From 6baeaa9619cb2f967d50753fdf2129fdb968f997 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Wed, 20 May 2020 00:49:38 -0400 Subject: [PATCH] Assume pattern for specifying one or more studyInstanceUids --- platform/viewer/src/routes/Mode/Mode.jsx | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/platform/viewer/src/routes/Mode/Mode.jsx b/platform/viewer/src/routes/Mode/Mode.jsx index 388e3a2c1..e5c152db3 100644 --- a/platform/viewer/src/routes/Mode/Mode.jsx +++ b/platform/viewer/src/routes/Mode/Mode.jsx @@ -4,6 +4,7 @@ import PropTypes from 'prop-types'; import { ToolBarManager } from '@ohif/core'; import { DragAndDropProvider } from '@ohif/ui'; // +import { useQuery } from '@hooks'; import ViewportGrid from '@components/ViewportGrid'; import Compose from './Compose'; //import DisplaySetCreator from './DisplaySetCreator'; @@ -15,12 +16,21 @@ export default function ModeRoute({ extensionManager, servicesManager, }) { - const { routes, extensions, sopClassHandlers } = mode; - const dataSources = extensionManager.getDataSources(dataSourceName); - // TODO: For now assume one unique datasource. + // Parse route params/querystring + const query = useQuery(); + const queryStudyInstanceUIDs = query.get('StudyInstanceUIDs'); + const { StudyInstanceUIDs: paramsStudyInstanceUIDs } = useParams(); + const StudyInstanceUIDs = queryStudyInstanceUIDs || paramsStudyInstanceUIDs; + const { extensions, sopClassHandlers } = mode; + // TODO: + // - Check query/params for specific dataSource + // - If provided, query for that dataSource instance + // - If not provided, select default datasource + // - Update `extensionManager` to have a method to retrieve the default source + const dataSources = extensionManager.getDataSources(dataSourceName); const dataSource = dataSources[0]; - const route = routes[0]; + const route = mode.routes[0]; const { DisplaySetService } = servicesManager.services;