From ea9d47ba7596b246dafdf4fee5fd104216c819c8 Mon Sep 17 00:00:00 2001
From: alecmerdler <merdlera@oregonstate.edu>
Date: Wed, 22 Feb 2017 16:33:34 -0800
Subject: [PATCH] ignore invalid linear workflow sections that are after the
 current section

---
 .../linear-workflow.component.html            |   2 +-
 .../linear-workflow.component.spec.ts         |  18 ++++++++++++++++--
 .../linear-workflow.component.ts              |  18 ++++++++++--------
 .../manage-trigger-custom-git.component.html  |   2 +-
 ...anage-trigger-custom-git.component.spec.ts |  14 ++++++++++++++
 test/data/test.db                             | Bin 1314816 -> 1314816 bytes
 6 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/static/js/directives/ui/linear-workflow/linear-workflow.component.html b/static/js/directives/ui/linear-workflow/linear-workflow.component.html
index bbb0d3868..899dc4c2d 100644
--- a/static/js/directives/ui/linear-workflow/linear-workflow.component.html
+++ b/static/js/directives/ui/linear-workflow/linear-workflow.component.html
@@ -23,7 +23,7 @@
         <td>
           <!-- Next sections -->
           <div class="upcoming"
-               ng-if="$ctrl.currentSection.index != $ctrl.sections.length - 1">
+               ng-if="$ctrl.currentSection.index < $ctrl.sections.length - 1">
             <b>Next:</b>
             <ul>
               <li ng-repeat="section in $ctrl.sections"
diff --git a/static/js/directives/ui/linear-workflow/linear-workflow.component.spec.ts b/static/js/directives/ui/linear-workflow/linear-workflow.component.spec.ts
index 855fd9197..9f479b51b 100644
--- a/static/js/directives/ui/linear-workflow/linear-workflow.component.spec.ts
+++ b/static/js/directives/ui/linear-workflow/linear-workflow.component.spec.ts
@@ -89,12 +89,21 @@ describe("LinearWorkflowComponent", () => {
         new LinearWorkflowSectionComponent(),
       ];
       sections.forEach((section) => {
-        section.sectionVisible = true;
-        section.isCurrentSection = true;
+        section.sectionVisible = false;
+        section.isCurrentSection = false;
         component.addSection(section);
       });
     });
 
+    it("does nothing if invalid section is after the current section", () => {
+      sections[sections.length - 1].sectionValid = false;
+      sections[sections.length - 1].sectionId = "Some Section";
+      component.onSectionInvalid(sections[sections.length - 1].sectionId);
+
+      expect(sections[sections.length - 1].isCurrentSection).toBe(false);
+      expect(sections[sections.length - 1].sectionVisible).toBe(false);
+    });
+
     it("sets the section with the given id to be the current section", () => {
       component.onSectionInvalid(invalidSection.sectionId);
 
@@ -102,6 +111,11 @@ describe("LinearWorkflowComponent", () => {
     });
 
     it("hides all sections after the section with the given id", () => {
+      sections.forEach((section) => {
+        section.sectionVisible = true;
+        section.isCurrentSection = true;
+        component.addSection(section);
+      });
       component.onSectionInvalid(invalidSection.sectionId);
 
       sections.forEach((section) => {
diff --git a/static/js/directives/ui/linear-workflow/linear-workflow.component.ts b/static/js/directives/ui/linear-workflow/linear-workflow.component.ts
index 69e43dc20..960289c15 100644
--- a/static/js/directives/ui/linear-workflow/linear-workflow.component.ts
+++ b/static/js/directives/ui/linear-workflow/linear-workflow.component.ts
@@ -45,14 +45,16 @@ export class LinearWorkflowComponent implements ng.IComponentController {
 
   public onSectionInvalid(sectionId: string): void {
     var invalidSection = this.sections.filter(section => section.component.sectionId == sectionId)[0];
-    invalidSection.component.isCurrentSection = true;
-    this.currentSection = invalidSection;
-    this.sections.forEach((section) => {
-      if (section.index > invalidSection.index) {
-        section.component.sectionVisible = false;
-        section.component.isCurrentSection = false;
-      }
-    });
+    if (invalidSection.index <= this.currentSection.index) {
+      invalidSection.component.isCurrentSection = true;
+      this.currentSection = invalidSection;
+      this.sections.forEach((section) => {
+        if (section.index > invalidSection.index) {
+          section.component.sectionVisible = false;
+          section.component.isCurrentSection = false;
+        }
+      });
+    }
   }
 }
 
diff --git a/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.html b/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.html
index d75adcb07..43cb23b97 100644
--- a/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.html
+++ b/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.html
@@ -2,7 +2,7 @@
   <linear-workflow
     workflow-state="$ctrl.currentState"
     done-title="Create Trigger"
-    workflow-complete="$ctrl.activateTrigger({'config': $ctrl.config})">
+    on-workflow-complete="$ctrl.activateTrigger({'config': $ctrl.config})">
     <!-- Section: Repository -->
     <linear-workflow-section class="row"
       section-id="repo"
diff --git a/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.spec.ts b/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.spec.ts
index e69de29bb..5f87efb36 100644
--- a/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.spec.ts
+++ b/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.spec.ts
@@ -0,0 +1,14 @@
+import { ManageTriggerCustomGitComponent } from './manage-trigger-custom-git.component';
+
+
+describe("ManageTriggerCustomGitComponent", () => {
+  var component: ManageTriggerCustomGitComponent;
+
+  beforeEach(() => {
+    component = new ManageTriggerCustomGitComponent();
+  });
+
+  describe("$onChanges", () => {
+
+  });
+});
diff --git a/test/data/test.db b/test/data/test.db
index cfce4f8698f2c58334b74b10f740a96982258200..c70eb4c9ceae00ef2f559ac05c0e392abc9673fe 100644
GIT binary patch
delta 3830
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

delta 569
zcmYk2F=!J}7{}jzcg?%Yz20|MMTOKfw6s+y%}KF1XdAE~7Q}N9A}!<uu?SHLwuorS
zIg~63rZ{{7J9JQjAUG6xU<Nnmf|HY*i--jggv-z`Xw~7j{QtlAf4rCMM9EIn${BlG
z!xxRcC-G)%yp7=nnt8lJ(uaaR?L!{7BAfP$rbX9AVAslHMUWpt&bg2G@DAR>ik>dO
z6l;<yMR>`lS4f61tLH-)JB*Lf#yr&d^pYSi@=iJ_-o+KXiAy>x!T5idpmBm8T!p5Y
zSGP$<aA7wnjVijd41=^-g(1DU3^kM6^CV-K(8U<Oxz7rvQ5vp-r&)Q|Zx=|e!dX4H
z3Sa)U{ed<8;W5nhm2)H$IHk`dzm+jM-T)-E4S_B<;5935k7Nrbb=ZPe{grY0^c?&;
zD~!ol%m9;NBx5rUlhtb5{WW77*cRBv9KWG~)c)*NIqC}R;yOofkh<U9%N(TwQ%rTR
zZ+_*kuma08oNQJI@u&Lvx1#iY76E&Q!2tE1W*i600-IR&dOW*`Y6e_!-7p*>0zo4a
zY7!o8=w?wpEa^<7ejo^=p4JpI$aoAgJ`*rQI;|aX5@p#Pp+2ewXV&iUF4?+cAH5+D
E0PyRn^Z)<=