X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/1703f15adf9e3875ff0c78ce78117a87b70ca05c..909844cdb1eda3d4cd31f3fa1818ee7eca62d319:/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 b3e36ab7..6dd02c9b 100644 --- a/src/views/process-panel/process-panel.tsx +++ b/src/views/process-panel/process-panel.tsx @@ -2,42 +2,57 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { RootState } from '~/store/store'; +import { RootState } from 'store/store'; import { connect } from 'react-redux'; -import { getProcess, getSubprocesses, Process, getProcessStatus } from '~/store/processes/process'; +import { getProcess, getSubprocesses, Process, getProcessStatus } from 'store/processes/process'; import { Dispatch } from 'redux'; -import { openProcessContextMenu } from '~/store/context-menu/context-menu-actions'; -import { matchProcessRoute } from '~/routes/routes'; -import { ProcessPanelRootDataProps, ProcessPanelRootActionProps, ProcessPanelRoot } from './process-panel-root'; -import { ProcessPanel as ProcessPanelState} from '~/store/process-panel/process-panel'; +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 { toggleProcessPanelFilter } from '~/store/process-panel/process-panel-actions'; +import { + toggleProcessPanelFilter, + navigateToOutput, + openWorkflow +} from 'store/process-panel/process-panel-actions'; +import { openProcessInputDialog } from 'store/processes/process-input-actions'; +import { cancelRunningWorkflow } from 'store/processes/processes-actions'; +import { navigateToLogCollection, setProcessLogsPanelFilter } from 'store/process-logs-panel/process-logs-panel-actions'; -const mapStateToProps = ({ router, resources, processPanel }: RootState): ProcessPanelRootDataProps => { - const pathname = router.location ? router.location.pathname : ''; - const match = matchProcessRoute(pathname); - const uuid = match ? match.params.id : ''; +const mapStateToProps = ({ router, resources, processPanel, processLogsPanel }: RootState): ProcessPanelRootDataProps => { + const uuid = getProcessPanelCurrentUuid(router) || ''; const subprocesses = getSubprocesses(uuid)(resources); return { process: getProcess(uuid)(resources), subprocesses: subprocesses.filter(subprocess => processPanel.filters[getProcessStatus(subprocess)]), filters: getFilters(processPanel, subprocesses), - totalSubprocessesLength: subprocesses.length, + processLogsPanel: processLogsPanel, }; }; const mapDispatchToProps = (dispatch: Dispatch): ProcessPanelRootActionProps => ({ - onContextMenu: event => { - dispatch(openProcessContextMenu(event)); + onContextMenu: (event, process) => { + dispatch(openProcessContextMenu(event, process)); }, onToggle: status => { dispatch(toggleProcessPanelFilter(status)); - } + }, + openProcessInputDialog: (uuid) => dispatch(openProcessInputDialog(uuid)), + navigateToOutput: (uuid) => dispatch(navigateToOutput(uuid)), + navigateToWorkflow: (uuid) => dispatch(openWorkflow(uuid)), + cancelProcess: (uuid) => dispatch(cancelRunningWorkflow(uuid)), + onLogFilterChange: (filter) => dispatch(setProcessLogsPanelFilter(filter.value)), + navigateToLog: (uuid) => dispatch(navigateToLogCollection(uuid)), }); -export const ProcessPanel = connect(mapStateToProps, mapDispatchToProps)(ProcessPanelRoot); - -export const getFilters = (processPanel: ProcessPanelState, processes: Process[]) => { +const getFilters = (processPanel: ProcessPanelState, processes: Process[]) => { const grouppedProcesses = groupBy(processes, getProcessStatus); return Object .keys(processPanel.filters) @@ -47,4 +62,6 @@ export const getFilters = (processPanel: ProcessPanelState, processes: Process[] checked: processPanel.filters[filter], key: filter, })); - }; \ No newline at end of file + }; + +export const ProcessPanel = connect(mapStateToProps, mapDispatchToProps)(ProcessPanelRoot);