Merge branch 'master' into 14155-edit-process
authorJanicki Artur <artur.janicki@contractors.roche.com>
Mon, 10 Sep 2018 15:51:00 +0000 (17:51 +0200)
committerJanicki Artur <artur.janicki@contractors.roche.com>
Mon, 10 Sep 2018 15:51:00 +0000 (17:51 +0200)
refs #14155

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

1  2 
src/store/workbench/workbench-actions.ts
src/views-components/context-menu/action-sets/process-action-set.ts
src/views-components/context-menu/action-sets/process-resource-action-set.ts
src/views/workbench/workbench.tsx

index deb07ab33ce01e2785e11e2d23ea62de9e3df8eb,647395bd77ead7d1b286e2a5a07840bace194d80..d1b0fae953281b562d7edebeb2c9c5d1bcf8435d
@@@ -30,12 -30,14 +30,14 @@@ import * as collectionUpdateActions fro
  import * as collectionMoveActions from '~/store/collections/collection-move-actions';
  import * as processesActions from '../processes/processes-actions';
  import * as processMoveActions from '~/store/processes/process-move-actions';
 +import * as processUpdateActions from '~/store/processes/process-update-actions';
+ import * as processCopyActions from '~/store/processes/process-copy-actions';
  import { trashPanelColumns } from "~/views/trash-panel/trash-panel";
  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 { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog';
  
 -
  export const loadWorkbench = () =>
      async (dispatch: Dispatch, getState: () => RootState) => {
          const { auth, router } = getState();
index 284b9e8e861679a2598539a0a9a0e27e6b8263fd,891064bad89a0456946e20bc04b3849db13a6b29..1a291dfd506d11b9cb358bb5d7ce732542d3dabd
@@@ -12,7 -12,7 +12,8 @@@ import 
  import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
  import { navigateToProcessLogs } from '~/store/navigation/navigation-action';
  import { openMoveProcessDialog } from '~/store/processes/process-move-actions';
 +import { openProcessUpdateDialog } from "~/store/processes/process-update-actions";
+ import { openCopyProcessDialog } from '~/store/processes/process-copy-actions';
  
  export const processActionSet: ContextMenuActionSet = [[
      {
index 9deaff961fde49002070b189b5728c42bfa48238,ac092268f755ec8321bb19896c5962231200d1ff..b1985232e5f5ab5162d409a98a8c4cb5556605eb
@@@ -8,7 -8,7 +8,8 @@@ import { toggleFavorite } from "~/store
  import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, RemoveIcon } from "~/components/icon/icon";
  import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
  import { openMoveProcessDialog } from '~/store/processes/process-move-actions';
 +import { openProcessUpdateDialog } from "~/store/processes/process-update-actions";
+ import { openCopyProcessDialog } from '~/store/processes/process-copy-actions';
  
  export const processResourceActionSet: ContextMenuActionSet = [[
      {
index aa7cfaba7016e9831151ffe3870b0b8ff89eab14,0e85ca3e8488bde391901ababc45f7a53523f518..56fabeba0cadcf2b92733707007d8944023aa31c
@@@ -30,8 -30,8 +30,9 @@@ import { ProcessLogPanel } from '~/view
  import { CreateProjectDialog } from '~/views-components/dialog-forms/create-project-dialog';
  import { CreateCollectionDialog } from '~/views-components/dialog-forms/create-collection-dialog';
  import { CopyCollectionDialog } from '~/views-components/dialog-forms/copy-collection-dialog';
+ import { CopyProcessDialog } from '~/views-components/dialog-forms/copy-process-dialog';
  import { UpdateCollectionDialog } from '~/views-components/dialog-forms/update-collection-dialog';
 +import { UpdateProcessDialog } from '~/views-components/dialog-forms/update-process-dialog';
  import { UpdateProjectDialog } from '~/views-components/dialog-forms/update-project-dialog';
  import { MoveProcessDialog } from '~/views-components/dialog-forms/move-process-dialog';
  import { MoveProjectDialog } from '~/views-components/dialog-forms/move-project-dialog';