From 9ad8cc8740508e1c7f6b99bed11ceb076028f015 Mon Sep 17 00:00:00 2001 From: John Holt Date: Mon, 3 Jul 2023 10:16:37 +0100 Subject: [PATCH 1/2] Make general dc path less important --- client/src/js/modules/dc/router.js | 3 ++- client/src/js/modules/dc/routes.js | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/client/src/js/modules/dc/router.js b/client/src/js/modules/dc/router.js index 4270c1b91..339390cbc 100644 --- a/client/src/js/modules/dc/router.js +++ b/client/src/js/modules/dc/router.js @@ -4,7 +4,7 @@ define(['utils/lazyrouter'], function(LazyRouter) { var Router = LazyRouter.extend({ appRoutes: { 'dc': 'dc_list', - 'dc(/visit/:visit)(:pathmatch)': 'dc_list', + 'dc/view/id/:id': 'di_viewer', 'dc/map/id/:id/aid/:aid': 'mapmodelviewer', 'dc/rsv/id/:id': 'rsviewer', @@ -12,6 +12,7 @@ define(['utils/lazyrouter'], function(LazyRouter) { 'dc/apstatussummary/visit/:visit(/ty/:ty)': 'apstatussummary', 'dc/sc/visit/:visit': 'sampleChanger', 'dc/queue/visit/:visit': 'queue', + 'dc(/visit/:visit)(:pathmatch)': 'dc_list', }, loadEvents: ['dclist:show', 'dc:show'], diff --git a/client/src/js/modules/dc/routes.js b/client/src/js/modules/dc/routes.js index 6a735851f..64d400157 100644 --- a/client/src/js/modules/dc/routes.js +++ b/client/src/js/modules/dc/routes.js @@ -85,21 +85,6 @@ function lookupVisit(visit) { // Search probably has no value with an id (i.e. individual data collection) or probably dcg either. // The DC component handles the prefetching and proposal lookup in a cleaner method than using marionette wrapper directly let routes = [ - { - path: '/dc(/visit/)?:visit([a-zA-Z]{2}[0-9]+-[0-9]+)?:pathMatch(.*)*', - name: 'dc-list', - component: DCWrapper, - props: route => ({ - id: +RoutesUtil.getParamValue(route.params.pathMatch, 'id') || null, - visit: route.params.visit || '', - dcg: +RoutesUtil.getParamValue(route.params.pathMatch, 'dcg') || null, - page: +RoutesUtil.getParamValue(route.params.pathMatch, 'page') || 1, - ty: RoutesUtil.getParamValue(route.params.pathMatch, 'ty') || '', - search: RoutesUtil.getParamValue(route.params.pathMatch, 's') || '', - pjid: +RoutesUtil.getParamValue(route.params.pathMatch, 'pjid') || null, - sgid: +RoutesUtil.getParamValue(route.params.pathMatch, 'sgid') || null - }), - }, { path: '/dc/map/id/:id([0-9]+)(/aid/)?:aid([0-9]+)?', name: 'dc-mapmodelviewer', @@ -125,6 +110,21 @@ let routes = [ id: +route.params.id || null, }), }, + { + path: '/dc(/visit/)?:visit([a-zA-Z]{2}[0-9]+-[0-9]+)?:pathMatch(.*)*', + name: 'dc-list', + component: DCWrapper, + props: route => ({ + id: +RoutesUtil.getParamValue(route.params.pathMatch, 'id') || null, + visit: route.params.visit || '', + dcg: +RoutesUtil.getParamValue(route.params.pathMatch, 'dcg') || null, + page: +RoutesUtil.getParamValue(route.params.pathMatch, 'page') || 1, + ty: RoutesUtil.getParamValue(route.params.pathMatch, 'ty') || '', + search: RoutesUtil.getParamValue(route.params.pathMatch, 's') || '', + pjid: +RoutesUtil.getParamValue(route.params.pathMatch, 'pjid') || null, + sgid: +RoutesUtil.getParamValue(route.params.pathMatch, 'sgid') || null + }), + }, { path: '/dc/summary/visit/:visit([a-zA-Z]{2}[0-9]+-[0-9]+)', name: 'dc-summary', From e47cecaf6f6c5d2a1b9206c1cecedfee198e9a80 Mon Sep 17 00:00:00 2001 From: John Holt <7570055+John-Holt-Tessella@users.noreply.github.com> Date: Mon, 3 Jul 2023 13:08:55 +0100 Subject: [PATCH 2/2] Update client/src/js/modules/dc/router.js Co-authored-by: Guilherme Francisco --- client/src/js/modules/dc/router.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/js/modules/dc/router.js b/client/src/js/modules/dc/router.js index 339390cbc..2126b57d4 100644 --- a/client/src/js/modules/dc/router.js +++ b/client/src/js/modules/dc/router.js @@ -4,7 +4,6 @@ define(['utils/lazyrouter'], function(LazyRouter) { var Router = LazyRouter.extend({ appRoutes: { 'dc': 'dc_list', - 'dc/view/id/:id': 'di_viewer', 'dc/map/id/:id/aid/:aid': 'mapmodelviewer', 'dc/rsv/id/:id': 'rsviewer',