fix: retrieveSeriesMetadata (#2703)

extensions/default/src/DicomJSONDataSource/index.js

@@ -134,8 +134,68 @@ function createDicomJSONApi(dicomJsonConfig) {
     },
     retrieve: {
       series: {
-        metaData: () => {
-          console.debug(' DICOMJson retrieve series metadata');
+        metaData: ({
+          StudyInstanceUID,
+          madeInClient = false,
+          customSort,
+        } = {}) => {
+          if (!StudyInstanceUID) {
+            throw new Error(
+              'Unable to query for SeriesMetadata without StudyInstanceUID'
+            );
+          }
+
+          const study = findStudies('StudyInstanceUID', StudyInstanceUID)[0];
+          let series;
+
+          if (customSort) {
+            series = customSort(study.series);
+          } else {
+            series = study.series;
+          }
+
+          const seriesSummaryMetadata = series.map(series => {
+            const seriesSummary = {
+              StudyInstanceUID: study.StudyInstanceUID,
+              ...series,
+            };
+            delete seriesSummary.instances;
+            return seriesSummary;
+          });
+
+          // Async load series, store as retrieved
+          function storeInstances(naturalizedInstances) {
+            DicomMetadataStore.addInstances(naturalizedInstances, madeInClient);
+          }
+
+          DicomMetadataStore.addSeriesMetadata(
+            seriesSummaryMetadata,
+            madeInClient
+          );
+
+          function setSuccessFlag() {
+            const study = DicomMetadataStore.getStudy(
+              StudyInstanceUID,
+              madeInClient
+            );
+            study.isLoaded = true;
+          }
+
+          const numberOfSeries = series.length;
+          series.forEach((series, index) => {
+            const instances = series.instances.map(instance => {
+              const obj = {
+                ...instance.metadata,
+                url: instance.url,
+                imageId: instance.url,
+                ...series,
+              };
+              delete obj.instances;
+              return obj;
+            });
+            storeInstances(instances);
+            if (index === numberOfSeries - 1) setSuccessFlag();
+          });
         },
       },
     },
@@ -144,66 +204,6 @@ function createDicomJSONApi(dicomJsonConfig) {
         console.debug(' DICOMJson store dicom');
       },
     },
-    retrieveSeriesMetadata: ({
-      StudyInstanceUID,
-      madeInClient = false,
-      customSort,
-    } = {}) => {
-      if (!StudyInstanceUID) {
-        throw new Error(
-          'Unable to query for SeriesMetadata without StudyInstanceUID'
-        );
-      }
-
-      const study = findStudies('StudyInstanceUID', StudyInstanceUID)[0];
-      let series;
-
-      if (customSort) {
-        series = customSort(study.series);
-      } else {
-        series = study.series;
-      }
-
-      const seriesSummaryMetadata = series.map(series => {
-        const seriesSummary = {
-          StudyInstanceUID: study.StudyInstanceUID,
-          ...series,
-        };
-        delete seriesSummary.instances;
-        return seriesSummary;
-      });
-
-      // Async load series, store as retrieved
-      function storeInstances(naturalizedInstances) {
-        DicomMetadataStore.addInstances(naturalizedInstances, madeInClient);
-      }
-
-      DicomMetadataStore.addSeriesMetadata(seriesSummaryMetadata, madeInClient);
-
-      function setSuccessFlag() {
-        const study = DicomMetadataStore.getStudy(
-          StudyInstanceUID,
-          madeInClient
-        );
-        study.isLoaded = true;
-      }
-
-      const numberOfSeries = series.length;
-      series.forEach((series, index) => {
-        const instances = series.instances.map(instance => {
-          const obj = {
-            ...instance.metadata,
-            url: instance.url,
-            imageId: instance.url,
-            ...series,
-          };
-          delete obj.instances;
-          return obj;
-        });
-        storeInstances(instances);
-        if (index === numberOfSeries - 1) setSuccessFlag();
-      });
-    },
     getImageIdsForDisplaySet(displaySet) {
       const images = displaySet.images;
       const imageIds = [];