@ohif/app 3.8.0-beta.85 → 3.8.0-beta.87

package/dist/{206.bundle.f944f8146169a6867103.js → 206.bundle.096c1d86defe1cf7e9ae.js}

@@ -2750,8 +2750,8 @@ function ViewerHeader({
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.8.0-beta.85";
-  const commitHash = "1a013909a19b0f679c354b6f84bf55daa61fbe60";
+  const versionNumber = "3.8.0-beta.87";
+  const commitHash = "8192e348eca993fec331d4963efe88f9a730eceb";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',
@@ -3117,7 +3117,8 @@ function PanelStudyBrowser({
   } = (0,ui_src/* useImageViewer */.Bz)();
   const [{
     activeViewportId,
-    viewports
+    viewports,
+    isHangingProtocolLayout
   }, viewportGridService] = (0,ui_src/* useViewportGrid */.ih)();
   const [activeTabName, setActiveTabName] = (0,react.useState)('primary');
   const [expandedStudyInstanceUIDs, setExpandedStudyInstanceUIDs] = (0,react.useState)([...StudyInstanceUIDs]);
@@ -3128,7 +3129,7 @@ function PanelStudyBrowser({
     let updatedViewports = [];
     const viewportId = activeViewportId;
     try {
-      updatedViewports = hangingProtocolService.getViewportsRequireUpdate(viewportId, displaySetInstanceUID);
+      updatedViewports = hangingProtocolService.getViewportsRequireUpdate(viewportId, displaySetInstanceUID, isHangingProtocolLayout);
     } catch (error) {
       console.warn(error);
       uiNotificationService.show({
@@ -4560,6 +4561,9 @@ function getDisplaySetInfo(instances) {
     timePoints
   } = dynamicVolumeInfo;
   let displaySetInfo;
+  const {
+    appConfig
+  } = appContext;
   if (isDynamicVolume) {
     const timePoint = timePoints[0];
     const instancesMap = new Map();
@@ -4567,9 +4571,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 */.Ay)(firstTimePointInstances);
+    displaySetInfo = (0,isDisplaySetReconstructable/* default */.Ay)(firstTimePointInstances, appConfig);
   } else {
-    displaySetInfo = (0,isDisplaySetReconstructable/* default */.Ay)(instances);
+    displaySetInfo = (0,isDisplaySetReconstructable/* default */.Ay)(instances, appConfig);
   }
   return {
     isDynamicVolume,
@@ -4786,6 +4790,9 @@ const generateAdvancedPresets = ({
     return [];
   }
   const displaySetInsaneUIDs = viewportGridService.getDisplaySetsUIDsForViewport(viewportId);
+  if (!displaySetInsaneUIDs) {
+    return [];
+  }
   const displaySets = displaySetInsaneUIDs.map(uid => displaySetService.getDisplaySetByUID(uid));
   return hangingProtocols.map(hp => {
     if (!hp.isPreset) {
@@ -5371,8 +5378,8 @@ function adaptItem(item, subProps) {
 }
 // EXTERNAL MODULE: ../../ui/src/components/ContextMenu/ContextMenu.tsx
 var ContextMenu = __webpack_require__(59852);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 18 modules
-var dist_esm = __webpack_require__(24542);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js
+var dist_esm = __webpack_require__(39371);
 ;// CONCATENATED MODULE: ../../../extensions/default/src/CustomizableContextMenu/ContextMenuController.tsx
 var _ContextMenuController;
 
@@ -6178,7 +6185,7 @@ const reuseCachedLayout = (state, hangingProtocolService, syncService) => {
  *                  This class uses the options to store the already viewed
  *                  display sets, filling it initially with the pre-existing viewports.
  */
-const findViewportsByPosition_findOrCreateViewport = (hangingProtocolService, viewportsByPosition, position, positionId, options) => {
+const findViewportsByPosition_findOrCreateViewport = (hangingProtocolService, isHangingProtocolLayout, viewportsByPosition, position, positionId, options) => {
   const byPositionViewport = viewportsByPosition?.[positionId];
   if (byPositionViewport) {
     return {
@@ -6194,8 +6201,9 @@ const findViewportsByPosition_findOrCreateViewport = (hangingProtocolService, vi
   if (!options.inDisplay) {
     options.inDisplay = [...viewportsByPosition.initialInDisplay];
   }
-  // See if there is a default viewport for new views.
-  const missing = hangingProtocolService.getMissingViewport(protocolId, stageIndex, options);
+
+  // See if there is a default viewport for new views
+  const missing = hangingProtocolService.getMissingViewport(isHangingProtocolLayout ? protocolId : 'default', stageIndex, options);
   if (missing) {
     const displaySetInstanceUIDs = missing.displaySetsInfo.map(it => it.displaySetInstanceUID);
     options.inDisplay.push(...displaySetInstanceUIDs);
@@ -6534,7 +6542,7 @@ const commandsModule = ({
           numRows,
           numCols
         }, stateSyncService);
-        const findOrCreateViewport = findViewportsByPosition_findOrCreateViewport.bind(null, hangingProtocolService, stateReduce.viewportsByPosition);
+        const findOrCreateViewport = findViewportsByPosition_findOrCreateViewport.bind(null, hangingProtocolService, isHangingProtocolLayout, stateReduce.viewportsByPosition);
         viewportGridService.setLayout({
           numRows,
           numCols,
@@ -6551,7 +6559,8 @@ const commandsModule = ({
       const {
         activeViewportId,
         viewports,
-        layout
+        layout,
+        isHangingProtocolLayout
       } = viewportGridState;
       const {
         displaySetInstanceUIDs,
@@ -6575,7 +6584,7 @@ const commandsModule = ({
         // updatedViewportsViaHP below contains the viewports applicable to the HP that existed
         // prior to the toggle to one-up - including the updated viewports if a display
         // set swap were to have occurred.
-        const updatedViewportsViaHP = displaySetInstanceUIDs.length > 1 ? [] : displaySetInstanceUIDs.map(displaySetInstanceUID => hangingProtocolService.getViewportsRequireUpdate(viewportIdToUpdate, displaySetInstanceUID)).flat();
+        const updatedViewportsViaHP = displaySetInstanceUIDs.length > 1 ? [] : displaySetInstanceUIDs.map(displaySetInstanceUID => hangingProtocolService.getViewportsRequireUpdate(viewportIdToUpdate, displaySetInstanceUID, isHangingProtocolLayout)).flat();
 
         // findOrCreateViewport returns either one of the updatedViewportsViaHP
         // returned from the HP service OR if there is not one from the HP service then
@@ -6742,7 +6751,8 @@ const commandsModule = ({
       currentDisplaySets.sort(dsSortFn);
       const {
         activeViewportId,
-        viewports
+        viewports,
+        isHangingProtocolLayout
       } = viewportGridService.getState();
       const {
         displaySetInstanceUIDs
@@ -6762,7 +6772,7 @@ const commandsModule = ({
       } = currentDisplaySets[displaySetIndexToShow];
       let updatedViewports = [];
       try {
-        updatedViewports = hangingProtocolService.getViewportsRequireUpdate(activeViewportId, displaySetInstanceUID);
+        updatedViewports = hangingProtocolService.getViewportsRequireUpdate(activeViewportId, displaySetInstanceUID, isHangingProtocolLayout);
       } catch (error) {
         console.warn(error);
         uiNotificationService.show({