@ohif/app 3.7.0-beta.1 → 3.7.0-beta.100

package/dist/{744.bundle.392a124e4ee20ad6a657.js → 19.bundle.eef637102334f1832ba9.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[744],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[19,579],{
 
-/***/ 43418:
+/***/ 41832:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 
@@ -12,16 +12,16 @@ __webpack_require__.d(__webpack_exports__, {
 });
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
-var react = __webpack_require__(32735);
+var react = __webpack_require__(43001);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
-var prop_types = __webpack_require__(60216);
+var prop_types = __webpack_require__(3827);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 // EXTERNAL MODULE: ../../../node_modules/xstate/es/index.js + 22 modules
-var es = __webpack_require__(87519);
-// EXTERNAL MODULE: ../../../node_modules/@xstate/react/lib/index.js
-var lib = __webpack_require__(38531);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var src = __webpack_require__(43803);
+var es = __webpack_require__(261);
+// EXTERNAL MODULE: ../../../node_modules/@xstate/react/es/index.js + 8 modules
+var react_es = __webpack_require__(44530);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var src = __webpack_require__(71783);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/measurementTrackingMachine.js
 
 const RESPONSE = {
@@ -37,6 +37,7 @@ const machineConfiguration = {
   id: 'measurementTracking',
   initial: 'idle',
   context: {
+    activeViewportId: null,
     trackedStudy: '',
     trackedSeries: [],
     ignoredSeries: [],
@@ -66,7 +67,12 @@ const machineConfiguration = {
           cond: 'hasNotIgnoredSRSeriesForHydration'
         },
         RESTORE_PROMPT_HYDRATE_SR: 'promptHydrateStructuredReport',
-        HYDRATE_SR: 'hydrateStructuredReport'
+        HYDRATE_SR: 'hydrateStructuredReport',
+        UPDATE_ACTIVE_VIEWPORT_ID: {
+          actions: (0,es/* assign */.f0)({
+            activeViewportId: (_, event) => event.activeViewportId
+          })
+        }
       }
     },
     promptBeginTracking: {
@@ -247,7 +253,7 @@ const defaultOptions = {
     showStructuredReportDisplaySetInActiveViewport: (ctx, evt) => {
       console.warn('showStructuredReportDisplaySetInActiveViewport: not implemented');
     },
-    clearContext: (0,es.assign)({
+    clearContext: (0,es/* assign */.f0)({
       trackedStudy: '',
       trackedSeries: [],
       ignoredSeries: [],
@@ -256,7 +262,7 @@ const defaultOptions = {
       prevIgnoredSeries: []
     }),
     // Promise resolves w/ `evt.data.*`
-    setTrackedStudyAndSeries: (0,es.assign)((ctx, evt) => ({
+    setTrackedStudyAndSeries: (0,es/* assign */.f0)((ctx, evt) => ({
       prevTrackedStudy: ctx.trackedStudy,
       prevTrackedSeries: ctx.trackedSeries.slice(),
       prevIgnoredSeries: ctx.ignoredSeries.slice(),
@@ -265,7 +271,7 @@ const defaultOptions = {
       trackedSeries: [evt.data.SeriesInstanceUID],
       ignoredSeries: []
     })),
-    setTrackedStudyAndMultipleSeries: (0,es.assign)((ctx, evt) => {
+    setTrackedStudyAndMultipleSeries: (0,es/* assign */.f0)((ctx, evt) => {
       const studyInstanceUID = evt.StudyInstanceUID || evt.data.StudyInstanceUID;
       const seriesInstanceUIDs = evt.SeriesInstanceUIDs || evt.data.SeriesInstanceUIDs;
       return {
@@ -278,24 +284,24 @@ const defaultOptions = {
         ignoredSeries: []
       };
     }),
-    setIsDirtyToClean: (0,es.assign)((ctx, evt) => ({
+    setIsDirtyToClean: (0,es/* assign */.f0)((ctx, evt) => ({
       isDirty: false
     })),
-    setIsDirty: (0,es.assign)((ctx, evt) => ({
+    setIsDirty: (0,es/* assign */.f0)((ctx, evt) => ({
       isDirty: true
     })),
-    ignoreSeries: (0,es.assign)((ctx, evt) => ({
+    ignoreSeries: (0,es/* assign */.f0)((ctx, evt) => ({
       prevIgnoredSeries: [...ctx.ignoredSeries],
       ignoredSeries: [...ctx.ignoredSeries, evt.data.SeriesInstanceUID]
     })),
-    ignoreHydrationForSRSeries: (0,es.assign)((ctx, evt) => ({
+    ignoreHydrationForSRSeries: (0,es/* assign */.f0)((ctx, evt) => ({
       ignoredSRSeriesForHydration: [...ctx.ignoredSRSeriesForHydration, evt.data.srSeriesInstanceUID]
     })),
-    addTrackedSeries: (0,es.assign)((ctx, evt) => ({
+    addTrackedSeries: (0,es/* assign */.f0)((ctx, evt) => ({
       prevTrackedSeries: [...ctx.trackedSeries],
       trackedSeries: [...ctx.trackedSeries, evt.data.SeriesInstanceUID]
     })),
-    removeTrackedSeries: (0,es.assign)((ctx, evt) => ({
+    removeTrackedSeries: (0,es/* assign */.f0)((ctx, evt) => ({
       prevTrackedSeries: ctx.trackedSeries.slice().filter(ser => ser !== evt.SeriesInstanceUID),
       trackedSeries: ctx.trackedSeries.slice().filter(ser => ser !== evt.SeriesInstanceUID)
     }))
@@ -345,6 +351,7 @@ const defaultOptions = {
 };
 
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptBeginTracking.js
+
 const promptBeginTracking_RESPONSE = {
   NO_NEVER: -1,
   CANCEL: 0,
@@ -361,36 +368,36 @@ function promptBeginTracking(_ref, ctx, evt) {
     uiViewportDialogService
   } = servicesManager.services;
   const {
-    viewportIndex,
+    viewportId,
     StudyInstanceUID,
     SeriesInstanceUID
   } = evt;
   return new Promise(async function (resolve, reject) {
-    let promptResult = await _askTrackMeasurements(uiViewportDialogService, viewportIndex);
+    let promptResult = await _askTrackMeasurements(uiViewportDialogService, viewportId);
     resolve({
       userResponse: promptResult,
       StudyInstanceUID,
       SeriesInstanceUID,
-      viewportIndex
+      viewportId
     });
   });
 }
-function _askTrackMeasurements(uiViewportDialogService, viewportIndex) {
+function _askTrackMeasurements(uiViewportDialogService, viewportId) {
   return new Promise(function (resolve, reject) {
     const message = 'Track measurements for this series?';
     const actions = [{
       id: 'prompt-begin-tracking-cancel',
-      type: 'cancel',
+      type: src/* ButtonEnums.type */.LZ.dt.secondary,
       text: 'No',
       value: promptBeginTracking_RESPONSE.CANCEL
     }, {
       id: 'prompt-begin-tracking-no-do-not-ask-again',
-      type: 'secondary',
+      type: src/* ButtonEnums.type */.LZ.dt.secondary,
       text: 'No, do not ask again',
       value: promptBeginTracking_RESPONSE.NO_NEVER
     }, {
       id: 'prompt-begin-tracking-yes',
-      type: 'primary',
+      type: src/* ButtonEnums.type */.LZ.dt.primary,
       text: 'Yes',
       value: promptBeginTracking_RESPONSE.SET_STUDY_AND_SERIES
     }];
@@ -399,7 +406,7 @@ function _askTrackMeasurements(uiViewportDialogService, viewportIndex) {
       resolve(result);
     };
     uiViewportDialogService.show({
-      viewportIndex,
+      viewportId,
       id: 'measurement-tracking-prompt-begin-tracking',
       type: 'info',
       message,
@@ -414,6 +421,7 @@ function _askTrackMeasurements(uiViewportDialogService, viewportIndex) {
 }
 /* harmony default export */ const TrackedMeasurementsContext_promptBeginTracking = (promptBeginTracking);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptTrackNewSeries.js
+
 const promptTrackNewSeries_RESPONSE = {
   NO_NEVER: -1,
   CANCEL: 0,
@@ -431,37 +439,37 @@ function promptTrackNewSeries(_ref, ctx, evt) {
     UIViewportDialogService
   } = servicesManager.services;
   const {
-    viewportIndex,
+    viewportId,
     StudyInstanceUID,
     SeriesInstanceUID
   } = evt;
   return new Promise(async function (resolve, reject) {
-    let promptResult = await _askShouldAddMeasurements(UIViewportDialogService, viewportIndex);
+    let promptResult = await _askShouldAddMeasurements(UIViewportDialogService, viewportId);
     if (promptResult === promptTrackNewSeries_RESPONSE.CREATE_REPORT) {
-      promptResult = ctx.isDirty ? await _askSaveDiscardOrCancel(UIViewportDialogService, viewportIndex) : promptTrackNewSeries_RESPONSE.SET_STUDY_AND_SERIES;
+      promptResult = ctx.isDirty ? await _askSaveDiscardOrCancel(UIViewportDialogService, viewportId) : promptTrackNewSeries_RESPONSE.SET_STUDY_AND_SERIES;
     }
     resolve({
       userResponse: promptResult,
       StudyInstanceUID,
       SeriesInstanceUID,
-      viewportIndex,
+      viewportId,
       isBackupSave: false
     });
   });
 }
-function _askShouldAddMeasurements(uiViewportDialogService, viewportIndex) {
+function _askShouldAddMeasurements(uiViewportDialogService, viewportId) {
   return new Promise(function (resolve, reject) {
     const message = 'Do you want to add this measurement to the existing report?';
     const actions = [{
-      type: 'cancel',
+      type: src/* ButtonEnums.type */.LZ.dt.secondary,
       text: 'Cancel',
       value: promptTrackNewSeries_RESPONSE.CANCEL
     }, {
-      type: 'secondary',
+      type: src/* ButtonEnums.type */.LZ.dt.primary,
       text: 'Create new report',
       value: promptTrackNewSeries_RESPONSE.CREATE_REPORT
     }, {
-      type: 'primary',
+      type: src/* ButtonEnums.type */.LZ.dt.primary,
       text: 'Add to existing report',
       value: promptTrackNewSeries_RESPONSE.ADD_SERIES
     }];
@@ -470,7 +478,7 @@ function _askShouldAddMeasurements(uiViewportDialogService, viewportIndex) {
       resolve(result);
     };
     uiViewportDialogService.show({
-      viewportIndex,
+      viewportId,
       type: 'info',
       message,
       actions,
@@ -482,7 +490,7 @@ function _askShouldAddMeasurements(uiViewportDialogService, viewportIndex) {
     });
   });
 }
-function _askSaveDiscardOrCancel(UIViewportDialogService, viewportIndex) {
+function _askSaveDiscardOrCancel(UIViewportDialogService, viewportId) {
   return new Promise(function (resolve, reject) {
     const message = 'You have existing tracked measurements. What would you like to do with your existing tracked measurements?';
     const actions = [{
@@ -503,7 +511,7 @@ function _askSaveDiscardOrCancel(UIViewportDialogService, viewportIndex) {
       resolve(result);
     };
     UIViewportDialogService.show({
-      viewportIndex,
+      viewportId,
       type: 'warning',
       message,
       actions,
@@ -534,25 +542,25 @@ function promptTrackNewStudy(_ref, ctx, evt) {
     UIViewportDialogService
   } = servicesManager.services;
   const {
-    viewportIndex,
+    viewportId,
     StudyInstanceUID,
     SeriesInstanceUID
   } = evt;
   return new Promise(async function (resolve, reject) {
-    let promptResult = await promptTrackNewStudy_askTrackMeasurements(UIViewportDialogService, viewportIndex);
+    let promptResult = await promptTrackNewStudy_askTrackMeasurements(UIViewportDialogService, viewportId);
     if (promptResult === promptTrackNewStudy_RESPONSE.SET_STUDY_AND_SERIES) {
-      promptResult = ctx.isDirty ? await promptTrackNewStudy_askSaveDiscardOrCancel(UIViewportDialogService, viewportIndex) : promptTrackNewStudy_RESPONSE.SET_STUDY_AND_SERIES;
+      promptResult = ctx.isDirty ? await promptTrackNewStudy_askSaveDiscardOrCancel(UIViewportDialogService, viewportId) : promptTrackNewStudy_RESPONSE.SET_STUDY_AND_SERIES;
     }
     resolve({
       userResponse: promptResult,
       StudyInstanceUID,
       SeriesInstanceUID,
-      viewportIndex,
+      viewportId,
       isBackupSave: false
     });
   });
 }
-function promptTrackNewStudy_askTrackMeasurements(UIViewportDialogService, viewportIndex) {
+function promptTrackNewStudy_askTrackMeasurements(UIViewportDialogService, viewportId) {
   return new Promise(function (resolve, reject) {
     const message = 'Track measurements for this series?';
     const actions = [{
@@ -573,7 +581,7 @@ function promptTrackNewStudy_askTrackMeasurements(UIViewportDialogService, viewp
       resolve(result);
     };
     UIViewportDialogService.show({
-      viewportIndex,
+      viewportId,
       type: 'info',
       message,
       actions,
@@ -585,7 +593,7 @@ function promptTrackNewStudy_askTrackMeasurements(UIViewportDialogService, viewp
     });
   });
 }
-function promptTrackNewStudy_askSaveDiscardOrCancel(UIViewportDialogService, viewportIndex) {
+function promptTrackNewStudy_askSaveDiscardOrCancel(UIViewportDialogService, viewportId) {
   return new Promise(function (resolve, reject) {
     const message = 'Measurements cannot span across multiple studies. Do you want to save your tracked measurements?';
     const actions = [{
@@ -606,7 +614,7 @@ function promptTrackNewStudy_askSaveDiscardOrCancel(UIViewportDialogService, vie
       resolve(result);
     };
     UIViewportDialogService.show({
-      viewportIndex,
+      viewportId,
       type: 'warning',
       message,
       actions,
@@ -619,70 +627,17 @@ function promptTrackNewStudy_askSaveDiscardOrCancel(UIViewportDialogService, vie
   });
 }
 /* harmony default export */ const TrackedMeasurementsContext_promptTrackNewStudy = (promptTrackNewStudy);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var core_src = __webpack_require__(48501);
-;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/_shared/createReportAsync.tsx
-
-
-
-/**
- *
- * @param {*} servicesManager
- * @param {*} dataSource
- * @param {*} measurements
- * @param {*} options
- * @returns {string[]} displaySetInstanceUIDs
- */
-async function createReportAsync(servicesManager, commandsManager, dataSource, measurements, options) {
-  const {
-    displaySetService,
-    uiNotificationService,
-    uiDialogService
-  } = servicesManager.services;
-  const loadingDialogId = uiDialogService.create({
-    showOverlay: true,
-    isDraggable: false,
-    centralize: true,
-    // TODO: Create a loading indicator component + zeplin design?
-    content: Loading
-  });
-  try {
-    const naturalizedReport = await commandsManager.runCommand('storeMeasurements', {
-      measurementData: measurements,
-      dataSource,
-      additionalFindingTypes: ['ArrowAnnotate'],
-      options
-    }, 'CORNERSTONE_STRUCTURED_REPORT');
-
-    // The "Mode" route listens for DicomMetadataStore changes
-    // When a new instance is added, it listens and
-    // automatically calls makeDisplaySets
-    core_src.DicomMetadataStore.addInstances([naturalizedReport], true);
-    const displaySetInstanceUID = displaySetService.getMostRecentDisplaySet();
-    uiNotificationService.show({
-      title: 'Create Report',
-      message: 'Measurements saved successfully',
-      type: 'success'
-    });
-    return [displaySetInstanceUID];
-  } catch (error) {
-    uiNotificationService.show({
-      title: 'Create Report',
-      message: error.message || 'Failed to store measurements',
-      type: 'error'
-    });
-  } finally {
-    uiDialogService.dismiss({
-      id: loadingDialogId
-    });
-  }
-}
-function Loading() {
-  return /*#__PURE__*/react.createElement("div", {
-    className: "text-primary-active"
-  }, "Loading...");
+// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 76 modules
+var default_src = __webpack_require__(56342);
+;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/_shared/getNextSRSeriesNumber.js
+const MIN_SR_SERIES_NUMBER = 4700;
+function getNextSRSeriesNumber(displaySetService) {
+  const activeDisplaySets = displaySetService.getActiveDisplaySets();
+  const srDisplaySets = activeDisplaySets.filter(ds => ds.Modality === 'SR');
+  const srSeriesNumbers = srDisplaySets.map(ds => ds.SeriesNumber);
+  const maxSeriesNumber = Math.max(...srSeriesNumbers, MIN_SR_SERIES_NUMBER);
+  return maxSeriesNumber + 1;
 }
-/* harmony default export */ const _shared_createReportAsync = (createReportAsync);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/_shared/PROMPT_RESPONSES.js
 const PROMPT_RESPONSES_RESPONSE = {
   NO_NEVER: -1,
@@ -693,132 +648,10 @@ const PROMPT_RESPONSES_RESPONSE = {
   NO_NOT_FOR_SERIES: 4
 };
 /* harmony default export */ const PROMPT_RESPONSES = (PROMPT_RESPONSES_RESPONSE);
-;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/_shared/createReportDialogPrompt.tsx
-/* eslint-disable react/display-name */
-
-
-
-function createReportDialogPrompt(uiDialogService) {
-  return new Promise(function (resolve, reject) {
-    let dialogId = undefined;
-    const _handleClose = () => {
-      // Dismiss dialog
-      uiDialogService.dismiss({
-        id: dialogId
-      });
-      // Notify of cancel action
-      resolve({
-        action: PROMPT_RESPONSES.CANCEL,
-        value: undefined
-      });
-    };
-
-    /**
-     *
-     * @param {string} param0.action - value of action performed
-     * @param {string} param0.value - value from input field
-     */
-    const _handleFormSubmit = _ref => {
-      let {
-        action,
-        value
-      } = _ref;
-      uiDialogService.dismiss({
-        id: dialogId
-      });
-      switch (action.id) {
-        case 'save':
-          resolve({
-            action: PROMPT_RESPONSES.CREATE_REPORT,
-            value: value.label
-          });
-          break;
-        case 'cancel':
-          resolve({
-            action: PROMPT_RESPONSES.CANCEL,
-            value: undefined
-          });
-          break;
-      }
-    };
-    dialogId = uiDialogService.create({
-      centralize: true,
-      isDraggable: false,
-      content: src/* Dialog */.Vq,
-      useLastPosition: false,
-      showOverlay: true,
-      contentProps: {
-        title: 'Create Report',
-        value: {
-          label: ''
-        },
-        noCloseButton: true,
-        onClose: _handleClose,
-        actions: [{
-          id: 'cancel',
-          text: 'Cancel',
-          type: 'primary'
-        }, {
-          id: 'save',
-          text: 'Save',
-          type: 'secondary'
-        }],
-        // TODO: Should be on button press...
-        onSubmit: _handleFormSubmit,
-        body: _ref2 => {
-          let {
-            value,
-            setValue
-          } = _ref2;
-          const onChangeHandler = event => {
-            event.persist();
-            setValue(value => ({
-              ...value,
-              label: event.target.value
-            }));
-          };
-          const onKeyPressHandler = event => {
-            if (event.key === 'Enter') {
-              uiDialogService.dismiss({
-                id: dialogId
-              });
-              resolve({
-                action: PROMPT_RESPONSES.CREATE_REPORT,
-                value: value.label
-              });
-            }
-          };
-          return /*#__PURE__*/react.createElement("div", {
-            className: ""
-          }, /*#__PURE__*/react.createElement(src/* Input */.II, {
-            label: "Enter the report name",
-            labelClassName: "text-white grow leading-[1.2] text-[14px]",
-            autoFocus: true,
-            className: "bg-black border-primary-main grow",
-            type: "text",
-            value: value.label,
-            onChange: onChangeHandler,
-            onKeyPress: onKeyPressHandler
-          }));
-        }
-      }
-    });
-  });
-}
-;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/_shared/getNextSRSeriesNumber.js
-const MIN_SR_SERIES_NUMBER = 4700;
-function getNextSRSeriesNumber(displaySetService) {
-  const activeDisplaySets = displaySetService.getActiveDisplaySets();
-  const srDisplaySets = activeDisplaySets.filter(ds => ds.Modality === 'SR');
-  const srSeriesNumbers = srDisplaySets.map(ds => ds.SeriesNumber);
-  const maxSeriesNumber = Math.max(...srSeriesNumbers, MIN_SR_SERIES_NUMBER);
-  return maxSeriesNumber + 1;
-}
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptSaveReport.js
 
 
 
-
 function promptSaveReport(_ref, ctx, evt) {
   let {
     servicesManager,
@@ -830,7 +663,7 @@ function promptSaveReport(_ref, ctx, evt) {
     measurementService,
     displaySetService
   } = servicesManager.services;
-  const viewportIndex = evt.viewportIndex === undefined ? evt.data.viewportIndex : evt.viewportIndex;
+  const viewportId = evt.viewportId === undefined ? evt.data.viewportId : evt.viewportId;
   const isBackupSave = evt.isBackupSave === undefined ? evt.data.isBackupSave : evt.isBackupSave;
   const StudyInstanceUID = evt?.data?.StudyInstanceUID;
   const SeriesInstanceUID = evt?.data?.SeriesInstanceUID;
@@ -841,7 +674,9 @@ function promptSaveReport(_ref, ctx, evt) {
   let displaySetInstanceUIDs;
   return new Promise(async function (resolve, reject) {
     // TODO: Fallback if (uiDialogService) {
-    const promptResult = await createReportDialogPrompt(uiDialogService);
+    const promptResult = await (0,default_src.createReportDialogPrompt)(uiDialogService, {
+      extensionManager
+    });
     if (promptResult.action === PROMPT_RESPONSES.CREATE_REPORT) {
       const dataSources = extensionManager.getDataSources();
       const dataSource = dataSources[0];
@@ -853,9 +688,20 @@ function promptSaveReport(_ref, ctx, evt) {
       : promptResult.value; // provided value
 
       const SeriesNumber = getNextSRSeriesNumber(displaySetService);
-      displaySetInstanceUIDs = await _shared_createReportAsync(servicesManager, commandsManager, dataSource, trackedMeasurements, {
-        SeriesDescription,
-        SeriesNumber
+      const getReport = async () => {
+        return commandsManager.runCommand('storeMeasurements', {
+          measurementData: trackedMeasurements,
+          dataSource,
+          additionalFindingTypes: ['ArrowAnnotate'],
+          options: {
+            SeriesDescription,
+            SeriesNumber
+          }
+        }, 'CORNERSTONE_STRUCTURED_REPORT');
+      };
+      displaySetInstanceUIDs = await (0,default_src.createReportAsync)({
+        servicesManager,
+        getReport
       });
     } else if (promptResult.action === PROMPT_RESPONSES.CANCEL) {
       // Do nothing
@@ -865,16 +711,17 @@ function promptSaveReport(_ref, ctx, evt) {
       createdDisplaySetInstanceUIDs: displaySetInstanceUIDs,
       StudyInstanceUID,
       SeriesInstanceUID,
-      viewportIndex,
+      viewportId,
       isBackupSave
     });
   });
 }
 /* harmony default export */ const TrackedMeasurementsContext_promptSaveReport = (promptSaveReport);
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/index.tsx + 15 modules
-var cornerstone_dicom_sr_src = __webpack_require__(65948);
+var cornerstone_dicom_sr_src = __webpack_require__(42170);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptHydrateStructuredReport.js
 
+
 const promptHydrateStructuredReport_RESPONSE = {
   NO_NEVER: -1,
   CANCEL: 0,
@@ -887,19 +734,20 @@ const promptHydrateStructuredReport_RESPONSE = {
 function promptHydrateStructuredReport(_ref, ctx, evt) {
   let {
     servicesManager,
-    extensionManager
+    extensionManager,
+    appConfig
   } = _ref;
   const {
     uiViewportDialogService,
     displaySetService
   } = servicesManager.services;
   const {
-    viewportIndex,
+    viewportId,
     displaySetInstanceUID
   } = evt;
   const srDisplaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
   return new Promise(async function (resolve, reject) {
-    const promptResult = await promptHydrateStructuredReport_askTrackMeasurements(uiViewportDialogService, viewportIndex);
+    const promptResult = await promptHydrateStructuredReport_askTrackMeasurements(uiViewportDialogService, viewportId);
 
     // Need to do action here... So we can set state...
     let StudyInstanceUID, SeriesInstanceUIDs;
@@ -907,7 +755,8 @@ function promptHydrateStructuredReport(_ref, ctx, evt) {
       console.warn('!! HYDRATING STRUCTURED REPORT');
       const hydrationResult = (0,cornerstone_dicom_sr_src.hydrateStructuredReport)({
         servicesManager,
-        extensionManager
+        extensionManager,
+        appConfig
       }, displaySetInstanceUID);
       StudyInstanceUID = hydrationResult.StudyInstanceUID;
       SeriesInstanceUIDs = hydrationResult.SeriesInstanceUIDs;
@@ -916,21 +765,21 @@ function promptHydrateStructuredReport(_ref, ctx, evt) {
       userResponse: promptResult,
       displaySetInstanceUID: evt.displaySetInstanceUID,
       srSeriesInstanceUID: srDisplaySet.SeriesInstanceUID,
-      viewportIndex,
+      viewportId,
       StudyInstanceUID,
       SeriesInstanceUIDs
     });
   });
 }
-function promptHydrateStructuredReport_askTrackMeasurements(uiViewportDialogService, viewportIndex) {
+function promptHydrateStructuredReport_askTrackMeasurements(uiViewportDialogService, viewportId) {
   return new Promise(function (resolve, reject) {
     const message = 'Do you want to continue tracking measurements for this study?';
     const actions = [{
-      type: 'secondary',
+      type: src/* ButtonEnums.type */.LZ.dt.secondary,
       text: 'No',
       value: promptHydrateStructuredReport_RESPONSE.CANCEL
     }, {
-      type: 'primary',
+      type: src/* ButtonEnums.type */.LZ.dt.primary,
       text: 'Yes',
       value: promptHydrateStructuredReport_RESPONSE.HYDRATE_REPORT
     }];
@@ -939,7 +788,7 @@ function promptHydrateStructuredReport_askTrackMeasurements(uiViewportDialogServ
       resolve(result);
     };
     uiViewportDialogService.show({
-      viewportIndex,
+      viewportId,
       type: 'info',
       message,
       actions,
@@ -963,7 +812,7 @@ function hydrateStructuredReport(_ref, ctx, evt) {
     displaySetService
   } = servicesManager.services;
   const {
-    viewportIndex,
+    viewportId,
     displaySetInstanceUID
   } = evt;
   const srDisplaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
@@ -977,13 +826,15 @@ function hydrateStructuredReport(_ref, ctx, evt) {
     resolve({
       displaySetInstanceUID: evt.displaySetInstanceUID,
       srSeriesInstanceUID: srDisplaySet.SeriesInstanceUID,
-      viewportIndex,
+      viewportId,
       StudyInstanceUID,
       SeriesInstanceUIDs
     });
   });
 }
 /* harmony default export */ const TrackedMeasurementsContext_hydrateStructuredReport = (hydrateStructuredReport);
+// EXTERNAL MODULE: ./state/index.js + 1 modules
+var state = __webpack_require__(62657);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.tsx
 
 
@@ -997,6 +848,7 @@ function hydrateStructuredReport(_ref, ctx, evt) {
 
 
 
+
 const TrackedMeasurementsContext = /*#__PURE__*/react.createContext();
 TrackedMeasurementsContext.displayName = 'TrackedMeasurementsContext';
 const useTrackedMeasurements = () => (0,react.useContext)(TrackedMeasurementsContext);
@@ -1017,9 +869,10 @@ _ref2 // Component props
   let {
     children
   } = _ref2;
+  const [appConfig] = (0,state/* useAppConfig */.M)();
   const [viewportGrid, viewportGridService] = (0,src/* useViewportGrid */.O_)();
   const {
-    activeViewportIndex,
+    activeViewportId,
     viewports
   } = viewportGrid;
   const {
@@ -1031,11 +884,12 @@ _ref2 // Component props
     jumpToFirstMeasurementInActiveViewport: (ctx, evt) => {
       const {
         trackedStudy,
-        trackedSeries
+        trackedSeries,
+        activeViewportId
       } = ctx;
       const measurements = measurementService.getMeasurements();
       const trackedMeasurements = measurements.filter(m => trackedStudy === m.referenceStudyUID && trackedSeries.includes(m.referenceSeriesUID));
-      console.log('jumping to measurement reset viewport', viewportGrid.activeViewportIndex, trackedMeasurements[0]);
+      console.log('jumping to measurement reset viewport', activeViewportId, trackedMeasurements[0]);
       const referencedDisplaySetUID = trackedMeasurements[0].displaySetInstanceUID;
       const referencedDisplaySet = displaySetService.getDisplaySetByUID(referencedDisplaySetUID);
       const referencedImages = referencedDisplaySet.images;
@@ -1055,7 +909,7 @@ _ref2 // Component props
         }
       }
       viewportGridService.setDisplaySetsForViewport({
-        viewportIndex: viewportGrid.activeViewportIndex,
+        viewportId: activeViewportId,
         displaySetInstanceUIDs: [referencedDisplaySetUID],
         viewportOptions: {
           initialImageOptions: {
@@ -1066,9 +920,9 @@ _ref2 // Component props
     },
     showStructuredReportDisplaySetInActiveViewport: (ctx, evt) => {
       if (evt.data.createdDisplaySetInstanceUIDs.length > 0) {
-        const StructuredReportDisplaySetInstanceUID = evt.data.createdDisplaySetInstanceUIDs[0].displaySetInstanceUID;
+        const StructuredReportDisplaySetInstanceUID = evt.data.createdDisplaySetInstanceUIDs[0];
         viewportGridService.setDisplaySetsForViewport({
-          viewportIndex: evt.data.viewportIndex,
+          viewportId: evt.data.viewportId,
           displaySetInstanceUIDs: [StructuredReportDisplaySetInstanceUID]
         });
       }
@@ -1092,28 +946,34 @@ _ref2 // Component props
   machineOptions.services = Object.assign({}, machineOptions.services, {
     promptBeginTracking: TrackedMeasurementsContext_promptBeginTracking.bind(null, {
       servicesManager,
-      extensionManager
+      extensionManager,
+      appConfig
     }),
     promptTrackNewSeries: TrackedMeasurementsContext_promptTrackNewSeries.bind(null, {
       servicesManager,
-      extensionManager
+      extensionManager,
+      appConfig
     }),
     promptTrackNewStudy: TrackedMeasurementsContext_promptTrackNewStudy.bind(null, {
       servicesManager,
-      extensionManager
+      extensionManager,
+      appConfig
     }),
     promptSaveReport: TrackedMeasurementsContext_promptSaveReport.bind(null, {
       servicesManager,
       commandsManager,
-      extensionManager
+      extensionManager,
+      appConfig
     }),
     promptHydrateStructuredReport: TrackedMeasurementsContext_promptHydrateStructuredReport.bind(null, {
       servicesManager,
-      extensionManager
+      extensionManager,
+      appConfig
     }),
     hydrateStructuredReport: TrackedMeasurementsContext_hydrateStructuredReport.bind(null, {
       servicesManager,
-      extensionManager
+      extensionManager,
+      appConfig
     })
   });
 
@@ -1126,13 +986,19 @@ _ref2 // Component props
   // - Fix viewport border resize
   // - created/destroyed hooks for extensions (cornerstone measurement subscriptions in it's `init`)
 
-  const measurementTrackingMachine = (0,es.Machine)(machineConfiguration, machineOptions);
-  const [trackedMeasurements, sendTrackedMeasurementsEvent, trackedMeasurementsService] = (0,lib.useMachine)(measurementTrackingMachine);
+  const measurementTrackingMachine = (0,es/* Machine */.J)(machineConfiguration, machineOptions);
+  const [trackedMeasurements, sendTrackedMeasurementsEvent] = (0,react_es/* useMachine */.eO)(measurementTrackingMachine);
+  (0,react.useEffect)(() => {
+    // Update the state machine with the active viewport ID
+    sendTrackedMeasurementsEvent('UPDATE_ACTIVE_VIEWPORT_ID', {
+      activeViewportId
+    });
+  }, [activeViewportId, sendTrackedMeasurementsEvent]);
 
   // ~~ Listen for changes to ViewportGrid for potential SRs hung in panes when idle
   (0,react.useEffect)(() => {
-    if (viewports.length > 0) {
-      const activeViewport = viewports[activeViewportIndex];
+    if (viewports.size > 0) {
+      const activeViewport = viewports.get(activeViewportId);
       if (!activeViewport || !activeViewport?.displaySetInstanceUIDs?.length) {
         return;
       }
@@ -1171,11 +1037,11 @@ _ref2 // Component props
         sendTrackedMeasurementsEvent('PROMPT_HYDRATE_SR', {
           displaySetInstanceUID: displaySet.displaySetInstanceUID,
           SeriesInstanceUID: displaySet.SeriesInstanceUID,
-          viewportIndex: activeViewportIndex
+          viewportId: activeViewportId
         });
       }
     }
-  }, [activeViewportIndex, sendTrackedMeasurementsEvent, servicesManager.services, viewports]);
+  }, [activeViewportId, sendTrackedMeasurementsEvent, servicesManager.services, viewports]);
   return /*#__PURE__*/react.createElement(TrackedMeasurementsContext.Provider, {
     value: [trackedMeasurements, sendTrackedMeasurementsEvent]
   }, children);
@@ -1184,7 +1050,8 @@ TrackedMeasurementsContextProvider.propTypes = {
   children: prop_types_default().oneOf([(prop_types_default()).func, (prop_types_default()).node]),
   servicesManager: (prop_types_default()).object.isRequired,
   commandsManager: (prop_types_default()).object.isRequired,
-  extensionManager: (prop_types_default()).object.isRequired
+  extensionManager: (prop_types_default()).object.isRequired,
+  appConfig: (prop_types_default()).object
 };
 
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/index.js
@@ -1215,7 +1082,7 @@ function getContextModule(_ref) {
 
 /***/ }),
 
-/***/ 43744:
+/***/ 28030:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -1226,23 +1093,29 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ measurement_tracking_src)
 });
 
-// EXTERNAL MODULE: ../../../extensions/measurement-tracking/src/getContextModule.tsx + 14 modules
-var getContextModule = __webpack_require__(43418);
+// EXTERNAL MODULE: ../../../extensions/measurement-tracking/src/getContextModule.tsx + 12 modules
+var getContextModule = __webpack_require__(41832);
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
-var react = __webpack_require__(32735);
+var react = __webpack_require__(43001);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
-var prop_types = __webpack_require__(60216);
+var prop_types = __webpack_require__(3827);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../node_modules/react-router-dom/dist/index.js
+var dist = __webpack_require__(62474);
+// EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
+var es = __webpack_require__(69190);
+// EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
+var src = __webpack_require__(71771);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var ui_src = __webpack_require__(71783);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.tsx
 
 
 
 
 
+
+
 const {
   formatDate
 } = src.utils;
@@ -1260,12 +1133,15 @@ function PanelStudyBrowserTracking(_ref) {
     dataSource
   } = _ref;
   const {
-    measurementService,
     displaySetService,
     uiDialogService,
     hangingProtocolService,
     uiNotificationService
   } = servicesManager.services;
+  const navigate = (0,dist/* useNavigate */.s0)();
+  const {
+    t
+  } = (0,es/* useTranslation */.$G)('Common');
 
   // Normally you nest the components so the tree isn't so deep, and the data
   // doesn't have to have such an intense shape. This works well enough for now.
@@ -1274,10 +1150,8 @@ function PanelStudyBrowserTracking(_ref) {
     StudyInstanceUIDs
   } = (0,ui_src/* useImageViewer */.zG)();
   const [{
-    activeViewportIndex,
-    viewports,
-    numCols,
-    numRows
+    activeViewportId,
+    viewports
   }, viewportGridService] = (0,ui_src/* useViewportGrid */.O_)();
   const [trackedMeasurements, sendTrackedMeasurementsEvent] = (0,getContextModule/* useTrackedMeasurements */.I)();
   const [activeTabName, setActiveTabName] = (0,react.useState)('primary');
@@ -1288,9 +1162,9 @@ function PanelStudyBrowserTracking(_ref) {
   const [jumpToDisplaySet, setJumpToDisplaySet] = (0,react.useState)(null);
   const onDoubleClickThumbnailHandler = displaySetInstanceUID => {
     let updatedViewports = [];
-    const viewportIndex = activeViewportIndex;
+    const viewportId = activeViewportId;
     try {
-      updatedViewports = hangingProtocolService.getViewportsRequireUpdate(viewportIndex, displaySetInstanceUID);
+      updatedViewports = hangingProtocolService.getViewportsRequireUpdate(viewportId, displaySetInstanceUID);
     } catch (error) {
       console.warn(error);
       uiNotificationService.show({
@@ -1302,37 +1176,7 @@ function PanelStudyBrowserTracking(_ref) {
     }
     viewportGridService.setDisplaySetsForViewports(updatedViewports);
   };
-  const activeViewportDisplaySetInstanceUIDs = viewports[activeViewportIndex]?.displaySetInstanceUIDs;
-  (0,react.useEffect)(() => {
-    const added = measurementService.EVENTS.MEASUREMENT_ADDED;
-    const addedRaw = measurementService.EVENTS.RAW_MEASUREMENT_ADDED;
-    const subscriptions = [];
-    [added, addedRaw].forEach(evt => {
-      subscriptions.push(measurementService.subscribe(evt, _ref2 => {
-        let {
-          source,
-          measurement
-        } = _ref2;
-        const {
-          referenceSeriesUID: SeriesInstanceUID,
-          referenceStudyUID: StudyInstanceUID
-        } = measurement;
-        sendTrackedMeasurementsEvent('SET_DIRTY', {
-          SeriesInstanceUID
-        });
-        sendTrackedMeasurementsEvent('TRACK_SERIES', {
-          viewportIndex: activeViewportIndex,
-          StudyInstanceUID,
-          SeriesInstanceUID
-        });
-      }).unsubscribe);
-    });
-    return () => {
-      subscriptions.forEach(unsub => {
-        unsub();
-      });
-    };
-  }, [measurementService, activeViewportIndex, sendTrackedMeasurementsEvent]);
+  const activeViewportDisplaySetInstanceUIDs = viewports.get(activeViewportId)?.displaySetInstanceUIDs;
   const {
     trackedSeries
   } = trackedMeasurements.context;
@@ -1345,6 +1189,10 @@ function PanelStudyBrowserTracking(_ref) {
       const qidoForStudyUID = await dataSource.query.studies.search({
         studyInstanceUid: StudyInstanceUID
       });
+      if (!qidoForStudyUID?.length) {
+        navigate('/notfoundstudy', '_self');
+        throw new Error('Invalid study URL');
+      }
       let qidoStudiesForPatient = qidoForStudyUID;
 
       // try to fetch the prior studies based on the patientID if the
@@ -1358,7 +1206,7 @@ function PanelStudyBrowserTracking(_ref) {
       const actuallyMappedStudies = mappedStudies.map(qidoStudy => {
         return {
           studyInstanceUid: qidoStudy.StudyInstanceUID,
-          date: formatDate(qidoStudy.StudyDate),
+          date: formatDate(qidoStudy.StudyDate) || t('NoStudyDate'),
           description: qidoStudy.StudyDescription,
           modalities: qidoStudy.ModalitiesInStudy,
           numInstances: qidoStudy.NumInstances
@@ -1390,17 +1238,18 @@ function PanelStudyBrowserTracking(_ref) {
       const imageIds = dataSource.getImageIdsForDisplaySet(displaySet);
       const imageId = imageIds[Math.floor(imageIds.length / 2)];
 
-      // TODO: Is it okay that imageIds are not returned here for SR displaysets?
-      if (imageId) {
-        // When the image arrives, render it and store the result in the thumbnailImgSrcMap
-        newImageSrcEntry[dSet.displaySetInstanceUID] = await getImageSrc(imageId);
-        setThumbnailImageSrcMap(prevState => {
-          return {
-            ...prevState,
-            ...newImageSrcEntry
-          };
-        });
+      // TODO: Is it okay that imageIds are not returned here for SR displaySets?
+      if (!imageId || displaySet?.unsupported) {
+        return;
       }
+      // When the image arrives, render it and store the result in the thumbnailImgSrcMap
+      newImageSrcEntry[dSet.displaySetInstanceUID] = await getImageSrc(imageId);
+      setThumbnailImageSrcMap(prevState => {
+        return {
+          ...prevState,
+          ...newImageSrcEntry
+        };
+      });
     });
   }, [displaySetService, dataSource, getImageSrc]);
 
@@ -1427,6 +1276,9 @@ function PanelStudyBrowserTracking(_ref) {
         const displaySetInstanceUID = dSet.displaySetInstanceUID;
         const newImageSrcEntry = {};
         const displaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
+        if (displaySet?.unsupported) {
+          return;
+        }
         if (options.madeInClient) {
           setJumpToDisplaySet(displaySetInstanceUID);
         }
@@ -1434,31 +1286,41 @@ function PanelStudyBrowserTracking(_ref) {
         const imageId = imageIds[Math.floor(imageIds.length / 2)];
 
         // TODO: Is it okay that imageIds are not returned here for SR displaysets?
-        if (imageId) {
-          // When the image arrives, render it and store the result in the thumbnailImgSrcMap
-          newImageSrcEntry[displaySetInstanceUID] = await getImageSrc(imageId);
-          setThumbnailImageSrcMap(prevState => {
-            return {
-              ...prevState,
-              ...newImageSrcEntry
-            };
-          });
+        if (!imageId) {
+          return;
         }
+
+        // When the image arrives, render it and store the result in the thumbnailImgSrcMap
+        newImageSrcEntry[displaySetInstanceUID] = await getImageSrc(imageId);
+        setThumbnailImageSrcMap(prevState => {
+          return {
+            ...prevState,
+            ...newImageSrcEntry
+          };
+        });
       });
     });
-
+    return () => {
+      SubscriptionDisplaySetsAdded.unsubscribe();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [displaySetService, dataSource, getImageSrc, thumbnailImageSrcMap, trackedSeries, viewports]);
+  (0,react.useEffect)(() => {
     // TODO: Will this always hold _all_ the displaySets we care about?
     // DISPLAY_SETS_CHANGED returns `DisplaySerService.activeDisplaySets`
     const SubscriptionDisplaySetsChanged = displaySetService.subscribe(displaySetService.EVENTS.DISPLAY_SETS_CHANGED, changedDisplaySets => {
       const mappedDisplaySets = _mapDisplaySets(changedDisplaySets, thumbnailImageSrcMap, trackedSeries, viewports, viewportGridService, dataSource, displaySetService, uiDialogService, uiNotificationService);
       setDisplaySets(mappedDisplaySets);
     });
+    const SubscriptionDisplaySetMetaDataInvalidated = displaySetService.subscribe(displaySetService.EVENTS.DISPLAY_SET_SERIES_METADATA_INVALIDATED, () => {
+      const mappedDisplaySets = _mapDisplaySets(displaySetService.getActiveDisplaySets(), thumbnailImageSrcMap, trackedSeries, viewports, viewportGridService, dataSource, displaySetService, uiDialogService, uiNotificationService);
+      setDisplaySets(mappedDisplaySets);
+    });
     return () => {
-      SubscriptionDisplaySetsAdded.unsubscribe();
       SubscriptionDisplaySetsChanged.unsubscribe();
+      SubscriptionDisplaySetMetaDataInvalidated.unsubscribe();
     };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [displaySetService, dataSource, getImageSrc, thumbnailImageSrcMap, trackedSeries, viewports]);
+  }, [thumbnailImageSrcMap, trackedSeries, viewports, dataSource, displaySetService]);
   const tabs = _createStudyBrowserTabs(StudyInstanceUIDs, studyDisplayList, displaySets, hangingProtocolService);
 
   // TODO: Should not fire this on "close"
@@ -1568,14 +1430,16 @@ viewportGridService, dataSource, displaySetService, uiDialogService, uiNotificat
   const thumbnailNoImageDisplaySets = [];
   displaySets.filter(ds => !ds.excludeFromThumbnailBrowser).forEach(ds => {
     const imageSrc = thumbnailImageSrcMap[ds.displaySetInstanceUID];
-    const componentType = _getComponentType(ds.Modality);
+    const componentType = _getComponentType(ds);
     const numPanes = viewportGridService.getNumViewportPanes();
-    const viewportIdentificator = numPanes === 1 ? [] : viewports.reduce((acc, viewportData, index) => {
-      if (index < numPanes && viewportData?.displaySetInstanceUIDs?.includes(ds.displaySetInstanceUID)) {
-        acc.push(viewportData.viewportLabel);
-      }
-      return acc;
-    }, []);
+    const viewportIdentificator = [];
+    if (numPanes !== 1) {
+      viewports.forEach(viewportData => {
+        if (viewportData?.displaySetInstanceUIDs?.includes(ds.displaySetInstanceUID)) {
+          viewportIdentificator.push(viewportData.viewportLabel);
+        }
+      });
+    }
     const array = componentType === 'thumbnailTracked' ? thumbnailDisplaySets : thumbnailNoImageDisplaySets;
     const {
       displaySetInstanceUID
@@ -1588,6 +1452,7 @@ viewportGridService, dataSource, displaySetService, uiDialogService, uiNotificat
       seriesDate: formatDate(ds.SeriesDate),
       numInstances: ds.numImageFrames,
       countIcon: ds.countIcon,
+      messages: ds.messages,
       StudyInstanceUID: ds.StudyInstanceUID,
       componentType,
       imageSrc,
@@ -1598,11 +1463,12 @@ viewportGridService, dataSource, displaySetService, uiDialogService, uiNotificat
       },
 
       isTracked: trackedSeriesInstanceUIDs.includes(ds.SeriesInstanceUID),
+      isHydratedForDerivedDisplaySet: ds.isHydrated,
       viewportIdentificator
     };
     if (componentType === 'thumbnailNoImage') {
       if (dataSource.reject && dataSource.reject.series) {
-        thumbnailProps.canReject = true;
+        thumbnailProps.canReject = !ds?.unsupported;
         thumbnailProps.onReject = () => {
           uiDialogService.create({
             id: 'ds-reject-sr',
@@ -1613,16 +1479,18 @@ viewportGridService, dataSource, displaySetService, uiDialogService, uiNotificat
             contentProps: {
               title: 'Delete Report',
               body: () => /*#__PURE__*/react.createElement("div", {
-                className: "p-4 text-white bg-primary-dark"
-              }, /*#__PURE__*/react.createElement("p", null, "Are you sure you want to delete this report?"), /*#__PURE__*/react.createElement("p", null, "This action cannot be undone.")),
+                className: "bg-primary-dark p-4 text-white"
+              }, /*#__PURE__*/react.createElement("p", null, "Are you sure you want to delete this report?"), /*#__PURE__*/react.createElement("p", {
+                className: "mt-2"
+              }, "This action cannot be undone.")),
               actions: [{
                 id: 'cancel',
                 text: 'Cancel',
-                type: 'secondary'
+                type: ui_src/* ButtonEnums.type */.LZ.dt.secondary
               }, {
                 id: 'yes',
                 text: 'Yes',
-                type: 'primary',
+                type: ui_src/* ButtonEnums.type */.LZ.dt.primary,
                 classes: ['reject-yes-button']
               }],
               onClose: () => uiDialogService.dismiss({
@@ -1632,10 +1500,10 @@ viewportGridService, dataSource, displaySetService, uiDialogService, uiNotificat
                 const yesButton = document.querySelector('.reject-yes-button');
                 yesButton.focus();
               },
-              onSubmit: async _ref3 => {
+              onSubmit: async _ref2 => {
                 let {
                   action
-                } = _ref3;
+                } = _ref2;
                 switch (action.id) {
                   case 'yes':
                     try {
@@ -1679,8 +1547,8 @@ viewportGridService, dataSource, displaySetService, uiDialogService, uiNotificat
   return [...thumbnailDisplaySets, ...thumbnailNoImageDisplaySets];
 }
 const thumbnailNoImageModalities = ['SR', 'SEG', 'SM', 'RTSTRUCT', 'RTPLAN', 'RTDOSE', 'DOC', 'OT'];
-function _getComponentType(Modality) {
-  if (thumbnailNoImageModalities.includes(Modality)) {
+function _getComponentType(ds) {
+  if (thumbnailNoImageModalities.includes(ds.Modality) || ds?.unsupported) {
     return 'thumbnailNoImage';
   }
   return 'thumbnailTracked';
@@ -1877,10 +1745,8 @@ WrappedPanelStudyBrowserTracking.propTypes = {
   servicesManager: (prop_types_default()).object.isRequired
 };
 /* harmony default export */ const panels_PanelStudyBrowserTracking = (WrappedPanelStudyBrowserTracking);
-// EXTERNAL MODULE: ./hooks/index.js + 3 modules
-var hooks = __webpack_require__(39852);
-// EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
-var es = __webpack_require__(21572);
+// EXTERNAL MODULE: ./hooks/index.js + 1 modules
+var hooks = __webpack_require__(10800);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/ActionButtons.tsx
 
 
@@ -1896,20 +1762,15 @@ function ActionButtons(_ref) {
     t
   } = (0,es/* useTranslation */.$G)('MeasurementTable');
   return /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
-    className: "text-base px-2 py-2",
-    size: "initial",
-    variant: disabled ? 'disabled' : 'outlined',
-    color: "black",
-    border: "primaryActive",
     onClick: onExportClick,
-    disabled: disabled
+    disabled: disabled,
+    type: ui_src/* ButtonEnums.type */.LZ.dt.secondary,
+    size: ui_src/* ButtonEnums.size */.LZ.dp.small
   }, t('Export')), /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
-    className: "ml-2 px-2 text-base",
-    variant: disabled ? 'disabled' : 'outlined',
-    size: "initial",
-    color: "black",
-    border: "primaryActive",
+    className: "ml-2",
     onClick: onCreateReportClick,
+    type: ui_src/* ButtonEnums.type */.LZ.dt.secondary,
+    size: ui_src/* ButtonEnums.size */.LZ.dp.small,
     disabled: disabled
   }, t('Create Report')));
 }
@@ -1925,7 +1786,7 @@ ActionButtons.defaultProps = {
 };
 /* harmony default export */ const PanelMeasurementTableTracking_ActionButtons = (ActionButtons);
 // EXTERNAL MODULE: ../../../node_modules/lodash.debounce/index.js
-var lodash_debounce = __webpack_require__(40001);
+var lodash_debounce = __webpack_require__(8324);
 var lodash_debounce_default = /*#__PURE__*/__webpack_require__.n(lodash_debounce);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/index.tsx
 
@@ -1957,9 +1818,9 @@ function PanelMeasurementTableTracking(_ref) {
     servicesManager,
     extensionManager
   } = _ref;
-  const [viewportGrid, viewportGridService] = (0,ui_src/* useViewportGrid */.O_)();
+  const [viewportGrid] = (0,ui_src/* useViewportGrid */.O_)();
   const [measurementChangeTimestamp, setMeasurementsUpdated] = (0,react.useState)(Date.now().toString());
-  const debouncedMeasurementChangeTimestamp = (0,hooks/* useDebounce */.Nr)(measurementChangeTimestamp, 200);
+  const debouncedMeasurementChangeTimestamp = (0,hooks/* useDebounce */.N)(measurementChangeTimestamp, 200);
   const {
     measurementService,
     uiDialogService,
@@ -2053,7 +1914,7 @@ function PanelMeasurementTableTracking(_ref) {
       uid,
       isActive
     } = _ref2;
-    measurementService.jumpToMeasurement(viewportGrid.activeViewportIndex, uid);
+    measurementService.jumpToMeasurement(viewportGrid.activeViewportId, uid);
     onMeasurementItemClickHandler({
       uid,
       isActive
@@ -2126,23 +1987,21 @@ function PanelMeasurementTableTracking(_ref) {
             labelClassName: "text-white grow text-[14px] leading-[1.2]",
             autoFocus: true,
             id: "annotation",
-            className: "bg-black border-primary-main",
+            className: "border-primary-main bg-black",
             type: "text",
             value: value.label,
             onChange: onChangeHandler,
             onKeyPress: onKeyPressHandler
           });
         },
-        actions: [
-        // temp: swap button types until colors are updated
-        {
+        actions: [{
           id: 'cancel',
           text: 'Cancel',
-          type: 'primary'
+          type: ui_src/* ButtonEnums.type */.LZ.dt.secondary
         }, {
           id: 'save',
           text: 'Save',
-          type: 'secondary'
+          type: ui_src/* ButtonEnums.type */.LZ.dt.primary
         }],
         onSubmit: onSubmitHandler
       }
@@ -2164,7 +2023,7 @@ function PanelMeasurementTableTracking(_ref) {
   const displayMeasurementsWithoutFindings = displayMeasurements.filter(dm => dm.measurementType !== measurementService.VALUE_TYPES.POINT);
   const additionalFindings = displayMeasurements.filter(dm => dm.measurementType === measurementService.VALUE_TYPES.POINT);
   return /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("div", {
-    className: "overflow-x-hidden overflow-y-auto invisible-scrollbar",
+    className: "invisible-scrollbar overflow-y-auto overflow-x-hidden",
     ref: measurementsPanelRef,
     "data-cy": 'trackedMeasurements-panel'
   }, displayStudySummary.key && /*#__PURE__*/react.createElement(ui_src/* StudySummary */.YL, {
@@ -2189,7 +2048,7 @@ function PanelMeasurementTableTracking(_ref) {
     onExportClick: exportReport,
     onCreateReportClick: () => {
       sendTrackedMeasurementsEvent('SAVE_REPORT', {
-        viewportIndex: viewportGrid.activeViewportIndex,
+        viewportId: viewportGrid.activeViewportId,
         isBackupSave: true
       });
     },
@@ -2238,7 +2097,9 @@ function _mapMeasurementToDisplay(measurement, types, displaySetService) {
   if (findingSites) {
     const siteText = [];
     findingSites.forEach(site => {
-      if (site?.text !== label) siteText.push(site.text);
+      if (site?.text !== label) {
+        siteText.push(site.text);
+      }
     });
     displayText = [...siteText, ...displayText];
   }
@@ -2277,7 +2138,7 @@ function getPanelModule(_ref) {
   } = _ref;
   return [{
     name: 'seriesList',
-    iconName: 'group-layers',
+    iconName: 'tab-studies',
     iconLabel: 'Studies',
     label: 'Studies',
     component: panels_PanelStudyBrowserTracking.bind(null, {
@@ -2302,7 +2163,7 @@ function getPanelModule(_ref) {
 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); }
 
 const Component = /*#__PURE__*/react.lazy(() => {
-  return __webpack_require__.e(/* import() */ 799).then(__webpack_require__.bind(__webpack_require__, 91799));
+  return __webpack_require__.e(/* import() */ 822).then(__webpack_require__.bind(__webpack_require__, 86822));
 });
 const OHIFCornerstoneViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {