From e292bca92ed440efa23ac5697690cd5eefffc293 Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Thu, 7 May 2020 14:05:03 -0400
Subject: [PATCH] Add support for route definition generation in appInit from
 modes config

---
 platform/viewer/src/App.js     |  6 ++++--
 platform/viewer/src/appInit.js | 17 ++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/platform/viewer/src/App.js b/platform/viewer/src/App.js
index 3e425dd97..c15c8a317 100644
--- a/platform/viewer/src/App.js
+++ b/platform/viewer/src/App.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { BrowserRouter, HashRouter } from 'react-router-dom';
 import { ThemeWrapper } from '@ohif/ui';
 // Viewer Project
-import routes from './routes';
+import createRoutes from './routes';
 import appInit from './appInit.js';
 
 /**
@@ -20,14 +20,16 @@ function App({ config, defaultExtensions }) {
     commandsManager,
     extensionManager,
     servicesManager,
+    appRoutes,
   } = appInit(config, defaultExtensions);
 
+  console.log(appRoutes);
   // TODO: Expose configuration w/ context?
   // See: `setConfiguration` in master
 
   return (
     <Router basename={appConfig.routerBasename}>
-      <ThemeWrapper>{routes()}</ThemeWrapper>
+      <ThemeWrapper>{createRoutes(appRoutes)}</ThemeWrapper>
     </Router>
   );
 }
diff --git a/platform/viewer/src/appInit.js b/platform/viewer/src/appInit.js
index a50d13782..0d612d6ed 100644
--- a/platform/viewer/src/appInit.js
+++ b/platform/viewer/src/appInit.js
@@ -20,15 +20,16 @@ import buildModeRoutes from './routes/buildModeRoutes';
 function appInit(appConfigOrFunc, defaultExtensions) {
   const appConfig = {
     ...(typeof appConfigOrFunc === 'function'
-      ? config({ servicesManager })
+      ? appConfigOrFunc({ servicesManager })
       : appConfigOrFunc),
   };
 
+  // TODO: Wire this up to Rodrigo's basic Context "ContextService"
   const commandsManagerConfig = {
     /** Used by commands to inject `viewports` from "redux" */
-    getAppState: () => store.getState(),
+    getAppState: () => {},
     /** Used by commands to determine active context */
-    getActiveContexts: () => getActiveContexts(store.getState()),
+    getActiveContexts: () => ['VIEWER', 'ACTIVE_VIEWPORT::CORNERSTONE'],
   };
   const commandsManager = new CommandsManager(commandsManagerConfig);
   const servicesManager = new ServicesManager();
@@ -37,12 +38,6 @@ function appInit(appConfigOrFunc, defaultExtensions) {
     commandsManager,
     servicesManager,
     appConfig,
-    api: {
-      contexts: CONTEXTS,
-      hooks: {
-        useAppContext,
-      },
-    },
   });
 
   servicesManager.registerServices([
@@ -69,14 +64,14 @@ function appInit(appConfigOrFunc, defaultExtensions) {
 
   const { modes } = appConfig;
 
-  const routes = buildModeRoutes(modes, extensionManager);
+  const appRoutes = buildModeRoutes(modes, extensionManager) || [];
 
   return {
     appConfig,
     commandsManager,
     extensionManager,
     servicesManager,
-    routes,
+    appRoutes,
   };
 }