merge master

Feature #13893

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

diff --cc src/services/services.ts
index 4f191bbc87bc14f7ea902a34270ed71f9452da1e,e0d15cc40a40b855e599a76d151c70c4ef5a17cb..31743003126ad95f63663d6996d6445e2c98d441
--- 1/src/services/services.ts
--- 2/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 1a2dd12f71d81a7bcde760f00b968c17cf8592b7,c5845d4827f28163f4ad3578b6863229427700ad..5c928fcad7b8c1952e1301ff19fd76ba75fa0582
--- 1/src/store/store.ts
--- 2/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/project-panel/project-panel.tsx
Simple merge

diff --cc src/views/workbench/workbench.tsx
index 1f2131a229c381cca8e7870410d83ae0670db5aa,e25244018c8801f31f913c0af5aed526fdc6f49b..160e12f84017e5a99e19c6e0084d3546dbdd59c9
--- 1/src/views/workbench/workbench.tsx
--- 2/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;