@ohif/app 3.9.0-beta.76 → 3.9.0-beta.78

package/dist/{2281.bundle.216a0d86eaed7f4870ae.js → 655.bundle.28f107410332c62993a3.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[2281],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[655],{
 
-/***/ 32281:
+/***/ 10655:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -12,6 +12,7 @@ __webpack_require__.d(__webpack_exports__, {
   ContextMenuController: () => (/* reexport */ ContextMenuController),
   CustomizableContextMenuTypes: () => (/* reexport */ types_namespaceObject),
   StaticWadoClient: () => (/* reexport */ StaticWadoClient),
+  cleanDenaturalizedDataset: () => (/* reexport */ cleanDenaturalizedDataset),
   createReportAsync: () => (/* reexport */ Actions_createReportAsync),
   createReportDialogPrompt: () => (/* reexport */ CreateReportDialogPrompt),
   "default": () => (/* binding */ default_src),
@@ -27,7 +28,10 @@ __webpack_require__.r(types_namespaceObject);
 var utils_namespaceObject = {};
 __webpack_require__.r(utils_namespaceObject);
 __webpack_require__.d(utils_namespaceObject, {
-  fixBulkDataURI: () => (fixBulkDataURI)
+  cleanDenaturalizedDataset: () => (cleanDenaturalizedDataset),
+  fixBulkDataURI: () => (fixBulkDataURI),
+  fixMultiValueKeys: () => (fixMultiValueKeys),
+  transferDenaturalizedDataset: () => (transferDenaturalizedDataset)
 });
 
 // EXTERNAL MODULE: ../../../node_modules/dicomweb-client/build/dicomweb-client.es.js
@@ -1307,6 +1311,7 @@ function fixBulkDataURI(value, instance, dicomWebConfig) {
   const {
     bulkDataURI: uriConfig = {}
   } = dicomWebConfig;
+  BulkDataURI = uriConfig.transform?.(BulkDataURI) || BulkDataURI;
 
   // Handle incorrectly prefixed origins
   const {
@@ -1323,7 +1328,7 @@ function fixBulkDataURI(value, instance, dicomWebConfig) {
       SeriesInstanceUID
     } = instance;
     const isInstanceStart = BulkDataURI.startsWith('instances/') || BulkDataURI.startsWith('../');
-    if (BulkDataURI.startsWith('series/') || BulkDataURI.startsWith('bulkdata/') || uriConfig.relativeResolution === 'studies' && isInstanceStart) {
+    if (BulkDataURI.startsWith('series/') || BulkDataURI.startsWith('bulkdata/') || uriConfig.relativeResolution === 'studies' && !isInstanceStart) {
       value.BulkDataURI = `${dicomWebConfig.wadoRoot}/studies/${StudyInstanceUID}/${BulkDataURI}`;
     } else if (isInstanceStart || uriConfig.relativeResolution === 'series' || !uriConfig.relativeResolution) {
       value.BulkDataURI = `${dicomWebConfig.wadoRoot}/studies/${StudyInstanceUID}/series/${SeriesInstanceUID}/${BulkDataURI}`;
@@ -1510,6 +1515,14 @@ function createDicomWebApi(dicomWebConfig, servicesManager) {
           singlepart: dicomWebConfig.singlepart
         }, params);
       },
+      /**
+       * Provide direct access to the dicom web client for certain use cases
+       * where the dicom web client is used by an external library such as the
+       * microscopy viewer.
+       * Note this instance only needs to support the wado queries, and may not
+       * support any QIDO or STOW operations.
+       */
+      getWadoDicomWebClient: () => wadoDicomWebClient,
       bulkDataURI: async ({
         StudyInstanceUID,
         BulkDataURI
@@ -1634,6 +1647,31 @@ function createDicomWebApi(dicomWebConfig, servicesManager) {
         promises: seriesPromises
       } = await retrieveStudyMetadata(wadoDicomWebClient, StudyInstanceUID, enableStudyLazyLoad, filters, sortCriteria, sortFunction, dicomWebConfig);
 
+      /**
+       * Adds the retrieve bulkdata function to naturalized DICOM data.
+       * This is done recursively, for sub-sequences.
+       */
+      const addRetrieveBulkDataNaturalized = (naturalized, instance = naturalized) => {
+        for (const key of Object.keys(naturalized)) {
+          const value = naturalized[key];
+          if (Array.isArray(value) && typeof value[0] === 'object') {
+            // Fix recursive values
+            value.forEach(child => addRetrieveBulkDataNaturalized(child, instance));
+            continue;
+          }
+
+          // The value.Value will be set with the bulkdata read value
+          // in which case it isn't necessary to re-read this.
+          if (value && value.BulkDataURI && !value.Value) {
+            // handle the scenarios where bulkDataURI is relative path
+            fixBulkDataURI(value, instance, dicomWebConfig);
+            // Provide a method to fetch bulkdata
+            value.retrieveBulkData = retrieveBulkData.bind(qidoDicomWebClient, value);
+          }
+        }
+        return naturalized;
+      };
+
       /**
        * naturalizes the dataset, and adds a retrieve bulkdata method
        * to any values containing BulkDataURI.
@@ -1647,49 +1685,7 @@ function createDicomWebApi(dicomWebConfig, servicesManager) {
         if (!dicomWebConfig.bulkDataURI?.enabled) {
           return naturalized;
         }
-        Object.keys(naturalized).forEach(key => {
-          const value = naturalized[key];
-
-          // The value.Value will be set with the bulkdata read value
-          // in which case it isn't necessary to re-read this.
-          if (value && value.BulkDataURI && !value.Value) {
-            // handle the scenarios where bulkDataURI is relative path
-            fixBulkDataURI(value, naturalized, dicomWebConfig);
-            // Provide a method to fetch bulkdata
-            value.retrieveBulkData = (options = {}) => {
-              const {
-                mediaType
-              } = options;
-              const useOptions = {
-                // The bulkdata fetches work with either multipart or
-                // singlepart, so set multipart to false to let the server
-                // decide which type to respond with.
-                multipart: false,
-                BulkDataURI: value.BulkDataURI,
-                // The study instance UID is required if the bulkdata uri
-                // is relative - that isn't disallowed by DICOMweb, but
-                // isn't well specified in the standard, but is needed in
-                // any implementation that stores static copies of the metadata
-                StudyInstanceUID: naturalized.StudyInstanceUID,
-                mediaTypes: mediaType ? [{
-                  mediaType
-                }, {
-                  mediaType: 'application/octet-stream'
-                }] : undefined,
-                ...options
-              };
-              return qidoDicomWebClient.retrieveBulkData(useOptions).then(val => {
-                // There are DICOM PDF cases where the first ArrayBuffer in the array is
-                // the bulk data and DICOM video cases where the second ArrayBuffer is
-                // the bulk data. Here we play it safe and do a find.
-                const ret = val instanceof Array && val.find(arrayBuffer => arrayBuffer?.byteLength) || undefined;
-                value.Value = ret;
-                return ret;
-              });
-            };
-          }
-        });
-        return naturalized;
+        return addRetrieveBulkDataNaturalized(naturalized);
       };
 
       // Async load series, store as retrieved
@@ -1810,6 +1806,41 @@ function createDicomWebApi(dicomWebConfig, servicesManager) {
   return src/* IWebApiDataSource */.Is.create(implementation);
 }
 
+/**
+ * A bindable function that retrieves the bulk data against this as the
+ * dicomweb client, and on the given value element.
+ *
+ * @param value - a bind value that stores the retrieve value to short circuit the
+ *    next retrieve instance.
+ * @param options - to allow specifying the content type.
+ */
+function retrieveBulkData(value, options = {}) {
+  const {
+    mediaType
+  } = options;
+  const useOptions = {
+    // The bulkdata fetches work with either multipart or
+    // singlepart, so set multipart to false to let the server
+    // decide which type to respond with.
+    multipart: false,
+    BulkDataURI: value.BulkDataURI,
+    mediaTypes: mediaType ? [{
+      mediaType
+    }, {
+      mediaType: 'application/octet-stream'
+    }] : undefined,
+    ...options
+  };
+  return this.retrieveBulkData(useOptions).then(val => {
+    // There are DICOM PDF cases where the first ArrayBuffer in the array is
+    // the bulk data and DICOM video cases where the second ArrayBuffer is
+    // the bulk data. Here we play it safe and do a find.
+    const ret = val instanceof Array && val.find(arrayBuffer => arrayBuffer?.byteLength) || undefined;
+    value.Value = ret;
+    return ret;
+  });
+}
+
 ;// CONCATENATED MODULE: ../../../extensions/default/src/DicomJSONDataSource/index.js
 
 
@@ -2854,8 +2885,8 @@ function ViewerHeader({
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.9.0-beta.76";
-  const commitHash = "ab6e341731652a4fa894fcb576eb23dc95aefa11";
+  const versionNumber = "3.9.0-beta.78";
+  const commitHash = "7599ec9421129dcade94e6fa6ec7908424ab3134";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',
@@ -4188,14 +4219,6 @@ function getPanelModule({
   }];
 }
 /* harmony default export */ const src_getPanelModule = (getPanelModule);
-// EXTERNAL MODULE: ../../core/src/utils/isImage.js
-var isImage = __webpack_require__(74440);
-// EXTERNAL MODULE: ../../core/src/utils/sopClassDictionary.js
-var sopClassDictionary = __webpack_require__(66050);
-// EXTERNAL MODULE: ../../core/src/classes/ImageSet.ts
-var ImageSet = __webpack_require__(15337);
-// EXTERNAL MODULE: ../../core/src/utils/isDisplaySetReconstructable.js
-var isDisplaySetReconstructable = __webpack_require__(74824);
 ;// CONCATENATED MODULE: ../../../extensions/default/package.json
 const package_namespaceObject = JSON.parse('{"u2":"@ohif/extension-default"}');
 ;// CONCATENATED MODULE: ../../../extensions/default/src/id.js
@@ -4204,6 +4227,8 @@ const id = package_namespaceObject.u2;
 
 // EXTERNAL MODULE: ../../core/src/utils/sortInstancesByPosition.ts
 var sortInstancesByPosition = __webpack_require__(87134);
+// EXTERNAL MODULE: ../../core/src/utils/isDisplaySetReconstructable.js
+var isDisplaySetReconstructable = __webpack_require__(74824);
 ;// CONCATENATED MODULE: ../../../extensions/default/src/utils/validations/checkMultiframe.ts
 
 
@@ -4487,6 +4512,8 @@ function getDisplaySetMessages(instances, isReconstructable, isDynamicVolume) {
   }
   return messages;
 }
+// EXTERNAL MODULE: ../../core/src/classes/ImageSet.ts
+var ImageSet = __webpack_require__(15337);
 ;// CONCATENATED MODULE: ../../../extensions/default/src/getDisplaySetsFromUnsupportedSeries.js
 
 
@@ -4603,9 +4630,14 @@ const chartHandler = {
 
 
 
-
-
-
+const {
+  isImage,
+  sopClassDictionary,
+  isDisplaySetReconstructable: getSopClassHandlerModule_isDisplaySetReconstructable
+} = src.utils;
+const {
+  ImageSet: getSopClassHandlerModule_ImageSet
+} = src.classes;
 const DEFAULT_VOLUME_LOADER_SCHEME = 'cornerstoneStreamingImageVolume';
 const DYNAMIC_VOLUME_LOADER_SCHEME = 'cornerstoneStreamingDynamicImageVolume';
 const sopClassHandlerName = 'stack';
@@ -4646,9 +4678,9 @@ function getDisplaySetInfo(instances) {
     // O(n) to convert it into a map and O(1) to find each instance
     instances.forEach(instance => instancesMap.set(instance.imageId, instance));
     const firstTimePointInstances = timePoint.map(imageId => instancesMap.get(imageId));
-    displaySetInfo = (0,isDisplaySetReconstructable/* default */.ZP)(firstTimePointInstances, appConfig);
+    displaySetInfo = getSopClassHandlerModule_isDisplaySetReconstructable(firstTimePointInstances, appConfig);
   } else {
-    displaySetInfo = (0,isDisplaySetReconstructable/* default */.ZP)(instances, appConfig);
+    displaySetInfo = getSopClassHandlerModule_isDisplaySetReconstructable(instances, appConfig);
   }
   return {
     isDynamicVolume,
@@ -4658,7 +4690,7 @@ function getDisplaySetInfo(instances) {
 }
 const makeDisplaySet = instances => {
   const instance = instances[0];
-  const imageSet = new ImageSet/* default */.Z(instances);
+  const imageSet = new getSopClassHandlerModule_ImageSet(instances);
   const {
     isDynamicVolume,
     value: isReconstructable,
@@ -4753,7 +4785,7 @@ function getDisplaySetsFromSeries(instances) {
   const stackableInstances = [];
   instances.forEach(instance => {
     // All imaging modalities must have a valid value for sopClassUid (x00080016) or rows (x00280010)
-    if (!(0,isImage/* isImage */.O)(instance.SOPClassUID) && !instance.Rows) {
+    if (!isImage(instance.SOPClassUID) && !instance.Rows) {
       return;
     }
     let displaySet;
@@ -4761,7 +4793,6 @@ function getDisplaySetsFromSeries(instances) {
       displaySet = makeDisplaySet([instance]);
       displaySet.setAttributes({
         sopClassUids,
-        isClip: true,
         numImageFrames: instance.NumberOfFrames,
         instanceNumber: instance.InstanceNumber,
         acquisitionDatetime: instance.AcquisitionDateTime
@@ -4789,7 +4820,10 @@ function getDisplaySetsFromSeries(instances) {
   }
   return displaySets;
 }
-const getSopClassHandlerModule_sopClassUids = [sopClassDictionary/* default */.Z.ComputedRadiographyImageStorage, sopClassDictionary/* default */.Z.DigitalXRayImageStorageForPresentation, sopClassDictionary/* default */.Z.DigitalXRayImageStorageForProcessing, sopClassDictionary/* default */.Z.DigitalMammographyXRayImageStorageForPresentation, sopClassDictionary/* default */.Z.DigitalMammographyXRayImageStorageForProcessing, sopClassDictionary/* default */.Z.DigitalIntraOralXRayImageStorageForPresentation, sopClassDictionary/* default */.Z.DigitalIntraOralXRayImageStorageForProcessing, sopClassDictionary/* default */.Z.CTImageStorage, sopClassDictionary/* default */.Z.EnhancedCTImageStorage, sopClassDictionary/* default */.Z.LegacyConvertedEnhancedCTImageStorage, sopClassDictionary/* default */.Z.UltrasoundMultiframeImageStorage, sopClassDictionary/* default */.Z.MRImageStorage, sopClassDictionary/* default */.Z.EnhancedMRImageStorage, sopClassDictionary/* default */.Z.EnhancedMRColorImageStorage, sopClassDictionary/* default */.Z.LegacyConvertedEnhancedMRImageStorage, sopClassDictionary/* default */.Z.UltrasoundImageStorage, sopClassDictionary/* default */.Z.UltrasoundImageStorageRET, sopClassDictionary/* default */.Z.SecondaryCaptureImageStorage, sopClassDictionary/* default */.Z.MultiframeSingleBitSecondaryCaptureImageStorage, sopClassDictionary/* default */.Z.MultiframeGrayscaleByteSecondaryCaptureImageStorage, sopClassDictionary/* default */.Z.MultiframeGrayscaleWordSecondaryCaptureImageStorage, sopClassDictionary/* default */.Z.MultiframeTrueColorSecondaryCaptureImageStorage, sopClassDictionary/* default */.Z.XRayAngiographicImageStorage, sopClassDictionary/* default */.Z.EnhancedXAImageStorage, sopClassDictionary/* default */.Z.XRayRadiofluoroscopicImageStorage, sopClassDictionary/* default */.Z.EnhancedXRFImageStorage, sopClassDictionary/* default */.Z.XRay3DAngiographicImageStorage, sopClassDictionary/* default */.Z.XRay3DCraniofacialImageStorage, sopClassDictionary/* default */.Z.BreastTomosynthesisImageStorage, sopClassDictionary/* default */.Z.BreastProjectionXRayImageStorageForPresentation, sopClassDictionary/* default */.Z.BreastProjectionXRayImageStorageForProcessing, sopClassDictionary/* default */.Z.IntravascularOpticalCoherenceTomographyImageStorageForPresentation, sopClassDictionary/* default */.Z.IntravascularOpticalCoherenceTomographyImageStorageForProcessing, sopClassDictionary/* default */.Z.NuclearMedicineImageStorage, sopClassDictionary/* default */.Z.VLEndoscopicImageStorage, sopClassDictionary/* default */.Z.VideoEndoscopicImageStorage, sopClassDictionary/* default */.Z.VLMicroscopicImageStorage, sopClassDictionary/* default */.Z.VideoMicroscopicImageStorage, sopClassDictionary/* default */.Z.VLSlideCoordinatesMicroscopicImageStorage, sopClassDictionary/* default */.Z.VLPhotographicImageStorage, sopClassDictionary/* default */.Z.VideoPhotographicImageStorage, sopClassDictionary/* default */.Z.OphthalmicPhotography8BitImageStorage, sopClassDictionary/* default */.Z.OphthalmicPhotography16BitImageStorage, sopClassDictionary/* default */.Z.OphthalmicTomographyImageStorage, sopClassDictionary/* default */.Z.VLWholeSlideMicroscopyImageStorage, sopClassDictionary/* default */.Z.PositronEmissionTomographyImageStorage, sopClassDictionary/* default */.Z.EnhancedPETImageStorage, sopClassDictionary/* default */.Z.LegacyConvertedEnhancedPETImageStorage, sopClassDictionary/* default */.Z.RTImageStorage, sopClassDictionary/* default */.Z.EnhancedUSVolumeStorage];
+const getSopClassHandlerModule_sopClassUids = [sopClassDictionary.ComputedRadiographyImageStorage, sopClassDictionary.DigitalXRayImageStorageForPresentation, sopClassDictionary.DigitalXRayImageStorageForProcessing, sopClassDictionary.DigitalMammographyXRayImageStorageForPresentation, sopClassDictionary.DigitalMammographyXRayImageStorageForProcessing, sopClassDictionary.DigitalIntraOralXRayImageStorageForPresentation, sopClassDictionary.DigitalIntraOralXRayImageStorageForProcessing, sopClassDictionary.CTImageStorage, sopClassDictionary.EnhancedCTImageStorage, sopClassDictionary.LegacyConvertedEnhancedCTImageStorage, sopClassDictionary.UltrasoundMultiframeImageStorage, sopClassDictionary.MRImageStorage, sopClassDictionary.EnhancedMRImageStorage, sopClassDictionary.EnhancedMRColorImageStorage, sopClassDictionary.LegacyConvertedEnhancedMRImageStorage, sopClassDictionary.UltrasoundImageStorage, sopClassDictionary.UltrasoundImageStorageRET, sopClassDictionary.SecondaryCaptureImageStorage, sopClassDictionary.MultiframeSingleBitSecondaryCaptureImageStorage, sopClassDictionary.MultiframeGrayscaleByteSecondaryCaptureImageStorage, sopClassDictionary.MultiframeGrayscaleWordSecondaryCaptureImageStorage, sopClassDictionary.MultiframeTrueColorSecondaryCaptureImageStorage, sopClassDictionary.XRayAngiographicImageStorage, sopClassDictionary.EnhancedXAImageStorage, sopClassDictionary.XRayRadiofluoroscopicImageStorage, sopClassDictionary.EnhancedXRFImageStorage, sopClassDictionary.XRay3DAngiographicImageStorage, sopClassDictionary.XRay3DCraniofacialImageStorage, sopClassDictionary.BreastTomosynthesisImageStorage, sopClassDictionary.BreastProjectionXRayImageStorageForPresentation, sopClassDictionary.BreastProjectionXRayImageStorageForProcessing, sopClassDictionary.IntravascularOpticalCoherenceTomographyImageStorageForPresentation, sopClassDictionary.IntravascularOpticalCoherenceTomographyImageStorageForProcessing, sopClassDictionary.NuclearMedicineImageStorage, sopClassDictionary.VLEndoscopicImageStorage, sopClassDictionary.VideoEndoscopicImageStorage, sopClassDictionary.VLMicroscopicImageStorage, sopClassDictionary.VideoMicroscopicImageStorage, sopClassDictionary.VLSlideCoordinatesMicroscopicImageStorage, sopClassDictionary.VLPhotographicImageStorage, sopClassDictionary.VideoPhotographicImageStorage, sopClassDictionary.OphthalmicPhotography8BitImageStorage, sopClassDictionary.OphthalmicPhotography16BitImageStorage, sopClassDictionary.OphthalmicTomographyImageStorage,
+// Handled by another sop class module
+// sopClassDictionary.VLWholeSlideMicroscopyImageStorage,
+sopClassDictionary.PositronEmissionTomographyImageStorage, sopClassDictionary.EnhancedPETImageStorage, sopClassDictionary.LegacyConvertedEnhancedPETImageStorage, sopClassDictionary.RTImageStorage, sopClassDictionary.EnhancedUSVolumeStorage];
 function getSopClassHandlerModule(appContextParam) {
   appContext = appContextParam;
   return [{
@@ -8814,9 +8848,78 @@ const handlePETImageMetadata = ({
     console.log(error);
   }
 };
+;// CONCATENATED MODULE: ../../../extensions/default/src/DicomWebDataSource/utils/cleanDenaturalizedDataset.ts
+
+function isPrimitive(v) {
+  return !(typeof v == 'object' || Array.isArray(v));
+}
+const vrNumerics = new Set(['DS', 'FL', 'FD', 'IS', 'OD', 'OF', 'OL', 'OV', 'SL', 'SS', 'SV', 'UL', 'US', 'UV']);
+
+/**
+ * Specialized for DICOM JSON format dataset cleaning.
+ * @param obj
+ * @returns
+ */
+function cleanDenaturalizedDataset(obj, options) {
+  if (Array.isArray(obj)) {
+    const newAry = obj.map(o => isPrimitive(o) ? o : cleanDenaturalizedDataset(o, options));
+    return newAry;
+  }
+  if (isPrimitive(obj)) {
+    return obj;
+  }
+  Object.keys(obj).forEach(key => {
+    if (obj[key].Value === null && obj[key].vr) {
+      delete obj[key].Value;
+    } else if (Array.isArray(obj[key].Value) && obj[key].vr) {
+      if (obj[key].Value.length === 1 && obj[key].Value[0].BulkDataURI) {
+        if (options?.dataSourceConfig) {
+          // Not needed unless data source is directly used for loading data.
+          fixBulkDataURI(obj[key].Value[0], options, options.dataSourceConfig);
+        }
+        obj[key].BulkDataURI = obj[key].Value[0].BulkDataURI;
+
+        // prevent mixed-content blockage
+        if (window.location.protocol === 'https:' && obj[key].BulkDataURI.startsWith('http:')) {
+          obj[key].BulkDataURI = obj[key].BulkDataURI.replace('http:', 'https:');
+        }
+        delete obj[key].Value;
+      } else if (vrNumerics.has(obj[key].vr)) {
+        obj[key].Value = obj[key].Value.map(v => +v);
+      } else {
+        obj[key].Value = obj[key].Value.map(entry => cleanDenaturalizedDataset(entry, options));
+      }
+    }
+  });
+  return obj;
+}
+
+/**
+ * This is required to make the denaturalized data transferrable when it has
+ * added proxy values.
+ */
+function transferDenaturalizedDataset(dataset) {
+  const noNull = cleanDenaturalizedDataset(dataset);
+  return JSON.parse(JSON.stringify(noNull));
+}
+;// CONCATENATED MODULE: ../../../extensions/default/src/DicomWebDataSource/utils/fixMultiValueKeys.ts
+/**
+ * Fix multi-valued keys so that those which are strings split by
+ * a backslash are returned as arrays.
+ */
+function fixMultiValueKeys(naturalData, keys = ['ImageType']) {
+  for (const key of keys) {
+    if (typeof naturalData[key] === 'string') {
+      naturalData[key] = naturalData[key].split('\\');
+    }
+  }
+  return naturalData;
+}
 ;// CONCATENATED MODULE: ../../../extensions/default/src/DicomWebDataSource/utils/index.ts
 
 
+
+
 ;// CONCATENATED MODULE: ../../../extensions/default/src/index.ts
 
 
@@ -8835,6 +8938,7 @@ const handlePETImageMetadata = ({
 
 
 
+
 const defaultExtension = {
   /**
    * Only required property. Should be a unique value across all extensions.

package/dist/{6591.bundle.ace15b11ac7df3edf1bb.js → 6591.bundle.92a28f98c3f45ac3b3f1.js}

@@ -23,9 +23,12 @@ const SOPClassHandlerId = `${id}.sopClassHandlerModule.dicom-video`;
 
 // EXTERNAL MODULE: ../../core/src/index.ts + 74 modules
 var src = __webpack_require__(84793);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 1 modules
+var esm = __webpack_require__(12651);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-video/src/getSopClassHandlerModule.js
 
 
+
 const SOP_CLASS_UIDS = {
   VIDEO_MICROSCOPIC_IMAGE_STORAGE: '1.2.840.10008.5.1.4.1.1.77.1.2.1',
   VIDEO_PHOTOGRAPHIC_IMAGE_STORAGE: '1.2.840.10008.5.1.4.1.1.77.1.4.1',
@@ -64,7 +67,8 @@ const _getDisplaySetsFromSeries = (instances, servicesManager, extensionManager)
     const {
       Modality,
       SOPInstanceUID,
-      SeriesDescription = 'VIDEO'
+      SeriesDescription = 'VIDEO',
+      imageId
     } = instance;
     const {
       SeriesNumber,
@@ -93,7 +97,10 @@ const _getDisplaySetsFromSeries = (instances, servicesManager, extensionManager)
       SOPClassHandlerId: SOPClassHandlerId,
       referencedImages: null,
       measurements: null,
+      viewportType: esm.Enums.ViewportType.VIDEO,
+      // The videoUrl is deprecated, the preferred URL is renderedUrl
       videoUrl,
+      renderedUrl: videoUrl,
       instances: [instance],
       thumbnailSrc: dataSource.retrieve.directURL({
         instance,
@@ -101,12 +108,19 @@ const _getDisplaySetsFromSeries = (instances, servicesManager, extensionManager)
         defaultType: 'image/jpeg',
         tag: 'Absent'
       }),
+      imageIds: [imageId],
       isDerivedDisplaySet: true,
       isLoaded: false,
       sopClassUids,
       numImageFrames: NumberOfFrames,
       instance
     };
+    esm.utilities.genericMetadataProvider.add(imageId, {
+      type: 'imageUrlModule',
+      metadata: {
+        rendered: videoUrl
+      }
+    });
     return displaySet;
   });
 };

package/dist/{7502.bundle.abf1ade64f101ba01596.js → 7502.bundle.550aee57ecd221eab7c1.js}

@@ -273,7 +273,9 @@ function modeFactory({
             rightPanels: ['@ohif/extension-dicom-microscopy.panelModule.measure'],
             viewports: [{
               namespace: '@ohif/extension-dicom-microscopy.viewportModule.microscopy-dicom',
-              displaySetsToDisplay: ['@ohif/extension-dicom-microscopy.sopClassHandlerModule.DicomMicroscopySopClassHandler', '@ohif/extension-dicom-microscopy.sopClassHandlerModule.DicomMicroscopySRSopClassHandler']
+              displaySetsToDisplay: [
+              // Share the sop class handler with cornerstone version of it
+              '@ohif/extension-cornerstone.sopClassHandlerModule.DicomMicroscopySopClassHandler', '@ohif/extension-dicom-microscopy.sopClassHandlerModule.DicomMicroscopySRSopClassHandler']
             }, {
               namespace: dicomvideo.viewport,
               displaySetsToDisplay: [dicomvideo.sopClassHandler]
@@ -287,11 +289,7 @@ function modeFactory({
     }],
     extensions: extensionDependencies,
     hangingProtocol: ['default'],
-    // Order is important in sop class handlers when two handlers both use
-    // the same sop class under different situations.  In that case, the more
-    // general handler needs to come last.  For this case, the dicomvideo must
-    // come first to remove video transfer syntax before ohif uses images
-    sopClassHandlers: ['@ohif/extension-dicom-microscopy.sopClassHandlerModule.DicomMicroscopySopClassHandler', '@ohif/extension-dicom-microscopy.sopClassHandlerModule.DicomMicroscopySRSopClassHandler', dicomvideo.sopClassHandler, dicompdf.sopClassHandler],
+    sopClassHandlers: ['@ohif/extension-cornerstone.sopClassHandlerModule.DicomMicroscopySopClassHandler', '@ohif/extension-dicom-microscopy.sopClassHandlerModule.DicomMicroscopySRSopClassHandler', dicomvideo.sopClassHandler, dicompdf.sopClassHandler],
     hotkeys: [...src/* hotkeys */.dD.defaults.hotkeyBindings],
     ...modeConfiguration
   };

package/dist/{3424.bundle.1b6101d721148c04242b.js → 79.bundle.b03daeeef3e6faf9dca3.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[3424,4757],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[79,4757],{
 
-/***/ 3094:
+/***/ 30365:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -19,6 +19,8 @@ var prop_types = __webpack_require__(3827);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 // EXTERNAL MODULE: ../../ui/src/index.js + 784 modules
 var src = __webpack_require__(38604);
+// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 95 modules
+var default_src = __webpack_require__(10655);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/DicomMicroscopyViewport.css
 // extracted by mini-css-extract-plugin
 
@@ -253,8 +255,6 @@ const itemGenerator = props => {
 /* harmony default export */ const ViewportOverlay = (generateFromConfig({}));
 // EXTERNAL MODULE: ../../core/src/index.ts + 74 modules
 var core_src = __webpack_require__(84793);
-// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 93 modules
-var default_src = __webpack_require__(32281);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/utils/dicomWebClient.ts
 
 
@@ -328,48 +328,6 @@ function getDicomWebClient({
 }
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
 var dcmjs_es = __webpack_require__(67540);
-;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/utils/cleanDenaturalizedDataset.ts
-
-function isPrimitive(v) {
-  return !(typeof v == 'object' || Array.isArray(v));
-}
-const vrNumerics = ['DS', 'FL', 'FD', 'IS', 'OD', 'OF', 'OL', 'OV', 'SL', 'SS', 'SV', 'UL', 'US', 'UV'];
-
-/**
- * Specialized for DICOM JSON format dataset cleaning.
- * @param obj
- * @returns
- */
-function cleanDenaturalizedDataset(obj, options) {
-  if (Array.isArray(obj)) {
-    const newAry = obj.map(o => isPrimitive(o) ? o : cleanDenaturalizedDataset(o, options));
-    return newAry;
-  } else if (isPrimitive(obj)) {
-    return obj;
-  } else {
-    Object.keys(obj).forEach(key => {
-      if (obj[key].Value === null && obj[key].vr) {
-        delete obj[key].Value;
-      } else if (Array.isArray(obj[key].Value) && obj[key].vr) {
-        if (obj[key].Value.length === 1 && obj[key].Value[0].BulkDataURI) {
-          default_src.dicomWebUtils.fixBulkDataURI(obj[key].Value[0], options, options.dataSourceConfig);
-          obj[key].BulkDataURI = obj[key].Value[0].BulkDataURI;
-
-          // prevent mixed-content blockage
-          if (window.location.protocol === 'https:' && obj[key].BulkDataURI.startsWith('http:')) {
-            obj[key].BulkDataURI = obj[key].BulkDataURI.replace('http:', 'https:');
-          }
-          delete obj[key].Value;
-        } else if (vrNumerics.includes(obj[key].vr)) {
-          obj[key].Value = obj[key].Value.map(v => +v);
-        } else {
-          obj[key].Value = obj[key].Value.map(entry => cleanDenaturalizedDataset(entry, options));
-        }
-      }
-    });
-    return obj;
-  }
-}
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/DicomMicroscopyViewport.tsx
 
 
@@ -495,7 +453,7 @@ class DicomMicroscopyViewport extends react.Component {
         // NOTE: depending on different data source, image.ImageType sometimes
         //    is a string, not a string array.
         m.ImageType = typeof m.ImageType === 'string' ? m.ImageType.split('\\') : m.ImageType;
-        const inst = cleanDenaturalizedDataset(dcmjs_es["default"].data.DicomMetaDictionary.denaturalizeDataset(m), {
+        const inst = (0,default_src.cleanDenaturalizedDataset)(dcmjs_es["default"].data.DicomMetaDictionary.denaturalizeDataset(m), {
           StudyInstanceUID: m.StudyInstanceUID,
           SeriesInstanceUID: m.SeriesInstanceUID,
           dataSourceConfig: this.props.dataSource.getConfig()