fix(multiframe): handling proxies properly (#4693)

Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>
Co-authored-by: Chao Sui <chao.sui@curvebeamai.com>

extensions/default/src/DicomLocalDataSource/index.js

@@ -142,7 +142,9 @@ function createDicomLocalApi(dicomLocalConfig) {
           study.series.forEach(aSeries => {
             const { SeriesInstanceUID } = aSeries;
 
-            aSeries.instances.forEach(instance => {
+            const isMultiframe = aSeries.instances[0].NumberOfFrames > 1;
+
+            aSeries.instances.forEach((instance, index) => {
               const {
                 url: imageId,
                 StudyInstanceUID,
@@ -151,22 +153,14 @@ function createDicomLocalApi(dicomLocalConfig) {
               } = instance;
 
               instance.imageId = imageId;
-              const numberOfFrames = instance.NumberOfFrames || 1;
-              // Process all frames consistently, whether single or multiframe
-              for (let i = 0; i < numberOfFrames; i++) {
-                const frameNumber = i + 1;
-                const frameImageId = implementation.getImageIdsForInstance({
-                  instance,
-                  frame: frameNumber,
-                });
-                // Add imageId specific mapping to this data as the URL isn't necessarily WADO-URI.
-                metadataProvider.addImageIdToUIDs(frameImageId, {
-                  StudyInstanceUID,
-                  SeriesInstanceUID,
-                  SOPInstanceUID,
-                  frameNumber: numberOfFrames > 1 ? frameNumber : undefined,
-                });
-              }
+
+              // Add imageId specific mapping to this data as the URL isn't necessarily WADO-URI.
+              metadataProvider.addImageIdToUIDs(imageId, {
+                StudyInstanceUID,
+                SeriesInstanceUID,
+                SOPInstanceUID,
+                frameIndex: isMultiframe ? index : 1,
+              });
             });
 
             DicomMetadataStore._broadcastEvent(EVENTS.INSTANCES_ADDED, {

extensions/default/src/DicomWebDataSource/index.ts

@@ -478,7 +478,6 @@ function createDicomWebApi(dicomWebConfig: DicomWebConfig, servicesManager) {
           instance.wadoUri = dicomWebConfig.wadoUri;
 
           const { StudyInstanceUID, SeriesInstanceUID, SOPInstanceUID } = instance;
-
           const numberOfFrames = instance.NumberOfFrames || 1;
           // Process all frames consistently, whether single or multiframe
           for (let i = 0; i < numberOfFrames; i++) {