X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/2a92ec7492e5c040f8f04bb62818a2c2ec34bd35..db5a3f09820e8d41aeef7000d95b0ea67507c5a3:/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 65999a5c..0cc52e5e 100644 --- a/src/views/search-results-panel/search-results-panel.tsx +++ b/src/views/search-results-panel/search-results-panel.tsx @@ -5,26 +5,44 @@ 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 { 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 { 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 { + user: rootState.auth.user, + sessions: rootState.auth.sessions, + remoteHostsConfig: rootState.auth.remoteHostsConfig, + localCluster: rootState.auth.localCluster, + }; +}; 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)); - }, + onContextMenu: (event, resourceUuid) => { return; }, onDialogOpen: (ownerUuid: string) => { return; }, onItemClick: (resourceUuid: string) => { dispatch(loadDetailsPanel(resourceUuid)); @@ -34,4 +52,4 @@ const mapDispatchToProps = (dispatch: Dispatch): SearchResultsPanelActionProps = } }); -export const SearchResultsPanel = connect(null, mapDispatchToProps)(SearchResultsPanelView); \ No newline at end of file +export const SearchResultsPanel = connect(mapStateToProps, mapDispatchToProps)(SearchResultsPanelView);