@ohif/app 3.13.0-beta.42 → 3.13.0-beta.43

package/dist/{3461.bundle.d418652280863f312da3.js → 3461.bundle.829d07239cde6238db7b.js}

@@ -980,16 +980,25 @@ function _processNonGeometricallyDefinedMeasurement(mergedContentSequence) {
       MeasuredValueSequence
     } = item;
 
-    // Handle spatial reference ONLY if ContentSequence exists
+    // Handle spatial reference ONLY if ContentSequence exists.
+    // ContentSequence may be a scalar SCOORD or an array when additional named
+    // SCOORDs (e.g. control points) are nested alongside the primary geometry.
+    // Pick the primary geometry entry: prefer the SCOORD without a
+    // ConceptNameCodeSequence (plain polyline), falling back to the first SCOORD.
     if (ContentSequence) {
+      const scoordItem = Array.isArray(ContentSequence) ? ContentSequence.find(cs => (cs.ValueType === 'SCOORD' || cs.ValueType === 'SCOORD3D') && !cs.ConceptNameCodeSequence) ?? ContentSequence.find(cs => cs.ValueType === 'SCOORD' || cs.ValueType === 'SCOORD3D') : ContentSequence;
+      if (!scoordItem) {
+        console.warn('ContentSequence array contains no SCOORD or SCOORD3D entry, skipping annotation.');
+        return;
+      }
       const {
         ValueType
-      } = ContentSequence;
+      } = scoordItem;
       if (ValueType !== 'SCOORD' && ValueType !== 'SCOORD3D') {
         console.warn(`Graphic ${ValueType} not currently supported, skipping annotation.`);
         return;
       }
-      const coords = _getCoordsFromSCOORDOrSCOORD3D(ContentSequence);
+      const coords = _getCoordsFromSCOORDOrSCOORD3D(scoordItem);
       if (coords) {
         measurement.coords.push(coords);
       }
@@ -1190,8 +1199,6 @@ function onModeEnter({
     ds.isHydrated = false;
   });
 }
-// EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
-var dcmjs_es = __webpack_require__(5842);
 ;// ../../../extensions/cornerstone-dicom-sr/src/utils/getFilteredCornerstoneToolState.ts
 
 
@@ -1680,10 +1687,6 @@ function choosePoints(points) {
 
 
 
-
-const {
-  downloadBlob
-} = src/* utils */.Wp;
 const {
   MeasurementReport: commandsModule_MeasurementReport
 } = esm/* adaptersSR */.QX.Cornerstone3D;
@@ -1745,29 +1748,8 @@ const commandsModule = props => {
     /**
      *
      * @param measurementData An array of measurements from the measurements service
-     * @param additionalFindingTypes toolTypes that should be stored with labels as Findings
-     * @param options Naturalized DICOM JSON headers to merge into the displaySet.
-     * as opposed to Finding Sites.
      * that you wish to serialize.
-     */
-    downloadReport: ({
-      measurementData,
-      additionalFindingTypes,
-      options = {}
-    }) => {
-      const srDataset = _generateReport(measurementData, additionalFindingTypes, options);
-      const reportBlob = dcmjs_es/* default.data */.Ay.data.datasetToBlob(srDataset);
-
-      //Create a URL for the binary.
-      downloadBlob(reportBlob, {
-        filename: 'dicom-sr.dcm'
-      });
-    },
-    /**
-     *
-     * @param measurementData An array of measurements from the measurements service
-     * that you wish to serialize.
-     * @param dataSource The dataSource that you wish to use to persist the data.
+     * @param dataSource The data source name ('download', 'copyToClipboard', or a named data source).
      * @param additionalFindingTypes toolTypes that should be stored with labels as Findings
      * @param options Naturalized DICOM JSON headers to merge into the displaySet.
      * @return The naturalized report
@@ -1778,23 +1760,24 @@ const commandsModule = props => {
       additionalFindingTypes,
       options = {}
     }) => {
-      // Use the @cornerstonejs adapter for converting to/from DICOM
-      // But it is good enough for now whilst we only have cornerstone as a datasource.
       log.info('[DICOMSR] storeMeasurements');
-      if (!dataSource || !dataSource.store || !dataSource.store.dicom) {
-        log.error('[DICOMSR] datasource has no dataSource.store.dicom endpoint!');
+      const storeFn = commandsManager.runCommand('createStoreFunction', {
+        dataSource,
+        defaultFileName: 'dicom-sr.dcm'
+      });
+      if (!storeFn) {
+        log.error('[DICOMSR] No valid store for dataSource:', dataSource);
         return Promise.reject({});
       }
       try {
         const naturalizedReport = _generateReport(measurementData, additionalFindingTypes, options);
         const {
-          StudyInstanceUID,
           ContentSequence
         } = naturalizedReport;
         // The content sequence has 5 or more elements, of which
         // the `[4]` element contains the annotation data, so this is
         // checking that there is some annotation data present.
-        if (!ContentSequence?.[4].ContentSequence?.length) {
+        if (!ContentSequence?.[4]?.ContentSequence?.length) {
           console.log('naturalizedReport missing imaging content', naturalizedReport);
           throw new Error('Invalid report, no content');
         }
@@ -1810,15 +1793,10 @@ const commandsModule = props => {
             naturalizedReport
           });
         }
-        await dataSource.store.dicom(naturalizedReport, null, dicomDict);
-        if (StudyInstanceUID) {
-          dataSource.deleteStudyMetadataPromise(StudyInstanceUID);
-        }
-
-        // The "Mode" route listens for DicomMetadataStore changes
-        // When a new instance is added, it listens and
-        // automatically calls makeDisplaySets
-        src/* DicomMetadataStore */.H8.addInstances([naturalizedReport], true);
+        await storeFn(naturalizedReport, {
+          measurementData,
+          dicomDict
+        });
         return naturalizedReport;
       } catch (error) {
         console.warn(error);
@@ -1841,7 +1819,6 @@ const commandsModule = props => {
     }
   };
   const definitions = {
-    downloadReport: actions.downloadReport,
     storeMeasurements: actions.storeMeasurements,
     hydrateStructuredReport: actions.hydrateStructuredReport
   };

package/dist/{4688.bundle.114adcc40c407ed7d18c.js → 4688.bundle.4e3a2e7fe6353e18fc9d.js}

@@ -7442,37 +7442,13 @@ const ExportSegmentationSubMenuItem = ({
     className: "text-foreground"
   }), /*#__PURE__*/react.createElement("span", {
     className: "pl-2"
-  }, t('Download & Export'))), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuPortal */.dce, null, /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuSubContent */.M56, null, /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuLabel */.lpj, {
-    className: "flex items-center pl-0"
-  }, /*#__PURE__*/react.createElement(ui_next_src/* Icons */.FI1.Download, {
-    className: "h-5 w-5"
-  }), /*#__PURE__*/react.createElement("span", {
-    className: "pl-1"
-  }, t('Download'))), segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
+  }, t('Export'))), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuPortal */.dce, null, /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuSubContent */.M56, null, segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
     onClick: e => {
       e.preventDefault();
       actions.downloadCSVSegmentationReport(segmentationId);
     },
     disabled: !allowExport
   }, t('CSV Report')), segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
-    onClick: e => {
-      e.preventDefault();
-      actions.onSegmentationDownload(segmentationId);
-    },
-    disabled: !allowExport
-  }, t('DICOM SEG')), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
-    onClick: e => {
-      e.preventDefault();
-      actions.onSegmentationDownloadRTSS(segmentationId);
-    },
-    disabled: !allowExport
-  }, t('DICOM RTSS')), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuSeparator */.mBJ, null), /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuLabel */.lpj, {
-    className: "flex items-center pl-0"
-  }, /*#__PURE__*/react.createElement(ui_next_src/* Icons */.FI1.Export, {
-    className: "h-5 w-5"
-  }), /*#__PURE__*/react.createElement("span", {
-    className: "pl-1 pt-1"
-  }, t('Export'))), segmentationRepresentationType === esm_enums.SegmentationRepresentations.Labelmap && /*#__PURE__*/react.createElement(ui_next_src/* DropdownMenuItem */._26, {
     onClick: e => {
       e.preventDefault();
       actions.storeSegmentation(segmentationId, 'SEG');
@@ -7549,16 +7525,6 @@ const CustomDropdownMenuContent = () => {
         context: 'CORNERSTONE'
       });
     },
-    onSegmentationDownloadRTSS: segmentationId => {
-      commandsManager.run('downloadRTSS', {
-        segmentationId
-      });
-    },
-    onSegmentationDownload: segmentationId => {
-      commandsManager.run('downloadSegmentation', {
-        segmentationId
-      });
-    },
     downloadCSVSegmentationReport: segmentationId => {
       commandsManager.run('downloadCSVSegmentationReport', {
         segmentationId

package/dist/{4819.bundle.0cd1049e47d4d46ef63a.js → 4819.bundle.cdf38c8daa32fe3750a1.js}

@@ -803,8 +803,9 @@ function TrackedMeasurementsContextProvider({
       });
     },
     showStructuredReportDisplaySetInActiveViewport: (ctx, evt) => {
-      if (evt.data.createdDisplaySetInstanceUIDs.length > 0) {
-        const StructuredReportDisplaySetInstanceUID = evt.data.createdDisplaySetInstanceUIDs[0];
+      const uids = evt.data?.createdDisplaySetInstanceUIDs;
+      if (uids?.length > 0) {
+        const StructuredReportDisplaySetInstanceUID = uids[0];
         viewportGridService.setDisplaySetsForViewport({
           viewportId: evt.data.viewportId,
           displaySetInstanceUIDs: [StructuredReportDisplaySetInstanceUID]

package/dist/{8305.bundle.d907ab2a252d536ac865.js → 8305.bundle.ac779a289cb3546a1c6f.js}

@@ -363,7 +363,6 @@ var PROMPT_RESPONSES = __webpack_require__(96357);
 
 
 
-
 const getTargetViewport = ({
   viewportId,
   viewportGridService
@@ -390,12 +389,10 @@ const {
     }
   }
 } = adapters_dist_esm/* adaptersRT */.f_;
-const {
-  /* downloadDICOMData */ "vk": downloadDICOMData
-} = adapters_dist_esm/* helpers */._$;
 const commandsModule = ({
   servicesManager,
-  extensionManager
+  extensionManager,
+  commandsManager
 }) => {
   const {
     segmentationService,
@@ -548,7 +545,11 @@ const commandsModule = ({
       const generatedSegmentation = actions.generateSegmentation({
         segmentationId
       });
-      downloadDICOMData(generatedSegmentation.dataset, `${segmentationInOHIF.label}`);
+      const storeFn = commandsManager.runCommand('createStoreFunction', {
+        dataSource: 'download',
+        defaultFileName: `${segmentationInOHIF.label}.dcm`
+      });
+      storeFn(generatedSegmentation.dataset);
     },
     /**
      * Stores a segmentation based on the provided segmentationId into a specified data source.
@@ -575,10 +576,9 @@ const commandsModule = ({
         label,
         predecessorImageId
       } = segmentation;
-      const defaultDataSource = dataSource ?? extensionManager.getActiveDataSource()[0];
       const {
         value: reportName,
-        dataSourceName: selectedDataSource,
+        dataSourceName,
         series,
         priorSeriesNumber,
         action
@@ -587,42 +587,47 @@ const commandsModule = ({
         extensionManager,
         predecessorImageId,
         title: 'Store Segmentation',
-        modality
+        modality,
+        enableDownload: true
       });
-      if (action === PROMPT_RESPONSES/* default */.A.CREATE_REPORT) {
-        try {
-          const selectedDataSourceConfig = selectedDataSource ? extensionManager.getDataSources(selectedDataSource)[0] : defaultDataSource;
-          const args = {
-            segmentationId,
-            options: {
-              SeriesDescription: series ? undefined : reportName || label || 'Contour Series',
-              SeriesNumber: series ? undefined : 1 + priorSeriesNumber,
-              predecessorImageId: series
-            }
-          };
-          const generatedDataAsync = modality === 'SEG' && actions.generateSegmentation(args) || modality === 'RTSTRUCT' && actions.generateContour(args);
-          const generatedData = await generatedDataAsync;
-          if (!generatedData || !generatedData.dataset) {
-            throw new Error('Error during segmentation generation');
-          }
-          const {
-            dataset: naturalizedReport
-          } = generatedData;
-
-          // DCMJS assigns a dummy study id during creation, and this can cause problems, so clearing it out
-          if (naturalizedReport.StudyID === 'No Study ID') {
-            naturalizedReport.StudyID = '';
+      if (action !== PROMPT_RESPONSES/* default */.A.CREATE_REPORT) {
+        return;
+      }
+      const defaultFileName = modality === 'RTSTRUCT' ? `rtss-${segmentationId}.dcm` : `${label || 'segmentation'}.dcm`;
+      const storeFn = commandsManager.runCommand('createStoreFunction', {
+        dataSource: dataSourceName,
+        defaultFileName
+      });
+      if (!storeFn) {
+        throw new Error(`No valid store for dataSource: ${dataSourceName}`);
+      }
+      try {
+        const args = {
+          segmentationId,
+          options: {
+            SeriesDescription: series ? undefined : reportName || label || 'Contour Series',
+            SeriesNumber: series ? undefined : 1 + priorSeriesNumber,
+            predecessorImageId: series
           }
-          await selectedDataSourceConfig.store.dicom(naturalizedReport);
+        };
+        const generatedDataAsync = modality === 'SEG' && actions.generateSegmentation(args) || modality === 'RTSTRUCT' && actions.generateContour(args);
+        const generatedData = await generatedDataAsync;
+        if (!generatedData?.dataset) {
+          throw new Error('Error during segmentation generation');
+        }
+        const {
+          dataset: naturalizedReport
+        } = generatedData;
 
-          // add the information for where we stored it to the instance as well
-          naturalizedReport.wadoRoot = selectedDataSourceConfig.getConfig().wadoRoot;
-          src/* DicomMetadataStore */.H8.addInstances([naturalizedReport], true);
-          return naturalizedReport;
-        } catch (error) {
-          console.debug('Error storing segmentation:', error);
-          throw error;
+        // DCMJS assigns a dummy study id during creation, and this can cause problems, so clearing it out
+        if (naturalizedReport.StudyID === 'No Study ID') {
+          naturalizedReport.StudyID = '';
         }
+        await storeFn(naturalizedReport, {});
+        return naturalizedReport;
+      } catch (error) {
+        console.debug('Error storing segmentation:', error);
+        throw error;
       }
     },
     generateContour: async args => {
@@ -658,13 +663,11 @@ const commandsModule = ({
         InstanceNumber: instanceNumber = 1,
         SeriesInstanceUID: seriesUID
       } = dataset;
-      try {
-        //Create a URL for the binary.
-        const filename = `rtss-${seriesUID}-${instanceNumber}.dcm`;
-        downloadDICOMData(dataset, filename);
-      } catch (e) {
-        console.warn(e);
-      }
+      const storeFn = commandsManager.runCommand('createStoreFunction', {
+        dataSource: 'download',
+        defaultFileName: `rtss-${seriesUID}-${instanceNumber}.dcm`
+      });
+      await storeFn(dataset);
     },
     toggleActiveSegmentationUtility: ({
       itemId: buttonId

package/dist/{8963.bundle.bc2e871cbd92e9fdbbf5.js → 8963.bundle.0a71d2361f66b5b7cafb.js}

@@ -12,11 +12,10 @@ __webpack_require__.d(__webpack_exports__, {
   X6: () => (/* reexport */ adaptersPMAP),
   f_: () => (/* reexport */ adaptersRT),
   ql: () => (/* reexport */ adaptersSEG),
-  QX: () => (/* reexport */ adaptersSR),
-  _$: () => (/* reexport */ helpers_namespaceObject)
+  QX: () => (/* reexport */ adaptersSR)
 });
 
-// UNUSED EXPORTS: utilities
+// UNUSED EXPORTS: helpers, utilities
 
 // NAMESPACE OBJECT: ../../../node_modules/@cornerstonejs/adapters/dist/esm/adapters/Cornerstone/Segmentation.js
 var Segmentation_namespaceObject = {};
@@ -63,13 +62,6 @@ __webpack_require__.d(enums_namespaceObject, {
   s: () => (Events)
 });
 
-// NAMESPACE OBJECT: ../../../node_modules/@cornerstonejs/adapters/dist/esm/adapters/helpers/index.js
-var helpers_namespaceObject = {};
-__webpack_require__.r(helpers_namespaceObject);
-__webpack_require__.d(helpers_namespaceObject, {
-  vk: () => (downloadDICOMData)
-});
-
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
 var dcmjs_es = __webpack_require__(5842);
 ;// ../../../node_modules/@cornerstonejs/adapters/dist/esm/adapters/helpers/toArray.js

package/dist/{9195.bundle.5c8fc381c7a8b1b81c43.js → 9195.bundle.dba57be4160f9d16add7.js}

@@ -4663,7 +4663,8 @@ function CreateReportDialogPrompt({
   minSeriesNumber = 0,
   predecessorImageId,
   extensionManager,
-  servicesManager
+  servicesManager,
+  enableDownload = false
 }) {
   const {
     uiDialogService,
@@ -4683,6 +4684,7 @@ function CreateReportDialogPrompt({
         predecessorImageId,
         minSeriesNumber,
         modality,
+        enableDownload,
         onSave: async ({
           reportName,
           dataSource: selectedDataSource,
@@ -7516,8 +7518,6 @@ const useToggleOneUpViewportGridStore = (0,zustand_esm/* create */.vt)(set => ({
   })
 }));
 ;// ../../../extensions/default/src/Actions/createReportAsync.tsx
-
-
 /**
  *
  * @param {*} servicesManager
@@ -7525,7 +7525,8 @@ const useToggleOneUpViewportGridStore = (0,zustand_esm/* create */.vt)(set => ({
 async function createReportAsync({
   servicesManager,
   getReport,
-  reportType = 'measurement'
+  reportType = 'Measurements',
+  successMessage
 }) {
   const {
     displaySetService,
@@ -7538,15 +7539,13 @@ async function createReportAsync({
       return;
     }
 
-    // The "Mode" route listens for DicomMetadataStore changes
-    // When a new instance is added, it listens and
-    // automatically calls makeDisplaySets
-    src/* DicomMetadataStore */.H8.addInstances([naturalizedReport], true);
+    // addInstances is called by the store command (storeMeasurements/storeSegmentation),
+    // so the display set should already exist at this point.
     const displaySet = displaySetService.getMostRecentDisplaySet();
     const displaySetInstanceUID = displaySet.displaySetInstanceUID;
     uiNotificationService.show({
       title: 'Create Report',
-      message: `${reportType} saved successfully`,
+      message: successMessage ?? `${reportType} saved successfully`,
       type: 'success'
     });
     return [displaySetInstanceUID];
@@ -7602,34 +7601,32 @@ async function promptSaveReport({
       predecessorImageId,
       minSeriesNumber: 3000,
       extensionManager,
-      servicesManager
+      servicesManager,
+      enableDownload: true
     });
     if (promptResult.action === PROMPT_RESPONSES/* default */.A.CREATE_REPORT) {
-      const dataSources = extensionManager.getDataSources(promptResult.dataSourceName);
-      const dataSource = dataSources[0];
       const {
         series,
         priorSeriesNumber,
-        value: reportName
+        value: reportName,
+        dataSourceName
       } = promptResult;
       const SeriesDescription = reportName || defaultSaveTitle;
-      const getReport = async () => {
-        return commandsManager.runCommand('storeMeasurements', {
-          measurementData,
-          dataSource,
-          additionalFindingTypes: ['ArrowAnnotate'],
-          options: {
-            SeriesDescription,
-            SeriesNumber: 1 + priorSeriesNumber,
-            predecessorImageId: series
-          }
-        }, 'CORNERSTONE_STRUCTURED_REPORT');
-      };
+      const getReport = async () => commandsManager.runCommand('storeMeasurements', {
+        measurementData,
+        dataSource: dataSourceName,
+        additionalFindingTypes: ['ArrowAnnotate'],
+        options: {
+          SeriesDescription,
+          SeriesNumber: 1 + priorSeriesNumber,
+          predecessorImageId: series
+        }
+      }, 'CORNERSTONE_STRUCTURED_REPORT');
       displaySetInstanceUIDs = await Actions_createReportAsync({
         servicesManager,
         getReport
       });
-    } else if (promptResult.action === RESPONSE.CANCEL) {
+    } else if (promptResult.action === PROMPT_RESPONSES/* default */.A.CANCEL) {
       // Do nothing
     }
     return {
@@ -7661,6 +7658,10 @@ function findPredecessorImageId(annotations) {
 ;// ../../../extensions/default/src/commandsModule.ts
 
 
+const {
+  downloadBlob
+} = src/* utils */.Wp;
+
 
 
 
@@ -8381,6 +8382,74 @@ const commandsModule = ({
         viewportsToUpdate: updatedViewports
       });
       setTimeout(() => actions.scrollActiveThumbnailIntoView(), 0);
+    },
+    /**
+     * Creates a store function based on the data source type.
+     * @param dataSource - 'download', 'copyToClipboard', or a named data source
+     * @param defaultFileName - Default filename for download/clipboard
+     * @param defaultContentType - Default content type for clipboard
+     * @returns A store function, or null if no valid store exists
+     */
+    createStoreFunction: ({
+      dataSource,
+      defaultFileName,
+      defaultContentType
+    }) => {
+      if (dataSource === 'download') {
+        return async dicom => {
+          const instances = Array.isArray(dicom) ? dicom : [dicom];
+          src/* DicomMetadataStore */.H8.addInstances(instances, true);
+          if (instances.length !== 1) {
+            throw new Error('Download only supports a single DICOM instance');
+          }
+          const reportBlob = dcmjs_es/* default.data */.Ay.data.datasetToBlob(instances[0]);
+          downloadBlob(reportBlob, {
+            filename: defaultFileName || 'dicom.dcm'
+          });
+        };
+      }
+      if (dataSource === 'copyToClipboard') {
+        return async dicom => {
+          const instances = Array.isArray(dicom) ? dicom : [dicom];
+          src/* DicomMetadataStore */.H8.addInstances(instances, true);
+          if (instances.length !== 1) {
+            throw new Error('Copy to clipboard only supports a single DICOM instance');
+          }
+          const reportBlob = dcmjs_es/* default.data */.Ay.data.datasetToBlob(instances[0]);
+          const type = defaultContentType || 'application/dicom';
+          await navigator.clipboard.write([new ClipboardItem({
+            [type]: new Blob([reportBlob], {
+              type
+            })
+          })]);
+        };
+      }
+
+      // DICOM STOW path — resolve the named data source
+      const dataSources = extensionManager.getDataSources(dataSource);
+      const resolvedDataSource = dataSources?.[0];
+      if (!resolvedDataSource?.store?.dicom) {
+        return null;
+      }
+      return async (dicom, {
+        dicomDict
+      } = {}) => {
+        const instances = Array.isArray(dicom) ? dicom : [dicom];
+        const config = resolvedDataSource.getConfig?.();
+        if (config?.wadoRoot) {
+          instances.forEach(instance => {
+            instance.wadoRoot = config.wadoRoot;
+          });
+        }
+        src/* DicomMetadataStore */.H8.addInstances(instances, true);
+        for (const instance of instances) {
+          await resolvedDataSource.store.dicom(instance, null, dicomDict);
+        }
+        const studyUIDs = new Set(instances.map(i => i.StudyInstanceUID).filter(Boolean));
+        for (const uid of studyUIDs) {
+          resolvedDataSource.deleteStudyMetadataPromise(uid);
+        }
+      };
     }
   };
   const definitions = {
@@ -8412,7 +8481,8 @@ const commandsModule = ({
     updateViewportDisplaySet: actions.updateViewportDisplaySet,
     scrollActiveThumbnailIntoView: actions.scrollActiveThumbnailIntoView,
     addDisplaySetAsLayer: actions.addDisplaySetAsLayer,
-    removeDisplaySetLayer: actions.removeDisplaySetLayer
+    removeDisplaySetLayer: actions.removeDisplaySetLayer,
+    createStoreFunction: actions.createStoreFunction
   };
   return {
     actions,
@@ -10402,8 +10472,8 @@ function AboutModalDefault() {
     name
   } = (0,browser_detect_es5/* default */.A)();
   const browser = `${name[0].toUpperCase()}${name.substr(1)} ${version}`;
-  const versionNumber = "3.13.0-beta.42";
-  const commitHash = "1df671e9ab67d43f98bf09f6838ddc0a5f220277";
+  const versionNumber = "3.13.0-beta.43";
+  const commitHash = "1d4802c2a38dd75dca7afca87913e100453c9135";
   const [main, beta] = versionNumber.split('-');
   return /*#__PURE__*/react.createElement(ui_next_src/* AboutModal */.VTU, {
     className: "w-[400px]"
@@ -10576,6 +10646,7 @@ function UserPreferencesModalDefault({
 
 
 
+
 function ReportDialog({
   dataSources,
   modality = 'SR',
@@ -10583,11 +10654,16 @@ function ReportDialog({
   minSeriesNumber = 3000,
   hide,
   onSave,
-  onCancel
+  onCancel,
+  enableDownload = false
 }) {
+  const {
+    t
+  } = (0,es/* useTranslation */.Bd)('Buttons');
   const {
     servicesManager
   } = (0,src/* useSystem */.Jg)();
+  const actionTakenRef = (0,react.useRef)(false);
   const [selectedDataSource, setSelectedDataSource] = (0,react.useState)(dataSources?.[0]?.value ?? null);
   const {
     displaySetService
@@ -10616,6 +10692,7 @@ function ReportDialog({
     setReportName(newReportName);
   }, [selectedSeries, seriesOptions]);
   const handleSave = (0,react.useCallback)(() => {
+    actionTakenRef.current = true;
     onSave({
       reportName,
       dataSource: selectedDataSource,
@@ -10625,10 +10702,31 @@ function ReportDialog({
     hide();
   }, [selectedDataSource, selectedSeries, reportName, hide, onSave]);
   const handleCancel = (0,react.useCallback)(() => {
+    actionTakenRef.current = true;
     onCancel();
     hide();
   }, [onCancel, hide]);
+  const handleDownload = (0,react.useCallback)(() => {
+    actionTakenRef.current = true;
+    onSave({
+      reportName,
+      dataSource: 'download',
+      priorSeriesNumber: Math.max(...seriesOptions.map(it => it.seriesNumber)),
+      series: selectedSeries
+    });
+    hide();
+  }, [selectedDataSource, selectedSeries, reportName, hide, onSave]);
+
+  // Handles the close dialog button/external close as a cancel
+  (0,react.useEffect)(() => {
+    return () => {
+      if (!actionTakenRef.current) {
+        onCancel();
+      }
+    };
+  }, [onCancel]);
   const showDataSourceSelect = dataSources?.length > 1;
+  const showDownloadButton = enableDownload;
   return /*#__PURE__*/react.createElement("div", {
     className: "text-foreground flex min-w-[400px] max-w-md flex-col"
   }, /*#__PURE__*/react.createElement("div", {
@@ -10685,9 +10783,9 @@ function ReportDialog({
     disabled: !!selectedSeries
   })))), /*#__PURE__*/react.createElement("div", {
     className: "flex justify-end gap-2"
-  }, /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0, null, /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0.Actions, null, /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0.ActionsSecondary, {
-    onClick: handleCancel
-  }, "Cancel"), /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0.ActionsPrimary, {
+  }, /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0, null, /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0.Actions, null, showDownloadButton && /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0.ActionsSecondary, {
+    onClick: handleDownload
+  }, t('Download')), /*#__PURE__*/react.createElement(ui_next_src/* InputDialog */.fa0.ActionsPrimary, {
     onClick: handleSave
   }, "Save"))))));
 }