chore(release): publish [skip ci]

- @ohif/extension-vtk@1.12.4 - @ohif/ui@1.10.3 - @ohif/viewer@4.12.2
Re #2571 : thumbnail footer remove instance number and add link icon if any derived display set is present (#2582 )
2021-10-15 11:37:07 +00:00 · 2021-10-15 13:29:36 +02:00 · 2021-10-06 21:01:00 +00:00 · 2021-10-06 17:53:07 -03:00 · 2021-10-05 09:40:49 -03:00 · 2021-10-04 07:36:45 +00:00
31 changed files with 425 additions and 74 deletions
@@ -0,0 +1 @@
+custom: https://giving.massgeneral.org/ohif
@@ -1,18 +0,0 @@
---
-name: "\U0001F917 Support Question"
-about: "I have a question \U0001F4AC"
-title: ''
-labels: 'Community: Question :question:, Triage :white_flag:'
-assignees: ''
---
-
-> :hand: We are a small team with limited resources. Your question is much more
-> likely to be answered if it is
-> [a good question](https://stackoverflow.com/help/how-to-ask)
-
-**Description**
-
-Questions can often be answered by our documentation. Unable to find an answer
-in our docs? We'll try to help. In the meantime, if you answer your own
-question, please respond with the answer here so that others may benefit as
-well. Better yet, open a PR to expand our docs ^\_^
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 🤗 Support Question
+    url: https://community.ohif.org/
+    about: Please use our forum if you have questions or need help.
@@ -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.

+## [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
+
+
+
+
+
 # [2.12.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.11.0...@ohif/extension-cornerstone@2.12.0) (2021-09-23)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-cornerstone",
-  "version": "2.12.0",
+  "version": "2.12.1",
  "description": "OHIF extension for Cornerstone",
  "author": "OHIF",
  "license": "MIT",
@@ -36,7 +36,7 @@
    "cornerstone-math": "^0.1.9",
    "cornerstone-tools": "^6.0.0",
    "cornerstone-wado-image-loader": "^4.0.3",
-    "dcmjs": "0.18.8",
+    "dcmjs": "0.18.9",
    "dicom-parser": "^1.8.9",
    "hammerjs": "^2.0.8",
    "prop-types": "^15.6.2",
@@ -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.

+## [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.3.10](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.3.9...@ohif/extension-dicom-html@1.3.10) (2021-06-02)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-html",
-  "version": "1.3.10",
+  "version": "1.3.11",
  "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.8",
+    "dcmjs": "0.18.9",
    "prop-types": "^15.6.2",
    "react": "^16.8.6",
    "react-dom": "^16.8.6"
@@ -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.

+## [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
+
+
+
+
+
+## [0.7.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.7.0...@ohif/extension-dicom-rt@0.7.1) (2021-09-28)
+
+**Note:** Version bump only for package @ohif/extension-dicom-rt
+
+
+
+
+
 # [0.7.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.6.14...@ohif/extension-dicom-rt@0.7.0) (2021-09-23)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-rt",
-  "version": "0.7.0",
+  "version": "0.7.2",
  "description": "OHIF extension for rendering DICOM RTSTRUCTs on top of cornerstone images.",
  "author": "OHIF",
  "license": "MIT",
@@ -31,7 +31,7 @@
    "@ohif/core": "^0.50.0",
    "cornerstone-core": "^2.5.0",
    "cornerstone-tools": "^6.0.0",
-    "dcmjs": "0.18.8",
+    "dcmjs": "0.18.9",
    "gl-matrix": "^3.3.0",
    "prop-types": "^15.6.2",
    "react": "^16.8.6",
@@ -112,6 +112,10 @@ export default {
                  ['RTSTRUCT'].includes(ds.Modality)
                )
              ) {
+                triggerRTPanelUpdatedEvent({
+                  badgeNumber: referencedDisplaySets.length,
+                  target: 'rt-panel',
+                });
                return false;
              }
            }
@@ -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.

+## [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
+
+
+
+
+
+## [0.7.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.0...@ohif/extension-dicom-segmentation@0.7.1) (2021-09-28)
+
+**Note:** Version bump only for package @ohif/extension-dicom-segmentation
+
+
+
+
+
 # [0.7.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.6.11...@ohif/extension-dicom-segmentation@0.7.0) (2021-09-23)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-segmentation",
-  "version": "0.7.0",
+  "version": "0.7.2",
  "description": "OHIF extension for viewing segmentations in the 2D MPR view",
  "author": "OHIF",
  "license": "MIT",
@@ -31,7 +31,7 @@
    "@ohif/core": "^0.50.0",
    "cornerstone-core": "^2.5.0",
    "cornerstone-tools": "^6.0.0",
-    "dcmjs": "0.18.8",
+    "dcmjs": "0.18.9",
    "prop-types": "^15.6.2",
    "react": "^16.8.6",
    "react-dom": "^16.8.6"
@@ -126,7 +126,7 @@ export default {
          label: 'Segmentations',
          target: 'segmentation-panel',
          stateEvent: SegmentationPanelTabUpdatedEvent,
-          isDisabled: studies => {
+          isDisabled: (studies, activeViewport) => {
            if (!studies) {
              return true;
            }
@@ -139,6 +139,20 @@ export default {
                  const series = study.series[j];

                  if (series.Modality === 'SEG') {
+                    if (activeViewport) {
+                      const studyMetadata = studyMetadataManager.get(
+                        activeViewport.StudyInstanceUID
+                      );
+                      const referencedDS = studyMetadata.getDerivedDatasets({
+                        referencedSeriesInstanceUID:
+                          activeViewport.SeriesInstanceUID,
+                        Modality: 'SEG',
+                      });
+                      triggerSegmentationPanelTabUpdatedEvent({
+                        badgeNumber: referencedDS.length,
+                        target: 'segmentation-panel',
+                      });
+                    }
                    return false;
                  }
                }
@@ -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.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
+
+
+
+
+
 ## [0.2.11](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.2.10...@ohif/extension-dicom-tag-browser@0.2.11) (2021-06-03)

 **Note:** Version bump only for package @ohif/extension-dicom-tag-browser
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-tag-browser",
-  "version": "0.2.11",
+  "version": "0.2.12",
  "description": "OHIF extension for checking DICOM headers.",
  "author": "OHIF",
  "license": "MIT",
@@ -28,7 +28,7 @@
  },
  "peerDependencies": {
    "@ohif/core": "^2.6.0",
-    "dcmjs": "0.18.8",
+    "dcmjs": "0.18.9",
    "react": "^16.8.6"
  },
  "dependencies": {
@@ -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.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.12.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.1...@ohif/extension-vtk@1.12.2) (2021-09-28)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.12.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.0...@ohif/extension-vtk@1.12.1) (2021-09-24)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 # [1.12.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.11.18...@ohif/extension-vtk@1.12.0) (2021-09-23)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-vtk",
-  "version": "1.12.0",
+  "version": "1.12.4",
  "description": "OHIF extension for VTK.js",
  "author": "OHIF",
  "license": "MIT",
@@ -35,7 +35,7 @@
    "cornerstone-core": "^2.5.0",
    "cornerstone-tools": "^6.0.0",
    "cornerstone-wado-image-loader": "^4.0.3",
-    "dcmjs": "0.18.8",
+    "dcmjs": "0.18.9",
    "dicom-parser": "^1.8.9",
    "i18next": "^17.0.3",
    "i18next-browser-languagedetector": "^3.0.1",
@@ -53,8 +53,8 @@
    "react-vtkjs-viewport": "^0.14.4"
  },
  "devDependencies": {
-    "@ohif/core": "^2.15.0",
-    "@ohif/ui": "^1.10.1",
+    "@ohif/core": "^2.16.0",
+    "@ohif/ui": "^1.10.3",
    "cornerstone-tools": "^6.0.0",
    "cornerstone-wado-image-loader": "^4.0.3",
    "dicom-parser": "^1.8.9",
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [2.16.0](https://github.com/OHIF/Viewers/compare/@ohif/core@2.15.1...@ohif/core@2.16.0) (2021-10-04)
+
+
+### Features
+
+* Added support for WADO servers built with static hosting (e.g. S3) ([#2566](https://github.com/OHIF/Viewers/issues/2566)) ([a046c6c](https://github.com/OHIF/Viewers/commit/a046c6c9017a84e5ead71d5113b5e892333b4130))
+
+
+
+
+
+## [2.15.1](https://github.com/OHIF/Viewers/compare/@ohif/core@2.15.0...@ohif/core@2.15.1) (2021-09-28)
+
+**Note:** Version bump only for package @ohif/core
+
+
+
+
+
 # [2.15.0](https://github.com/OHIF/Viewers/compare/@ohif/core@2.14.1...@ohif/core@2.15.0) (2021-09-23)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/core",
-  "version": "2.15.0",
+  "version": "2.16.0",
  "description": "Generic business logic for web-based medical imaging applications",
  "author": "OHIF Core Team",
  "license": "MIT",
@@ -39,7 +39,7 @@
  "dependencies": {
    "@babel/runtime": "^7.5.5",
    "ajv": "^6.10.0",
-    "dcmjs": "0.18.8",
+    "dcmjs": "0.18.9",
    "dicomweb-client": "^0.8.1",
    "immer": "6.0.2",
    "isomorphic-base64": "^1.0.2",
@@ -0,0 +1,85 @@
+import { api } from 'dicomweb-client';
+
+/**
+ * An implementation of the static wado client, that fetches data from
+ * a static response rather than actually doing real queries.  This allows
+ * fast encoding of test data, but because it is static, anything actually
+ * performing searches doesn't work.  This version fixes the query issue
+ * by manually implementing a query option.
+ */
+export default class StaticWadoClient extends api.DICOMwebClient {
+  static filterKeys = {
+    StudyInstanceUID: '0020000D',
+    PatientName: '00100010',
+    PatientID: '00100020',
+    StudyDescription: '00081030',
+    ModalitiesInStudy: '00080061',
+  };
+
+  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;
+    });
+  }
+
+  async searchForStudies(options) {
+    if (!this.staticWado) return super.searchForStudies(options);
+
+    let searchResult = await super.searchForStudies(options);
+    const { queryParams } = options;
+    if (!queryParams) return searchResult;
+    const filtered = searchResult.filter(study => {
+      for (const key of Object.keys(StaticWadoClient.filterKeys)) {
+        if (!this.filterItem(key, queryParams, study)) return false;
+      }
+      return true;
+    });
+    return filtered;
+  }
+
+  filterItem(key, queryParams, study) {
+    const altKey = StaticWadoClient.filterKeys[key] || key;
+    if (!queryParams) return true;
+    const testValue = queryParams[key] || queryParams[altKey];
+    if (!testValue) return true;
+    const valueElem = study[key] || study[altKey];
+    if (!valueElem) return false;
+    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;
+  }
+}
@@ -1,4 +1,5 @@
 import { api } from 'dicomweb-client';
+import StaticWadoClient from './StaticWadoClient';
 import DICOMWeb from '../../../DICOMWeb/';

 import errorHandler from '../../../errorHandler';
@@ -115,14 +116,18 @@ function resultDataToStudies(resultData) {
 }

 export default function Studies(server, filter) {
+  const { staticWado } = server;
  const config = {
+    ...server,
    url: server.qidoRoot,
    headers: DICOMWeb.getAuthorizationHeader(server),
    errorInterceptor: errorHandler.getHTTPErrorHandler(),
    requestHooks: [getXHRRetryRequestHook()],
  };

-  const dicomWeb = new api.DICOMwebClient(config);
+  const dicomWeb = staticWado
+    ? new StaticWadoClient(config)
+    : new api.DICOMwebClient(config);
  server.qidoSupportsIncludeField =
    server.qidoSupportsIncludeField === undefined
      ? true
@@ -1,4 +1,4 @@
-import { api } from 'dicomweb-client';
+import StaticWadoClient from '../qido/StaticWadoClient';
 import dcmjs from 'dcmjs';
 import DICOMWeb from '../../../DICOMWeb/';
 import RetrieveMetadataLoader from './retrieveMetadataLoader';
@@ -73,7 +73,8 @@ export default class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader
  configLoad() {
    const { server } = this;

-    const client = new api.DICOMwebClient({
+    const client = new StaticWadoClient({
+      ...server,
      url: server.qidoRoot,
      headers: DICOMWeb.getAuthorizationHeader(server),
      errorInterceptor: errorHandler.getHTTPErrorHandler(),
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [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)
+
+
+### Bug Fixes
+
+* throttle thumbnail progress updates ([#2557](https://github.com/OHIF/Viewers/issues/2557)) ([66c587b](https://github.com/OHIF/Viewers/commit/66c587b139835201331a64bc24a17901e7583649))
+
+
+
+
+
 ## [1.10.1](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.10.0...@ohif/ui@1.10.1) (2021-09-13)

 **Note:** Version bump only for package @ohif/ui
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/ui",
-  "version": "1.10.1",
+  "version": "1.10.3",
  "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,
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
+import throttle from 'lodash.throttle';
 import { useDrag } from 'react-dnd';
 import { classes } from '@ohif/core';
 import ImageThumbnail from './ImageThumbnail';
@@ -14,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;
@@ -27,10 +29,15 @@ function ThumbnailFooter({
        inconsistencyWarningsSet(response);
      }
    });
+    hasDerivedDisplaySets.then(response => {
+      if (!unmounted) {
+        derivedDisplaySetsActiveSet(response);
+      }
+    });
    return () => {
      unmounted = true;
    };
-  }, [hasWarnings]);
+  }, [hasWarnings, hasDerivedDisplaySets]);

  const infoOnly = !SeriesDescription;

@@ -87,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>
    );
@@ -113,9 +147,9 @@ function ThumbnailFooter({
      <div className="series-description">{SeriesDescription}</div>
      {getSeriesInformation(
        SeriesNumber,
-        InstanceNumber,
        numImageFrames,
-        inconsistencyWarnings
+        inconsistencyWarnings,
+        derivedDisplaySetsActive
      )}
    </div>
  );
@@ -129,11 +163,11 @@ function Thumbnail(props) {
    displaySetInstanceUID,
    imageId,
    imageSrc,
-    InstanceNumber,
    numImageFrames,
    SeriesDescription,
    SeriesNumber,
    hasWarnings,
+    hasDerivedDisplaySets,
    StudyInstanceUID,
    onClick,
    onDoubleClick,
@@ -144,13 +178,13 @@ function Thumbnail(props) {

  const [stackPercentComplete, setStackPercentComplete] = useState(0);
  useEffect(() => {
-    const onProgressChange = ({ detail }) => {
+    const onProgressChange = throttle(({ detail }) => {
      const { progressId, progressData } = detail;
      if (`StackProgress:${displaySetInstanceUID}` === progressId) {
        const percent = progressData ? progressData.percentComplete : 0;
        setStackPercentComplete(percent);
      }
-    };
+    }, 100);

    document.addEventListener(
      StudyLoadingListener.events.OnProgress,
@@ -231,8 +265,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,
@@ -3,6 +3,49 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [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
+
+
+
+
+
+# [4.12.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.11.2...@ohif/viewer@4.12.0) (2021-10-04)
+
+
+### Features
+
+* Added support for WADO servers built with static hosting (e.g. S3) ([#2566](https://github.com/OHIF/Viewers/issues/2566)) ([a046c6c](https://github.com/OHIF/Viewers/commit/a046c6c9017a84e5ead71d5113b5e892333b4130))
+
+
+
+
+
+## [4.11.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.11.1...@ohif/viewer@4.11.2) (2021-09-28)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.11.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.11.0...@ohif/viewer@4.11.1) (2021-09-24)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
 # [4.11.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.10.1...@ohif/viewer@4.11.0) (2021-09-23)


@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "4.11.0",
+  "version": "4.12.2",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -47,18 +47,18 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
-    "@ohif/core": "^2.15.0",
-    "@ohif/extension-cornerstone": "^2.12.0",
+    "@ohif/core": "^2.16.0",
+    "@ohif/extension-cornerstone": "^2.12.1",
    "@ohif/extension-debugging": "^0.3.0",
-    "@ohif/extension-dicom-html": "^1.3.10",
+    "@ohif/extension-dicom-html": "^1.3.11",
    "@ohif/extension-dicom-microscopy": "^0.52.0",
    "@ohif/extension-dicom-pdf": "^1.1.0",
-    "@ohif/extension-dicom-rt": "^0.7.0",
-    "@ohif/extension-dicom-segmentation": "^0.7.0",
+    "@ohif/extension-dicom-rt": "^0.7.2",
+    "@ohif/extension-dicom-segmentation": "^0.7.2",
    "@ohif/extension-lesion-tracker": "^0.2.1",
-    "@ohif/extension-vtk": "^1.12.0",
+    "@ohif/extension-vtk": "^1.12.4",
    "@ohif/i18n": "^0.53.0",
-    "@ohif/ui": "^1.10.1",
+    "@ohif/ui": "^1.10.3",
    "@tanem/react-nprogress": "^1.1.25",
    "classnames": "^2.2.6",
    "core-js": "^3.2.1",
@@ -66,7 +66,7 @@
    "cornerstone-math": "^0.1.9",
    "cornerstone-tools": "^6.0.0",
    "cornerstone-wado-image-loader": "^4.0.3",
-    "dcmjs": "0.18.8",
+    "dcmjs": "0.18.9",
    "dicom-parser": "^1.8.9",
    "dicomweb-client": "^0.8.1",
    "hammerjs": "^2.0.8",
@@ -0,0 +1,20 @@
+window.config = {
+  routerBasename: '/',
+  showStudyList: true,
+  servers: {
+    dicomWeb: [
+      {
+        name: 'LocalStatic',
+        wadoUriRoot: 'http://localhost:5000/',
+        qidoRoot: 'http://localhost:5000',
+        wadoRoot: 'http://localhost:5000/',
+        qidoSupportsIncludeField: false,
+        imageRendering: 'wadors',
+        thumbnailRendering: 'thumbnail',
+        enableStudyLazyLoad: true,
+        supportsFuzzyMatching: false,
+        staticWado: true,
+      },
+    ],
+  },
+};
@@ -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.
 *
@@ -456,6 +483,7 @@ const _checkForSeriesInconsistencesWarnings = async function(
    // warnings already checked and cached in displaySet
    return displaySet.inconsistencyWarnings;
  }
+
  const inconsistencyWarnings = [];

  if (displaySet.Modality !== 'SEG') {
@@ -515,7 +543,6 @@ const _checkForSeriesInconsistencesWarnings = async function(
  } else {
    const segMetadata = displaySet.metadata;
    if (!segMetadata) {
-      displaySet.inconsistencyWarnings = inconsistencyWarnings;
      return inconsistencyWarnings;
    }

@@ -524,7 +551,6 @@ const _checkForSeriesInconsistencesWarnings = async function(
      false
    );
    if (!referencedDisplaySet) {
-      displaySet.inconsistencyWarnings = inconsistencyWarnings;
      return inconsistencyWarnings;
    }

@@ -532,7 +558,6 @@ const _checkForSeriesInconsistencesWarnings = async function(
      image.getImageId()
    );
    if (!imageIds || imageIds.length === 0) {
-      displaySet.inconsistencyWarnings = inconsistencyWarnings;
      return inconsistencyWarnings;
    }

@@ -686,7 +711,6 @@ const _mapStudiesToThumbnails = function(studies, activeDisplaySetInstanceUID) {
      const {
        displaySetInstanceUID,
        SeriesDescription,
-        InstanceNumber,
        numImageFrames,
        SeriesNumber,
      } = displaySet;
@@ -711,6 +735,11 @@ const _mapStudiesToThumbnails = function(studies, activeDisplaySetInstanceUID) {
        studies
      );

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

@@ -6647,10 +6647,10 @@ dateformat@^3.0.0:
  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==

-dcmjs@0.18.8:
-  version "0.18.8"
-  resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.18.8.tgz#fc8e6af03ace9050da49f4108334aa3d0a3bdf3d"
-  integrity sha512-Z3nNEmzkWdpHQPgjozGqk8XcuhP/hXP1C64Wtg9V+VO9eEc8eNFJFJ6If62f1cuOh0FaRwHqxBT7OzhOAUpFTA==
+dcmjs@0.18.9:
+  version "0.18.9"
+  resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.18.9.tgz#0e18fcff975aaae8ca01a96e781fa75c29ec97f3"
+  integrity sha512-aTu4fUo3TSgohJC+U509qdXL1per09XvlYdQva0BGtIZMr/iR5n8h/ojpcDTRJoVtSuaj331KJj1yCj8FMMK4Q==
  dependencies:
    "@babel/polyfill" "^7.8.3"
    "@babel/runtime" "^7.8.4"
Author	SHA1	Message	Date
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
ohif-bot	9481e2a99e	chore(release): publish [skip ci] - @ohif/extension-dicom-rt@0.7.2 - @ohif/extension-dicom-segmentation@0.7.2 - @ohif/viewer@4.12.1	2021-10-06 21:01:00 +00:00
Igor Octaviano	f783fd7650	Merge pull request #2575 from OHIF/fix/ohif-2570 OHIF-2570: Update badge number based on active ds	2021-10-06 17:53:07 -03:00
Igor Octaviano	79afee7615	Merge branch 'master' into fix/ohif-2570	2021-10-05 09:40:49 -03:00
ohif-bot	539141fe5a	chore(release): publish [skip ci] - @ohif/extension-vtk@1.12.3 - @ohif/core@2.16.0 - @ohif/viewer@4.12.0	2021-10-04 07:36:45 +00:00
Bill Wallace	a046c6c901	feat: Added support for WADO servers built with static hosting (e.g. S3) (#2566 )	2021-10-04 09:30:36 +02:00
igoroctaviano	073be065cf	Update badge number based on active ds	2021-10-01 18:09:48 -03:00
ohif-bot	252536a1e6	chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.12.1 - @ohif/extension-dicom-html@1.3.11 - @ohif/extension-dicom-rt@0.7.1 - @ohif/extension-dicom-segmentation@0.7.1 - @ohif/extension-dicom-tag-browser@0.2.12 - @ohif/extension-vtk@1.12.2 - @ohif/core@2.15.1 - @ohif/viewer@4.11.2	2021-09-28 12:14:17 +00:00
Davide Punzo	53b1d71d56	fix regression not showing warnings list on thumbnail for segmentations (#2563 ) * fix regression not showing warnings list on thumbnail for segmentations * update dcmjs version	2021-09-28 14:07:29 +02:00
Erik Ziegler	702d99cb93	Add FUNDING.yml	2021-09-27 14:23:37 +02:00
Alireza	bb7b78bf33	chore(github): Create config.yml for issues (#2561 ) * chore(github): Create config.yml for issues * Delete ---support-question.md	2021-09-27 14:20:38 +02:00
ohif-bot	b796fc9c62	chore(release): publish [skip ci] - @ohif/extension-vtk@1.12.1 - @ohif/ui@1.10.2 - @ohif/viewer@4.11.1	2021-09-24 11:04:33 +00:00
Erik Ziegler	66c587b139	fix: throttle thumbnail progress updates (#2557 )	2021-09-24 12:58:30 +02:00
				`@@ -0,0 +1 @@`
				`custom: https://giving.massgeneral.org/ohif`