@ohif/app 3.8.0-beta.44 → 3.8.0-beta.46

package/dist/{170.bundle.1f3fe239b9c1b1190487.js → 170.bundle.d67d45cc1b7b9f84456c.js}

@@ -29,8 +29,8 @@ const SOPClassHandlerId = `${id}.sopClassHandlerModule.${SOPClassHandlerName}`;
 var src = __webpack_require__(71771);
 // EXTERNAL MODULE: ../../../node_modules/gl-matrix/esm/index.js + 10 modules
 var esm = __webpack_require__(45451);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 448 modules
-var dist_esm = __webpack_require__(81399);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 454 modules
+var dist_esm = __webpack_require__(76634);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 375 modules
 var core_dist_esm = __webpack_require__(56846);
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/tools/modules/dicomSRModule.js
@@ -1631,8 +1631,8 @@ function getLabelFromDCMJSImportedToolData(toolData) {
 }
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/adapters.es.js
 var adapters_es = __webpack_require__(91202);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 448 modules
-var dist_esm = __webpack_require__(81399);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 454 modules
+var dist_esm = __webpack_require__(76634);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.js
 
 

package/dist/{181.bundle.a2d7b26d73467d2ce8cd.js → 181.bundle.59bc83ea0a5cf5d335e7.js}

@@ -19,8 +19,8 @@ var index_esm = __webpack_require__(7023);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(3827);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 448 modules
-var esm = __webpack_require__(81399);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 454 modules
+var esm = __webpack_require__(76634);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 375 modules
 var dist_esm = __webpack_require__(56846);
 // EXTERNAL MODULE: ../../core/src/index.ts + 65 modules

package/dist/{456.bundle.e13d33d52ad90d855d17.js → 456.bundle.91e448feea24adbb07da.js}

@@ -37,8 +37,8 @@ __webpack_require__.r(types_namespaceObject);
 var react = __webpack_require__(43001);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 375 modules
 var esm = __webpack_require__(56846);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 448 modules
-var dist_esm = __webpack_require__(81399);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 454 modules
+var dist_esm = __webpack_require__(76634);
 // EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
 var src = __webpack_require__(71771);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/streaming-image-volume-loader/dist/esm/index.js + 13 modules

package/dist/{466.bundle.3c02041e1d1a06ff405a.js → 466.bundle.5d139ee45607d5b0859e.js}

@@ -26,8 +26,8 @@ var react = __webpack_require__(43001);
 var src = __webpack_require__(71771);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 375 modules
 var esm = __webpack_require__(56846);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 448 modules
-var dist_esm = __webpack_require__(81399);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 454 modules
+var dist_esm = __webpack_require__(76634);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/adapters.es.js
 var adapters_es = __webpack_require__(91202);
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js

package/dist/{483.bundle.b6c38c658dc197444754.js → 483.bundle.c369395e0d9b40db0f4e.js}

@@ -1527,8 +1527,8 @@ function getPanelModule({
   }];
 }
 /* harmony default export */ const src_getPanelModule = (getPanelModule);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 448 modules
-var esm = __webpack_require__(81399);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 454 modules
+var esm = __webpack_require__(76634);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 375 modules
 var dist_esm = __webpack_require__(56846);
 ;// CONCATENATED MODULE: ../../../extensions/tmtv/src/utils/measurementServiceMappings/constants/supportedTools.js

package/dist/{738.bundle.1a1774ad29dfc01d0530.js → 738.bundle.a78c54de79dfe11c2c19.js}

@@ -393,10 +393,11 @@ class RetrieveMetadataLoader {
    * @param {Object} client The dicomweb-client.
    * @param {Array} studyInstanceUID Study instance ui to be retrieved
    * @param {Object} [filters] - Object containing filters to be applied on retrieve metadata process
-   * @param {string} [filter.seriesInstanceUID] - series instance uid to filter results against
-   * @param {Function} [sortSeries] - Custom sort function for series
+   * @param {string} [filters.seriesInstanceUID] - series instance uid to filter results against
+   * @param {Object} [sortCriteria] - Custom sort criteria used for series
+   * @param {Function} [sortFunction] - Custom sort function for series
    */
-  constructor(client, studyInstanceUID, filters = {}, sortCriteria, sortFunction) {
+  constructor(client, studyInstanceUID, filters = {}, sortCriteria = undefined, sortFunction = undefined) {
     this.client = client;
     this.studyInstanceUID = studyInstanceUID;
     this.filters = filters;
@@ -417,13 +418,9 @@ class RetrieveMetadataLoader {
   async runLoaders(loaders) {
     let result;
     for (const loader of loaders) {
-      try {
-        result = await loader();
-        if (result && result.length) {
-          break; // closes iterator in case data is retrieved successfully
-        }
-      } catch (e) {
-        throw e;
+      result = await loader();
+      if (result && result.length) {
+        break; // closes iterator in case data is retrieved successfully
       }
     }
     if (loaders.next().done && !result) {
@@ -506,6 +503,57 @@ class RetrieveMetadataLoaderSync extends RetrieveMetadataLoader {
 
 
 
+// Series Date, Series Time, Series Description and Series Number to be included
+// in the series metadata query result
+const includeField = ['00080021', '00080031', '0008103E', '00200011'].join(',');
+class DeferredPromise {
+  constructor() {
+    this.metadata = undefined;
+    this.processFunction = undefined;
+    this.internalPromise = undefined;
+    this.thenFunction = undefined;
+    this.rejectFunction = undefined;
+  }
+  setMetadata(metadata) {
+    this.metadata = metadata;
+  }
+  setProcessFunction(func) {
+    this.processFunction = func;
+  }
+  getPromise() {
+    return this.start();
+  }
+  start() {
+    if (this.internalPromise) {
+      return this.internalPromise;
+    }
+    this.internalPromise = this.processFunction();
+    // in case then and reject functions called before start
+    if (this.thenFunction) {
+      this.then(this.thenFunction);
+      this.thenFunction = undefined;
+    }
+    if (this.rejectFunction) {
+      this.reject(this.rejectFunction);
+      this.rejectFunction = undefined;
+    }
+    return this.internalPromise;
+  }
+  then(func) {
+    if (this.internalPromise) {
+      return this.internalPromise.then(func);
+    } else {
+      this.thenFunction = func;
+    }
+  }
+  reject(func) {
+    if (this.internalPromise) {
+      return this.internalPromise.reject(func);
+    } else {
+      this.rejectFunction = func;
+    }
+  }
+}
 /**
  * Creates an immutable series loader object which loads each series sequentially using the iterator interface.
  *
@@ -520,12 +568,20 @@ function makeSeriesAsyncLoader(client, studyInstanceUID, seriesInstanceUIDList)
     hasNext() {
       return seriesInstanceUIDList.length > 0;
     },
-    async next() {
-      const seriesInstanceUID = seriesInstanceUIDList.shift();
-      return client.retrieveSeriesMetadata({
-        studyInstanceUID,
-        seriesInstanceUID
+    next() {
+      const {
+        seriesInstanceUID,
+        metadata
+      } = seriesInstanceUIDList.shift();
+      const promise = new DeferredPromise();
+      promise.setMetadata(metadata);
+      promise.setProcessFunction(() => {
+        return client.retrieveSeriesMetadata({
+          studyInstanceUID,
+          seriesInstanceUID
+        });
       });
+      return promise;
     }
   });
 }
@@ -549,19 +605,22 @@ class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader {
       } = {},
       client
     } = this;
+
+    // asking to include Series Date, Series Time, Series Description
+    // and Series Number in the series metadata returned to better sort series
+    // in preLoad function
+    let options = {
+      studyInstanceUID,
+      queryParams: {
+        includefield: includeField
+      }
+    };
     if (seriesInstanceUID) {
-      const options = {
-        studyInstanceUID,
-        queryParams: {
-          SeriesInstanceUID: seriesInstanceUID
-        }
-      };
+      options.queryParams.SeriesInstanceUID = seriesInstanceUID;
       preLoaders.push(client.searchForSeries.bind(client, options));
     }
     // Fallback preloader
-    preLoaders.push(client.searchForSeries.bind(client, {
-      studyInstanceUID
-    }));
+    preLoaders.push(client.searchForSeries.bind(client, options));
     yield* preLoaders;
   }
   async preLoad() {
@@ -573,18 +632,24 @@ class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader {
       naturalizeDataset
     } = dcmjs_es["default"].data.DicomMetaDictionary;
     const naturalized = result.map(naturalizeDataset);
-    return (0,sortStudy/* sortStudySeries */.IO)(naturalized, sortCriteria || sortStudy/* sortingCriteria */.S1.seriesSortCriteria.seriesInfoSortingCriteria, sortFunction);
+    return (0,sortStudy/* sortStudySeries */.IO)(naturalized, sortCriteria, sortFunction);
   }
   async load(preLoadData) {
     const {
       client,
       studyInstanceUID
     } = this;
-    const seriesInstanceUIDs = preLoadData.map(s => s.SeriesInstanceUID);
+    const seriesInstanceUIDs = preLoadData.map(seriesMetadata => {
+      return {
+        seriesInstanceUID: seriesMetadata.SeriesInstanceUID,
+        metadata: seriesMetadata
+      };
+    });
     const seriesAsyncLoader = makeSeriesAsyncLoader(client, studyInstanceUID, seriesInstanceUIDs);
     const promises = [];
     while (seriesAsyncLoader.hasNext()) {
-      promises.push(seriesAsyncLoader.next());
+      const promise = seriesAsyncLoader.next();
+      promises.push(promise);
     }
     return {
       preLoadData,
@@ -748,6 +813,7 @@ function deleteStudyMetadataPromise(StudyInstanceUID) {
  * performing searches doesn't work.  This version fixes the query issue
  * by manually implementing a query option.
  */
+
 class StaticWadoClient extends dicomweb_client_es.api.DICOMwebClient {
   constructor(qidoConfig) {
     super(qidoConfig);
@@ -1060,17 +1126,35 @@ const EXPLICIT_VR_LITTLE_ENDIAN = '1.2.840.10008.1.2.1';
 const metadataProvider = src.classes.MetadataProvider;
 
 /**
+ * Creates a DICOM Web API based on the provided configuration.
  *
- * @param {string} name - Data source name
- * @param {string} wadoUriRoot - Legacy? (potentially unused/replaced)
- * @param {string} qidoRoot - Base URL to use for QIDO requests
- * @param {string} wadoRoot - Base URL to use for WADO requests
- * @param {boolean} qidoSupportsIncludeField - Whether QIDO supports the "Include" option to request additional fields in response
- * @param {string} imageRengering - wadors | ? (unsure of where/how this is used)
- * @param {string} thumbnailRendering - wadors | ? (unsure of where/how this is used)
- * @param {bool} supportsReject - Whether the server supports reject calls (i.e. DCM4CHEE)
- * @param {bool} lazyLoadStudy - "enableStudyLazyLoad"; Request series meta async instead of blocking
- * @param {string|bool} singlepart - indicates of the retrieves can fetch singlepart.  Options are bulkdata, video, image or boolean true
+ * @param {object} dicomWebConfig - Configuration for the DICOM Web API
+ * @param {string} dicomWebConfig.name - Data source name
+ * @param {string} dicomWebConfig.wadoUriRoot - Legacy? (potentially unused/replaced)
+ * @param {string} dicomWebConfig.qidoRoot - Base URL to use for QIDO requests
+ * @param {string} dicomWebConfig.wadoRoot - Base URL to use for WADO requests
+ * @param {string} dicomWebConfig.wadoUri - Base URL to use for WADO URI requests
+ * @param {boolean} dicomWebConfig.qidoSupportsIncludeField - Whether QIDO supports the "Include" option to request additional fields in response
+ * @param {string} dicomWebConfig.imageRendering - wadors | ? (unsure of where/how this is used)
+ * @param {string} dicomWebConfig.thumbnailRendering - wadors | ? (unsure of where/how this is used)
+ * @param {boolean} dicomWebConfig.supportsReject - Whether the server supports reject calls (i.e. DCM4CHEE)
+ * @param {boolean} dicomWebConfig.lazyLoadStudy - "enableStudyLazyLoad"; Request series meta async instead of blocking
+ * @param {string|boolean} dicomWebConfig.singlepart - indicates if the retrieves can fetch singlepart. Options are bulkdata, video, image, or boolean true
+ * @param {string} dicomWebConfig.requestTransferSyntaxUID - Transfer syntax to request from the server
+ * @param {object} dicomWebConfig.acceptHeader - Accept header to use for requests
+ * @param {boolean} dicomWebConfig.omitQuotationForMultipartRequest - Whether to omit quotation marks for multipart requests
+ * @param {boolean} dicomWebConfig.supportsFuzzyMatching - Whether the server supports fuzzy matching
+ * @param {boolean} dicomWebConfig.supportsWildcard - Whether the server supports wildcard matching
+ * @param {boolean} dicomWebConfig.supportsNativeDICOMModel - Whether the server supports the native DICOM model
+ * @param {boolean} dicomWebConfig.enableStudyLazyLoad - Whether to enable study lazy loading
+ * @param {boolean} dicomWebConfig.enableRequestTag - Whether to enable request tag
+ * @param {boolean} dicomWebConfig.enableStudyLazyLoad - Whether to enable study lazy loading
+ * @param {boolean} dicomWebConfig.bulkDataURI - Whether to enable bulkDataURI
+ * @param {function} dicomWebConfig.onConfiguration - Function that is called after the configuration is initialized
+ * @param {boolean} dicomWebConfig.staticWado - Whether to use the static WADO client
+ * @param {object} userAuthenticationService - User authentication service
+ * @param {object} userAuthenticationService.getAuthorizationHeader - Function that returns the authorization header
+ * @returns {object} - DICOM Web API object
  */
 function createDicomWebApi(dicomWebConfig, servicesManager) {
   const {
@@ -1200,13 +1284,14 @@ function createDicomWebApi(dicomWebConfig, servicesManager) {
           filters,
           sortCriteria,
           sortFunction,
-          madeInClient = false
+          madeInClient = false,
+          returnPromises = false
         } = {}) => {
           if (!StudyInstanceUID) {
             throw new Error('Unable to query for SeriesMetadata without StudyInstanceUID');
           }
           if (dicomWebConfig.enableStudyLazyLoad) {
-            return implementation._retrieveSeriesMetadataAsync(StudyInstanceUID, filters, sortCriteria, sortFunction, madeInClient);
+            return implementation._retrieveSeriesMetadataAsync(StudyInstanceUID, filters, sortCriteria, sortFunction, madeInClient, returnPromises);
           }
           return implementation._retrieveSeriesMetadataSync(StudyInstanceUID, filters, sortCriteria, sortFunction, madeInClient);
         }
@@ -1293,7 +1378,7 @@ function createDicomWebApi(dicomWebConfig, servicesManager) {
       Object.keys(instancesPerSeries).forEach(seriesInstanceUID => src.DicomMetadataStore.addInstances(instancesPerSeries[seriesInstanceUID], madeInClient));
       return seriesSummaryMetadata;
     },
-    _retrieveSeriesMetadataAsync: async (StudyInstanceUID, filters, sortCriteria, sortFunction, madeInClient = false) => {
+    _retrieveSeriesMetadataAsync: async (StudyInstanceUID, filters, sortCriteria, sortFunction, madeInClient = false, returnPromises = false) => {
       const enableStudyLazyLoad = true;
       wadoDicomWebClient.headers = generateWadoHeader();
       // Get Series
@@ -1366,7 +1451,7 @@ function createDicomWebApi(dicomWebConfig, servicesManager) {
         const naturalizedInstances = instances.map(addRetrieveBulkData);
 
         // Adding instanceMetadata to OHIF MetadataProvider
-        naturalizedInstances.forEach((instance, index) => {
+        naturalizedInstances.forEach(instance => {
           instance.wadoRoot = dicomWebConfig.wadoRoot;
           instance.wadoUri = dicomWebConfig.wadoUri;
           const imageId = implementation.getImageIdsForInstance({
@@ -1390,7 +1475,7 @@ function createDicomWebApi(dicomWebConfig, servicesManager) {
         src.DicomMetadataStore.addInstances(naturalizedInstances, madeInClient);
       }
       function setSuccessFlag() {
-        const study = src.DicomMetadataStore.getStudy(StudyInstanceUID, madeInClient);
+        const study = src.DicomMetadataStore.getStudy(StudyInstanceUID);
         if (!study) {
           return;
         }
@@ -1403,11 +1488,21 @@ function createDicomWebApi(dicomWebConfig, servicesManager) {
         aSeries.StudyInstanceUID = StudyInstanceUID;
       });
       src.DicomMetadataStore.addSeriesMetadata(seriesSummaryMetadata, madeInClient);
-      const seriesDeliveredPromises = seriesPromises.map(promise => promise.then(instances => {
-        storeInstances(instances);
-      }));
-      await Promise.all(seriesDeliveredPromises);
-      setSuccessFlag();
+      const seriesDeliveredPromises = seriesPromises.map(promise => {
+        if (!returnPromises) {
+          promise?.start();
+        }
+        return promise.then(instances => {
+          storeInstances(instances);
+        });
+      });
+      if (returnPromises) {
+        Promise.all(seriesDeliveredPromises).then(() => setSuccessFlag());
+        return seriesPromises;
+      } else {
+        await Promise.all(seriesDeliveredPromises);
+        setSuccessFlag();
+      }
       return seriesSummaryMetadata;
     },
     deleteStudyMetadataPromise: deleteStudyMetadataPromise,
@@ -1438,7 +1533,7 @@ function createDicomWebApi(dicomWebConfig, servicesManager) {
     },
     getImageIdsForInstance({
       instance,
-      frame
+      frame = undefined
     }) {
       const imageIds = getImageId({
         instance,
@@ -2475,8 +2570,8 @@ function ViewerHeader({
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.8.0-beta.44";
-  const commitHash = "1456a493d66c90c787b022256c9f2846afb115fc";
+  const versionNumber = "3.8.0-beta.46";
+  const commitHash = "d00a86b022742ea089d246d06cfd691f43b64412";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',
@@ -4823,8 +4918,8 @@ function adaptItem(item, subProps) {
 }
 // EXTERNAL MODULE: ../../ui/src/components/ContextMenu/ContextMenu.tsx
 var ContextMenu = __webpack_require__(5638);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 448 modules
-var dist_esm = __webpack_require__(81399);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/tools/dist/esm/index.js + 454 modules
+var dist_esm = __webpack_require__(76634);
 ;// CONCATENATED MODULE: ../../../extensions/default/src/CustomizableContextMenu/ContextMenuController.tsx
 var _class;
 
@@ -6748,6 +6843,9 @@ const defaultProtocol = {
   editableBy: {},
   protocolMatchingRules: [],
   toolGroupIds: ['default'],
+  hpInitiationCriteria: {
+    minSeriesLoaded: 1
+  },
   // -1 would be used to indicate active only, whereas other values are
   // the number of required priors referenced - so 0 means active with
   // 0 or more priors.

package/dist/{822.bundle.2092dbfefbc1b5834965.js → 822.bundle.b3c3a7d5a0768cd9c990.js}

@@ -14,7 +14,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(71771);
 /* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(89556);
 /* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(69190);
-/* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(81399);
+/* harmony import */ var _cornerstonejs_tools__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(76634);
 /* harmony import */ var _getContextModule__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(41832);
 /* harmony import */ var _cornerstonejs_core__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(56846);
 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); }