X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fc5cb3c6ccabcc1da401d0dd9858fab764e31235..5005f810d8c5e8c9e8c94c5981b014e41d2a40b3:/src/views/search-results-panel/search-results-panel.tsx diff --git a/src/views/search-results-panel/search-results-panel.tsx b/src/views/search-results-panel/search-results-panel.tsx index bde7207a8a..0902f15bdc 100644 --- a/src/views/search-results-panel/search-results-panel.tsx +++ b/src/views/search-results-panel/search-results-panel.tsx @@ -4,13 +4,32 @@ import { Dispatch } from "redux"; import { connect } from "react-redux"; -import { navigateTo } from '~/store/navigation/navigation-action'; -import { SearchResultsPanelActionProps } from './search-results-panel-view'; -import { openContextMenu, resourceKindToContextMenuKind } from '~/store/context-menu/context-menu-actions'; -import { ResourceKind } from '~/models/resource'; -import { loadDetailsPanel } from '~/store/details-panel/details-panel-action'; -import { SearchResultsPanelView } from '~/views/search-results-panel/search-results-panel-view'; -import { RootState } from '~/store/store'; +import { navigateTo } from 'store/navigation/navigation-action'; +import { openSearchResultsContextMenu } from 'store/context-menu/context-menu-actions'; +import { loadDetailsPanel } from 'store/details-panel/details-panel-action'; +import { SearchResultsPanelView } from 'views/search-results-panel/search-results-panel-view'; +import { RootState } from 'store/store'; +import { SearchBarAdvancedFormData } from 'models/search-bar'; +import { User } from "models/user"; +import { Config } from 'common/config'; +import { Session } from "models/session"; + +export interface SearchResultsPanelDataProps { + data: SearchBarAdvancedFormData; + user: User; + sessions: Session[]; + remoteHostsConfig: { [key: string]: Config }; + localCluster: string; +} + +export interface SearchResultsPanelActionProps { + onItemClick: (item: string) => void; + onContextMenu: (event: React.MouseEvent, item: string) => void; + onDialogOpen: (ownerUuid: string) => void; + onItemDoubleClick: (item: string) => void; +} + +export type SearchResultsPanelProps = SearchResultsPanelDataProps & SearchResultsPanelActionProps; const mapStateToProps = (rootState: RootState) => { return { @@ -23,17 +42,7 @@ const mapStateToProps = (rootState: RootState) => { const mapDispatchToProps = (dispatch: Dispatch): SearchResultsPanelActionProps => ({ onContextMenu: (event, resourceUuid) => { - const kind = resourceKindToContextMenuKind(resourceUuid); - if (kind) { - dispatch(openContextMenu(event, { - name: '', - uuid: resourceUuid, - ownerUuid: '', - kind: ResourceKind.NONE, - menuKind: kind - })); - } - dispatch(loadDetailsPanel(resourceUuid)); + dispatch(openSearchResultsContextMenu(event, resourceUuid)); }, onDialogOpen: (ownerUuid: string) => { return; }, onItemClick: (resourceUuid: string) => {