Merge branch '14643-re-run-workflow'

[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 2dc2a92e582bd34d34f9e7e676e47814a0735286..d6095d10ce4b2ce0a8b64aa56ab59e2aa0ebbe1b 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
@@ -40,12 +40,6 @@ export const collectionActionSet: ContextMenuActionSet = [[
             });
         }
     },
-    {
-        component: ToggleTrashAction,
-        execute: (dispatch, resource) => {
-            dispatch<any>(toggleCollectionTrashed(resource.uuid, resource.isTrashed!!));
-        }
-    },
     {
         icon: MoveToIcon,
         name: "Move to",
@@ -76,10 +70,16 @@ export const collectionActionSet: ContextMenuActionSet = [[
     {
         icon: AdvancedIcon,
         name: "Advanced",
-        execute: (dispatch, { uuid, ownerUuid }) => {
-            dispatch<any>(openAdvancedTabDialog(uuid, ownerUuid));
+        execute: (dispatch, resource) => {
+            dispatch<any>(openAdvancedTabDialog(resource.uuid));
         }
-    }
+    },
+    {
+        component: ToggleTrashAction,
+        execute: (dispatch, resource) => {
+            dispatch<any>(toggleCollectionTrashed(resource.uuid, resource.isTrashed!!));
+        }
+    },
     // {
     //     icon: RemoveIcon,
     //     name: "Remove",