fix(ui): fix link with log line (#5206)

* fix: loading logs

* fix(ui): link with job line

Author: sguiheux

ui/src/app/views/workflow/run/node/pipeline/node.pipeline.component.ts

@@ -61,9 +61,6 @@ export class WorkflowRunNodePipelineComponent implements OnInit, OnDestroy {
     }
 
     ngOnInit() {
-        this.queryParamsSub = this._route.queryParams.subscribe((queryParams) => {
-            this.updateSelectedItems(queryParams);
-        });
         this.nodeJobRunSubs = this.nodeJobRun$.subscribe(rj => {
             if (!rj && !this.currentJob) {
                 return;
@@ -102,12 +99,6 @@ export class WorkflowRunNodePipelineComponent implements OnInit, OnDestroy {
         });
     }
 
-    updateSelectedItems(queryParams) {
-        if (queryParams['actionId']) {
-            this.selectJob(queryParams['actionId']);
-        }
-    }
-
     selectedJobManual(jobID: number) {
         if (!this.mapJobStatus.has(jobID)) {
             return;
@@ -157,11 +148,14 @@ export class WorkflowRunNodePipelineComponent implements OnInit, OnDestroy {
                                 { status: rj.status, warnings, start: rj.start, done: rj.done });
                         }
 
-                        if (!currentNodeJobRun && sIndex === 0 && rjIndex === 0) {
+                        if (!currentNodeJobRun && sIndex === 0 && rjIndex === 0 && !this._route.snapshot.queryParams['actionId']) {
                             refresh = true;
                             this.selectJob(s.jobs[0].pipeline_action_id);
                         } else if (currentNodeJobRun && currentNodeJobRun.job.pipeline_action_id === this.currentJob.pipeline_action_id) {
                             this.selectJob(this.currentJob.pipeline_action_id);
+                        } else if (this._route.snapshot.queryParams['actionId'] &&
+                            this._route.snapshot.queryParams['actionId'] === rj.job.pipeline_action_id.toString()) {
+                            this.selectJob(rj.job.pipeline_action_id);
                         }
                     });
                 }

ui/src/app/views/workflow/run/node/pipeline/step/step.log.component.ts

@@ -141,8 +141,10 @@ export class WorkflowStepLogComponent implements OnInit, OnDestroy {
             let activeStep = parseInt(qps['stageId'], 10) === this.job.pipeline_stage_id &&
                 parseInt(qps['actionId'], 10) === this.job.pipeline_action_id && parseInt(qps['stepOrder'], 10) === this.stepOrder;
             if (activeStep) {
-                this.showLogs = true;
                 this.selectedLine = parseInt(qps['line'], 10);
+                if (!this.showLogs) {
+                    this.toggleLogs();
+                }
             } else {
                 this.selectedLine = null;
             }
@@ -343,7 +345,6 @@ export class WorkflowStepLogComponent implements OnInit, OnDestroy {
             stepOrder: this.stepOrder,
             line: lineNumber
         });
-        let fragment = 'L' + this.job.pipeline_stage_id + '-' + this.job.pipeline_action_id + '-' + this.stepOrder + '-' + lineNumber;
         this._router.navigate([
             'project',
             this._store.selectSnapshot(ProjectState.projectSnapshot).key,
@@ -353,6 +354,6 @@ export class WorkflowStepLogComponent implements OnInit, OnDestroy {
             (<WorkflowStateModel>this._store.selectSnapshot(WorkflowState)).workflowNodeRun.num,
             'node',
             (<WorkflowStateModel>this._store.selectSnapshot(WorkflowState)).workflowNodeRun.id
-        ], { queryParams: qps, fragment });
+        ], { queryParams: qps });
     }
 }