cy.get('[data-cy=search-results]').should('contain', 'version 1');
});
});
+
+ it.only('can display path of the selected item', function() {
+ const colName = `Collection ${Math.floor(Math.random() * Math.floor(999999))}`;
+
+ // Creates the collection using the admin token so we can set up
+ // a bogus manifest text without block signatures.
+ cy.createCollection(adminUser.token, {
+ name: colName,
+ owner_uuid: activeUser.user.uuid,
+ preserve_version: true,
+ manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
+ }).then(function() {
+ cy.loginAs(activeUser);
+
+ cy.doSearch(colName);
+
+ cy.get('[data-cy=search-results]').should('contain', colName);
+
+ cy.get('[data-cy=search-results]').contains(colName).closest('tr').click();
+
+ cy.get('[data-cy=element-path]').should('contain', `/ Projects / ${colName}`);
+ });
+ });
});
\ No newline at end of file
interface ColumnSelectorDataProps {
columns: DataColumns<any>;
onColumnToggle: (column: DataColumn<any>) => void;
+ className?: string;
}
type CssRules = "checkbox";
import { PaperProps } from '@material-ui/core/Paper';
import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view';
-type CssRules = 'searchBox' | "toolbar" | "toolbarUnderTitle" | "footer" | "root" | 'moreOptionsButton' | 'title' | 'dataTable' | 'container';
+type CssRules = 'searchBox' | 'headerMenu' | "toolbar" | "footer" | "root" | 'moreOptionsButton' | 'title' | 'dataTable' | 'container';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
searchBox: {
paddingTop: theme.spacing.unit,
paddingRight: theme.spacing.unit * 2,
},
- toolbarUnderTitle: {
- paddingTop: 0
- },
footer: {
overflow: 'auto'
},
padding: 0
},
title: {
+ display: 'inline-block',
paddingLeft: theme.spacing.unit * 3,
paddingTop: theme.spacing.unit * 3,
fontSize: '18px'
container: {
height: '100%',
},
+ headerMenu: {
+ float: 'right',
+ display: 'inline-block'
+ }
});
interface DataExplorerDataProps<T> {
title?: React.ReactNode;
paperKey?: string;
currentItemUuid: string;
+ elementPath?: string;
}
interface DataExplorerActionProps<T> {
items, itemsAvailable, onRowClick, onRowDoubleClick, classes,
dataTableDefaultView, hideColumnSelector, actions, paperProps, hideSearchInput,
paperKey, fetchMode, currentItemUuid, title,
- doHidePanel, doMaximizePanel, panelName, panelMaximized
+ doHidePanel, doMaximizePanel, panelName, panelMaximized, elementPath
} = this.props;
const dataCy = this.props["data-cy"];
return <Paper className={classes.root} {...paperProps} key={paperKey} data-cy={dataCy}>
<Grid container direction="column" wrap="nowrap" className={classes.container}>
- {title && <Grid item xs className={classes.title}>{title}</Grid>}
- {(!hideColumnSelector || !hideSearchInput || !!actions) && <Grid item xs><Toolbar className={title ? classes.toolbarUnderTitle : classes.toolbar}>
- <Grid container justify="space-between" wrap="nowrap" alignItems="center">
- {!hideSearchInput && <div className={classes.searchBox}>
- {!hideSearchInput && <SearchInput
- label={searchLabel}
- value={searchValue}
- selfClearProp={currentItemUuid}
- onSearch={onSearch} />}
- </div>}
- {actions}
- {!hideColumnSelector && <ColumnSelector
- columns={columns}
- onColumnToggle={onColumnToggle} />}
- </Grid>
- { doMaximizePanel && !panelMaximized &&
- <Tooltip title={`Maximize ${panelName || 'panel'}`} disableFocusListener>
- <IconButton onClick={doMaximizePanel}><MaximizeIcon /></IconButton>
- </Tooltip> }
- { doHidePanel &&
- <Tooltip title={`Close ${panelName || 'panel'}`} disableFocusListener>
- <IconButton onClick={doHidePanel}><CloseIcon /></IconButton>
- </Tooltip> }
- </Toolbar></Grid>}
+ <div>
+ {title && <Grid item xs className={classes.title}>{title}</Grid>}
+ {
+ (!hideColumnSelector || !hideSearchInput || !!actions) &&
+ <Grid className={classes.headerMenu} item xs>
+ <Toolbar className={classes.toolbar}>
+ <Grid container justify="space-between" wrap="nowrap" alignItems="center">
+ {!hideSearchInput && <div className={classes.searchBox}>
+ {!hideSearchInput && <SearchInput
+ label={searchLabel}
+ value={searchValue}
+ selfClearProp={currentItemUuid}
+ onSearch={onSearch} />}
+ </div>}
+ {actions}
+ {!hideColumnSelector && <ColumnSelector
+ columns={columns}
+ onColumnToggle={onColumnToggle} />}
+ </Grid>
+ { doMaximizePanel && !panelMaximized &&
+ <Tooltip title={`Maximize ${panelName || 'panel'}`} disableFocusListener>
+ <IconButton onClick={doMaximizePanel}><MaximizeIcon /></IconButton>
+ </Tooltip> }
+ { doHidePanel &&
+ <Tooltip title={`Close ${panelName || 'panel'}`} disableFocusListener>
+ <IconButton onClick={doHidePanel}><CloseIcon /></IconButton>
+ </Tooltip> }
+ </Toolbar>
+ </Grid>
+ }
+ </div>
<Grid item xs="auto" className={classes.dataTable}><DataTable
columns={this.props.contextMenuColumn ? [...columns, this.contextMenuColumn] : columns}
items={items}
currentItemUuid={currentItemUuid}
currentRoute={paperKey} /></Grid>
<Grid item xs><Toolbar className={classes.footer}>
- <Grid container justify="flex-end">
+ {
+ elementPath &&
+ <Grid container>
+ <span data-cy="element-path">
+ {elementPath}
+ </span>
+ </Grid>
+ }
+ <Grid container={!elementPath} justify="flex-end">
{fetchMode === DataTableFetchMode.PAGINATED ? <TablePagination
count={itemsAvailable}
rowsPerPage={rowsPerPage}
import { customEncodeURI } from "common/url";
import { FilterBuilder } from "services/api/filter-builder";
import { ListArguments } from "services/common-service/common-service";
+import { Session } from "models/session";
export type UploadProgress = (fileId: number, loaded: number, total: number, currentTime: number) => void;
]);
}
- async get(uuid: string, showErrors?: boolean, select?: string[]) {
+ async get(uuid: string, showErrors?: boolean, select?: string[], session?: Session) {
super.validateUuid(uuid);
// We use a filtered list request to avoid getting the manifest text
const filters = new FilterBuilder().addEqual('uuid', uuid).getFilters();
if (select) {
listArgs.select = select;
}
- const lst = await super.list(listArgs, showErrors);
- return lst.items[0];
+
+ if (session) {
+ const lst = await super.list(listArgs, showErrors);
+ return lst.items[0];
+ } else {
+ return super.get(uuid, showErrors, session);
+ }
}
create(data?: Partial<CollectionResource>) {
// SPDX-License-Identifier: AGPL-3.0
import { camelCase, isPlainObject, isArray, snakeCase } from "lodash";
-import { AxiosInstance, AxiosPromise } from "axios";
+import { AxiosInstance, AxiosPromise, AxiosRequestConfig } from "axios";
import uuid from "uuid/v4";
import { ApiActions } from "services/api/api-actions";
import QueryString from "query-string";
+import { Session } from "models/session";
interface Errors {
status: number;
);
}
- get(uuid: string, showErrors?: boolean) {
+ get(uuid: string, showErrors?: boolean, select?: string[], session?: Session) {
this.validateUuid(uuid);
+
+ const cfg: AxiosRequestConfig = {};
+ if (session) {
+ cfg.baseURL = session.baseUrl;
+ cfg.headers = { 'Authorization': 'Bearer ' + session.token };
+ }
+
return CommonService.defaultResponse(
this.serverApi
- .get<T>(`/${this.resourceType}/${uuid}`),
+ .get<T>(`/${this.resourceType}/${uuid}`, session ? cfg : undefined),
this.actions,
true, // mapKeys
showErrors
//
// 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';
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";
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",
LAST_MODIFIED = "Last modified"
}
-export type CssRules = 'siteManagerLink';
+export type CssRules = 'siteManagerLink' | 'searchResults';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+ searchResults: {
+ width: '100%'
+ },
siteManagerLink: {
marginRight: theme.spacing.unit * 2,
float: 'right'
(props: SearchResultsPanelProps & WithStyles<CssRules, true>) => {
const homeCluster = props.user.uuid.substring(0, 5);
const loggedIn = props.sessions.filter((ss) => ss.loggedIn && ss.userIsActive);
- return <span data-cy='search-results'><DataExplorer
+ const [selectedItem, setSelectedItem] = useState('');
+ const [itemPath, setItemPath] = useState<string[]>([]);
+
+ 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 <span data-cy='search-results' className={props.classes.searchResults}>
+ <DataExplorer
id={SEARCH_RESULTS_PANEL_ID}
- onRowClick={props.onItemClick}
+ onRowClick={onItemClick}
onRowDoubleClick={props.onItemDoubleClick}
onContextMenu={props.onContextMenu}
contextMenuColumn={false}
+ elementPath={`/ ${itemPath.reverse().join(' / ')}`}
hideSearchInput
title={
<div>