X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d6d85de50096eb0053d58c5022fd4e949c830929..aa1d8deaccc72c09fab378b19502b20791d16ae6:/src/index.tsx
diff --git a/src/index.tsx b/src/index.tsx
index ecc616629c..a921b47138 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -27,8 +27,14 @@ import { collectionFilesActionSet } from './views-components/context-menu/action
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';
-import { addRouteChangeHandlers } from './routes/routes';
-import { loadWorkbench } from './store/navigation/navigation-action';
+import { processActionSet } from './views-components/context-menu/action-sets/process-action-set';
+import { loadWorkbench } from './store/workbench/workbench-actions';
+import { Routes } from '~/routes/routes';
+import { trashActionSet } from "~/views-components/context-menu/action-sets/trash-action-set";
+import { ServiceRepository } from '~/services/services';
+import { initWebSocket } from '~/websocket/websocket';
+import { Config } from '~/common/config';
+import { addRouteChangeHandlers } from './routes/route-change-handlers';
const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev");
const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7);
@@ -46,15 +52,16 @@ addMenuActionSet(ContextMenuKind.COLLECTION_FILES, collectionFilesActionSet);
addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActionSet);
addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet);
addMenuActionSet(ContextMenuKind.COLLECTION_RESOURCE, collectionResourceActionSet);
+addMenuActionSet(ContextMenuKind.PROCESS, processActionSet);
+addMenuActionSet(ContextMenuKind.TRASH, trashActionSet);
fetchConfig()
- .then(async (config) => {
+ .then((config) => {
const history = createBrowserHistory();
const services = createServices(config);
const store = configureStore(history, services);
- store.subscribe(initListener(history, store));
-
+ store.subscribe(initListener(history, store, services, config));
store.dispatch(initAuth());
const TokenComponent = (props: any) => ;
@@ -65,8 +72,8 @@ fetchConfig()
-
-
+
+
@@ -80,12 +87,13 @@ fetchConfig()
});
-const initListener = (history: History, store: RootStore) => {
+const initListener = (history: History, store: RootStore, services: ServiceRepository, config: Config) => {
let initialized = false;
return async () => {
const { router, auth } = store.getState();
if (router.location && auth.user && !initialized) {
initialized = true;
+ initWebSocket(config, services.authService, store);
await store.dispatch(loadWorkbench());
addRouteChangeHandlers(history, store);
}