[WIP] fix 5287 optimize series discovery on load time

extensions/default/jest.config.js

@@ -5,11 +5,12 @@ module.exports = {
   moduleNameMapper: {
     ...base.moduleNameMapper,
     '@ohif/(.*)': '<rootDir>/../../platform/$1/src',
+    'dicomweb-client': '<rootDir>/../../node_modules/dicomweb-client',
     '^@cornerstonejs/(.*)$': '<rootDir>/../../node_modules/@cornerstonejs/$1/dist/esm',
   },
   // rootDir: "../.."
   // testMatch: [
   //   //`<rootDir>/platform/${pack.name}/**/*.spec.js`
   //   "<rootDir>/platform/app/**/*.test.js"
   // ]
-};
+};

extensions/default/src/DicomJSONDataSource/index.js → extensions/default/src/DataSources/DicomJSONDataSource/index.js

@@ -2,8 +2,7 @@ import { DicomMetadataStore, IWebApiDataSource } from '@ohif/core';
 import OHIF from '@ohif/core';
 import qs from 'query-string';
 
-import getImageId from '../DicomWebDataSource/utils/getImageId';
-import getDirectURL from '../utils/getDirectURL';
+import {getDirectURL, getImageId} from '../utils';
 
 const metadataProvider = OHIF.classes.MetadataProvider;
 
@@ -60,6 +59,7 @@ const findStudies = (key, value) => {
 };
 
 function createDicomJSONApi(dicomJsonConfig) {
+  const dicomJsonConfigCopy = JSON.parse(JSON.stringify(dicomJsonConfig));
   const implementation = {
     initialize: async ({ query, url }) => {
       if (!url) {
@@ -89,7 +89,11 @@ function createDicomJSONApi(dicomJsonConfig) {
 
           series.instances.forEach(instance => {
             const { metadata: naturalizedDicom } = instance;
-            const imageId = getImageId({ instance, config: dicomJsonConfig });
+            const imageId = getImageId(
+              instance,
+              undefined,
+              dicomJsonConfig
+          );
 
             const { query } = qs.parseUrl(instance.url);
 
@@ -231,7 +235,11 @@ function createDicomJSONApi(dicomJsonConfig) {
               const obj = {
                 ...modifiedMetadata,
                 url: instance.url,
-                imageId: getImageId({ instance, config: dicomJsonConfig }),
+                imageId: getImageId(
+                  instance,
+                  undefined,
+                  dicomJsonConfig
+                ),
                 ...series,
                 ...study,
               };
@@ -280,20 +288,26 @@ function createDicomJSONApi(dicomJsonConfig) {
         const NumberOfFrames = instance.NumberOfFrames || 1;
         const instances = instanceMap.get(instance.SOPInstanceUID) || [instance];
         for (let i = 0; i < NumberOfFrames; i++) {
-          const imageId = getImageId({
-            instance: instances[Math.min(i, instances.length - 1)],
-            frame: NumberOfFrames > 1 ? i : undefined,
-            config: dicomJsonConfig,
-          });
+          const imageId = getImageId(
+            instances[Math.min(i, instances.length - 1)],
+            NumberOfFrames > 1 ? i : undefined,
+            dicomJsonConfig,
+          );
           imageIds.push(imageId);
         }
       });
 
       return imageIds;
     },
-    getImageIdsForInstance({ instance, frame }) {
-      const imageIds = getImageId({ instance, frame });
-      return imageIds;
+    getImageIdsForInstance({ instance, frame = undefined }) {
+      return getImageId({
+        instance,
+        frame,
+        config: dicomJsonConfig,
+      });
+    },
+    getConfig() {
+      return dicomJsonConfigCopy;
     },
     getStudyInstanceUIDs: ({ params, query }) => {
       const url = query.get('url');

extensions/default/src/DicomLocalDataSource/index.js → extensions/default/src/DataSources/DicomLocalDataSource/index.js

@@ -43,6 +43,7 @@ const customSort = (seriesA, seriesB) => {
 
 function createDicomLocalApi(dicomLocalConfig) {
   const { name } = dicomLocalConfig;
+  const dicomLocalConfigCopy = JSON.parse(JSON.stringify(dicomLocalConfig));
 
   const implementation = {
     initialize: ({ params, query }) => {},
@@ -194,14 +195,14 @@ function createDicomLocalApi(dicomLocalConfig) {
         if (NumberOfFrames > 1) {
           // in multiframe we start at frame 1
           for (let i = 1; i <= NumberOfFrames; i++) {
-            const imageId = this.getImageIdsForInstance({
+            const imageId = implementation.getImageIdsForInstance({
               instance,
               frame: i,
             });
             imageIds.push(imageId);
           }
         } else {
-          const imageId = this.getImageIdsForInstance({ instance });
+          const imageId = implementation.getImageIdsForInstance({ instance });
           imageIds.push(imageId);
         }
       });
@@ -234,6 +235,9 @@ function createDicomLocalApi(dicomLocalConfig) {
     deleteStudyMetadataPromise() {
       console.log('deleteStudyMetadataPromise not implemented');
     },
+    getConfig() {
+      return dicomLocalConfigCopy;
+    },
     getStudyInstanceUIDs: ({ params, query }) => {
       const { StudyInstanceUIDs: paramsStudyInstanceUIDs } = params;
       const queryStudyInstanceUIDs = query.getAll('StudyInstanceUIDs');