X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cdc8a73914399a401642ca553e9d3d8b2d42db5c..f9dea751e6f0143195a7b5614217ec04c94376bd:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index d3115a6754..a921b47138 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -28,9 +28,13 @@ 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'; const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev"); const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7); @@ -49,6 +53,7 @@ addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActio addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_RESOURCE, collectionResourceActionSet); addMenuActionSet(ContextMenuKind.PROCESS, processActionSet); +addMenuActionSet(ContextMenuKind.TRASH, trashActionSet); fetchConfig() .then((config) => { @@ -56,8 +61,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) => ; @@ -83,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); }