From: Lisa Knox Date: Thu, 19 Oct 2023 20:27:36 +0000 (-0400) Subject: 20382: removed openRunningContextMenu and related code Arvados-DCO-1.1-Signed-off... X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/23064a8e0ced7fb43269434e73d553c0338fd6b8?hp=92eefe98ca9631ee971881fc46f8a1829ac897b9 20382: removed openRunningContextMenu and related code Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- diff --git a/src/store/context-menu/context-menu-actions.ts b/src/store/context-menu/context-menu-actions.ts index 18845ace76..464314877f 100644 --- a/src/store/context-menu/context-menu-actions.ts +++ b/src/store/context-menu/context-menu-actions.ts @@ -215,31 +215,12 @@ export const openProcessContextMenu = (event: React.MouseEvent, pro description: res.description, outputUuid: res.outputUuid || "", workflowUuid: res.properties.template_uuid || "", - menuKind: ContextMenuKind.PROCESS_RESOURCE, + menuKind: isProcessCancelable(process) ? ContextMenuKind.RUNNING_PROCESS_RESOURCE : ContextMenuKind.PROCESS_RESOURCE }) ); } }; -export const openRunningProcessContextMenu = - (event: React.MouseEvent, process: Process) => (dispatch: Dispatch, getState: () => RootState) => { - const res = getResource(process.containerRequest.uuid)(getState().resources); - if (res) { - dispatch( - openContextMenu(event, { - uuid: res.uuid, - ownerUuid: res.ownerUuid, - kind: ResourceKind.PROCESS, - name: res.name, - description: res.description, - outputUuid: res.outputUuid || "", - workflowUuid: res.properties.template_uuid || "", - menuKind: ContextMenuKind.RUNNING_PROCESS_RESOURCE, - }) - ); - } - }; - export const openPermissionEditContextMenu = (event: React.MouseEvent, link: LinkResource) => (dispatch: Dispatch, getState: () => RootState) => { if (link) { diff --git a/src/views-components/context-menu/action-sets/process-resource-action-set.ts b/src/views-components/context-menu/action-sets/process-resource-action-set.ts index 7d85518d2d..6db875f2b2 100644 --- a/src/views-components/context-menu/action-sets/process-resource-action-set.ts +++ b/src/views-components/context-menu/action-sets/process-resource-action-set.ts @@ -122,8 +122,8 @@ export const runningProcessResourceActionSet = [ { name: "CANCEL", icon: StopIcon, - execute: (dispatch, resource) => { - dispatch(cancelRunningWorkflow(resource.uuid)); + execute: (dispatch, resources) => { + dispatch(cancelRunningWorkflow(resources[0].uuid)); }, }, ], diff --git a/src/views/all-processes-panel/all-processes-panel.tsx b/src/views/all-processes-panel/all-processes-panel.tsx index 6d612e752d..ee53f99c3f 100644 --- a/src/views/all-processes-panel/all-processes-panel.tsx +++ b/src/views/all-processes-panel/all-processes-panel.tsx @@ -22,14 +22,14 @@ import { ResourceCreatedAtDate, } from "views-components/data-explorer/renderers"; import { ProcessIcon } from "components/icon/icon"; -import { openProcessContextMenu, openRunningProcessContextMenu } from "store/context-menu/context-menu-actions"; +import { openProcessContextMenu } from "store/context-menu/context-menu-actions"; import { loadDetailsPanel } from "store/details-panel/details-panel-action"; import { navigateTo } from "store/navigation/navigation-action"; import { ContainerRequestResource, ContainerRequestState } from "models/container-request"; import { RootState } from "store/store"; import { createTree } from "models/tree"; import { getInitialProcessStatusFilters, getInitialProcessTypeFilters } from "store/resource-type-filters/resource-type-filters"; -import { getProcess, isProcessCancelable } from "store/processes/process"; +import { getProcess } from "store/processes/process"; import { ResourcesState } from "store/resources/resources"; type CssRules = "toolbar" | "button" | "root"; @@ -132,9 +132,7 @@ export const AllProcessesPanel = withStyles(styles)( class extends React.Component { handleContextMenu = (event: React.MouseEvent, resourceUuid: string) => { const process = getProcess(resourceUuid)(this.props.resources); - if (process && isProcessCancelable(process)) { - this.props.dispatch(openRunningProcessContextMenu(event, process)); - } else if (process) { + if (process) { this.props.dispatch(openProcessContextMenu(event, process)); } this.props.dispatch(loadDetailsPanel(resourceUuid)); diff --git a/src/views/process-panel/process-panel.tsx b/src/views/process-panel/process-panel.tsx index 6c1d4a7116..4a6b5fd333 100644 --- a/src/views/process-panel/process-panel.tsx +++ b/src/views/process-panel/process-panel.tsx @@ -6,7 +6,7 @@ import { RootState } from "store/store"; import { connect } from "react-redux"; import { getProcess, getSubprocesses, Process, getProcessStatus } from "store/processes/process"; import { Dispatch } from "redux"; -import { openProcessContextMenu, openRunningProcessContextMenu } from "store/context-menu/context-menu-actions"; +import { openProcessContextMenu } from "store/context-menu/context-menu-actions"; import { ProcessPanelRootDataProps, ProcessPanelRootActionProps, ProcessPanelRoot } from "./process-panel-root"; import { getProcessPanelCurrentUuid, ProcessPanel as ProcessPanelState } from "store/process-panel/process-panel"; import { groupBy } from "lodash"; @@ -19,7 +19,6 @@ import { loadNodeJson, } from "store/process-panel/process-panel-actions"; import { cancelRunningWorkflow, resumeOnHoldWorkflow, startWorkflow } from "store/processes/processes-actions"; -import { isProcessCancelable } from "store/processes/process"; import { navigateToLogCollection, pollProcessLogs, setProcessLogsPanelFilter } from "store/process-logs-panel/process-logs-panel-actions"; import { snackbarActions, SnackbarKind } from "store/snackbar/snackbar-actions"; @@ -52,10 +51,7 @@ const mapDispatchToProps = (dispatch: Dispatch): ProcessPanelRootActionProps => ); }, onContextMenu: (event, process) => { - // dispatch(openProcessContextMenu(event, process)); - if (process && isProcessCancelable(process)) { - dispatch(openRunningProcessContextMenu(event, process)); - } else if (process) { + if (process) { dispatch(openProcessContextMenu(event, process)); } }, diff --git a/src/views/subprocess-panel/subprocess-panel.tsx b/src/views/subprocess-panel/subprocess-panel.tsx index 9ab069b6ca..0aa02d5270 100644 --- a/src/views/subprocess-panel/subprocess-panel.tsx +++ b/src/views/subprocess-panel/subprocess-panel.tsx @@ -4,20 +4,17 @@ import { Dispatch } from "redux"; import { connect } from "react-redux"; -import { openProcessContextMenu, openRunningProcessContextMenu } from "store/context-menu/context-menu-actions"; +import { openProcessContextMenu } from "store/context-menu/context-menu-actions"; import { SubprocessPanelRoot, SubprocessPanelActionProps, SubprocessPanelDataProps } from "views/subprocess-panel/subprocess-panel-root"; import { RootState } from "store/store"; import { navigateTo } from "store/navigation/navigation-action"; import { loadDetailsPanel } from "store/details-panel/details-panel-action"; import { getProcess } from "store/processes/process"; -import { isProcessCancelable } from "store/processes/process"; const mapDispatchToProps = (dispatch: Dispatch): SubprocessPanelActionProps => ({ onContextMenu: (event, resourceUuid, resources) => { const process = getProcess(resourceUuid)(resources); - if (process && isProcessCancelable(process)) { - dispatch(openRunningProcessContextMenu(event, process)); - } else if (process) { + if (process) { dispatch(openProcessContextMenu(event, process)); } },