chore(release): publish [skip ci]

- @ohif/extension-cornerstone@2.12.5 - @ohif/extension-dicom-html@1.3.16 - @ohif/extension-dicom-rt@0.7.7 - @ohif/extension-dicom-segmentation@0.7.7 - @ohif/extension-dicom-tag-browser@0.2.18 - @ohif/extension-vtk@1.12.13 - @ohif/core@2.16.9 - @ohif/viewer@4.12.15
IDC: update dcmjs to version 0.19.3 (#2697 )
2022-02-02 15:09:29 +00:00 · 2022-02-02 16:06:14 +01:00 · 2022-01-31 15:05:24 +00:00 · 2022-01-31 10:02:18 -05:00 · 2022-01-29 01:06:23 +00:00 · 2022-01-28 20:02:30 -05:00
40 changed files with 1545 additions and 305 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
@@ -349,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/**/*'
@@ -377,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/**/*'
@@ -410,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
@@ -489,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`,
    },
@@ -8,7 +8,9 @@ OHIF Viewer and its medical imaging data. This post covers one of many potential
 setups that accomplish that. Please note, noticably absent is user account
 control.

-Do not use this recipe to host sensitive medical data on the open web. Depending
+> **Do not use this recipe to host sensitive medical data on the open web!** 
+
+Depending
 on your company's policies, this may be an appropriate setup on an internal
 network when protected with a server's basic authentication. For a more robust
 setup, check out our [user account control recipe](./user-account-control.md)
@@ -23,13 +25,13 @@ Our two biggest hurdles when hosting our image archive and web client are:

 ### Handling Web Requests

-We mittigate our first issue by allowing [Nginx][nginx] to handle incoming web
+We mitigate our first issue by allowing [Nginx][nginx] to handle incoming web
 requests. Nginx is open source software for web serving, reverse proxying,
 caching, and more. It's designed for maximum performance and stability --
 allowing us to more reliably serve content than Orthanc's built-in server can.

 More specifically, we accomplish this by using a
-[`reverse proxy`](https://en.wikipedia.org/wiki/Reverse_proxy) to retrieve
+[`reverse proxy`](https://en.wikipedia.org/wiki/Reverse_proxy) to retrieve 
 resources from our image archive (Orthanc), and when accessing its web admin.

 > A reverse proxy is a type of proxy server that retrieves resources on behalf
@@ -38,7 +40,7 @@ resources from our image archive (Orthanc), and when accessing its web admin.

 ### CORS Issues

-Cross-Origin Resource Sharing (CORS) is a mechanism that uses HTTP headers to
+[Cross-Origin Resource Sharing][understanding-cors] (CORS) is a mechanism that uses HTTP headers to
 tell a browser which web applications have permission to access selected
 resources from a server at a different origin (domain, protocol, port). IE. By
 default, a Web App located at `http://my-website.com` can't access resources
@@ -51,9 +53,6 @@ We can solve this one of two ways:

 **This solution uses the first approach.**

-You can read more about CORS in this Medium article: [Understanding
-CORS][understanding-cors]
-
 ### Diagram

 This setup allows us to create a setup similar to the one pictured below:
@@ -73,6 +72,8 @@ This setup allows us to create a setup similar to the one pictured below:
 - Docker
  - [Docker for Mac](https://docs.docker.com/docker-for-mac/)
  - [Docker for Windows](https://docs.docker.com/docker-for-windows/)
+- Node 16.x with optional Python and Visual Studio Build Tools ([webpack 4 has an issue](https://github.com/webpack/webpack/issues/14532) with Node 17.x)
+  - [Node.js](https://nodejs.org/en/download/)

 _Not sure if you have `docker` installed already? Try running `docker --version`
 in command prompt or terminal_
@@ -81,7 +82,7 @@ in command prompt or terminal_

 _Spin Things Up_

- Navigate to `<project-root>/docker/OpenResty-Orthanc` in your shell
+- Navigate to `./platform/viewer/.recipes/OpenResty-Orthanc` in your shell
 - Run `docker-compose up`

 _Upload Your First Study_
@@ -94,16 +95,16 @@ _Upload Your First Study_

 ### Troubleshooting

-_Exit code 137_
+#### Exit code 137

 This means Docker ran out of memory. Open Docker Desktop, go to the `advanced`
 tab, and increase the amount of Memory available.

-_Cannot create container for service X_
+#### Cannot create container for service X

 Use this one with caution: `docker system prune`

-_X is already running_
+#### X is already running

 Stop running all containers:

@@ -120,15 +121,12 @@ likely want to update:
 #### OHIF Viewer

 The OHIF Viewer's configuration is imported from a static `.js` file. The
-configuration we use is set to a specific file when we build the viewer, and
+configuration we use is set to [a specific file][config-ohif] when we build the viewer, and
 determined by the env variable: `APP_CONFIG`. You can see where we set its value
 in the `dockerfile` for this solution:

 `ENV APP_CONFIG=config/docker_openresty-orthanc.js`

-You can find the configuration we're using here:
-`/public/config/docker_openresty-orthanc.js`
-
 To rebuild the `webapp` image created by our `dockerfile` after updating the
 Viewer's configuration, you can run:

@@ -137,7 +135,7 @@ Viewer's configuration, you can run:

 #### Other

-All other files are found in: `/docker/OpenResty-Orthanc/`
+All other files in this directory include

 | Service           | Configuration                     | Docs                                        |
 | ----------------- | --------------------------------- | ------------------------------------------- |
@@ -236,6 +234,8 @@ members put together:
 [orthanc-docs]: http://book.orthanc-server.com/users/configuration.html#configuration
 [lua-resty-openidc-docs]: https://github.com/zmartzone/lua-resty-openidc
 <!-- SRC -->
+
+[config-ohif]: https://github.com/OHIF/Viewers/blob/master/platform/viewer/public/config/docker_openresty-orthanc.js
 [dockerfile]: https://github.com/OHIF/Viewers/blob/master/platform/viewer/.recipes/OpenResty-Orthanc/dockerfile
 [config-nginx]: https://github.com/OHIF/Viewers/blob/master/platform/viewer/.recipes/OpenResty-Orthanc/config/nginx.conf
 [config-orthanc]: https://github.com/OHIF/Viewers/blob/master/platform/viewer/.recipes/OpenResty-Orthanc/config/orthanc.json
@@ -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.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-cornerstone@2.12.4...@ohif/extension-cornerstone@2.12.5) (2022-02-02)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
 ## [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
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-cornerstone",
-  "version": "2.12.4",
+  "version": "2.12.5",
  "description": "OHIF extension for Cornerstone",
  "author": "OHIF",
  "license": "MIT",
@@ -36,7 +36,7 @@
    "cornerstone-math": "^0.1.9",
    "cornerstone-tools": "^6.0.6",
    "cornerstone-wado-image-loader": "^4.1.0",
-    "dcmjs": "0.19.2",
+    "dcmjs": "0.19.3",
    "dicom-parser": "^1.8.11",
    "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.16](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-html@1.3.15...@ohif/extension-dicom-html@1.3.16) (2022-02-02)
+
+**Note:** Version bump only for package @ohif/extension-dicom-html
+
+
+
+
+
 ## [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,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-html",
-  "version": "1.3.15",
+  "version": "1.3.16",
  "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.19.2",
+    "dcmjs": "0.19.3",
    "prop-types": "^15.6.2",
    "react": "^16.8.6",
    "react-dom": "^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.

+## [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,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-pdf",
-  "version": "1.1.1",
+  "version": "1.1.2",
  "description": "OHIF extension for Dicom PDF",
  "author": "OHIF",
  "license": "MIT",
@@ -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,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [0.7.7](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-rt@0.7.6...@ohif/extension-dicom-rt@0.7.7) (2022-02-02)
+
+**Note:** Version bump only for package @ohif/extension-dicom-rt
+
+
+
+
+
 ## [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
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-rt",
-  "version": "0.7.6",
+  "version": "0.7.7",
  "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.6.1",
    "cornerstone-tools": "^6.0.6",
-    "dcmjs": "0.19.2",
+    "dcmjs": "0.19.3",
    "gl-matrix": "^3.3.0",
    "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.7.7](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-segmentation@0.7.6...@ohif/extension-dicom-segmentation@0.7.7) (2022-02-02)
+
+**Note:** Version bump only for package @ohif/extension-dicom-segmentation
+
+
+
+
+
 ## [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
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-segmentation",
-  "version": "0.7.6",
+  "version": "0.7.7",
  "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.6.1",
    "cornerstone-tools": "^6.0.6",
-    "dcmjs": "0.19.2",
+    "dcmjs": "0.19.3",
    "prop-types": "^15.6.2",
    "react": "^16.8.6",
    "react-dom": "^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.2.18](https://github.com/OHIF/Viewers/compare/@ohif/extension-dicom-tag-browser@0.2.17...@ohif/extension-dicom-tag-browser@0.2.18) (2022-02-02)
+
+**Note:** Version bump only for package @ohif/extension-dicom-tag-browser
+
+
+
+
+
 ## [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
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-dicom-tag-browser",
-  "version": "0.2.17",
+  "version": "0.2.18",
  "description": "OHIF extension for checking DICOM headers.",
  "author": "OHIF",
  "license": "MIT",
@@ -28,7 +28,7 @@
  },
  "peerDependencies": {
    "@ohif/core": "^2.6.0",
-    "dcmjs": "0.19.2",
+    "dcmjs": "0.19.3",
    "react": "^16.8.6"
  },
  "dependencies": {
@@ -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.12.13](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.12.12...@ohif/extension-vtk@1.12.13) (2022-02-02)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [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,6 +1,6 @@
 {
  "name": "@ohif/extension-vtk",
-  "version": "1.12.11",
+  "version": "1.12.13",
  "description": "OHIF extension for VTK.js",
  "author": "OHIF",
  "license": "MIT",
@@ -35,7 +35,7 @@
    "cornerstone-core": "^2.6.1",
    "cornerstone-tools": "^6.0.6",
    "cornerstone-wado-image-loader": "^4.1.0",
-    "dcmjs": "0.19.2",
+    "dcmjs": "0.19.3",
    "dicom-parser": "^1.8.11",
    "i18next": "^17.0.3",
    "i18next-browser-languagedetector": "^3.0.1",
@@ -53,7 +53,7 @@
    "react-vtkjs-viewport": "^0.14.4"
  },
  "devDependencies": {
-    "@ohif/core": "^2.16.7",
+    "@ohif/core": "^2.16.9",
    "@ohif/ui": "^1.10.5",
    "cornerstone-tools": "^6.0.6",
    "cornerstone-wado-image-loader": "^4.1.0",
@@ -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,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [2.16.9](https://github.com/OHIF/Viewers/compare/@ohif/core@2.16.8...@ohif/core@2.16.9) (2022-02-02)
+
+**Note:** Version bump only for package @ohif/core
+
+
+
+
+
+## [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
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/core",
-  "version": "2.16.7",
+  "version": "2.16.9",
  "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.19.2",
+    "dcmjs": "0.19.3",
    "dicomweb-client": "^0.8.3",
    "immer": "6.0.2",
    "isomorphic-base64": "^1.0.2",
@@ -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;
  }
 }
@@ -10,9 +10,9 @@ services:
  ohif_viewer:
    build:
      # Project root
-      context: ./../../
+      context: ./../../../../
      # Relative to context
-      dockerfile: ./docker/OpenResty-Orthanc-Keycloak/dockerfile
+      dockerfile: ./platform/viewer/.recipes/OpenResty-Orthanc-Keycloak/dockerfile
    image: webapp:latest
    container_name: webapp
    volumes:
@@ -35,7 +35,7 @@ services:
  # TODO: Update to use Postgres
  # https://github.com/mrts/docker-postgresql-multiple-databases
  orthanc:
-    image: jodogne/orthanc-plugins:1.5.6
+    image: jodogne/orthanc-plugins:1.9.7
    hostname: orthanc
    container_name: orthanc
    volumes:
@@ -47,7 +47,7 @@ services:

  # LINK: https://hub.docker.com/r/jboss/keycloak
  keycloak:
-    image: jboss/keycloak:6.0.1
+    image: jboss/keycloak:16.1.0
    hostname: keycloak
    container_name: keycloak
    volumes:
@@ -23,7 +23,9 @@


 # Stage 1: Build the application
-FROM node:11.2.0-slim as builder
+
+# Needs to be pinned at 16.x for now because of https://github.com/webpack/webpack/issues/14532
+FROM node:lts-slim as builder

 RUN mkdir /usr/src/app
 WORKDIR /usr/src/app
@@ -36,12 +38,12 @@ COPY yarn.lock /usr/src/app/yarn.lock

 ADD . /usr/src/app/
 RUN yarn install
-RUN yarn run build:web
+RUN yarn run build

 # Stage 2: Bundle the built application into a Docker container
 # which runs openresty (nginx) using Alpine Linux
 # LINK: https://hub.docker.com/r/openresty/openresty
-FROM openresty/openresty:1.15.8.1rc1-0-alpine-fat
+FROM openresty/openresty:1.19.9.1-4-alpine-fat

 RUN mkdir /var/log/nginx
 RUN apk add --no-cache openssl
@@ -60,6 +62,6 @@ RUN luarocks install lua-resty-openidc
 RUN luarocks install luacrypto

 # Copy build output to image
-COPY --from=builder /usr/src/app/build /var/www/html
+COPY --from=builder /usr/src/app/platform/viewer/dist /var/www/html

 ENTRYPOINT ["/usr/local/openresty/nginx/sbin/nginx", "-g", "daemon off;"]
@@ -10,9 +10,9 @@ services:
  ohif_viewer:
    build:
      # Project root
-      context: ./../../
+      context: ./../../../../
      # Relative to context
-      dockerfile: ./docker/OpenResty-Orthanc/dockerfile
+      dockerfile: ./platform/viewer/.recipes/OpenResty-Orthanc/dockerfile
    image: webapp:latest
    container_name: webapp
    volumes:
@@ -34,7 +34,7 @@ services:
  # TODO: Update to use Postgres
  # https://github.com/mrts/docker-postgresql-multiple-databases
  orthanc:
-    image: jodogne/orthanc-plugins:1.5.6
+    image: jodogne/orthanc-plugins:1.9.7
    hostname: orthanc
    container_name: orthanc
    volumes:
@@ -23,7 +23,9 @@


 # Stage 1: Build the application
-FROM node:11.2.0-slim as builder
+
+# Needs to be pinned at 16.x for now because of https://github.com/webpack/webpack/issues/14532
+FROM node:lts-slim as builder

 RUN mkdir /usr/src/app
 WORKDIR /usr/src/app
@@ -36,12 +38,12 @@ COPY yarn.lock /usr/src/app/yarn.lock

 ADD . /usr/src/app/
 RUN yarn install
-RUN yarn run build:web
+RUN yarn run build

 # Stage 2: Bundle the built application into a Docker container
 # which runs openresty (nginx) using Alpine Linux
 # LINK: https://hub.docker.com/r/openresty/openresty
-FROM openresty/openresty:1.15.8.1rc1-0-alpine-fat
+FROM openresty/openresty:1.19.9.1-4-alpine-fat

 RUN mkdir /var/log/nginx
 RUN apk add --no-cache openssl
@@ -60,6 +62,6 @@ RUN luarocks install lua-resty-openidc
 RUN luarocks install luacrypto

 # Copy build output to image
-COPY --from=builder /usr/src/app/build /var/www/html
+COPY --from=builder /usr/src/app/platform/viewer/dist /var/www/html

 ENTRYPOINT ["/usr/local/openresty/nginx/sbin/nginx", "-g", "daemon off;"]
@@ -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,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [4.12.15](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.14...@ohif/viewer@4.12.15) (2022-02-02)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [4.12.14](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.12.13...@ohif/viewer@4.12.14) (2022-01-31)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+## [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
@@ -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.12",
+  "version": "4.12.15",
  "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,16 +47,16 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
-    "@ohif/core": "^2.16.7",
-    "@ohif/extension-cornerstone": "^2.12.4",
+    "@ohif/core": "^2.16.9",
+    "@ohif/extension-cornerstone": "^2.12.5",
    "@ohif/extension-debugging": "^0.3.1",
-    "@ohif/extension-dicom-html": "^1.3.15",
+    "@ohif/extension-dicom-html": "^1.3.16",
    "@ohif/extension-dicom-microscopy": "^0.52.0",
-    "@ohif/extension-dicom-pdf": "^1.1.1",
-    "@ohif/extension-dicom-rt": "^0.7.6",
-    "@ohif/extension-dicom-segmentation": "^0.7.6",
+    "@ohif/extension-dicom-pdf": "^1.1.2",
+    "@ohif/extension-dicom-rt": "^0.7.7",
+    "@ohif/extension-dicom-segmentation": "^0.7.7",
    "@ohif/extension-lesion-tracker": "^0.2.1",
-    "@ohif/extension-vtk": "^1.12.11",
+    "@ohif/extension-vtk": "^1.12.13",
    "@ohif/i18n": "^0.53.0",
    "@ohif/ui": "^1.10.5",
    "@tanem/react-nprogress": "^1.1.25",
@@ -66,7 +66,7 @@
    "cornerstone-math": "^0.1.9",
    "cornerstone-tools": "^6.0.6",
    "cornerstone-wado-image-loader": "^4.1.0",
-    "dcmjs": "0.19.2",
+    "dcmjs": "0.19.3",
    "dicom-parser": "^1.8.11",
    "dicomweb-client": "^0.8.3",
    "hammerjs": "^2.0.8",
@@ -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',
@@ -0,0 +1 @@
+3.7
Author	SHA1	Message	Date
ohif-bot	1953118c8a	chore(release): publish [skip ci] - @ohif/extension-cornerstone@2.12.5 - @ohif/extension-dicom-html@1.3.16 - @ohif/extension-dicom-rt@0.7.7 - @ohif/extension-dicom-segmentation@0.7.7 - @ohif/extension-dicom-tag-browser@0.2.18 - @ohif/extension-vtk@1.12.13 - @ohif/core@2.16.9 - @ohif/viewer@4.12.15	2022-02-02 15:09:29 +00:00
Davide Punzo	7807f849f2	IDC: update dcmjs to version 0.19.3 (#2697 )	2022-02-02 16:06:14 +01:00
ohif-bot	b426256df5	chore(release): publish [skip ci] - @ohif/viewer@4.12.14	2022-01-31 15:05:24 +00:00
Josiah VinsonandJosiah Vinson	c9b7e97f9c	Fixing broken OpenResty / Orthanc recipes and updating doc (#2652 ) * Updating docker files and documentation for OpenResty / Orthanc recipes. * fixing link formatting Co-authored-by: Josiah Vinson <jovinson@microsoft.com>	2022-01-31 10:02:18 -05:00
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