Merge branch 'master'

Feature #13855

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --cc src/index.tsx
index 64ff70571255047c0e405c4d92cb8c2711d7da87,b2c00f988c0d2ee4041cbd36c1e856bb06c1468c..c950c55727927e98268206e2c1abfae4317bbb37
--- 1/src/index.tsx
--- 2/src/index.tsx
+++ b/src/index.tsx
@@@ -24,15 -24,13 +24,17 @@@ import { rootProjectActionSet } from ".
  import { projectActionSet } from "./views-components/context-menu/action-sets/project-action-set";
  import { resourceActionSet } from './views-components/context-menu/action-sets/resource-action-set';
  import { favoriteActionSet } from "./views-components/context-menu/action-sets/favorite-action-set";
 +import { collectionFilesActionSet } from './views-components/context-menu/action-sets/collection-files-action-set';
 +import { collectionFilesItemActionSet } from './views-components/context-menu/action-sets/collection-files-item-action-set';
+ import { collectionActionSet } from './views-components/context-menu/action-sets/collection-action-set';
  
  addMenuActionSet(ContextMenuKind.ROOT_PROJECT, rootProjectActionSet);
  addMenuActionSet(ContextMenuKind.PROJECT, projectActionSet);
  addMenuActionSet(ContextMenuKind.RESOURCE, resourceActionSet);
  addMenuActionSet(ContextMenuKind.FAVORITE, favoriteActionSet);
 +addMenuActionSet(ContextMenuKind.COLLECTION_FILES, collectionFilesActionSet);
 +addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActionSet);
+ addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet); 
  
  fetchConfig()
      .then(config => {

diff --cc src/store/store.ts
index 33e537c019641582ca9b0be76223cd8884fd1027,5c928fcad7b8c1952e1301ff19fd76ba75fa0582..9d888efb6163b914057b10a0f7f84559943e3ddc
--- 1/src/store/store.ts
--- 2/src/store/store.ts
+++ b/src/store/store.ts
@@@ -18,8 -18,8 +18,10 @@@ 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 { CollectionPanelFilesState } from './collection-panel/collection-panel-files/collection-panel-files-state';
 +import { collectionPanelFilesReducer } from './collection-panel/collection-panel-files/collections-panel-files-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-components/context-menu/context-menu.tsx
index 20ed66990b565883ed1768c51ade0f527aaf9985,4ec702914169e27d839df59b8a7d94bb497d4b26..8b00893703839c5bbd9fe64d932348ff08474f4b
--- 1/src/views-components/context-menu/context-menu.tsx
--- 2/src/views-components/context-menu/context-menu.tsx
+++ b/src/views-components/context-menu/context-menu.tsx
@@@ -60,6 -60,5 +60,7 @@@ export enum ContextMenuKind 
      PROJECT = "Project",
      RESOURCE = "Resource",
      FAVORITE = "Favorite",
 +    COLLECTION_FILES = "CollectionFiles",
 +    COLLECTION_FILES_ITEM = "CollectionFilesItem",
+     COLLECTION = 'Collection'
  }

diff --cc src/views/workbench/workbench.tsx
index 34030f1e79398cd44c3db209dfba8b49c6abde0d,160e12f84017e5a99e19c6e0084d3546dbdd59c9..5a28413c7d0975b65056a12fe91e96a3f26d0cd5
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -36,7 -37,10 +37,11 @@@ 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 { CollectionPanelFiles } from '../../views-components/collection-panel-files/collection-panel-files';
+ 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;
@@@ -213,7 -217,7 +218,8 @@@ export const Workbench = withStyles(sty
                                  <Switch>
                                      <Route path="/projects/:id" render={this.renderProjectPanel} />
                                      <Route path="/favorites" render={this.renderFavoritePanel} />
+                                     <Route path="/collections/:id" render={this.renderCollectionPanel} />
 +                                    <Route path="/" render={() => <CollectionPanelFiles />} />
                                  </Switch>
                              </div>
                              {user && <DetailsPanel />}