From 098a75551da89166c5e761263455de9d97869fe5 Mon Sep 17 00:00:00 2001
From: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
Date: Thu, 28 May 2020 18:42:56 +0200
Subject: [PATCH 1/2] fix(ui): display spawn info for waiting job

Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
---
 .../run/node/pipeline/spawninfo/spawninfo.component.ts       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/views/workflow/run/node/pipeline/spawninfo/spawninfo.component.ts b/ui/src/app/views/workflow/run/node/pipeline/spawninfo/spawninfo.component.ts
index b2de5dba7f..ea9cbda550 100644
--- a/ui/src/app/views/workflow/run/node/pipeline/spawninfo/spawninfo.component.ts
+++ b/ui/src/app/views/workflow/run/node/pipeline/spawninfo/spawninfo.component.ts
@@ -42,7 +42,6 @@ export class WorkflowRunJobSpawnInfoComponent implements OnDestroy, OnInit {
     @Select(WorkflowState.getSelectedWorkflowNodeJobRun()) nodeJobRun$: Observable<WorkflowNodeJobRun>;
     nodeJobRunSubs: Subscription;
 
-    currentNodeJobRunID: number;
     currentJobID: number;
     jobStatus: string;
     spawnInfos: String;
@@ -100,7 +99,7 @@ export class WorkflowRunJobSpawnInfoComponent implements OnDestroy, OnInit {
                 this.jobStatus = njr.status;
                 this.currentJobID = njr.id;
                 this.variables = njr.parameters;
-                if (!njr.spawninfos) {
+                if (!this.worker) {
                     this.initWorker();
                 } else {
                     this.spawnInfos = this.getSpawnInfos(njr.spawninfos);
@@ -146,7 +145,7 @@ export class WorkflowRunJobSpawnInfoComponent implements OnDestroy, OnInit {
                 workflowName: this._store.selectSnapshot(WorkflowState.workflowSnapshot).name,
                 number: (<WorkflowStateModel>this._store.selectSnapshot(WorkflowState)).workflowNodeRun.num,
                 nodeRunId: (<WorkflowStateModel>this._store.selectSnapshot(WorkflowState)).workflowNodeRun.id,
-                runJobId: this.currentNodeJobRunID,
+                runJobId: this.currentJobID,
             });
 
             this.workerSubscription = this.worker.response().subscribe(msg => {

From 817fb2346d5c190575b6e3dfa912f858a1cdc16b Mon Sep 17 00:00:00 2001
From: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
Date: Fri, 29 May 2020 16:11:58 +0200
Subject: [PATCH 2/2] fix(ui): cr

Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
---
 .../workflow/run/node/pipeline/spawninfo/spawninfo.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/views/workflow/run/node/pipeline/spawninfo/spawninfo.component.ts b/ui/src/app/views/workflow/run/node/pipeline/spawninfo/spawninfo.component.ts
index ea9cbda550..bcef584ad4 100644
--- a/ui/src/app/views/workflow/run/node/pipeline/spawninfo/spawninfo.component.ts
+++ b/ui/src/app/views/workflow/run/node/pipeline/spawninfo/spawninfo.component.ts
@@ -99,7 +99,7 @@ export class WorkflowRunJobSpawnInfoComponent implements OnDestroy, OnInit {
                 this.jobStatus = njr.status;
                 this.currentJobID = njr.id;
                 this.variables = njr.parameters;
-                if (!this.worker) {
+                if (!PipelineStatus.isDone(njr.status)) {
                     this.initWorker();
                 } else {
                     this.spawnInfos = this.getSpawnInfos(njr.spawninfos);