From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Tue, 26 Jun 2018 11:12:55 +0000 (+0200)
Subject: merge-conflicts
X-Git-Tag: 1.2.0~66^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/78915a29d2911b1c442920b614f3e48da9e567c2

merge-conflicts

Feature #13679

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
---

78915a29d2911b1c442920b614f3e48da9e567c2
diff --cc src/components/data-table/data-table.tsx
index bf0854b9,e86113ef..e8a5b24e
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@@ -38,7 -44,7 +38,7 @@@ class DataTable<T> extends React.Compon
      renderHeadCell = (column: DataColumn<T>, index: number) => {
          const { name, key, renderHeader, filters, sortDirection } = column;
          const { onSortToggle, onFiltersChange } = this.props;
-         return <TableCell key={key || index} style={{minWidth: column.width}}>
 -        return <TableCell key={key || index}>
++        return <TableCell key={key || index} style={{width: column.width, minWidth: column.width}}>
              {renderHeader ?
                  renderHeader() :
                  filters
diff --cc src/views-components/project-explorer/project-explorer.tsx
index b54fd72b,1018ef5e..94ae4389
--- a/src/views-components/project-explorer/project-explorer.tsx
+++ b/src/views-components/project-explorer/project-explorer.tsx
@@@ -65,8 -65,7 +67,8 @@@ class ProjectExplorer extends React.Com
                  name: "Group",
                  selected: true
              }],
-             render: item => renderType(item.type),
 -            render: item => renderType(item.kind)
++            render: item => renderType(item.kind),
 +            width: "125px"
          }, {
              name: "Owner",
              selected: true,