X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/56069f1f9fa111b9756e9bfa7a3b0c9dba2e9a7a..refs/heads/18549-global-search-results-show-path:/src/views/search-results-panel/search-results-panel-view.tsx diff --git a/src/views/search-results-panel/search-results-panel-view.tsx b/src/views/search-results-panel/search-results-panel-view.tsx index b82b1745..60fdd33e 100644 --- a/src/views/search-results-panel/search-results-panel-view.tsx +++ b/src/views/search-results-panel/search-results-panel-view.tsx @@ -2,30 +2,37 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; -import { SortDirection } from '~/components/data-table/data-column'; -import { DataColumns } from '~/components/data-table/data-table'; -import { DataTableFilterItem } from '~/components/data-table-filters/data-table-filters'; -import { ResourceKind } from '~/models/resource'; -import { ContainerRequestState } from '~/models/container-request'; -import { SEARCH_RESULTS_PANEL_ID } from '~/store/search-results-panel/search-results-panel-actions'; -import { DataExplorer } from '~/views-components/data-explorer/data-explorer'; +import React, { useEffect, useCallback, useState } from 'react'; +import { SortDirection } from 'components/data-table/data-column'; +import { DataColumns } from 'components/data-table/data-table'; +import { DataTableFilterItem } from 'components/data-table-filters/data-table-filters'; +import { extractUuidKind, ResourceKind } from 'models/resource'; +import { ContainerRequestState } from 'models/container-request'; +import { SEARCH_RESULTS_PANEL_ID } from 'store/search-results-panel/search-results-panel-actions'; +import { DataExplorer } from 'views-components/data-explorer/data-explorer'; import { - ProcessStatus, ResourceCluster, + ResourceCluster, ResourceFileSize, ResourceLastModifiedDate, ResourceName, - ResourceOwner, + ResourceOwnerWithName, + ResourceStatus, ResourceType -} from '~/views-components/data-explorer/renderers'; -import { createTree } from '~/models/tree'; -import { getInitialResourceTypeFilters } from '~/store/resource-type-filters/resource-type-filters'; +} from 'views-components/data-explorer/renderers'; +import servicesProvider from 'common/service-provider'; +import { createTree } from 'models/tree'; +import { getInitialResourceTypeFilters } from 'store/resource-type-filters/resource-type-filters'; import { SearchResultsPanelProps } from "./search-results-panel"; +import { Routes } from 'routes/routes'; +import { Link } from 'react-router-dom'; +import { StyleRulesCallback, withStyles, WithStyles } from '@material-ui/core'; +import { ArvadosTheme } from 'common/custom-theme'; +import { getSearchSessions } from 'store/search-bar/search-bar-actions'; +import { camelCase } from 'lodash'; export enum SearchResultsPanelColumnNames { CLUSTER = "Cluster", NAME = "Name", - PROJECT = "Project", STATUS = "Status", TYPE = 'Type', OWNER = "Owner", @@ -33,6 +40,18 @@ export enum SearchResultsPanelColumnNames { LAST_MODIFIED = "Last modified" } +export type CssRules = 'siteManagerLink' | 'searchResults'; + +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ + searchResults: { + width: '100%' + }, + siteManagerLink: { + marginRight: theme.spacing.unit * 2, + float: 'right' + } +}); + export interface WorkflowPanelFilter extends DataTableFilterItem { type: ResourceKind | ContainerRequestState; } @@ -53,19 +72,12 @@ export const searchResultsPanelColumns: DataColumns = [ filters: createTree(), render: (uuid: string) => }, - { - name: SearchResultsPanelColumnNames.PROJECT, - selected: true, - configurable: true, - filters: createTree(), - render: uuid => - }, { name: SearchResultsPanelColumnNames.STATUS, selected: true, configurable: true, filters: createTree(), - render: uuid => + render: uuid => }, { name: SearchResultsPanelColumnNames.TYPE, @@ -79,7 +91,7 @@ export const searchResultsPanelColumns: DataColumns = [ selected: true, configurable: true, filters: createTree(), - render: uuid => + render: uuid => }, { name: SearchResultsPanelColumnNames.FILE_SIZE, @@ -98,19 +110,74 @@ export const searchResultsPanelColumns: DataColumns = [ } ]; -export const SearchResultsPanelView = (props: SearchResultsPanelProps) => { - const homeCluster = props.user.uuid.substr(0, 5); - return Searching clusters: {props.sessions.filter((ss) => ss.loggedIn).map((ss) => {ss.clusterId})} : -
Searching local cluster {props.localCluster} only. To search multiple clusters, start from your home Workbench.
- } - />; -}; +export const SearchResultsPanelView = withStyles(styles, { withTheme: true })( + (props: SearchResultsPanelProps & WithStyles) => { + const homeCluster = props.user.uuid.substring(0, 5); + const loggedIn = props.sessions.filter((ss) => ss.loggedIn && ss.userIsActive); + const [selectedItem, setSelectedItem] = useState(''); + const [itemPath, setItemPath] = useState([]); + + useEffect(() => { + let tmpPath: string[] = []; + + (async () => { + if (selectedItem !== '') { + let searchUuid = selectedItem; + let itemKind = extractUuidKind(searchUuid); + + while (itemKind !== ResourceKind.USER) { + const clusterId = searchUuid.split('-')[0]; + const serviceType = camelCase(itemKind?.replace('arvados#', '')); + const service = Object.values(servicesProvider.getServices()) + .filter(({resourceType}) => !!resourceType) + .find(({resourceType}) => camelCase(resourceType).indexOf(serviceType) > -1); + const sessions = getSearchSessions(clusterId, props.sessions); + + if (sessions.length > 0) { + const session = sessions[0]; + const { name, ownerUuid } = await (service as any).get(searchUuid, false, session); + tmpPath.push(name); + searchUuid = ownerUuid; + itemKind = extractUuidKind(searchUuid); + } else { + break; + } + } + + tmpPath.push(props.user.uuid === searchUuid ? 'Projects' : 'Shared with me'); + setItemPath(tmpPath); + } + })(); + + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [selectedItem]); + + const onItemClick = useCallback((uuid) => { + setSelectedItem(uuid); + props.onItemClick(uuid); + // eslint-disable-next-line react-hooks/exhaustive-deps + },[props.onItemClick]); + + return + + {loggedIn.length === 1 ? + Searching local cluster + : Searching clusters: {loggedIn.map((ss) => + + )}} + {loggedIn.length === 1 && props.localCluster !== homeCluster ? + To search multiple clusters, start from your home Workbench. + : Use Site Manager to manage which clusters will be searched.} + + } + />; + });