X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/6fdd4a4d609cf8fa459786f42eb337f8da6a5afa..31e84a9315728c2f58a26bf0e9e1d2b38326fb86:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index aa372fa5..43cfb5fb 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -8,27 +8,26 @@ import { Provider } from "react-redux"; import { MainPanel } from '~/views/main-panel/main-panel'; import '~/index.css'; import { Route, Switch } from 'react-router'; -import createBrowserHistory from "history/createBrowserHistory"; +import { createBrowserHistory } from "history"; import { History } from "history"; import { configureStore, RootStore } from '~/store/store'; import { ConnectedRouter } from "react-router-redux"; import { ApiToken } from "~/views-components/api-token/api-token"; import { AddSession } from "~/views-components/add-session/add-session"; -import { initAuth } from "~/store/auth/auth-action"; +import { initAuth, logout } from "~/store/auth/auth-action"; import { createServices } from "~/services/services"; import { MuiThemeProvider } from '@material-ui/core/styles'; import { CustomTheme } from '~/common/custom-theme'; import { fetchConfig } from '~/common/config'; import { addMenuActionSet, ContextMenuKind } from '~/views-components/context-menu/context-menu'; import { rootProjectActionSet } from "~/views-components/context-menu/action-sets/root-project-action-set"; -import { projectActionSet } from "~/views-components/context-menu/action-sets/project-action-set"; +import { filterGroupActionSet, projectActionSet, readOnlyProjectActionSet } from "~/views-components/context-menu/action-sets/project-action-set"; import { resourceActionSet } from '~/views-components/context-menu/action-sets/resource-action-set'; import { favoriteActionSet } from "~/views-components/context-menu/action-sets/favorite-action-set"; -import { collectionFilesActionSet } from '~/views-components/context-menu/action-sets/collection-files-action-set'; -import { collectionFilesItemActionSet } from '~/views-components/context-menu/action-sets/collection-files-item-action-set'; +import { collectionFilesActionSet, readOnlyCollectionFilesActionSet } from '~/views-components/context-menu/action-sets/collection-files-action-set'; +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 } from '~/views-components/context-menu/action-sets/collection-action-set'; -import { collectionResourceActionSet } from '~/views-components/context-menu/action-sets/collection-resource-action-set'; +import { collectionActionSet, collectionAdminActionSet, oldCollectionVersionActionSet, readOnlyCollectionActionSet } from '~/views-components/context-menu/action-sets/collection-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'; @@ -37,8 +36,8 @@ 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 { setTokenDialogApiHost } from '~/store/token-dialog/token-dialog-actions'; +import { processResourceActionSet, readOnlyProcessResourceActionSet } from '~/views-components/context-menu/action-sets/process-resource-action-set'; import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions'; import { trashedCollectionActionSet } from '~/views-components/context-menu/action-sets/trashed-collection-action-set'; import { setBuildInfo } from '~/store/app-info/app-info-actions'; @@ -58,25 +57,32 @@ import { groupActionSet } from '~/views-components/context-menu/action-sets/grou import { groupMemberActionSet } from '~/views-components/context-menu/action-sets/group-member-action-set'; import { linkActionSet } from '~/views-components/context-menu/action-sets/link-action-set'; import { loadFileViewersConfig } from '~/store/file-viewers/file-viewers-actions'; -import { collectionAdminActionSet } from '~/views-components/context-menu/action-sets/collection-admin-action-set'; import { processResourceAdminActionSet } from '~/views-components/context-menu/action-sets/process-resource-admin-action-set'; -import { projectAdminActionSet } from '~/views-components/context-menu/action-sets/project-admin-action-set'; +import { filterGroupAdminActionSet, 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()}]`); addMenuActionSet(ContextMenuKind.ROOT_PROJECT, rootProjectActionSet); addMenuActionSet(ContextMenuKind.PROJECT, projectActionSet); +addMenuActionSet(ContextMenuKind.READONLY_PROJECT, readOnlyProjectActionSet); +addMenuActionSet(ContextMenuKind.FILTER_GROUP, filterGroupActionSet); addMenuActionSet(ContextMenuKind.RESOURCE, resourceActionSet); addMenuActionSet(ContextMenuKind.FAVORITE, favoriteActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_FILES, collectionFilesActionSet); +addMenuActionSet(ContextMenuKind.READONLY_COLLECTION_FILES, readOnlyCollectionFilesActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_FILES_NOT_SELECTED, collectionFilesNotSelectedActionSet); 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.OLD_VERSION_COLLECTION, oldCollectionVersionActionSet); addMenuActionSet(ContextMenuKind.TRASHED_COLLECTION, trashedCollectionActionSet); addMenuActionSet(ContextMenuKind.PROCESS, processActionSet); addMenuActionSet(ContextMenuKind.PROCESS_RESOURCE, processResourceActionSet); +addMenuActionSet(ContextMenuKind.READONLY_PROCESS_RESOURCE, readOnlyProcessResourceActionSet); addMenuActionSet(ContextMenuKind.TRASH, trashActionSet); addMenuActionSet(ContextMenuKind.REPOSITORY, repositoryActionSet); addMenuActionSet(ContextMenuKind.SSH_KEY, sshKeyActionSet); @@ -91,6 +97,9 @@ addMenuActionSet(ContextMenuKind.GROUP_MEMBER, groupMemberActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_ADMIN, collectionAdminActionSet); addMenuActionSet(ContextMenuKind.PROCESS_ADMIN, processResourceAdminActionSet); addMenuActionSet(ContextMenuKind.PROJECT_ADMIN, projectAdminActionSet); +addMenuActionSet(ContextMenuKind.FILTER_GROUP_ADMIN, filterGroupAdminActionSet); + +storeRedirects(); fetchConfig() .then(({ config, apiHost }) => { @@ -99,29 +108,33 @@ fetchConfig() progressFn: (id, working) => { store.dispatch(progressIndicatorActions.TOGGLE_WORKING({ id, working })); }, - errorFn: (id, error) => { - console.error("Backend error:", error); - if (error.errors) { - store.dispatch(snackbarActions.OPEN_SNACKBAR({ - message: `${error.errors[0]}`, - kind: SnackbarKind.ERROR, - hideDuration: 8000 - })); - } else { - store.dispatch(snackbarActions.OPEN_SNACKBAR({ - message: `${error.message}`, - kind: SnackbarKind.ERROR, - hideDuration: 8000 - })); + errorFn: (id, error, showSnackBar) => { + if (showSnackBar) { + console.error("Backend error:", error); + + if (error.status === 404) { + store.dispatch(openNotFoundDialog()); + } else if (error.status === 401 && error.errors[0].indexOf("Not logged in") > -1) { + store.dispatch(logout()); + } else { + store.dispatch(snackbarActions.OPEN_SNACKBAR({ + message: `${error.errors + ? error.errors[0] + : error.message}`, + kind: SnackbarKind.ERROR, + hideDuration: 8000 + }) + ); + } } } }); - const store = configureStore(history, services); + const store = configureStore(history, services, config); store.subscribe(initListener(history, store, services, config)); store.dispatch(initAuth(config)); store.dispatch(setBuildInfo()); - store.dispatch(setCurrentTokenDialogApiHost(apiHost)); + store.dispatch(setTokenDialogApiHost(apiHost)); store.dispatch(loadVocabulary); store.dispatch(loadFileViewersConfig); @@ -166,5 +179,3 @@ const initListener = (history: History, store: RootStore, services: ServiceRepos } }; }; - -// force build comment #1