@ohif/app 3.9.1 → 3.9.3

package/dist/{app.bundle.d02143bec2df7fec9964.js → app.bundle.9af5a6d7ff3a778d05b7.js}

@@ -934,7 +934,7 @@ class BaseVolumeViewport extends _Viewport__WEBPACK_IMPORTED_MODULE_18__/* ["def
         sliceIndex ??= currentIndex;
         const { viewPlaneNormal, focalPoint } = this.getCamera();
         const querySeparator = volumeId.includes('?') ? '&' : '?';
-        return `volumeId:${volumeId}${querySeparator}sliceIndex=${sliceIndex}&viewPlaneNormal=${viewPlaneNormal.join(',')}&focalPoint=${focalPoint.join(',')}`;
+        return `volumeId:${volumeId}${querySeparator}sliceIndex=${sliceIndex}&viewPlaneNormal=${viewPlaneNormal.join(',')}`;
     }
     _addVolumeId(volumeId) {
         this.volumeIds.add(volumeId);
@@ -16844,6 +16844,12 @@ var cache = __webpack_require__(49038);
 
 
 
+function convertDataType(data, targetDataType) {
+    const Constructor = (0,getBufferConfiguration/* getConstructorFromType */.j)(targetDataType);
+    const convertedData = new Constructor(data.length);
+    convertedData.set(data);
+    return convertedData;
+}
 function vtkStreamingOpenGLTexture(publicAPI, model) {
     model.classHierarchy.push('vtkStreamingOpenGLTexture');
     model.updatedFrames = [];
@@ -16894,10 +16900,14 @@ function vtkStreamingOpenGLTexture(publicAPI, model) {
                 if (!image) {
                     continue;
                 }
-                const data = image.voxelManager.getScalarData();
+                let data = image.voxelManager.getScalarData();
                 const gl = model.context;
-                const dataType = data.constructor.name;
-                const [pixData] = publicAPI.updateArrayDataTypeForGL(dataType, [data]);
+                if (volume.dataType !== data.constructor.name) {
+                    data = convertDataType(data, volume.dataType);
+                }
+                const [pixData] = publicAPI.updateArrayDataTypeForGL(volume.dataType, [
+                    data,
+                ]);
                 publicAPI.bind();
                 const zOffset = i;
                 gl.texSubImage3D(model.target, 0, 0, 0, zOffset, model.width, model.height, 1, model.format, model.openGLDataType, pixData);
@@ -16931,8 +16941,12 @@ function vtkStreamingOpenGLTexture(publicAPI, model) {
                 constructor = data.constructor;
             }
             const gl = model.context;
-            const dataType = data.constructor.name;
-            const [pixData] = publicAPI.updateArrayDataTypeForGL(dataType, [data]);
+            if (volume.dataType !== data.constructor.name) {
+                data = convertDataType(data, volume.dataType);
+            }
+            const [pixData] = publicAPI.updateArrayDataTypeForGL(volume.dataType, [
+                data,
+            ]);
             publicAPI.bind();
             let zOffset = i;
             gl.texSubImage3D(model.target, 0, 0, 0, zOffset, model.width, model.height, 1, model.format, model.openGLDataType, pixData);
@@ -25049,12 +25063,20 @@ const deepMerge = (target = {}, source = {}, optionsArgument = undefined) => {
 /* harmony import */ var _getScalingParameters__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(32173);
 /* harmony import */ var _hasFloatScalingParameters__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(30169);
 /* harmony import */ var _init__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(59693);
+/* harmony import */ var _cache_cache__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(49038);
+
 
 
 
 
 
 
+const constructorToTypedArray = {
+    Uint8Array: 'Uint8Array',
+    Int16Array: 'Int16Array',
+    Uint16Array: 'Uint16Array',
+    Float32Array: 'Float32Array',
+};
 function generateVolumePropsFromImageIds(imageIds, volumeId) {
     const volumeMetadata = (0,_makeVolumeMetadata__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A)(imageIds);
     const { ImageOrientationPatient, PixelSpacing, Columns, Rows } = volumeMetadata;
@@ -25087,6 +25109,10 @@ function generateVolumePropsFromImageIds(imageIds, volumeId) {
 function _determineDataType(imageIds, volumeMetadata) {
     const { BitsAllocated, PixelRepresentation } = volumeMetadata;
     const signed = PixelRepresentation === 1;
+    const cachedDataType = _getDataTypeFromCache(imageIds);
+    if (cachedDataType) {
+        return cachedDataType;
+    }
     const [firstIndex, middleIndex, lastIndex] = [
         0,
         Math.floor(imageIds.length / 2),
@@ -25121,6 +25147,19 @@ function _determineDataType(imageIds, volumeMetadata) {
             throw new Error(`Bits allocated of ${BitsAllocated} is not defined to generate scalarData for the volume.`);
     }
 }
+function _getDataTypeFromCache(imageIds) {
+    const indices = [0, Math.floor(imageIds.length / 2), imageIds.length - 1];
+    const images = indices.map((i) => _cache_cache__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Ay.getImage(imageIds[i]));
+    if (!images.every(Boolean)) {
+        return null;
+    }
+    const constructorName = images[0].getPixelData().constructor.name;
+    if (images.every((img) => img.getPixelData().constructor.name === constructorName) &&
+        constructorName in constructorToTypedArray) {
+        return constructorToTypedArray[constructorName];
+    }
+    return null;
+}
 
 
 
@@ -25768,6 +25807,15 @@ const imageRetrieveMetadataProvider = {
     add: (key, payload) => {
         retrieveConfigurationState.set(key, payload);
     },
+    clone: () => {
+        return new Map(retrieveConfigurationState);
+    },
+    restore: (state) => {
+        retrieveConfigurationState.clear();
+        state.forEach((value, key) => {
+            retrieveConfigurationState.set(key, value);
+        });
+    },
     get: (type, ...queries) => {
         if (type === IMAGE_RETRIEVE_CONFIGURATION) {
             return queries
@@ -26693,7 +26741,10 @@ function calculateViewportsSpatialRegistration(viewport1, viewport2) {
 
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/utilities/getViewportImageCornersInWorld.js
 function getViewportImageCornersInWorld(viewport) {
-    const { imageData, dimensions } = viewport.getImageData();
+    const { imageData, dimensions } = viewport.getImageData() || {};
+    if (!imageData || !dimensions) {
+        return [];
+    }
     const { canvas } = viewport;
     const ratio = window.devicePixelRatio;
     const topLeftCanvas = [0, 0];
@@ -30108,6 +30159,10 @@ function getPixelDataTypeFromMinMax(min, max) {
     }
     return pixelDataType || Float32Array;
 }
+function validatePixelDataType(min, max, type) {
+    const pixelDataType = getPixelDataTypeFromMinMax(min, max);
+    return pixelDataType === type;
+}
 
 ;// CONCATENATED MODULE: ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/esm/imageLoader/convertColorSpace.js
 
@@ -31760,7 +31815,7 @@ const workerFn = () => {
     const instance = new Worker(new URL(/* worker import */ __webpack_require__.p + __webpack_require__.u(1927), __webpack_require__.b), { type: undefined });
     return instance;
 };
-function init(options) {
+function init(options = {}) {
     setOptions(options);
     imageLoader_registerLoaders();
     const workerManager = (0,esm.getWebWorkerManager)();
@@ -66971,7 +67026,7 @@ function vtkOpenGLTexture(publicAPI, model) {
     }
     return result;
   };
-  publicAPI.useHalfFloat = () => model.enableHalfFloat && model.canUseHalfFloat;
+  publicAPI.useHalfFloat = () => model.enableUseHalfFloat && model.canUseHalfFloat;
 
   //----------------------------------------------------------------------------
   publicAPI.setInternalFormat = iFormat => {
@@ -67605,18 +67660,21 @@ function vtkOpenGLTexture(publicAPI, model) {
   }
   function setCanUseHalfFloat(dataType, offset, scale, preferSizeOverAccuracy) {
     publicAPI.getOpenGLDataType(dataType);
+
+    // Don't consider halfFloat and convert back to Float when the range of data does not generate an accurate halfFloat
+    // AND it is not preferable to have a smaller texture than an exact texture.
+    const isExactHalfFloat = hasExactHalfFloat(offset, scale) || preferSizeOverAccuracy;
     let useHalfFloat = false;
     if (model._openGLRenderWindow.getWebgl2()) {
-      useHalfFloat = model.openGLDataType === model.context.HALF_FLOAT;
+      // If OES_texture_float_linear is not available, and using a half float would still be exact, force half floats
+      // This is because half floats are always texture filterable in webgl2, while full *32F floats are not (unless the extension is present)
+      const forceHalfFloat = model.openGLDataType === model.context.FLOAT && model.context.getExtension('OES_texture_float_linear') === null && isExactHalfFloat;
+      useHalfFloat = forceHalfFloat || model.openGLDataType === model.context.HALF_FLOAT;
     } else {
       const halfFloatExt = model.context.getExtension('OES_texture_half_float');
       useHalfFloat = halfFloatExt && model.openGLDataType === halfFloatExt.HALF_FLOAT_OES;
     }
-
-    // Don't consider halfFloat and convert back to Float when the range of data does not generate an accurate halfFloat
-    // AND it is not preferable to have a smaller texture than an exact texture.
-    const isHalfFloat = useHalfFloat && (hasExactHalfFloat(offset, scale) || preferSizeOverAccuracy);
-    model.canUseHalfFloat = isHalfFloat;
+    model.canUseHalfFloat = useHalfFloat && isExactHalfFloat;
   }
   function processDataArray(dataArray, preferSizeOverAccuracy) {
     const numComps = dataArray.getNumberOfComponents();
@@ -94944,8 +95002,8 @@ var ui_src = __webpack_require__(35647);
 var ui_next_src = __webpack_require__(35570);
 // EXTERNAL MODULE: ./state/index.js + 1 modules
 var state = __webpack_require__(45981);
-// EXTERNAL MODULE: ../../core/src/index.ts + 71 modules
-var core_src = __webpack_require__(29463);
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var core_src = __webpack_require__(80818);
 // EXTERNAL MODULE: ../node_modules/react-router/dist/index.js
 var react_router_dist = __webpack_require__(67435);
 ;// CONCATENATED MODULE: ./hooks/useSearchParams.ts
@@ -95921,8 +95979,8 @@ function WorkList({
     };
   });
   const hasStudies = numOfStudies > 0;
-  const versionNumber = "3.9.1";
-  const commitHash = "610faa5a2738da5eabc40e57e338c359f481e852";
+  const versionNumber = "3.9.3";
+  const commitHash = "5d4f2e2a8e62f8de97d56a4e3f17be6018e9f2eb";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',
@@ -96708,7 +96766,7 @@ function ViewerViewportGrid(props) {
         isActive: isActive
       }, /*#__PURE__*/react.createElement("div", {
         "data-cy": "viewport-pane",
-        className: classnames_default()('flex h-full w-full flex-col', {
+        className: classnames_default()('flex h-full w-full min-w-[5px] flex-col', {
           'pointer-events-none': !isActive && (appConfig?.activateViewportBeforeInteraction ?? true)
         })
       }, /*#__PURE__*/react.createElement(ViewportComponent, {
@@ -96797,35 +96855,35 @@ modes.push("@ohif/mode-preclinical-4d");
 async function loadModule(module) {
   if (typeof module !== 'string') return module;
   if (module === "@ohif/extension-default") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(1520), __webpack_require__.e(2591)]).then(__webpack_require__.bind(__webpack_require__, 71520));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(5630), __webpack_require__.e(4759)]).then(__webpack_require__.bind(__webpack_require__, 55630));
     return imported.default;
   }
   if (module === "@ohif/extension-cornerstone") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(4182)]).then(__webpack_require__.bind(__webpack_require__, 11185));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(3326)]).then(__webpack_require__.bind(__webpack_require__, 11185));
     return imported.default;
   }
   if (module === "@ohif/extension-measurement-tracking") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(5261), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(5687), __webpack_require__.e(3200)]).then(__webpack_require__.bind(__webpack_require__, 71903));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(5758), __webpack_require__.e(5261), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(5687), __webpack_require__.e(3200)]).then(__webpack_require__.bind(__webpack_require__, 71903));
     return imported.default;
   }
   if (module === "@ohif/extension-cornerstone-dicom-sr") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(5687), __webpack_require__.e(1801)]).then(__webpack_require__.bind(__webpack_require__, 85687));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(5758), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(5687), __webpack_require__.e(4182)]).then(__webpack_require__.bind(__webpack_require__, 85687));
     return imported.default;
   }
   if (module === "@ohif/extension-cornerstone-dicom-seg") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3970), __webpack_require__.e(1520), __webpack_require__.e(7197)]).then(__webpack_require__.bind(__webpack_require__, 96975));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(5758), __webpack_require__.e(5630), __webpack_require__.e(7197)]).then(__webpack_require__.bind(__webpack_require__, 96975));
     return imported.default;
   }
   if (module === "@ohif/extension-cornerstone-dicom-pmap") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(5139)]).then(__webpack_require__.bind(__webpack_require__, 82098));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(5758), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(5139)]).then(__webpack_require__.bind(__webpack_require__, 82098));
     return imported.default;
   }
   if (module === "@ohif/extension-cornerstone-dynamic-volume") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(717)]).then(__webpack_require__.bind(__webpack_require__, 14696));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(7013)]).then(__webpack_require__.bind(__webpack_require__, 14696));
     return imported.default;
   }
   if (module === "@ohif/extension-dicom-microscopy") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(5807), __webpack_require__.e(1520), __webpack_require__.e(5247)]).then(__webpack_require__.bind(__webpack_require__, 22801));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(2343), __webpack_require__.e(5630), __webpack_require__.e(5247)]).then(__webpack_require__.bind(__webpack_require__, 22801));
     return imported.default;
   }
   if (module === "@ohif/extension-dicom-pdf") {
@@ -96837,7 +96895,7 @@ async function loadModule(module) {
     return imported.default;
   }
   if (module === "@ohif/extension-tmtv") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(3198)]).then(__webpack_require__.bind(__webpack_require__, 57289));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(5758), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(3198)]).then(__webpack_require__.bind(__webpack_require__, 57289));
     return imported.default;
   }
   if (module === "@ohif/extension-test") {
@@ -96849,7 +96907,7 @@ async function loadModule(module) {
     return imported.default;
   }
   if (module === "@ohif/mode-longitudinal") {
-    const imported = await Promise.all(/* import() */[__webpack_require__.e(149), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(3970), __webpack_require__.e(1520), __webpack_require__.e(1185), __webpack_require__.e(5687), __webpack_require__.e(1266)]).then(__webpack_require__.bind(__webpack_require__, 35589));
+    const imported = await Promise.all(/* import() */[__webpack_require__.e(3900), __webpack_require__.e(1436), __webpack_require__.e(3334), __webpack_require__.e(5758), __webpack_require__.e(5630), __webpack_require__.e(1185), __webpack_require__.e(5687), __webpack_require__.e(1266)]).then(__webpack_require__.bind(__webpack_require__, 35589));
     return imported.default;
   }
   if (module === "@ohif/mode-segmentation") {
@@ -97351,9 +97409,9 @@ function ModeRoute({
       const hangingProtocolIdToUse = hangingProtocolService.getProtocolById(runTimeHangingProtocolId) ? runTimeHangingProtocolId : hangingProtocol;
 
       // Determine the index of the stageId if the hangingProtocolIdToUse is defined
-      const stageIndex = hangingProtocolIdToUse ? hangingProtocolService.getStageIndex(hangingProtocolIdToUse, {
+      const stageIndex = Array.isArray(hangingProtocolIdToUse) ? -1 : hangingProtocolService.getStageIndex(hangingProtocolIdToUse, {
         stageId: runTimeStageId || undefined
-      }) : -1;
+      });
       // Ensure that the stage index is never negative
       // If stageIndex is negative (e.g., if stage wasn't found), use 0 as the default
       const stageIndexToUse = Math.max(0, stageIndex);
@@ -102096,7 +102154,7 @@ function _getImageOrientationPatient(image) {
 
 /***/ }),
 
-/***/ 29463:
+/***/ 80818:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -105525,8 +105583,8 @@ class ProtocolEngine {
     return this.matchedProtocols.get(highestScoringProtocolId);
   }
 }
-// EXTERNAL MODULE: ../../core/src/utils/index.ts + 29 modules
-var utils = __webpack_require__(37415);
+// EXTERNAL MODULE: ../../core/src/utils/index.ts + 28 modules
+var utils = __webpack_require__(5971);
 ;// CONCATENATED MODULE: ../../core/src/services/HangingProtocolService/custom-attribute/isDisplaySetFromUrl.ts
 
 
@@ -107353,7 +107411,7 @@ class CustomizationService extends pubSubServiceInterface/* PubSubService */.R {
       return customization;
     }
     const parent = this.getCustomization(customizationType);
-    const result = parent ? Object.assign(Object.create(parent), customization) : customization;
+    const result = parent ? Object.assign({}, parent, customization) : customization;
     // Execute an nested type information
     return result.transform?.(this) || result;
   }
@@ -108484,7 +108542,7 @@ class StudyPrefetcherService extends pubSubServiceInterface/* PubSubService */.R
     this._displaySetLoadingStates.clear();
     this._imageIdsToDisplaySetsMap.clear();
     this._inflightRequests.clear();
-    this.imageLoadPoolManager.clearRequestStack(IMAGE_REQUEST_TYPE);
+    this.imageLoadPoolManager.clearRequestStack(this.requestType);
     this._broadcastEvent(this.EVENTS.SERVICE_STOPPED, {});
   }
 
@@ -109726,7 +109784,16 @@ function _getPaletteColor(paletteColorLookupTableData, lutDescriptor) {
 }
 // EXTERNAL MODULE: ../../core/src/utils/toNumber.js
 var toNumber = __webpack_require__(37827);
+// EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 1 modules
+var esm = __webpack_require__(3823);
+;// CONCATENATED MODULE: ../../core/src/utils/dicomSplit.ts
+function dicomSplit(value) {
+  return Array.isArray(value) && value || typeof value === 'string' && value.split('\\') || value;
+}
 ;// CONCATENATED MODULE: ../../core/src/utils/combineFrameInstance.ts
+
+
+
 /**
  * Combine the Per instance frame data, the shared frame data
  * and the root data objects.
@@ -109741,43 +109808,96 @@ const combineFrameInstance = (frame, instance) => {
   const {
     PerFrameFunctionalGroupsSequence,
     SharedFunctionalGroupsSequence,
-    NumberOfFrames
+    NumberOfFrames,
+    ImageType
   } = instance;
+  instance.ImageType = dicomSplit(ImageType);
   if (PerFrameFunctionalGroupsSequence || NumberOfFrames > 1) {
     const frameNumber = Number.parseInt(frame || 1);
-    const shared = (SharedFunctionalGroupsSequence ? Object.values(SharedFunctionalGroupsSequence[0]) : []).filter(it => !!it).map(it => it[0]).filter(it => it !== undefined && typeof it === 'object');
-    const perFrame = (PerFrameFunctionalGroupsSequence ? Object.values(PerFrameFunctionalGroupsSequence[frameNumber - 1]) : []).filter(it => !!it).map(it => it[0]).filter(it => it !== undefined && typeof it === 'object');
 
     // this is to fix NM multiframe datasets with position and orientation
     // information inside DetectorInformationSequence
     if (!instance.ImageOrientationPatient && instance.DetectorInformationSequence) {
       instance.ImageOrientationPatient = instance.DetectorInformationSequence[0].ImageOrientationPatient;
     }
+    let ImagePositionPatientToUse = instance.ImagePositionPatient;
     if (!instance.ImagePositionPatient && instance.DetectorInformationSequence) {
-      instance.ImagePositionPatient = instance.DetectorInformationSequence[0].ImagePositionPatient;
+      let imagePositionPatient = instance.DetectorInformationSequence[0].ImagePositionPatient;
+      let imageOrientationPatient = instance.ImageOrientationPatient;
+      imagePositionPatient = imagePositionPatient.map(it => Number(it));
+      imageOrientationPatient = imageOrientationPatient.map(it => Number(it));
+      const SpacingBetweenSlices = Number(instance.SpacingBetweenSlices);
+
+      // Calculate the position for the current frame
+      if (imageOrientationPatient && SpacingBetweenSlices) {
+        const rowOrientation = esm/* vec3.fromValues */.eR.fromValues(imageOrientationPatient[0], imageOrientationPatient[1], imageOrientationPatient[2]);
+        const colOrientation = esm/* vec3.fromValues */.eR.fromValues(imageOrientationPatient[3], imageOrientationPatient[4], imageOrientationPatient[5]);
+        const normalVector = esm/* vec3.cross */.eR.cross(esm/* vec3.create */.eR.create(), rowOrientation, colOrientation);
+        const position = esm/* vec3.scaleAndAdd */.eR.scaleAndAdd(esm/* vec3.create */.eR.create(), imagePositionPatient, normalVector, SpacingBetweenSlices * (frameNumber - 1));
+        ImagePositionPatientToUse = [position[0], position[1], position[2]];
+      }
     }
-    const newInstance = Object.assign(instance, {
-      frameNumber: frameNumber
-    });
 
-    // merge the shared first then the per frame to override
-    [...shared, ...perFrame].forEach(item => {
-      Object.entries(item).forEach(([key, value]) => {
-        newInstance[key] = value;
+    // Cache the _parentInstance at the top level as a full copy to prevent
+    // setting values hard.
+    if (!instance._parentInstance) {
+      Object.defineProperty(instance, '_parentInstance', {
+        value: {
+          ...instance
+        }
       });
+    }
+    const sharedInstance = createCombinedValue(instance._parentInstance, SharedFunctionalGroupsSequence?.[0], '_shared');
+    const newInstance = createCombinedValue(sharedInstance, PerFrameFunctionalGroupsSequence?.[frameNumber - 1], frameNumber);
+    newInstance.ImagePositionPatient = ImagePositionPatientToUse ?? newInstance.ImagePositionPatient ?? [0, 0, frameNumber];
+    Object.defineProperty(newInstance, 'frameNumber', {
+      value: frameNumber,
+      writable: true,
+      enumerable: true,
+      configurable: true
     });
-
-    // Todo: we should cache this combined instance somewhere, maybe add it
-    // back to the dicomMetaStore so we don't have to do this again.
-    return {
-      ...newInstance,
-      ImagePositionPatient: newInstance.ImagePositionPatient ?? [0, 0, frameNumber]
-    };
+    return newInstance;
   } else {
     return instance;
   }
 };
+
+/**
+ * Creates a combined instance stored in the parent object which
+ * inherits from the parent instance the attributes in the functional groups.
+ * The storage key in the parent is in key
+ */
+function createCombinedValue(parent, functionalGroups, key) {
+  if (parent[key]) {
+    return parent[key];
+  }
+  // Exclude any proxying values
+  const newInstance = Object.create(parent);
+  Object.defineProperty(parent, key, {
+    value: newInstance,
+    writable: false,
+    enumerable: false
+  });
+  if (!functionalGroups) {
+    return newInstance;
+  }
+  const shared = functionalGroups ? Object.values(functionalGroups).filter(Boolean).map(it => it[0]).filter(it => typeof it === 'object') : [];
+
+  // merge the shared first then the per frame to override
+  [...shared].forEach(item => {
+    if (item.SOPInstanceUID) {
+      // This sub-item is a previous value information item, so don't merge it
+      return;
+    }
+    Object.entries(item).forEach(([key, value]) => {
+      newInstance[key] = value;
+    });
+  });
+  return newInstance;
+}
 /* harmony default export */ const utils_combineFrameInstance = (combineFrameInstance);
+// EXTERNAL MODULE: ../../core/src/utils/formatPN.js
+var formatPN = __webpack_require__(27766);
 ;// CONCATENATED MODULE: ../../core/src/classes/MetadataProvider.ts
 
 
@@ -109787,23 +109907,25 @@ const combineFrameInstance = (frame, instance) => {
 
 
 
+
 class MetadataProvider {
   constructor() {
-    this.studies = new Map();
     this.imageURIToUIDs = new Map();
-    this.imageUIDsByImageId = new Map();
     // Can be used to store custom metadata for a specific type.
     // For instance, the scaling metadata for PET can be stored here
     // as type "scalingModule"
     this.customMetadata = new Map();
   }
   addImageIdToUIDs(imageId, uids) {
+    if (!imageId) {
+      throw new Error('MetadataProvider::Empty imageId');
+    }
+
     // This method is a fallback for when you don't have WADO-URI or WADO-RS.
     // You can add instances fetched by any method by calling addInstance, and hook an imageId to point at it here.
     // An example would be dicom hosted at some random site.
     const imageURI = (0,utils/* imageIdToURI */.YF)(imageId);
     this.imageURIToUIDs.set(imageURI, uids);
-    this.imageUIDsByImageId.set(imageId, uids);
   }
   addCustomMetadata(imageId, type, metadata) {
     const imageURI = (0,utils/* imageIdToURI */.YF)(imageId);
@@ -109813,6 +109935,9 @@ class MetadataProvider {
     this.customMetadata.get(type)[imageURI] = metadata;
   }
   _getInstance(imageId) {
+    if (!imageId) {
+      throw new Error('MetadataProvider::Empty imageId');
+    }
     const uids = this.getUIDsFromImageID(imageId);
     if (!uids) {
       return;
@@ -110079,7 +110204,7 @@ class MetadataProvider {
         } = instance;
         let patientName;
         if (PatientName) {
-          patientName = PatientName.Alphabetic;
+          patientName = (0,formatPN/* default */.A)(PatientName);
         }
         metadata = {
           patientName,
@@ -110184,21 +110309,6 @@ class MetadataProvider {
     return;
   }
   getUIDsFromImageID(imageId) {
-    if (!imageId) {
-      throw new Error('MetadataProvider::Empty imageId');
-    }
-    // TODO: adding csiv here is not really correct. Probably need to use
-    // metadataProvider.addImageIdToUIDs(imageId, {
-    //   StudyInstanceUID,
-    //   SeriesInstanceUID,
-    //   SOPInstanceUID,
-    // })
-    // somewhere else
-
-    const cachedUIDs = this.imageUIDsByImageId.get(imageId);
-    if (cachedUIDs) {
-      return cachedUIDs;
-    }
     if (imageId.startsWith('wadors:')) {
       const strippedImageId = imageId.split('/studies/')[1];
       const splitImageId = strippedImageId.split('/');
@@ -110946,7 +111056,7 @@ function useToolbar({
 
   // Effect to handle active viewportId change event
   (0,react.useEffect)(() => {
-    const events = [viewportGridService.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED, viewportGridService.EVENTS.VIEWPORTS_READY];
+    const events = [viewportGridService.EVENTS.ACTIVE_VIEWPORT_ID_CHANGED, viewportGridService.EVENTS.VIEWPORTS_READY, viewportGridService.EVENTS.LAYOUT_CHANGED];
     const subscriptions = events.map(event => {
       return viewportGridService.subscribe(event, ({
         viewportId
@@ -111653,6 +111763,38 @@ class PubSubService {
 
 /***/ }),
 
+/***/ 27766:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   A: () => (/* binding */ formatPN)
+/* harmony export */ });
+/**
+ * Formats a patient name for display purposes
+ */
+function formatPN(name) {
+  if (!name) {
+    return;
+  }
+  let nameToUse = name.Alphabetic ?? name;
+  if (typeof nameToUse === 'object') {
+    nameToUse = '';
+  }
+
+  // Convert the first ^ to a ', '. String.replace() only affects
+  // the first appearance of the character.
+  const commaBetweenFirstAndLast = nameToUse.replace('^', ', ');
+
+  // Replace any remaining '^' characters with spaces
+  const cleaned = commaBetweenFirstAndLast.replace(/\^/g, ' ');
+
+  // Trim any extraneous whitespace
+  return cleaned.trim();
+}
+
+/***/ }),
+
 /***/ 27054:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
@@ -111675,7 +111817,7 @@ const guid = () => {
 
 /***/ }),
 
-/***/ 37415:
+/***/ 5971:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -112295,29 +112437,8 @@ var i18next = __webpack_require__(40680);
 function formatTime(time, format = 'HH:mm:ss') {
   return moment_default()(time, 'HH:mm:ss').format(format);
 }
-;// CONCATENATED MODULE: ../../core/src/utils/formatPN.js
-/**
- * Formats a patient name for display purposes
- */
-function formatPN(name) {
-  if (!name) {
-    return;
-  }
-  let nameToUse = name.Alphabetic ?? name;
-  if (typeof nameToUse === 'object') {
-    nameToUse = '';
-  }
-
-  // Convert the first ^ to a ', '. String.replace() only affects
-  // the first appearance of the character.
-  const commaBetweenFirstAndLast = nameToUse.replace('^', ', ');
-
-  // Replace any remaining '^' characters with spaces
-  const cleaned = commaBetweenFirstAndLast.replace(/\^/g, ' ');
-
-  // Trim any extraneous whitespace
-  return cleaned.trim();
-}
+// EXTERNAL MODULE: ../../core/src/utils/formatPN.js
+var formatPN = __webpack_require__(27766);
 ;// CONCATENATED MODULE: ../../core/src/utils/generateAcceptHeader.ts
 const generateAcceptHeader = (configAcceptHeader = [], requestTransferSyntaxUID = '*',
 //default to accept all transfer syntax
@@ -113097,6 +113218,7 @@ function roundNumber(value, precision = 2) {
 var DicomMetadataStore = __webpack_require__(60140);
 ;// CONCATENATED MODULE: ../../core/src/utils/downloadCSVReport.js
 
+
 function downloadCSVReport(measurementData) {
   if (measurementData.length === 0) {
     // Prevent download of report with no measurements.
@@ -113173,7 +113295,7 @@ function _getCommonRowItems(measurement, seriesMetadata) {
   return {
     'Patient ID': firstInstance.PatientID,
     // Patient ID
-    'Patient Name': firstInstance.PatientName?.Alphabetic || '',
+    'Patient Name': (0,formatPN/* default */.A)(firstInstance.PatientName) || '',
     // Patient Name
     StudyInstanceUID: measurement.referenceStudyUID,
     // StudyInstanceUID
@@ -113425,7 +113547,7 @@ const utils = {
   writeScript: writeScript,
   formatDate: formatDate,
   formatTime: formatTime,
-  formatPN: formatPN,
+  formatPN: formatPN/* default */.A,
   b64toBlob: utils_b64toBlob,
   urlUtil: utils_urlUtil,
   imageIdToURI: imageIdToURI,
@@ -115012,7 +115134,7 @@ const detectionOptions = {
   }
 });
 ;// CONCATENATED MODULE: ../../i18n/package.json
-const package_namespaceObject = {"rE":"3.9.0"};
+const package_namespaceObject = {"rE":"3.9.2"};
 ;// CONCATENATED MODULE: ../../i18n/src/utils.js
 const languagesMap = {
   ar: 'Arabic',
@@ -239571,13 +239693,6 @@ SidePanel.propTypes = {
   side: prop_types_default().oneOf(['left', 'right']).isRequired,
   className: (prop_types_default()).string,
   activeTabIndex: (prop_types_default()).number,
-  tabs: prop_types_default().oneOfType([prop_types_default().arrayOf(prop_types_default().shape({
-    iconName: (prop_types_default()).string.isRequired,
-    iconLabel: (prop_types_default()).string.isRequired,
-    name: (prop_types_default()).string.isRequired,
-    label: (prop_types_default()).string.isRequired,
-    content: (prop_types_default()).func // TODO: Should be node, but it keeps complaining?
-  }))]),
   onOpen: (prop_types_default()).func,
   onClose: (prop_types_default()).func,
   onActiveTabIndexChange: (prop_types_default()).func,
@@ -241700,8 +241815,8 @@ function ToolboxUI(props) {
   }, render())) : render());
 }
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 71 modules
-var core_src = __webpack_require__(29463);
+// EXTERNAL MODULE: ../../core/src/index.ts + 72 modules
+var core_src = __webpack_require__(80818);
 ;// CONCATENATED MODULE: ../../ui-next/src/components/Toolbox/Toolbox.tsx
 function Toolbox_extends() { return Toolbox_extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, Toolbox_extends.apply(null, arguments); }
 
@@ -242197,9 +242312,7 @@ const DataRow = ({
     return /*#__PURE__*/react.createElement("div", {
       key: cleanText,
       className: "whitespace-pre-wrap"
-    }, indentation, cleanText.includes(':') ? /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("span", {
-      className: "font-medium"
-    }, cleanText.split(':')[0], ":"), cleanText.split(':')[1]) : /*#__PURE__*/react.createElement("span", {
+    }, indentation, /*#__PURE__*/react.createElement("span", {
       className: "font-medium"
     }, cleanText));
   };
@@ -242307,11 +242420,13 @@ const DataRow = ({
     className: "text-foreground"
   }), /*#__PURE__*/react.createElement("span", {
     className: "pl-2"
-  }, isLocked ? 'Unlock' : 'Lock')))))), details && details.primary?.length > 0 && /*#__PURE__*/react.createElement("div", {
+  }, isLocked ? 'Unlock' : 'Lock')))))), details && (details.primary?.length > 0 || details.secondary?.length > 0) && /*#__PURE__*/react.createElement("div", {
     className: "ml-7 px-2 py-2"
   }, /*#__PURE__*/react.createElement("div", {
-    className: "text-secondary-foreground text-base leading-normal"
-  }, renderDetails(details.primary))));
+    className: "text-secondary-foreground flex items-center gap-1 text-base leading-normal"
+  }, details.primary?.length > 0 && renderDetails(details.primary), details.secondary?.length > 0 && /*#__PURE__*/react.createElement("div", {
+    className: "text-muted-foreground ml-auto text-sm"
+  }, renderDetails(details.secondary)))));
 };
 /* harmony default export */ const DataRow_DataRow = (DataRow);
 ;// CONCATENATED MODULE: ../../ui-next/src/components/DataRow/index.ts
@@ -242497,7 +242612,7 @@ const SegmentationSegments = ({
     return null;
   }
   const segmentCount = Object.keys(representationToUse.segments).length;
-  const height = mode === 'collapsed' ? 'h-[600px]' : `h-[${segmentCount * 200}px]`;
+  const height = mode === 'collapsed' ? 'h-[900px]' : `h-[${segmentCount * 200}px]`;
   return /*#__PURE__*/react.createElement(ScrollArea_ScrollArea, {
     className: `ohif-scrollbar invisible-scrollbar bg-bkg-low space-y-px ${height}`,
     showArrows: true
@@ -243248,24 +243363,24 @@ Stack: ${error.stack}
   }, /*#__PURE__*/react.createElement(Dialog_DialogContent, {
     className: "border-input h-[50vh] w-[90vw] border-2 sm:max-w-[900px]"
   }, /*#__PURE__*/react.createElement(DialogHeader, null, /*#__PURE__*/react.createElement(Dialog_DialogTitle, {
-    className: "text-xl"
-  }, title), /*#__PURE__*/react.createElement(Dialog_DialogDescription, {
-    className: "text-lg"
-  }, subtitle)), /*#__PURE__*/react.createElement(ScrollArea_ScrollArea, {
-    className: "h-[calc(90vh-120px)]"
-  }, /*#__PURE__*/react.createElement("div", {
-    className: "space-y-4 pr-4 font-mono text-base"
+    className: "text-muted-foreground flex justify-between text-xl"
   }, /*#__PURE__*/react.createElement("div", {
-    className: "flex justify-end"
-  }, /*#__PURE__*/react.createElement("button", {
+    className: "flex items-center"
+  }, title), /*#__PURE__*/react.createElement("button", {
     onClick: () => {
       copyErrorDetails();
       setShowDetails(false);
     },
-    className: "text-aqua-pale hover:text-aqua-pale/80 flex items-center gap-2 rounded bg-gray-800 px-4 py-2"
+    className: "text-aqua-pale hover:text-aqua-pale/80 flex items-center gap-2 rounded bg-gray-800 px-4 py-2 font-light"
   }, /*#__PURE__*/react.createElement(Icons.Code, {
     className: "h-4 w-4"
-  }), t('Copy Details'))), /*#__PURE__*/react.createElement("div", {
+  }), t('Copy Details'))), /*#__PURE__*/react.createElement(Dialog_DialogDescription, {
+    className: "text-lg"
+  }, subtitle)), /*#__PURE__*/react.createElement(ScrollArea_ScrollArea, {
+    className: "h-[100%]"
+  }, /*#__PURE__*/react.createElement("div", {
+    className: "space-y-4 pr-4 font-mono text-base"
+  }, /*#__PURE__*/react.createElement("div", {
     className: "space-y-4"
   }, /*#__PURE__*/react.createElement("p", {
     className: "text-aqua-pale break-words text-lg"
@@ -252322,8 +252437,8 @@ ViewportDialogProvider.propTypes = {
 // EXTERNAL MODULE: ../../../node_modules/lodash.merge/index.js
 var lodash_merge = __webpack_require__(2816);
 var lodash_merge_default = /*#__PURE__*/__webpack_require__.n(lodash_merge);
-// 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);
 ;// CONCATENATED MODULE: ../../ui/src/utils/viewportLabels.ts
 const viewportLabels = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'];
 /* harmony default export */ const utils_viewportLabels = (viewportLabels);
@@ -265572,7 +265687,7 @@ const SidePanel_SidePanel = ({
       position: side === 'left' ? 'right' : 'left',
       key: index,
       content: getToolTipContent(childComponent.label, childComponent.disabled),
-      className: classnames_default()('flex items-center', side === 'left' ? 'justify-end ' : 'justify-start ')
+      className: classnames_default()('flex items-center', side === 'left' ? 'justify-end' : 'justify-start')
     }, /*#__PURE__*/react.createElement("div", {
       id: `${childComponent.name}-btn`,
       "data-cy": `${childComponent.name}-btn`,
@@ -265610,7 +265725,7 @@ const SidePanel_SidePanel = ({
   const getTabGridComponent = () => {
     const numCols = getNumGridColumns(tabs.length, gridWidth);
     return /*#__PURE__*/react.createElement("div", {
-      className: classnames_default()('flex grow ', side === 'right' ? 'justify-start' : 'justify-end')
+      className: classnames_default()('flex grow', side === 'right' ? 'justify-start' : 'justify-end')
     }, /*#__PURE__*/react.createElement("div", {
       className: classnames_default()('bg-primary-dark text-primary-active flex flex-wrap'),
       style: getGridStyle(side, tabs.length, gridWidth, expandedWidth)
@@ -265649,7 +265764,7 @@ const SidePanel_SidePanel = ({
   };
   const getOneTabComponent = () => {
     return /*#__PURE__*/react.createElement("div", {
-      className: classnames_default()('text-primary-active flex	 grow cursor-pointer select-none justify-center self-center text-[13px]'),
+      className: classnames_default()('text-primary-active flex grow cursor-pointer select-none justify-center self-center text-[13px]'),
       style: {
         ...(side === 'left' ? {
           marginLeft: `${closeIconWidth}px`
@@ -265663,7 +265778,7 @@ const SidePanel_SidePanel = ({
   };
   const getOpenStateComponent = () => {
     return /*#__PURE__*/react.createElement("div", {
-      className: "bg-primary-dark flex select-none rounded-t pt-1.5 pb-[2px]\t"
+      className: "bg-primary-dark flex select-none rounded-t pt-1.5 pb-[2px]"
     }, getCloseIcon(), tabs.length === 1 ? getOneTabComponent() : getTabGridComponent());
   };
   return /*#__PURE__*/react.createElement("div", {
@@ -277239,7 +277354,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
     });
@@ -421567,7 +421682,7 @@ function __disposeResources(env) {
 /******/ 		// This function allow to reference async chunks
 /******/ 		__webpack_require__.u = (chunkId) => {
 /******/ 			// return url for filenames based on template
-/******/ 			return "" + ({"572":"polySeg","3054":"histogram-worker","3584":"suv-peak-worker"}[chunkId] || chunkId) + ".bundle." + {"149":"ce5596fc563276036744","213":"e663335fb0884edde6d8","572":"b79ae514989e86301c71","717":"0f32b7b57347b5141248","1185":"023fe7179faaa50019d3","1266":"e9abd5c45b5236544151","1374":"019bbc010eeb66109e8b","1436":"773756cd51b69e887bac","1520":"97dbd9bfa83148e5334d","1801":"c552846463998fdc9ad4","1927":"49539e3ab5b0aad1399c","2424":"b7da298db43541d3a7c0","2591":"e1bbdc34a55bee082ff2","2701":"8c1ff2e0faaa7d2f4716","2825":"b04c941a87fd580deb6d","3054":"f0e060cf2637a2ca94b7","3121":"d3e7092e305cf6cecdb5","3198":"c82b7424070ffd02faf1","3200":"a12825fb5aec200d33e2","3334":"0e6ba24024018199ab66","3584":"31c3b3b957204af93b7e","3970":"31942cc0c12a008e7ba0","4182":"ec850ce1f74b1f6fe559","4202":"5c8120ed4841da0af211","4834":"aad44c2628cdefb7a4dd","5139":"367a6827071448e2923d","5247":"6dc2a50f21821b2ffdf5","5261":"74682659cce85f3ae592","5687":"5731ec23dd9eb43a083e","5807":"dac5ce36534a71c77723","6939":"9b79da82315a25f37d96","7159":"9f4856182f1eda29c59d","7197":"c28453cdb392072d8bf8","7955":"6a255705b1ef5906f4a8","8008":"5bf7b274246be10e2f05","8228":"55ac03d7165248f47d4e","8259":"623c29b26b170a8a085b","8295":"4ecb27f9e58526f12bcb","8558":"01d05fd73da5db8e60f9","9551":"6c260a9869e14dcc3543","9611":"767595c93877e5166c03","9862":"7146682e56aa66130ae6"}[chunkId] + ".js";
+/******/ 			return "" + ({"572":"polySeg","3054":"histogram-worker","3584":"suv-peak-worker"}[chunkId] || chunkId) + ".bundle." + {"213":"c0c23f7fd4b66d78d0fe","572":"6e85073e3abf2e6e6078","1185":"9f4c770baf52abcf3c6d","1266":"0097d9c4ba974905a833","1374":"2e1fa65e28731d98969a","1436":"be39664239aa2bbca527","1927":"2b2fa0b539d6ac5b0dc3","2343":"f096450c21417279d4cc","2424":"d73e8d67dc2aace299d2","2701":"c8271fa4986a45fea350","2825":"0612b1b8ab3e8ee01b93","3054":"f0e060cf2637a2ca94b7","3198":"7a18515cfe4113417251","3200":"e46dca03aa824998973a","3326":"d01046d6c2c31654c125","3334":"0e6ba24024018199ab66","3584":"e2e8e46de3e958a1a3db","3900":"0e4e29374e221b260ed1","3902":"8ae7b2e27f760af997dd","4182":"e372664fc1cc7ed6296e","4202":"497702023d73202f4f39","4438":"a945f803d0eeb11d081f","4759":"1e982897292fc19ecd7c","4834":"92ba088cc62a6b791000","5139":"70d3be7dd1896f245d7b","5247":"4e8669e41fd28813e643","5261":"74682659cce85f3ae592","5630":"44d0ca81d77b7ae5193b","5687":"50b800a714486557b243","5758":"cd1599b81bdb1f735f9d","6939":"9b79da82315a25f37d96","7013":"979d3a29f6142e8c1290","7159":"9f4856182f1eda29c59d","7197":"30f8969751309ab5235c","7955":"9264a10437f0a67e6057","8008":"6772a210a995b568f8d0","8228":"2c1e61eec1f9f4b3b613","8259":"9cf9ef151893ede068bb","8558":"9c22f000a404f1006a41","9551":"3507bb1d4353df13bf3a","9611":"9f1aa9041196d77f2b7e","9862":"aa2f8e0010f1be1bc87d"}[chunkId] + ".js";
 /******/ 		};
 /******/ 	})();
 /******/ 	
@@ -421739,7 +421854,7 @@ function __disposeResources(env) {
 /******/ 		};
 /******/ 		
 /******/ 		__webpack_require__.f.miniCss = (chunkId, promises) => {
-/******/ 			var cssChunks = {"717":1,"1266":1,"1801":1,"2591":1,"3198":1,"3200":1,"4182":1,"5139":1,"5247":1,"7159":1,"7197":1,"8228":1,"9611":1};
+/******/ 			var cssChunks = {"1266":1,"3198":1,"3200":1,"3326":1,"3902":1,"4182":1,"4438":1,"4759":1,"5139":1,"5247":1,"7013":1,"7159":1,"7197":1,"8228":1,"9611":1};
 /******/ 			if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 			else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 				promises.push(installedCssChunks[chunkId] = loadStylesheet(chunkId).then(() => {
@@ -421754,7 +421869,7 @@ function __disposeResources(env) {
 /******/ 		// no hmr
 /******/ 		
 /******/ 		__webpack_require__.F.miniCss = (chunkId) => {
-/******/ 			if((!__webpack_require__.o(installedCssChunks, chunkId) || installedCssChunks[chunkId] === undefined) && /^(3(198|200|524)|71(59|7|97)|(180|259|961)1|1266|4182|5139|5247|8228)$/.test(chunkId)) {
+/******/ 			if((!__webpack_require__.o(installedCssChunks, chunkId) || installedCssChunks[chunkId] === undefined) && /^(3(198|200|326|524|902)|4(182|438|759)|7(013|159|197)|1266|5139|5247|8228|9611)$/.test(chunkId)) {
 /******/ 				installedCssChunks[chunkId] = null;
 /******/ 				var link = document.createElement('link');
 /******/ 		
@@ -421795,7 +421910,7 @@ function __disposeResources(env) {
 /******/ 					if(installedChunkData) {
 /******/ 						promises.push(installedChunkData[2]);
 /******/ 					} else {
-/******/ 						if(!/^(1801|2591|4182)$/.test(chunkId)) {
+/******/ 						if(4182 != chunkId) {
 /******/ 							// setup Promise in chunk cache
 /******/ 							var promise = new Promise((resolve, reject) => (installedChunkData = installedChunks[chunkId] = [resolve, reject]));
 /******/ 							promises.push(installedChunkData[2] = promise);
@@ -421826,7 +421941,7 @@ function __disposeResources(env) {
 /******/ 		};
 /******/ 		
 /******/ 		__webpack_require__.F.j = (chunkId) => {
-/******/ 			if((!__webpack_require__.o(installedChunks, chunkId) || installedChunks[chunkId] === undefined) && !/^(1801|2591|4182)$/.test(chunkId)) {
+/******/ 			if((!__webpack_require__.o(installedChunks, chunkId) || installedChunks[chunkId] === undefined) && 4182 != chunkId) {
 /******/ 				installedChunks[chunkId] = null;
 /******/ 				var link = document.createElement('link');
 /******/ 		
@@ -421891,17 +422006,10 @@ function __disposeResources(env) {
 /******/ 			"213": [
 /******/ 				6939
 /******/ 			],
-/******/ 			"717": [
-/******/ 				9611
-/******/ 			],
 /******/ 			"1266": [
 /******/ 				9611,
 /******/ 				2701
 /******/ 			],
-/******/ 			"1801": [
-/******/ 				9611,
-/******/ 				2701
-/******/ 			],
 /******/ 			"2424": [
 /******/ 				7159
 /******/ 			],
@@ -421913,18 +422021,38 @@ function __disposeResources(env) {
 /******/ 				2701,
 /******/ 				9862
 /******/ 			],
+/******/ 			"3326": [
+/******/ 				9611
+/******/ 			],
+/******/ 			"3902": [
+/******/ 				9611
+/******/ 			],
 /******/ 			"4182": [
+/******/ 				9611,
+/******/ 				2701
+/******/ 			],
+/******/ 			"4438": [
 /******/ 				9611
 /******/ 			],
 /******/ 			"5139": [
 /******/ 				9611,
 /******/ 				4202
 /******/ 			],
+/******/ 			"7013": [
+/******/ 				9611
+/******/ 			],
 /******/ 			"7197": [
-/******/ 				8295
+/******/ 				3334,
+/******/ 				1185,
+/******/ 				3902
 /******/ 			],
 /******/ 			"8558": [
-/******/ 				3121
+/******/ 				3900,
+/******/ 				1436,
+/******/ 				3334,
+/******/ 				5630,
+/******/ 				1185,
+/******/ 				4438
 /******/ 			]
 /******/ 		};
 /******/ 		__webpack_require__.f.prefetch = (chunkId, promises) => (Promise.all(promises).then(() => {