chore(release): publish [skip ci]

- @ohif/extension-dicom-pdf@1.1.2 - @ohif/extension-vtk@1.12.12 - @ohif/core@2.16.8 - @ohif/viewer@4.12.13
Feat/v2 e2e static tests (#2684 )
2022-01-29 01:06:23 +00:00 · 2022-01-28 20:02:30 -05:00 · 2022-01-20 09:18:41 +00:00 · 2022-01-20 10:15:19 +01:00 · 2022-01-19 09:29:16 +00:00 · 2022-01-19 10:25:42 +01:00
61 changed files with 2320 additions and 513 deletions
@@ -25,11 +25,9 @@ executors:
    docker:
      # Primary container image where all steps run.
      - image: 'cypress/browsers:node14.15.0-chrome86-ff82'
-      - image: 'ohif/viewer-testdata:0.1-test'
-
 defaults: &defaults
  docker:
-    - image: circleci/node:14.15.0
+    - image: cimg/node:14.18
      environment:
        TERM: xterm # Enable colors in term
        QUICK_BUILD: true
@@ -119,6 +117,7 @@ jobs:
          command: yarn install --frozen-lockfile

      - setup_remote_docker:
+          version: 19.03.13
          docker_layer_caching: false

      - run:
@@ -295,6 +294,7 @@ jobs:
      - attach_workspace:
          at: ~/repo
      - setup_remote_docker:
+          version: 19.03.13
          docker_layer_caching: false
      - run:
          name: Build and push Docker image
@@ -347,7 +347,8 @@ workflows:
          store_artifacts: true
          working_directory: platform/viewer
          build:
-            npx cross-env QUICK_BUILD=true APP_CONFIG=config/dicomweb-server.js
+            git submodule update --init &&
+            npx cross-env QUICK_BUILD=true APP_CONFIG=config/e2e.js
            yarn run build
          start: yarn run test:e2e:serve
          spec: 'cypress/integration/common/**/*,cypress/integration/pwa/**/*'
@@ -375,7 +376,8 @@ workflows:
          store_artifacts: true
          working_directory: platform/viewer
          build:
-            npx cross-env QUICK_BUILD=true APP_CONFIG=config/dicomweb-server.js
+            git submodule update --init &&
+            npx cross-env QUICK_BUILD=true APP_CONFIG=config/e2e.js
            yarn run build:package
          start: yarn run test:e2e:serve
          spec: 'cypress/integration/common/**/*,cypress/integration/script-tag/**/*'
@@ -408,7 +410,8 @@ workflows:
          store_artifacts: false
          working_directory: platform/viewer
          build:
-            npx cross-env QUICK_BUILD=true APP_CONFIG=config/dicomweb-server.js
+            git submodule update --init &&
+            npx cross-env QUICK_BUILD=true APP_CONFIG=config/e2e.js
            yarn run build
          # start server --> verify running --> percy + chrome + cypress
          command: yarn run test:e2e:dist
@@ -487,7 +490,8 @@ workflows:
          store_artifacts: false
          working_directory: platform/viewer
          build:
-            npx cross-env QUICK_BUILD=true APP_CONFIG=config/dicomweb-server.js
+            git submodule update --init &&
+            npx cross-env QUICK_BUILD=true APP_CONFIG=config/e2e.js
            yarn run build
          # start server --> verify running --> percy + chrome + cypress
          command: yarn run test:e2e:dist
@@ -0,0 +1,3 @@
+[submodule "testdata"]
+	path = testdata
+	url = https://github.com/OHIF/viewer-testdata-dicomweb.git
@@ -0,0 +1 @@
+14.18.0
@@ -28,7 +28,7 @@ module.exports = (env, argv, { SRC_DIR, DIST_DIR }) => {

  const config = {
    mode: isProdBuild ? 'production' : 'development',
-    devtool: isProdBuild ? 'source-map' : 'cheap-module-eval-source-map',
+    devtool: isProdBuild ? 'source-map' : 'eval-cheap-module-source-map',
    entry: {
      app: `${SRC_DIR}/index.js`,
    },
@@ -273,6 +273,17 @@ development of OHIF Viewer:
  Leidos Biomedical Research under Task Order HHSN26100071 from NCI.
  [IDC Viewer](https://learn.canceridc.dev/portal/visualization) is a customized
  version of the OHIF Viewer.
+  
+### Research notice
+Please note that this repository is participating in a study into sustainability
+ of open source projects. Data will be gathered about this repository for
+ approximately the next 12 months, starting from June 2021.
+
+Data collected will include number of contributors, number of PRs, time taken to
+ close/merge these PRs, and issues closed.
+
+For more information, please visit
+[our informational page](https://sustainable-open-science-and-software.github.io/) or download our [participant information sheet](https://sustainable-open-science-and-software.github.io/assets/PIS_sustainable_software.pdf).

 ## License

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [2.12.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.12.3...@ohif/extension-cornerstone@2.12.4) (2022-01-20)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
+## [2.12.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.12.2...@ohif/extension-cornerstone@2.12.3) (2021-12-02)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
+## [2.12.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.12.1...@ohif/extension-cornerstone@2.12.2) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
 ## [2.12.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.12.0...@ohif/extension-cornerstone@2.12.1) (2021-09-28)

 **Note:** Version bump only for package @ohif/extension-cornerstone
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-cornerstone",
-  "version": "2.12.1",
+  "version": "2.12.4",
  "description": "OHIF extension for Cornerstone",
  "author": "OHIF",
  "license": "MIT",
@@ -32,12 +32,12 @@
  "peerDependencies": {
    "@ohif/core": "^0.50.0",
    "@ohif/ui": "^0.50.0",
-    "cornerstone-core": "^2.5.0",
+    "cornerstone-core": "^2.6.1",
    "cornerstone-math": "^0.1.9",
-    "cornerstone-tools": "^6.0.0",
-    "cornerstone-wado-image-loader": "^4.0.3",
-    "dcmjs": "0.18.9",
-    "dicom-parser": "^1.8.9",
+    "cornerstone-tools": "^6.0.6",
+    "cornerstone-wado-image-loader": "^4.1.0",
+    "dcmjs": "0.19.2",
+    "dicom-parser": "^1.8.11",
    "hammerjs": "^2.0.8",
    "prop-types": "^15.6.2",
    "react": "^16.8.6",
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [0.3.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-debugging@0.3.0...@ohif/extension-debugging@0.3.1) (2021-12-02)
+
+**Note:** Version bump only for package @ohif/extension-debugging
+
+
+
+
+
 # [0.3.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-debugging@0.2.2...@ohif/extension-debugging@0.3.0) (2021-09-23)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-debugging",
-  "version": "0.3.0",
+  "version": "0.3.1",
  "description": "OHIF extension for debugging.",
  "author": "OHIF",
  "license": "MIT",
@@ -28,12 +28,12 @@
  },
  "peerDependencies": {
    "@ohif/core": "^2.6.0",
-    "dicom-parser": "^1.8.9"
+    "dicom-parser": "^1.8.11"
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
    "detect-browser": "5.1.1",
-    "dicomweb-client": "^0.8.1",
+    "dicomweb-client": "^0.8.3",
    "file-saver": "^2.0.2",
    "jszip": "^3.2.2"
  }
@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.3.15](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.3.14...@ohif/extension-dicom-html@1.3.15) (2022-01-20)
+
+**Note:** Version bump only for package @ohif/extension-dicom-html
+
+
+
+
+
+## [1.3.14](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.3.13...@ohif/extension-dicom-html@1.3.14) (2021-12-02)
+
+**Note:** Version bump only for package @ohif/extension-dicom-html
+
+
+
+
+
+## [1.3.13](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.3.12...@ohif/extension-dicom-html@1.3.13) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/extension-dicom-html
+
+
+
+
+
+## [1.3.12](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.3.11...@ohif/extension-dicom-html@1.3.12) (2021-10-25)
+
+**Note:** Version bump only for package @ohif/extension-dicom-html
+
+
+
+
+
 ## [1.3.11](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.3.10...@ohif/extension-dicom-html@1.3.11) (2021-09-28)

 **Note:** Version bump only for package @ohif/extension-dicom-html
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-html",
-  "version": "1.3.11",
+  "version": "1.3.15",
  "description": "OHIF extension for rendering structured reports to HTML",
  "author": "OHIF",
  "license": "MIT",
@@ -29,7 +29,7 @@
  },
  "peerDependencies": {
    "@ohif/core": "^0.50.0",
-    "dcmjs": "0.18.9",
+    "dcmjs": "0.19.2",
    "prop-types": "^15.6.2",
    "react": "^16.8.6",
    "react-dom": "^16.8.6"
@@ -160,7 +160,7 @@ const getContentSequence = (data, level = 1) => {

  const root = [];
  if (header) {
-    const HeaderDynamicLevel = `h${level}`;
+    const HeaderDynamicLevel = `h${Math.min(level, 6)}`;

    root.push(<HeaderDynamicLevel key={header}>{header}</HeaderDynamicLevel>);
  }
@@ -170,7 +170,7 @@ const getContentSequence = (data, level = 1) => {

    if (key === '_meta') {
      const HeaderDynamicLevel = `h3`;
-      root.push(<hr />);
+      root.push(<hr key={root.length} />);
      root.push(
        <HeaderDynamicLevel key="Metadata">
          DICOM File Meta Information
@@ -217,7 +217,7 @@ class DicomHtmlViewport extends Component {
  };

  componentDidMount() {
-    const dataSet = this.setContentFromByteArray(this.props.byteArray);
+    this.setContentFromByteArray(this.props.byteArray);
  }

  setContentFromByteArray(byteArray) {
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.1.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-pdf@1.1.1...@ohif/extension-dicom-pdf@1.1.2) (2022-01-29)
+
+**Note:** Version bump only for package @ohif/extension-dicom-pdf
+
+
+
+
+
+## [1.1.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-pdf@1.1.0...@ohif/extension-dicom-pdf@1.1.1) (2021-12-02)
+
+**Note:** Version bump only for package @ohif/extension-dicom-pdf
+
+
+
+
+
 # [1.1.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-pdf@1.0.6...@ohif/extension-dicom-pdf@1.1.0) (2021-09-23)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-pdf",
-  "version": "1.1.0",
+  "version": "1.1.2",
  "description": "OHIF extension for Dicom PDF",
  "author": "OHIF",
  "license": "MIT",
@@ -29,7 +29,7 @@
  },
  "peerDependencies": {
    "@ohif/core": "^0.50.0",
-    "dicom-parser": "^1.8.9",
+    "dicom-parser": "^1.8.11",
    "prop-types": "^15.6.2",
    "react": "^16.8.6",
    "react-dom": "^16.8.6"
@@ -33,6 +33,7 @@ class DicomPDFViewport extends Component {

  static propTypes = {
    byteArray: TypedArrayProp.uint8,
+    rawPdf: PropTypes.bool,
    useNative: PropTypes.bool,
    viewportData: PropTypes.object,
    activeViewportIndex: PropTypes.number,
@@ -45,7 +46,8 @@ class DicomPDFViewport extends Component {
  };

  async componentDidMount() {
-    const dataSet = this.parseByteArray(this.props.byteArray);
+    const { rawPdf } = this.props
+    const dataSet = !rawPdf && this.parseByteArray(this.props.byteArray);
    const fileURL = this.getPDFFileUrl(dataSet, this.props.byteArray);

    this.setState(state => ({ ...state, fileURL }));
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import OHIF from '@ohif/core';
 import OHIFComponentPlugin from './OHIFComponentPlugin.js';
 import DicomPDFViewport from './DicomPDFViewport';
+import { str2ab } from '@ohif/core';

 const { DicomLoaderService } = OHIF.utils;

@@ -18,6 +19,7 @@ class OHIFDicomPDFViewport extends Component {

  state = {
    byteArray: null,
+    rawPdf: false,
    error: null,
  };

@@ -34,6 +36,15 @@ class OHIFDicomPDFViewport extends Component {
  componentDidMount() {
    const { displaySet, studies } = this.props.viewportData;

+    if (displaySet.metadata && displaySet.metadata.EncapsulatedDocument) {
+      const { InlineBinary, BulkDataURI } = displaySet.metadata.EncapsulatedDocument;
+      if (InlineBinary) {
+        const inlineBinaryData = atob(InlineBinary);
+        const byteArray = str2ab(inlineBinaryData);
+        this.setState({ byteArray, rawPdf: true });
+        return;
+      }
+    }
    DicomLoaderService.findDicomDataPromise(displaySet, studies).then(
      data => this.setState({ byteArray: new Uint8Array(data) }),
      error => {
@@ -49,15 +60,16 @@ class OHIFDicomPDFViewport extends Component {
      viewportIndex,
      activeViewportIndex,
    } = this.props;
-    const { byteArray, error } = this.state;
+    const { byteArray, error, rawPdf } = this.state;
    const { id, init, destroy } = OHIFDicomPDFViewport;
    const pluginProps = { id, init, destroy };

    return (
      <OHIFComponentPlugin {...pluginProps}>
-        {byteArray && (
+        {(byteArray) && (
          <DicomPDFViewport
            byteArray={byteArray}
+            rawPdf={rawPdf}
            setViewportActive={setViewportActive}
            viewportIndex={viewportIndex}
            activeViewportIndex={activeViewportIndex}
@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [0.7.6](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.7.5...@ohif/extension-dicom-rt@0.7.6) (2022-01-20)
+
+**Note:** Version bump only for package @ohif/extension-dicom-rt
+
+
+
+
+
+## [0.7.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.7.4...@ohif/extension-dicom-rt@0.7.5) (2022-01-19)
+
+**Note:** Version bump only for package @ohif/extension-dicom-rt
+
+
+
+
+
+## [0.7.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.7.3...@ohif/extension-dicom-rt@0.7.4) (2021-12-02)
+
+**Note:** Version bump only for package @ohif/extension-dicom-rt
+
+
+
+
+
+## [0.7.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.7.2...@ohif/extension-dicom-rt@0.7.3) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/extension-dicom-rt
+
+
+
+
+
 ## [0.7.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.7.1...@ohif/extension-dicom-rt@0.7.2) (2021-10-06)

 **Note:** Version bump only for package @ohif/extension-dicom-rt
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-rt",
-  "version": "0.7.2",
+  "version": "0.7.6",
  "description": "OHIF extension for rendering DICOM RTSTRUCTs on top of cornerstone images.",
  "author": "OHIF",
  "license": "MIT",
@@ -29,9 +29,9 @@
  },
  "peerDependencies": {
    "@ohif/core": "^0.50.0",
-    "cornerstone-core": "^2.5.0",
-    "cornerstone-tools": "^6.0.0",
-    "dcmjs": "0.18.9",
+    "cornerstone-core": "^2.6.1",
+    "cornerstone-tools": "^6.0.6",
+    "dcmjs": "0.19.2",
    "gl-matrix": "^3.3.0",
    "prop-types": "^15.6.2",
    "react": "^16.8.6",
@@ -81,13 +81,10 @@ const RTPanel = ({
  useEffect(() => {
    updateStructureSets();

-    document.addEventListener('extensiondicomrtrtloaded', updateStructureSets);
+    document.addEventListener('rt-panel-tab-updated', updateStructureSets);

    return () => {
-      document.removeEventListener(
-        'extensiondicomrtrtloaded',
-        updateStructureSets
-      );
+      document.removeEventListener('rt-panel-tab-updated', updateStructureSets);
    };
  }, []);

@@ -91,17 +91,12 @@ export default {
            }

            if (activeViewport) {
-              const study = studies.find(
-                s => s.StudyInstanceUID === activeViewport.StudyInstanceUID
-              );
-              const ds = study.displaySets.find(
-                ds =>
-                  ds.displaySetInstanceUID ===
-                  activeViewport.displaySetInstanceUID
-              );
              const studyMetadata = studyMetadataManager.get(
                activeViewport.StudyInstanceUID
              );
+              if (!studyMetadata) {
+                return;
+              }
              const referencedDisplaySets = studyMetadata.getDerivedDatasets({
                referencedSeriesInstanceUID: activeViewport.SeriesInstanceUID,
                Modality: 'RTSTRUCT',
@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [0.7.6](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.5...@ohif/extension-dicom-segmentation@0.7.6) (2022-01-20)
+
+**Note:** Version bump only for package @ohif/extension-dicom-segmentation
+
+
+
+
+
+## [0.7.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.4...@ohif/extension-dicom-segmentation@0.7.5) (2021-12-02)
+
+**Note:** Version bump only for package @ohif/extension-dicom-segmentation
+
+
+
+
+
+## [0.7.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.3...@ohif/extension-dicom-segmentation@0.7.4) (2021-10-27)
+
+**Note:** Version bump only for package @ohif/extension-dicom-segmentation
+
+
+
+
+
+## [0.7.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.2...@ohif/extension-dicom-segmentation@0.7.3) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/extension-dicom-segmentation
+
+
+
+
+
 ## [0.7.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.1...@ohif/extension-dicom-segmentation@0.7.2) (2021-10-06)

 **Note:** Version bump only for package @ohif/extension-dicom-segmentation
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-segmentation",
-  "version": "0.7.2",
+  "version": "0.7.6",
  "description": "OHIF extension for viewing segmentations in the 2D MPR view",
  "author": "OHIF",
  "license": "MIT",
@@ -29,9 +29,9 @@
  },
  "peerDependencies": {
    "@ohif/core": "^0.50.0",
-    "cornerstone-core": "^2.5.0",
-    "cornerstone-tools": "^6.0.0",
-    "dcmjs": "0.18.9",
+    "cornerstone-core": "^2.6.1",
+    "cornerstone-tools": "^6.0.6",
+    "dcmjs": "0.19.2",
    "prop-types": "^15.6.2",
    "react": "^16.8.6",
    "react-dom": "^16.8.6"
@@ -24,6 +24,7 @@ const SegmentItem = ({
  onClick,
  itemClass,
  color,
+  labelmap3D,
  visible,
  onVisibilityChange,
 }) => {
@@ -39,7 +40,7 @@ const SegmentItem = ({
    event.stopPropagation();
    const newVisibility = !isVisible;
    setIsVisible(newVisibility);
-    onVisibilityChange(newVisibility, index);
+    onVisibilityChange(newVisibility, index, labelmap3D);
  };

  return (
@@ -431,23 +431,43 @@ const SegmentationPanel = ({
    return enabledElements[activeIndex].element;
  };

-  const onSegmentVisibilityChangeHandler = (isVisible, segmentNumber) => {
-    /** Get all labelmaps with this segmentNumber (overlapping segments) */
-    const { labelmaps3D } = getBrushStackState();
-    const possibleLabelMaps3D = labelmaps3D.filter(({ labelmaps2D }) => {
-      return labelmaps2D.some(({ segmentsOnLabelmap }) =>
-        segmentsOnLabelmap.includes(segmentNumber)
-      );
-    });
-
+  const onSegmentVisibilityChangeHandler = (
+    isVisible,
+    segmentNumber,
+    labelmap3D
+  ) => {
    let segmentsHidden = [];
-    possibleLabelMaps3D.forEach(labelmap3D => {
-      labelmap3D.segmentsHidden[segmentNumber] = !isVisible;
+    if (labelmap3D.metadata.hasOverlapping) {
+      /** Get all labelmaps with this segmentNumber and that
+       * are from the same series (overlapping segments) */
+      const { labelmaps3D } = getBrushStackState();

-      segmentsHidden = [
-        ...new Set([...segmentsHidden, ...labelmap3D.segmentsHidden]),
-      ];
-    });
+      const sameSeriesLabelMaps3D = labelmaps3D.filter(({ metadata }) => {
+        return (
+          labelmap3D.metadata.segmentationSeriesInstanceUID ===
+          metadata.segmentationSeriesInstanceUID
+        );
+      });
+
+      const possibleLabelMaps3D = sameSeriesLabelMaps3D.filter(
+        ({ labelmaps2D }) => {
+          return labelmaps2D.some(({ segmentsOnLabelmap }) =>
+            segmentsOnLabelmap.includes(segmentNumber)
+          );
+        }
+      );
+
+      possibleLabelMaps3D.forEach(labelmap3D => {
+        labelmap3D.segmentsHidden[segmentNumber] = !isVisible;
+
+        segmentsHidden = [
+          ...new Set([...segmentsHidden, ...labelmap3D.segmentsHidden]),
+        ];
+      });
+    } else {
+      labelmap3D.segmentsHidden[segmentNumber] = !isVisible;
+      segmentsHidden = [...labelmap3D.segmentsHidden];
+    }

    setState(state => ({ ...state, segmentsHidden }));

@@ -514,6 +534,7 @@ const SegmentationPanel = ({
          label={segmentLabel}
          index={segmentNumber}
          color={color}
+          labelmap3D={labelmap3D}
          visible={!labelmap3D.segmentsHidden[segmentIndex]}
          onVisibilityChange={onSegmentVisibilityChangeHandler}
        />
@@ -64,8 +64,17 @@ export default function getSopClassHandlerModule({ servicesManager }) {
        metadata,
      };

-      segDisplaySet.getSourceDisplaySet = function(studies, activateLabelMap = true, onDisplaySetLoadFailureHandler) {
-        return getSourceDisplaySet(studies, segDisplaySet, activateLabelMap, onDisplaySetLoadFailureHandler);
+      segDisplaySet.getSourceDisplaySet = function(
+        studies,
+        activateLabelMap = true,
+        onDisplaySetLoadFailureHandler
+      ) {
+        return getSourceDisplaySet(
+          studies,
+          segDisplaySet,
+          activateLabelMap,
+          onDisplaySetLoadFailureHandler
+        );
      };

      segDisplaySet.load = async function(referencedDisplaySet, studies) {
@@ -98,6 +107,9 @@ export default function getSopClassHandlerModule({ servicesManager }) {
        if (labelmapBufferArray.length > 1) {
          let labelmapIndexes = [];
          for (let i = 0; i < labelmapBufferArray.length; ++i) {
+            segMetadata.segmentationSeriesInstanceUID =
+              segDisplaySet.SeriesInstanceUID;
+            segMetadata.hasOverlapping = true;
            labelmapIndexes.push(
              await loadSegmentation(
                imageIds,
@@ -118,6 +130,9 @@ export default function getSopClassHandlerModule({ servicesManager }) {
          labelmapIndex = labelmapIndexes[0];
          console.warn('Overlapping segments!');
        } else {
+          segMetadata.segmentationSeriesInstanceUID =
+            segDisplaySet.SeriesInstanceUID;
+          segMetadata.hasOverlapping = false;
          labelmapIndex = await loadSegmentation(
            imageIds,
            segDisplaySet,
@@ -143,6 +143,9 @@ export default {
                      const studyMetadata = studyMetadataManager.get(
                        activeViewport.StudyInstanceUID
                      );
+                      if (!studyMetadata) {
+                        return;
+                      }
                      const referencedDS = studyMetadata.getDerivedDatasets({
                        referencedSeriesInstanceUID:
                          activeViewport.SeriesInstanceUID,
@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [0.2.17](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.2.16...@ohif/extension-dicom-tag-browser@0.2.17) (2022-01-20)
+
+**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
+
+
+
+
+
+## [0.2.16](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.2.15...@ohif/extension-dicom-tag-browser@0.2.16) (2021-12-10)
+
+**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
+
+
+
+
+
+## [0.2.15](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.2.14...@ohif/extension-dicom-tag-browser@0.2.15) (2021-12-02)
+
+**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
+
+
+
+
+
+## [0.2.14](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.2.13...@ohif/extension-dicom-tag-browser@0.2.14) (2021-11-30)
+
+**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
+
+
+
+
+
+## [0.2.13](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.2.12...@ohif/extension-dicom-tag-browser@0.2.13) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
+
+
+
+
+
 ## [0.2.12](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.2.11...@ohif/extension-dicom-tag-browser@0.2.12) (2021-09-28)

 **Note:** Version bump only for package @ohif/extension-dicom-tag-browser
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-tag-browser",
-  "version": "0.2.12",
+  "version": "0.2.17",
  "description": "OHIF extension for checking DICOM headers.",
  "author": "OHIF",
  "license": "MIT",
@@ -28,12 +28,12 @@
  },
  "peerDependencies": {
    "@ohif/core": "^2.6.0",
-    "dcmjs": "0.18.9",
+    "dcmjs": "0.19.2",
    "react": "^16.8.6"
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
-    "dicomweb-client": "^0.8.1",
+    "dicomweb-client": "^0.8.3",
    "moment": "2.24.0",
    "react-select": "^3.0.8"
  }
@@ -18,7 +18,7 @@ const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => {
    activeDisplaySetInstanceUID,
    setActiveDisplaySetInstanceUID,
  ] = useState(displaySetInstanceUID);
-  const [activeInstance, setActiveInstance] = useState(0);
+  const [activeInstance, setActiveInstance] = useState(1);
  const [tags, setTags] = useState([]);
  const [meta, setMeta] = useState('');
  const [instanceList, setInstanceList] = useState([]);
@@ -51,20 +51,21 @@ const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => {
        description: displayDate,
        onClick: () => {
          setActiveDisplaySetInstanceUID(displaySetInstanceUID);
-          setActiveInstance(0);
+          setActiveInstance(1);
        },
      };
    });

    let metadata;
-    const isImageStack = activeDisplaySet instanceof ImageSet;
+    const isImageStack =
+      activeDisplaySet instanceof ImageSet &&
+      activeDisplaySet.isModalitySupported === true;

-    let selectedInstanceValue;
    let instanceList;

    if (isImageStack) {
      const { images } = activeDisplaySet;
-      const image = images[activeInstance];
+      const image = images[activeInstance - 1];

      instanceList = images.map((image, index) => {
        const metadata = image.getData().metadata;
@@ -91,7 +92,7 @@ const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => {
    setInstanceList(instanceList);
    setDisplaySetList(newDisplaySetList);
    setIsImageStack(isImageStack);
-  }, [activeDisplaySetInstanceUID, activeInstance]);
+  }, [activeDisplaySetInstanceUID, activeInstance, displaySets]);

  const selectedDisplaySetValue = displaySetList.find(
    ds => ds.value === activeDisplaySetInstanceUID
@@ -106,7 +107,7 @@ const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => {
          showValue
          step={1}
          min={1}
-          max={instanceList.length - 1}
+          max={instanceList.length}
          value={activeInstance}
          valueRenderer={value => <p>Instance Number: {value}</p>}
          onChange={({ target }) => {
@@ -3,6 +3,78 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.12.12](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.11...@ohif/extension-vtk@1.12.12) (2022-01-29)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.12.11](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.10...@ohif/extension-vtk@1.12.11) (2022-01-20)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.12.10](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.9...@ohif/extension-vtk@1.12.10) (2022-01-13)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.12.9](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.8...@ohif/extension-vtk@1.12.9) (2021-12-23)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.12.8](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.7...@ohif/extension-vtk@1.12.8) (2021-12-23)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.12.7](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.6...@ohif/extension-vtk@1.12.7) (2021-12-02)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.12.6](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.5...@ohif/extension-vtk@1.12.6) (2021-11-30)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.12.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.4...@ohif/extension-vtk@1.12.5) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.12.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.3...@ohif/extension-vtk@1.12.4) (2021-10-15)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 ## [1.12.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.2...@ohif/extension-vtk@1.12.3) (2021-10-04)

 **Note:** Version bump only for package @ohif/extension-vtk
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-vtk",
-  "version": "1.12.3",
+  "version": "1.12.12",
  "description": "OHIF extension for VTK.js",
  "author": "OHIF",
  "license": "MIT",
@@ -32,11 +32,11 @@
    "@ohif/core": "^0.50.0",
    "@ohif/i18n": "^0.50.0",
    "@ohif/ui": "^0.50.0",
-    "cornerstone-core": "^2.5.0",
-    "cornerstone-tools": "^6.0.0",
-    "cornerstone-wado-image-loader": "^4.0.3",
-    "dcmjs": "0.18.9",
-    "dicom-parser": "^1.8.9",
+    "cornerstone-core": "^2.6.1",
+    "cornerstone-tools": "^6.0.6",
+    "cornerstone-wado-image-loader": "^4.1.0",
+    "dcmjs": "0.19.2",
+    "dicom-parser": "^1.8.11",
    "i18next": "^17.0.3",
    "i18next-browser-languagedetector": "^3.0.1",
    "prop-types": "^15.7.2",
@@ -53,11 +53,11 @@
    "react-vtkjs-viewport": "^0.14.4"
  },
  "devDependencies": {
-    "@ohif/core": "^2.16.0",
-    "@ohif/ui": "^1.10.2",
-    "cornerstone-tools": "^6.0.0",
-    "cornerstone-wado-image-loader": "^4.0.3",
-    "dicom-parser": "^1.8.9",
+    "@ohif/core": "^2.16.8",
+    "@ohif/ui": "^1.10.5",
+    "cornerstone-tools": "^6.0.6",
+    "cornerstone-wado-image-loader": "^4.1.0",
+    "dicom-parser": "^1.8.11",
    "gh-pages": "^2.0.1",
    "i18next": "^17.0.3",
    "i18next-browser-languagedetector": "^3.0.1",
@@ -56,6 +56,7 @@
    "@babel/preset-env": "^7.5.0",
    "@babel/preset-react": "^7.0.0",
    "@percy/cypress": "^2.2.0",
+    "@webpack-cli/serve": "^1.6.1",
    "babel-eslint": "9.x",
    "babel-loader": "^8.0.6",
    "babel-plugin-inline-react-svg": "1.1.0",
@@ -104,8 +105,8 @@
    "stylus-loader": "^3.0.2",
    "terser-webpack-plugin": "^2.1.0",
    "webpack": "^4.35.2",
-    "webpack-cli": "^3.3.5",
-    "webpack-dev-server": "^3.7.2",
+    "webpack-cli": "^4.9.2",
+    "webpack-dev-server": "^4.7.3",
    "webpack-hot-middleware": "^2.25.0",
    "webpack-merge": "^4.2.1",
    "workbox-webpack-plugin": "^5.0.0-beta.1",
@@ -123,6 +124,7 @@
    ]
  },
  "resolutions": {
+    "**/node-gyp": "8.4.1",
    "**/@babel/runtime": "7.5.5"
  }
 }
@@ -3,6 +3,76 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [2.16.8](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.7...@ohif/core@2.16.8) (2022-01-29)
+
+**Note:** Version bump only for package @ohif/core
+
+
+
+
+
+## [2.16.7](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.6...@ohif/core@2.16.7) (2022-01-20)
+
+**Note:** Version bump only for package @ohif/core
+
+
+
+
+
+## [2.16.6](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.5...@ohif/core@2.16.6) (2022-01-13)
+
+**Note:** Version bump only for package @ohif/core
+
+
+
+
+
+## [2.16.5](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.4...@ohif/core@2.16.5) (2021-12-23)
+
+
+### Bug Fixes
+
+* DICOMFileLoadingListener typo in method name ([#2647](https://github.com/OHIF/Viewers/issues/2647)) ([761d54f](https://github.com/OHIF/Viewers/commit/761d54fbbfb376c20ee15794ef7bb7111f64a06f))
+
+
+
+
+
+## [2.16.4](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.3...@ohif/core@2.16.4) (2021-12-23)
+
+
+### Bug Fixes
+
+* SeriesTime and SeriesDate are only set for the first series and undefined for the remaining ones ([#2476](https://github.com/OHIF/Viewers/issues/2476)) ([6a401c9](https://github.com/OHIF/Viewers/commit/6a401c9e5204cb4f7af6aa33190ad5a8d0879de6))
+
+
+
+
+
+## [2.16.3](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.2...@ohif/core@2.16.3) (2021-12-02)
+
+**Note:** Version bump only for package @ohif/core
+
+
+
+
+
+## [2.16.2](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.1...@ohif/core@2.16.2) (2021-11-30)
+
+**Note:** Version bump only for package @ohif/core
+
+
+
+
+
+## [2.16.1](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.0...@ohif/core@2.16.1) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/core
+
+
+
+
+
 # [2.16.0](https://github.com/OHIF/Viewers/compare/@ohif/core@2.15.1...@ohif/core@2.16.0) (2021-10-04)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/core",
-  "version": "2.16.0",
+  "version": "2.16.8",
  "description": "Generic business logic for web-based medical imaging applications",
  "author": "OHIF Core Team",
  "license": "MIT",
@@ -31,16 +31,16 @@
    "test:unit:ci": "jest --ci --runInBand --collectCoverage"
  },
  "peerDependencies": {
-    "cornerstone-core": "^2.5.0",
-    "cornerstone-tools": "^6.0.0",
-    "cornerstone-wado-image-loader": "^4.0.3",
-    "dicom-parser": "^1.8.9"
+    "cornerstone-core": "^2.6.1",
+    "cornerstone-tools": "^6.0.6",
+    "cornerstone-wado-image-loader": "^4.1.0",
+    "dicom-parser": "^1.8.11"
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
    "ajv": "^6.10.0",
-    "dcmjs": "0.18.9",
-    "dicomweb-client": "^0.8.1",
+    "dcmjs": "0.19.2",
+    "dicomweb-client": "^0.8.3",
    "immer": "6.0.2",
    "isomorphic-base64": "^1.0.2",
    "lodash.clonedeep": "^4.5.0",
@@ -98,7 +98,7 @@ class DICOMFileLoadingListener extends BaseLoadingListener {
  constructor(stack, options) {
    super(stack, options);

-    this.imageLoadProgressEventHandler = this._imageLoadProgressEventHandle.bind(
+    this.imageLoadProgressEventHandler = this._imageLoadProgressEventHandler.bind(
      this
    );

@@ -1,6 +1,4 @@
 import cornerstone from 'cornerstone-core';
-import cornerstoneTools from 'cornerstone-tools';
-
 import getImageId from '../utils/getImageId.js';

 const noop = () => {};
@@ -13,6 +11,7 @@ export class StudyPrefetcher {
    requestType: 'prefetch',
    preventCache: false,
    prefetchDisplaySetsTimeout: 300,
+    maxNumPrefetchRequests: 100,
    includeActiveDisplaySet: false,
  };

@@ -94,7 +93,11 @@ export class StudyPrefetcher {
    }

    this.element = element;
-    this.enabledElement = cornerstone.getEnabledElement(element);
+    try {
+      this.enabledElement = cornerstone.getEnabledElement(element);
+    } catch {
+      throw new Error('Failed to find the enabled element');
+    }

    this.stopPrefetching();
    this.prefetchDisplaySets(displaySetInstanceUID);
@@ -114,7 +117,11 @@ export class StudyPrefetcher {
   * @param {number} timeout
   */
  prefetchDisplaySetsAsync(element, timeout) {
-    this.enabledElement = cornerstone.getEnabledElement(element);
+    try {
+      this.enabledElement = cornerstone.getEnabledElement(element);
+    } catch {
+      throw new Error('Failed to find the enabled element');
+    }
    timeout = timeout || this.options.prefetchDisplaySetsTimeout;
    clearTimeout(this.prefetchDisplaySetsHandler);
    this.prefetchDisplaySetsHandler = setTimeout(() => {
@@ -145,6 +152,11 @@ export class StudyPrefetcher {
    const nonCachedImageIds = this.filterCachedImageIds(imageIds);
    const imageLoadPoolManager = cornerstone.imageLoadPoolManager;

+    imageLoadPoolManager.maxNumRequests = {
+      ...imageLoadPoolManager.maxNumRequests,
+      prefetch: this.options.maxNumPrefetchRequests,
+    };
+
    let requestFn;
    if (this.options.preventCache) {
      requestFn = id => cornerstone.loadImage(id);
@@ -9,7 +9,10 @@ import { SeriesMetadata } from './SeriesMetadata';
 import { api } from 'dicomweb-client';
 // - createStacks
 import { isImage } from '../../utils/isImage';
-import { isDisplaySetReconstructable, isSpacingUniform } from '../../utils/isDisplaySetReconstructable';
+import {
+  isDisplaySetReconstructable,
+  isSpacingUniform,
+} from '../../utils/isDisplaySetReconstructable';
 import errorHandler from '../../errorHandler';
 import isLowPriorityModality from '../../utils/isLowPriorityModality';
 import getXHRRetryRequestHook from '../../utils/xhrRetryRequestHook';
@@ -159,41 +162,64 @@ class StudyMetadata extends Metadata {
    // series into another display set.
    const stackableInstances = [];
    series.forEachInstance(instance => {
+      let displaySet;
+
      // All imaging modalities must have a valid value for SOPClassUID (x00080016) or Rows (x00280010)
      if (
        !isImage(instance.getTagValue('SOPClassUID')) &&
        !instance.getTagValue('Rows')
      ) {
-        return;
-      }
-
-      let displaySet;
-
-      if (isMultiFrame(instance)) {
-        displaySet = makeDisplaySet(series, [instance]);
-
+        // we set an empty display and we add a isModalitySupported variable to
+        // print a warning that the modality is not supported in the thumbnail.
+        const displaySet = new ImageSet([]);
+        const seriesData = series.getData();
        displaySet.setAttributes({
-          sopClassUIDs,
-          isClip: true,
+          displaySetInstanceUID: displaySet.uid,
+          SeriesDate: seriesData.SeriesDate,
+          SeriesTime: seriesData.SeriesTime,
          SeriesInstanceUID: series.getSeriesInstanceUID(),
-          StudyInstanceUID: study.getStudyInstanceUID(), // Include the study instance UID for drag/drop purposes
-          numImageFrames: instance.getTagValue('NumberOfFrames'), // Override the default value of instances.length
-          InstanceNumber: instance.getTagValue('InstanceNumber'), // Include the instance number
-          AcquisitionDatetime: instance.getTagValue('AcquisitionDateTime'), // Include the acquisition datetime
-        });
-        displaySets.push(displaySet);
-      } else if (isSingleImageModality(instance.Modality)) {
-        displaySet = makeDisplaySet(series, [instance]);
-        displaySet.setAttributes({
-          sopClassUIDs,
+          SeriesNumber: instance.getTagValue('SeriesNumber'),
+          SeriesDescription: instance.getTagValue('SeriesDescription'),
+          numImageFrames: instance.getTagValue('NumberOfFrames'),
+          frameRate: instance.getTagValue('FrameTime'),
+          Modality: instance.getTagValue('Modality'),
+          isMultiFrame: false,
          StudyInstanceUID: study.getStudyInstanceUID(), // Include the study instance UID
-          SeriesInstanceUID: series.getSeriesInstanceUID(),
          InstanceNumber: instance.getTagValue('InstanceNumber'), // Include the instance number
          AcquisitionDatetime: instance.getTagValue('AcquisitionDateTime'), // Include the acquisition datetime
+          isReconstructable: false,
+          isModalitySupported: false,
+          metadata: instance.getData().metadata,
        });
+
        displaySets.push(displaySet);
      } else {
-        stackableInstances.push(instance);
+        if (isMultiFrame(instance)) {
+          displaySet = makeDisplaySet(series, [instance]);
+
+          displaySet.setAttributes({
+            sopClassUIDs,
+            isClip: true,
+            SeriesInstanceUID: series.getSeriesInstanceUID(),
+            StudyInstanceUID: study.getStudyInstanceUID(), // Include the study instance UID for drag/drop purposes
+            numImageFrames: instance.getTagValue('NumberOfFrames'), // Override the default value of instances.length
+            InstanceNumber: instance.getTagValue('InstanceNumber'), // Include the instance number
+            AcquisitionDatetime: instance.getTagValue('AcquisitionDateTime'), // Include the acquisition datetime
+          });
+          displaySets.push(displaySet);
+        } else if (isSingleImageModality(instance.Modality)) {
+          displaySet = makeDisplaySet(series, [instance]);
+          displaySet.setAttributes({
+            sopClassUIDs,
+            StudyInstanceUID: study.getStudyInstanceUID(), // Include the study instance UID
+            SeriesInstanceUID: series.getSeriesInstanceUID(),
+            InstanceNumber: instance.getTagValue('InstanceNumber'), // Include the instance number
+            AcquisitionDatetime: instance.getTagValue('AcquisitionDateTime'), // Include the acquisition datetime
+          });
+          displaySets.push(displaySet);
+        } else {
+          stackableInstances.push(instance);
+        }
      }
    });

@@ -227,7 +253,6 @@ class StudyMetadata extends Metadata {
    displaySets.map(displaySet => this._derivedDisplaySets.push(displaySet));
  }

-
  /**
   * Returns the source display set of the derivated display set.
   * @param {object} derivatedDisplaySet
@@ -242,40 +267,45 @@ class StudyMetadata extends Metadata {
    });

    const otherDisplaySets = allDisplaySets.filter(
-      ds => ds.displaySetInstanceUID !== derivatedDisplaySet.displaySetInstanceUID
+      ds =>
+        ds.displaySetInstanceUID !== derivatedDisplaySet.displaySetInstanceUID
    );

    const { metadata } = derivatedDisplaySet;

-    let referencedSeriesInstanceUIDs = _findReferencedSeriesInstanceUIDsFromSourceImageSequence
-    (metadata, otherDisplaySets);
+    let referencedSeriesInstanceUIDs = _findReferencedSeriesInstanceUIDsFromSourceImageSequence(
+      metadata,
+      otherDisplaySets
+    );

-    let noReferencedSeriesAvailable = !referencedSeriesInstanceUIDs ||
+    let noReferencedSeriesAvailable =
+      !referencedSeriesInstanceUIDs ||
      referencedSeriesInstanceUIDs.length === 0;
    if (noReferencedSeriesAvailable) {
-      referencedSeriesInstanceUIDs =
-        _findReferencedSeriesInstanceUIDsFromReferencedSeriesSequence
-          (metadata);
+      referencedSeriesInstanceUIDs = _findReferencedSeriesInstanceUIDsFromReferencedSeriesSequence(
+        metadata
+      );
    }

-    noReferencedSeriesAvailable = !referencedSeriesInstanceUIDs ||
+    noReferencedSeriesAvailable =
+      !referencedSeriesInstanceUIDs ||
      referencedSeriesInstanceUIDs.length === 0;
    if (noReferencedSeriesAvailable) {
-      referencedSeriesInstanceUIDs =
-      _findReferencedSeriesInstanceUIDsFromReferencedImageSequence
-          (metadata, otherDisplaySets);
+      referencedSeriesInstanceUIDs = _findReferencedSeriesInstanceUIDsFromReferencedImageSequence(
+        metadata,
+        otherDisplaySets
+      );
    }

-    const referencedSeriesAvailable = referencedSeriesInstanceUIDs &&
-      referencedSeriesInstanceUIDs.length !== 0;
+    const referencedSeriesAvailable =
+      referencedSeriesInstanceUIDs && referencedSeriesInstanceUIDs.length !== 0;
    if (referencedSeriesAvailable) {
      const referencedDisplaySet = otherDisplaySets.find(ds =>
        referencedSeriesInstanceUIDs.includes(ds.SeriesInstanceUID)
      );
-      ;
      return referencedDisplaySet;
    }
-  };
+  }

  /**
   * Returns a list of derived datasets in the study, filtered by the given filter.
@@ -303,7 +333,10 @@ class StudyMetadata extends Metadata {
    if (referencedSeriesInstanceUID) {
      filteredDerivedDisplaySets = filteredDerivedDisplaySets.filter(
        displaySet => {
-          return StudyMetadata.getReferencedDisplaySet(displaySet, [this]).SeriesInstanceUID === referencedSeriesInstanceUID;
+          return (
+            StudyMetadata.getReferencedDisplaySet(displaySet, [this])
+              .SeriesInstanceUID === referencedSeriesInstanceUID
+          );
        }
      );
    }
@@ -311,8 +344,7 @@ class StudyMetadata extends Metadata {
    if (referencedFrameOfReferenceUID) {
      filteredDerivedDisplaySets = filteredDerivedDisplaySets.filter(
        displaySet =>
-          displaySet.FrameOfReferenceUID ===
-          referencedFrameOfReferenceUID
+          displaySet.FrameOfReferenceUID === referencedFrameOfReferenceUID
      );
    }

@@ -497,8 +529,10 @@ class StudyMetadata extends Metadata {
      }
    }

-    if (this._displaySets.some(ds => 
-        ds.displaySetInstanceUID === displaySet.displaySetInstanceUID)
+    if (
+      this._displaySets.some(
+        ds => ds.displaySetInstanceUID === displaySet.displaySetInstanceUID
+      )
    ) {
      return;
    }
@@ -867,8 +901,9 @@ const makeDisplaySet = (series, instances) => {
    imageSet.sortByImagePositionPatient();

    // check if the spacing is uniform and update isReconstructable
-    const datasetIs4D = displayReconstructableInfo.reconstructionIssues.find
-      (issue => issue === ReconstructionIssues.DATASET_4D);
+    const datasetIs4D = displayReconstructableInfo.reconstructionIssues.find(
+      issue => issue === ReconstructionIssues.DATASET_4D
+    );
    displaySpacingInfo = isSpacingUniform(imageSet.images, datasetIs4D);
    imageSet.isReconstructable = displaySpacingInfo.isUniform;

@@ -881,11 +916,15 @@ const makeDisplaySet = (series, instances) => {

  if (!imageSet.displayReconstructableInfo) {
    // It is not reconstrabale Save type of warning
-    imageSet.reconstructionIssues = displaySpacingInfo ?
-      displayReconstructableInfo.reconstructionIssues.concat(displaySpacingInfo.reconstructionIssues) :
-        displayReconstructableInfo.reconstructionIssues;
+    imageSet.reconstructionIssues = displaySpacingInfo
+      ? displayReconstructableInfo.reconstructionIssues.concat(
+          displaySpacingInfo.reconstructionIssues
+        )
+      : displayReconstructableInfo.reconstructionIssues;
  }

+  imageSet.isModalitySupported = true;
+
  return imageSet;
 };

@@ -963,38 +1002,36 @@ function _getDisplaySetFromSopClassModule(
 }

 /**
-  * Returns the referenced series instance UIDs by searching the information in the
-  * ReferencedSeriesSequence.
-  * @param {object} derivatedDisplaySet.metadata
-  * @return {array[string]} referenced series instance UIDs.
-  */
-function _findReferencedSeriesInstanceUIDsFromReferencedSeriesSequence (
-  metadata,
+ * Returns the referenced series instance UIDs by searching the information in the
+ * ReferencedSeriesSequence.
+ * @param {object} derivatedDisplaySet.metadata
+ * @return {array[string]} referenced series instance UIDs.
+ */
+function _findReferencedSeriesInstanceUIDsFromReferencedSeriesSequence(
+  metadata
 ) {
  if (!metadata.ReferencedSeriesSequence) {
    return;
  }

  let referencedSeriesInstanceUIDs;
-  const ReferencedSeriesSequence = _toArray(
-    metadata.ReferencedSeriesSequence
-  );
+  const ReferencedSeriesSequence = _toArray(metadata.ReferencedSeriesSequence);

  referencedSeriesInstanceUIDs = ReferencedSeriesSequence.map(
    ReferencedSeries => ReferencedSeries.SeriesInstanceUID
  );

  return referencedSeriesInstanceUIDs;
-};
+}

 /**
-  * Returns the referenced series instance UIDs by searching the information in the
-  * ReferencedImageSequence.
-  * @param {object} derivatedDisplaySet.metadata
-  * @param {array[object]} displaysets
-  * @return {array[string]} referenced series instance UIDs.
-  */
-function _findReferencedSeriesInstanceUIDsFromReferencedImageSequence (
+ * Returns the referenced series instance UIDs by searching the information in the
+ * ReferencedImageSequence.
+ * @param {object} derivatedDisplaySet.metadata
+ * @param {array[object]} displaysets
+ * @return {array[string]} referenced series instance UIDs.
+ */
+function _findReferencedSeriesInstanceUIDsFromReferencedImageSequence(
  metadata,
  displaySets
 ) {
@@ -1015,22 +1052,25 @@ function _findReferencedSeriesInstanceUIDsFromReferencedImageSequence (
      ReferencedSOPInstanceUID
    );

-    if (referencedSeriesInstanceUIDs && referencedSeriesInstanceUIDs.length !== 0) {
+    if (
+      referencedSeriesInstanceUIDs &&
+      referencedSeriesInstanceUIDs.length !== 0
+    ) {
      break;
    }
  }

  return referencedSeriesInstanceUIDs;
-};
+}

 /**
-  * Returns the referenced series instance UIDs by searching the information in the
-  * SourceImageSequence.
-  * @param {object} derivatedDisplaySet.metadata
-  * @param {array[object]} displaysets
-  * @return {array[string]} referenced series instance UIDs.
-  */
-function _findReferencedSeriesInstanceUIDsFromSourceImageSequence (
+ * Returns the referenced series instance UIDs by searching the information in the
+ * SourceImageSequence.
+ * @param {object} derivatedDisplaySet.metadata
+ * @param {array[object]} displaysets
+ * @return {array[string]} referenced series instance UIDs.
+ */
+function _findReferencedSeriesInstanceUIDsFromSourceImageSequence(
  metadata,
  displaySets
 ) {
@@ -1040,9 +1080,7 @@ function _findReferencedSeriesInstanceUIDsFromSourceImageSequence (
    SourceImageSequence = metadata.SourceImageSequence;
  } else {
    const { PerFrameFunctionalGroupsSequence } = metadata;
-    const firstFunctionalGroups = _toArray(
-      PerFrameFunctionalGroupsSequence
-    )[0];
+    const firstFunctionalGroups = _toArray(PerFrameFunctionalGroupsSequence)[0];
    if (firstFunctionalGroups) {
      const { DerivationImageSequence } = firstFunctionalGroups;
      SourceImageSequence = DerivationImageSequence;
@@ -1062,22 +1100,25 @@ function _findReferencedSeriesInstanceUIDsFromSourceImageSequence (
      displaySets,
      ReferencedSOPInstanceUID
    );
-    if (referencedSeriesInstanceUIDs && referencedSeriesInstanceUIDs.length !== 0) {
+    if (
+      referencedSeriesInstanceUIDs &&
+      referencedSeriesInstanceUIDs.length !== 0
+    ) {
      break;
    }
  }

  return referencedSeriesInstanceUIDs;
-};
+}

 /**
-  * Returns the referenced series instance UIDs by searching the information in the
-  * SOPInstanceUID of the displaySets.
-  * @param {array[object]} displaysets
-  * @param {string} SOPInstanceUID
-  * @return {array[string]} referenced series instance UIDs.
-  */
-function _findReferencedSeriesInstanceUIDsFromSOPInstanceUID (
+ * Returns the referenced series instance UIDs by searching the information in the
+ * SOPInstanceUID of the displaySets.
+ * @param {array[object]} displaysets
+ * @param {string} SOPInstanceUID
+ * @return {array[string]} referenced series instance UIDs.
+ */
+function _findReferencedSeriesInstanceUIDsFromSOPInstanceUID(
  displaySets,
  SOPInstanceUID
 ) {
@@ -1098,10 +1139,10 @@ function _findReferencedSeriesInstanceUIDsFromSOPInstanceUID (
      }
    }
  }
-};
+}

 function _toArray(arrayOrObject) {
  return Array.isArray(arrayOrObject) ? arrayOrObject : [arrayOrObject];
 }

-export {StudyMetadata};
+export { StudyMetadata };
@@ -20,6 +20,7 @@ import ui from './ui';
 import user from './user.js';
 import errorHandler from './errorHandler.js';
 import utils, { hotkeys } from './utils/';
+import str2ab from './utils/str2ab';

 import {
  UINotificationService,
@@ -96,6 +97,8 @@ export {
  UIDialogService,
  MeasurementService,
  LoggerService,
+
+  str2ab,
 };

 export { OHIF };
@@ -26,6 +26,7 @@ describe('Top level exports', () => {
      'cornerstone',
      'default', //
      'errorHandler',
+      'str2ab',
      'string',
      'ui',
      'user',
@@ -9,38 +9,27 @@ import { api } from 'dicomweb-client';
 */
 export default class StaticWadoClient extends api.DICOMwebClient {
  static filterKeys = {
-    StudyInstanceUID: '0020000D',
-    PatientName: '00100010',
-    PatientID: '00100020',
-    StudyDescription: '00081030',
-    ModalitiesInStudy: '00080061',
+    "StudyInstanceUID": "0020000D",
+    "PatientName": "00100010",
+    "00100020": "mrn",
+    "PatientID": "00100020",
+    "StudyDescription": "00081030",
+    "StudyDate": "00080020",
+    "ModalitiesInStudy": "00080061",
+    AccessionNumber: "00080050",
  };

  constructor(qidoConfig) {
    super(qidoConfig);
    this.staticWado = qidoConfig.staticWado;
-    this.extendMetadataWithInstances = qidoConfig.extendMetadataWithInstances;
-  }
-
-  async retrieveSeriesMetadata(options) {
-    if (!this.extendMetadataWithInstances)
-      return super.retrieveSeriesMetadata(options);
-    const results = await Promise.all([
-      super.retrieveSeriesMetadata(options),
-      this.searchForInstances(options),
-    ]);
-    const metadata = results[0];
-    const instances = results[1];
-    return metadata.map(item => {
-      const sopUID = item['00080018'].Value[0];
-      const instance = instances.find(
-        instance => instance['00080018'].Value[0] == sopUID
-      );
-      Object.assign(item, instance);
-      return item;
-    });
  }

+  /**
+   * Replace the search for studies remote query with a local version which
+   * retrieves a complete query list and then sub-selects from it locally.
+   * @param {*} options
+   * @returns
+   */
  async searchForStudies(options) {
    if (!this.staticWado) return super.searchForStudies(options);

@@ -56,6 +45,62 @@ export default class StaticWadoClient extends api.DICOMwebClient {
    return filtered;
  }

+  /**
+   * Compares values, matching any instance of desired to any instance of
+   * actual by recursively go through the paired set of values.  That is,
+   * this is O(m*n) where m is how many items in desired and n is the length of actual
+   * Then, at the individual item node, compares the Alphabetic name if present,
+   * and does a sub-string matching on string values, and otherwise does an
+   * exact match comparison.
+   *
+   * @param {*} desired
+   * @param {*} actual
+   * @returns true if the values match
+   */
+  compareValues(desired, actual) {
+    if (Array.isArray(desired)) {
+      return desired.find(item => this.compareValues(item, actual));
+    }
+    if (Array.isArray(actual)) {
+      return actual.find(actualItem => this.compareValues(desired, actualItem));
+    }
+    if (actual && actual.Alphabetic) {
+      actual = actual.Alphabetic;
+    }
+    if (typeof (actual) == 'string') {
+      if (actual.length === 0) return true;
+      if (desired.length === 0 || desired === '*') return true;
+      if (desired[0] === '*' && desired[desired.length - 1] === '*') {
+        console.log(`Comparing ${actual} to ${desired.substring(1, desired.length - 1)}`)
+        return actual.indexOf(desired.substring(1, desired.length - 1)) != -1;
+      } else if (desired[desired.length - 1] === '*') {
+        return actual.indexOf(desired.substring(0, desired.length - 1)) != -1;
+      } else if (desired[0] === '*') {
+        return actual.indexOf(desired.substring(1)) === actual.length - desired.length + 1;
+      }
+    }
+    return desired === actual;
+  }
+
+  /** Compares a pair of dates to see if the value is within the range */
+  compareDateRange(range, value) {
+    if (!value) return true;
+    const dash = range.indexOf('-');
+    if (dash === -1) return this.compareValues(range, value);
+    const start = range.substring(0, dash);
+    const end = range.substring(dash + 1);
+    return (!start || value >= start) &&
+      (!end || value <= end);
+  }
+
+  /**
+   * Filters the return list by the query parameters.
+   *
+   * @param {*} key
+   * @param {*} queryParams
+   * @param {*} study
+   * @returns
+   */
  filterItem(key, queryParams, study) {
    const altKey = StaticWadoClient.filterKeys[key] || key;
    if (!queryParams) return true;
@@ -63,23 +108,8 @@ export default class StaticWadoClient extends api.DICOMwebClient {
    if (!testValue) return true;
    const valueElem = study[key] || study[altKey];
    if (!valueElem) return false;
+    if (valueElem.vr == 'DA') return this.compareDateRange(testValue, valueElem.Value[0]);
    const value = valueElem.Value;
-    return this.eqItem(testValue, value);
-  }
-
-  eqItem(testValue, value) {
-    if (testValue.filter) {
-      return (
-        testValue.filter(testItem => this.eqItem(testItem, value)).length > 0
-      );
-    }
-    if (value === testValue) return true;
-    if (typeof value == 'string') {
-      return value.indexOf(testValue) != -1;
-    }
-    if (value.Alphabetic) return this.eqItem(testValue, value.Alphabetic);
-    if (value.filter)
-      return value.filter(item => this.eqItem(testValue, item)).length > 0;
-    return false;
+    return this.compareValues(testValue, value) && true;
  }
 }
@@ -116,6 +116,11 @@ async function makeSOPInstance(server, study, instance) {
    };
    study.seriesMap[SeriesInstanceUID] = series;
    study.series.push(series);
+  } else {
+    if (series.SeriesDate === undefined)
+      series.SeriesDate = naturalizedInstance.SeriesDate;
+    if (series.SeriesTime === undefined)
+      series.SeriesTime = naturalizedInstance.SeriesTime;
  }

  const wadouri = buildInstanceWadoUrl(
@@ -1,6 +1,5 @@
 import { ReconstructionIssues } from './../enums.js';

-
 /**
 * Checks if a series is reconstructable to a 3D volume.
 *
@@ -78,7 +77,9 @@ function processSingleframe(instances) {
      reconstructionIssues.push(ReconstructionIssues.VARYING_IMAGESDIMENSIONS);
    } else if (SamplesPerPixel !== firstImageSamplesPerPixel) {
      reconstructionIssues.push(ReconstructionIssues.VARYING_IMAGESCOMPONENTS);
-    } else if (!_isSameArray(ImageOrientationPatient, firstImageOrientationPatient)) {
+    } else if (
+      !_isSameArray(ImageOrientationPatient, firstImageOrientationPatient)
+    ) {
      reconstructionIssues.push(ReconstructionIssues.VARYING_IMAGESORIENTATION);
    }

@@ -92,7 +93,10 @@ function processSingleframe(instances) {
    reconstructionIssues.push(ReconstructionIssues.DATASET_4D);
  }

-  return { value: reconstructionIssues.length === 0 ? true : false, reconstructionIssues };
+  return {
+    value: reconstructionIssues.length === 0 ? true : false,
+    reconstructionIssues,
+  };
 }

 /**
@@ -116,14 +120,12 @@ function isSpacingUniform(instances, datasetIs4D) {
  // If spacing is on a uniform grid but we are missing frames,
  // Allow reconstruction, but pass back the number of missing frames.
  if (n > 2) {
-    const lastIpp = instances[n - 1].getData().metadata
-      .ImagePositionPatient;
+    const lastIpp = instances[n - 1].getData().metadata.ImagePositionPatient;

    // We can't reconstruct if we are missing ImagePositionPatient values
    if (firstImagePositionPatient && lastIpp) {
      const averageSpacingBetweenFrames =
-        _getPerpendicularDistance(firstImagePositionPatient, lastIpp) /
-        (n - 1);
+        _getPerpendicularDistance(firstImagePositionPatient, lastIpp) / (n - 1);

      let previousImagePositionPatient = firstImagePositionPatient;

@@ -136,7 +138,7 @@ function isSpacingUniform(instances, datasetIs4D) {
          previousImagePositionPatient
        );

-        if (datasetIs4D && spacingBetweenFrames < 1.e-3) {
+        if (datasetIs4D && spacingBetweenFrames < 1e-3) {
          // the dataset is 4D, if the distance is zero, means that we are
          // checking the 4th dimension. Do not return, since we want still to
          // check the 3rd dimension spacing.
@@ -164,10 +166,13 @@ function isSpacingUniform(instances, datasetIs4D) {
    }
  }

-  return { isUniform: reconstructionIssues.length === 0 ? true : false, missingFrames, reconstructionIssues };
+  return {
+    isUniform: reconstructionIssues.length === 0 ? true : false,
+    missingFrames,
+    reconstructionIssues,
+  };
 }

-
 /**
 *  Check if 4D dataset.
 *
@@ -181,7 +186,7 @@ function isSpacingUniform(instances, datasetIs4D) {
 *
 * @returns {boolean} dataset4D value.
 */
- function _isDataset4D(instances) {
+function _isDataset4D(instances) {
  const n = instances.length;
  for (let ii = 0; ii < n; ++ii) {
    const instanceMetadataControl = instances[ii].getData().metadata;
@@ -204,7 +209,12 @@ function isSpacingUniform(instances, datasetIs4D) {
        continue;
      }

-      if (_isSameArray(instanceMetadataControl.ImagePositionPatient, instanceMetadata.ImagePositionPatient)) {
+      if (
+        _isSameArray(
+          instanceMetadataControl.ImagePositionPatient,
+          instanceMetadata.ImagePositionPatient
+        )
+      ) {
        return true;
      }
    }
@@ -265,11 +275,11 @@ function _getSpacingIssue(spacing, averageSpacing) {
 function _getPerpendicularDistance(a, b) {
  return Math.sqrt(
    Math.pow(a[0] - b[0], 2) +
-    Math.pow(a[1] - b[1], 2) +
-    Math.pow(a[2] - b[2], 2)
+      Math.pow(a[1] - b[1], 2) +
+      Math.pow(a[2] - b[2], 2)
  );
 }

 const constructableModalities = ['MR', 'CT', 'PT', 'NM'];

-export {isDisplaySetReconstructable, isSpacingUniform};
+export { isDisplaySetReconstructable, isSpacingUniform };
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.10.5](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.10.4...@ohif/ui@1.10.5) (2021-11-30)
+
+**Note:** Version bump only for package @ohif/ui
+
+
+
+
+
+## [1.10.4](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.10.3...@ohif/ui@1.10.4) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/ui
+
+
+
+
+
+## [1.10.3](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.10.2...@ohif/ui@1.10.3) (2021-10-15)
+
+**Note:** Version bump only for package @ohif/ui
+
+
+
+
+
 ## [1.10.2](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.10.1...@ohif/ui@1.10.2) (2021-09-24)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/ui",
-  "version": "1.10.2",
+  "version": "1.10.5",
  "description": "A set of React components for Medical Imaging Viewers",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -25,11 +25,12 @@ function StudyBrowser(props) {
                altImageText,
                displaySetInstanceUID,
                imageId,
-                InstanceNumber,
+                derivedDisplaySetsNumber,
                numImageFrames,
                SeriesDescription,
                SeriesNumber,
                hasWarnings,
+                hasDerivedDisplaySets,
              } = thumb;

              return (
@@ -48,12 +49,13 @@ function StudyBrowser(props) {
                    // Thumb
                    altImageText={altImageText}
                    imageId={imageId}
-                    InstanceNumber={InstanceNumber}
+                    derivedDisplaySetsNumber={derivedDisplaySetsNumber}
                    displaySetInstanceUID={displaySetInstanceUID} // used by drop
                    numImageFrames={numImageFrames}
                    SeriesDescription={SeriesDescription}
                    SeriesNumber={SeriesNumber}
                    hasWarnings={hasWarnings}
+                    hasDerivedDisplaySets={hasDerivedDisplaySets}
                    // Events
                    onClick={onThumbnailClick.bind(
                      undefined,
@@ -83,7 +85,7 @@ StudyBrowser.propTypes = {
          altImageText: PropTypes.string,
          displaySetInstanceUID: PropTypes.string.isRequired,
          imageId: PropTypes.string,
-          InstanceNumber: PropTypes.number,
+          derivedDisplaySetsNumber: PropTypes.number,
          numImageFrames: PropTypes.number,
          SeriesDescription: PropTypes.string,
          SeriesNumber: PropTypes.number,
@@ -15,11 +15,12 @@ const StudyLoadingListener = classes.StudyLoadingListener;
 function ThumbnailFooter({
  SeriesDescription,
  SeriesNumber,
-  InstanceNumber,
  numImageFrames,
  hasWarnings,
+  hasDerivedDisplaySets,
 }) {
  const [inconsistencyWarnings, inconsistencyWarningsSet] = useState([]);
+  const [derivedDisplaySetsActive, derivedDisplaySetsActiveSet] = useState([]);

  useEffect(() => {
    let unmounted = false;
@@ -28,10 +29,15 @@ function ThumbnailFooter({
        inconsistencyWarningsSet(response);
      }
    });
+    hasDerivedDisplaySets.then(response => {
+      if (!unmounted) {
+        derivedDisplaySetsActiveSet(response);
+      }
+    });
    return () => {
      unmounted = true;
    };
-  }, [hasWarnings]);
+  }, [hasWarnings, hasDerivedDisplaySets]);

  const infoOnly = !SeriesDescription;

@@ -88,20 +94,47 @@ function ThumbnailFooter({
      </React.Fragment>
    );
  };
+
+  const getDerivedInfo = derivedDisplaySetsActive => {
+    return (
+      <React.Fragment>
+        {derivedDisplaySetsActive ? (
+          <div className="derived">
+            <Icon name="link" />
+          </div>
+        ) : (
+          <React.Fragment></React.Fragment>
+        )}
+      </React.Fragment>
+    );
+  };
+
  const getSeriesInformation = (
    SeriesNumber,
-    InstanceNumber,
    numImageFrames,
-    inconsistencyWarnings
+    inconsistencyWarnings,
+    derivedDisplaySetsActive
  ) => {
-    if (!SeriesNumber && !InstanceNumber && !numImageFrames) {
+    if (!SeriesNumber && !numImageFrames) {
      return;
    }
    const seriesInformation = (
      <div className="series-information">
-        {getInfo(SeriesNumber, 'S:')}
-        {getInfo(InstanceNumber, 'I:')}
-        {getInfo(numImageFrames, '', 'image-frames')}
+        <React.Fragment>
+          {SeriesNumber !== undefined ? (
+            getInfo(SeriesNumber, 'S:')
+          ) : (
+            <React.Fragment></React.Fragment>
+          )}
+        </React.Fragment>
+        <React.Fragment>
+          {numImageFrames !== undefined ? (
+            getInfo(numImageFrames, '', 'image-frames')
+          ) : (
+            <React.Fragment></React.Fragment>
+          )}
+        </React.Fragment>
+        {getDerivedInfo(derivedDisplaySetsActive)}
        {getWarningInfo(SeriesNumber, inconsistencyWarnings)}
      </div>
    );
@@ -114,9 +147,9 @@ function ThumbnailFooter({
      <div className="series-description">{SeriesDescription}</div>
      {getSeriesInformation(
        SeriesNumber,
-        InstanceNumber,
        numImageFrames,
-        inconsistencyWarnings
+        inconsistencyWarnings,
+        derivedDisplaySetsActive
      )}
    </div>
  );
@@ -130,11 +163,6 @@ function Thumbnail(props) {
    displaySetInstanceUID,
    imageId,
    imageSrc,
-    InstanceNumber,
-    numImageFrames,
-    SeriesDescription,
-    SeriesNumber,
-    hasWarnings,
    StudyInstanceUID,
    onClick,
    onDoubleClick,
@@ -232,8 +260,8 @@ Thumbnail.propTypes = {
  altImageText: PropTypes.string,
  SeriesDescription: PropTypes.string,
  SeriesNumber: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  InstanceNumber: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
  hasWarnings: PropTypes.instanceOf(Promise),
+  hasDerivedDisplaySets: PropTypes.instanceOf(Promise),
  numImageFrames: PropTypes.number,
  onDoubleClick: PropTypes.func,
  onClick: PropTypes.func,
@@ -41,7 +41,7 @@ const SnackbarProvider = ({ children, service }) => {
    LogManager.subscribe(LogManager.EVENTS.OnLog, onLogHandler);

    return () => {
-      LogManager.subscribe(LogManager.EVENTS.OnLog, onLogHandler);
+      LogManager.unsubscribe(LogManager.EVENTS.OnLog, onLogHandler);
    };
  }, [show]);

@@ -26,6 +26,16 @@ const PROXY_TARGET = process.env.PROXY_TARGET;
 const PROXY_DOMAIN = process.env.PROXY_DOMAIN;
 const ENTRY_TARGET = process.env.ENTRY_TARGET || `${SRC_DIR}/index.js`;

+
+const setHeaders = (res, path) => {
+  res.setHeader('Content-Type', 'text/plain')
+  if (path.indexOf('.gz') !== -1) {
+    res.setHeader('Content-Encoding', 'gzip')
+  } else if (path.indexOf('.br') !== -1) {
+    res.setHeader('Content-Encoding', 'br')
+  }
+}
+
 module.exports = (env, argv) => {
  const baseConfig = webpackBase(env, argv, { SRC_DIR, DIST_DIR });
  const isProdBuild = process.env.NODE_ENV === 'production';
@@ -134,11 +144,40 @@ module.exports = (env, argv) => {
      hot: true,
      open: true,
      port: 3000,
-      host: '0.0.0.0',
-      public: 'http://localhost:' + 3000,
+      client: {
+        overlay: { errors: true, warnings: false },
+      },
+      'static': [
+        {
+          directory: path.join(require('os').homedir(), 'dicomweb'),
+          staticOptions: {
+            extensions: ['gz', 'br'],
+            index: "index.json.gz",
+            redirect: true,
+            setHeaders,
+          },
+          publicPath: '/dicomweb',
+        },
+        {
+          directory: '../../testdata',
+          staticOptions: {
+            extensions: ['gz', 'br'],
+            index: "index.json.gz",
+            redirect: true,
+            setHeaders,
+          },
+          publicPath: '/testdata',
+        },
+      ],
+      //public: 'http://localhost:' + 3000,
+      //writeToDisk: true,
      historyApiFallback: {
        disableDotRule: true,
      },
+      headers: {
+        'Cross-Origin-Embedder-Policy': 'require-corp',
+        'Cross-Origin-Opener-Policy': 'same-origin',
+      },
    },
  });

@@ -3,6 +3,102 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [4.12.13](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.12...@ohif/viewer@4.12.13) (2022-01-29)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.12](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.11...@ohif/viewer@4.12.12) (2022-01-20)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.11](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.10...@ohif/viewer@4.12.11) (2022-01-19)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.10](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.9...@ohif/viewer@4.12.10) (2022-01-13)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.9](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.8...@ohif/viewer@4.12.9) (2021-12-23)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.8](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.7...@ohif/viewer@4.12.8) (2021-12-23)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.7](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.6...@ohif/viewer@4.12.7) (2021-12-02)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.6](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.5...@ohif/viewer@4.12.6) (2021-11-30)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.5](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.4...@ohif/viewer@4.12.5) (2021-10-27)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.4](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.3...@ohif/viewer@4.12.4) (2021-10-26)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.3](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.2...@ohif/viewer@4.12.3) (2021-10-25)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.1...@ohif/viewer@4.12.2) (2021-10-15)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
 ## [4.12.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.0...@ohif/viewer@4.12.1) (2021-10-06)

 **Note:** Version bump only for package @ohif/viewer
@@ -85,7 +85,7 @@ describe('OHIF Save Measurements', function() {
  //   cy.get('.sb-closeIcon').click();
  // });

-  it('checks if warning message is displayed on measurements of unsupported tools', function() {
+  /*it('checks if warning message is displayed on measurements of unsupported tools', function() {
    // Add measurement for unsupported tool in the viewport
    cy.addAngleMeasurement();

@@ -108,7 +108,7 @@ describe('OHIF Save Measurements', function() {

    // Close Measurements panel
    cy.get('@measurementsBtn').click();
-  });
+  });*/

  /*it('checks if measurements of unsupported tools were not saved', function() {
    // Add measurement for supported tool in the viewport
@@ -1,4 +1,5 @@
 import '@percy/cypress';
+import { enable } from 'cornerstone-core';
 import 'cypress-file-upload';
 import { DragSimulator } from '../helpers/DragSimulator.js';
 import {
@@ -199,6 +200,11 @@ Cypress.Commands.add('waitDicomImage', (timeout = 50000) => {
      .its('cornerstone')
      .then({ timeout }, $cornerstone => {
        return new Cypress.Promise(resolve => {
+          const onEnabled = enabledEvt => {
+            const element = enabledEvt.detail.element;
+
+            element.addEventListener('cornerstoneimagerendered', onEvent);
+          };
          const onEvent = renderedEvt => {
            const element = renderedEvt.detail.element;

@@ -209,15 +215,17 @@ Cypress.Commands.add('waitDicomImage', (timeout = 50000) => {
            );
            resolve();
          };
-          const onEnabled = enabledEvt => {
-            const element = enabledEvt.detail.element;
-
-            element.addEventListener('cornerstoneimagerendered', onEvent);
-          };
-          $cornerstone.events.addEventListener(
-            'cornerstoneelementenabled',
-            onEnabled
-          );
+          const enabledElements = $cornerstone.getEnabledElements();
+          if (enabledElements && enabledElements.length && !enabledElements[0].invalid) {
+            // Sometimes the page finishes rendering before this gets run,
+            // if so, just resolve immediately.
+            resolve();
+          } else {
+            $cornerstone.events.addEventListener(
+              'cornerstoneelementenabled',
+              onEnabled
+            );
+          }
        });
      });
  }
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "4.12.1",
+  "version": "4.12.13",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -22,8 +22,8 @@
    "build:viewer:ci": "cross-env NODE_ENV=production PUBLIC_URL=/pwa/ APP_CONFIG=config/netlify.js QUICK_BUILD=true node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --config .webpack/webpack.pwa.js",
    "build:viewer:demo": "cross-env NODE_ENV=production APP_CONFIG=config/demo.js HTML_TEMPLATE=rollbar.html QUICK_BUILD=true node --max_old_space_size=4096 ./../../node_modules/webpack/bin/webpack.js --progress --config .webpack/webpack.pwa.js",
    "build:viewer:package": "yarn run build:package",
-    "dev": "cross-env NODE_ENV=development webpack-dev-server --config .webpack/webpack.pwa.js --watch",
-    "dev:orthanc": "cross-env NODE_ENV=development PROXY_TARGET=/dicom-web PROXY_DOMAIN=http://localhost:8042 APP_CONFIG=config/docker_nginx-orthanc.js webpack-dev-server --config .webpack/webpack.pwa.js --watch",
+    "dev": "cross-env NODE_ENV=development webpack-dev-server --config .webpack/webpack.pwa.js",
+    "dev:orthanc": "cross-env NODE_ENV=development PROXY_TARGET=/dicom-web PROXY_DOMAIN=http://localhost:8042 APP_CONFIG=config/docker_nginx-orthanc.js webpack-dev-server --config .webpack/webpack.pwa.js",
    "dev:viewer": "yarn run dev",
    "start": "yarn run dev",
    "test:e2e": "cypress open",
@@ -31,7 +31,7 @@
    "test:e2e:script-tag": "cypress run --config video=false --browser chrome --spec 'cypress/integration/common/**/*,cypress/integration/script-tag/**/*'",
    "test:e2e:local": "cypress run --config video=false --browser chrome --spec 'cypress/integration/common/**/*,cypress/integration/pwa/**/*'",
    "test:e2e:dist": "start-server-and-test test:e2e:serve http://localhost:3000 test:e2e:ci",
-    "test:e2e:serve": "serve -n -l 3000 -s dist",
+    "test:e2e:serve": "cross-env APP_CONFIG=config/e2e.js yarn start",
    "test:unit": "jest --watchAll",
    "test:unit:ci": "jest --ci --runInBand --collectCoverage",
    "prepublishOnly": "yarn run build:package",
@@ -47,28 +47,28 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
-    "@ohif/core": "^2.16.0",
-    "@ohif/extension-cornerstone": "^2.12.1",
-    "@ohif/extension-debugging": "^0.3.0",
-    "@ohif/extension-dicom-html": "^1.3.11",
+    "@ohif/core": "^2.16.8",
+    "@ohif/extension-cornerstone": "^2.12.4",
+    "@ohif/extension-debugging": "^0.3.1",
+    "@ohif/extension-dicom-html": "^1.3.15",
    "@ohif/extension-dicom-microscopy": "^0.52.0",
-    "@ohif/extension-dicom-pdf": "^1.1.0",
-    "@ohif/extension-dicom-rt": "^0.7.2",
-    "@ohif/extension-dicom-segmentation": "^0.7.2",
+    "@ohif/extension-dicom-pdf": "^1.1.2",
+    "@ohif/extension-dicom-rt": "^0.7.6",
+    "@ohif/extension-dicom-segmentation": "^0.7.6",
    "@ohif/extension-lesion-tracker": "^0.2.1",
-    "@ohif/extension-vtk": "^1.12.3",
+    "@ohif/extension-vtk": "^1.12.12",
    "@ohif/i18n": "^0.53.0",
-    "@ohif/ui": "^1.10.2",
+    "@ohif/ui": "^1.10.5",
    "@tanem/react-nprogress": "^1.1.25",
    "classnames": "^2.2.6",
    "core-js": "^3.2.1",
-    "cornerstone-core": "^2.5.0",
+    "cornerstone-core": "^2.6.1",
    "cornerstone-math": "^0.1.9",
-    "cornerstone-tools": "^6.0.0",
-    "cornerstone-wado-image-loader": "^4.0.3",
-    "dcmjs": "0.18.9",
-    "dicom-parser": "^1.8.9",
-    "dicomweb-client": "^0.8.1",
+    "cornerstone-tools": "^6.0.6",
+    "cornerstone-wado-image-loader": "^4.1.0",
+    "dcmjs": "0.19.2",
+    "dicom-parser": "^1.8.11",
+    "dicomweb-client": "^0.8.3",
    "hammerjs": "^2.0.8",
    "i18next": "^17.0.3",
    "i18next-browser-languagedetector": "^3.0.1",
@@ -11,6 +11,7 @@ window.config = {
    displaySetCount: 3,
    preventCache: false,
    prefetchDisplaySetsTimeout: 300,
+    maxNumPrefetchRequests: 100,
    displayProgress: true,
    includeActiveDisplaySet: true,
  },
@@ -0,0 +1,116 @@
+window.config = {
+  routerBasename: '/',
+  showStudyList: true,
+  servers: {
+    dicomWeb: [
+      {
+        name: 'LocalStatic',
+        wadoUriRoot: '/testdata',
+        qidoRoot: '/testdata',
+        wadoRoot: '/testdata',
+        qidoSupportsIncludeField: false,
+        imageRendering: 'wadors',
+        enableStudyLazyLoad: true,
+        supportsFuzzyMatching: false,
+        staticWado: true,
+      },
+    ],
+  },
+  // Extensions should be able to suggest default values for these?
+  // Or we can require that these be explicitly set
+  hotkeys: [
+    // ~ Global
+    {
+      commandName: 'incrementActiveViewport',
+      label: 'Next Viewport',
+      keys: ['right'],
+    },
+    {
+      commandName: 'decrementActiveViewport',
+      label: 'Previous Viewport',
+      keys: ['left'],
+    },
+    // Supported Keys: https://craig.is/killing/mice
+    // ~ Cornerstone Extension
+    { commandName: 'rotateViewportCW', label: 'Rotate Right', keys: ['r'] },
+    { commandName: 'rotateViewportCCW', label: 'Rotate Left', keys: ['l'] },
+    { commandName: 'invertViewport', label: 'Invert', keys: ['i'] },
+    {
+      commandName: 'flipViewportVertical',
+      label: 'Flip Horizontally',
+      keys: ['h'],
+    },
+    {
+      commandName: 'flipViewportHorizontal',
+      label: 'Flip Vertically',
+      keys: ['v'],
+    },
+    { commandName: 'scaleUpViewport', label: 'Zoom In', keys: ['+'] },
+    { commandName: 'scaleDownViewport', label: 'Zoom Out', keys: ['-'] },
+    { commandName: 'fitViewportToWindow', label: 'Zoom to Fit', keys: ['='] },
+    { commandName: 'resetViewport', label: 'Reset', keys: ['space'] },
+    // clearAnnotations
+    { commandName: 'nextImage', label: 'Next Image', keys: ['down'] },
+    { commandName: 'previousImage', label: 'Previous Image', keys: ['up'] },
+    // firstImage
+    // lastImage
+    {
+      commandName: 'previousViewportDisplaySet',
+      label: 'Previous Series',
+      keys: ['pagedown'],
+    },
+    {
+      commandName: 'nextViewportDisplaySet',
+      label: 'Next Series',
+      keys: ['pageup'],
+    },
+    // ~ Cornerstone Tools
+    { commandName: 'setZoomTool', label: 'Zoom', keys: ['z'] },
+    // ~ Window level presets
+    {
+      commandName: 'windowLevelPreset1',
+      label: 'W/L Preset 1',
+      keys: ['1'],
+    },
+    {
+      commandName: 'windowLevelPreset2',
+      label: 'W/L Preset 2',
+      keys: ['2'],
+    },
+    {
+      commandName: 'windowLevelPreset3',
+      label: 'W/L Preset 3',
+      keys: ['3'],
+    },
+    {
+      commandName: 'windowLevelPreset4',
+      label: 'W/L Preset 4',
+      keys: ['4'],
+    },
+    {
+      commandName: 'windowLevelPreset5',
+      label: 'W/L Preset 5',
+      keys: ['5'],
+    },
+    {
+      commandName: 'windowLevelPreset6',
+      label: 'W/L Preset 6',
+      keys: ['6'],
+    },
+    {
+      commandName: 'windowLevelPreset7',
+      label: 'W/L Preset 7',
+      keys: ['7'],
+    },
+    {
+      commandName: 'windowLevelPreset8',
+      label: 'W/L Preset 8',
+      keys: ['8'],
+    },
+    {
+      commandName: 'windowLevelPreset9',
+      label: 'W/L Preset 9',
+      keys: ['9'],
+    },
+  ],
+};
@@ -5,9 +5,9 @@ window.config = {
    dicomWeb: [
      {
        name: 'LocalStatic',
-        wadoUriRoot: 'http://localhost:5000/',
-        qidoRoot: 'http://localhost:5000',
-        wadoRoot: 'http://localhost:5000/',
+        wadoUriRoot: '/dicomweb',
+        qidoRoot: '/dicomweb',
+        wadoRoot: '/dicomweb',
        qidoSupportsIncludeField: false,
        imageRendering: 'wadors',
        thumbnailRendering: 'thumbnail',
@@ -14,13 +14,11 @@ const mapDispatchToProps = (dispatch, ownProps) => {
        displaySetInstanceUID
      );

+      const { LoggerService, UINotificationService } = servicesManager.services;
+
      if (displaySet.isDerived) {
        const { Modality } = displaySet;
        if (Modality === 'SEG' && servicesManager) {
-          const {
-            LoggerService,
-            UINotificationService,
-          } = servicesManager.services;
          const onDisplaySetLoadFailureHandler = error => {
            LoggerService.error({ error, message: error.message });
            UINotificationService.show({
@@ -55,14 +53,42 @@ const mapDispatchToProps = (dispatch, ownProps) => {
        }

        if (!displaySet) {
-          throw new Error(
+          const error = new Error(
            `Referenced series for ${Modality} dataset not present.`
          );
+          const message = `Referenced series for ${Modality} dataset not present.`;
+          LoggerService.error({ error, message });
+          UINotificationService.show({
+            autoClose: false,
+            title: 'Fail to load series',
+            message,
+            type: 'error',
+          });
        }
+      }

-        if (!displaySet) {
-          throw new Error('Source data not present');
-        }
+      if (!displaySet) {
+        const error = new Error('Source data not present');
+        const message = 'Source data not present';
+        LoggerService.error({ error, message });
+        UINotificationService.show({
+          autoClose: false,
+          title: 'Fail to load series',
+          message,
+          type: 'error',
+        });
+      }
+
+      if (displaySet.isModalitySupported === false) {
+        const error = new Error('Modality not supported');
+        const message = 'Modality not supported';
+        LoggerService.error({ error, message });
+        UINotificationService.show({
+          autoClose: false,
+          title: 'Fail to load series',
+          message,
+          type: 'error',
+        });
      }

      dispatch(setActiveViewportSpecificData(displaySet));
@@ -23,6 +23,8 @@ import './Viewer.css';
 import StudyPrefetcher from '../components/StudyPrefetcher.js';
 import StudyLoadingMonitor from '../components/StudyLoadingMonitor';

+const { studyMetadataManager } = OHIF.utils;
+
 class Viewer extends Component {
  static propTypes = {
    studies: PropTypes.arrayOf(
@@ -429,6 +431,31 @@ class Viewer extends Component {

 export default withDialog(Viewer);

+/**
+ * Async function to check if the displaySet has any derived one
+ *
+ * @param {*object} displaySet
+ * @param {*object} study
+ * @returns {bool}
+ */
+const _checkForDerivedDisplaySets = async function(displaySet, study) {
+  let derivedDisplaySetsNumber = 0;
+  if (
+    displaySet.Modality &&
+    !['SEG', 'SR', 'RTSTRUCT', 'RTDOSE'].includes(displaySet.Modality)
+  ) {
+    const studyMetadata = studyMetadataManager.get(study.StudyInstanceUID);
+
+    const derivedDisplaySets = studyMetadata.getDerivedDatasets({
+      referencedSeriesInstanceUID: displaySet.SeriesInstanceUID,
+    });
+
+    derivedDisplaySetsNumber = derivedDisplaySets.length;
+  }
+
+  return derivedDisplaySetsNumber > 0;
+};
+
 /**
 * Async function to check if there are any inconsistences in the series.
 *
@@ -513,6 +540,10 @@ const _checkForSeriesInconsistencesWarnings = async function(
        'The datasets is missing frames: ' + displaySet.missingFrames + '.'
      );
    }
+
+    if (displaySet.isModalitySupported === false) {
+      inconsistencyWarnings.push('The datasets modality is not supported.');
+    }
  } else {
    const segMetadata = displaySet.metadata;
    if (!segMetadata) {
@@ -684,7 +715,6 @@ const _mapStudiesToThumbnails = function(studies, activeDisplaySetInstanceUID) {
      const {
        displaySetInstanceUID,
        SeriesDescription,
-        InstanceNumber,
        numImageFrames,
        SeriesNumber,
      } = displaySet;
@@ -709,6 +739,11 @@ const _mapStudiesToThumbnails = function(studies, activeDisplaySetInstanceUID) {
        studies
      );

+      const hasDerivedDisplaySets = _checkForDerivedDisplaySets(
+        displaySet,
+        study
+      );
+
      return {
        active: _isDisplaySetActive(
          displaySet,
@@ -719,10 +754,10 @@ const _mapStudiesToThumbnails = function(studies, activeDisplaySetInstanceUID) {
        altImageText,
        displaySetInstanceUID,
        SeriesDescription,
-        InstanceNumber,
        numImageFrames,
        SeriesNumber,
        hasWarnings,
+        hasDerivedDisplaySets,
      };
    });

@@ -139,10 +139,11 @@ class ViewerMain extends Component {
      displaySetInstanceUID
    );

+    const { LoggerService, UINotificationService } = servicesManager.services;
+
    if (displaySet.isDerived) {
      const { Modality } = displaySet;
      if (Modality === 'SEG' && servicesManager) {
-        const {LoggerService, UINotificationService} = servicesManager.services;
        const onDisplaySetLoadFailureHandler = error => {
          LoggerService.error({ error, message: error.message });
          UINotificationService.show({
@@ -153,24 +154,41 @@ class ViewerMain extends Component {
          });
        };

-        const {referencedDisplaySet} = displaySet.getSourceDisplaySet(
+        const { referencedDisplaySet } = displaySet.getSourceDisplaySet(
          this.props.studies,
          true,
          onDisplaySetLoadFailureHandler
        );
        displaySet = referencedDisplaySet;
-
      } else {
        displaySet = displaySet.getSourceDisplaySet(this.props.studies);
      }

      if (!displaySet) {
-        throw new Error(
-          `Referenced series for ${Modality} dataset not present.`
-        );
+        const error = new Error('Source data not present');
+        const message = 'Source data not present';
+        LoggerService.error({ error, message });
+        UINotificationService.show({
+          autoClose: false,
+          title: 'Fail to load series',
+          message,
+          type: 'error',
+        });
      }
    }

+    if (displaySet.isModalitySupported === false) {
+      const error = new Error('Modality not supported');
+      const message = 'Modality not supported';
+      LoggerService.error({ error, message });
+      UINotificationService.show({
+        autoClose: false,
+        title: 'Fail to load series',
+        message,
+        type: 'error',
+      });
+    }
+
    this.props.setViewportSpecificData(viewportIndex, displaySet);
  };

@@ -0,0 +1 @@
+3.7
Author	SHA1	Message	Date
ohif-bot	0fc7d93d73	chore(release): publish [skip ci] - @ohif/extension-dicom-pdf@1.1.2 - @ohif/extension-vtk@1.12.12 - @ohif/core@2.16.8 - @ohif/viewer@4.12.13	2022-01-29 01:06:23 +00:00
Bill Wallace	33307d3cd2	Feat/v2 e2e static tests (#2684 ) Use the static data for hte e2e tests	2022-01-28 20:02:30 -05:00
ohif-bot	c3ce909434	chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.12.4 - @ohif/extension-dicom-html@1.3.15 - @ohif/extension-dicom-rt@0.7.6 - @ohif/extension-dicom-segmentation@0.7.6 - @ohif/extension-dicom-tag-browser@0.2.17 - @ohif/extension-vtk@1.12.11 - @ohif/core@2.16.7 - @ohif/viewer@4.12.12	2022-01-20 09:18:41 +00:00
Davide Punzo	ad2c750503	IDC update dcmjs to v0.19.2 (#2672 ) * IDC: update dcmjs with SEG loading regression fix	2022-01-20 10:15:19 +01:00
ohif-bot	cceb61f123	chore(release): publish [skip ci] - @ohif/extension-dicom-rt@0.7.5 - @ohif/viewer@4.12.11	2022-01-19 09:29:16 +00:00
Davide Punzo	13bcba8c39	IDC #2657 : fix rt struct panel update (#2666 ) * Fix observation in RT panel	2022-01-19 10:25:42 +01:00
ohif-bot	d2db026158	chore(release): publish [skip ci] - @ohif/extension-vtk@1.12.10 - @ohif/core@2.16.6 - @ohif/viewer@4.12.10	2022-01-13 13:21:38 +00:00
Ștefan Silviu-AlexandruandStefan Silviu	e4b0552db4	feature: configurable max prefetch request count (#2632 ) * feature: configurable max prefetch request count * update name and default value for prefetch number Co-authored-by: Stefan Silviu <silviu.stefan@atta.systems>	2022-01-13 08:18:29 -05:00
ohif-bot	d7ba2fac69	chore(release): publish [skip ci] - @ohif/extension-vtk@1.12.9 - @ohif/core@2.16.5 - @ohif/viewer@4.12.9	2021-12-23 22:25:30 +00:00
Alireza	761d54fbbf	fix: DICOMFileLoadingListener typo in method name (#2647 )	2021-12-23 17:22:35 -05:00
ohif-bot	79548d2380	chore(release): publish [skip ci] - @ohif/extension-vtk@1.12.8 - @ohif/core@2.16.4 - @ohif/viewer@4.12.8	2021-12-23 20:38:37 +00:00
Christian-e-S Christian El Salloum Alireza	6a401c9e52	fix: SeriesTime and SeriesDate are only set for the first series and undefined for the remaining ones (#2476 ) * set SeriesDate and SeriesTime for all series, instead of only for the first series * set SeriesDate and SeriesTime only when they are undefined * fix: equality operator Co-authored-by: Christian El Salloum <christian.elsalloum@emtensor.com> Co-authored-by: Alireza <ar.sedghi@gmail.com>	2021-12-23 15:35:37 -05:00
Yo Yehudi	23376d279d	chore: Add research notice (#2458 )	2021-12-23 12:01:07 -05:00
ohif-bot	4110b0422c	chore(release): publish [skip ci] - @ohif/extension-dicom-tag-browser@0.2.16	2021-12-10 09:38:52 +00:00
Davide Punzo	ed501bb462	IDC Re #2633 : fix slider min and max (#2634 ) * IDC Re #2633: fix slider min and max	2021-12-10 10:33:30 +01:00
Davide Punzo	abf050e162	update docker remote version for CI (#2629 )	2021-12-02 13:56:59 +01:00
ohif-bot	35ed82e161	chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.12.3 - @ohif/extension-debugging@0.3.1 - @ohif/extension-dicom-html@1.3.14 - @ohif/extension-dicom-pdf@1.1.1 - @ohif/extension-dicom-rt@0.7.4 - @ohif/extension-dicom-segmentation@0.7.5 - @ohif/extension-dicom-tag-browser@0.2.15 - @ohif/extension-vtk@1.12.7 - @ohif/core@2.16.3 - @ohif/viewer@4.12.7	2021-12-02 11:57:19 +00:00
Davide Punzo	d0ccc22fd9	Update cornerstone deps (#2628 ) * update cornerstone deps	2021-12-02 12:53:41 +01:00
ohif-bot	31841c495f	chore(release): publish [skip ci] - @ohif/extension-dicom-tag-browser@0.2.14 - @ohif/extension-vtk@1.12.6 - @ohif/core@2.16.2 - @ohif/ui@1.10.5 - @ohif/viewer@4.12.6	2021-11-30 14:20:06 +00:00
Davide Punzo	65505d9bce	Re IDC #2604 : show series (with unsupported modalities) on slides panel and on tag explorer (#2621 ) * Re IDC #2604: show series (with unsupported modalities) on slides panel and on tag explorer	2021-11-30 15:15:51 +01:00
ohif-bot	460fdeb534	chore(release): publish [skip ci] - @ohif/extension-dicom-segmentation@0.7.4 - @ohif/viewer@4.12.5	2021-10-27 13:10:24 +00:00
Igor Octaviano	f4b7091ae4	Merge pull request #2596 from OHIF/fix/ohif-2590 Re #2590: Fix segments visibility handler	2021-10-27 10:06:35 -03:00
Davide Punzo	1e72684455	Re #2590 : Fix segments visibility handler	2021-10-26 13:00:01 +02:00
ohif-bot	5b0b6301b9	chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.12.2 - @ohif/extension-dicom-html@1.3.13 - @ohif/extension-dicom-rt@0.7.3 - @ohif/extension-dicom-segmentation@0.7.3 - @ohif/extension-dicom-tag-browser@0.2.13 - @ohif/extension-vtk@1.12.5 - @ohif/core@2.16.1 - @ohif/ui@1.10.4 - @ohif/viewer@4.12.4	2021-10-26 08:23:03 +00:00
Igor OctavianoandDavide Punzo	03a34a75a1	Add checks for study metadata in rt and seg panels + bump dcmjs to fix circular references issues naturalizing datasets (#2588 ) Co-authored-by: Davide Punzo <punzodavide@hotmail.it>	2021-10-26 10:19:12 +02:00
ohif-bot	729272a985	chore(release): publish [skip ci] - @ohif/extension-dicom-html@1.3.12 - @ohif/viewer@4.12.3	2021-10-25 15:11:00 +00:00
Bill Wallace	9194ec2404	fix(OHIF):The header depth was too deep for display SR files. (#2594 )	2021-10-25 17:08:10 +02:00
ohif-bot	52c95a1209	chore(release): publish [skip ci] - @ohif/extension-vtk@1.12.4 - @ohif/ui@1.10.3 - @ohif/viewer@4.12.2	2021-10-15 11:37:07 +00:00
Davide Punzo	8903adaea7	Re #2571 : thumbnail footer remove instance number and add link icon if any derived display set is present (#2582 ) * Re #2571, thumbnail footer layout modifications: remove instance number and add link icon if any derived display set is present.	2021-10-15 13:29:36 +02:00