chore(release): publish [skip ci]

- @ohif/extension-vtk@1.3.14
 - @ohif/core@2.7.1
 - @ohif/viewer@3.9.2

docs/latest/viewer/configuration.md

@@ -11,7 +11,25 @@ are:
 ```js
 window.config = {
   routerBasename: '/',
-  whiteLabelling: {},
+  whiteLabeling: {
+    /* Optional: Should return a React component to be rendered in the "Logo" section of the application's Top Navigation bar */
+    createLogoComponentFn: function(React) {
+      return React.createElement('a', {
+        target: '_self',
+        rel: 'noopener noreferrer',
+        className: 'header-brand',
+        href: '/',
+        style: {
+          display: 'block',
+          textIndent: '-9999px',
+          background: 'url(/svg-file-hosted-at-domain-root.svg)',
+          backgroundSize: 'contain',
+          backgroundRepeat: 'no-repeat',
+          width: '200px',
+        },
+      });
+    },
+  },
   extensions: [],
   showStudyList: true,
   filterQueryParam: false,

docs/latest/viewer/themeing.md

@@ -66,11 +66,11 @@ open to pull requests and discussion issues.
 
 Current white-labeling options are limited. We expose the ability to replace the
 "Logo" section of the application with a custom "Logo" component. You can do
-this by adding a `whiteLabelling` key to your
+this by adding a `whiteLabeling` key to your
 [configuration file](./configuration.md).
 
 ```js
-function RadicalImagingLogo() {
+function RadicalImagingLogo(React) {
   return React.createElement(
     'a',
     {
@@ -83,8 +83,8 @@ function RadicalImagingLogo() {
   );
 }
 
-props.whiteLabelling = {
-  logoComponent: RadicalImagingLogo(),
+props.whiteLabeling = {
+  createLogoComponentFn: RadicalImagingLogo,
 };
 ```
 

docs/latest/yarn.lock

@@ -20,10 +20,10 @@ abbrev@~1.0.9:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
   integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU=
 
-agent-base@4, agent-base@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+agent-base@4, agent-base@^4.1.0, agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
   dependencies:
     es6-promisify "^5.0.0"
 
@@ -773,9 +773,9 @@ err-code@^1.0.0:
     prr "~1.0.1"
 
 es6-promise@^4.0.3:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f"
-  integrity sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
@@ -1289,11 +1289,11 @@ http-signature@~1.2.0:
     sshpk "^1.7.0"
 
 https-proxy-agent@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
   dependencies:
-    agent-base "^4.1.0"
+    agent-base "^4.3.0"
     debug "^3.1.0"
 
 humanize-ms@^1.2.1:
@@ -1807,11 +1807,16 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@^2.0.0, ms@^2.1.1:
+ms@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
+ms@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 mute-stream@~0.0.4:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"

extensions/vtk/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.
 
+## [1.3.14](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.3.13...@ohif/extension-vtk@1.3.14) (2020-04-22)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 ## [1.3.13](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.3.12...@ohif/extension-vtk@1.3.13) (2020-04-17)
 
 **Note:** Version bump only for package @ohif/extension-vtk

extensions/vtk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-vtk",
-  "version": "1.3.13",
+  "version": "1.3.14",
   "description": "OHIF extension for VTK.js",
   "author": "OHIF",
   "license": "MIT",
@@ -53,7 +53,7 @@
     "react-vtkjs-viewport": "^0.8.3"
   },
   "devDependencies": {
-    "@ohif/core": "^2.7.0",
+    "@ohif/core": "^2.7.1",
     "@ohif/ui": "^1.4.3",
     "cornerstone-tools": "4.12.5",
     "cornerstone-wado-image-loader": "^3.0.0",

platform/core/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.7.1](https://github.com/OHIF/Viewers/compare/@ohif/core@2.7.0...@ohif/core@2.7.1) (2020-04-22)
+
+
+### Bug Fixes
+
+* whiteLabeling should support component creation by passing React to defined fn ([#1659](https://github.com/OHIF/Viewers/issues/1659)) ([2093a00](https://github.com/OHIF/Viewers/commit/2093a0036584b2cc698c8f06fe62b334523b1029))
+
+
+
+
+
 # [2.7.0](https://github.com/OHIF/Viewers/compare/@ohif/core@2.6.11...@ohif/core@2.7.0) (2020-04-17)
 
 

platform/core/package.json

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

platform/core/src/classes/MetadataProvider.js

@@ -378,7 +378,7 @@ class MetadataProvider {
         }
 
         metadata = {
-          overlays
+          overlays,
         };
 
         break;

platform/viewer/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.
 
+## [3.9.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.9.1...@ohif/viewer@3.9.2) (2020-04-22)
+
+
+### Bug Fixes
+
+* whiteLabeling should support component creation by passing React to defined fn ([#1659](https://github.com/OHIF/Viewers/issues/1659)) ([2093a00](https://github.com/OHIF/Viewers/commit/2093a0036584b2cc698c8f06fe62b334523b1029))
+
+
+
+
+
+## [3.9.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.9.0...@ohif/viewer@3.9.1) (2020-04-17)
+
+
+### Bug Fixes
+
+* `showStudyList` config ([#1647](https://github.com/OHIF/Viewers/issues/1647)) ([d9fc7bb](https://github.com/OHIF/Viewers/commit/d9fc7bbb0e6d868f507c515f031aaf88a2353e2f))
+
+
+
+
+
 # [3.9.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.8.21...@ohif/viewer@3.9.0) (2020-04-17)
 
 

platform/viewer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohif/viewer",
-  "version": "3.9.0",
+  "version": "3.9.2",
   "description": "OHIF Viewer",
   "author": "OHIF Contributors",
   "license": "MIT",
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@ohif/core": "^2.7.0",
+    "@ohif/core": "^2.7.1",
     "@ohif/extension-cornerstone": "^2.5.2",
     "@ohif/extension-dicom-html": "^1.1.2",
     "@ohif/extension-dicom-microscopy": "^0.50.9",
@@ -57,7 +57,7 @@
     "@ohif/extension-dicom-rt": "^0.0.2",
     "@ohif/extension-dicom-segmentation": "^0.1.2",
     "@ohif/extension-lesion-tracker": "^0.2.0",
-    "@ohif/extension-vtk": "^1.3.13",
+    "@ohif/extension-vtk": "^1.3.14",
     "@ohif/i18n": "^0.52.8",
     "@ohif/ui": "^1.4.3",
     "@tanem/react-nprogress": "^1.1.25",

platform/viewer/public/config/default.js

@@ -1,7 +1,6 @@
 window.config = {
   // default: '/'
   routerBasename: '/',
-  whiteLabelling: {},
   extensions: [],
   showStudyList: true,
   filterQueryParam: false,

platform/viewer/public/config/demo.js

@@ -1,6 +1,5 @@
 window.config = {
   routerBasename: '/',
-  whiteLabelling: {},
   extensions: [],
   showStudyList: true,
   servers: {

platform/viewer/public/config/docker_nginx-orthanc.js

@@ -1,6 +1,5 @@
 window.config = {
   routerBasename: '/',
-  whiteLabelling: {},
   showStudyList: true,
   servers: {
     dicomWeb: [

platform/viewer/public/config/docker_openresty-orthanc-keycloak.js

@@ -1,6 +1,5 @@
 window.config = {
   routerBasename: '/',
-  whiteLabelling: {},
   showStudyList: true,
   servers: {
     // This is an array, but we'll only use the first entry for now

platform/viewer/public/config/docker_openresty-orthanc.js

@@ -1,6 +1,5 @@
 window.config = {
   routerBasename: '/',
-  whiteLabelling: {},
   showStudyList: true,
   servers: {
     // This is an array, but we'll only use the first entry for now

platform/viewer/public/config/google.js

@@ -1,6 +1,5 @@
 window.config = {
   routerBasename: '/',
-  whiteLabelling: {},
   enableGoogleCloudAdapter: true,
   healthcareApiEndpoint: 'https://healthcare.googleapis.com/v1beta1',
   servers: {

platform/viewer/public/config/local_dcm4chee.js

@@ -1,7 +1,6 @@
 window.config = {
   // default: '/'
   routerBasename: '/',
-  whiteLabelling: {},
   // default: ''
   showStudyList: true,
   servers: {

platform/viewer/public/config/netlify.js

@@ -1,6 +1,5 @@
 window.config = {
   routerBasename: '/pwa',
-  whiteLabelling: {},
   showStudyList: true,
   servers: {
     dicomWeb: [

platform/viewer/public/config/public_dicomweb.js

@@ -1,6 +1,5 @@
 window.config = {
   routerBasename: '/',
-  whiteLabelling: {},
   showStudyList: true,
   servers: {
     dicomWeb: [

platform/viewer/src/App.js

@@ -50,7 +50,7 @@ import { getActiveContexts } from './store/layout/selectors.js';
 import store from './store';
 
 /** Contexts */
-import WhiteLabellingContext from './context/WhiteLabellingContext';
+import WhiteLabelingContext from './context/WhiteLabelingContext';
 import UserManagerContext from './context/UserManagerContext';
 import AppContext from './context/AppContext';
 
@@ -77,7 +77,9 @@ class App extends Component {
       PropTypes.shape({
         routerBasename: PropTypes.string.isRequired,
         oidc: PropTypes.array,
-        whiteLabelling: PropTypes.object,
+        whiteLabeling: PropTypes.shape({
+          createLogoComponentFn: PropTypes.func,
+        }),
         extensions: PropTypes.array,
       }),
     ]).isRequired,
@@ -86,7 +88,7 @@ class App extends Component {
 
   static defaultProps = {
     config: {
-      whiteLabelling: {},
+      showStudyList: true,
       oidc: [],
       extensions: [],
     },
@@ -102,10 +104,10 @@ class App extends Component {
     const { config, defaultExtensions } = props;
 
     const appDefaultConfig = {
+      showStudyList: true,
       cornerstoneExtensionConfig: {},
       extensions: [],
       routerBasename: '/',
-      whiteLabelling: {},
     };
 
     this._appConfig = {
@@ -144,7 +146,7 @@ class App extends Component {
   }
 
   render() {
-    const { whiteLabelling, routerBasename } = this._appConfig;
+    const { whiteLabeling, routerBasename } = this._appConfig;
     const {
       UINotificationService,
       UIDialogService,
@@ -160,7 +162,7 @@ class App extends Component {
               <OidcProvider store={store} userManager={this._userManager}>
                 <UserManagerContext.Provider value={this._userManager}>
                   <Router basename={routerBasename}>
-                    <WhiteLabellingContext.Provider value={whiteLabelling}>
+                    <WhiteLabelingContext.Provider value={whiteLabeling}>
                       <SnackbarProvider service={UINotificationService}>
                         <DialogProvider service={UIDialogService}>
                           <ModalProvider
@@ -173,7 +175,7 @@ class App extends Component {
                           </ModalProvider>
                         </DialogProvider>
                       </SnackbarProvider>
-                    </WhiteLabellingContext.Provider>
+                    </WhiteLabelingContext.Provider>
                   </Router>
                 </UserManagerContext.Provider>
               </OidcProvider>
@@ -188,7 +190,7 @@ class App extends Component {
         <Provider store={store}>
           <I18nextProvider i18n={i18n}>
             <Router basename={routerBasename}>
-              <WhiteLabellingContext.Provider value={whiteLabelling}>
+              <WhiteLabelingContext.Provider value={whiteLabeling}>
                 <SnackbarProvider service={UINotificationService}>
                   <DialogProvider service={UIDialogService}>
                     <ModalProvider modal={OHIFModal} service={UIModalService}>
@@ -196,7 +198,7 @@ class App extends Component {
                     </ModalProvider>
                   </DialogProvider>
                 </SnackbarProvider>
-              </WhiteLabellingContext.Provider>
+              </WhiteLabelingContext.Provider>
             </Router>
           </I18nextProvider>
         </Provider>

platform/viewer/src/components/Header/Header.css

@@ -4,8 +4,16 @@
   height: var(--top-bar-height);
 }
 
-.dd-item {
-  width: 100%;
+.header-left-box {
+  display: inline-block;
+  position: relative;
+}
+
+.header-brand {
+  text-decoration: none;
+  height: 30px;
+  float: left;
+  clear: both;
 }
 
 /* Home Page */
@@ -17,35 +25,11 @@
   width: 100%;
 }
 
-.header-left-box {
-  display: inline-block;
-  position: relative;
-}
-
-.header-viewerLink {
-  float: left;
-}
-
-.header-brand {
-  height: 30px;
-  text-decoration: none;
-  float: left;
-  clear: both;
-}
-
 .entry-header.header-big .header-brand {
-  height: auto;
+  height: 50px;
   padding: 0;
 }
 
-.header-logo-image {
-  fill: transparent;
-  height: 100%;
-  margin: 0 8px 0 0;
-  width: 30px;
-  float: left;
-}
-
 .entry-header.header-big .header-logo-image {
   margin-right: 20px;
   width: 50px;
@@ -57,6 +41,24 @@
   height: auto;
 }
 
+/** OTHER STYLES **/
+
+.dd-item {
+  width: 100%;
+}
+
+.header-viewerLink {
+  float: left;
+}
+
+.header-logo-image {
+  fill: transparent;
+  height: 100%;
+  margin: 0 8px 0 0;
+  width: 30px;
+  float: left;
+}
+
 .header-btn {
   color: var(--text-secondary-color);
   cursor: pointer;
@@ -130,13 +132,6 @@
     width: 40%;
   }
 
-  /* Account for notification bar height */
-  .entry-header.header-big .header-brand {
-  }
-
-  .dd-menu {
-  }
-
   /* Toggle Notification Bar */
   .notification-bar {
     display: block;

platform/viewer/src/components/Header/Header.js

@@ -1,30 +1,29 @@
 import React, { useState, useEffect } from 'react';
 import { Link, withRouter } from 'react-router-dom';
 import { withTranslation } from 'react-i18next';
-
 import PropTypes from 'prop-types';
-
+import classNames from 'classnames';
 import { Dropdown, AboutContent, withModal } from '@ohif/ui';
-
+//
 import { UserPreferences } from './../UserPreferences';
 import OHIFLogo from '../OHIFLogo/OHIFLogo.js';
 import './Header.css';
 
-// Context
-import AppContext from './../../context/AppContext';
-
 function Header(props) {
   const {
     t,
     user,
     userManager,
     modal: { show },
-    home,
+    useLargeLogo,
+    linkPath,
+    linkText,
     location,
     children,
   } = props;
 
   const [options, setOptions] = useState([]);
+  const hasLink = linkText && linkPath;
 
   useEffect(() => {
     const optionsValue = [
@@ -61,15 +60,12 @@ function Header(props) {
     setOptions(optionsValue);
   }, [setOptions, show, t, user, userManager]);
 
-  const { appConfig = {} } = AppContext;
-  const showStudyList =
-    appConfig.showStudyList !== undefined ? appConfig.showStudyList : true;
-
-  // ANTD -- Hamburger, Drawer, Menu
   return (
     <>
       <div className="notification-bar">{t('INVESTIGATIONAL USE ONLY')}</div>
-      <div className={`entry-header ${home ? 'header-big' : ''}`}>
+      <div
+        className={classNames('entry-header', { 'header-big': useLargeLogo })}
+      >
         <div className="header-left-box">
           {location && location.studyLink && (
             <Link
@@ -82,15 +78,15 @@ function Header(props) {
 
           {children}
 
-          {showStudyList && !home && (
+          {hasLink && (
             <Link
               className="header-btn header-studyListLinkSection"
               to={{
-                pathname: '/',
+                pathname: linkPath,
                 state: { studyLink: location.pathname },
               }}
             >
-              {t('Study list')}
+              {t(linkText)}
             </Link>
           )}
         </div>
@@ -105,7 +101,11 @@ function Header(props) {
 }
 
 Header.propTypes = {
-  home: PropTypes.bool.isRequired,
+  // Study list, /
+  linkText: PropTypes.string,
+  linkPath: PropTypes.string,
+  useLargeLogo: PropTypes.bool,
+  //
   location: PropTypes.object.isRequired,
   children: PropTypes.node,
   t: PropTypes.func.isRequired,
@@ -115,7 +115,7 @@ Header.propTypes = {
 };
 
 Header.defaultProps = {
-  home: true,
+  useLargeLogo: false,
   children: OHIFLogo(),
 };
 

platform/viewer/src/connectedComponents/Viewer.js

@@ -14,8 +14,9 @@ import SidePanel from './../components/SidePanel.js';
 import { extensionManager } from './../App.js';
 
 // Contexts
-import WhiteLabellingContext from '../context/WhiteLabellingContext.js';
+import WhiteLabelingContext from '../context/WhiteLabelingContext.js';
 import UserManagerContext from '../context/UserManagerContext';
+import AppContext from '../context/AppContext';
 
 import './Viewer.css';
 
@@ -226,17 +227,33 @@ class Viewer extends Component {
     return (
       <>
         {/* HEADER */}
-        <WhiteLabellingContext.Consumer>
-          {whiteLabelling => (
+        <WhiteLabelingContext.Consumer>
+          {whiteLabeling => (
             <UserManagerContext.Consumer>
               {userManager => (
-                <ConnectedHeader home={false} userManager={userManager}>
-                  {whiteLabelling.logoComponent}
-                </ConnectedHeader>
+                <AppContext.Consumer>
+                  {appContext => (
+                    <ConnectedHeader
+                      linkText={
+                        appContext.appConfig.showStudyList
+                          ? 'Study List'
+                          : undefined
+                      }
+                      linkPath={
+                        appContext.appConfig.showStudyList ? '/' : undefined
+                      }
+                      userManager={userManager}
+                    >
+                      {whiteLabeling &&
+                        whiteLabeling.createLogoComponentFn &&
+                        whiteLabeling.createLogoComponentFn(React)}
+                    </ConnectedHeader>
+                  )}
+                </AppContext.Consumer>
               )}
             </UserManagerContext.Consumer>
           )}
-        </WhiteLabellingContext.Consumer>
+        </WhiteLabelingContext.Consumer>
 
         {/* TOOLBAR */}
         <ConnectedToolbarRow
@@ -290,11 +307,11 @@ class Viewer extends Component {
                 activeIndex={this.props.activeViewportIndex}
               />
             ) : (
-                <ConnectedStudyBrowser
-                  studies={this.state.thumbnails}
-                  studyMetadata={this.props.studies}
-                />
-              )}
+              <ConnectedStudyBrowser
+                studies={this.state.thumbnails}
+                studyMetadata={this.props.studies}
+              />
+            )}
           </SidePanel>
 
           {/* MAIN */}
@@ -332,7 +349,7 @@ export default withDialog(Viewer);
  * @param {Study[]} studies
  * @param {DisplaySet[]} studies[].displaySets
  */
-const _mapStudiesToThumbnails = function (studies) {
+const _mapStudiesToThumbnails = function(studies) {
   return studies.map(study => {
     const { StudyInstanceUID } = study;
 

platform/viewer/src/context/WhiteLabelingContext.js

@@ -0,0 +1,10 @@
+import OHIFLogo from '../components/OHIFLogo/OHIFLogo.js';
+import React from 'react';
+
+const defaultContextValues = {
+  createLogoComponentFn: React => OHIFLogo(),
+};
+
+const WhiteLabelingContext = React.createContext(defaultContextValues);
+
+export default WhiteLabelingContext;

platform/viewer/src/context/WhiteLabellingContext.js

@@ -1,10 +0,0 @@
-import OHIFLogo from '../components/OHIFLogo/OHIFLogo.js';
-import React from 'react';
-
-const defaultContextValues = {
-  logoComponent: OHIFLogo(),
-};
-
-const WhiteLabellingContext = React.createContext(defaultContextValues);
-
-export default WhiteLabellingContext;

platform/viewer/src/routes/routesUtil.js

@@ -45,9 +45,7 @@ const ROUTES_DEF = {
       path: ['/studylist', '/'],
       component: StudyListRouting,
       condition: appConfig => {
-        return appConfig.showStudyList !== undefined
-          ? appConfig.showStudyList
-          : true;
+        return appConfig.showStudyList;
       },
     },
     local: {
@@ -72,10 +70,7 @@ const ROUTES_DEF = {
         '/projects/:project/locations/:location/datasets/:dataset/dicomStores/:dicomStore',
       component: StudyListRouting,
       condition: appConfig => {
-        const showList =
-          appConfig.showStudyList !== undefined
-            ? appConfig.showStudyList
-            : true;
+        const showList = appConfig.showStudyList;
 
         return showList && !!appConfig.enableGoogleCloudAdapter;
       },

platform/viewer/src/studylist/StudyListRoute.js

@@ -19,7 +19,7 @@ import filesToStudies from '../lib/filesToStudies.js';
 
 // Contexts
 import UserManagerContext from '../context/UserManagerContext';
-import WhiteLabellingContext from '../context/WhiteLabellingContext';
+import WhiteLabelingContext from '../context/WhiteLabelingContext';
 import AppContext from '../context/AppContext';
 
 const { urlUtil: UrlUtil } = OHIF.utils;
@@ -209,21 +209,23 @@ function StudyListRoute(props) {
         />
       ) : null}
       {healthCareApiWindows}
-      <WhiteLabellingContext.Consumer>
-        {whiteLabelling => (
+      <WhiteLabelingContext.Consumer>
+        {whiteLabeling => (
           <UserManagerContext.Consumer>
             {userManager => (
               <ConnectedHeader
-                home={true}
+                useLargeLogo={true}
                 user={user}
                 userManager={userManager}
               >
-                {whiteLabelling.logoComponent}
+                {whiteLabeling &&
+                  whiteLabeling.createLogoComponentFn &&
+                  whiteLabeling.createLogoComponentFn(React)}
               </ConnectedHeader>
             )}
           </UserManagerContext.Consumer>
         )}
-      </WhiteLabellingContext.Consumer>
+      </WhiteLabelingContext.Consumer>
       <div className="study-list-header">
         <div className="header">
           <h1 style={{ fontWeight: 300, fontSize: '22px' }}>