21128: fixed navToOutput and circular deps Arvados-DCO-1.1-Signed-off-by: Lisa Knox...

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

diff --git a/src/views-components/context-menu/action-sets/process-resource-action-set.ts b/src/views-components/context-menu/action-sets/process-resource-action-set.ts
index 7d85518d2d217050dfbbe6a0e7d6f0c92576f10a..2aa7faa1242369be4ea985bad80805b94529b72f 100644 (file)
--- a/src/views-components/context-menu/action-sets/process-resource-action-set.ts
+++ b/src/views-components/context-menu/action-sets/process-resource-action-set.ts
@@ -60,8 +60,8 @@ export const readOnlyProcessResourceActionSet: ContextMenuActionSet = [
             icon: OutputIcon,
             name: "Outputs",
             execute: (dispatch, resources) => {
-                if (resources[0].outputUuid) {
-                    dispatch<any>(navigateToOutput(resources[0].outputUuid));
+                if (resources[0]) {
+                    dispatch<any>(navigateToOutput(resources[0]));
                 }
             },
         },
@@ -116,17 +116,16 @@ export const processResourceActionSet: ContextMenuActionSet = [
     ],
 ];
 
-export const runningProcessResourceActionSet = [
+const runningProcessOnlyActionSet: ContextMenuActionSet = [
     [
-        ...processResourceActionSet.reduce((prev, next) => prev.concat(next), []),
         {
             name: "CANCEL",
             icon: StopIcon,
-            execute: (dispatch, resource) => {
-                dispatch(cancelRunningWorkflow(resource.uuid));
+            execute: (dispatch, resources) => {
+                dispatch<any>(cancelRunningWorkflow(resources[0].uuid));
             },
         },
-    ],
+    ]
 ];
 
 export const processResourceAdminActionSet: ContextMenuActionSet = [
@@ -144,24 +143,16 @@ export const processResourceAdminActionSet: ContextMenuActionSet = [
     ],
 ];
 
-export const runningProcessResourceAdminActionSet: ContextMenuActionSet = [
+export const runningProcessResourceActionSet = [
     [
         ...processResourceActionSet.reduce((prev, next) => prev.concat(next), []),
-        {
-            component: TogglePublicFavoriteAction,
-            name: "Add to public favorites",
-            execute: (dispatch, resources) => {
-                dispatch<any>(togglePublicFavorite(resources[0])).then(() => {
-                    dispatch<any>(publicFavoritePanelActions.REQUEST_ITEMS());
-                });
-            },
-        },
-        {
-            name: "CANCEL",
-            icon: StopIcon,
-            execute: (dispatch, resources) => {
-                dispatch<any>(cancelRunningWorkflow(resources[0].uuid));
-            },
-        },
+        ...runningProcessOnlyActionSet.reduce((prev, next) => prev.concat(next), []),
+    ],
+];
+
+export const runningProcessResourceAdminActionSet: ContextMenuActionSet = [
+    [
+        ...processResourceAdminActionSet.reduce((prev, next) => prev.concat(next), []),
+        ...runningProcessOnlyActionSet.reduce((prev, next) => prev.concat(next), []),
     ],
 ];