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,
+ ResourceStatus,
ResourceType
} from '~/views-components/data-explorer/renderers';
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 { Routes } from '~/routes/routes';
+import { Link } from 'react-router-dom';
import { StyleRulesCallback, withStyles, WithStyles } from '@material-ui/core';
import { ArvadosTheme } from '~/common/custom-theme';
export enum SearchResultsPanelColumnNames {
CLUSTER = "Cluster",
NAME = "Name",
- PROJECT = "Project",
STATUS = "Status",
TYPE = 'Type',
OWNER = "Owner",
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
siteManagerLink: {
- marginLeft: theme.spacing.unit * 2
+ marginRight: theme.spacing.unit * 2,
+ float: 'right'
}
});
filters: createTree(),
render: (uuid: string) => <ResourceName uuid={uuid} />
},
- {
- name: SearchResultsPanelColumnNames.PROJECT,
- selected: true,
- configurable: true,
- filters: createTree(),
- render: uuid => <ResourceFileSize uuid={uuid} />
- },
{
name: SearchResultsPanelColumnNames.STATUS,
selected: true,
configurable: true,
filters: createTree(),
- render: uuid => <ProcessStatus uuid={uuid} />
+ render: uuid => <ResourceStatus uuid={uuid} />
},
{
name: SearchResultsPanelColumnNames.TYPE,
export const SearchResultsPanelView = withStyles(styles, { withTheme: true })(
(props: SearchResultsPanelProps & WithStyles<CssRules, true>) => {
const homeCluster = props.user.uuid.substr(0, 5);
- const loggedIn = props.sessions.filter((ss) => ss.loggedIn);
- return <DataExplorer
+ const loggedIn = props.sessions.filter((ss) => ss.loggedIn && ss.userIsActive);
+ return <span data-cy='search-results'><DataExplorer
id={SEARCH_RESULTS_PANEL_ID}
onRowClick={props.onItemClick}
onRowDoubleClick={props.onItemDoubleClick}
contextMenuColumn={false}
hideSearchInput
title={
- <div>{(props.localCluster !== homeCluster && loggedIn.length === 1) ?
- <span>Searching local cluster {props.localCluster} only. To search multiple clusters, <a href={props.remoteHostsConfig[homeCluster] && props.remoteHostsConfig[homeCluster].workbench2Url}> start from your home Workbench.</a></span> :
- <span>Searching clusters: {loggedIn.map((ss) => <span key={ss.clusterId}> {ss.clusterId}</span>)}</span>}
- <Link to={Routes.SITE_MANAGER} className={props.classes.siteManagerLink}>Site Manager</Link>
- </div>
+ <div>
+ {loggedIn.length === 1 ?
+ <span>Searching local cluster <ResourceCluster uuid={props.localCluster} /></span>
+ : <span>Searching clusters: {loggedIn.map((ss) => <span key={ss.clusterId}>
+ <a href={props.remoteHostsConfig[ss.clusterId] && props.remoteHostsConfig[ss.clusterId].workbench2Url} style={{ textDecoration: 'none' }}> <ResourceCluster uuid={ss.clusterId} /></a>
+ </span>)}</span>}
+ {loggedIn.length === 1 && props.localCluster !== homeCluster ?
+ <span>To search multiple clusters, <a href={props.remoteHostsConfig[homeCluster] && props.remoteHostsConfig[homeCluster].workbench2Url}> start from your home Workbench.</a></span>
+ : <span style={{ marginLeft: "2em" }}>Use <Link to={Routes.SITE_MANAGER} >Site Manager</Link> to manage which clusters will be searched.</span>}
+ </div >
}
- />;
+ /></span>;
});