merge master

Feature #13858

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

diff --combined src/views/workbench/workbench.tsx
index 27470fa43086c2ebdd78630eec1db39b01ecdefc,82a868e6dece3fb472d53d11b1fa99fa8c20461d..1d53842b422bcbcb4484b6607c355d46fa5d8445
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -24,8 -24,6 +24,6 @@@ import { AuthService } from "~/services
  import { RenameFileDialog } from '~/views-components/rename-file-dialog/rename-file-dialog';
  import { FileRemoveDialog } from '~/views-components/file-remove-dialog/file-remove-dialog';
  import { MultipleFilesRemoveDialog } from '~/views-components/file-remove-dialog/multiple-files-remove-dialog';
- import { UploadCollectionFilesDialog } from '~/views-components/upload-collection-files-dialog/upload-collection-files-dialog';
- import { CollectionPartialCopyDialog } from '~/views-components/collection-partial-copy-dialog/collection-partial-copy-dialog';
  import { SidePanel } from '~/views-components/side-panel/side-panel';
  import { Routes } from '~/routes/routes';
  import { Breadcrumbs } from '~/views-components/breadcrumbs/breadcrumbs';
@@@ -36,7 -34,9 +34,10 @@@ import { UpdateCollectionDialog } from 
  import { UpdateProjectDialog } from '~/views-components/dialog-forms/update-project-dialog';
  import { MoveProjectDialog } from '~/views-components/dialog-forms/move-project-dialog';
  import { MoveCollectionDialog } from '~/views-components/dialog-forms/move-collection-dialog';
 +import { ProcessPanel } from '~/views/process-panel/process-panel';
+ import { UploadCollectionFilesDialog } from '~/views-components/dialog-forms/upload-collection-files-dialog';
+ import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog';
+ 
  
  const APP_BAR_HEIGHT = 100;
  
@@@ -165,7 -165,6 +166,7 @@@ export const Workbench = withStyles(sty
                                      <Route path={Routes.PROJECTS} component={ProjectPanel} />
                                      <Route path={Routes.COLLECTIONS} component={CollectionPanel} />
                                      <Route path={Routes.FAVORITES} component={FavoritePanel} />
 +                                    <Route path={Routes.PROCESS} component={ProcessPanel} />
                                  </Switch>
                              </div>
                              {user && <DetailsPanel />}
@@@ -175,7 -174,7 +176,7 @@@
                          <CreateProjectDialog />
                          <CreateCollectionDialog />
                          <RenameFileDialog />
-                         <CollectionPartialCopyDialog />
+                         <PartialCopyCollectionDialog />
                          <FileRemoveDialog />
                          <CopyCollectionDialog />
                          <MultipleFilesRemoveDialog />