Merge branch 'master'

[arvados-workbench2.git] / src / views-components / context-menu / action-sets / collection-action-set.ts

diff --git a/src/views-components/context-menu/action-sets/collection-action-set.ts b/src/views-components/context-menu/action-sets/collection-action-set.ts
index 240590684dc62798c1907dc19ffac2a9f4085644..5fb4f2d11d0058864a2a58ab61076957c961f656 100644 (file)
--- a/src/views-components/context-menu/action-sets/collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-action-set.ts
@@ -8,9 +8,8 @@ import { toggleFavorite } from "~/store/favorites/favorites-actions";
 import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, ProvenanceGraphIcon, AdvancedIcon, RemoveIcon } from "~/components/icon/icon";
 import { openUpdater } from "~/store/collections/updater/collection-updater-action";
 import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
-import { openMakeACopyDialog, MAKE_A_COPY_DIALOG } from "~/views-components/make-a-copy-dialog/make-a-copy-dialog";
-import { openMoveToDialog } from "../../move-to-dialog/move-to-dialog";
-import { reset } from 'redux-form';
+import { openMoveCollectionDialog } from '~/store/move-collection-dialog/move-collection-dialog';
+import { openProjectCopyDialog } from "~/views-components/project-copy-dialog/project-copy-dialog";
 
 export const collectionActionSet: ContextMenuActionSet = [[
     {
@@ -30,7 +29,7 @@ export const collectionActionSet: ContextMenuActionSet = [[
     {
         icon: MoveToIcon,
         name: "Move to",
-        execute: dispatch => dispatch<any>(openMoveToDialog())
+        execute: (dispatch, resource) => dispatch<any>(openMoveCollectionDialog(resource))
     },
     {
         component: ToggleFavoriteAction,
@@ -44,8 +43,7 @@ export const collectionActionSet: ContextMenuActionSet = [[
         icon: CopyIcon,
         name: "Copy to project",
         execute: (dispatch, resource) => {
-            dispatch(reset(MAKE_A_COPY_DIALOG));
-            dispatch<any>(openMakeACopyDialog({name: resource.name, projectUuid: resource.uuid}));
+            dispatch<any>(openProjectCopyDialog({name: resource.name, projectUuid: resource.uuid}));
         }
     },
     {