From a08147758267cc6a07b7e303772d1d010df6e118 Mon Sep 17 00:00:00 2001
From: Tianchu Zhao <evantczhao@gmail.com>
Date: Sat, 9 Oct 2021 01:44:10 +1100
Subject: [PATCH] feat(ui): resume on selected node. Fixes #5763 (#6885)

Signed-off-by: Tianchu Zhao <evantczhao@gmail.com>
---
 .../app/shared/services/workflows-service.ts  |  7 ++-
 ui/src/app/shared/workflow-operations-map.ts  |  2 +-
 .../workflow-details/workflow-details.tsx     |  9 +++
 .../workflow-node-info/workflow-node-info.tsx |  7 ++-
 workflow/util/util.go                         |  1 +
 workflow/util/util_test.go                    | 61 +++++++++++++++++++
 6 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/ui/src/app/shared/services/workflows-service.ts b/ui/src/app/shared/services/workflows-service.ts
index e2a02e77201e..e00a394b7a62 100644
--- a/ui/src/app/shared/services/workflows-service.ts
+++ b/ui/src/app/shared/services/workflows-service.ts
@@ -112,8 +112,11 @@ export class WorkflowsService {
         return requests.put(`api/v1/workflows/${namespace}/${name}/suspend`).then(res => res.body as Workflow);
     }
 
-    public resume(name: string, namespace: string) {
-        return requests.put(`api/v1/workflows/${namespace}/${name}/resume`).then(res => res.body as Workflow);
+    public resume(name: string, namespace: string, nodeFieldSelector: string) {
+        return requests
+            .put(`api/v1/workflows/${namespace}/${name}/resume`)
+            .send({nodeFieldSelector})
+            .then(res => res.body as Workflow);
     }
 
     public stop(name: string, namespace: string) {
diff --git a/ui/src/app/shared/workflow-operations-map.ts b/ui/src/app/shared/workflow-operations-map.ts
index 28804bb32ac9..665b32600d8f 100644
--- a/ui/src/app/shared/workflow-operations-map.ts
+++ b/ui/src/app/shared/workflow-operations-map.ts
@@ -48,7 +48,7 @@ export const WorkflowOperationsMap: WorkflowOperations = {
         title: 'RESUME',
         iconClassName: 'fa fa-play',
         disabled: (wf: Workflow) => !Utils.isWorkflowSuspended(wf),
-        action: (wf: Workflow) => services.workflows.resume(wf.metadata.name, wf.metadata.namespace)
+        action: (wf: Workflow) => services.workflows.resume(wf.metadata.name, wf.metadata.namespace, null)
     },
     STOP: {
         title: 'STOP',
diff --git a/ui/src/app/workflows/components/workflow-details/workflow-details.tsx b/ui/src/app/workflows/components/workflow-details/workflow-details.tsx
index 6d6af66d9ff9..23750cdd783f 100644
--- a/ui/src/app/workflows/components/workflow-details/workflow-details.tsx
+++ b/ui/src/app/workflows/components/workflow-details/workflow-details.tsx
@@ -224,6 +224,14 @@ export const WorkflowDetails = ({history, location, match}: RouteComponentProps<
         }
     };
 
+    const renderResumePopup = () => {
+        return popup.confirm('Confirm', `Are you sure you want to resume node: ${nodeId}?`).then(yes => {
+            if (yes) {
+                services.workflows.resume(workflow.metadata.name, workflow.metadata.namespace, 'id=' + nodeId).catch(setError);
+            }
+        });
+    };
+
     const selectedNode = workflow && workflow.status && workflow.status.nodes && workflow.status.nodes[nodeId];
     return (
         <Page
@@ -283,6 +291,7 @@ export const WorkflowDetails = ({history, location, match}: RouteComponentProps<
                                         onShowEvents={() => setSidePanel(`events:${nodeId}`)}
                                         onShowYaml={() => setSidePanel(`yaml:${nodeId}`)}
                                         archived={false}
+                                        onResume={() => renderResumePopup()}
                                     />
                                 )}
                             </div>
diff --git a/ui/src/app/workflows/components/workflow-node-info/workflow-node-info.tsx b/ui/src/app/workflows/components/workflow-node-info/workflow-node-info.tsx
index 716f9b594eb5..b5621fa1f3aa 100644
--- a/ui/src/app/workflows/components/workflow-node-info/workflow-node-info.tsx
+++ b/ui/src/app/workflows/components/workflow-node-info/workflow-node-info.tsx
@@ -61,6 +61,7 @@ interface Props {
     onShowYaml?: (nodeId: string) => any;
     onTabSelected?: (tabSelected: string) => void;
     selectedTabKey?: string;
+    onResume?: () => void;
 }
 
 const AttributeRow = (attr: {title: string; value: any}) => (
@@ -149,12 +150,16 @@ const WorkflowNodeSummary = (props: Props) => {
             value: <ResourcesDuration resourcesDuration={props.node.resourcesDuration} />
         });
     }
-
     const showLogs = (x = 'main') => props.onShowContainerLogs(props.node.id, x);
     return (
         <div className='white-box'>
             <div className='white-box__details'>{<AttributeRows attributes={attributes} />}</div>
             <div>
+                {props.node.type === 'Suspend' && props.onResume && (
+                    <Button icon='play' onClick={() => props.onResume()}>
+                        RESUME
+                    </Button>
+                )}{' '}
                 {props.node.type !== 'Container' && props.onShowYaml && <Button onClick={() => props.onShowYaml(props.node.id)}>MANIFEST</Button>}{' '}
                 {props.node.type === 'Pod' && props.onShowContainerLogs && (
                     <DropDownButton
diff --git a/workflow/util/util.go b/workflow/util/util.go
index 62451bad7169..0f6a92528346 100644
--- a/workflow/util/util.go
+++ b/workflow/util/util.go
@@ -432,6 +432,7 @@ func SelectorMatchesNode(selector fields.Selector, node wfv1.NodeStatus) bool {
 		"templateName": node.TemplateName,
 		"phase":        string(node.Phase),
 		"name":         node.Name,
+		"id":           node.ID,
 	}
 	if node.TemplateRef != nil {
 		nodeFields["templateRef.name"] = node.TemplateRef.Name
diff --git a/workflow/util/util_test.go b/workflow/util/util_test.go
index 19b355e8a7ab..bb3226e68ec7 100644
--- a/workflow/util/util_test.go
+++ b/workflow/util/util_test.go
@@ -12,6 +12,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/fields"
 	kubefake "k8s.io/client-go/kubernetes/fake"
 	"sigs.k8s.io/yaml"
 
@@ -484,6 +485,66 @@ func TestUpdateSuspendedNode(t *testing.T) {
 	}
 }
 
+func TestSelectorMatchesNode(t *testing.T) {
+	tests := map[string]struct {
+		selector string
+		outcome  bool
+	}{
+		"idFound": {
+			selector: "id=123",
+			outcome:  true,
+		},
+		"idNotFound": {
+			selector: "id=321",
+			outcome:  false,
+		},
+		"nameFound": {
+			selector: "name=failed-node",
+			outcome:  true,
+		},
+		"phaseFound": {
+			selector: "phase=Failed",
+			outcome:  true,
+		},
+		"randomNotFound": {
+			selector: "foo=Failed",
+			outcome:  false,
+		},
+		"templateFound": {
+			selector: "templateRef.name=templateName",
+			outcome:  true,
+		},
+		"inputFound": {
+			selector: "inputs.parameters.myparam.value=abc",
+			outcome:  true,
+		},
+	}
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			node := wfv1.NodeStatus{ID: "123", Name: "failed-node", Phase: wfv1.NodeFailed, TemplateRef: &wfv1.TemplateRef{
+				Name:     "templateName",
+				Template: "template",
+			},
+				Inputs: &wfv1.Inputs{
+					Parameters: []wfv1.Parameter{
+						{
+							Name:  "myparam",
+							Value: wfv1.AnyStringPtr("abc"),
+						},
+					},
+				},
+			}
+			selector, err := fields.ParseSelector(tc.selector)
+			assert.NoError(t, err)
+			if tc.outcome {
+				assert.True(t, SelectorMatchesNode(selector, node))
+			} else {
+				assert.False(t, SelectorMatchesNode(selector, node))
+			}
+		})
+	}
+}
+
 func TestGetNodeType(t *testing.T) {
 	t.Run("getNodeType", func(t *testing.T) {
 		assert.Equal(t, wfv1.NodeTypePod, GetNodeType(&wfv1.Template{Script: &wfv1.ScriptTemplate{}}))