X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/c276ce4c8dd3cf27ad6d17eca9af473f353fda55..4b8cc1acf54add3e4337b27a7e957a84dc9c07b4:/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 9f1d0adb..4f283a6c 100644 --- a/src/views/process-panel/process-panel.tsx +++ b/src/views/process-panel/process-panel.tsx @@ -2,29 +2,49 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; import { RootState } from '~/store/store'; import { connect } from 'react-redux'; -import { getProcess, getSubprocesses } 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 { groupBy } from 'lodash'; +import { toggleProcessPanelFilter } from '~/store/process-panel/process-panel-actions'; -const mapStateToProps = ({ router, resources }: RootState): ProcessPanelRootDataProps => { +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 subprocesses = getSubprocesses(uuid)(resources); return { process: getProcess(uuid)(resources), - subprocesses: getSubprocesses(uuid)(resources) + subprocesses: subprocesses.filter(subprocess => processPanel.filters[getProcessStatus(subprocess)]), + filters: getFilters(processPanel, subprocesses), + totalSubprocessesLength: subprocesses.length, }; }; const mapDispatchToProps = (dispatch: Dispatch): ProcessPanelRootActionProps => ({ - onContextMenu: (event: React.MouseEvent) => { - dispatch(openProcessContextMenu(event)); + onContextMenu: (event, process) => { + dispatch(openProcessContextMenu(event, process)); + }, + onToggle: status => { + dispatch(toggleProcessPanelFilter(status)); } }); export const ProcessPanel = connect(mapStateToProps, mapDispatchToProps)(ProcessPanelRoot); + +export 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, + })); + }; \ No newline at end of file