Merge branch 'master' into docs/testing-guidelines

.netlify/build-deploy-preview.sh

@@ -27,4 +27,4 @@ mv platform/viewer/dist/* .netlify/www/pwa -v
 echo 'Nothing left to see here. Go home, folks.'
 
 # Build using react-scripts
-# npx cross-env PUBLIC_URL=/demo REACT_APP_CONFIG=config/netlify.js react-scripts --max_old_space_size=4096 build
+# npx cross-env PUBLIC_URL=/demo APP_CONFIG=config/netlify.js react-scripts --max_old_space_size=4096 build

babel.config.js

@@ -22,6 +22,7 @@ module.exports = {
   // https://babeljs.io/docs/en/options#babelrcroots
   babelrcRoots: ['./platform/*', './extensions/*'],
   plugins: [
+    'react-hot-loader/babel',
     'inline-react-svg',
     '@babel/plugin-proposal-class-properties',
     '@babel/plugin-proposal-object-rest-spread',

docs/latest/advanced/_maintained-extensions-table.md

@@ -10,7 +10,7 @@
         <!-- CORNERSTONE.js -->
         <tr>
             <td>
-                <a href="https://www.npmjs.com/package/ohif-cornerstone-extension">
+                <a href="https://www.npmjs.com/package/@ohif/extension-cornerstone">
                     Cornerstone
                 </a>
             </td>
@@ -22,7 +22,7 @@
         <!-- VTK.js -->
         <tr>
             <td>
-                <a href="https://www.npmjs.com/package/ohif-vtk-extension">
+                <a href="https://www.npmjs.com/package/@ohif/extension-vtk">
                     VTK.js
                 </a>
             </td>
@@ -33,30 +33,30 @@
         </tr>
         <tr>
             <td>
-                <a href="">HTML</a>
+                <a href="https://www.npmjs.com/package/@ohif/extension-dicom-html">DICOM HTML</a>
             </td>
             <td>
-                Renders text and HTML content for <a href="https://github.com/OHIF/Viewers/blob/react/extensions/ohif-dicom-html-extension/src/OHIFDicomHtmlSopClassHandler.js#L7-L15">specific SopClassUIDs</a>.
+                Renders text and HTML content for <a href="https://github.com/OHIF/Viewers/blob/master/extensions/dicom-html/src/OHIFDicomHtmlSopClassHandler.js#L4-L12">specific SopClassUIDs</a>.
             </td>
             <td>Viewport, SopClassHandler</td>
         </tr>
         <tr>
             <td>
-                <a href="https://www.npmjs.com/package/ohif-dicom-pdf-extension">PDF</a>
+                <a href="https://www.npmjs.com/package/@ohif/extension-dicom-pdf">DICOM PDF</a>
             </td>
             <td>
-                Renders PDFs for a <a href="https://github.com/OHIF/Viewers/blob/react/extensions/ohif-dicom-pdf-extension/src/OHIFDicomPDFSopClassHandler.js#L8">specific SopClassUID</a>.
+                Renders PDFs for a <a href="https://github.com/OHIF/Viewers/blob/master/extensions/dicom-pdf/src/OHIFDicomPDFSopClassHandler.js#L4-L6">specific SopClassUID</a>.
             </td>
             <td>Viewport, SopClassHandler</td>
         </tr>
         <tr>
             <td>
-                <a href="https://www.npmjs.com/package/ohif-dicom-microscopy-extension">Microscopy</a>
+                <a href="https://www.npmjs.com/package/@ohif/extension-dicom-microscopy">DICOM Microscopy</a>
             </td>
             <td>
-                Renders Microscopy images for a <a href="https://github.com/OHIF/Viewers/blob/react/extensions/ohif-dicom-microscopy-extension/src/DicomMicroscopySopClassHandler.js#L6">specific SopClassUID</a>.
+                Renders Microscopy images for a <a href="https://github.com/OHIF/Viewers/blob/master/extensions/dicom-microscopy/src/DicomMicroscopySopClassHandler.js#L5-L7">specific SopClassUID</a>.
             </td>
             <td>Viewport, SopClassHandler</td>
         </tr>
     </tbody>
-</table>
+</table>

docs/latest/advanced/extensions.md

@@ -152,7 +152,7 @@ is used depends on:
 <center><i>An example of three Viewports</i></center>
 
 For a complete example implementation,
-[check out the OHIFCornerstoneViewport](https://github.com/OHIF/Viewers/blob/react/extensions/ohif-cornerstone-extension/src/OHIFCornerstoneViewport.js).
+[check out the OHIFCornerstoneViewport](https://github.com/OHIF/Viewers/blob/master/extensions/cornerstone/src/OHIFCornerstoneViewport.js).
 
 #### Toolbar
 
@@ -168,7 +168,7 @@ store.
 Toolbar components are rendered in the `ToolbarRow` component.
 
 For a complete example implementation,
-[check out the OHIFCornerstoneViewport's Toolbar Module](https://github.com/OHIF/Viewers/blob/react/extensions/ohif-cornerstone-extension/src/ToolbarModule.js).
+[check out the OHIFCornerstoneViewport's Toolbar Module](https://github.com/OHIF/Viewers/blob/master/extensions/cornerstone/src/toolbarModule.js).
 
 #### SopClassHandler
 
@@ -197,9 +197,9 @@ would like included at startup.
 _app.js_
 
 ```js
-import { createStore, combineReducers } from "redux";
-import OHIF from "@ohif/core";
-import OHIFCornerstoneExtension from "ohif-cornerstone-extension";
+import { createStore, combineReducers } from 'redux';
+import OHIF from '@ohif/core';
+import OHIFCornerstoneExtension from 'ohif-cornerstone-extension';
 
 const combined = combineReducers(OHIF.redux.reducers);
 const store = createStore(combined);
@@ -214,8 +214,8 @@ ExtensionManager.registerExtensions(store, extensions);
 
 A small number of powerful extensions for popular use cases are maintained by
 OHIF. They're co-located in the
-[`OHIF/Viewers`](https://github.com/OHIF/Viewers/tree/react/) repository, in the
-top level [`extensions/`](https://github.com/OHIF/Viewers/tree/react/extensions)
+[`OHIF/Viewers`](https://github.com/OHIF/Viewers) repository, in the top level
+[`extensions/`](https://github.com/OHIF/Viewers/tree/master/extensions)
 directory.
 
 {% include "./_maintained-extensions-table.md" %}
@@ -225,6 +225,6 @@ directory.
 -->
 
 <!-- prettier-ignore-start -->
-[example-ext-src]: https://github.com/OHIF/Viewers/blob/master/extensions/_ohif-example-extension/src/index.js)
-[module-types]: https://github.com/OHIF/ohif-core/blob/43c08a29eff3fb646a0e83a03a236ddd84f4a6e8/src/plugins.js#L1-L6
+[example-ext-src]: https://github.com/OHIF/Viewers/tree/master/extensions/_example/src
+[module-types]: https://github.com/OHIF/Viewers/blob/master/platform/core/src/extensions/MODULE_TYPES.js
 <!-- prettier-ignore-end -->

docs/latest/connecting-to-image-archives/google-cloud-healthcare.md

@@ -53,7 +53,7 @@ Images can even be transcoded on the fly if this is desired.
 ```bash
 cd OHIFViewer
 yarn install
-REACT_APP_CONFIG=config/google.js yarn run dev
+APP_CONFIG=config/google.js yarn run dev
 ```
 
 ## Running via Docker

docs/latest/deployment/recipes/build-for-production.md

@@ -71,11 +71,11 @@ how to configure the project for your own imaging archive below.
 #### How it Works
 
 The configuration for our project is in the `/public/config` directory. Our
-build process knows which configuration file to use based on the
-`REACT_APP_CONFIG` environment variable. By default, its value is
-[`default.js`](https://github.com/OHIF/Viewers/blob/react/public/config/default.js).
-When we build, the `%REACT_APP_CONFIG%` value in
-our[`/public/index.html`](https://github.com/OHIF/Viewers/blob/react/public/index.html#L12-L15)
+build process knows which configuration file to use based on the `APP_CONFIG`
+environment variable. By default, its value is
+[`default.js`](https://github.com/OHIF/Viewers/blob/master/platform/viewer/public/config/default.js).
+When we build, the `%APP_CONFIG%` value in
+our[`/public/index.html`](https://github.com/OHIF/Viewers/blob/master/platform/viewer/public/index.html)
 file is substituted for the correct configuration file's name. This sets
 the`window.config` equal to our configuration file's value.
 
@@ -104,17 +104,17 @@ window.config = {
       },
     ],
   },
-}
+};
 ```
 
 You can also create a new config file and specify its path relative to the build
-output's root by setting the `REACT_APP_CONFIG` environment variable. You can
-set the value of this environment variable a few different ways:
+output's root by setting the `APP_CONFIG` environment variable. You can set the
+value of this environment variable a few different ways:
 
 - [Add a temporary environment variable in your shell](https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#adding-temporary-environment-variables-in-your-shell)
 - [Add environment specific variables in `.env` file(s)](https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#adding-development-environment-variables-in-env)
 - Using the `cross-env` package in an npm script:
-  - `"build": "cross-env REACT_APP_CONFIG=config/my-config.js react-scripts build"`
+  - `"build": "cross-env APP_CONFIG=config/my-config.js react-scripts build"`
 
 After updating the configuration, `yarn run build:web` to generate updated build
 output.

docs/latest/deployment/recipes/nginx--image-archive.md

@@ -11,7 +11,7 @@ control.
 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 recpie](./user-account-control.md)
+setup, check out our [user account control recipe](./user-account-control.md)
 that builds on the lessons learned here.
 
 ## Overview
@@ -51,7 +51,7 @@ We can solve this one of two ways:
 
 This solution uses the first approach, but you can see an example of the second
 in the `docker-compose` bundled with this project for local development:
-[HERE](#)
+[HERE](https://github.com/OHIF/Viewers/blob/master/platform/viewer/.recipes/Nginx-Orthanc/docker-compose.yml)
 
 You can read more about CORS in this Medium article: [Understanding
 CORS][understanding-cors]
@@ -124,10 +124,10 @@ likely want to update:
 The OHIF Viewer's configuration is imported from a static `.js` file and made
 available globally at `window.config`. The configuration we use is set to a
 specific file when we build the viewer, and determined by the env variable:
-`REACT_APP_CONFIG`. You can see where we set its value in the `dockerfile` for
-this solution:
+`APP_CONFIG`. You can see where we set its value in the `dockerfile` for this
+solution:
 
-`ENV REACT_APP_CONFIG=config/docker_openresty-orthanc.js`
+`ENV APP_CONFIG=config/docker_openresty-orthanc.js`
 
 You can find the configuration we're using here:
 `/public/config/docker_openresty-orthanc.js`

docs/latest/deployment/recipes/user-account-control.md

@@ -125,10 +125,10 @@ likely want to update:
 The OHIF Viewer's configuration is imported from a static `.js` file and made
 available globally at `window.config`. The configuration we use is set to a
 specific file when we build the viewer, and determined by the env variable:
-`REACT_APP_CONFIG`. You can see where we set its value in the `dockerfile` for
-this solution:
+`APP_CONFIG`. You can see where we set its value in the `dockerfile` for this
+solution:
 
-`ENV REACT_APP_CONFIG=config/docker_openresty-orthanc-keycloak.js`
+`ENV APP_CONFIG=config/docker_openresty-orthanc-keycloak.js`
 
 You can find the configuration we're using here:
 `/public/config/docker_openresty-orthanc-keycloak.js`
@@ -281,9 +281,9 @@ community 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]: #
-[dockerfile]: #
-[config-nginx]: #
-[config-orthanc]: #
-[config-keycloak]: #
+[config]: https://github.com/OHIF/Viewers/blob/master/platform/viewer/src/config.js
+[dockerfile]: https://github.com/OHIF/Viewers/tree/master/platform/viewer/.recipes
+[config-nginx]: https://github.com/OHIF/Viewers/tree/master/platform/viewer/.recipes
+[config-orthanc]: https://github.com/OHIF/Viewers/tree/master/platform/viewer/.recipes
+[config-keycloak]: https://github.com/OHIF/Viewers/tree/master/platform/viewer/.recipes
 <!-- prettier-ignore-end -->

docs/latest/essentials/configuration.md

@@ -7,11 +7,11 @@
 ## How it Works
 
 The configuration for our project is in the `/public/config` directory. Our
-build process knows which configuration file to use based on the
-`REACT_APP_CONFIG` environment variable. By default, its value is
-[`default.js`](https://github.com/OHIF/Viewers/blob/react/public/config/default.js).
-When we build, the `%REACT_APP_CONFIG%` value in
-our[`/public/index.html`](https://github.com/OHIF/Viewers/blob/react/public/index.html#L12-L15)
+build process knows which configuration file to use based on the `APP_CONFIG`
+environment variable. By default, its value is
+[`default.js`](https://github.com/OHIF/Viewers/blob/master/platform/viewer/public/config/default.js).
+When we build, the `%APP_CONFIG%` value in
+our[`/public/index.html`](https://github.com/OHIF/Viewers/blob/master/platform/viewer/public/index.html)
 file is substituted for the correct configuration file's name. This sets the
 `window.config` equal to our configuration file's value.
 
@@ -40,17 +40,17 @@ window.config = {
       },
     ],
   },
-}
+};
 ```
 
 You can also create a new config file and specify its path relative to the build
-output's root by setting the `REACT_APP_CONFIG` environment variable. You can
-set the value of this environment variable a few different ways:
+output's root by setting the `APP_CONFIG` environment variable. You can set the
+value of this environment variable a few different ways:
 
 - [Add a temporary environment variable in your shell](https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#adding-temporary-environment-variables-in-your-shell)
 - [Add environment specific variables in `.env` file(s)](https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#adding-development-environment-variables-in-env)
 - Using the `cross-env` package in an npm script:
-  - `"build": "cross-env REACT_APP_CONFIG=config/my-config.js react-scripts build"`
+  - `"build": "cross-env APP_CONFIG=config/my-config.js react-scripts build"`
 
 After updating the configuration, `yarn run build:web` to generate updated build
 output.

docs/latest/essentials/data-source.md

@@ -60,8 +60,8 @@ _Upload your first Study:_
 #### Orthanc: Learn More
 
 You can see the `docker-compose.yml` file this command runs at
-[`<project-root>/docker/Nginx-Docker/`](#), and more on Orthanc for Docker in
-[Orthanc's documentation][orthanc-docker].
+[`<project-root>/platform/viewer/.recipes/Nginx-Orthanc/`](https://github.com/OHIF/Viewers/tree/master/platform/viewer/.recipes/Nginx-Orthanc),
+and more on Orthanc for Docker in [Orthanc's documentation][orthanc-docker].
 
 ### Connecting to Orthanc
 
@@ -87,19 +87,18 @@ is running the `dev:orthanc` script in our project's `package.json`. That script
 is:
 
 ```js
-cross-env PORT=5000 REACT_APP_CONFIG=config/docker_nginx-orthanc.js react-scripts start
+cross-env PORT=5000 APP_CONFIG=config/docker_nginx-orthanc.js react-scripts start
 ```
 
 - `cross-env` sets two environment variables
   - PORT: 5000
-  - REACT_APP_CONFIG: `config/docker_nginx-orthanc.js`
+  - APP_CONFIG: `config/docker_nginx-orthanc.js`
 - `react-scripts` runs it's `start` script. This is [the de-facto
   way][cra-start] to run a "Create React App" in development mode.
 
-The `REACT_APP_CONFIG` value tells our app which file to load on to
-`window.config`. By default, our app uses the file at
-`<project-root>/public/config/default.js`. Here is what that configuration looks
-like:
+The `APP_CONFIG` value tells our app which file to load on to `window.config`.
+By default, our app uses the file at `<project-root>/public/config/default.js`.
+Here is what that configuration looks like:
 
 ```js
 window.config = {

docs/latest/frequently-asked-questions.md

@@ -37,8 +37,8 @@ Some tips for filing a new issue:
 At the moment we are in the process of defining our roadmap and will do our best
 to communicate this to the community. If your requested feature is on the
 roadmap, then it will most likely be built at some point. If it is not, you are
-welcome to build it yourself and [contribute it](../contributing.md). If you
-have resources and would like to fund the development of a feature, please
+welcome to build it yourself and [contribute it](contributing.md). If you have
+resources and would like to fund the development of a feature, please
 [contact us](http://www.ohif.org).
 
 ### Who should I contact about Academic Collaborations?

extensions/cornerstone/CHANGELOG.md

@@ -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.50.1](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2019-08-14)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
 # [0.50.0-alpha.10](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2019-08-14)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone

extensions/cornerstone/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone",
-  "version": "0.50.0",
+  "version": "0.50.1",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",

extensions/dicom-html/CHANGELOG.md

@@ -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.50.1](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2019-08-14)
+
+**Note:** Version bump only for package @ohif/extension-dicom-html
+
+
+
+
+
 # [0.50.0-alpha.10](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2019-08-14)
 
 **Note:** Version bump only for package @ohif/extension-dicom-html

extensions/dicom-html/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-html",
-  "version": "0.50.0",
+  "version": "0.50.1",
   "description": "OHIF extension for rendering structured reports to HTML",
   "author": "OHIF",
   "license": "MIT",

extensions/dicom-microscopy/CHANGELOG.md

@@ -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.50.1](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2019-08-14)
+
+**Note:** Version bump only for package @ohif/extension-dicom-microscopy
+
+
+
+
+
 # [0.50.0-alpha.10](https://github.com/OHIF/Viewers/compare/@ohif/[email protected]...@ohif/[email protected]) (2019-08-14)
 
 **Note:** Version bump only for package @ohif/extension-dicom-microscopy

extensions/dicom-microscopy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-microscopy",
-  "version": "0.50.0",
+  "version": "0.50.1",
   "description": "OHIF extension for Dicom Microscopy",
   "author": "OHIF",
   "license": "MIT",