16718: Merge branch 'master' into 16718-past-collection-versions-search

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --combined src/views/search-results-panel/search-results-panel-view.tsx
index 109fb3057964c44ae396b8d898d9ae52d970891f,43ca131396ddcd8063688c1a4d7cc6368d18f2dc..fbaba210e29b94cec6d32def6256c6eba116d342
--- 1/src/views/search-results-panel/search-results-panel-view.tsx
--- 2/src/views/search-results-panel/search-results-panel-view.tsx
+++ b/src/views/search-results-panel/search-results-panel-view.tsx
@@@ -11,12 -11,11 +11,12 @@@ import { ContainerRequestState } from '
  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';
@@@ -30,6 -29,7 +30,6 @@@ import { ArvadosTheme } from '~/common/
  export enum SearchResultsPanelColumnNames {
      CLUSTER = "Cluster",
      NAME = "Name",
 -    PROJECT = "Project",
      STATUS = "Status",
      TYPE = 'Type',
      OWNER = "Owner",
@@@ -66,12 -66,19 +66,12 @@@ export const searchResultsPanelColumns
          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,
@@@ -107,7 -114,7 +107,7 @@@
  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);
+         const loggedIn = props.sessions.filter((ss) => ss.loggedIn && ss.userIsActive);
          return <DataExplorer
              id={SEARCH_RESULTS_PANEL_ID}
              onRowClick={props.onItemClick}