@ohif/app 3.9.1 → 3.9.3

package/dist/{1520.bundle.97dbd9bfa83148e5334d.js → 5630.bundle.44d0ca81d77b7ae5193b.js}

@@ -1,7 +1,7 @@
 "use strict";
-(self["webpackChunk"] = self["webpackChunk"] || []).push([[1520],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[5630],{
 
-/***/ 71520:
+/***/ 55630:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -29,7 +29,7 @@ __webpack_require__.d(__webpack_exports__, {
   useHangingProtocolStageIndexStore: () => (/* reexport */ useHangingProtocolStageIndexStore),
   usePatientInfo: () => (/* reexport */ hooks_usePatientInfo),
   useToggleHangingProtocolStore: () => (/* reexport */ useToggleHangingProtocolStore),
-  useToggleOneUpViewportGridStore: () => (/* reexport */ useToggleOneUpViewportGridStore/* useToggleOneUpViewportGridStore */.Y),
+  useToggleOneUpViewportGridStore: () => (/* reexport */ useToggleOneUpViewportGridStore),
   useUIStateStore: () => (/* reexport */ useUIStateStore),
   useViewportGridStore: () => (/* reexport */ useViewportGridStore),
   useViewportsByPositionStore: () => (/* reexport */ useViewportsByPositionStore),
@@ -59,8 +59,8 @@ __webpack_require__.d(src_utils_namespaceObject, {
 
 // EXTERNAL MODULE: ../../../node_modules/dicomweb-client/build/dicomweb-client.es.js
 var dicomweb_client_es = __webpack_require__(83562);
-// EXTERNAL MODULE: ../../core/src/index.ts + 71 modules
-var src = __webpack_require__(29463);
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var src = __webpack_require__(80818);
 // EXTERNAL MODULE: ../../core/src/utils/sortStudy.ts
 var sortStudy = __webpack_require__(45476);
 ;// CONCATENATED MODULE: ../../../extensions/default/src/DicomWebDataSource/qido.js
@@ -1726,23 +1726,35 @@ function createDicomWebApi(dicomWebConfig, servicesManager) {
         naturalizedInstances.forEach(instance => {
           instance.wadoRoot = dicomWebConfig.wadoRoot;
           instance.wadoUri = dicomWebConfig.wadoUri;
-          const imageId = implementation.getImageIdsForInstance({
-            instance
-          });
+          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++) {
+            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
+            });
+          }
 
           // Adding imageId to each instance
           // Todo: This is not the best way I can think of to let external
           // metadata handlers know about the imageId that is stored in the store
-          instance.imageId = imageId;
-
-          // Adding UIDs to metadataProvider
-          // Note: storing imageURI in metadataProvider since stack viewports
-          // will use the same imageURI
-          metadataProvider.addImageIdToUIDs(imageId, {
-            StudyInstanceUID,
-            SeriesInstanceUID: instance.SeriesInstanceUID,
-            SOPInstanceUID: instance.SOPInstanceUID
+          const imageId = implementation.getImageIdsForInstance({
+            instance
           });
+          instance.imageId = imageId;
         });
         src/* DicomMetadataStore */.H8.addInstances(naturalizedInstances, madeInClient);
       }
@@ -1964,7 +1976,7 @@ function createDicomJSONApi(dicomJsonConfig) {
               query
             } = query_string.parseUrl(instance.url);
 
-            // Add imageId specific mapping to this data as the URL isn't necessarliy WADO-URI.
+            // Add imageId specific mapping to this data as the URL isn't necessarily WADO-URI.
             DicomJSONDataSource_metadataProvider.addImageIdToUIDs(imageId, {
               StudyInstanceUID,
               SeriesInstanceUID,
@@ -2388,9 +2400,12 @@ function createDicomLocalApi(dicomLocalConfig) {
       instance,
       frame
     }) {
-      if (instance.imageId) {
-        return instance.imageId;
-      }
+      // Important: Never use instance.imageId because it might be multiframe,
+      // which would make it an invalid imageId.
+      // if (instance.imageId) {
+      //   return instance.imageId;
+      // }
+
       const {
         StudyInstanceUID,
         SeriesInstanceUID,
@@ -2918,7 +2933,7 @@ function usePatientInfo(servicesManager) {
     }
     setPatientInfo({
       PatientID: instance.PatientID || null,
-      PatientName: instance.PatientName ? formatPN(instance.PatientName.Alphabetic) : null,
+      PatientName: instance.PatientName ? formatPN(instance.PatientName) : null,
       PatientSex: instance.PatientSex || null,
       PatientDOB: formatDate(instance.PatientBirthDate) || null
     });
@@ -3056,8 +3071,8 @@ function ViewerHeader({
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.9.1";
-  const commitHash = "610faa5a2738da5eabc40e57e338c359f481e852";
+  const versionNumber = "3.9.3";
+  const commitHash = "5d4f2e2a8e62f8de97d56a4e3f17be6018e9f2eb";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',
@@ -3859,6 +3874,7 @@ function WrappedPanelStudyBrowser({
   const _requestDisplaySetCreationForStudy = Panels_requestDisplaySetCreationForStudy.bind(null, dataSource);
   return /*#__PURE__*/react.createElement(StudyBrowser_PanelStudyBrowser, {
     servicesManager: servicesManager,
+    commandsManager: commandsManager,
     dataSource: dataSource,
     getImageSrc: _getImageSrcFromImageId,
     getStudiesForPatientByMRN: _getStudiesForPatientByMRN,
@@ -6301,7 +6317,7 @@ const reuseCachedLayout = (state, hangingProtocolService) => {
 
 
 const useViewportsByPositionStore_PRESENTATION_TYPE_ID = 'viewportsByPositionId';
-const useViewportsByPositionStore_DEBUG_STORE = true;
+const useViewportsByPositionStore_DEBUG_STORE = false;
 
 /**
  * Represents the state and actions for managing viewports by position.
@@ -6495,8 +6511,21 @@ const createToggleHangingProtocolStore = set => ({
 const useToggleHangingProtocolStore = (0,zustand_esm/* create */.vt)()(useToggleHangingProtocolStore_DEBUG_STORE ? (0,middleware/* devtools */.lt)(createToggleHangingProtocolStore, {
   name: 'ToggleHangingProtocolStore'
 }) : createToggleHangingProtocolStore);
-// EXTERNAL MODULE: ../../../extensions/default/src/stores/useToggleOneUpViewportGridStore.ts
-var useToggleOneUpViewportGridStore = __webpack_require__(73325);
+;// CONCATENATED MODULE: ../../../extensions/default/src/stores/useToggleOneUpViewportGridStore.ts
+
+const useToggleOneUpViewportGridStore_PRESENTATION_TYPE_ID = 'toggleOneUpViewportGridId';
+// Stores the entire ViewportGridService getState when toggling to one up
+// (e.g. via a double click) so that it can be restored when toggling back.
+const useToggleOneUpViewportGridStore = (0,zustand_esm/* create */.vt)(set => ({
+  toggleOneUpViewportGridStore: null,
+  type: useToggleOneUpViewportGridStore_PRESENTATION_TYPE_ID,
+  setToggleOneUpViewportGridStore: state => set({
+    toggleOneUpViewportGridStore: state
+  }),
+  clearToggleOneUpViewportGridStore: () => set({
+    toggleOneUpViewportGridStore: null
+  })
+}));
 ;// CONCATENATED MODULE: ../../../extensions/default/src/commandsModule.ts
 
 
@@ -6798,7 +6827,7 @@ const commandsModule = ({
         // The viewer is in one-up. Check if there is a state to restore/toggle back to.
         const {
           toggleOneUpViewportGridStore
-        } = useToggleOneUpViewportGridStore/* useToggleOneUpViewportGridStore */.Y.getState();
+        } = useToggleOneUpViewportGridStore.getState();
         if (!toggleOneUpViewportGridStore) {
           return;
         }
@@ -6854,7 +6883,7 @@ const commandsModule = ({
         // Store the current viewport grid state so we can toggle it back later.
         const {
           setToggleOneUpViewportGridStore
-        } = useToggleOneUpViewportGridStore/* useToggleOneUpViewportGridStore */.Y.getState();
+        } = useToggleOneUpViewportGridStore.getState();
         setToggleOneUpViewportGridStore(viewportGridState);
 
         // one being toggled to one up.
@@ -7107,7 +7136,7 @@ const hpMN = {
       // It has no affect if nothing is specified in the URL.
       {
         attribute: 'isDisplaySetFromUrl',
-        weight: 10,
+        weight: 20,
         constraint: {
           equals: true
         }
@@ -7344,7 +7373,7 @@ const defaultDisplaySetSelector = {
   // It has no affect if nothing is specified in the URL.
   {
     attribute: 'isDisplaySetFromUrl',
-    weight: 10,
+    weight: 20,
     constraint: {
       equals: true
     }
@@ -7375,7 +7404,7 @@ const priorDisplaySetSelector = {
   // It has no affect if nothing is specified in the URL.
   {
     attribute: 'isDisplaySetFromUrl',
-    weight: 10,
+    weight: 20,
     constraint: {
       equals: true
     }
@@ -7865,7 +7894,7 @@ const hpScale = {
       // It has no affect if nothing is specified in the URL.
       {
         attribute: 'isDisplaySetFromUrl',
-        weight: 10,
+        weight: 20,
         constraint: {
           equals: true
         }
@@ -8001,7 +8030,7 @@ const defaultProtocol = {
       // It has no affect if nothing is specified in the URL.
       {
         attribute: 'isDisplaySetFromUrl',
-        weight: 10,
+        weight: 20,
         constraint: {
           equals: true
         }
@@ -9620,30 +9649,6 @@ const defaultExtension = {
 /* harmony default export */ const default_src = (defaultExtension);
 
 
-/***/ }),
-
-/***/ 73325:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   Y: () => (/* binding */ useToggleOneUpViewportGridStore)
-/* harmony export */ });
-/* harmony import */ var zustand__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(95759);
-
-const PRESENTATION_TYPE_ID = 'toggleOneUpViewportGridId';
-// Stores the entire ViewportGridService getState when toggling to one up
-// (e.g. via a double click) so that it can be restored when toggling back.
-const useToggleOneUpViewportGridStore = (0,zustand__WEBPACK_IMPORTED_MODULE_0__/* .create */ .vt)(set => ({
-  toggleOneUpViewportGridStore: null,
-  type: PRESENTATION_TYPE_ID,
-  setToggleOneUpViewportGridStore: state => set({
-    toggleOneUpViewportGridStore: state
-  }),
-  clearToggleOneUpViewportGridStore: () => set({
-    toggleOneUpViewportGridStore: null
-  })
-}));
-
 /***/ })
 
 }]);

package/dist/{5687.bundle.5731ec23dd9eb43a083e.js → 5687.bundle.50b800a714486557b243.js}

@@ -73,8 +73,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
 var react = __webpack_require__(86326);
-// EXTERNAL MODULE: ../../core/src/index.ts + 71 modules
-var src = __webpack_require__(29463);
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var src = __webpack_require__(80818);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 105 modules
 var cornerstone_src = __webpack_require__(11185);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 61 modules
@@ -1987,7 +1987,7 @@ function getTrackingUniqueIdentifiersForElement(element) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29463);
+/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80818);
 
 const ImageSet = _ohif_core__WEBPACK_IMPORTED_MODULE_0__/* .classes */ .Ly.ImageSet;
 const findInstance = (measurement, displaySetService) => {
@@ -2089,8 +2089,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js
 var esm = __webpack_require__(81985);
-// EXTERNAL MODULE: ../../core/src/index.ts + 71 modules
-var src = __webpack_require__(29463);
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var src = __webpack_require__(80818);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/esm/index.js + 61 modules
 var dist_esm = __webpack_require__(33970);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/getLabelFromDCMJSImportedToolData.js