Merge branch 'master' into 14643-re-run-workflow

[arvados-workbench2.git] / src / store / context-menu / context-menu-actions.ts

diff --git a/src/store/context-menu/context-menu-actions.ts b/src/store/context-menu/context-menu-actions.ts
index 06d10185ffb90e49e5910823d6154f37035e2929..269495e5d3af4cee52cb2fd819320a4d4b4c600a 100644 (file)
--- a/src/store/context-menu/context-menu-actions.ts
+++ b/src/store/context-menu/context-menu-actions.ts
@@ -17,7 +17,6 @@ import { RepositoryResource } from '~/models/repositories';
 import { SshKeyResource } from '~/models/ssh-key';
 import { VirtualMachinesResource } from '~/models/virtual-machines';
 import { KeepServiceResource } from '~/models/keep-services';
-import { NodeResource } from '~/models/node';
 import { ApiClientAuthorization } from '~/models/api-client-authorization';
 import { ProcessResource } from '~/models/process';
 
@@ -37,6 +36,7 @@ export type ContextMenuResource = {
     menuKind: ContextMenuKind;
     isTrashed?: boolean;
     outputUuid?: string;
+    workflowUuid?: string;
 };
 
 export const isKeyboardClick = (event: React.MouseEvent<HTMLElement>) => event.nativeEvent.detail === 0;
@@ -112,24 +112,24 @@ export const openKeepServiceContextMenu = (event: React.MouseEvent<HTMLElement>,
         }));
     };
 
-export const openComputeNodeContextMenu = (event: React.MouseEvent<HTMLElement>, computeNode: NodeResource) =>
+export const openComputeNodeContextMenu = (event: React.MouseEvent<HTMLElement>, resourceUuid: string) =>
     (dispatch: Dispatch) => {
         dispatch<any>(openContextMenu(event, {
             name: '',
-            uuid: computeNode.uuid,
-            ownerUuid: computeNode.ownerUuid,
+            uuid: resourceUuid,
+            ownerUuid: '',
             kind: ResourceKind.NODE,
             menuKind: ContextMenuKind.NODE
         }));
     };
 
 export const openApiClientAuthorizationContextMenu =
-    (event: React.MouseEvent<HTMLElement>, apiClientAuthorization: ApiClientAuthorization) =>
+    (event: React.MouseEvent<HTMLElement>, resourceUuid: string) =>
         (dispatch: Dispatch) => {
             dispatch<any>(openContextMenu(event, {
                 name: '',
-                uuid: apiClientAuthorization.uuid,
-                ownerUuid: apiClientAuthorization.ownerUuid,
+                uuid: resourceUuid,
+                ownerUuid: '',
                 kind: ResourceKind.API_CLIENT_AUTHORIZATION,
                 menuKind: ContextMenuKind.API_CLIENT_AUTHORIZATION
             }));
@@ -188,6 +188,7 @@ export const openProcessContextMenu = (event: React.MouseEvent<HTMLElement>, pro
                 name: res.name,
                 description: res.description,
                 outputUuid: res.outputUuid || '',
+                workflowUuid: res.properties.workflowUuid || '',
                 menuKind: ContextMenuKind.PROCESS
             }));
         }