X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/5627bf1a83323d2b0364cb069564998eb8c6ca7a..cc493b89840b48f40c2beaf626994724331aa196:/src/views/favorite-panel/favorite-panel.tsx diff --git a/src/views/favorite-panel/favorite-panel.tsx b/src/views/favorite-panel/favorite-panel.tsx index 3fd33aef..9fbae5ce 100644 --- a/src/views/favorite-panel/favorite-panel.tsx +++ b/src/views/favorite-panel/favorite-panel.tsx @@ -8,18 +8,17 @@ import { DataExplorer } from "~/views-components/data-explorer/data-explorer"; import { DispatchProp, connect } from 'react-redux'; import { DataColumns } from '~/components/data-table/data-table'; import { RouteComponentProps } from 'react-router'; -import { RootState } from '~/store/store'; import { DataTableFilterItem } from '~/components/data-table-filters/data-table-filters'; import { ContainerRequestState } from '~/models/container-request'; import { SortDirection } from '~/components/data-table/data-column'; import { ResourceKind } from '~/models/resource'; import { resourceLabel } from '~/common/labels'; import { ArvadosTheme } from '~/common/custom-theme'; -import { FAVORITE_PANEL_ID, loadFavoritePanel } from "~/store/favorite-panel/favorite-panel-action"; +import { FAVORITE_PANEL_ID } from "~/store/favorite-panel/favorite-panel-action"; import { ResourceFileSize, ResourceLastModifiedDate, ProcessStatus, ResourceType, ResourceOwner, ResourceName } from '~/views-components/data-explorer/renderers'; import { FavoriteIcon } from '~/components/icon/icon'; import { Dispatch } from 'redux'; -import { contextMenuActions } from '~/store/context-menu/context-menu-actions'; +import { contextMenuActions, openContextMenu, resourceKindToContextMenuKind } from '~/store/context-menu/context-menu-actions'; import { ContextMenuKind } from '~/views-components/context-menu/context-menu'; import { loadDetailsPanel } from '../../store/details-panel/details-panel-action'; import { navigateTo } from '~/store/navigation/navigation-action'; @@ -151,13 +150,10 @@ interface FavoritePanelActionProps { const mapDispatchToProps = (dispatch: Dispatch): FavoritePanelActionProps => ({ onContextMenu: (event, resourceUuid) => { - event.preventDefault(); - dispatch( - contextMenuActions.OPEN_CONTEXT_MENU({ - position: { x: event.clientX, y: event.clientY }, - resource: { name: '', uuid: resourceUuid, kind: ContextMenuKind.RESOURCE } - }) - ); + const kind = resourceKindToContextMenuKind(resourceUuid); + if (kind) { + dispatch(openContextMenu(event, { name: '', uuid: resourceUuid, kind })); + } }, onDialogOpen: (ownerUuid: string) => { return; }, onItemClick: (resourceUuid: string) => { @@ -172,7 +168,7 @@ type FavoritePanelProps = FavoritePanelDataProps & FavoritePanelActionProps & Di & WithStyles & RouteComponentProps<{ id: string }>; export const FavoritePanel = withStyles(styles)( - connect((state: RootState) => ({ currentItemId: state.projects.currentItemId }), mapDispatchToProps)( + connect(undefined, mapDispatchToProps)( class extends React.Component { render() { return