Merge branch '17018-readonly-file-actions-fix'

[arvados-workbench2.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 ebe5a826d2c1804f4e7a60e6cf7c2b945403ec13..dae91bd0e5fcb15427857a63e541034dab2d527b 100644 (file)
--- a/src/views/search-results-panel/search-results-panel-view.tsx
+++ b/src/views/search-results-panel/search-results-panel-view.tsx
@@ -30,7 +30,6 @@ import { ArvadosTheme } from '~/common/custom-theme';
 export enum SearchResultsPanelColumnNames {
     CLUSTER = "Cluster",
     NAME = "Name",
-    PROJECT = "Project",
     STATUS = "Status",
     TYPE = 'Type',
     OWNER = "Owner",
@@ -67,13 +66,6 @@ export const searchResultsPanelColumns: DataColumns<string> = [
         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,
@@ -115,8 +107,8 @@ export const searchResultsPanelColumns: DataColumns<string> = [
 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}
@@ -135,5 +127,5 @@ export const SearchResultsPanelView = withStyles(styles, { withTheme: true })(
                         : <span style={{ marginLeft: "2em" }}>Use <Link to={Routes.SITE_MANAGER} >Site Manager</Link> to manage which clusters will be searched.</span>}
                 </div >
             }
-        />;
+        /></span>;
     });