X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/64fcf842a75ade29706401a47759deab406f0dfd..f5c0cb11102a006cda59711f29458b7569b9a21f:/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 f02c906a..2cb30198 100644 --- a/src/views/favorite-panel/favorite-panel.tsx +++ b/src/views/favorite-panel/favorite-panel.tsx @@ -5,23 +5,29 @@ import * as React from 'react'; import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core'; import { DataExplorer } from "~/views-components/data-explorer/data-explorer"; -import { DispatchProp, connect } from 'react-redux'; +import { connect, DispatchProp } from 'react-redux'; import { DataColumns } from '~/components/data-table/data-table'; import { RouteComponentProps } from 'react-router'; 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 } from "~/store/favorite-panel/favorite-panel-action"; -import { ResourceFileSize, ResourceLastModifiedDate, ProcessStatus, ResourceType, ResourceOwner, ResourceName } from '~/views-components/data-explorer/renderers'; +import { + ProcessStatus, + ResourceFileSize, + ResourceLastModifiedDate, + ResourceName, + ResourceOwner, + ResourceType +} 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 { ContextMenuKind } from '~/views-components/context-menu/context-menu'; -import { loadDetailsPanel } from '../../store/details-panel/details-panel-action'; +import { openContextMenu, resourceKindToContextMenuKind } 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"; type CssRules = "toolbar" | "button"; @@ -150,13 +156,16 @@ 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, + ownerUuid: '', + kind: ResourceKind.NONE, + menuKind: kind + })); + } }, onDialogOpen: (ownerUuid: string) => { return; }, onItemClick: (resourceUuid: string) => { @@ -180,7 +189,8 @@ export const FavoritePanel = withStyles(styles)( onRowDoubleClick={this.props.onItemDoubleClick} onContextMenu={this.props.onContextMenu} defaultIcon={FavoriteIcon} - defaultMessages={['Your favorites list is empty.']} />; + defaultMessages={['Your favorites list is empty.']} + contextMenuColumn={true}/>; } } )