From 63cf8beb26a8412d812c7ef31ac47af942ec968b Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Wed, 16 Apr 2014 17:50:25 -0400
Subject: [PATCH] =?UTF-8?q?-=20Fix=20trigger=20setup=20to=E2=80=A6=20work?=
 =?UTF-8?q?=E2=80=A6=20-=20Make=20sure=20new=20manual=20builds=20are=20add?=
 =?UTF-8?q?ed=20to=20the=20repo=20build=20list=20immediately?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/directives/setup-trigger-dialog.html |  9 +++++---
 static/js/app.js                            | 25 ++++++++++++++++-----
 static/js/controllers.js                    |  3 +++
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/static/directives/setup-trigger-dialog.html b/static/directives/setup-trigger-dialog.html
index 1e84a782a..fd5dde932 100644
--- a/static/directives/setup-trigger-dialog.html
+++ b/static/directives/setup-trigger-dialog.html
@@ -8,7 +8,10 @@
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
           <h4 class="modal-title">Setup new build trigger</h4>
         </div>
-        <div class="modal-body">          
+        <div class="modal-body" ng-show="activating">
+          <span class="quay-spinner"></span> Setting up trigger...
+        </div>
+        <div class="modal-body" ng-show="!activating">          
           <!-- Trigger-specific setup -->
           <div class="trigger-description-element trigger-option-section" ng-switch on="trigger.service">
             <div ng-switch-when="github">
@@ -90,8 +93,8 @@
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-primary"
-                  ng-disabled="!trigger.$ready || (!publicPull && !pullEntity) || checkingPullRequirements"
-                  ng-click="activate">Finished</button>
+                  ng-disabled="!trigger.$ready || (!publicPull && !pullEntity) || checkingPullRequirements || activating"
+                  ng-click="activate()">Finished</button>
           <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
         </div>
       </div><!-- /.modal-content -->
diff --git a/static/js/app.js b/static/js/app.js
index 66b212530..9d555b899 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -3722,17 +3722,26 @@ quayApp.directive('setupTriggerDialog', function () {
       'activated': '&activated'
     },
     controller: function($scope, $element, ApiService, UserService) {
+      var modalSetup = false;
+
       $scope.show = function() {
+        $scope.activating = false;
         $scope.pullEntity = null;
         $scope.publicPull = true;
         $scope.showPullRequirements = false;
 
         $('#setupTriggerModal').modal({});
-        $('#setupTriggerModal').on('hidden.bs.modal', function () {
-          $scope.$apply(function() {
-            $scope.cancelSetupTrigger();
+
+        if (!modalSetup) {
+          $('#setupTriggerModal').on('hidden.bs.modal', function () {
+            if ($scope.trigger['is_active']) { return; }
+
+            $scope.$apply(function() {
+              $scope.cancelSetupTrigger();
+            });
           });
-        });
+          modalSetup = true;
+        }
       };
 
       $scope.isNamespaceAdmin = function(namespace) {
@@ -3744,6 +3753,7 @@ quayApp.directive('setupTriggerDialog', function () {
       };
 
       $scope.hide = function() {
+        $scope.activating = false;
         $('#setupTriggerModal').modal('hide');
       };
 
@@ -3810,9 +3820,12 @@ quayApp.directive('setupTriggerDialog', function () {
           data['pull_robot'] = $scope.pullEntity['name'];
         }
 
+        $scope.activating = true;
+
         ApiService.activateBuildTrigger(data, params).then(function(resp) {
-          trigger['is_active'] = true;
-          trigger['pull_robot'] = resp['pull_robot'];
+          $scope.hide();
+          $scope.trigger['is_active'] = true;
+          $scope.trigger['pull_robot'] = resp['pull_robot'];
           $scope.activated({'trigger': $scope.trigger});
         }, function(resp) {
           $scope.hide();
diff --git a/static/js/controllers.js b/static/js/controllers.js
index 820e2512f..2c32d433d 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -362,6 +362,7 @@ function RepoCtrl($scope, $sanitize, Restangular, ImageMetadataService, ApiServi
   };
 
   $scope.handleBuildStarted = function(build) {
+    getBuildInfo($scope.repo);
     startBuildInfoTimer($scope.repo);
   };
 
@@ -1518,6 +1519,8 @@ function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, $routeParams
   };
 
   $scope.deleteTrigger = function(trigger) {
+    if (!trigger) { return; }
+
     var params = {
       'repository': namespace + '/' + name,
       'trigger_uuid': trigger.id