Using appContext in DataSourceWrapper and createRoutes

platform/viewer/src/routes/DataSourceWrapper.jsx

@@ -1,9 +1,10 @@
 /* eslint-disable react/jsx-props-no-spreading */
-import React, { useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { MODULE_TYPES } from '@ohif/core';
 //
-import { appConfig, extensionManager } from '../App.jsx';
+import { appConfigContext } from '../state/appConfig.context';
+import { extensionManager } from '../App.jsx';
 
 /**
  * Uses route properties to determine the data source that should be passed
@@ -14,6 +15,7 @@ import { appConfig, extensionManager } from '../App.jsx';
  * @param {function} props.children - Layout Template React Component
  */
 function DataSourceWrapper(props) {
+  const { appConfig } = useContext(appConfigContext);
   const { children: LayoutTemplate, history, ...rest } = props;
   const queryFilterValues = _getQueryFilterValues(history.location.search);
 

platform/viewer/src/routes/index.js

@@ -7,6 +7,7 @@ import NotFound from './NotFound';
 import buildModeRoutes from './buildModeRoutes';
 
 // TODO: Make these configurable
+// TODO: Include "routes" debug route if dev build
 const bakedInRoutes = [
   // WORK LIST
   {
@@ -19,16 +20,13 @@ const bakedInRoutes = [
   { component: NotFound },
 ];
 
-const createRoutes = (modes, dataSources, extensionManager, t, t2) => {
-  console.log('Creating Routes: ', routes, bakedInRoutes);
-  console.log(modes, dataSources, extensionManager, t, t2);
-  if (!modes.length) {
-    modes.push(window.exampleMode);
-  }
+const createRoutes = (modes, dataSources, extensionManager) => {
   const routes = buildModeRoutes(modes, dataSources, extensionManager) || [];
   // TODO: Shouldn't need to guard input routes with an empty array?
   const allRoutes = [...(routes || []), ...bakedInRoutes];
 
+  console.log('Creating Routes: ', modes, dataSources, routes, bakedInRoutes, allRoutes);
+
   return (
     <Switch>
       {allRoutes.map((route, i) => {