From 08fb41e26f7227e85c56faf833918e94ebf8531e Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Thu, 23 Jan 2020 14:23:55 -0300 Subject: [PATCH] 15012: Shows process context menu on all_process page items. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- .../all-processes-panel.tsx | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/views/all-processes-panel/all-processes-panel.tsx b/src/views/all-processes-panel/all-processes-panel.tsx index fcb8dbb7..650a0d95 100644 --- a/src/views/all-processes-panel/all-processes-panel.tsx +++ b/src/views/all-processes-panel/all-processes-panel.tsx @@ -22,7 +22,7 @@ import { ResourceCreatedAtDate } from '~/views-components/data-explorer/renderers'; import { ProcessIcon } from '~/components/icon/icon'; -import { openContextMenu, resourceKindToContextMenuKind } 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 { ContainerRequestState } from "~/models/container-request"; @@ -30,6 +30,8 @@ import { RootState } from '~/store/store'; import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view'; import { createTree } from '~/models/tree'; import { getInitialProcessStatusFilters, getInitialProcessTypeFilters } from '~/store/resource-type-filters/resource-type-filters'; +import { getProcess } from '~/store/processes/process'; +import { ResourcesState } from '~/store/resources/resources'; type CssRules = "toolbar" | "button"; @@ -105,7 +107,7 @@ export const allProcessesPanelColumns: DataColumns = [ ]; interface AllProcessesPanelDataProps { - isAdmin: boolean; + resources: ResourcesState; } interface AllProcessesPanelActionProps { @@ -114,7 +116,7 @@ interface AllProcessesPanelActionProps { onItemDoubleClick: (item: string) => void; } const mapStateToProps = (state : RootState): AllProcessesPanelDataProps => ({ - isAdmin: state.auth.user!.isAdmin + resources: state.resources }); type AllProcessesPanelProps = AllProcessesPanelDataProps & AllProcessesPanelActionProps & DispatchProp @@ -124,15 +126,9 @@ export const AllProcessesPanel = withStyles(styles)( connect(mapStateToProps)( class extends React.Component { handleContextMenu = (event: React.MouseEvent, resourceUuid: string) => { - const menuKind = resourceKindToContextMenuKind(resourceUuid, this.props.isAdmin); - if (menuKind) { - this.props.dispatch(openContextMenu(event, { - name: '', - uuid: resourceUuid, - ownerUuid: '', - kind: ResourceKind.NONE, - menuKind - })); + const process = getProcess(resourceUuid)(this.props.resources); + if (process) { + this.props.dispatch(openProcessContextMenu(event, process)); } this.props.dispatch(loadDetailsPanel(resourceUuid)); } -- 2.30.2