[ARVADOS-WORKBENCH2] updated: 1.1.4-444-ge4c3def

[Git user]

Summary of changes:
 src/common/custom-theme.ts                         |  28 +++++-
 src/components/icon/icon.tsx                       |   9 +-
 src/index.tsx                                      |   2 +
 src/models/collection.ts                           |   4 +
 src/models/project.ts                              |   4 +
 src/services/services.ts                           |   2 +-
 .../collection-panel/collection-panel-action.ts    |  30 ++++++
 .../collection-panel/collection-panel-reducer.ts   |  21 +++++
 src/store/context-menu/context-menu-reducer.ts     |   1 -
 src/store/navigation/navigation-action.ts          |   6 +-
 src/store/store.ts                                 |   3 +
 .../action-sets/collection-action-set.ts           |  77 +++++++++++++++
 .../action-sets/favorite-action-set.ts             |   2 +-
 .../context-menu/action-sets/project-action-set.ts |   2 +-
 .../action-sets/resource-action-set.ts             |   2 +-
 .../{action-sets => actions}/favorite-action.tsx   |   2 +-
 src/views-components/context-menu/context-menu.tsx |   3 +-
 src/views/collection-panel/collection-panel.tsx    | 103 +++++++++++++++++++++
 src/views/project-panel/project-panel.tsx          |   2 +-
 src/views/workbench/workbench.tsx                  |  42 +++++++--
 20 files changed, 323 insertions(+), 22 deletions(-)
 create mode 100644 src/store/collection-panel/collection-panel-action.ts
 create mode 100644 src/store/collection-panel/collection-panel-reducer.ts
 create mode 100644 src/views-components/context-menu/action-sets/collection-action-set.ts
 rename src/views-components/context-menu/{action-sets => actions}/favorite-action.tsx (89%)
 create mode 100644 src/views/collection-panel/collection-panel.tsx

       via  e4c3defe5d79926d86f49ba83cfe3125261481cb (commit)
       via  378c6a3a18cd9849bf4233e130a9ffdf250de35e (commit)
       via  7ae86efd9905582df4191910528c3803a68ba81b (commit)
       via  3ee31ce16470660d90fb870e048c2de9fcde6e47 (commit)
       via  ccc52fb9e9a880f8b8e9b15b09c2ebd513575bd4 (commit)
       via  c01f42311966c4d13413ee34dd6c97d5e5ac8b7f (commit)
      from  83d2d86a40a316eb332b9962f9fac2eae3259cc2 (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 e4c3defe5d79926d86f49ba83cfe3125261481cb
Merge: 83d2d86 378c6a3
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Mon Jul 30 13:45:47 2018 +0200

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

diff --cc src/services/services.ts
index 4f191bb,e0d15cc..3174300
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@@ -13,6 -12,5 +13,6 @@@ import { CollectionCreationService } fr
  export const authService = new AuthService(authClient, apiClient);
  export const groupsService = new GroupsService(apiClient);
  export const projectService = new ProjectService(apiClient);
 +export const collectionCreationService = new CollectionCreationService(apiClient);
  export const linkService = new LinkService(apiClient);
- export const favoriteService = new FavoriteService(linkService, groupsService);
+ export const favoriteService = new FavoriteService(linkService, groupsService);
diff --cc src/store/store.ts
index 1a2dd12,c5845d4..5c928fc
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@@ -18,7 -18,7 +18,8 @@@ import { favoritePanelMiddleware } fro
  import { reducer as formReducer } from 'redux-form';
  import { FavoritesState, favoritesReducer } from './favorites/favorites-reducer';
  import { snackbarReducer, SnackbarState } from './snackbar/snackbar-reducer';
 +import { CollectionCreatorState, collectionCreationReducer } from './collections/creator/collection-creator-reducer';
+ import { CollectionPanelState, collectionPanelReducer } from './collection-panel/collection-panel-reducer';
  
  const composeEnhancers =
      (process.env.NODE_ENV === 'development' &&
diff --cc src/views/workbench/workbench.tsx
index 1f2131a,e252440..160e12f
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -37,7 -36,9 +37,10 @@@ import { FavoritePanel, FAVORITE_PANEL_
  import { CurrentTokenDialog } from '../../views-components/current-token-dialog/current-token-dialog';
  import { dataExplorerActions } from '../../store/data-explorer/data-explorer-action';
  import { Snackbar } from '../../views-components/snackbar/snackbar';
 +import { CreateCollectionDialog } from '../../views-components/create-collection-dialog/create-collection-dialog';
+ import { CollectionPanel } from '../collection-panel/collection-panel';
+ import { loadCollection } from '../../store/collection-panel/collection-panel-action';
+ import { getCollectionUrl } from '../../models/collection';
  
  const drawerWidth = 240;
  const appBarHeight = 100;

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


hooks/post-receive
--