X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/66088cabf30c5291ad8894e7009d9c9af466c158..edcdf0ae72c56bf4aa05f93ed2877faa3a5e75c4:/services/workbench2/src/index.tsx diff --git a/services/workbench2/src/index.tsx b/services/workbench2/src/index.tsx index a3f6c1ee79..784d1ffdb0 100644 --- a/services/workbench2/src/index.tsx +++ b/services/workbench2/src/index.tsx @@ -20,7 +20,8 @@ import { MuiThemeProvider } from "@material-ui/core/styles"; import { CustomTheme } from "common/custom-theme"; import { fetchConfig } from "common/config"; import servicesProvider from "common/service-provider"; -import { addMenuActionSet, ContextMenuKind } from "views-components/context-menu/context-menu"; +import { addMenuActionSet } from "views-components/context-menu/context-menu"; +import { ContextMenuKind } from "views-components/context-menu/menu-item-sort"; import { rootProjectActionSet } from "views-components/context-menu/action-sets/root-project-action-set"; import { filterGroupActionSet, @@ -64,7 +65,6 @@ import { runningProcessResourceAdminActionSet, 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"; import { getBuildInfo } from "common/app-info"; @@ -77,6 +77,7 @@ import { keepServiceActionSet } from "views-components/context-menu/action-sets/ import { loadVocabulary } from "store/vocabulary/vocabulary-actions"; import { virtualMachineActionSet } from "views-components/context-menu/action-sets/virtual-machine-action-set"; import { userActionSet } from "views-components/context-menu/action-sets/user-action-set"; +import { UserDetailsActionSet } from "views-components/context-menu/action-sets/user-details-action-set"; import { apiClientAuthorizationActionSet } from "views-components/context-menu/action-sets/api-client-authorization-action-set"; import { groupActionSet } from "views-components/context-menu/action-sets/group-action-set"; import { groupMemberActionSet } from "views-components/context-menu/action-sets/group-member-action-set"; @@ -89,11 +90,12 @@ import { } from "views-components/context-menu/action-sets/project-admin-action-set"; import { permissionEditActionSet } from "views-components/context-menu/action-sets/permission-edit-action-set"; import { workflowActionSet, readOnlyWorkflowActionSet } from "views-components/context-menu/action-sets/workflow-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"; import { searchResultsActionSet } from "views-components/context-menu/action-sets/search-results-action-set"; +import 'bootstrap/dist/css/bootstrap.min.css'; +import '@coreui/coreui/dist/css/coreui.min.css'; + console.log(`Starting arvados [${getBuildInfo()}]`); addMenuActionSet(ContextMenuKind.ROOT_PROJECT, rootProjectActionSet); @@ -124,6 +126,7 @@ addMenuActionSet(ContextMenuKind.SSH_KEY, sshKeyActionSet); addMenuActionSet(ContextMenuKind.VIRTUAL_MACHINE, virtualMachineActionSet); addMenuActionSet(ContextMenuKind.KEEP_SERVICE, keepServiceActionSet); addMenuActionSet(ContextMenuKind.USER, userActionSet); +addMenuActionSet(ContextMenuKind.USER_DETAILS, UserDetailsActionSet); addMenuActionSet(ContextMenuKind.LINK, linkActionSet); addMenuActionSet(ContextMenuKind.API_CLIENT_AUTHORIZATION, apiClientAuthorizationActionSet); addMenuActionSet(ContextMenuKind.GROUPS, groupActionSet); @@ -153,25 +156,13 @@ fetchConfig().then(({ config, apiHost }) => { const services = createServices(config, { progressFn: (id, working) => { - //store.dispatch(progressIndicatorActions.TOGGLE_WORKING({ id, working })); }, errorFn: (id, error, showSnackBar: boolean) => { 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) { + if (error.status === 401 && error.errors[0].indexOf("Not logged in") > -1) { // Catch auth errors when navigating and redirect to login preserving url location store.dispatch(logout(false, true)); - } else { - store.dispatch( - snackbarActions.OPEN_SNACKBAR({ - message: `${error.errors ? error.errors[0] : error.message}`, - kind: SnackbarKind.ERROR, - hideDuration: 8000, - }) - ); } } },