X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/6d49676d1505f09223d85a488e79ca678201a81b..ed59f8b637bc1131ec95e7215efb8bfa4fde9f04:/src/views/user-panel/user-panel.tsx diff --git a/src/views/user-panel/user-panel.tsx b/src/views/user-panel/user-panel.tsx index 3c835673..169b32ab 100644 --- a/src/views/user-panel/user-panel.tsx +++ b/src/views/user-panel/user-panel.tsx @@ -9,7 +9,7 @@ import { connect, DispatchProp } from 'react-redux'; import { DataColumns } from 'components/data-table/data-table'; import { RootState } from 'store/store'; import { SortDirection } from 'components/data-table/data-column'; -import { openContextMenu } from "store/context-menu/context-menu-actions"; +import { openUserContextMenu } from "store/context-menu/context-menu-actions"; import { getResource, ResourcesState } from "store/resources/resources"; import { UserResourceFullName, @@ -20,7 +20,6 @@ import { ResourceUsername } from "views-components/data-explorer/renderers"; import { navigateToUserProfile } from "store/navigation/navigation-action"; -import { ContextMenuKind } from "views-components/context-menu/context-menu"; import { DataTableDefaultView } from 'components/data-table-default-view/data-table-default-view'; import { createTree } from 'models/tree'; import { compose, Dispatch } from 'redux'; @@ -109,7 +108,7 @@ interface UserPanelDataProps { interface UserPanelActionProps { openUserCreateDialog: () => void; handleRowClick: (uuid: string) => void; - onContextMenu: (event: React.MouseEvent, item: any) => void; + handleContextMenu: (event, resource: UserResource) => void; } const mapStateToProps = (state: RootState) => { @@ -121,7 +120,7 @@ const mapStateToProps = (state: RootState) => { const mapDispatchToProps = (dispatch: Dispatch) => ({ openUserCreateDialog: () => dispatch(openUserCreateDialog()), handleRowClick: (uuid: string) => dispatch(navigateToUserProfile(uuid)), - onContextMenu: (event: React.MouseEvent, item: any) => dispatch(openContextMenu(event, item)) + handleContextMenu: (event, resource: UserResource) => dispatch(openUserContextMenu(event, resource)), }); type UserPanelProps = UserPanelDataProps & UserPanelActionProps & DispatchProp & WithStyles; @@ -161,13 +160,7 @@ export const UserPanel = compose( event.stopPropagation(); const resource = getResource(resourceUuid)(this.props.resources); if (resource) { - this.props.onContextMenu(event, { - name: '', - uuid: resource.uuid, - ownerUuid: resource.ownerUuid, - kind: resource.kind, - menuKind: ContextMenuKind.USER - }); + this.props.handleContextMenu(event, resource); } } }