fix(ui): no more christmas tree in run conditions (#3781)

Signed-off-by: Benjamin Coenen <[email protected]>
ovh · Dec 27, 2018 · 427a88a · 427a88a
1 parent 89d9f42
commit 427a88a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/ui/src/app/shared/workflow/modal/conditions/condition-form/condition.component.ts b/ui/src/app/shared/workflow/modal/conditions/condition-form/condition.component.ts
@@ -1,8 +1,8 @@
-import {Component, EventEmitter, Input, Output, ViewChild} from '@angular/core';
-import {cloneDeep} from 'lodash';
-import {CodemirrorComponent} from 'ng2-codemirror-typescript/Codemirror';
-import {PipelineStatus} from '../../../../../model/pipeline.model';
-import {Workflow, WorkflowNodeCondition, WorkflowNodeConditions} from '../../../../../model/workflow.model';
+import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
+import { cloneDeep } from 'lodash';
+import { CodemirrorComponent } from 'ng2-codemirror-typescript/Codemirror';
+import { PipelineStatus } from '../../../../../model/pipeline.model';
+import { Workflow, WorkflowNodeCondition, WorkflowNodeConditions } from '../../../../../model/workflow.model';
 declare var CodeMirror: any;
 
 @Component({
@@ -35,6 +35,7 @@ export class WorkflowNodeConditionFormComponent {
     _names: Array<string> = [];
     suggest: Array<string> = [];
     condition = new WorkflowNodeCondition();
+    oldVariableCondition: string;
     codeMirrorConfig: {};
     statuses = [PipelineStatus.SUCCESS, PipelineStatus.FAIL, PipelineStatus.SKIPPED];
 
@@ -87,10 +88,13 @@ export class WorkflowNodeConditionFormComponent {
       this.condition.value = event.target.checked ?  'true' : 'false';
     }
 
-    variableChanged(event: any) {
-        this.condition.value = null;
-        this.condition.operator = 'eq';
-        if (event.target.value === 'cds.manual') {
+    variableChanged(variable: any) {
+        if (!variable || variable !== this.oldVariableCondition) {
+            this.condition.value = null;
+            this.condition.operator = 'eq';
+        }
+        this.oldVariableCondition = variable;
+        if (variable === 'cds.manual') {
             this.condition.value = 'false';
         }
     }

diff --git a/ui/src/app/shared/workflow/modal/conditions/condition-form/condition.form.html b/ui/src/app/shared/workflow/modal/conditions/condition-form/condition.form.html
@@ -20,7 +20,7 @@ <h4>{{ 'workflow_node_condition_form' | translate}}</h4>
                         *ngIf="names"
                         class="search"
                         [(model)]="condition.variable"
-                        (change)="variableChanged($event)"
+                        (click)="variableChanged(condition.variable)"
                         [options]="{'fullTextSearch': true, 'allowAdditions': true}">
                         <option *ngFor="let n of names" [value]="n">{{n}}</option>
                     </sm-select>