chore(release): publish [skip ci]

- @ohif/extension-vtk@1.9.3
 - @ohif/viewer@4.6.3

.circleci/config.yml

@@ -269,7 +269,12 @@ jobs:
           paths: .
 
   DOCS_PUBLISH:
-    <<: *defaults
+    docker:
+      # Gitbook fails due to graceful-fs updates above this node version :-(
+      - image: circleci/node:12.9.1
+        environment:
+          TERM: xterm # Enable colors in term
+    working_directory: ~/repo
     steps:
       - checkout
       - run:
@@ -390,7 +395,7 @@ workflows:
       # Update hub.docker.org
       - cypress/run:
           name: 'Generate Percy Snapshots'
-          executor: cypress/browsers-chrome76
+          executor: chrome-and-pacs
           browser: chrome
           pre-steps:
             - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global
@@ -467,7 +472,7 @@ workflows:
       # and record a Cypress dashboard test run
       - cypress/run:
           name: 'Generate Percy Snapshots'
-          executor: cypress/browsers-chrome76
+          executor: chrome-and-pacs
           browser: chrome
           pre-steps:
             - run: 'rm -rf ~/.yarn && npm i -g yarn && yarn -v && yarn global

extensions/dicom-tag-browser/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.1.0...@ohif/extension-dicom-tag-browser@0.1.1) (2020-12-03)
+
+
+### Bug Fixes
+
+* fallback to original dataset VR for XS ([f57725a](https://github.com/OHIF/Viewers/commit/f57725ac8bfd59ea46ab334a1823882afadefba1))
+
+
+
+
+
+# [0.1.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.0.5...@ohif/extension-dicom-tag-browser@0.1.0) (2020-12-03)
+
+
+### Features
+
+* add show scroll option to modal ([be494a7](https://github.com/OHIF/Viewers/commit/be494a7376d15777dbe598289c4ecdb9f48a6a48))
+
+
+
+
+
+## [0.0.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.0.4...@ohif/extension-dicom-tag-browser@0.0.5) (2020-12-03)
+
+**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
+
+
+
+
+
 ## [0.0.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.0.3...@ohif/extension-dicom-tag-browser@0.0.4) (2020-10-07)
 
 **Note:** Version bump only for package @ohif/extension-dicom-tag-browser

extensions/dicom-tag-browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-tag-browser",
-  "version": "0.0.4",
+  "version": "0.1.1",
   "description": "OHIF extension for checking DICOM headers.",
   "author": "OHIF",
   "license": "MIT",

extensions/dicom-tag-browser/src/components/DicomTagBrowser.js

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { classes } from '@ohif/core';
+import { classes, cornerstone as OHIFCornerstone } from '@ohif/core';
 import dcmjs from 'dcmjs';
 import DicomBrowserSelect from './DicomBrowserSelect';
 import moment from 'moment';
@@ -10,6 +10,8 @@ const { ImageSet } = classes;
 const { DicomMetaDictionary } = dcmjs.data;
 const { nameMap } = DicomMetaDictionary;
 
+const { metadataProvider } = OHIFCornerstone;
+
 const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => {
   const [
     activeDisplaySetInstanceUID,
@@ -17,6 +19,7 @@ const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => {
   ] = useState(displaySetInstanceUID);
   const [activeInstance, setActiveInstance] = useState(0);
   const [tags, setTags] = useState([]);
+  const [meta, setMeta] = useState('');
   const [instanceList, setInstanceList] = useState([]);
   const [displaySetList, setDisplaySetList] = useState([]);
   const [isImageStack, setIsImageStack] = useState(false);
@@ -83,6 +86,7 @@ const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => {
     }
 
     setTags(getSortedTags(metadata));
+    setMeta(metadata);
     setInstanceList(instanceList);
     setDisplaySetList(newDisplaySetList);
     setIsImageStack(isImageStack);
@@ -114,41 +118,43 @@ const DicomTagBrowser = ({ displaySets, displaySetInstanceUID }) => {
         options={displaySetList}
       />
       {instanceSelectList}
-      <DicomTagTable tags={tags}></DicomTagTable>
+      <DicomTagTable tags={tags} meta={meta}></DicomTagTable>
     </div>
   );
 };
 
-function DicomTagTable({ tags }) {
-  const rows = getFormattedRowsFromTags(tags);
+function DicomTagTable({ tags, meta }) {
+  const rows = getFormattedRowsFromTags(tags, meta);
 
   return (
     <div>
       <table className="dicom-tag-browser-table">
-        <tr>
-          <th className="dicom-tag-browser-table-left">Tag</th>
-          <th className="dicom-tag-browser-table-left">Value Representation</th>
-          <th className="dicom-tag-browser-table-left">Keyword</th>
-          <th className="dicom-tag-browser-table-left">Value</th>
-        </tr>
-        {rows.map(row => {
-          const className = row.className ? row.className : null;
+        <tbody>
+          <tr>
+            <th className="dicom-tag-browser-table-left">Tag</th>
+            <th className="dicom-tag-browser-table-left">Value Representation</th>
+            <th className="dicom-tag-browser-table-left">Keyword</th>
+            <th className="dicom-tag-browser-table-left">Value</th>
+          </tr>
+          {rows.map((row, index) => {
+            const className = row.className ? row.className : null;
 
-          return (
-            <tr className={className}>
-              <td>{row[0]}</td>
-              <td className="dicom-tag-browser-table-center">{row[1]}</td>
-              <td>{row[2]}</td>
-              <td>{row[3]}</td>
-            </tr>
-          );
-        })}
+            return (
+              <tr className={className} key={`DICOMTagRow-${index}`}>
+                <td>{row[0]}</td>
+                <td className="dicom-tag-browser-table-center">{row[1]}</td>
+                <td>{row[2]}</td>
+                <td>{row[3]}</td>
+              </tr>
+            );
+          })}
+        </tbody>
       </table>
     </div>
   );
 }
 
-function getFormattedRowsFromTags(tags) {
+function getFormattedRowsFromTags(tags, meta) {
   const rows = [];
 
   tags.forEach(tagInfo => {
@@ -175,6 +181,17 @@ function getFormattedRowsFromTags(tags) {
         rows.push(...formatedRowsFromTags);
       });
     } else {
+      if (tagInfo.vr === 'xs') {
+        try {
+          const dataset = metadataProvider.getStudyDataset(meta.StudyInstanceUID);
+          const tag = dcmjs.data.Tag.fromPString(tagInfo.tag).toCleanString();
+          const originalTagInfo = dataset[tag];
+          tagInfo.vr = originalTagInfo.vr;
+        } catch (error) {
+          console.error(`Failed to parse value representation for tag '${tagInfo.keyword}'`);
+        }
+      }
+
       rows.push([
         `${tagInfo.tagIndent}${tagInfo.tag}`,
         tagInfo.vr,
@@ -247,10 +264,11 @@ function getRows(metadata, depth = 0) {
       sequenceAsArray.forEach(item => {
         const sequenceRows = getRows(item, depth + 1);
 
-        // Sort the sequence group.
-        _sortTagList(sequenceRows);
-
-        sequence.values.push(sequenceRows);
+        if (sequenceRows.length) {
+          // Sort the sequence group.
+          _sortTagList(sequenceRows);
+          sequence.values.push(sequenceRows);
+        }
       });
 
       continue;
@@ -276,13 +294,12 @@ function getRows(metadata, depth = 0) {
           } else if (value.Alphabetic) {
             value = value.Alphabetic;
           } else {
-            console.error('Unrecognised Value for element:');
-            console.error(value);
+            console.warn(`Unrecognised Value: ${value} for ${keyword}:`);
+            console.warn(value);
             value = ' ';
           }
         } else {
-          console.error('Unrecognised Value for element:');
-          console.error(value);
+          console.warn(`Unrecognised Value: ${value} for ${keyword}:`);
           value = ' ';
         }
       }

extensions/dicom-tag-browser/src/getCommandsModule.js

@@ -21,7 +21,7 @@ export default function getCommandsModule(servicesManager) {
 
       const { UIModalService } = servicesManager.services;
 
-      const WrappedDicomTagBrowser = function() {
+      const WrappedDicomTagBrowser = function () {
         return (
           <DicomTagBrowser
             displaySets={displaySets}
@@ -34,6 +34,7 @@ export default function getCommandsModule(servicesManager) {
         content: WrappedDicomTagBrowser,
         title: `DICOM Tag Browser`,
         fullscreen: true,
+        showScrollbar: true
       });
     },
   };

extensions/vtk/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.3](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.9.2...@ohif/extension-vtk@1.9.3) (2020-12-03)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.9.2](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.9.1...@ohif/extension-vtk@1.9.2) (2020-12-03)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.9.1](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.9.0...@ohif/extension-vtk@1.9.1) (2020-12-03)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+# [1.9.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.8.0...@ohif/extension-vtk@1.9.0) (2020-12-03)
+
+
+### Features
+
+* Add error boundary and retry logic for network failures during dynamic imports ([#2145](https://github.com/OHIF/Viewers/issues/2145)) ([4c07904](https://github.com/OHIF/Viewers/commit/4c079044f6ae2381c6054d8d77414100152d1d19))
+
+
+
+
+
 # [1.8.0](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.7.16...@ohif/extension-vtk@1.8.0) (2020-11-30)
 
 

extensions/vtk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-vtk",
-  "version": "1.8.0",
+  "version": "1.9.3",
   "description": "OHIF extension for VTK.js",
   "author": "OHIF",
   "license": "MIT",
@@ -53,8 +53,8 @@
     "react-vtkjs-viewport": "^0.14.2"
   },
   "devDependencies": {
-    "@ohif/core": "^2.10.7",
-    "@ohif/ui": "^1.5.7",
+    "@ohif/core": "^2.11.1",
+    "@ohif/ui": "^1.7.1",
     "cornerstone-tools": "^4.20.1",
     "cornerstone-wado-image-loader": "^3.1.0",
     "dicom-parser": "^1.8.3",

extensions/vtk/src/asyncComponent.js

@@ -1,37 +0,0 @@
-/**
- * We use this component to leverage "Code Splitting"
- *
- * Link: https://serverless-stack.com/chapters/code-splitting-in-create-react-app.html
- */
-
-import React, { Component } from 'react';
-
-export default function asyncComponent(importComponent) {
-  class AsyncComponent extends Component {
-    constructor(props) {
-      super(props);
-
-      this.state = {
-        component: null,
-      };
-    }
-
-    async componentDidMount() {
-      // Add dynamically loaded component to state
-      const { default: component } = await importComponent();
-
-      this.setState({
-        component: component,
-      });
-    }
-
-    render() {
-      const C = this.state.component;
-
-      // Render the loaded component, or null
-      return C ? <C {...this.props} /> : null;
-    }
-  }
-
-  return AsyncComponent;
-}

extensions/vtk/src/index.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import asyncComponent from './asyncComponent.js';
+import { asyncComponent, retryImport } from '@ohif/ui';
+
 import commandsModule from './commandsModule.js';
 import toolbarModule from './toolbarModule.js';
 import withCommandsManager from './withCommandsManager.js';
@@ -8,7 +9,7 @@ import { version } from '../package.json';
 // import loadLocales from './loadLocales';
 
 const OHIFVTKViewport = asyncComponent(() =>
-  import(/* webpackChunkName: "OHIFVTKViewport" */ './OHIFVTKViewport.js')
+  retryImport(() => import(/* webpackChunkName: "OHIFVTKViewport" */ './OHIFVTKViewport.js'))
 );
 
 const vtkExtension = {

extensions/vtk/src/toolbarComponents/VTKMPRToolbarButton.js

@@ -31,7 +31,57 @@ const _isDisplaySetReconstructable = (viewportSpecificData = {}, activeViewportI
 
   if (!displaySet) {
     return false;
-  };
+  }
+
+  // 2D MPR is not currently available for 4D datasets.
+
+  // Assuming that slices at different time have the same position, here we just check if
+  // there are multiple slices for the same ImagePositionPatient and disable MPR.
+
+  // A better heuristic would be checking 4D tags, e.g. the presence of multiple TemporalPositionIdentifier values.
+  // However, some studies (e.g. https://github.com/OHIF/Viewers/issues/2113) do not have such tags.
+
+  for (let ii = 0; ii < displaySet.numImageFrames; ++ii){
+    const imageIdControl = displaySet.images[ii].getImageId()
+    const instanceMetadataControl = cornerstone.metaData.get('instance', imageIdControl)
+
+    if (!instanceMetadataControl ||
+      instanceMetadataControl === undefined ||
+      !instanceMetadataControl.ImagePositionPatient ||
+      instanceMetadataControl.ImagePositionPatient === undefined ) {
+      // if ImagePositionPatient is missing, skip the 4D datasets check.
+      // do not return false, because it could be a 3D dataset.
+      continue;
+    }
+
+    let xImagePositionPatientControl = instanceMetadataControl.ImagePositionPatient[0];
+    let yImagePositionPatientControl = instanceMetadataControl.ImagePositionPatient[1];
+    let zImagePositionPatientControl = instanceMetadataControl.ImagePositionPatient[2];
+
+    for (let jj = ii + 1; jj < displaySet.numImageFrames; ++jj){
+      const imageId = displaySet.images[jj].getImageId()
+      const instanceMetadata = cornerstone.metaData.get('instance', imageId)
+
+      if (!instanceMetadata ||
+        instanceMetadata === undefined ||
+        !instanceMetadata.ImagePositionPatient ||
+        instanceMetadata.ImagePositionPatient === undefined) {
+        // if ImagePositionPatient is missing, skip the 4D datasets check.
+        // do not return false, because it could be a 3D dataset.
+        continue;
+      }
+
+      let xImagePositionPatient = instanceMetadata.ImagePositionPatient[0];
+      let yImagePositionPatient = instanceMetadata.ImagePositionPatient[1];
+      let zImagePositionPatient = instanceMetadata.ImagePositionPatient[2];
+
+      if (xImagePositionPatientControl === xImagePositionPatient &&
+          yImagePositionPatientControl === yImagePositionPatient &&
+          zImagePositionPatientControl === zImagePositionPatient){
+        return false;
+      }
+    }
+  }
 
   return displaySet.isReconstructable;
 };

platform/core/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.11.1](https://github.com/OHIF/Viewers/compare/@ohif/core@2.11.0...@ohif/core@2.11.1) (2020-12-03)
+
+
+### Bug Fixes
+
+* fallback to original dataset VR for XS ([f57725a](https://github.com/OHIF/Viewers/commit/f57725ac8bfd59ea46ab334a1823882afadefba1))
+
+
+
+
+
+# [2.11.0](https://github.com/OHIF/Viewers/compare/@ohif/core@2.10.7...@ohif/core@2.11.0) (2020-12-03)
+
+
+### Features
+
+* add show scroll option to modal ([be494a7](https://github.com/OHIF/Viewers/commit/be494a7376d15777dbe598289c4ecdb9f48a6a48))
+
+
+
+
+
 ## [2.10.7](https://github.com/OHIF/Viewers/compare/@ohif/core@2.10.6...@ohif/core@2.10.7) (2020-10-07)
 
 **Note:** Version bump only for package @ohif/core

platform/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/core",
-  "version": "2.10.7",
+  "version": "2.11.1",
   "description": "Generic business logic for web-based medical imaging applications",
   "author": "OHIF Core Team",
   "license": "MIT",

platform/core/src/classes/MetadataProvider.js

@@ -20,6 +20,7 @@ class MetadataProvider {
       writable: false,
       value: new Map(),
     });
+    this.datasets = {};
   }
 
   async addInstance(dicomJSONDatasetOrP10ArrayBuffer, options = {}) {
@@ -52,6 +53,7 @@ class MetadataProvider {
       SOPInstanceUID,
     } = naturalizedDataset;
 
+    this._getAndCacheStudyDataset(StudyInstanceUID, dicomJSONDataset);
     const study = this._getAndCacheStudy(StudyInstanceUID);
     const series = this._getAndCacheSeriesFromStudy(study, SeriesInstanceUID);
     const instance = this._getAndCacheInstanceFromStudy(series, SOPInstanceUID);
@@ -71,6 +73,16 @@ class MetadataProvider {
     this.imageIdToUIDs.set(imageId, uids);
   }
 
+  _getAndCacheStudyDataset(StudyInstanceUID, dataset) {
+    if (!this.datasets[StudyInstanceUID]) {
+      this.datasets[StudyInstanceUID] = dataset;
+    }
+  }
+
+  getStudyDataset(StudyInstanceUID) {
+    return this.datasets[StudyInstanceUID];
+  }
+
   _getAndCacheStudy(StudyInstanceUID) {
     const studies = this.studies;
 
@@ -83,6 +95,7 @@ class MetadataProvider {
 
     return study;
   }
+
   _getAndCacheSeriesFromStudy(study, SeriesInstanceUID) {
     let series = study.series.get(SeriesInstanceUID);
 

platform/core/src/services/UIModalService/index.js

@@ -9,6 +9,7 @@
  * @property {boolean} [closeButton=true] Should the modal body render the close button.
  * @property {string} [title=null] Should the modal render the title independently of the body content.
  * @property {string} [customClassName=null] The custom class to style the modal.
+ * @property {boolean} [showScrollbar=null] Show or hide scrollbar.
  */
 
 const name = 'UIModalService';
@@ -28,7 +29,7 @@ const serviceImplementation = {
 /**
  * Show a new UI modal;
  *
- * @param {ModalProps} props { content, contentProps, shouldCloseOnEsc, isOpen, onClose, closeButton, title, customClassName }
+ * @param {ModalProps} props { content, contentProps, shouldCloseOnEsc, isOpen, onClose, closeButton, title, customClassName, showScrollbar }
  */
 function _show({
   content = null,
@@ -40,6 +41,7 @@ function _show({
   title = null,
   fullscreen = false,
   customClassName = null,
+  showScrollbar = false
 }) {
   return serviceImplementation._show({
     content,
@@ -51,6 +53,7 @@ function _show({
     title,
     fullscreen,
     customClassName,
+    showScrollbar
   });
 }
 

platform/ui/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.1](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.7.0...@ohif/ui@1.7.1) (2020-12-03)
+
+
+### Bug Fixes
+
+* fallback to original dataset VR for XS ([f57725a](https://github.com/OHIF/Viewers/commit/f57725ac8bfd59ea46ab334a1823882afadefba1))
+
+
+
+
+
+# [1.7.0](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.6.0...@ohif/ui@1.7.0) (2020-12-03)
+
+
+### Features
+
+* add show scroll option to modal ([be494a7](https://github.com/OHIF/Viewers/commit/be494a7376d15777dbe598289c4ecdb9f48a6a48))
+
+
+
+
+
+# [1.6.0](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.5.7...@ohif/ui@1.6.0) (2020-12-03)
+
+
+### Features
+
+* Add error boundary and retry logic for network failures during dynamic imports ([#2145](https://github.com/OHIF/Viewers/issues/2145)) ([4c07904](https://github.com/OHIF/Viewers/commit/4c079044f6ae2381c6054d8d77414100152d1d19))
+
+
+
+
+
 ## [1.5.7](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.5.6...@ohif/ui@1.5.7) (2020-11-02)
 
 

platform/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/ui",
-  "version": "1.5.7",
+  "version": "1.7.1",
   "description": "A set of React components for Medical Imaging Viewers",
   "author": "OHIF Contributors",
   "license": "MIT",

platform/ui/src/components/errorBoundary/ErrorBoundary.js

@@ -15,8 +15,8 @@ const ErrorFallback = ({ error, componentStack, resetErrorBoundary }) => {
 
 const OHIFErrorBoundary = ({
   context = 'OHIF',
-  onReset = () => {},
-  onError = () => {},
+  onReset = () => { },
+  onError = () => { },
   fallbackComponent,
   children,
 }) => {
@@ -45,7 +45,7 @@ OHIFErrorBoundary.propTypes = {
   onReset: PropTypes.func,
   onError: PropTypes.func,
   children: PropTypes.node.isRequired,
-  fallbackComponent: PropTypes.element,
+  fallbackComponent: PropTypes.oneOfType([PropTypes.node, PropTypes.func, PropTypes.element]),
 };
 
 export default OHIFErrorBoundary;

platform/ui/src/components/errorPage/ErrorPage.css

@@ -0,0 +1,24 @@
+.ErrorPage {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  color: var(--active-color);
+}
+
+.ErrorPage .error-container {
+  margin: 10px;
+  width: 50%;
+  height: 25%;
+  overflow: scroll;
+  border-radius: 15px;
+  border-color: var(--active-color);
+  border: 1px solid;
+  padding: 5px;
+}
+
+.ErrorPage .retry-icon {
+  cursor: pointer;
+}

platform/ui/src/components/errorPage/ErrorPage.js

@@ -0,0 +1,41 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Icon } from '@ohif/ui';
+
+import './ErrorPage.css';
+
+const ErrorPage = ({ error, title, description, onRetry }) => {
+  return (
+    <div className="ErrorPage">
+      {title && <h3>{title}</h3>}
+      <p>{description}</p>
+      <Icon
+        className="retry-icon"
+        name="rotate-right"
+        width="25px"
+        height="25px"
+        onClick={onRetry}
+      />
+      {error && (
+        <div className="error-container">
+          <pre>{error.message}</pre>
+          <pre>{error.stack}</pre>
+        </div>
+      )}
+    </div>
+  );
+};
+
+ErrorPage.propTypes = {
+  error: PropTypes.object,
+  title: PropTypes.string,
+  description: PropTypes.string,
+  onRetry: PropTypes.func
+};
+
+ErrorPage.defaultProps = {
+  description: 'Oh snap, something went wrong, please try reloading',
+  onRetry: () => window.location.reload()
+};
+
+export default ErrorPage;

platform/ui/src/components/errorPage/index.js

@@ -0,0 +1,2 @@
+import ErrorPage from './ErrorPage';
+export default ErrorPage;

platform/ui/src/components/index.js

@@ -16,6 +16,7 @@ import { SelectTree } from './selectTree';
 import { SimpleDialog } from './simpleDialog';
 import { OHIFModal } from './ohifModal';
 import { ContextMenu } from './contextMenu';
+import ErrorPage from './errorPage';
 import {
   PageToolbar,
   StudyList,
@@ -58,4 +59,5 @@ export {
   Tooltip,
   AboutContent,
   OHIFModal,
+  ErrorPage
 };

platform/ui/src/components/ohifModal/OHIFModal.styl

@@ -27,13 +27,13 @@
     &.OHIFModal-fullscreen
       width: 95%
 
-
-
   &__content
     padding: 20px
     max-height: 90vh;
-    overflow-x: hidden;
     overflow-y: auto;
+
+  &:not(.visibleScrollbar) &__content
+    overflow-x: hidden;
     scrollbar-width: none;
     -ms-overflow-style: none;
     &::-webkit-scrollbar

platform/ui/src/contextProviders/ModalProvider.js

@@ -34,6 +34,7 @@ const ModalProvider = ({ children, modal: Modal, service }) => {
     isOpen: true,
     onClose: null,
     closeButton: true,
+    showScrollbar: false,
     title: null,
     customClassName: '',
     fullscreen: false,
@@ -81,13 +82,14 @@ const ModalProvider = ({ children, modal: Modal, service }) => {
     shouldCloseOnEsc,
     fullscreen,
     closeButton,
+    showScrollbar
   } = options;
 
   return (
     <Provider value={{ show, hide }}>
       {ModalContent && (
         <Modal
-          className={classNames(customClassName, ModalContent.className)}
+          className={classNames(customClassName, ModalContent.className, { 'visibleScrollbar': showScrollbar })}
           shouldCloseOnEsc={shouldCloseOnEsc}
           isOpen={isOpen}
           title={title}

platform/ui/src/index.js

@@ -29,7 +29,8 @@ import {
   Tooltip,
   AboutContent,
   OHIFModal,
-  ErrorBoundary
+  ErrorBoundary,
+  ErrorPage
 } from './components';
 import { useDebounce, useMedia } from './hooks';
 
@@ -53,6 +54,7 @@ import { ScrollableArea } from './ScrollableArea/ScrollableArea.js';
 import Toolbar from './viewer/Toolbar.js';
 import ToolbarButton from './viewer/ToolbarButton.js';
 import ViewerbaseDragDropContext from './utils/viewerbaseDragDropContext.js';
+import { asyncComponent, retryImport } from './utils/asyncComponent';
 import {
   SnackbarProvider,
   useSnackbarContext,
@@ -112,7 +114,6 @@ export {
   ToolbarSection,
   Tooltip,
   AboutContent,
-  ViewerbaseDragDropContext,
   SnackbarProvider,
   useSnackbarContext,
   withSnackbar,
@@ -125,7 +126,12 @@ export {
   withDialog,
   useDialog,
   ErrorBoundary,
+  ErrorPage,
   // Hooks
   useDebounce,
   useMedia,
+  // Utils
+  ViewerbaseDragDropContext,
+  asyncComponent,
+  retryImport
 };

platform/ui/src/utils/asyncComponent/asyncComponent.js

@@ -0,0 +1,62 @@
+import React, { useState, useEffect } from 'react';
+import { ErrorPage } from '@ohif/ui';
+
+export const retryImport = (fn, retriesLeft = 5, interval = 1000) =>
+  new Promise((resolve, reject) => {
+    fn().then(resolve).catch((error) => {
+      setTimeout(() => {
+        if (retriesLeft === 1) {
+          /* reject('maximum retries exceeded'); */
+          reject(error);
+          return;
+        }
+
+        /* Passing on "reject" is the important part */
+        retry(fn, retriesLeft - 1, interval).then(resolve, reject);
+      }, interval);
+    });
+  });
+
+const onError = (error, setState) => setState({ component: ErrorPage });
+
+/**
+ * We use this function to lazy load the import of a component to leverage 'Code Splitting'
+ * Link: https://serverless-stack.com/chapters/code-splitting-in-create-react-app.html
+ */
+const asyncComponent = (importComponent, options = { onError }) => props => {
+  const [state, setState] = useState({ component: null });
+
+  const isFunction = item => typeof item === 'function';
+  const isChunkError = error => error.toString().indexOf('ChunkLoadError') > -1;
+
+  useEffect(() => {
+    const addDynamicallyLoadedComponentToState = async () => {
+      try {
+        const { default: component } = await importComponent();
+        setState({ component });
+        if (options.onLoaded && isFunction(options.onLoaded)) {
+          options.onLoaded(component);
+        }
+      } catch (error) {
+        console.error('[AsyncComponent] Failed to import chunk:', error);
+
+        if (options.onError && isFunction(options.onError)) {
+          options.onError(error, setState);
+          return;
+        }
+
+        if (isChunkError(error)) {
+          console.error('[AsyncComponent] Reloading due to chunk error');
+          window.location.reload();
+        }
+      }
+    };
+
+    addDynamicallyLoadedComponentToState();
+  }, []);
+
+  const Component = state.component;
+  return Component ? <Component {...props} /> : null;
+};
+
+export default asyncComponent;

platform/ui/src/utils/asyncComponent/index.js

@@ -0,0 +1,2 @@
+export { default as asyncComponent } from './asyncComponent';
+export { retryImport } from './asyncComponent';

platform/viewer/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.6.3](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.6.2...@ohif/viewer@4.6.3) (2020-12-03)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.6.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.6.1...@ohif/viewer@4.6.2) (2020-12-03)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.6.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.6.0...@ohif/viewer@4.6.1) (2020-12-03)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+# [4.6.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.5.29...@ohif/viewer@4.6.0) (2020-12-03)
+
+
+### Features
+
+* Add error boundary and retry logic for network failures during dynamic imports ([#2145](https://github.com/OHIF/Viewers/issues/2145)) ([4c07904](https://github.com/OHIF/Viewers/commit/4c079044f6ae2381c6054d8d77414100152d1d19))
+
+
+
+
+
 ## [4.5.29](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.5.28...@ohif/viewer@4.5.29) (2020-12-03)
 
 **Note:** Version bump only for package @ohif/viewer

platform/viewer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/viewer",
-  "version": "4.5.29",
+  "version": "4.6.3",
   "description": "OHIF Viewer",
   "author": "OHIF Contributors",
   "license": "MIT",
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@ohif/core": "^2.10.7",
+    "@ohif/core": "^2.11.1",
     "@ohif/extension-cornerstone": "^2.9.6",
     "@ohif/extension-debugging": "^0.1.6",
     "@ohif/extension-dicom-html": "^1.2.9",
@@ -58,9 +58,9 @@
     "@ohif/extension-dicom-rt": "^0.4.9",
     "@ohif/extension-dicom-segmentation": "^0.4.7",
     "@ohif/extension-lesion-tracker": "^0.2.1",
-    "@ohif/extension-vtk": "^1.8.0",
+    "@ohif/extension-vtk": "^1.9.3",
     "@ohif/i18n": "^0.53.0",
-    "@ohif/ui": "^1.5.7",
+    "@ohif/ui": "^1.7.1",
     "@tanem/react-nprogress": "^1.1.25",
     "classnames": "^2.2.6",
     "core-js": "^3.2.1",

platform/viewer/src/OHIFStandaloneViewer.js

@@ -5,9 +5,8 @@ import { Route, Switch } from 'react-router-dom';
 import { NProgress } from '@tanem/react-nprogress';
 import { CSSTransition } from 'react-transition-group';
 import { connect } from 'react-redux';
-import { ViewerbaseDragDropContext, ErrorBoundary } from '@ohif/ui';
+import { ViewerbaseDragDropContext, ErrorBoundary, asyncComponent, retryImport } from '@ohif/ui';
 import { SignoutCallbackComponent } from 'redux-oidc';
-import asyncComponent from './components/AsyncComponent.js';
 import * as RoutesUtil from './routes/routesUtil';
 
 import NotFound from './routes/NotFound.js';
@@ -18,7 +17,7 @@ import './theme-tide.css';
 // Contexts
 import AppContext from './context/AppContext';
 const CallbackPage = asyncComponent(() =>
-  import(/* webpackChunkName: "CallbackPage" */ './routes/CallbackPage.js')
+  retryImport(() => import(/* webpackChunkName: "CallbackPage" */ './routes/CallbackPage.js'))
 );
 
 class OHIFStandaloneViewer extends Component {
@@ -203,10 +202,10 @@ class OHIFStandaloneViewer extends Component {
                   {match === null ? (
                     <></>
                   ) : (
-                    <ErrorBoundary context={match.url}>
-                      <Component match={match} location={this.props.location} />
-                    </ErrorBoundary>
-                  )}
+                      <ErrorBoundary context={match.url}>
+                        <Component match={match} location={this.props.location} />
+                      </ErrorBoundary>
+                    )}
                 </CSSTransition>
               )}
             </Route>

platform/viewer/src/components/AsyncComponent.js

@@ -1,37 +0,0 @@
-/**
- * We use this component to leverage "Code Splitting"
- *
- * Link: https://serverless-stack.com/chapters/code-splitting-in-create-react-app.html
- */
-
-import React, { Component } from 'react';
-
-export default function asyncComponent(importComponent) {
-  class AsyncComponent extends Component {
-    constructor(props) {
-      super(props);
-
-      this.state = {
-        component: null,
-      };
-    }
-
-    async componentDidMount() {
-      // Add dynamically loaded component to state
-      const { default: component } = await importComponent();
-
-      this.setState({
-        component: component,
-      });
-    }
-
-    render() {
-      const C = this.state.component;
-
-      // Render the loaded component, or null
-      return C ? <C {...this.props} /> : null;
-    }
-  }
-
-  return AsyncComponent;
-}

platform/viewer/src/routes/routesUtil.js

@@ -1,32 +1,32 @@
-import asyncComponent from '../components/AsyncComponent.js';
-
+import { asyncComponent, retryImport } from '@ohif/ui';
 import OHIF from '@ohif/core';
+
 const { urlUtil: UrlUtil } = OHIF.utils;
 
 // Dynamic Import Routes (CodeSplitting)
 const IHEInvokeImageDisplay = asyncComponent(() =>
-  import(
-    /* webpackChunkName: "IHEInvokeImageDisplay" */ './IHEInvokeImageDisplay.js'
+  retryImport(() =>
+    import(/* webpackChunkName: "IHEInvokeImageDisplay" */ './IHEInvokeImageDisplay.js')
   )
 );
 const ViewerRouting = asyncComponent(() =>
-  import(/* webpackChunkName: "ViewerRouting" */ './ViewerRouting.js')
+  retryImport(() => import(/* webpackChunkName: "ViewerRouting" */ './ViewerRouting.js'))
 );
 
 const StudyListRouting = asyncComponent(() =>
-  import(
+  retryImport(() => import(
     /* webpackChunkName: "StudyListRouting" */ '../studylist/StudyListRouting.js'
-  )
+  ))
 );
 const StandaloneRouting = asyncComponent(() =>
-  import(
+  retryImport(() => import(
     /* webpackChunkName: "ConnectedStandaloneRouting" */ '../connectedComponents/ConnectedStandaloneRouting.js'
-  )
+  ))
 );
 const ViewerLocalFileData = asyncComponent(() =>
-  import(
+  retryImport(() => import(
     /* webpackChunkName: "ViewerLocalFileData" */ '../connectedComponents/ViewerLocalFileData.js'
-  )
+  ))
 );
 
 const reload = () => window.location.reload();