X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0213fdd808604f83ef79d0e0a415d8311e018a2f..79b9d798b16384d7429124ab99ff5bf54ec36411:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index 9339391ef0..ede257dc5d 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -30,7 +30,12 @@ import { } 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, readOnlyCollectionFilesActionSet } from "views-components/context-menu/action-sets/collection-files-action-set"; +import { + collectionFilesActionSet, + collectionFilesMultipleActionSet, + readOnlyCollectionFilesActionSet, + readOnlyCollectionFilesMultipleActionSet, +} from "views-components/context-menu/action-sets/collection-files-action-set"; import { collectionDirectoryItemActionSet, collectionFileItemActionSet, @@ -56,9 +61,9 @@ import { processResourceActionSet, runningProcessResourceActionSet, processResourceAdminActionSet, + 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"; @@ -82,9 +87,7 @@ import { projectAdminActionSet, } 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 } 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 { workflowActionSet, readOnlyWorkflowActionSet } from "views-components/context-menu/action-sets/workflow-action-set"; import { storeRedirects } from "./common/redirect-to"; import { searchResultsActionSet } from "views-components/context-menu/action-sets/search-results-action-set"; @@ -97,7 +100,9 @@ addMenuActionSet(ContextMenuKind.FILTER_GROUP, filterGroupActionSet); addMenuActionSet(ContextMenuKind.RESOURCE, resourceActionSet); addMenuActionSet(ContextMenuKind.FAVORITE, favoriteActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_FILES, collectionFilesActionSet); +addMenuActionSet(ContextMenuKind.COLLECTION_FILES_MULTIPLE, collectionFilesMultipleActionSet); addMenuActionSet(ContextMenuKind.READONLY_COLLECTION_FILES, readOnlyCollectionFilesActionSet); +addMenuActionSet(ContextMenuKind.READONLY_COLLECTION_FILES_MULTIPLE, readOnlyCollectionFilesMultipleActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_FILES_NOT_SELECTED, collectionFilesNotSelectedActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_DIRECTORY_ITEM, collectionDirectoryItemActionSet); addMenuActionSet(ContextMenuKind.READONLY_COLLECTION_DIRECTORY_ITEM, readOnlyCollectionDirectoryItemActionSet); @@ -122,11 +127,13 @@ addMenuActionSet(ContextMenuKind.GROUPS, groupActionSet); addMenuActionSet(ContextMenuKind.GROUP_MEMBER, groupMemberActionSet); addMenuActionSet(ContextMenuKind.COLLECTION_ADMIN, collectionAdminActionSet); addMenuActionSet(ContextMenuKind.PROCESS_ADMIN, processResourceAdminActionSet); +addMenuActionSet(ContextMenuKind.RUNNING_PROCESS_ADMIN, runningProcessResourceAdminActionSet); addMenuActionSet(ContextMenuKind.PROJECT_ADMIN, projectAdminActionSet); addMenuActionSet(ContextMenuKind.FROZEN_PROJECT, frozenActionSet); addMenuActionSet(ContextMenuKind.FROZEN_PROJECT_ADMIN, frozenAdminActionSet); addMenuActionSet(ContextMenuKind.FILTER_GROUP_ADMIN, filterGroupAdminActionSet); addMenuActionSet(ContextMenuKind.PERMISSION_EDIT, permissionEditActionSet); +addMenuActionSet(ContextMenuKind.READONLY_WORKFLOW, readOnlyWorkflowActionSet); addMenuActionSet(ContextMenuKind.WORKFLOW, workflowActionSet); addMenuActionSet(ContextMenuKind.SEARCH_RESULTS, searchResultsActionSet); @@ -143,25 +150,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, - }) - ); } } },