15672: Merge branch 'master' into 15672-subprocess-list-v2

[arvados.git] / 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 59119403893f456e74bac818346d9c1f6ae82d2e..8bc5419b854fce5091401316b6d68795ce235c7f 100644 (file)
--- a/src/views/search-results-panel/search-results-panel-view.tsx
+++ b/src/views/search-results-panel/search-results-panel-view.tsx
@@ -21,8 +21,8 @@ import {
 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';
 
@@ -41,7 +41,8 @@ export type CssRules = 'siteManagerLink';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     siteManagerLink: {
-        marginLeft: theme.spacing.unit * 2
+        marginRight: theme.spacing.unit * 2,
+        float: 'right'
     }
 });
 
@@ -122,11 +123,16 @@ export const SearchResultsPanelView = withStyles(styles, { withTheme: true })(
             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 >
             }
         />;
     });