X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/b6ac7fe88d347582d39fffa002e300af222c578f..1d0297e01e0196d63b4fb42573e5bd6d1e1a31b9:/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 3364a8d6..d853fd09 100644 --- a/src/views/process-panel/process-panel.tsx +++ b/src/views/process-panel/process-panel.tsx @@ -7,42 +7,71 @@ 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 { matchProcessRoute } from 'routes/routes'; -import { ProcessPanelRootDataProps, ProcessPanelRootActionProps, ProcessPanelRoot } from './process-panel-root'; -import { ProcessPanel as ProcessPanelState} from 'store/process-panel/process-panel'; +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, navigateToOutput, openWorkflow } from 'store/process-panel/process-panel-actions'; -import { openProcessInputDialog } from 'store/processes/process-input-actions'; +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'; -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, auth, 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), + processLogsPanel: processLogsPanel, + auth: auth, + inputRaw: processPanel.inputRaw, + inputParams: processPanel.inputParams, + outputRaw: processPanel.outputRaw, + outputDefinitions: processPanel.outputDefinitions, + outputParams: processPanel.outputParams, + nodeInfo: processPanel.nodeInfo, }; }; const mapDispatchToProps = (dispatch: Dispatch): ProcessPanelRootActionProps => ({ + onCopyToClipboard: (message: string) => { + dispatch(snackbarActions.OPEN_SNACKBAR({ + message, + hideDuration: 2000, + kind: SnackbarKind.SUCCESS, + })); + }, 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)) + 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)), + updateOutputParams: () => dispatch(updateOutputParams()), + loadNodeJson: (containerRequest) => dispatch(loadNodeJson(containerRequest)), }); -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) @@ -52,4 +81,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);