Merge branch 'master' into 13979-creating-project-name-of-previously-created-project...

refs #13979

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

diff --combined src/views/workbench/workbench.tsx
index fc716a56e663b9eee5372412b751ba05385f0118,8377744c1c0a6d0d28f4e9ffaeae24fb41f832d5..ab7ac38bc90cfae8518974dc867373015c0804b8
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -13,7 -13,6 +13,7 @@@ import { RootState } from "../../store/
  import { MainAppBar, MainAppBarActionProps, MainAppBarMenuItem } from '../../views-components/main-app-bar/main-app-bar';
  import { Breadcrumb } from '../../components/breadcrumbs/breadcrumbs';
  import { push } from 'react-router-redux';
 +import { reset } from 'redux-form';
  import { ProjectTree } from '../../views-components/project-tree/project-tree';
  import { TreeItem } from "../../components/tree/tree";
  import { getTreePath } from '../../store/project/project-reducer';
@@@ -47,8 -46,6 +47,8 @@@ import { RenameFileDialog } from '../..
  import { FileRemoveDialog } from '../../views-components/file-remove-dialog/file-remove-dialog';
  import { MultipleFilesRemoveDialog } from '../../views-components/file-remove-dialog/multiple-files-remove-dialog';
  import { DialogCollectionCreateWithSelectedFile } from '../../views-components/create-collection-dialog-with-selected/create-collection-dialog-with-selected';
 +import { COLLECTION_CREATE_DIALOG } from '../../views-components/dialog-create/dialog-collection-create';
 +import { PROJECT_CREATE_DIALOG } from '../../views-components/dialog-create/dialog-project-create';
  
  const DRAWER_WITDH = 240;
  const APP_BAR_HEIGHT = 100;
@@@ -260,6 -257,7 +260,7 @@@ export const Workbench = withStyles(sty
                      this.openContextMenu(event, {
                          uuid: item.uuid,
                          name: item.name,
+                         description: item.description,
                          kind: ContextMenuKind.COLLECTION
                      });
                  }}
@@@ -268,11 -266,20 +269,20 @@@
              renderProjectPanel = (props: RouteComponentProps<{ id: string }>) => <ProjectPanel
                  onItemRouteChange={itemId => this.props.dispatch(setProjectItem(itemId, ItemMode.ACTIVE))}
                  onContextMenu={(event, item) => {
+                     let kind: ContextMenuKind;
  
-                     const kind = item.kind === ResourceKind.PROJECT ? ContextMenuKind.PROJECT : ContextMenuKind.RESOURCE;
+                     if (item.kind === ResourceKind.PROJECT) {
+                         kind = ContextMenuKind.PROJECT;
+                     } else if (item.kind === ResourceKind.COLLECTION) {
+                         kind = ContextMenuKind.COLLECTION_RESOURCE;
+                     } else {
+                         kind = ContextMenuKind.RESOURCE;
+                     }
+                     
                      this.openContextMenu(event, {
                          uuid: item.uuid,
                          name: item.name,
+                         description: item.description,
                          kind
                      });
                  }}
@@@ -358,16 -365,14 +368,16 @@@
              }
  
              handleProjectCreationDialogOpen = (itemUuid: string) => {
 +                this.props.dispatch(reset(PROJECT_CREATE_DIALOG));
                  this.props.dispatch(projectActions.OPEN_PROJECT_CREATOR({ ownerUuid: itemUuid }));
              }
  
              handleCollectionCreationDialogOpen = (itemUuid: string) => {
 +                this.props.dispatch(reset(COLLECTION_CREATE_DIALOG));
                  this.props.dispatch(collectionCreateActions.OPEN_COLLECTION_CREATOR({ ownerUuid: itemUuid }));
              }
  
-             openContextMenu = (event: React.MouseEvent<HTMLElement>, resource: { name: string; uuid: string; kind: ContextMenuKind; }) => {
+             openContextMenu = (event: React.MouseEvent<HTMLElement>, resource: { name: string; uuid: string; description?: string; kind: ContextMenuKind; }) => {
                  event.preventDefault();
                  this.props.dispatch(
                      contextMenuActions.OPEN_CONTEXT_MENU({