X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/202a49e579c8ba643f6bc7f2bcb55fcf57d12eb8..6528692d3b49adaa03934fd059b8fec52c0bd0b1:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index 0a51ed3c..569656d9 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -28,7 +28,6 @@ import { collectionFilesActionSet, readOnlyCollectionFilesActionSet } from '~/vi import { collectionFilesItemActionSet, readOnlyCollectionFilesItemActionSet } from '~/views-components/context-menu/action-sets/collection-files-item-action-set'; import { collectionFilesNotSelectedActionSet } from '~/views-components/context-menu/action-sets/collection-files-not-selected-action-set'; import { collectionActionSet, readOnlyCollectionActionSet } 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 { loadWorkbench } from '~/store/workbench/workbench-actions'; import { Routes } from '~/routes/routes'; @@ -63,6 +62,7 @@ import { processResourceAdminActionSet } from '~/views-components/context-menu/a import { projectAdminActionSet } from '~/views-components/context-menu/action-sets/project-admin-action-set'; import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions"; import { openNotFoundDialog } from './store/not-found-panel/not-found-panel-action'; +import { storeRedirects } from './common/redirect-to'; console.log(`Starting arvados [${getBuildInfo()}]`); @@ -77,7 +77,6 @@ addMenuActionSet(ContextMenuKind.COLLECTION_FILES_NOT_SELECTED, collectionFilesN addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActionSet); addMenuActionSet(ContextMenuKind.READONLY_COLLECTION_FILES_ITEM, readOnlyCollectionFilesItemActionSet); addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet); -addMenuActionSet(ContextMenuKind.COLLECTION_RESOURCE, collectionResourceActionSet); addMenuActionSet(ContextMenuKind.READONLY_COLLECTION, readOnlyCollectionActionSet); addMenuActionSet(ContextMenuKind.TRASHED_COLLECTION, trashedCollectionActionSet); addMenuActionSet(ContextMenuKind.PROCESS, processActionSet); @@ -97,6 +96,8 @@ addMenuActionSet(ContextMenuKind.COLLECTION_ADMIN, collectionAdminActionSet); addMenuActionSet(ContextMenuKind.PROCESS_ADMIN, processResourceAdminActionSet); addMenuActionSet(ContextMenuKind.PROJECT_ADMIN, projectAdminActionSet); +storeRedirects(); + fetchConfig() .then(({ config, apiHost }) => { const history = createBrowserHistory(); @@ -124,7 +125,7 @@ fetchConfig() } } }); - const store = configureStore(history, services); + const store = configureStore(history, services, config); store.subscribe(initListener(history, store, services, config)); store.dispatch(initAuth(config));