fix(ui): fix add a trigger on a join (#3027)

Signed-off-by: Benjamin Coenen <benjamin.coenen@corp.ovh.com>
ovh · Jul 10, 2018 · f05a768 · f05a768
1 parent 6e06d15
commit f05a768
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/ui/src/app/shared/workflow/join/trigger/trigger.join.component.ts b/ui/src/app/shared/workflow/join/trigger/trigger.join.component.ts
@@ -76,7 +76,13 @@ export class WorkflowTriggerJoinComponent {
     }
 
     nextStep() {
-        this.nodeWizard.goToNextSection().subscribe((section) => this.currentSection = section);
+      this.nodeWizard.goToNextSection().subscribe((section) => {
+        if (section === 'done') {
+          this.saveTrigger();
+        } else {
+          this.currentSection = section;
+        }
+      });
     }
 
     hide(): void {

diff --git a/ui/src/app/shared/workflow/join/trigger/workflow.trigger.join.html b/ui/src/app/shared/workflow/join/trigger/workflow.trigger.join.html
@@ -16,7 +16,6 @@ <h3>{{ 'workflow_node_form_title' | translate }}</h3>
     </div>
     <div class="actions">
         <button class="ui grey button" [disabled]="loading" (click)="hide()">{{ 'common_close' | translate }}</button>
-        <button class="ui green button" [disabled]="loading || trigger.workflow_dest_node == null" *ngIf="currentSection !== 'environment'" [class.loading]="loading" (click)="nextStep()">{{ 'btn_next' | translate }}</button>
-        <button class="ui green button" *ngIf="currentSection === 'environment'" [disabled]="loading" [class.loading]="loading" (click)="saveTrigger()">{{ 'btn_finish' | translate }}</button>
+        <button class="ui green button" [disabled]="loading || trigger.workflow_dest_node == null" [class.loading]="loading" (click)="nextStep()">{{ 'btn_next' | translate }}</button>
     </div>
 </ng-template>