HYP-184 - Updated URLs to make trailing slash optional

app/contact/urls.py

@@ -3,6 +3,6 @@
 
 app_name = 'contact'
 urlpatterns = (
-    re_path(r'^(?P<project_key>[^/]+)/$', contact_form, name='contact_form'),
+    re_path(r'^(?P<project_key>[^/]+)/?$', contact_form, name='contact_form'),
     re_path(r'^', contact_form, name='contact_form'),
 )

app/hypatio/urls.py

@@ -14,9 +14,9 @@
     re_path(r'^manage/', include('manage.urls', namespace='manage')),
     re_path(r'^projects/', include('projects.urls', namespace='projects')),
     re_path(r'^profile/', include('profile.urls', namespace='profile')),
-    re_path(r'^data-sets/$', list_data_projects, name='data-sets'),
-    re_path(r'^data-challenges/$', list_data_challenges, name='data-challenges'),
-    re_path(r'^software-projects/$', list_software_projects, name='software-projects'),
+    re_path(r'^data-sets/?$', list_data_projects, name='data-sets'),
+    re_path(r'^data-challenges/?$', list_data_challenges, name='data-challenges'),
+    re_path(r'^software-projects/?$', list_software_projects, name='software-projects'),
     re_path(r'^healthcheck/?', include('health_check.urls')),
     re_path(r'^', index, name='index'),
 ]

app/manage/urls.py

@@ -35,31 +35,31 @@
 
 urlpatterns = [
     re_path(r'^$', DataProjectListManageView.as_view(), name='manage-projects'),
-    re_path(r'^download-email-list/$', download_email_list, name='download-email-list'),
-    re_path(r'^set-dataproject-details/$', set_dataproject_details, name='set-dataproject-details'),
-    re_path(r'^set-dataproject-registration-status/$', set_dataproject_registration_status, name='set-dataproject-registration-status'),
-    re_path(r'^set-dataproject-visible-status/$', set_dataproject_visible_status, name='set-dataproject-visible-status'),
-    re_path(r'^get-static-agreement-form-html/$', get_static_agreement_form_html, name='get-static-agreement-form-html'),
-    re_path(r'^get-hosted-file-edit-form/$', get_hosted_file_edit_form, name='get-hosted-file-edit-form'),
-    re_path(r'^get-hosted-file-logs/$', get_hosted_file_logs, name='get-hosted-file-logs'),
-    re_path(r'^process-hosted-file-edit-form-submission/$', process_hosted_file_edit_form_submission, name='process-hosted-file-edit-form-submission'),
-    re_path(r'^download-signed-form/$', download_signed_form, name='download-signed-form'),
-    re_path(r'^get-signed-form-status/$', get_signed_form_status, name='get-signed-form-status'),
-    re_path(r'^change-signed-form-status/$', change_signed_form_status, name='change-signed-form-status'),
-    re_path(r'^save-team-comment/$', save_team_comment, name='save-team-comment'),
-    re_path(r'^set-team-status/$', set_team_status, name='set-team-status'),
-    re_path(r'^delete-team/$', delete_team, name='delete-team'),
-    re_path(r'^team-notification/$', team_notification, name='team-notification'),
-    re_path(r'^download-team-submissions/(?P<project_key>[^/]+)/(?P<team_leader_email>[^/]+)/$', download_team_submissions, name='download-team-submissions'),
-    re_path(r'^download-submission/(?P<fileservice_uuid>[^/]+)/$', download_submission, name='download-submission'),
-    re_path(r'^export-submissions/(?P<project_key>[^/]+)/$', export_submissions, name='export-submissions'),
-    re_path(r'^download-submissions-export/(?P<project_key>[^/]+)/(?P<fileservice_uuid>[^/]+)/$', download_submissions_export, name='download-submissions-export'),
-    re_path(r'^host-submission/(?P<fileservice_uuid>[^/]+)/$', host_submission, name='host-submission'),
-    re_path(r'^sync-view-permissions/(?P<project_key>[^/]+)/$', sync_view_permissions, name='sync-view-permissions'),
-    re_path(r'^grant-view-permission/(?P<project_key>[^/]+)/(?P<user_email>[^/]+)/$', grant_view_permission, name='grant-view-permission'),
-    re_path(r'^remove-view-permission/(?P<project_key>[^/]+)/(?P<user_email>[^/]+)/$', remove_view_permission, name='remove-view-permission'),
-    re_path(r'^get-project-participants/(?P<project_key>[^/]+)/$', ProjectParticipants.as_view(), name='get-project-participants'),
-    re_path(r'^upload-signed-agreement-form/(?P<project_key>[^/]+)/(?P<user_email>[^/]+)/$', UploadSignedAgreementFormView.as_view(), name='upload-signed-agreement-form'),
-    re_path(r'^(?P<project_key>[^/]+)/$', DataProjectManageView.as_view(), name='manage-project'),
-    re_path(r'^(?P<project_key>[^/]+)/(?P<team_leader>[^/]+)/$', manage_team, name='manage-team'),
+    re_path(r'^download-email-list/?$', download_email_list, name='download-email-list'),
+    re_path(r'^set-dataproject-details/?$', set_dataproject_details, name='set-dataproject-details'),
+    re_path(r'^set-dataproject-registration-status/?$', set_dataproject_registration_status, name='set-dataproject-registration-status'),
+    re_path(r'^set-dataproject-visible-status/?$', set_dataproject_visible_status, name='set-dataproject-visible-status'),
+    re_path(r'^get-static-agreement-form-html/?$', get_static_agreement_form_html, name='get-static-agreement-form-html'),
+    re_path(r'^get-hosted-file-edit-form/?$', get_hosted_file_edit_form, name='get-hosted-file-edit-form'),
+    re_path(r'^get-hosted-file-logs/?$', get_hosted_file_logs, name='get-hosted-file-logs'),
+    re_path(r'^process-hosted-file-edit-form-submission/?$', process_hosted_file_edit_form_submission, name='process-hosted-file-edit-form-submission'),
+    re_path(r'^download-signed-form/?$', download_signed_form, name='download-signed-form'),
+    re_path(r'^get-signed-form-status/?$', get_signed_form_status, name='get-signed-form-status'),
+    re_path(r'^change-signed-form-status/?$', change_signed_form_status, name='change-signed-form-status'),
+    re_path(r'^save-team-comment/?$', save_team_comment, name='save-team-comment'),
+    re_path(r'^set-team-status/?$', set_team_status, name='set-team-status'),
+    re_path(r'^delete-team/?$', delete_team, name='delete-team'),
+    re_path(r'^team-notification/?$', team_notification, name='team-notification'),
+    re_path(r'^download-team-submissions/(?P<project_key>[^/]+)/(?P<team_leader_email>[^/]+)/?$', download_team_submissions, name='download-team-submissions'),
+    re_path(r'^download-submission/(?P<fileservice_uuid>[^/]+)/?$', download_submission, name='download-submission'),
+    re_path(r'^export-submissions/(?P<project_key>[^/]+)/?$', export_submissions, name='export-submissions'),
+    re_path(r'^download-submissions-export/(?P<project_key>[^/]+)/(?P<fileservice_uuid>[^/]+)/?$', download_submissions_export, name='download-submissions-export'),
+    re_path(r'^host-submission/(?P<fileservice_uuid>[^/]+)/?$', host_submission, name='host-submission'),
+    re_path(r'^sync-view-permissions/(?P<project_key>[^/]+)/?$', sync_view_permissions, name='sync-view-permissions'),
+    re_path(r'^grant-view-permission/(?P<project_key>[^/]+)/(?P<user_email>[^/]+)/?$', grant_view_permission, name='grant-view-permission'),
+    re_path(r'^remove-view-permission/(?P<project_key>[^/]+)/(?P<user_email>[^/]+)/?$', remove_view_permission, name='remove-view-permission'),
+    re_path(r'^get-project-participants/(?P<project_key>[^/]+)/?$', ProjectParticipants.as_view(), name='get-project-participants'),
+    re_path(r'^upload-signed-agreement-form/(?P<project_key>[^/]+)/(?P<user_email>[^/]+)/?$', UploadSignedAgreementFormView.as_view(), name='upload-signed-agreement-form'),
+    re_path(r'^(?P<project_key>[^/]+)/?$', DataProjectManageView.as_view(), name='manage-project'),
+    re_path(r'^(?P<project_key>[^/]+)/(?P<team_leader>[^/]+)/?$', manage_team, name='manage-team'),
 ]

app/profile/urls.py

@@ -8,7 +8,7 @@
 app_name = 'profile'
 urlpatterns = [
     re_path(r'^$', profile, name='profile'),
-    re_path(r'^send_confirmation_email/$', send_confirmation_email_view, name='send_confirmation_email'),
-    re_path(r'^update/$', update_profile, name='update'),
-    re_path(r'^signout/$', signout, name='signout'),
+    re_path(r'^send_confirmation_email/?$', send_confirmation_email_view, name='send_confirmation_email'),
+    re_path(r'^update/?$', update_profile, name='update'),
+    re_path(r'^signout/?$', signout, name='signout'),
 ]

app/projects/urls.py

@@ -24,20 +24,20 @@
 
 urlpatterns = [
     re_path(r'^$', list_data_projects, name='index'),
-    re_path(r'^autocomplete/hostedfileset/$', HostedFileSetAutocomplete.as_view(create_field='title'), name='hostedfileset-autocomplete'),
-    re_path(r'^submit_user_permission_request/$', submit_user_permission_request, name='submit_user_permission_request'),
+    re_path(r'^autocomplete/hostedfileset/?$', HostedFileSetAutocomplete.as_view(create_field='title'), name='hostedfileset-autocomplete'),
+    re_path(r'^submit_user_permission_request/?$', submit_user_permission_request, name='submit_user_permission_request'),
     re_path(r'^save_signed_agreement_form', save_signed_agreement_form, name='save_signed_agreement_form'),
     re_path(r'^save_signed_external_agreement_form', save_signed_external_agreement_form, name='save_signed_external_agreement_form'),
     re_path(r'^upload_signed_agreement_form', upload_signed_agreement_form, name='upload_signed_agreement_form'),
-    re_path(r'^join_team/$', join_team, name='join_team'),
-    re_path(r'^leave_team/$', leave_team, name='leave_team'),
-    re_path(r'^approve_team_join/$', approve_team_join, name='approve_team_join'),
-    re_path(r'^reject_team_join/$', reject_team_join, name='reject_team_join'),
-    re_path(r'^create_team/$', create_team, name='create_team'),
-    re_path(r'^finalize_team/$', finalize_team, name='finalize_team'),
-    re_path(r'^signed_agreement_form/$', signed_agreement_form, name='signed_agreement_form'),
-    re_path(r'^download_dataset/$', download_dataset, name='download_dataset'),
-    re_path(r'^upload_challengetasksubmission_file/$', upload_challengetasksubmission_file, name="upload_challengetasksubmission_file"),
-    re_path(r'^delete_challengetasksubmission/$', delete_challengetasksubmission, name='delete_challengetasksubmission'),
-    re_path(r'^(?P<project_key>[^/]+)/$', DataProjectView.as_view(), name="view-project"),
+    re_path(r'^join_team/?$', join_team, name='join_team'),
+    re_path(r'^leave_team/?$', leave_team, name='leave_team'),
+    re_path(r'^approve_team_join/?$', approve_team_join, name='approve_team_join'),
+    re_path(r'^reject_team_join/?$', reject_team_join, name='reject_team_join'),
+    re_path(r'^create_team/?$', create_team, name='create_team'),
+    re_path(r'^finalize_team/?$', finalize_team, name='finalize_team'),
+    re_path(r'^signed_agreement_form/?$', signed_agreement_form, name='signed_agreement_form'),
+    re_path(r'^download_dataset/?$', download_dataset, name='download_dataset'),
+    re_path(r'^upload_challengetasksubmission_file/?$', upload_challengetasksubmission_file, name="upload_challengetasksubmission_file"),
+    re_path(r'^delete_challengetasksubmission/?$', delete_challengetasksubmission, name='delete_challengetasksubmission'),
+    re_path(r'^(?P<project_key>[^/]+)/?$', DataProjectView.as_view(), name="view-project"),
 ]