Merge branch 'master' into 14137-new-button

refs #14137

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>

diff --cc src/views/workbench/workbench.tsx
index 3f61c5217f3cd7479753ca277ddf3cd3644ead8b,5c4648b6d35810e63520943c7b922fc9205792d1..db389572467c5dbd7d2fddbc4a938d21c57d0e21
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -40,10 -40,11 +40,11 @@@ import { MoveCollectionDialog } from '~
  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 { ProcessCommandDialog } from '~/views-components/process-command-dialog/process-command-dialog';
  
 -type CssRules = 'root' | 'contentWrapper' | 'content' | 'appBar';
 +type CssRules = 'root' | 'asidePanel' | 'contentWrapper' | 'content' | 'appBar';
  
  const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
      root: {