From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Mon, 26 Nov 2018 14:01:39 +0000 (+0100)
Subject: Merge branch 'master'
X-Git-Tag: 1.3.0~12^2^2~1^2~2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/1bbdd9c70d0099e0bf46b3c1ac55e423e3406314

Merge branch 'master'

Feature #14258

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

1bbdd9c70d0099e0bf46b3c1ac55e423e3406314
diff --cc src/components/data-explorer/data-explorer.tsx
index c9009c8a,f863ba13..cb979c7b
--- a/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@@ -7,11 -7,10 +7,11 @@@ import { Grid, Paper, Toolbar, StyleRul
  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';