Merge branch 'master'

[arvados-workbench2.git] / src / index.tsx

diff --git a/src/index.tsx b/src/index.tsx
index c950c55727927e98268206e2c1abfae4317bbb37..467aee08dd378915152892fbdcecb67ef4f86c86 100644 (file)
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -12,13 +12,12 @@ import createBrowserHistory from "history/createBrowserHistory";
 import { configureStore } from "./store/store";
 import { ConnectedRouter } from "react-router-redux";
 import { ApiToken } from "./views-components/api-token/api-token";
-import { authActions } from "./store/auth/auth-action";
-import { authService } from "./services/services";
+import { initAuth } from "./store/auth/auth-action";
+import { createServices } from "./services/services";
 import { getProjectList } from "./store/project/project-action";
 import { MuiThemeProvider } from '@material-ui/core/styles';
 import { CustomTheme } from './common/custom-theme';
 import { fetchConfig } from './common/config';
-import { setBaseUrl } from './common/api/server-api';
 import { addMenuActionSet, ContextMenuKind } from "./views-components/context-menu/context-menu";
 import { rootProjectActionSet } from "./views-components/context-menu/action-sets/root-project-action-set";
 import { projectActionSet } from "./views-components/context-menu/action-sets/project-action-set";
@@ -38,14 +37,14 @@ addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet);
 
 fetchConfig()
     .then(config => {
-
-        setBaseUrl(config.API_HOST);
-
         const history = createBrowserHistory();
-        const store = configureStore(history);
+        const services = createServices(config.API_HOST);
+        const store = configureStore(history, services);
+
+        store.dispatch(initAuth());
+        store.dispatch(getProjectList(services.authService.getUuid()));
 
-        store.dispatch(authActions.INIT());
-        store.dispatch<any>(getProjectList(authService.getUuid()));
+        const Token = (props: any) => <ApiToken authService={services.authService} {...props}/>;
 
         const App = () =>
             <MuiThemeProvider theme={CustomTheme}>
@@ -53,7 +52,7 @@ fetchConfig()
                     <ConnectedRouter history={history}>
                         <div>
                             <Route path="/" component={Workbench} />
-                            <Route path="/token" component={ApiToken} />
+                            <Route path="/token" component={Token} />
                         </div>
                     </ConnectedRouter>
                 </Provider>