X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/88ce683068f65862b3b5e753e55989902be5f1a9..a950096809e19f48ec006651227222d60e4fa86c:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index 6137e26dd9..8ab089a89f 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -28,10 +28,14 @@ import { collectionFilesItemActionSet } from './views-components/context-menu/ac 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 { processActionSet } from './views-components/context-menu/action-sets/process-action-set'; -import { addRouteChangeHandlers } from './routes/routes'; 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'; +import { processResourceActionSet } from './views-components/context-menu/action-sets/process-resource-action-set'; const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev"); const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7); @@ -50,6 +54,7 @@ addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActio addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_RESOURCE, collectionResourceActionSet); addMenuActionSet(ContextMenuKind.PROCESS, processActionSet); +addMenuActionSet(ContextMenuKind.PROCESS_RESOURCE, processResourceActionSet); addMenuActionSet(ContextMenuKind.TRASH, trashActionSet); fetchConfig() @@ -58,8 +63,7 @@ fetchConfig() 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) => ; @@ -85,12 +89,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); }