Merge branch 'master'

Feature #13751

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

diff --cc src/routes/routes.ts
Simple merge

diff --cc src/store/workbench/workbench-actions.ts
index 7b8fdb25ad83f97ccf12260472e94f0758ed4f64,d1b0fae953281b562d7edebeb2c9c5d1bcf8435d..bb41fa28fc99c89eaf70933d98aa8ede644e1749
--- 1/src/store/workbench/workbench-actions.ts
--- 2/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@@ -33,9 -36,7 +36,10 @@@ import { trashPanelColumns } from "~/vi
  import { loadTrashPanel, trashPanelActions } from "~/store/trash-panel/trash-panel-action";
  import { initProcessLogsPanel } from '../process-logs-panel/process-logs-panel-actions';
  import { loadProcessPanel } from '~/store/process-panel/process-panel-actions';
 +import { sharedWithMePanelActions } from '~/store/shared-with-me-panel/shared-with-me-panel-actions';
 +import { loadSharedWithMePanel } from '../shared-with-me-panel/shared-with-me-panel-actions';
 +
+ import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog';
  
  export const loadWorkbench = () =>
      async (dispatch: Dispatch, getState: () => RootState) => {

diff --cc src/views/workbench/workbench.tsx
index e075680de4981262cc4147eb61f755d9069646d2,5c4648b6d35810e63520943c7b922fc9205792d1..fee7652b0ae89fbd619037ecfa6fc81855cd75a3
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -36,11 -39,10 +39,11 @@@ import { MoveProjectDialog } from '~/vi
  import { MoveCollectionDialog } from '~/views-components/dialog-forms/move-collection-dialog';
  import { FilesUploadCollectionDialog } from '~/views-components/dialog-forms/files-upload-collection-dialog';
  import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog';
- 
  import { TrashPanel } from "~/views/trash-panel/trash-panel";
- import { MainContentBar } from '../../views-components/main-content-bar/main-content-bar';
+ import { MainContentBar } from '~/views-components/main-content-bar/main-content-bar';
  import { Grid } from '@material-ui/core';
 +import { SharedWithMePanel } from '../shared-with-me-panel/shared-with-me-panel';
+ import { ProcessCommandDialog } from '~/views-components/process-command-dialog/process-command-dialog';
  
  type CssRules = 'root' | 'contentWrapper' | 'content' | 'appBar';