Merge branch '13833-edit-project'

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

diff --git a/src/index.tsx b/src/index.tsx
index bf2816dd770de0bc79541470ddd909290ca98d06..cfdbb46cf55882743fd714e7520a9c64884a8d22 100644 (file)
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -12,7 +12,7 @@ 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 { 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';
@@ -23,31 +23,39 @@ import { rootProjectActionSet } from "./views-components/context-menu/action-set
 import { projectActionSet } from "./views-components/context-menu/action-sets/project-action-set";
 import { resourceActionSet } from './views-components/context-menu/action-sets/resource-action-set';
 import { favoriteActionSet } from "./views-components/context-menu/action-sets/favorite-action-set";
+import { collectionFilesActionSet } from './views-components/context-menu/action-sets/collection-files-action-set';
+import { collectionFilesItemActionSet } from './views-components/context-menu/action-sets/collection-files-item-action-set';
+import { collectionActionSet } from './views-components/context-menu/action-sets/collection-action-set';
+import { collectionResourceActionSet } from './views-components/context-menu/action-sets/collection-resource-action-set';
 
 addMenuActionSet(ContextMenuKind.ROOT_PROJECT, rootProjectActionSet);
 addMenuActionSet(ContextMenuKind.PROJECT, projectActionSet);
 addMenuActionSet(ContextMenuKind.RESOURCE, resourceActionSet);
 addMenuActionSet(ContextMenuKind.FAVORITE, favoriteActionSet);
+addMenuActionSet(ContextMenuKind.COLLECTION_FILES, collectionFilesActionSet);
+addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActionSet);
+addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet);
+addMenuActionSet(ContextMenuKind.COLLECTION_RESOURCE, collectionResourceActionSet);
 
 fetchConfig()
     .then(config => {
-
         const history = createBrowserHistory();
-        const services = createServices(config.API_HOST);
+        const services = createServices(config);
         const store = configureStore(history, services);
 
-        store.dispatch(authActions.INIT());
-        store.dispatch<any>(getProjectList(services.authService.getUuid()));
-
-        const Token = (props: any) => <ApiToken authService={services.authService} {...props}/>;
+        store.dispatch(initAuth());
+        store.dispatch(getProjectList(services.authService.getUuid()));
+        
+        const TokenComponent = (props: any) => <ApiToken authService={services.authService} {...props}/>;
+        const WorkbenchComponent = (props: any) => <Workbench authService={services.authService} {...props}/>;
 
         const App = () =>
             <MuiThemeProvider theme={CustomTheme}>
                 <Provider store={store}>
                     <ConnectedRouter history={history}>
                         <div>
-                            <Route path="/" component={Workbench} />
-                            <Route path="/token" component={Token} />
+                            <Route path="/" component={WorkbenchComponent} />
+                            <Route path="/token" component={TokenComponent} />
                         </div>
                     </ConnectedRouter>
                 </Provider>