From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Wed, 12 Sep 2018 07:47:15 +0000 (+0200)
Subject: Merge branch 'master'
X-Git-Tag: 1.3.0~93^2~8
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/085692af7ee9809e2714edacad1251e78a196bd3

Merge branch 'master'

Feature #13751

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

085692af7ee9809e2714edacad1251e78a196bd3
diff --cc src/store/workbench/workbench-actions.ts
index 7b8fdb25,d1b0fae9..bb41fa28
--- a/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 e075680d,5c4648b6..fee7652b
--- a/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';