@ohif/app 3.12.0-beta.42 → 3.12.0-beta.44

package/dist/{app.bundle.3b50b89cad830a8e4bae.js → app.bundle.6ca617bac9212ec44525.js}

@@ -126016,6 +126016,9 @@ class StudyPrefetcherService extends pubSubServiceInterface/* PubSubService */.R
       return;
     }
     const activeViewport = viewports.get(activeViewportId);
+    if (!activeViewport) {
+      return;
+    }
     const displaySetUpdated = this._setActiveDisplaySetsUIDs(activeViewport.displaySetInstanceUIDs);
     if (forceRestart || displaySetUpdated) {
       this._restartPrefetching();
@@ -129842,12 +129845,15 @@ var log = __webpack_require__(83887);
 var guid = __webpack_require__(27054);
 // EXTERNAL MODULE: ../../core/src/services/_shared/pubSubServiceInterface.ts
 var pubSubServiceInterface = __webpack_require__(37230);
+// EXTERNAL MODULE: ../../core/src/services/DicomMetadataStore/DicomMetadataStore.ts + 2 modules
+var DicomMetadataStore = __webpack_require__(60140);
 ;// ../../core/src/services/MeasurementService/MeasurementService.ts
 var _MeasurementService;
 
 
 
 
+
 /**
  * Measurement source schema
  *
@@ -129929,7 +129935,6 @@ class MeasurementService extends pubSubServiceInterface/* PubSubService */.R {
     super(EVENTS);
     this.VALUE_TYPES = VALUE_TYPES;
     this.measurements = new Map();
-    this.unmappedMeasurements = new Map();
     this.isMeasurementDeletedIndividually = void 0;
     this.sources = {};
     this.mappings = {};
@@ -130270,6 +130275,7 @@ class MeasurementService extends pubSubServiceInterface/* PubSubService */.R {
       const sourceMapping = sourceMappings.find(mapping => mapping.annotationType === annotationType);
       if (!sourceMapping) {
         console.log('No source mapping', source.uid, annotationType, source);
+        this.addUnmappedMeasurement(sourceAnnotationDetail, source);
         return;
       }
       const {
@@ -130283,15 +130289,7 @@ class MeasurementService extends pubSubServiceInterface/* PubSubService */.R {
       }
       measurement.source = source;
     } catch (error) {
-      // Todo: handle other
-      this.unmappedMeasurements.set(sourceAnnotationDetail.uid, {
-        ...sourceAnnotationDetail,
-        source: {
-          name: source.name,
-          version: source.version,
-          uid: source.uid
-        }
-      });
+      this.addUnmappedMeasurement(sourceAnnotationDetail, source);
       console.log('Failed to map', error);
       throw new Error(`Failed to map '${sourceInfo}' measurement for annotationType ${annotationType}: ${error.message}`);
     }
@@ -130337,19 +130335,89 @@ class MeasurementService extends pubSubServiceInterface/* PubSubService */.R {
     return newMeasurement.uid;
   }
 
+  /**
+   * Recursively searches for any attribute at any level in the object
+   * @param {any} obj The object to search
+   * @param {string} attributeName The name of the attribute to find
+   * @returns {any} The attribute value if found, undefined otherwise
+   */
+  findAttributeRecursively(obj, attributeName) {
+    if (!obj || typeof obj !== 'object') {
+      return undefined;
+    }
+    if (obj[attributeName]) {
+      return obj[attributeName];
+    }
+    for (const key in obj) {
+      if (obj.hasOwnProperty(key)) {
+        const result = this.findAttributeRecursively(obj[key], attributeName);
+        if (result) {
+          return result;
+        }
+      }
+    }
+    return undefined;
+  }
+
+  /**
+   * Adds an unmapped measurement to the measurement service.
+   *
+   * @param {any} sourceAnnotationDetail The source annotation detail
+   * @param {any} source The source
+   */
+  addUnmappedMeasurement(sourceAnnotationDetail, source) {
+    if (sourceAnnotationDetail.annotation?.invalidated === true) {
+      console.log('Measurement is invalidated, skipping...', sourceAnnotationDetail);
+      return;
+    }
+    if (sourceAnnotationDetail.annotation?.isPreview === true) {
+      console.log('Measurement is preview, skipping...', sourceAnnotationDetail);
+      return;
+    }
+    const metadata = this.findAttributeRecursively(sourceAnnotationDetail, 'metadata');
+    const label = this.findAttributeRecursively(sourceAnnotationDetail, 'label');
+    const referencedImageId = this.findAttributeRecursively(sourceAnnotationDetail, 'referencedImageId');
+    const displaySetInstanceUID = this.findAttributeRecursively(sourceAnnotationDetail, 'displaySetInstanceUID');
+    const measurement = {
+      ...sourceAnnotationDetail,
+      isUnmapped: true,
+      statusTooltip: 'This measurement is not compatible with this application',
+      source: {
+        name: source.name,
+        version: source.version,
+        uid: source.uid
+      }
+    };
+    if (metadata) {
+      measurement.metadata = metadata;
+    }
+    if (label) {
+      measurement.label = label;
+    }
+    if (referencedImageId) {
+      measurement.referencedImageId = referencedImageId;
+      const instance = DicomMetadataStore/* DicomMetadataStore */.H.getInstanceByImageId(referencedImageId);
+      measurement.referenceStudyUID = instance.StudyInstanceUID;
+      measurement.referenceSeriesUID = instance.SeriesInstanceUID;
+    }
+    if (displaySetInstanceUID) {
+      measurement.displaySetInstanceUID = displaySetInstanceUID;
+    }
+    this.measurements.set(sourceAnnotationDetail.uid, measurement);
+  }
+
   /**
    * Removes a measurement and broadcasts the removed event.
    *
    * @param {string} measurementUID The measurement uid
    */
   remove(measurementUID) {
-    const measurement = this.measurements.get(measurementUID) || this.unmappedMeasurements.get(measurementUID);
+    const measurement = this.measurements.get(measurementUID);
     if (!measurementUID || !measurement) {
       console.debug(`No uid provided, or unable to find measurement by uid.`);
       return;
     }
     const source = measurement.source;
-    this.unmappedMeasurements.delete(measurementUID);
     this.measurements.delete(measurementUID);
     this.isMeasurementDeletedIndividually = true;
     this._broadcastEvent(this.EVENTS.MEASUREMENT_REMOVED, {
@@ -130364,12 +130432,11 @@ class MeasurementService extends pubSubServiceInterface/* PubSubService */.R {
   removeMany(measurementUIDs) {
     const measurements = [];
     for (const measurementUID of measurementUIDs) {
-      const measurement = this.measurements.get(measurementUID) || this.unmappedMeasurements.get(measurementUID);
+      const measurement = this.measurements.get(measurementUID);
       if (!measurementUID || !measurement) {
         console.debug(`No uid provided, or unable to find measurement by uid.`);
         continue;
       }
-      this.unmappedMeasurements.delete(measurementUID);
       this.measurements.delete(measurementUID);
       measurements.push(measurement);
     }
@@ -130389,9 +130456,7 @@ class MeasurementService extends pubSubServiceInterface/* PubSubService */.R {
   clearMeasurements(filter) {
     // Make a copy of the measurements
     const toClear = this.getMeasurements(filter);
-    const unmappedClear = filter ? [...this.unmappedMeasurements.values()].filter(filter) : this.unmappedMeasurements;
-    const measurements = [...toClear, ...unmappedClear];
-    unmappedClear.forEach(measurement => this.unmappedMeasurements.delete(measurement.uid));
+    const measurements = [...toClear];
     toClear.forEach(measurement => this.measurements.delete(measurement.uid));
     this._broadcastEvent(this.EVENTS.MEASUREMENTS_CLEARED, {
       measurements
@@ -133396,6 +133461,8 @@ function filterMeasurementsBySeriesUID(selectedSeries) {
   }
   return measurement => selectedSeries.includes(measurement.referenceSeriesUID);
 }
+
+/** A filter that filters for measurements belonging to the study */
 function filterMeasurementsByStudyUID(studyUID) {
   return measurement => measurement.referenceStudyUID == studyUID;
 }
@@ -135336,7 +135403,7 @@ const detectionOptions = {
   }
 });
 ;// ../../i18n/package.json
-const package_namespaceObject = /*#__PURE__*/JSON.parse('{"rE":"3.12.0-beta.41"}');
+const package_namespaceObject = /*#__PURE__*/JSON.parse('{"rE":"3.12.0-beta.43"}');
 ;// ../../i18n/src/utils.js
 const languagesMap = {
   ar: 'Arabic',
@@ -275038,6 +275105,7 @@ LayoutSelector_LayoutSelector.propTypes = {
  * @component
  * @example
  * ```tsx
+ * // Basic usage without status
  * <DataRow
  *   number={1}
  *   title="My Item"
@@ -275053,6 +275121,29 @@ LayoutSelector_LayoutSelector.propTypes = {
  *   onDelete={() => {}}
  *   onColor={() => {}}
  * />
+ *
+ * // With warning status using composite pattern
+ * <DataRow
+ *   // ... other props
+ * >
+ *   <DataRow.Status.Warning tooltip="This structured report is not compatible with this application" />
+ * </DataRow>
+ *
+ * // With success status using composite pattern
+ * <DataRow
+ *   // ... other props
+ * >
+ *   <DataRow.Status.Success tooltip="Measurement completed successfully" />
+ * </DataRow>
+ *
+ * // Multiple status indicators
+ * <DataRow
+ *   // ... other props
+ * >
+ *   <DataRow.Status.Warning tooltip="Warning message" />
+ *   <DataRow.Status.Info tooltip="Additional info" />
+ * </DataRow>
+ *
  * ```
  */
 
@@ -275075,9 +275166,10 @@ LayoutSelector_LayoutSelector.propTypes = {
  * @property {() => void} onRename - Callback when rename is requested
  * @property {() => void} onDelete - Callback when delete is requested
  * @property {() => void} onColor - Callback when color change is requested
+ * @property {React.ReactNode} children - Optional children, including Status components
  */
 
-const DataRow = ({
+const DataRowComponent = ({
   number,
   title,
   colorHex,
@@ -275092,12 +275184,16 @@ const DataRow = ({
   isSelected = false,
   isVisible = true,
   disableEditing = false,
-  className
+  className,
+  children
 }) => {
   const [isDropdownOpen, setIsDropdownOpen] = (0,react.useState)(false);
   const isTitleLong = title?.length > 25;
   const rowRef = (0,react.useRef)(null);
 
+  // Extract Status components from children
+  const statusComponents = react.Children.toArray(children).filter(child => /*#__PURE__*/react.isValidElement(child) && child.type && child.type.displayName?.startsWith('DataRow.Status'));
+
   // useEffect(() => {
   //   if (isSelected && rowRef.current) {
   //     setTimeout(() => {
@@ -275213,7 +275309,7 @@ const DataRow = ({
     className: "h-6 w-6"
   })), isLocked && !disableEditing && /*#__PURE__*/react.createElement(Icons.Lock, {
     className: "text-muted-foreground h-6 w-6"
-  }), disableEditing && /*#__PURE__*/react.createElement("div", {
+  }), statusComponents, disableEditing && /*#__PURE__*/react.createElement("div", {
     className: "h-6 w-6"
   }), !disableEditing && /*#__PURE__*/react.createElement(DropdownMenu_DropdownMenu, {
     onOpenChange: open => setIsDropdownOpen(open)
@@ -275269,7 +275365,73 @@ const DataRow = ({
     className: "text-muted-foreground ml-auto text-sm"
   }, renderDetails(details.secondary)))));
 };
-/* harmony default export */ const DataRow_DataRow = ((/* unused pure expression or super */ null && (DataRow)));
+const StatusIndicator = ({
+  tooltip,
+  icon,
+  defaultTooltip
+}) => /*#__PURE__*/react.createElement(Tooltip_Tooltip, null, /*#__PURE__*/react.createElement(Tooltip_TooltipTrigger, {
+  asChild: true
+}, /*#__PURE__*/react.createElement("div", {
+  className: "flex h-6 w-6 items-center justify-center"
+}, icon)), /*#__PURE__*/react.createElement(Tooltip_TooltipContent, {
+  side: "bottom"
+}, /*#__PURE__*/react.createElement("div", null, tooltip || defaultTooltip)));
+const Status = ({
+  children
+}) => {
+  return /*#__PURE__*/react.createElement(react.Fragment, null, children);
+};
+const DataRow_StatusWarning = ({
+  tooltip
+}) => /*#__PURE__*/react.createElement(StatusIndicator, {
+  tooltip: tooltip,
+  icon: /*#__PURE__*/react.createElement(Icons.ByName, {
+    name: "status-alert",
+    className: "h-4 w-4 text-yellow-500"
+  }),
+  defaultTooltip: "Warning"
+});
+const DataRow_StatusSuccess = ({
+  tooltip
+}) => /*#__PURE__*/react.createElement(StatusIndicator, {
+  tooltip: tooltip,
+  icon: /*#__PURE__*/react.createElement(Icons.Checked, {
+    className: "h-4 w-4 text-green-500"
+  }),
+  defaultTooltip: "Success"
+});
+const DataRow_StatusError = ({
+  tooltip
+}) => /*#__PURE__*/react.createElement(StatusIndicator, {
+  tooltip: tooltip,
+  icon: /*#__PURE__*/react.createElement(Icons.ByName, {
+    name: "status-error",
+    className: "h-4 w-4 text-red-500"
+  }),
+  defaultTooltip: "Error"
+});
+const StatusInfo = ({
+  tooltip
+}) => /*#__PURE__*/react.createElement(StatusIndicator, {
+  tooltip: tooltip,
+  icon: /*#__PURE__*/react.createElement(Icons.Info, {
+    className: "h-4 w-4 text-blue-500"
+  }),
+  defaultTooltip: "Info"
+});
+Status.displayName = 'DataRow.Status';
+DataRow_StatusWarning.displayName = 'DataRow.Status.Warning';
+DataRow_StatusSuccess.displayName = 'DataRow.Status.Success';
+DataRow_StatusError.displayName = 'DataRow.Status.Error';
+StatusInfo.displayName = 'DataRow.Status.Info';
+Status.Warning = DataRow_StatusWarning;
+Status.Success = DataRow_StatusSuccess;
+Status.Error = DataRow_StatusError;
+Status.Info = StatusInfo;
+const DataRow = DataRowComponent;
+DataRow.Status = Status;
+/* harmony default export */ const DataRow_DataRow = (DataRow);
+
 ;// ../../ui-next/src/components/DataRow/index.ts
 
 ;// ../../ui-next/src/lib/createContext.tsx
@@ -275310,8 +275472,10 @@ function createContext(rootComponentName, defaultContext) {
 
 
 
+
 const [MeasurementTableProvider, useMeasurementTableContext] = createContext('MeasurementTable', {
-  data: []
+  data: [],
+  isExpanded: true
 });
 const MeasurementTable = ({
   data = [],
@@ -275382,7 +275546,7 @@ const MeasurementTable_Row = ({
   const {
     uid
   } = item;
-  return /*#__PURE__*/react.createElement(DataRow, {
+  return /*#__PURE__*/react.createElement(DataRow_DataRow, {
     key: item.uid,
     description: item.label,
     number: index + 1,
@@ -275395,11 +275559,13 @@ const MeasurementTable_Row = ({
     onRename: e => onAction(e, 'renameMeasurement', uid),
     onToggleVisibility: e => onAction(e, 'toggleVisibilityMeasurement', uid),
     onToggleLocked: e => onAction(e, 'toggleLockMeasurement', uid),
+    onColor: e => onAction(e, 'changeMeasurementColor', uid),
     disableEditing: disableEditing,
-    isExpanded: isExpanded,
     isVisible: item.isVisible,
     isLocked: item.isLocked
-  });
+  }, item.isUnmapped && /*#__PURE__*/react.createElement(DataRow_DataRow.Status.Warning, {
+    tooltip: item.statusTooltip
+  }));
 };
 MeasurementTable.Header = MeasurementTable_Header;
 MeasurementTable.Body = MeasurementTable_Body;
@@ -385942,7 +386108,7 @@ function __rewriteRelativeImportExtension(path, preserveJsx) {
 /******/ 		// This function allow to reference async chunks
 /******/ 		__webpack_require__.u = (chunkId) => {
 /******/ 			// return url for filenames based on template
-/******/ 			return "" + ({"572":"polySeg","2007":"interpolation","3054":"histogram-worker","3694":"compute"}[chunkId] || chunkId) + ".bundle." + {"85":"d3bd77dfeccaf22bb161","147":"30b16832e09898deaf32","213":"d7c96fbf2d262dd1d854","319":"fc959064ddf2f6978b54","414":"c9e4e3568323167f65a8","572":"1ab7dd310985596b4098","732":"6978ac30a1e36abf06db","810":"5f17189c5e5f15675a30","934":"ff9719b99b6c0792e16f","1447":"3ab897850d31f812f60b","1459":"961c0d8f519f1488bf98","1604":"becb7f1a797d63dc2e1b","1807":"49a30c0a1f5c49eca17b","1919":"03e81e78edc6cb576e70","1927":"8941122be98d6aea153c","2007":"f58dd6d3d25dd22cfefd","2108":"e84aa8d858d8c4f2413e","2243":"db90156b09c33f1caf2e","2345":"839224623fb00f805981","2424":"3eb01cf073a96dd6b683","2518":"fbbfa351f8e8c446599b","2701":"02c7c6c283a2ee468af6","2974":"ec95e58b346dbe30a362","3054":"b7bb02c6cd9273c422f5","3694":"f176731b761d630f358c","4019":"c5b332003e3cd00868ce","4113":"82a39a036f61a32c0316","4202":"45fc4a9b7b3cd639d185","4759":"8686abdd7bcf4aa7d107","5261":"6e1a017f8f1027557f5b","5349":"3c050d34f7395566c41e","5457":"16bfe389ed9373145dfa","5485":"dd8fec305758568cd0c7","5674":"24de237ef15879b25714","5802":"48b958ebd8d250156814","6027":"d8a5cecdd8855618e6e3","6201":"d7cc057ae245b4dec943","6939":"41fbdef87597b5172ec6","6991":"1c3166b3b48463d8b4f7","7159":"122cd4e6d8fd1287d07f","7197":"30939e46a8ed4193655c","7412":"80f68b38041e891c64a8","7431":"f6ee76ae243ffe1c811a","7639":"509b4e89932a3e238889","7656":"fb8042ef087692c555e6","8094":"5c44190a325ac23e3e5c","8402":"edb924cd47cd168f621c","8558":"faec2906b9214cf8239c","8740":"fa9a98c1ce314e7040f2","8815":"a6f1c6193fae293da169","9862":"b2d33e721d8c8e2a014c"}[chunkId] + ".js";
+/******/ 			return "" + ({"572":"polySeg","2007":"interpolation","3054":"histogram-worker","3694":"compute"}[chunkId] || chunkId) + ".bundle." + {"85":"c842f9e0d90fcae9331a","147":"30b16832e09898deaf32","213":"e65a963cbc1d5c1eca70","319":"fc959064ddf2f6978b54","414":"2a54515e688a58810af6","572":"1ab7dd310985596b4098","732":"6978ac30a1e36abf06db","810":"4251bc41930758f1c7f9","934":"bcff1de4b0a462244dde","1447":"dfac7fcb7d891b842990","1459":"bcd9c6aee80316acbeec","1604":"6374b685dd9265472107","1807":"fa17c6019a2ef6f97c3d","1919":"5c6517335a25b14d700d","1927":"8941122be98d6aea153c","2007":"f58dd6d3d25dd22cfefd","2108":"e84aa8d858d8c4f2413e","2243":"351b90b0dfedb402a824","2345":"839224623fb00f805981","2424":"407de5da5d26c71f14fd","2518":"fbbfa351f8e8c446599b","2701":"02c7c6c283a2ee468af6","2974":"ec95e58b346dbe30a362","3054":"b7bb02c6cd9273c422f5","3694":"f176731b761d630f358c","4019":"c5b332003e3cd00868ce","4113":"75ead0f05587d83dd132","4202":"45fc4a9b7b3cd639d185","4759":"8686abdd7bcf4aa7d107","5261":"6e1a017f8f1027557f5b","5349":"3c050d34f7395566c41e","5457":"7396b0f19e8b84cc0f0c","5485":"b1dee58c8d6aa3f7ba04","5674":"24de237ef15879b25714","5802":"48b958ebd8d250156814","6027":"896e74fec877d68505a1","6201":"a3b84409f4dd4633bb32","6939":"41fbdef87597b5172ec6","6991":"32e4de3097df11905d35","7159":"122cd4e6d8fd1287d07f","7197":"5b8c2206554500da1062","7412":"80f68b38041e891c64a8","7431":"f6ee76ae243ffe1c811a","7639":"c65454b472efdb4541c7","7656":"5a4fb45847d6a2361493","8094":"5c44190a325ac23e3e5c","8402":"edb924cd47cd168f621c","8558":"d2ec63cb2ac102cabaa4","8740":"fa9a98c1ce314e7040f2","8815":"5962a74e27364e10c368","9862":"b2d33e721d8c8e2a014c"}[chunkId] + ".js";
 /******/ 		};
 /******/ 	})();
 /******/