Merge branch 'master'

Feature #13633

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

diff --cc src/components/data-table/data-table.tsx
index 565630be296aca2d5f4b9f8e677e0e438ec72ac4,37e0fe15d52fa7d31272cb9c005034f86d1cfae3..43efdd0ada3bc97c50284926a3b75758375fb2c8
--- 1/src/components/data-table/data-table.tsx
--- 2/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@@ -3,12 -3,14 +3,14 @@@
  // SPDX-License-Identifier: AGPL-3.0
  
  import * as React from 'react';
 -import { Table, TableBody, TableRow, TableCell, TableHead, StyleRulesCallback, Theme, WithStyles, withStyles, Typography } from '@material-ui/core';
 +import { Table, TableBody, TableRow, TableCell, TableHead, TableSortLabel, StyleRulesCallback, Theme, WithStyles, withStyles, Typography } from '@material-ui/core';
  import { DataColumn } from './data-column';
  
+ export type DataColumns<T> = Array<DataColumn<T>>;
+ 
  export interface DataTableProps<T> {
      items: T[];
-     columns: Array<DataColumn<T>>;
+     columns: DataColumns<T>;
      onRowClick?: (event: React.MouseEvent<HTMLTableRowElement>, item: T) => void;
      onRowContextMenu?: (event: React.MouseEvent<HTMLTableRowElement>, item: T) => void;
  }

diff --cc src/views-components/data-explorer/data-explorer.tsx
index ded1b5e39cfdfa2c5e0651f6cc6677a8ee7ca492,c4de01a35be7eafc5f6452e6715fbc2cfb47f6b3..ffb21f93fb2c8caa1f7978d4cdda98afced87017
--- 1/src/components/data-explorer/data-explorer.tsx
--- 2/src/views-components/data-explorer/data-explorer.tsx
+++ b/src/views-components/data-explorer/data-explorer.tsx
@@@ -6,12 -6,14 +6,13 @@@ import * as React from 'react'
  import { Typography, Grid, Paper, Toolbar } from '@material-ui/core';
  import IconButton from '@material-ui/core/IconButton';
  import MoreVertIcon from "@material-ui/icons/MoreVert";
- import TableSortLabel from '@material-ui/core/TableSortLabel';
  import { formatFileSize, formatDate } from '../../common/formatters';
  import { DataItem } from './data-item';
- import { mockAnchorFromMouseEvent } from '../popover/helpers';
- import ContextMenu from '../context-menu/context-menu';
 -import { DataColumns } from "../../components/data-table/data-table";
+ import ContextMenu from "../../components/context-menu/context-menu";
+ import ColumnSelector from "../../components/column-selector/column-selector";
+ import DataTable from "../../components/data-table/data-table";
+ import { mockAnchorFromMouseEvent } from "../../components/popover/helpers";
 -import { DataColumn } from "../../components/data-table/data-column";
++import { DataColumn, toggleSortDirection, resetSortDirection } from "../../components/data-table/data-column";
  
  export interface DataExplorerContextActions {
      onAddToFavourite: (dataIitem: DataItem) => void;