X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/88ce683068f65862b3b5e753e55989902be5f1a9..6f8e509988756deb7e05a760e718d1ade164fd19:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index 6137e26dd9..2fb236d011 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -28,10 +28,16 @@ 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 { setCurrentTokenDialogApiHost } from '~/store/current-token-dialog/current-token-dialog-actions'; +import { processResourceActionSet } from './views-components/context-menu/action-sets/process-resource-action-set'; +import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions'; const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev"); const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7); @@ -50,17 +56,20 @@ 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() - .then((config) => { + .then(({ config, apiHost }) => { const history = createBrowserHistory(); - const services = createServices(config); + const services = createServices(config, (id, working) => { + store.dispatch(progressIndicatorActions.TOGGLE({ id, working })); + }); const store = configureStore(history, services); - store.subscribe(initListener(history, store)); - + store.subscribe(initListener(history, store, services, config)); store.dispatch(initAuth()); + store.dispatch(setCurrentTokenDialogApiHost(apiHost)); const TokenComponent = (props: any) => ; const WorkbenchComponent = (props: any) => ; @@ -85,12 +94,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); }