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

package/dist/{82.bundle.2b4c115ba19903aa6bba.js → 82.bundle.dbd076c633a0568628be.js}

@@ -29,8 +29,8 @@ __webpack_require__.d(utils_namespaceObject, {
 
 // EXTERNAL MODULE: ../../../node_modules/dicomweb-client/build/dicomweb-client.es.js
 var dicomweb_client_es = __webpack_require__(75935);
-// 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: ../../core/src/utils/sortStudy.ts
 var sortStudy = __webpack_require__(87853);
 ;// CONCATENATED MODULE: ../../../extensions/default/src/DicomWebDataSource/qido.js
@@ -999,21 +999,41 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
     supportsWildcard,
     supportsReject,
     staticWado,
-    singlepart
+    singlepart,
+    omitQuotationForMultipartRequest,
+    acceptHeader,
+    requestTransferSyntaxUID
   } = dicomWebConfig;
   const dicomWebConfigCopy = JSON.parse(JSON.stringify(dicomWebConfig));
+  const getAuthrorizationHeader = () => {
+    const xhrRequestHeaders = {};
+    const authHeaders = userAuthenticationService.getAuthorizationHeader();
+    if (authHeaders && authHeaders.Authorization) {
+      xhrRequestHeaders.Authorization = authHeaders.Authorization;
+    }
+    return xhrRequestHeaders;
+  };
+  const generateWadoHeader = () => {
+    let authorizationHeader = getAuthrorizationHeader();
+    //Generate accept header depending on config params
+    let formattedAcceptHeader = src.utils.generateAcceptHeader(acceptHeader, requestTransferSyntaxUID, omitQuotationForMultipartRequest);
+    return {
+      ...authorizationHeader,
+      Accept: formattedAcceptHeader
+    };
+  };
   const qidoConfig = {
     url: qidoRoot,
     staticWado,
     singlepart,
-    headers: userAuthenticationService.getAuthorizationHeader(),
+    headers: getAuthrorizationHeader(),
     errorInterceptor: src/* errorHandler */.Po.getHTTPErrorHandler()
   };
   const wadoConfig = {
     url: wadoRoot,
     staticWado,
     singlepart,
-    headers: userAuthenticationService.getAuthorizationHeader(),
+    headers: generateWadoHeader(),
     errorInterceptor: src/* errorHandler */.Po.getHTTPErrorHandler()
   };
 
@@ -1039,10 +1059,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
       studies: {
         mapParams: mapParams.bind(),
         search: async function (origParams) {
-          const headers = userAuthenticationService.getAuthorizationHeader();
-          if (headers) {
-            qidoDicomWebClient.headers = headers;
-          }
+          qidoDicomWebClient.headers = getAuthrorizationHeader();
           const {
             studyInstanceUid,
             seriesInstanceUid,
@@ -1059,10 +1076,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
       series: {
         // mapParams: mapParams.bind(),
         search: async function (studyInstanceUid) {
-          const headers = userAuthenticationService.getAuthorizationHeader();
-          if (headers) {
-            qidoDicomWebClient.headers = headers;
-          }
+          qidoDicomWebClient.headers = getAuthrorizationHeader();
           const results = await seriesInStudy(qidoDicomWebClient, studyInstanceUid);
           return processSeriesResults(results);
         }
@@ -1071,10 +1085,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
 
       instances: {
         search: (studyInstanceUid, queryParameters) => {
-          const headers = userAuthenticationService.getAuthorizationHeader();
-          if (headers) {
-            qidoDicomWebClient.headers = headers;
-          }
+          qidoDicomWebClient.headers = getAuthrorizationHeader();
           search.call(undefined, qidoDicomWebClient, studyInstanceUid, null, queryParameters);
         }
       }
@@ -1102,6 +1113,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
           StudyInstanceUID,
           BulkDataURI
         } = _ref2;
+        qidoDicomWebClient.headers = getAuthrorizationHeader();
         const options = {
           multipart: false,
           BulkDataURI,
@@ -1121,10 +1133,6 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
             sortFunction,
             madeInClient = false
           } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-          const headers = userAuthenticationService.getAuthorizationHeader();
-          if (headers) {
-            wadoDicomWebClient.headers = headers;
-          }
           if (!StudyInstanceUID) {
             throw new Error('Unable to query for SeriesMetadata without StudyInstanceUID');
           }
@@ -1137,10 +1145,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
     },
     store: {
       dicom: async (dataset, request) => {
-        const headers = userAuthenticationService.getAuthorizationHeader();
-        if (headers) {
-          wadoDicomWebClient.headers = headers;
-        }
+        wadoDicomWebClient.headers = getAuthrorizationHeader();
         if (dataset instanceof ArrayBuffer) {
           const options = {
             datasets: [dataset],
@@ -1170,7 +1175,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
     },
     _retrieveSeriesMetadataSync: async (StudyInstanceUID, filters, sortCriteria, sortFunction, madeInClient) => {
       const enableStudyLazyLoad = false;
-
+      wadoDicomWebClient.headers = generateWadoHeader();
       // data is all SOPInstanceUIDs
       const data = await retrieveStudyMetadata(wadoDicomWebClient, StudyInstanceUID, enableStudyLazyLoad, filters, sortCriteria, sortFunction);
 
@@ -1215,6 +1220,7 @@ function createDicomWebApi(dicomWebConfig, userAuthenticationService) {
     _retrieveSeriesMetadataAsync: async function (StudyInstanceUID, filters, sortCriteria, sortFunction) {
       let madeInClient = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
       const enableStudyLazyLoad = true;
+      wadoDicomWebClient.headers = generateWadoHeader();
       // Get Series
       const {
         preLoadData: seriesSummaryMetadata,
@@ -1988,8 +1994,8 @@ var dist = __webpack_require__(65783);
 var es = __webpack_require__(21572);
 // EXTERNAL MODULE: ../node_modules/react-router/dist/index.js
 var react_router_dist = __webpack_require__(14935);
-// 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);
 // EXTERNAL MODULE: ../../i18n/src/index.js + 95 modules
 var i18n_src = __webpack_require__(93058);
 // EXTERNAL MODULE: ./state/index.js + 1 modules
@@ -2143,8 +2149,8 @@ function ViewerLayout(_ref) {
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.7.0-beta.2";
-  const commitHash = "14369414cf0193f00243ae5c9f8415cf7079a753";
+  const versionNumber = "3.7.0-beta.21";
+  const commitHash = "3efa793e602a3d85409ece95b4e970b4c40d03b1";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',
@@ -2801,10 +2807,10 @@ function ActionButtons(_ref) {
   return /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement(ui_src/* ButtonGroup */.hE, {
     color: "black",
     size: "inherit"
-  }, /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
+  }, /*#__PURE__*/react.createElement(ui_src/* LegacyButton */.mN, {
     className: "px-2 py-2 text-base",
     onClick: onExportClick
-  }, t('Export CSV')), /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
+  }, t('Export CSV')), /*#__PURE__*/react.createElement(ui_src/* LegacyButton */.mN, {
     className: "px-2 py-2 text-base",
     onClick: onCreateReportClick
   }, t('Create Report'))));
@@ -2906,11 +2912,11 @@ function createReportDialogPrompt(uiDialogService, _ref) {
         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
         }],
         // TODO: Should be on button press...
         onSubmit: _handleFormSubmit,
@@ -3262,16 +3268,14 @@ function PanelMeasurementTable(_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
       }
@@ -5746,7 +5750,8 @@ function DataSourceSelector() {
   }, /*#__PURE__*/react.createElement("h1", {
     className: "text-white"
   }, ds.friendlyName), /*#__PURE__*/react.createElement(ui_src/* Button */.zx, {
-    className: classnames_default()('font-bold', 'ml-2'),
+    type: ui_src/* ButtonEnums.type */.LZ.U.primary,
+    className: classnames_default()('ml-2'),
     onClick: () => {
       navigate({
         pathname: '/',

package/dist/{917.bundle.ab1b2df827119f94a898.js → 917.bundle.3f61a417e9a607b190da.js}

@@ -21,8 +21,8 @@ const package_namespaceObject = JSON.parse('{"u2":"@ohif/extension-dicom-video"}
 const id = package_namespaceObject.u2;
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.dicom-video`;
 
-// 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);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-video/src/getSopClassHandlerModule.js
 
 

package/dist/{953.bundle.9e3a7225f07336bfcb41.js → 953.bundle.bad442420f62f5ab0c4b.js}

@@ -12,9 +12,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(32735);
 /* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(21572);
-/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(48501);
+/* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(62771);
 /* harmony import */ var _tools_modules_dicomSRModule__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(94709);
-/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(43803);
+/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(28619);
 /* harmony import */ var _utils_hydrateStructuredReport__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(68525);
 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); }
 

package/dist/{973.bundle.50644c5c4630221c00ac.js → 973.bundle.b833bec4e621fe4283c4.js}

@@ -13,8 +13,8 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ microscopy_src)
 });
 
-// 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);
 ;// CONCATENATED MODULE: ../../../modes/microscopy/package.json
 const package_namespaceObject = JSON.parse('{"u2":"@ohif/mode-microscopy"}');
 ;// CONCATENATED MODULE: ../../../modes/microscopy/src/id.js

package/dist/{976.bundle.2ee705b3311b8db2de5f.js → 976.bundle.0ec9edf8d307c412df16.js}

@@ -20,10 +20,10 @@ const id = package_namespaceObject.u2;
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
 var react = __webpack_require__(32735);
-// 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);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
 var es = __webpack_require__(21572);
 // EXTERNAL MODULE: ../../../node_modules/mathjs/lib/esm/index.js + 972 modules
@@ -1418,11 +1418,11 @@ function callInputDialog(_ref) {
         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
         }],
         onSubmit: onSubmitHandler,
         body: _ref3 => {

package/dist/{984.bundle.894dafd69ff965b87709.js → 984.bundle.1a1fe6f2b122b329a61d.js}

@@ -25,8 +25,8 @@ const id = package_namespaceObject.u2;
 const SOPClassHandlerName = 'dicom-sr';
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 
-// 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/gl-matrix/esm/index.js + 10 modules
 var esm = __webpack_require__(88256);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 321 modules
@@ -1585,8 +1585,8 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 335 modules
 var esm = __webpack_require__(77331);
-// 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);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/getLabelFromDCMJSImportedToolData.js
 /**
  * Extracts the label from the toolData imported from dcmjs. We need to do this

package/dist/app-config.js

@@ -11,7 +11,6 @@ window.config = {
   // some windows systems have issues with more than 3 web workers
   maxNumberOfWebWorkers: 3,
   // below flag is for performance reasons, but it might not work for all servers
-  omitQuotationForMultipartRequest: true,
   showWarningMessageForCrossOrigin: true,
   showCPUFallbackMessage: true,
   showLoadingIndicator: true,
@@ -51,7 +50,6 @@ window.config = {
         wadoUriRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb',
         qidoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb',
         wadoRoot: 'https://d33do7qe4w26qo.cloudfront.net/dicomweb',
-
         qidoSupportsIncludeField: false,
         supportsReject: false,
         imageRendering: 'wadors',
@@ -68,6 +66,7 @@ window.config = {
           enabled: true,
           relativeResolution: 'studies',
         },
+        omitQuotationForMultipartRequest: true,
       },
     },
     {