fix(ui): run workflow in the middle (#5077)

ovh · Mar 24, 2020 · dc99a29 · dc99a29
1 parent 9c2ac89
commit dc99a29
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/ui/src/app/shared/workflow/sidebar/run-node/workflow.sidebar.run.node.component.ts b/ui/src/app/shared/workflow/sidebar/run-node/workflow.sidebar.run.node.component.ts
@@ -110,7 +110,7 @@ export class WorkflowSidebarRunNodeComponent implements OnDestroy, OnInit {
         });
 
         this.nodeRunSubs = this.nodeRun$.subscribe( nrs => {
-            if (!nrs && !this.currentWorkflowNodeRun) {
+            if (!nrs) {
                 return;
             }
             // If event on same noderun with same status, check if tests or artifacts changed

diff --git a/ui/src/app/shared/workflow/wnode/wnode.component.ts b/ui/src/app/shared/workflow/wnode/wnode.component.ts
@@ -20,13 +20,13 @@ import {
     AddHookWorkflow,
     AddJoinWorkflow,
     AddNodeTriggerWorkflow,
-    OpenEditModal,
+    OpenEditModal, SelectWorkflowNode,
     SelectWorkflowNodeRun,
     UpdateWorkflow
 } from 'app/store/workflow.action';
 import { WorkflowState, WorkflowStateModel } from 'app/store/workflow.state';
 import { Subscription } from 'rxjs';
-import { finalize } from 'rxjs/operators';
+import { finalize, tap } from 'rxjs/operators';
 
 @Component({
     selector: 'app-workflow-wnode',
@@ -107,13 +107,17 @@ export class WorkflowWNodeComponent implements OnInit {
         if (this.workflow.previewMode || !popup) {
             return;
         }
-        popup.open();
-        if (this.currentNodeRun) {
+        if (!this.currentNodeRun) {
+            this._store.dispatch(new SelectWorkflowNode({
+                node: this.node
+            })).pipe(tap(popup.open));
+        } else {
             this._store.dispatch(new SelectWorkflowNodeRun({
                 workflowNodeRun: this.currentNodeRun,
                 node: this.node
-            }));
+            })).pipe(tap(popup.open));
         }
+
     }
 
     dblClickOnNode() {

diff --git a/ui/src/app/store/workflow.action.ts b/ui/src/app/store/workflow.action.ts
@@ -57,6 +57,11 @@ export class GetWorkflowNodeRun {
     constructor(public payload: { projectKey: string, workflowName: string, num: number, nodeRunID: number }) { }
 }
 
+export class SelectWorkflowNode {
+    static readonly type = '[Workflow] Select Workflow Node';
+    constructor(public payload: { node: WNode }) { }
+}
+
 export class SelectWorkflowNodeRun {
     static readonly type = '[Workflow] Select Workflow Node Run';
     constructor(public payload: { workflowNodeRun: WorkflowNodeRun, node: WNode }) { }

diff --git a/ui/src/app/store/workflow.state.ts b/ui/src/app/store/workflow.state.ts
@@ -1229,6 +1229,21 @@ export class WorkflowState {
         });
     }
 
+    @Action(actionWorkflow.SelectWorkflowNode)
+    selectWorkflowNode(ctx: StateContext<WorkflowStateModel>, action: actionWorkflow.SelectWorkflowNode) {
+        const state = ctx.getState();
+        if (state.node && state.node.id === action.payload.node.id) {
+            return;
+        }
+        ctx.setState({
+            ...state,
+            workflowNodeRun: null,
+            node: action.payload.node,
+            sidebar: WorkflowSidebarMode.RUNS
+        });
+    }
+
+
     @Action(actionWorkflow.SelectWorkflowNodeRun)
     selectWorkflowNodeRun(ctx: StateContext<WorkflowStateModel>, action: actionWorkflow.SelectWorkflowNodeRun) {
         const state = ctx.getState();