X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1d0297e01e0196d63b4fb42573e5bd6d1e1a31b9..0213fdd808604f83ef79d0e0a415d8311e018a2f:/src/views/process-panel/process-panel.tsx diff --git a/src/views/process-panel/process-panel.tsx b/src/views/process-panel/process-panel.tsx index d853fd091d..d3d8caf2de 100644 --- a/src/views/process-panel/process-panel.tsx +++ b/src/views/process-panel/process-panel.tsx @@ -2,35 +2,29 @@ // // SPDX-License-Identifier: AGPL-3.0 -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 } 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'; +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 { ProcessPanelRootDataProps, ProcessPanelRootActionProps, ProcessPanelRoot } from "./process-panel-root"; +import { getProcessPanelCurrentUuid, ProcessPanel as ProcessPanelState } from "store/process-panel/process-panel"; +import { groupBy } from "lodash"; import { loadInputs, loadOutputDefinitions, loadOutputs, toggleProcessPanelFilter, updateOutputParams, - loadNodeJson -} from 'store/process-panel/process-panel-actions'; -import { cancelRunningWorkflow } from 'store/processes/processes-actions'; -import { navigateToLogCollection, setProcessLogsPanelFilter } from 'store/process-logs-panel/process-logs-panel-actions'; -import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; + loadNodeJson, +} from "store/process-panel/process-panel-actions"; +import { cancelRunningWorkflow, resumeOnHoldWorkflow, startWorkflow } from "store/processes/processes-actions"; +import { navigateToLogCollection, setProcessLogsPanelFilter } from "store/process-logs-panel/process-logs-panel-actions"; +import { snackbarActions, SnackbarKind } from "store/snackbar/snackbar-actions"; +import { isProcessCancelable } from "store/processes/process"; const mapStateToProps = ({ router, auth, resources, processPanel, processLogsPanel }: RootState): ProcessPanelRootDataProps => { - const uuid = getProcessPanelCurrentUuid(router) || ''; + const uuid = getProcessPanelCurrentUuid(router) || ""; const subprocesses = getSubprocesses(uuid)(resources); return { process: getProcess(uuid)(resources), @@ -49,38 +43,45 @@ const mapStateToProps = ({ router, auth, resources, processPanel, processLogsPan const mapDispatchToProps = (dispatch: Dispatch): ProcessPanelRootActionProps => ({ onCopyToClipboard: (message: string) => { - dispatch(snackbarActions.OPEN_SNACKBAR({ - message, - hideDuration: 2000, - kind: SnackbarKind.SUCCESS, - })); + dispatch( + snackbarActions.OPEN_SNACKBAR({ + message, + hideDuration: 2000, + kind: SnackbarKind.SUCCESS, + }) + ); }, onContextMenu: (event, process) => { - dispatch(openProcessContextMenu(event, process)); + // dispatch(openProcessContextMenu(event, process)); + if (process && isProcessCancelable(process)) { + dispatch(openRunningProcessContextMenu(event, process)); + } else if (process) { + dispatch(openProcessContextMenu(event, process)); + } }, onToggle: status => { dispatch(toggleProcessPanelFilter(status)); }, - cancelProcess: (uuid) => dispatch(cancelRunningWorkflow(uuid)), - onLogFilterChange: (filter) => dispatch(setProcessLogsPanelFilter(filter.value)), - navigateToLog: (uuid) => dispatch(navigateToLogCollection(uuid)), - loadInputs: (containerRequest) => dispatch(loadInputs(containerRequest)), - loadOutputs: (containerRequest) => dispatch(loadOutputs(containerRequest)), - loadOutputDefinitions: (containerRequest) => dispatch(loadOutputDefinitions(containerRequest)), + cancelProcess: uuid => dispatch(cancelRunningWorkflow(uuid)), + startProcess: uuid => dispatch(startWorkflow(uuid)), + resumeOnHoldWorkflow: uuid => dispatch(resumeOnHoldWorkflow(uuid)), + onLogFilterChange: filter => dispatch(setProcessLogsPanelFilter(filter.value)), + navigateToLog: uuid => dispatch(navigateToLogCollection(uuid)), + loadInputs: containerRequest => dispatch(loadInputs(containerRequest)), + loadOutputs: containerRequest => dispatch(loadOutputs(containerRequest)), + loadOutputDefinitions: containerRequest => dispatch(loadOutputDefinitions(containerRequest)), updateOutputParams: () => dispatch(updateOutputParams()), - loadNodeJson: (containerRequest) => dispatch(loadNodeJson(containerRequest)), + loadNodeJson: containerRequest => dispatch(loadNodeJson(containerRequest)), }); const getFilters = (processPanel: ProcessPanelState, processes: Process[]) => { const grouppedProcesses = groupBy(processes, getProcessStatus); - return Object - .keys(processPanel.filters) - .map(filter => ({ - label: filter, - value: (grouppedProcesses[filter] || []).length, - checked: processPanel.filters[filter], - key: filter, - })); + return Object.keys(processPanel.filters).map(filter => ({ + label: filter, + value: (grouppedProcesses[filter] || []).length, + checked: processPanel.filters[filter], + key: filter, + })); }; export const ProcessPanel = connect(mapStateToProps, mapDispatchToProps)(ProcessPanelRoot);