merge-conflicts

Feature #13679

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

diff --cc src/components/data-table/data-table.tsx
index bf0854b925597ab1de60e28d2276b8736b15110c,e86113efdeac14a6e0f1928265b622875f582f19..e8a5b24e02c2fe22488236f1ae703f36ef482c8d
--- 1/src/components/data-table/data-table.tsx
--- 2/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 b54fd72b06de7ce55c547be4d0d23ea9ff3955f4,1018ef5e5fa428a351226ff8cf4efdc21b6d2412..94ae438986eeb3145ba02a1dfc872966de18c91f
--- 1/src/views-components/project-explorer/project-explorer.tsx
--- 2/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,