Merge pull request #65 from ImagingDataCommons/fix/series-query-param…

…s-OHIF Cherry-pick: OHIF's v3 series query params fix
ImagingDataCommons · Aug 27, 2024 · 26a8ff5 · 26a8ff5
2 parents 8fc0130 + 4cf379c
commit 26a8ff5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/extensions/default/src/DicomWebDataSource/utils/retrieveMetadataFiltered.js b/extensions/default/src/DicomWebDataSource/utils/retrieveMetadataFiltered.js
@@ -39,16 +39,22 @@ function retrieveMetadataFiltered(
       );
     });
 
-    Promise.all(promises).then(results => {
-      const aggregatedResult = { preLoadData: [], promises: [] };
+    if (enableStudyLazyLoad === true) {
+      Promise.all(promises).then(results => {
+        const aggregatedResult = { preLoadData: [], promises: [] };
 
-      results.forEach(({ preLoadData, promises }) => {
-        aggregatedResult.preLoadData = aggregatedResult.preLoadData.concat(preLoadData);
-        aggregatedResult.promises = aggregatedResult.promises.concat(promises);
-      });
+        results.forEach(({ preLoadData, promises }) => {
+          aggregatedResult.preLoadData = aggregatedResult.preLoadData.concat(preLoadData);
+          aggregatedResult.promises = aggregatedResult.promises.concat(promises);
+        });
 
-      resolve(aggregatedResult);
-    }, reject);
+        resolve(aggregatedResult);
+      }, reject);
+    } else {
+      Promise.all(promises).then(results => {
+        resolve(results.flat());
+      }, reject);
+    }
   });
 }
 

diff --git a/platform/app/src/routes/Mode/Mode.tsx b/platform/app/src/routes/Mode/Mode.tsx
@@ -252,7 +252,7 @@ export default function ModeRoute({
         Array.from(query.keys()).reduce((acc: Record<string, string>, val: string) => {
           const lowerVal = val.toLowerCase();
           // Not sure why the case matters here - it doesn't in the URL
-          if (lowerVal === 'seriesinstanceuids') {
+          if (lowerVal === 'seriesinstanceuids' || lowerVal === 'seriesinstanceuid') {
             const seriesUIDs = getSplitParam(lowerVal, query);
             return {
               ...acc,