fix(dicomjson): Update getUIDsFromImageID to work with json data source + update getDisplaySetImageUIDs to work with mixed sop class json (#4322)

extensions/default/src/DicomJSONDataSource/index.js

@@ -1,5 +1,6 @@
 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';
@@ -90,11 +91,14 @@ function createDicomJSONApi(dicomJsonConfig) {
             const { metadata: naturalizedDicom } = instance;
             const imageId = getImageId({ instance, config: dicomJsonConfig });
 
+            const { query } = qs.parseUrl(instance.url);
+
             // Add imageId specific mapping to this data as the URL isn't necessarliy WADO-URI.
             metadataProvider.addImageIdToUIDs(imageId, {
               StudyInstanceUID,
               SeriesInstanceUID,
               SOPInstanceUID: naturalizedDicom.SOPInstanceUID,
+              frameNumber: query.frame ? parseInt(query.frame) : undefined,
             });
           });
         });
@@ -258,28 +262,29 @@ function createDicomJSONApi(dicomJsonConfig) {
 
       const { StudyInstanceUID, SeriesInstanceUID } = displaySet;
       const study = findStudies('StudyInstanceUID', StudyInstanceUID)[0];
-      const series = study.series.find(s => s.SeriesInstanceUID === SeriesInstanceUID);
+      const series = study.series.find(s => s.SeriesInstanceUID === SeriesInstanceUID) || [];
-      let instances = displaySet.images;
+
-      if (series.instances.length > displaySet.images.length) {
+      const instanceMap = new Map();
-        instances = series.instances;
+      series.instances.forEach(instance => {
+        if (instance?.metadata?.SOPInstanceUID) {
+          const { metadata, url } = instance;
+          const existingInstances = instanceMap.get(metadata.SOPInstanceUID) || [];
+          existingInstances.push({ ...metadata, url });
+          instanceMap.set(metadata.SOPInstanceUID, existingInstances);
         }
+      });
 
-      instances.forEach(instance => {
+      displaySet.images.forEach(instance => {
-        const NumberOfFrames = instance.NumberOfFrames;
+        const NumberOfFrames = instance.NumberOfFrames || 1;
-
+        const instances = instanceMap.get(instance.SOPInstanceUID) || [instance];
-        if (NumberOfFrames > 1) {
         for (let i = 0; i < NumberOfFrames; i++) {
           const imageId = getImageId({
-              instance,
+            instance: instances[Math.min(i, instances.length - 1)],
-              frame: i,
+            frame: NumberOfFrames > 1 ? i : undefined,
             config: dicomJsonConfig,
           });
           imageIds.push(imageId);
         }
-        } else {
-          const imageId = getImageId({ instance, config: dicomJsonConfig });
-          imageIds.push(imageId);
-        }
       });
 
       return imageIds;

platform/core/src/classes/MetadataProvider.ts

@@ -8,31 +8,13 @@ import toNumber from '../utils/toNumber';
 import combineFrameInstance from '../utils/combineFrameInstance';
 
 class MetadataProvider {
-  constructor() {
+  private readonly studies: Map<string, any> = new Map();
-    // Define the main "metadataLookup" private property as an immutable property.
+  private readonly imageURIToUIDs: Map<string, any> = new Map();
-    Object.defineProperty(this, 'studies', {
+  private readonly imageUIDsByImageId: Map<string, any> = new Map();
-      configurable: false,
-      enumerable: false,
-      writable: false,
-      value: new Map(),
-    });
-    Object.defineProperty(this, 'imageURIToUIDs', {
-      configurable: false,
-      enumerable: false,
-      writable: false,
-      value: new Map(),
-    });
   // Can be used to store custom metadata for a specific type.
   // For instance, the scaling metadata for PET can be stored here
   // as type "scalingModule"
-    //
+  private readonly customMetadata: Map<string, any> = new Map();
-    Object.defineProperty(this, 'customMetadata', {
-      configurable: false,
-      enumerable: false,
-      writable: false,
-      value: new Map(),
-    });
-  }
 
   addImageIdToUIDs(imageId, uids) {
     // This method is a fallback for when you don't have WADO-URI or WADO-RS.
@@ -40,6 +22,7 @@ class MetadataProvider {
     // An example would be dicom hosted at some random site.
     const imageURI = imageIdToURI(imageId);
     this.imageURIToUIDs.set(imageURI, uids);
+    this.imageUIDsByImageId.set(imageId, uids);
   }
 
   addCustomMetadata(imageId, type, metadata) {
@@ -482,6 +465,12 @@ class MetadataProvider {
     //   SOPInstanceUID,
     // })
     // somewhere else
+
+    const cachedUIDs = this.imageUIDsByImageId.get(imageId);
+    if (cachedUIDs) {
+      return cachedUIDs;
+    }
+
     if (imageId.startsWith('wadors:')) {
       const strippedImageId = imageId.split('/studies/')[1];
       const splitImageId = strippedImageId.split('/');