[ARVADOS-WORKBENCH2] updated: 1.1.4-148-g78915a2

[Git user]

Summary of changes:
 src/components/data-table/data-table.tsx           |  2 +-
 src/index.tsx                                      |  6 +-
 src/models/resource.ts                             | 24 +++++-
 src/services/auth-service/auth-service.ts          |  4 +
 .../collection-service/collection-service.ts       |  3 +-
 src/services/project-service/project-service.ts    |  3 +-
 src/store/collection/collection-reducer.test.ts    |  5 +-
 src/store/collection/collection-reducer.ts         |  2 +-
 src/store/navigation/navigation-action.ts          | 63 ++++++++++++++
 src/store/project/project-reducer.test.ts          | 72 ++++++++--------
 src/store/project/project-reducer.ts               | 78 ++++++++++++-----
 src/store/store.ts                                 |  3 +-
 .../project-explorer/project-explorer-item.ts      | 16 +++-
 .../project-explorer/project-explorer.tsx          | 19 +++--
 src/views/project-panel/project-panel-selectors.ts | 57 +++++++++++--
 src/views/project-panel/project-panel.tsx          | 34 +++++---
 src/views/workbench/workbench.tsx                  | 98 ++++++++--------------
 tslint.json                                        |  4 +-
 18 files changed, 345 insertions(+), 148 deletions(-)
 create mode 100644 src/store/navigation/navigation-action.ts

       via  78915a29d2911b1c442920b614f3e48da9e567c2 (commit)
       via  4beb141298fce3da40f07e1a0a08f29ac28dfd09 (commit)
       via  b0ea85a58cf15903e67c5a7161d7887b03af713e (commit)
       via  948bf5f1e58f1003630b3b564e813557d1f54d84 (commit)
       via  e9fe89a00d2aea95b7e6c5ecdbeb4f6a583070b1 (commit)
       via  5fd5db805554d3eddd46cc911a5108fbb74b3cfc (commit)
       via  6e44781d01db889030cc5f7819aa7f15fe837e19 (commit)
       via  969254757ab4c21840faedf2bd1e4297c35203ac (commit)
      from  3eaf143e04107bf25e15aaef4d1b4d5d7ef68f86 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 78915a29d2911b1c442920b614f3e48da9e567c2
Merge: 3eaf143 4beb141
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Tue Jun 26 13:12:55 2018 +0200

    merge-conflicts
    
    Feature #13679
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>

diff --cc src/components/data-table/data-table.tsx
index bf0854b,e86113e..e8a5b24
--- 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 b54fd72,1018ef5..94ae438
--- 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,

-----------------------------------------------------------------------


hooks/post-receive
--