Merge branch 'master'

Feature #14258

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --combined src/components/data-explorer/data-explorer.tsx
index c9009c8a802033707325ec03967005c58211d634,f863ba13617adcc50c6ded0aac032445787079eb..cb979c7bd216b31d7e7d6760c08da9471a159472
--- 1/src/components/data-explorer/data-explorer.tsx
--- 2/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@@ -4,14 -4,13 +4,14 @@@
  
  import * as React from 'react';
  import { Grid, Paper, Toolbar, StyleRulesCallback, withStyles, WithStyles, TablePagination, IconButton, Tooltip } from '@material-ui/core';
- import MoreVertIcon from "@material-ui/icons/MoreVert";
  import { ColumnSelector } from "../column-selector/column-selector";
  import { DataTable, DataColumns } from "../data-table/data-table";
  import { DataColumn, SortDirection } from "../data-table/data-column";
 -import { DataTableFilterItem } from '../data-table-filters/data-table-filters';
  import { SearchInput } from '../search-input/search-input';
  import { ArvadosTheme } from "~/common/custom-theme";
 +import { createTree } from '~/models/tree';
 +import { DataTableFilters } from '../data-table-filters/data-table-filters-tree';
+ import { MoreOptionsIcon } from '~/components/icon/icon';
  
  type CssRules = 'searchBox' | "toolbar" | "footer" | "root" | 'moreOptionsButton';
  
@@@ -54,7 -53,7 +54,7 @@@ interface DataExplorerActionProps<T> 
      onColumnToggle: (column: DataColumn<T>) => void;
      onContextMenu: (event: React.MouseEvent<HTMLElement>, item: T) => void;
      onSortToggle: (column: DataColumn<T>) => void;
 -    onFiltersChange: (filters: DataTableFilterItem[], column: DataColumn<T>) => void;
 +    onFiltersChange: (filters: DataTableFilters, column: DataColumn<T>) => void;
      onChangePage: (page: number) => void;
      onChangeRowsPerPage: (rowsPerPage: number) => void;
      extractKey?: (item: T) => React.Key;
@@@ -128,7 -127,7 +128,7 @@@ export const DataExplorer = withStyles(
              <Grid container justify="center">
                  <Tooltip title="More options" disableFocusListener>
                      <IconButton className={this.props.classes.moreOptionsButton} onClick={event => this.props.onContextMenu(event, item)}>
-                         <MoreVertIcon />
+                         <MoreOptionsIcon />
                      </IconButton>
                  </Tooltip>
              </Grid>
@@@ -138,7 -137,7 +138,7 @@@
              selected: true,
              configurable: false,
              sortDirection: SortDirection.NONE,
 -            filters: [],
 +            filters: createTree(),
              key: "context-actions",
              render: this.renderContextMenuTrigger
          };