@ohif/app 3.7.0-beta.2 → 3.7.0-beta.21

package/dist/{707.bundle.57d5f86eceb59d415c4e.js → 707.bundle.112a221af4d036185312.js}

@@ -38,8 +38,8 @@ var react = __webpack_require__(32735);
 var esm = __webpack_require__(77331);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 321 modules
 var dist_esm = __webpack_require__(57270);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
+// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
+var src = __webpack_require__(62771);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/streaming-image-volume-loader/dist/esm/index.js + 13 modules
 var streaming_image_volume_loader_dist_esm = __webpack_require__(28909);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/dicom-image-loader/dist/dynamic-import/cornerstoneDICOMImageLoader.min.js
@@ -76,7 +76,7 @@ function initWebWorkers(appConfig) {
     initialized = true;
   }
 }
-function initWADOImageLoader(userAuthenticationService, appConfig) {
+function initWADOImageLoader(userAuthenticationService, appConfig, extensionManager) {
   (cornerstoneDICOMImageLoader_min_default()).external.cornerstone = esm;
   (cornerstoneDICOMImageLoader_min_default()).external.dicomParser = (dicomParser_min_default());
   registerVolumeLoader('cornerstoneStreamingImageVolume', streaming_image_volume_loader_dist_esm/* cornerstoneStreamingImageVolumeLoader */.IU);
@@ -90,18 +90,13 @@ function initWADOImageLoader(userAuthenticationService, appConfig) {
       convertFloatPixelDataToInt: false
     },
     beforeSend: function (xhr) {
+      //TODO should be removed in the future and request emitted by DicomWebDataSource
+      const sourceConfig = extensionManager.getActiveDataSource()?.[0].getConfig() ?? {};
       const headers = userAuthenticationService.getAuthorizationHeader();
-
-      // Request:
-      // JPEG-LS Lossless (1.2.840.10008.1.2.4.80) if available, otherwise accept
-      // whatever transfer-syntax the origin server provides.
-      // For now we use image/jls and image/x-jls because some servers still use the old type
-      // http://dicom.nema.org/medical/dicom/current/output/html/part18.html
+      const acceptHeader = src.utils.generateAcceptHeader(sourceConfig.acceptHeader, sourceConfig.requestTransferSyntaxUID, sourceConfig.omitQuotationForMultipartRequest);
       const xhrRequestHeaders = {
-        Accept: appConfig.omitQuotationForMultipartRequest ? 'multipart/related; type=application/octet-stream' : 'multipart/related; type="application/octet-stream"'
-        // 'multipart/related; type="image/x-jls", multipart/related; type="image/jls"; transfer-syntax="1.2.840.10008.1.2.4.80", multipart/related; type="image/x-jls", multipart/related; type="application/octet-stream"; transfer-syntax=*',
+        Accept: acceptHeader
       };
-
       if (headers) {
         Object.assign(xhrRequestHeaders, headers);
       }
@@ -122,8 +117,8 @@ function destroy() {
   }
   webWorkers.length = 0;
 }
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var ui_src = __webpack_require__(43803);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/callInputDialog.tsx
 
 
@@ -187,11 +182,11 @@ function callInputDialog(uiDialogService, data, callback) {
         actions: [{
           id: 'cancel',
           text: 'Cancel',
-          type: 'primary'
+          type: ui_src/* ButtonEnums.type */.LZ.U.secondary
         }, {
           id: 'save',
           text: 'Save',
-          type: 'secondary'
+          type: ui_src/* ButtonEnums.type */.LZ.U.primary
         }],
         onSubmit: onSubmitHandler,
         body: _ref2 => {
@@ -3254,7 +3249,7 @@ async function init(_ref) {
     thumbnail: appConfig?.maxNumRequests?.thumbnail || 75,
     prefetch: appConfig?.maxNumRequests?.prefetch || 10
   };
-  initWADOImageLoader(userAuthenticationService, appConfig);
+  initWADOImageLoader(userAuthenticationService, appConfig, extensionManager);
 
   /* Measurement Service */
   this.measurementServiceSource = connectToolsToMeasurementService(servicesManager);
@@ -3560,7 +3555,6 @@ const DicomUploadProgressItem = /*#__PURE__*/(0,react.memo)(_ref => {
   const [percentComplete, setPercentComplete] = (0,react.useState)(dicomFileUploader.getPercentComplete());
   const [failedReason, setFailedReason] = (0,react.useState)('');
   const [status, setStatus] = (0,react.useState)(dicomFileUploader.getStatus());
-  console.info(`${dicomFileUploader.getFileId()}`);
   const isComplete = (0,react.useCallback)(() => {
     return status === UploadStatus.Failed || status === UploadStatus.Cancelled || status === UploadStatus.Success;
   }, [status]);
@@ -3850,8 +3844,6 @@ function DicomUploadProgress(_ref) {
     }, numFilesCompleted === dicomFileUploaderArr.length ? /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("span", {
       className: NO_WRAP_ELLIPSIS_CLASS_NAMES
     }, `${dicomFileUploaderArr.length} ${dicomFileUploaderArr.length > 1 ? 'files' : 'file'} completed.`), /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
-      variant: "contained",
-      color: "primary",
       disabled: false,
       className: "ml-auto",
       onClick: onComplete
@@ -3959,8 +3951,6 @@ function DicomUpload(_ref) {
           getInputProps
         } = _ref3;
         return /*#__PURE__*/react.createElement("div", getRootProps(), /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
-          variant: "contained",
-          color: "primary",
           disabled: false,
           onClick: () => {}
         }, 'Add files', /*#__PURE__*/react.createElement("input", getInputProps())));
@@ -3973,9 +3963,7 @@ function DicomUpload(_ref) {
           getInputProps
         } = _ref4;
         return /*#__PURE__*/react.createElement("div", getRootProps(), /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
-          variant: "contained",
-          color: "primaryDark",
-          border: "primaryActive",
+          type: ui_src/* ButtonEnums.type */.LZ.U.secondary,
           disabled: false,
           onClick: () => {}
         }, 'Add folder', /*#__PURE__*/react.createElement("input", _extends({}, getInputProps(), {
@@ -6942,41 +6930,47 @@ class SegmentationService extends src/* PubSubService */.hC {
         segmentIndex,
         geometryId
       } = rtStructData;
-      const geometry = await esm.geometryLoader.createAndCacheGeometry(geometryId, {
-        geometryData: {
-          data,
-          id,
-          color,
-          frameOfReferenceUID: structureSet.frameOfReferenceUID,
-          segmentIndex
-        },
-        type: esm.Enums.GeometryType.CONTOUR
-      });
-      const contourSet = geometry.data;
-      const centroid = contourSet.getCentroid();
-      segmentsCachedStats[segmentIndex] = {
-        center: {
-          world: centroid
-        },
-        modifiedTime: rtDisplaySet.SeriesDate // we use the SeriesDate as the modifiedTime since this is the first time we are creating the segmentation
-      };
 
-      segmentation.segments[segmentIndex] = {
-        label: id,
-        segmentIndex,
-        color,
-        ...SEGMENT_CONSTANT
-      };
-      const numInitialized = Object.keys(segmentsCachedStats).length;
+      // catch error instead of failing to allow loading to continue
+      try {
+        const geometry = await esm.geometryLoader.createAndCacheGeometry(geometryId, {
+          geometryData: {
+            data,
+            id,
+            color,
+            frameOfReferenceUID: structureSet.frameOfReferenceUID,
+            segmentIndex
+          },
+          type: esm.Enums.GeometryType.CONTOUR
+        });
+        const contourSet = geometry.data;
+        const centroid = contourSet.getCentroid();
+        segmentsCachedStats[segmentIndex] = {
+          center: {
+            world: centroid
+          },
+          modifiedTime: rtDisplaySet.SeriesDate // we use the SeriesDate as the modifiedTime since this is the first time we are creating the segmentation
+        };
 
-      // Calculate percentage completed
-      const percentComplete = Math.round(numInitialized / allRTStructData.length * 100);
-      this._broadcastEvent(SegmentationService_EVENTS.SEGMENT_LOADING_COMPLETE, {
-        percentComplete,
-        // Note: this is not the geometryIds length since there might be
-        // some missing ROINumbers
-        numSegments: allRTStructData.length
-      });
+        segmentation.segments[segmentIndex] = {
+          label: id,
+          segmentIndex,
+          color,
+          ...SEGMENT_CONSTANT
+        };
+        const numInitialized = Object.keys(segmentsCachedStats).length;
+
+        // Calculate percentage completed
+        const percentComplete = Math.round(numInitialized / allRTStructData.length * 100);
+        this._broadcastEvent(SegmentationService_EVENTS.SEGMENT_LOADING_COMPLETE, {
+          percentComplete,
+          // Note: this is not the geometryIds length since there might be
+          // some missing ROINumbers
+          numSegments: allRTStructData.length
+        });
+      } catch (e) {
+        console.warn(e);
+      }
     };
     const promiseArray = [];
     for (let i = 0; i < allRTStructData.length; i++) {
@@ -7825,7 +7819,7 @@ class ViewportInfo {
     // Since SEG and other derived displaySets are loaded in a different way, and not
     // via cornerstoneViewportService
     let viewportData = this.getViewportData();
-    if (viewportData.viewportType === esm.Enums.ViewportType.ORTHOGRAPHIC) {
+    if (viewportData.viewportType === esm.Enums.ViewportType.ORTHOGRAPHIC || viewportData.viewportType === esm.Enums.ViewportType.VOLUME_3D) {
       viewportData = viewportData;
       return viewportData.data.some(_ref => {
         let {
@@ -8493,7 +8487,7 @@ class CornerstoneViewportService extends src/* PubSubService */.hC {
     const viewportId = viewportInfo.getViewportId();
     const viewport = this.getCornerstoneViewport(viewportId);
     const viewportCamera = viewport.getCamera();
-    if (viewport instanceof esm.VolumeViewport) {
+    if (viewport instanceof esm.VolumeViewport || viewport instanceof esm.VolumeViewport3D) {
       this._setVolumeViewport(viewport, viewportData, viewportInfo).then(() => {
         if (keepCamera) {
           viewport.setCamera(viewportCamera);

package/dist/{744.bundle.bfb752eba913c0a86d0a.js → 744.bundle.480d918dc1d9eb8293da.js}

@@ -20,8 +20,8 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 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);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/measurementTrackingMachine.js
 
 const RESPONSE = {
@@ -345,6 +345,7 @@ const defaultOptions = {
 };
 
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptBeginTracking.js
+
 const promptBeginTracking_RESPONSE = {
   NO_NEVER: -1,
   CANCEL: 0,
@@ -380,17 +381,17 @@ function _askTrackMeasurements(uiViewportDialogService, viewportIndex) {
     const message = 'Track measurements for this series?';
     const actions = [{
       id: 'prompt-begin-tracking-cancel',
-      type: 'cancel',
+      type: src/* ButtonEnums.type */.LZ.U.secondary,
       text: 'No',
       value: promptBeginTracking_RESPONSE.CANCEL
     }, {
       id: 'prompt-begin-tracking-no-do-not-ask-again',
-      type: 'secondary',
+      type: src/* ButtonEnums.type */.LZ.U.secondary,
       text: 'No, do not ask again',
       value: promptBeginTracking_RESPONSE.NO_NEVER
     }, {
       id: 'prompt-begin-tracking-yes',
-      type: 'primary',
+      type: src/* ButtonEnums.type */.LZ.U.primary,
       text: 'Yes',
       value: promptBeginTracking_RESPONSE.SET_STUDY_AND_SERIES
     }];
@@ -414,6 +415,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,
@@ -453,15 +455,15 @@ function _askShouldAddMeasurements(uiViewportDialogService, viewportIndex) {
   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.U.secondary,
       text: 'Cancel',
       value: promptTrackNewSeries_RESPONSE.CANCEL
     }, {
-      type: 'secondary',
+      type: src/* ButtonEnums.type */.LZ.U.primary,
       text: 'Create new report',
       value: promptTrackNewSeries_RESPONSE.CREATE_REPORT
     }, {
-      type: 'primary',
+      type: src/* ButtonEnums.type */.LZ.U.primary,
       text: 'Add to existing report',
       value: promptTrackNewSeries_RESPONSE.ADD_SERIES
     }];
@@ -619,8 +621,8 @@ 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);
+// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
+var core_src = __webpack_require__(62771);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/_shared/createReportAsync.tsx
 
 
@@ -723,17 +725,23 @@ function createReportDialogPrompt(uiDialogService) {
         action,
         value
       } = _ref;
-      uiDialogService.dismiss({
-        id: dialogId
-      });
       switch (action.id) {
         case 'save':
-          resolve({
-            action: PROMPT_RESPONSES.CREATE_REPORT,
-            value: value.label
-          });
+          // Only save if description is not blank otherwise ignore
+          if (value.label && value.label.trim() !== '') {
+            resolve({
+              action: PROMPT_RESPONSES.CREATE_REPORT,
+              value: value.label.trim()
+            });
+            uiDialogService.dismiss({
+              id: dialogId
+            });
+          }
           break;
         case 'cancel':
+          uiDialogService.dismiss({
+            id: dialogId
+          });
           resolve({
             action: PROMPT_RESPONSES.CANCEL,
             value: undefined
@@ -757,11 +765,11 @@ function createReportDialogPrompt(uiDialogService) {
         actions: [{
           id: 'cancel',
           text: 'Cancel',
-          type: 'primary'
+          type: src/* ButtonEnums.type */.LZ.U.secondary
         }, {
           id: 'save',
           text: 'Save',
-          type: 'secondary'
+          type: src/* ButtonEnums.type */.LZ.U.primary
         }],
         // TODO: Should be on button press...
         onSubmit: _handleFormSubmit,
@@ -779,12 +787,12 @@ function createReportDialogPrompt(uiDialogService) {
           };
           const onKeyPressHandler = event => {
             if (event.key === 'Enter') {
-              uiDialogService.dismiss({
-                id: dialogId
-              });
-              resolve({
-                action: PROMPT_RESPONSES.CREATE_REPORT,
-                value: value.label
+              // Trigger form submit
+              _handleFormSubmit({
+                action: {
+                  id: 'save'
+                },
+                value
               });
             }
           };
@@ -875,6 +883,7 @@ function promptSaveReport(_ref, ctx, evt) {
 var cornerstone_dicom_sr_src = __webpack_require__(65948);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptHydrateStructuredReport.js
 
+
 const promptHydrateStructuredReport_RESPONSE = {
   NO_NEVER: -1,
   CANCEL: 0,
@@ -926,11 +935,11 @@ function promptHydrateStructuredReport_askTrackMeasurements(uiViewportDialogServ
   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.U.secondary,
       text: 'No',
       value: promptHydrateStructuredReport_RESPONSE.CANCEL
     }, {
-      type: 'primary',
+      type: src/* ButtonEnums.type */.LZ.U.primary,
       text: 'Yes',
       value: promptHydrateStructuredReport_RESPONSE.HYDRATE_REPORT
     }];
@@ -1233,16 +1242,19 @@ var react = __webpack_require__(32735);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(60216);
 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-i18next/dist/es/index.js + 15 modules
+var es = __webpack_require__(21572);
+// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
+var src = __webpack_require__(62771);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var ui_src = __webpack_require__(28619);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.tsx
 
 
 
 
 
+
 const {
   formatDate
 } = src.utils;
@@ -1266,6 +1278,9 @@ function PanelStudyBrowserTracking(_ref) {
     hangingProtocolService,
     uiNotificationService
   } = servicesManager.services;
+  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.
@@ -1358,7 +1373,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
@@ -1618,11 +1633,11 @@ viewportGridService, dataSource, displaySetService, uiDialogService, uiNotificat
               actions: [{
                 id: 'cancel',
                 text: 'Cancel',
-                type: 'secondary'
+                type: ui_src/* ButtonEnums.type */.LZ.U.secondary
               }, {
                 id: 'yes',
                 text: 'Yes',
-                type: 'primary',
+                type: ui_src/* ButtonEnums.type */.LZ.U.primary,
                 classes: ['reject-yes-button']
               }],
               onClose: () => uiDialogService.dismiss({
@@ -1879,8 +1894,6 @@ WrappedPanelStudyBrowserTracking.propTypes = {
 /* 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);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/ActionButtons.tsx
 
 
@@ -1896,20 +1909,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.U.secondary,
+    size: ui_src/* ButtonEnums.size */.LZ.d.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.U.secondary,
+    size: ui_src/* ButtonEnums.size */.LZ.d.small,
     disabled: disabled
   }, t('Create Report')));
 }
@@ -2133,16 +2141,14 @@ function PanelMeasurementTableTracking(_ref) {
             onKeyPress: onKeyPressHandler
           });
         },
-        actions: [
-        // temp: swap button types until colors are updated
-        {
+        actions: [{
           id: 'cancel',
           text: 'Cancel',
-          type: 'primary'
+          type: ui_src/* ButtonEnums.type */.LZ.U.secondary
         }, {
           id: 'save',
           text: 'Save',
-          type: 'secondary'
+          type: ui_src/* ButtonEnums.type */.LZ.U.primary
         }],
         onSubmit: onSubmitHandler
       }

package/dist/{790.bundle.e28eaccb6818de78ae48.js → 790.bundle.981ed07d900d4a0a4b53.js}

@@ -12,10 +12,10 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ basic_dev_mode_src)
 });
 
-// EXTERNAL MODULE: ../../ui/src/index.js + 449 modules
-var src = __webpack_require__(43803);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var core_src = __webpack_require__(48501);
+// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
+var src = __webpack_require__(28619);
+// EXTERNAL MODULE: ../../core/src/index.ts + 102 modules
+var core_src = __webpack_require__(62771);
 ;// CONCATENATED MODULE: ../../../modes/basic-dev-mode/src/toolbarButtons.js
 // TODO: torn, can either bake this here; or have to create a whole new button type
 // Only ways that you can pass in a custom React component for render :l

package/dist/{799.bundle.ca18bdf4abe4d9abea26.js → 799.bundle.6fbb7a97bccfb55dc79f.js}

@@ -11,8 +11,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(32735);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(60216);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(48501);
-/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(43803);
+/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(62771);
+/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(28619);
 /* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(21572);
 /* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(57270);
 /* harmony import */ var _getContextModule__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(43418);
@@ -40,7 +40,7 @@ function TrackedCornerstoneViewport(props) {
   } = props;
   const {
     t
-  } = (0,react_i18next__WEBPACK_IMPORTED_MODULE_4__/* .useTranslation */ .$G)('TrackedViewport');
+  } = (0,react_i18next__WEBPACK_IMPORTED_MODULE_4__/* .useTranslation */ .$G)('Common');
   const {
     measurementService,
     cornerstoneViewportService
@@ -69,6 +69,7 @@ function TrackedCornerstoneViewport(props) {
     PatientAge,
     SliceThickness,
     SpacingBetweenSlices,
+    StudyDate,
     ManufacturerModelName
   } = displaySet.images[0];
   const updateIsTracked = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(() => {
@@ -159,8 +160,7 @@ function TrackedCornerstoneViewport(props) {
     getStatusComponent: () => _getStatusComponent(isTracked),
     studyData: {
       label: viewportLabel,
-      studyDate: formatDate(SeriesDate),
-      // TODO: This is series date. Is that ok?
+      studyDate: formatDate(SeriesDate) || formatDate(StudyDate) || t('NoStudyDate'),
       currentSeries: SeriesNumber,
       // TODO - switch entire currentSeries to be UID based or actual position based
       seriesDescription: SeriesDescription,