fix(ui,api): do not load condition names when it's not needed #4846 (#…

…4855) Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
ovh · Jan 9, 2020 · bb9aa43 · bb9aa43
1 parent 0052a65
commit bb9aa43
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 36 deletions.
diff --git a/engine/api/workflow_trigger.go b/engine/api/workflow_trigger.go
@@ -54,10 +54,7 @@ func (api *API) getWorkflowTriggerConditionHandler() service.Handler {
 			refNode = wr.Workflow.WorkflowData.NodeByID(id)
 			var errp error
 			params, errp = workflow.NodeBuildParametersFromRun(*wr, id)
-			if errp != nil {
-				return sdk.WrapError(errp, "getWorkflowTriggerConditionHandler> Unable to load build parameters from workflow run")
-			}
-			if len(params) == 0 {
+			if errp != nil || len(params) == 0 {
 				refNode = nil
 			}
 		}
@@ -66,18 +63,17 @@ func (api *API) getWorkflowTriggerConditionHandler() service.Handler {
 			var errp error
 			ancestorIds := refNode.Ancestors(wf.WorkflowData)
 			params, errp = workflow.NodeBuildParametersFromWorkflow(ctx, api.mustDB(), api.Cache, proj, wf, refNode, ancestorIds)
-			if errp != nil {
-				return sdk.WrapError(errp, "getWorkflowTriggerConditionHandler> Unable to load build parameters from workflow")
-			}
-			sdk.AddParameter(&params, "cds.dest.pipeline", sdk.StringParameter, "")
-			sdk.AddParameter(&params, "cds.status", sdk.StringParameter, "")
-			sdk.AddParameter(&params, "cds.manual", sdk.StringParameter, "")
-
-			if refNode.Context != nil && refNode.Context.ApplicationID != 0 {
-				sdk.AddParameter(&params, "cds.dest.application", sdk.StringParameter, "")
-			}
-			if refNode.Context != nil && refNode.Context.EnvironmentID != 0 {
-				sdk.AddParameter(&params, "cds.dest.environment", sdk.StringParameter, "")
+			if errp == nil && params != nil {
+				sdk.AddParameter(&params, "cds.dest.pipeline", sdk.StringParameter, "")
+				sdk.AddParameter(&params, "cds.status", sdk.StringParameter, "")
+				sdk.AddParameter(&params, "cds.manual", sdk.StringParameter, "")
+
+				if refNode.Context != nil && refNode.Context.ApplicationID != 0 {
+					sdk.AddParameter(&params, "cds.dest.application", sdk.StringParameter, "")
+				}
+				if refNode.Context != nil && refNode.Context.EnvironmentID != 0 {
+					sdk.AddParameter(&params, "cds.dest.environment", sdk.StringParameter, "")
+				}
 			}
 		}
 

diff --git a/ui/src/app/shared/workflow/wizard/conditions/wizard.conditions.component.ts b/ui/src/app/shared/workflow/wizard/conditions/wizard.conditions.component.ts
@@ -118,26 +118,28 @@ export class WorkflowWizardNodeConditionComponent extends Table<WorkflowNodeCond
             }
         });
 
-        if (this.node) {
-            this._workflowService.getTriggerCondition(this.project.key, this.workflow.name, this.node.id)
-                .pipe(
-                    first(),
-                    finalize(() => {
-                        this.loadingConditions = false;
-                        this._cd.markForCheck();
-                    })
-                )
-                .subscribe(wtc => this.triggerConditions = wtc);
-        } else {
-            this._workflowService.getTriggerHookCondition(this.project.key, this.workflow.name)
-                .pipe(
-                    first(),
-                    finalize(() => {
-                        this.loadingConditions = false;
-                        this._cd.markForCheck();
-                    })
-                )
-                .subscribe(wtc => this.triggerConditions = wtc);
+        if (!this.readonly) {
+            if (this.node) {
+                this._workflowService.getTriggerCondition(this.project.key, this.workflow.name, this.node.id)
+                    .pipe(
+                        first(),
+                        finalize(() => {
+                            this.loadingConditions = false;
+                            this._cd.markForCheck();
+                        })
+                    )
+                    .subscribe(wtc => this.triggerConditions = wtc);
+            } else {
+                this._workflowService.getTriggerHookCondition(this.project.key, this.workflow.name)
+                    .pipe(
+                        first(),
+                        finalize(() => {
+                            this.loadingConditions = false;
+                            this._cd.markForCheck();
+                        })
+                    )
+                    .subscribe(wtc => this.triggerConditions = wtc);
+            }
         }
     }