From 3e201d3ca01fac1f06f9a4d78b3a729a8ee09866 Mon Sep 17 00:00:00 2001
From: Jake McDermott <yo@jakemcdermott.me>
Date: Thu, 3 Jan 2019 09:37:02 -0500
Subject: [PATCH] add config pass-through to inline render

---
 src/App.jsx   | 31 ++++++++++++++++++-------------
 src/index.jsx |  6 +++---
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index 04ca8c740f..e0e162e07b 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -24,9 +24,11 @@ class App extends Component {
 
     this.state = {
       ansible_version: null,
-      version: null,
+      custom_virtualenvs: null,
       isAboutModalOpen: false,
       isNavOpen,
+      version: null,
+
     };
 
     this.fetchConfig = this.fetchConfig.bind(this);
@@ -41,6 +43,17 @@ class App extends Component {
     this.fetchConfig();
   }
 
+  async fetchConfig () {
+    const { api } = this.props;
+
+    try {
+      const { data: { ansible_version, custom_virtualenvs, version } } = await api.getConfig();
+      this.setState({ ansible_version, custom_virtualenvs, version });
+    } catch (err) {
+      this.setState({ ansible_version: null, custom_virtualenvs: null, version: null });
+    }
+  }
+
   async onLogout () {
     const { api } = this.props;
 
@@ -48,17 +61,6 @@ class App extends Component {
     window.location.replace('/#/login')
   }
 
-  async fetchConfig () {
-    const { api } = this.props;
-
-    try {
-      const { data: { ansible_version, version } } = await api.getConfig();
-      this.setState({ ansible_version, version });
-    } catch (err) {
-      this.setState({ ansible_version: null, version: null });
-    }
-  }
-
   onAboutModalOpen () {
     this.setState({ isAboutModalOpen: true });
   }
@@ -78,10 +80,12 @@ class App extends Component {
   render () {
     const {
       ansible_version,
+      custom_virtualenvs,
       isAboutModalOpen,
       isNavOpen,
       version,
     } = this.state;
+
     const {
       render,
       routeGroups = [],
@@ -90,6 +94,7 @@ class App extends Component {
 
     const config = {
       ansible_version,
+      custom_virtualenvs,
       version,
     };
 
@@ -134,7 +139,7 @@ class App extends Component {
           }
         >
           <ConfigContext.Provider value={config}>
-            { render ? render({ routeGroups }) : '' }
+            {render && render({ routeGroups, config })}
           </ConfigContext.Provider>
         </Page>
         <About
diff --git a/src/index.jsx b/src/index.jsx
index b5f1ff6168..470b3d54fb 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -73,8 +73,7 @@ const catalogs = { en, ja };
 export async function main (render, api) {
   const el = document.getElementById('app');
   // fetch additional config from server
-  const { data } = await api.getRoot();
-  const { custom_logo, custom_login_info } = data;
+  const { data: { custom_logo, custom_login_info } } = await api.getRoot();
 
   const loginRoutes = (
     <Switch>
@@ -252,7 +251,7 @@ export async function main (render, api) {
                             ],
                           },
                         ]}
-                        render={({ routeGroups }) => (
+                        render={({ routeGroups, config }) => (
                           routeGroups
                             .reduce((allRoutes, { routes }) => allRoutes.concat(routes), [])
                             .map(({ component: PageComponent, path }) => (
@@ -263,6 +262,7 @@ export async function main (render, api) {
                                   <PageComponent
                                     api={api}
                                     match={match}
+                                    {...config}
                                   />
                                 )}
                               />