@ohif/app 3.8.0-beta.8 → 3.8.0-beta.80

package/dist/{886.bundle.c8dd3ecc42a4253de278.js → 530.bundle.7c94543955552475c56a.js}

@@ -1,22 +1,22 @@
 "use strict";
-(self["webpackChunk"] = self["webpackChunk"] || []).push([[886],{
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[530],{
 
-/***/ 48886:
+/***/ 58530:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3827);
+/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(11374);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(43001);
-/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(69190);
-/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(71771);
-/* harmony import */ var _tools_modules_dicomSRModule__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(64035);
-/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(22582);
-/* harmony import */ var _utils_hydrateStructuredReport__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(38965);
-/* harmony import */ var _state__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(62657);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(41766);
+/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(80619);
+/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(55411);
+/* harmony import */ var _tools_modules_dicomSRModule__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(74334);
+/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(5085);
+/* harmony import */ var _utils_hydrateStructuredReport__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(77089);
+/* harmony import */ var _state__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(15575);
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 
@@ -26,9 +26,6 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 
-const {
-  formatDate
-} = _ohif_core__WEBPACK_IMPORTED_MODULE_3__.utils;
 const MEASUREMENT_TRACKING_EXTENSION_ID = '@ohif/extension-measurement-tracking';
 const SR_TOOLGROUP_BASE_NAME = 'SRToolGroup';
 function OHIFCornerstoneSRViewport(props) {
@@ -36,16 +33,16 @@ function OHIFCornerstoneSRViewport(props) {
     children,
     dataSource,
     displaySets,
-    viewportLabel,
     viewportOptions,
     servicesManager,
     extensionManager
   } = props;
-  const [appConfig] = (0,_state__WEBPACK_IMPORTED_MODULE_7__/* .useAppConfig */ .M)();
+  const [appConfig] = (0,_state__WEBPACK_IMPORTED_MODULE_7__/* .useAppConfig */ .r)();
   const {
     displaySetService,
     cornerstoneViewportService,
-    measurementService
+    measurementService,
+    viewportActionCornersService
   } = servicesManager.services;
   const viewportId = viewportOptions.viewportId;
 
@@ -54,7 +51,7 @@ function OHIFCornerstoneSRViewport(props) {
     throw new Error('SR viewport should only have a single display set');
   }
   const srDisplaySet = displaySets[0];
-  const [viewportGrid, viewportGridService] = (0,_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .useViewportGrid */ .O_)();
+  const [viewportGrid, viewportGridService] = (0,_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .useViewportGrid */ .ih)();
   const [measurementSelected, setMeasurementSelected] = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(0);
   const [measurementCount, setMeasurementCount] = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(1);
   const [activeImageDisplaySetData, setActiveImageDisplaySetData] = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null);
@@ -64,6 +61,9 @@ function OHIFCornerstoneSRViewport(props) {
     viewports,
     activeViewportId
   } = viewportGrid;
+  const {
+    t
+  } = (0,react_i18next__WEBPACK_IMPORTED_MODULE_2__/* .useTranslation */ .Bd)('Common');
 
   // Optional hook into tracking extension, if present.
   let trackedMeasurements;
@@ -78,14 +78,13 @@ function OHIFCornerstoneSRViewport(props) {
   if (!sendTrackedMeasurementsEvent) {
     // if no panels from measurement-tracking extension is used, this code will run
     trackedMeasurements = null;
-    sendTrackedMeasurementsEvent = (eventName, _ref) => {
-      let {
-        displaySetInstanceUID
-      } = _ref;
+    sendTrackedMeasurementsEvent = (eventName, {
+      displaySetInstanceUID
+    }) => {
       measurementService.clearMeasurements();
       const {
         SeriesInstanceUIDs
-      } = (0,_utils_hydrateStructuredReport__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)({
+      } = (0,_utils_hydrateStructuredReport__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .A)({
         servicesManager,
         extensionManager,
         appConfig
@@ -109,7 +108,7 @@ function OHIFCornerstoneSRViewport(props) {
     const {
       measurements
     } = srDisplaySet;
-    (0,_tools_modules_dicomSRModule__WEBPACK_IMPORTED_MODULE_4__/* .setTrackingUniqueIdentifiersForElement */ .l2)(element, measurements.map(measurement => measurement.TrackingUniqueIdentifier), measurementSelected);
+    (0,_tools_modules_dicomSRModule__WEBPACK_IMPORTED_MODULE_4__/* .setTrackingUniqueIdentifiersForElement */ .m1)(element, measurements.map(measurement => measurement.TrackingUniqueIdentifier), measurementSelected);
   }, [element, measurementSelected, srDisplaySet]);
 
   /**
@@ -135,11 +134,15 @@ function OHIFCornerstoneSRViewport(props) {
       // not throwing an error?
       console.warn('More than one SOPClassUID in the same series is not yet supported.');
     }
-    _getViewportReferencedDisplaySetData(srDisplaySet, newMeasurementSelected, displaySetService).then(_ref2 => {
-      let {
-        referencedDisplaySet,
-        referencedDisplaySetMetadata
-      } = _ref2;
+
+    // if (!srDisplaySet.measurements || !srDisplaySet.measurements.length) {
+    //   return;
+    // }
+
+    _getViewportReferencedDisplaySetData(srDisplaySet, newMeasurementSelected, displaySetService).then(({
+      referencedDisplaySet,
+      referencedDisplaySetMetadata
+    }) => {
       setMeasurementSelected(newMeasurementSelected);
       setActiveImageDisplaySetData(referencedDisplaySet);
       setReferencedDisplaySetMetadata(referencedDisplaySetMetadata);
@@ -202,16 +205,11 @@ function OHIFCornerstoneSRViewport(props) {
   }, [activeImageDisplaySetData, viewportId, measurementSelected]);
   const onMeasurementChange = (0,react__WEBPACK_IMPORTED_MODULE_1__.useCallback)(direction => {
     let newMeasurementSelected = measurementSelected;
-    if (direction === 'right') {
-      newMeasurementSelected++;
-      if (newMeasurementSelected >= measurementCount) {
-        newMeasurementSelected = 0;
-      }
-    } else {
-      newMeasurementSelected--;
-      if (newMeasurementSelected < 0) {
-        newMeasurementSelected = measurementCount - 1;
-      }
+    newMeasurementSelected += direction;
+    if (newMeasurementSelected >= measurementCount) {
+      newMeasurementSelected = 0;
+    } else if (newMeasurementSelected < 0) {
+      newMeasurementSelected = measurementCount - 1;
     }
     setTrackingIdentifiers(newMeasurementSelected);
     updateViewport(newMeasurementSelected);
@@ -221,10 +219,9 @@ function OHIFCornerstoneSRViewport(props) {
    Cleanup the SR viewport when the viewport is destroyed
    */
   (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(() => {
-    const onDisplaySetsRemovedSubscription = displaySetService.subscribe(displaySetService.EVENTS.DISPLAY_SETS_REMOVED, _ref3 => {
-      let {
-        displaySetInstanceUIDs
-      } = _ref3;
+    const onDisplaySetsRemovedSubscription = displaySetService.subscribe(displaySetService.EVENTS.DISPLAY_SETS_REMOVED, ({
+      displaySetInstanceUIDs
+    }) => {
       const activeViewport = viewports.get(activeViewportId);
       if (displaySetInstanceUIDs.includes(activeViewport.displaySetInstanceUID)) {
         viewportGridService.setDisplaySetsForViewport({
@@ -246,12 +243,16 @@ function OHIFCornerstoneSRViewport(props) {
    * if it is hydrated we don't even use the SR viewport.
    */
   (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(() => {
-    if (!srDisplaySet.isLoaded) {
-      srDisplaySet.load();
-    }
-    const numMeasurements = srDisplaySet.measurements.length;
-    setMeasurementCount(numMeasurements);
-  }, [srDisplaySet]);
+    const loadSR = async () => {
+      if (!srDisplaySet.isLoaded) {
+        await srDisplaySet.load();
+      }
+      const numMeasurements = srDisplaySet.measurements.length;
+      setMeasurementCount(numMeasurements);
+      updateViewport(measurementSelected);
+    };
+    loadSR();
+  }, [dataSource, srDisplaySet]);
 
   /**
    * Hook to update the tracking identifiers when the selected measurement changes or
@@ -268,18 +269,36 @@ function OHIFCornerstoneSRViewport(props) {
    * Todo: what is this, not sure what it does regarding the react aspect,
    * it is updating a local variable? which is not state.
    */
-  let isLocked = trackedMeasurements?.context?.trackedSeries?.length > 0;
+  const [isLocked, setIsLocked] = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(trackedMeasurements?.context?.trackedSeries?.length > 0);
   (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(() => {
-    isLocked = trackedMeasurements?.context?.trackedSeries?.length > 0;
+    setIsLocked(trackedMeasurements?.context?.trackedSeries?.length > 0);
   }, [trackedMeasurements]);
-
-  /**
-   * Data fetching for the SR displaySet, which updates the measurements and
-   * also gets the referenced image displaySet that SR is based on.
-   */
   (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(() => {
-    updateViewport(measurementSelected);
-  }, [dataSource, srDisplaySet]);
+    viewportActionCornersService.setComponents([{
+      viewportId,
+      id: 'viewportStatusComponent',
+      component: _getStatusComponent({
+        srDisplaySet,
+        viewportId,
+        isRehydratable: srDisplaySet.isRehydratable,
+        isLocked,
+        sendTrackedMeasurementsEvent,
+        t
+      }),
+      indexPriority: -100,
+      location: viewportActionCornersService.LOCATIONS.topLeft
+    }, {
+      viewportId,
+      id: 'viewportActionArrowsComponent',
+      index: 0,
+      component: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .ViewportActionArrows */ .$I, {
+        key: "actionArrows",
+        onArrowsClick: onMeasurementChange
+      }),
+      indexPriority: 0,
+      location: viewportActionCornersService.LOCATIONS.topRight
+    }]);
+  }, [isLocked, onMeasurementChange, sendTrackedMeasurementsEvent, srDisplaySet, t, viewportActionCornersService, viewportId]);
 
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   let childrenWithProps = null;
@@ -294,51 +313,7 @@ function OHIFCornerstoneSRViewport(props) {
       });
     });
   }
-  const {
-    PatientID,
-    PatientName,
-    PatientSex,
-    PatientAge,
-    SliceThickness,
-    ManufacturerModelName,
-    StudyDate,
-    SeriesDescription,
-    SpacingBetweenSlices,
-    SeriesNumber
-  } = referencedDisplaySetMetadata;
-
-  // TODO -> disabled double click for now: onDoubleClick={_onDoubleClick}
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(react__WEBPACK_IMPORTED_MODULE_1__.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .ViewportActionBar */ .uY, {
-    onDoubleClick: evt => {
-      evt.stopPropagation();
-      evt.preventDefault();
-    },
-    onArrowsClick: onMeasurementChange,
-    getStatusComponent: () => _getStatusComponent({
-      srDisplaySet,
-      viewportId,
-      isTracked: false,
-      isRehydratable: srDisplaySet.isRehydratable,
-      isLocked,
-      sendTrackedMeasurementsEvent
-    }),
-    studyData: {
-      label: viewportLabel,
-      useAltStyling: true,
-      studyDate: formatDate(StudyDate),
-      currentSeries: SeriesNumber,
-      seriesDescription: SeriesDescription || '',
-      patientInformation: {
-        patientName: PatientName ? _ohif_core__WEBPACK_IMPORTED_MODULE_3__["default"].utils.formatPN(PatientName.Alphabetic) : '',
-        patientSex: PatientSex || '',
-        patientAge: PatientAge || '',
-        MRN: PatientID || '',
-        thickness: SliceThickness ? `${parseFloat(SliceThickness).toFixed(2)}mm` : '',
-        spacing: SpacingBetweenSlices !== undefined ? `${SpacingBetweenSlices.toFixed(2)}mm` : '',
-        scanner: ManufacturerModelName || ''
-      }
-    }
-  }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement("div", {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(react__WEBPACK_IMPORTED_MODULE_1__.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement("div", {
     className: "relative flex h-full w-full flex-row overflow-hidden"
   }, getCornerstoneViewport(), childrenWithProps));
 }
@@ -350,21 +325,20 @@ OHIFCornerstoneSRViewport.propTypes = {
   viewportLabel: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().string),
   customProps: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().object),
   viewportOptions: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().object),
-  viewportLabel: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().string),
-  servicesManager: prop_types__WEBPACK_IMPORTED_MODULE_0___default().instanceOf(_ohif_core__WEBPACK_IMPORTED_MODULE_3__/* .ServicesManager */ .Xw).isRequired,
-  extensionManager: prop_types__WEBPACK_IMPORTED_MODULE_0___default().instanceOf(_ohif_core__WEBPACK_IMPORTED_MODULE_3__/* .ExtensionManager */ .W$).isRequired
+  servicesManager: prop_types__WEBPACK_IMPORTED_MODULE_0___default().instanceOf(_ohif_core__WEBPACK_IMPORTED_MODULE_3__/* .ServicesManager */ .CS).isRequired,
+  extensionManager: prop_types__WEBPACK_IMPORTED_MODULE_0___default().instanceOf(_ohif_core__WEBPACK_IMPORTED_MODULE_3__/* .ExtensionManager */ .nH).isRequired
 };
 OHIFCornerstoneSRViewport.defaultProps = {
   customProps: {}
 };
 async function _getViewportReferencedDisplaySetData(displaySet, measurementSelected, displaySetService) {
-  const {
-    measurements
-  } = displaySet;
-  const measurement = measurements[measurementSelected];
-  const {
-    displaySetInstanceUID
-  } = measurement;
+  if (!displaySet.keyImageDisplaySet) {
+    // Create a new display set, and preserve a reference to it here,
+    // so that it can be re-displayed and shown inside the SR viewport.
+    // This is only for ease of redisplay - the display set is stored in the
+    // usual manner in the display set service.
+    displaySet.keyImageDisplaySet = createReferencedImageDisplaySet(displaySetService, displaySet);
+  }
   const referencedDisplaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
   const image0 = referencedDisplaySet.images[0];
   const referencedDisplaySetMetadata = {
@@ -385,23 +359,20 @@ async function _getViewportReferencedDisplaySetData(displaySet, measurementSelec
     referencedDisplaySet
   };
 }
-function _getStatusComponent(_ref4) {
-  let {
-    srDisplaySet,
-    viewportId,
-    isRehydratable,
-    isLocked,
-    sendTrackedMeasurementsEvent
-  } = _ref4;
+function _getStatusComponent({
+  srDisplaySet,
+  viewportId,
+  isRehydratable,
+  isLocked,
+  sendTrackedMeasurementsEvent,
+  t
+}) {
   const handleMouseUp = () => {
     sendTrackedMeasurementsEvent('HYDRATE_SR', {
       displaySetInstanceUID: srDisplaySet.displaySetInstanceUID,
       viewportId
     });
   };
-  const {
-    t
-  } = (0,react_i18next__WEBPACK_IMPORTED_MODULE_2__/* .useTranslation */ .$G)('Common');
   const loadStr = t('LOAD');
 
   // 1 - Incompatible
@@ -412,19 +383,19 @@ function _getStatusComponent(_ref4) {
   let StatusIcon = null;
   switch (state) {
     case 1:
-      StatusIcon = () => /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .Icon */ .JO, {
+      StatusIcon = () => /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .Icon */ .In, {
         name: "status-alert"
       });
       ToolTipMessage = () => /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement("div", null, "This structured report is not compatible", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement("br", null), "with this application.");
       break;
     case 2:
-      StatusIcon = () => /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .Icon */ .JO, {
+      StatusIcon = () => /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .Icon */ .In, {
         name: "status-locked"
       });
       ToolTipMessage = () => /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement("div", null, "This structured report is currently read-only", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement("br", null), "because you are tracking measurements in", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement("br", null), "another viewport.");
       break;
     case 3:
-      StatusIcon = () => /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .Icon */ .JO, {
+      StatusIcon = () => /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .Icon */ .In, {
         className: "text-aqua-pale",
         name: "status-untracked"
       });
@@ -442,7 +413,7 @@ function _getStatusComponent(_ref4) {
     ,
     onMouseUp: handleMouseUp
   }, loadStr));
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(react__WEBPACK_IMPORTED_MODULE_1__.Fragment, null, ToolTipMessage && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .Tooltip */ .u, {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(react__WEBPACK_IMPORTED_MODULE_1__.Fragment, null, ToolTipMessage && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(_ohif_ui__WEBPACK_IMPORTED_MODULE_5__/* .Tooltip */ .m_, {
     content: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(ToolTipMessage, null),
     position: "bottom-left"
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(StatusArea, null)), !ToolTipMessage && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.createElement(StatusArea, null));