X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5e805cf2209d3afe42699e4658d8a12e50bcd5a4..9eca8f9b0755eaeb1104a8e699a463f0ac127040:/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 4518141031..d9b9002e3e 100644 --- a/src/views/search-results-panel/search-results-panel-view.tsx +++ b/src/views/search-results-panel/search-results-panel-view.tsx @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: AGPL-3.0 -import React from 'react'; +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 { ResourceKind } from 'models/resource'; +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'; @@ -19,6 +19,7 @@ import { ResourceStatus, ResourceType } 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"; @@ -26,6 +27,9 @@ 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'; +import { GroupContentsResource } from 'services/groups-service/groups-service'; export enum SearchResultsPanelColumnNames { CLUSTER = "Cluster", @@ -37,9 +41,12 @@ export enum SearchResultsPanelColumnNames { LAST_MODIFIED = "Last modified" } -export type CssRules = 'siteManagerLink'; +export type CssRules = 'siteManagerLink' | 'searchResults'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ + searchResults: { + width: '100%' + }, siteManagerLink: { marginRight: theme.spacing.unit * 2, float: 'right' @@ -50,7 +57,7 @@ export interface WorkflowPanelFilter extends DataTableFilterItem { type: ResourceKind | ContainerRequestState; } -export const searchResultsPanelColumns: DataColumns = [ +export const searchResultsPanelColumns: DataColumns = [ { name: SearchResultsPanelColumnNames.CLUSTER, selected: true, @@ -62,7 +69,7 @@ export const searchResultsPanelColumns: DataColumns = [ name: SearchResultsPanelColumnNames.NAME, selected: true, configurable: true, - sortDirection: SortDirection.NONE, + sort: {direction: SortDirection.NONE, field: "name"}, filters: createTree(), render: (uuid: string) => }, @@ -98,7 +105,7 @@ export const searchResultsPanelColumns: DataColumns = [ name: SearchResultsPanelColumnNames.LAST_MODIFIED, selected: true, configurable: true, - sortDirection: SortDirection.DESC, + sort: {direction: SortDirection.DESC, field: "modifiedAt"}, filters: createTree(), render: uuid => } @@ -108,12 +115,58 @@ 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); - return ([]); + + 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, undefined, 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 +