Merge branch 'master' into 13902-ui-move-to-popup

refs #13902

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

diff --combined src/views/workbench/workbench.tsx
index 9210fb32d54073c5dea97c269975f8af0e9b5778,5cf632faf174b655b91b29e456efaceba68d6849..cffae74388e7728cc7c66996973dd45bfce05f22
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -48,7 -48,6 +48,7 @@@ import { RenameFileDialog } from '~/vie
  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 { MoveToProjectDialog } from '../../views-components/move-to-dialog/move-to-dialog';
  import { COLLECTION_CREATE_DIALOG } from '~/views-components/dialog-create/dialog-collection-create';
  import { PROJECT_CREATE_DIALOG } from '~/views-components/dialog-create/dialog-project-create';
  
@@@ -243,7 -242,6 +243,7 @@@ export const Workbench = withStyles(sty
                          <CreateProjectDialog />
                          <CreateCollectionDialog />
                          <RenameFileDialog />
 +                        <MoveToProjectDialog />
                          <DialogCollectionCreateWithSelectedFile />
                          <FileRemoveDialog />
                          <MultipleFilesRemoveDialog />
@@@ -259,7 -257,7 +259,7 @@@
  
              renderCollectionPanel = (props: RouteComponentProps<{ id: string }>) => <CollectionPanel
                  onItemRouteChange={(collectionId) => {
-                     this.props.dispatch<any>(loadCollection(collectionId, ResourceKind.COLLECTION));
+                     this.props.dispatch<any>(loadCollection(collectionId));
                      this.props.dispatch<any>(loadCollectionTags(collectionId));
                  }}
                  onContextMenu={(event, item) => {
@@@ -300,7 -298,7 +300,7 @@@
                  onItemDoubleClick={item => {
                      switch (item.kind) {
                          case ResourceKind.COLLECTION:
-                             this.props.dispatch(loadCollection(item.uuid, item.kind as ResourceKind));
+                             this.props.dispatch(loadCollection(item.uuid));
                              this.props.dispatch(push(getCollectionUrl(item.uuid)));
                          default:
                              this.props.dispatch(setProjectItem(item.uuid, ItemMode.ACTIVE));
@@@ -327,7 -325,7 +327,7 @@@
                  onItemDoubleClick={item => {
                      switch (item.kind) {
                          case ResourceKind.COLLECTION:
-                             this.props.dispatch(loadCollection(item.uuid, item.kind as ResourceKind));
+                             this.props.dispatch(loadCollection(item.uuid));
                              this.props.dispatch(push(getCollectionUrl(item.uuid)));
                          default:
                              this.props.dispatch(loadDetails(item.uuid, ResourceKind.PROJECT));