@ohif/app 3.9.0-beta.66 → 3.9.0-beta.68

package/dist/{2281.bundle.f3aaec4290d1a8f2e08b.js → 2281.bundle.d8ba949af9af7c594a18.js}

@@ -1865,9 +1865,6 @@ const findStudies = (key, value) => {
   return studies;
 };
 function createDicomJSONApi(dicomJsonConfig) {
-  const {
-    wadoRoot
-  } = dicomJsonConfig;
   const implementation = {
     initialize: async ({
       query,
@@ -1896,9 +1893,12 @@ function createDicomJSONApi(dicomJsonConfig) {
           SeriesInstanceUID = series.SeriesInstanceUID;
           series.instances.forEach(instance => {
             const {
-              url: imageId,
               metadata: naturalizedDicom
             } = instance;
+            const imageId = getImageId({
+              instance,
+              config: dicomJsonConfig
+            });
 
             // Add imageId specific mapping to this data as the URL isn't necessarliy WADO-URI.
             DicomJSONDataSource_metadataProvider.addImageIdToUIDs(imageId, {
@@ -2024,7 +2024,10 @@ function createDicomJSONApi(dicomJsonConfig) {
               const obj = {
                 ...modifiedMetadata,
                 url: instance.url,
-                imageId: instance.url,
+                imageId: getImageId({
+                  instance,
+                  config: dicomJsonConfig
+                }),
                 ...series,
                 ...study
               };
@@ -2051,7 +2054,17 @@ function createDicomJSONApi(dicomJsonConfig) {
       if (!images) {
         return imageIds;
       }
-      displaySet.images.forEach(instance => {
+      const {
+        StudyInstanceUID,
+        SeriesInstanceUID
+      } = displaySet;
+      const study = findStudies('StudyInstanceUID', StudyInstanceUID)[0];
+      const series = study.series.find(s => s.SeriesInstanceUID === SeriesInstanceUID);
+      let instances = displaySet.images;
+      if (series.instances.length > displaySet.images.length) {
+        instances = series.instances;
+      }
+      instances.forEach(instance => {
         const NumberOfFrames = instance.NumberOfFrames;
         if (NumberOfFrames > 1) {
           for (let i = 0; i < NumberOfFrames; i++) {
@@ -2844,8 +2857,8 @@ function ViewerHeader({
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.9.0-beta.66";
-  const commitHash = "fc0064fd9d8cdc8fde81b81f0e71fd5d077ca22b";
+  const versionNumber = "3.9.0-beta.68";
+  const commitHash = "16b7aa4f6538b81e5915e47b9209d74575895dfe";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',