X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5627bf1a83323d2b0364cb069564998eb8c6ca7a..aafa91ce918b23cff556f73e337ad8fe76ed578a:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index ad77162986..b74329f6f2 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -27,9 +27,18 @@ 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'; +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'; +import { snackbarActions } from "~/store/snackbar/snackbar-actions"; const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev"); const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7); @@ -47,16 +56,26 @@ 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.PROCESS_RESOURCE, processResourceActionSet); +addMenuActionSet(ContextMenuKind.TRASH, trashActionSet); fetchConfig() - .then((config) => { + .then(({ config, apiHost }) => { const history = createBrowserHistory(); - const services = createServices(config); + const services = createServices(config, { + progressFn: (id, working) => { + store.dispatch(progressIndicatorActions.TOGGLE({ id, working })); + }, + errorFn: (id, message) => { + store.dispatch(snackbarActions.OPEN_SNACKBAR({ message })); + } + }); 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) => ; @@ -81,12 +100,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); }