- Add an analyze method on triggers that, when given trigger config, will attempt to analyze the trigger's Dockerfile and determine what pull credentials, if any, are needed and available

- Move the build trigger setup UI into its own directive (makes things cleaner)
- Fix a bug in the entitySearch directive around setting the current entity
- Change the build trigger setup UI to use the new analyze method and flow better

static/css/quay.css

@@ -3456,7 +3456,7 @@ pre.command:before {
 
   position: relative;
 
-  height: 100px;
+  height: 75px;
   opacity: 1;
 }
 
@@ -3607,10 +3607,10 @@ pre.command:before {
   margin-right: 34px;
 }
 
-.trigger-option-section:not(:last-child) {
-  border-bottom: 1px solid #eee;
-  padding-bottom: 16px;
-  margin-bottom: 16px;
+.trigger-option-section:not(:first-child) {
+  border-top: 1px solid #eee;
+  padding-top: 16px;
+  margin-top: 10px;
 }
 
 .trigger-option-section .entity-search-element .twitter-typeahead {

static/directives/entity-search.html

@@ -1,5 +1,5 @@
 <span class="entity-search-element" ng-class="isPersistent ? 'persistent' : ''"><input class="entity-search-control form-control">
-  <span class="entity-reference block-reference" ng-show="isPersistent && currentEntity" entity="currentEntity"></span>
+  <span class="entity-reference block-reference" ng-show="isPersistent && currentEntityInternal" entity="currentEntityInternal"></span>
   <div class="dropdown">
     <button class="btn btn-default dropdown-toggle" type="button" id="entityDropdownMenu" data-toggle="dropdown"
             ng-click="lazyLoad()">

static/directives/setup-trigger-dialog.html

@@ -0,0 +1,100 @@
+<div class="setup-trigger-directive-element">
+
+  <!-- Modal message dialog -->
+  <div class="modal fade" id="setupTriggerModal">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <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">          
+          <!-- Trigger-specific setup -->
+          <div class="trigger-description-element trigger-option-section" ng-switch on="trigger.service">
+            <div ng-switch-when="github">
+              <div class="trigger-setup-github" repository="repository" trigger="trigger"
+                   analyze="checkAnalyze(isValid)"></div>
+            </div>
+          </div>
+
+          <!-- Pull information -->
+          <div class="trigger-option-section" ng-show="showPullRequirements">
+            <div ng-show="!pullRequirements">
+              <span class="quay-spinner"></span> Checking pull credential requirements...
+            </div>
+
+            <div ng-show="pullRequirements">
+              <div class="alert alert-danger" ng-if="pullRequirements.status == 'error'">
+                {{ pullRequirements.message }}
+              </div>
+              <div class="alert alert-warning" ng-if="pullRequirements.status == 'warning'">
+                {{ pullRequirements.message }}
+              </div>
+              <div class="alert alert-success" ng-if="pullRequirements.status == 'analyzed' && pullRequirements.is_public === false">
+                The 
+                <a href="{{ pullRequirements.dockerfile_url }}" ng-if="pullRequirements.dockerfile_url" target="_blank">Dockerfile found</a>
+                <span ng-if="!pullRequirements.dockerfile_url">Dockerfile found</span>
+                depends on repository
+                <a href="/repository/{{ pullRequirements.namespace }}/{{ pullRequirements.name }}" target="_blank">
+                  {{ pullRequirements.namespace }}/{{ pullRequirements.name }}
+                </a> which requires
+                a robot account for pull access, because it is marked <strong>private</strong>.
+              </div>
+            </div>
+
+            <table style="width: 100%;" ng-show="pullRequirements">
+              <tr>
+                <td style="width: 114px">
+                  <div class="context-tooltip" title="The credentials used by the builder when pulling images" bs-tooltip>
+                    Pull Credentials:
+                  </div>
+                </td>
+                <td>
+                  <div ng-if="!isNamespaceAdmin(repository.namespace)" style="color: #aaa;">
+                    In order to set pull credentials for a build trigger, you must be an Administrator of the namespace <strong>{{ repository.namespace }}</strong>
+                  </div>
+                  <div class="btn-group btn-group-sm" ng-if="isNamespaceAdmin(repository.namespace)">
+                    <button type="button" class="btn btn-default"
+                            ng-class="publicPull ? 'active btn-info' : ''" ng-click="setPublicPull(true)">Public</button>
+                    <button type="button" class="btn btn-default"
+                            ng-class="publicPull ? '' : 'active btn-info'" ng-click="setPublicPull(false)">
+                      <i class="fa fa-wrench"></i>
+                      Robot account
+                    </button>
+                  </div>
+                </td>
+              </tr>
+              <tr ng-show="!publicPull">
+                <td>                  
+                </td>
+                <td>
+                  <div class="entity-search" namespace="repository.namespace" include-teams="false"
+                       input-title="'Select robot account for pulling...'"
+                       is-organization="repository.is_organization"
+                       is-persistent="true"
+                       current-entity="pullEntity"
+                       filter="['robot']"></div>
+
+                  <div class="alert alert-info" ng-if="pullRequirements.robots.length" style="margin-top: 20px; margin-bottom: 0px;">
+                    Note: We've automatically selected robot account <span class="entity-reference" entity="pullRequirements.robots[0]"></span>, since it has access to the repository.
+                  </div>
+                  <div class="alert alert-warning" ng-if="!pullRequirements.robots.length" style="margin-top: 20px; margin-bottom: 0px;">
+                    Note: No robot account currently has access to the repository. Please create one and/or assign access in the
+                    <a href="/repository/{{ pullRequirements.namespace }}/{{ pullRequirements.name }}/admin" target="_blank">repository's admin panel</a>.
+                  </div>
+                </td>
+              </tr>
+            </table>
+          </div>
+
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary"
+                  ng-disabled="!trigger.$ready || (!publicPull && !pullEntity) || checkingPullRequirements"
+                  ng-click="activate">Finished</button>
+          <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+        </div>
+      </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+  </div><!-- /.modal -->
+</div>

static/js/app.js

@@ -2650,6 +2650,7 @@ quayApp.directive('entitySearch', function () {
     controller: function($scope, $element, Restangular, UserService, ApiService) {
       $scope.lazyLoading = true;
       $scope.isAdmin = false;
+      $scope.currentEntityInternal = $scope.currentEntity;
 
       $scope.lazyLoad = function() {
         if (!$scope.namespace || !$scope.lazyLoading) { return; }
@@ -2732,7 +2733,9 @@ quayApp.directive('entitySearch', function () {
       };
 
       $scope.clearEntityInternal = function() {
+        $scope.currentEntityInternal = null;
         $scope.currentEntity = null;
+
         if ($scope.entitySelected) {
           $scope.entitySelected(null);
         }
@@ -2746,6 +2749,7 @@ quayApp.directive('entitySearch', function () {
         }
 
         if ($scope.isPersistent) {
+          $scope.currentEntityInternal = entity;
           $scope.currentEntity = entity;
         }
 
@@ -2870,6 +2874,16 @@ quayApp.directive('entitySearch', function () {
       $scope.$watch('inputTitle', function(title) {
         input.setAttribute('placeholder', title);
       });
+
+      $scope.$watch('currentEntity', function(entity) {
+        if ($scope.currentEntityInternal != entity) {
+          if (entity) {
+            $scope.setEntityInternal(entity, false);
+          } else {
+            $scope.clearEntityInternal();
+          }
+        }
+      });
     }
   };
   return directiveDefinitionObject;
@@ -3407,6 +3421,145 @@ quayApp.directive('dropdownSelectMenu', function () {
 });
 
 
+quayApp.directive('setupTriggerDialog', function () {
+  var directiveDefinitionObject = {
+    templateUrl: '/static/directives/setup-trigger-dialog.html',
+    replace: false,
+    transclude: false,
+    restrict: 'C',
+    scope: {
+      'repository': '=repository',
+      'trigger': '=trigger',
+      'counter': '=counter',
+      'canceled': '&canceled',
+      'activated': '&activated'
+    },
+    controller: function($scope, $element, ApiService, UserService) {
+      $scope.show = function() {
+        $scope.pullEntity = null;
+        $scope.publicPull = true;
+        $scope.showPullRequirements = false;
+
+        $('#setupTriggerModal').modal({});
+        $('#setupTriggerModal').on('hidden.bs.modal', function () {
+          $scope.$apply(function() {
+            $scope.cancelSetupTrigger();
+          });
+        });
+      };
+
+      $scope.isNamespaceAdmin = function(namespace) {
+        return UserService.isNamespaceAdmin(namespace);
+      };
+
+      $scope.cancelSetupTrigger = function() {
+        $scope.canceled({'trigger': $scope.trigger});
+      };
+
+      $scope.hide = function() {
+        $('#setupTriggerModal').modal('hide');
+      };
+
+      $scope.setPublicPull = function(value) {
+        $scope.publicPull = value;
+      };
+
+      $scope.checkAnalyze = function(isValid) {
+        if (!isValid) {
+          $scope.publicPull = true;
+          $scope.pullEntity = null;          
+          $scope.showPullRequirements = false;
+          $scope.checkingPullRequirements = false;
+          return;
+        }
+        
+        $scope.checkingPullRequirements = true;
+        $scope.showPullRequirements = true;
+        $scope.pullRequirements = null;
+
+        var params = {
+          'repository': $scope.repository.namespace + '/' + $scope.repository.name,
+          'trigger_uuid': $scope.trigger.id
+        };
+
+        var data = {
+          'config': $scope.trigger.config
+        };
+
+        ApiService.analyzeBuildTrigger(data, params).then(function(resp) {
+          $scope.pullRequirements = resp;
+
+          if (resp['status'] == 'publicbase') {
+            $scope.publicPull = true;
+            $scope.pullEntity = null;
+          } else if (resp['namespace']) {
+            $scope.publicPull = false;
+
+            if (resp['robots'] && resp['robots'].length > 0) {
+              $scope.pullEntity = resp['robots'][0];
+            } else {
+              $scope.pullEntity = null;
+            }
+          }
+
+          $scope.checkingPullRequirements = false;
+        }, function(resp) {
+          $scope.pullRequirements = resp;          
+          $scope.checkingPullRequirements = false;
+        });
+      };
+
+      $scope.activate = function() {
+        var params = {
+          'repository': $scope.repository.namespace + '/' + $scope.repository.name,
+          'trigger_uuid': $scope.trigger.id
+        };
+
+        var data = {
+          'config': $scope.trigger['config']
+        };
+
+        if ($scope.pullEntity) {
+          data['pull_robot'] = $scope.pullEntity['name'];
+        }
+
+        ApiService.activateBuildTrigger(data, params).then(function(resp) {
+          trigger['is_active'] = true;
+          trigger['pull_robot'] = resp['pull_robot'];
+          $scope.activated({'trigger': $scope.trigger});
+        }, function(resp) {
+          $scope.hide();
+          $scope.canceled({'trigger': $scope.trigger});
+
+          bootbox.dialog({
+            "message": resp['data']['message'] || 'The build trigger setup could not be completed',
+            "title": "Could not activate build trigger",
+            "buttons": {
+              "close": {
+                "label": "Close",
+                "className": "btn-primary"
+              }
+            }
+          });
+        });
+      };
+
+      var check = function() {
+        if ($scope.counter && $scope.trigger && $scope.repository) {
+          $scope.show();
+        }
+      };
+
+      $scope.$watch('trigger', check);
+      $scope.$watch('counter', check);
+      $scope.$watch('repository', check);
+    }
+  };
+  return directiveDefinitionObject;
+});
+
+
+
 quayApp.directive('triggerSetupGithub', function () {
   var directiveDefinitionObject = {
     priority: 0,
@@ -3416,15 +3569,18 @@ quayApp.directive('triggerSetupGithub', function () {
     restrict: 'C',
     scope: {
       'repository': '=repository',
-      'trigger': '=trigger'
+      'trigger': '=trigger',
+      'analyze': '&analyze'
     },
     controller: function($scope, $element, ApiService) {
+      $scope.analyzeCounter = 0;
       $scope.setupReady = false;
       $scope.loading = true;
            
       $scope.handleLocationInput = function(location) {
         $scope.trigger['config']['subdir'] = location || '';
         $scope.isInvalidLocation = $scope.locations.indexOf(location) < 0;
+        $scope.analyze({'isValid': !$scope.isInvalidLocation});
       };
 
       $scope.handleLocationSelected = function(datum) {
@@ -3435,6 +3591,7 @@ quayApp.directive('triggerSetupGithub', function () {
         $scope.currentLocation = location;
         $scope.trigger['config']['subdir'] = location || '';
         $scope.isInvalidLocation = false;
+        $scope.analyze({'isValid': true});
       };
  
       $scope.selectRepo = function(repo, org) {
@@ -3473,6 +3630,7 @@ quayApp.directive('triggerSetupGithub', function () {
               $scope.locations = null;
               $scope.trigger.$ready = false;
               $scope.isInvalidLocation = false;
+              $scope.analyze({'isValid': false});
               return;
             }
 
@@ -3485,12 +3643,14 @@ quayApp.directive('triggerSetupGithub', function () {
             } else {
               $scope.currentLocation = null;
               $scope.isInvalidLocation = resp['subdir'].indexOf('') < 0;
+              $scope.analyze({'isValid': !$scope.isInvalidLocation});
             }
           }, function(resp) {
             $scope.locationError = resp['message'] || 'Could not load Dockerfile locations';
             $scope.locations = null;
             $scope.trigger.$ready = false;
             $scope.isInvalidLocation = false;
+            $scope.analyze({'isValid': false});
           });
         }
       };
@@ -3535,7 +3695,14 @@ quayApp.directive('triggerSetupGithub', function () {
         });
       };
 
-      loadSources();
+      var check = function() {
+        if ($scope.repository && $scope.trigger) {
+          loadSources();
+        }
+      };
+
+      $scope.$watch('repository', check);
+      $scope.$watch('trigger', check);
 
       $scope.$watch('currentRepo', function(repo) {
         $scope.selectRepoInternal(repo);

static/js/controllers.js

@@ -1165,6 +1165,8 @@ function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, $routeParams
   $scope.githubRedirectUri = KeyService.githubRedirectUri;
   $scope.githubClientId = KeyService.githubClientId;
 
+  $scope.showTriggerSetupCounter = 0;
+
   $scope.getBadgeFormat = function(format, repo) {
     if (!repo) { return; }
 
@@ -1454,65 +1456,15 @@ function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, $routeParams
   };
 
   $scope.setupTrigger = function(trigger) {
-    $scope.triggerSetupReady = false;
     $scope.currentSetupTrigger = trigger;
-
-    trigger['_pullEntity'] = null;
-    trigger['_publicPull'] = true;
-
-    $('#setupTriggerModal').modal({});
-    $('#setupTriggerModal').on('hidden.bs.modal', function () {
-      $scope.$apply(function() {
-        $scope.cancelSetupTrigger();
-      });
-    });
+    $scope.showTriggerSetupCounter++;
   };
 
-  $scope.isNamespaceAdmin = function(namespace) {
-    return UserService.isNamespaceAdmin(namespace);
-  };
+  $scope.cancelSetupTrigger = function(trigger) {
+    if ($scope.currentSetupTrigger != trigger) { return; }
 
-  $scope.finishSetupTrigger = function(trigger) {
-    $('#setupTriggerModal').modal('hide');
-    $scope.currentSetupTrigger = null;
-
-    var params = {
-      'repository': namespace + '/' + name,
-      'trigger_uuid': trigger.id
-    };
-
-    var data = {
-      'config': trigger['config']
-    };
-
-    if (trigger['_pullEntity']) {
-      data['pull_robot'] = trigger['_pullEntity']['name'];
-    }
-
-    ApiService.activateBuildTrigger(data, params).then(function(resp) {
-      trigger['is_active'] = true;
-      trigger['pull_robot'] = resp['pull_robot'];
-    }, function(resp) {
-      $scope.triggers.splice($scope.triggers.indexOf(trigger), 1);
-      bootbox.dialog({
-        "message": resp['data']['message'] || 'The build trigger setup could not be completed',
-        "title": "Could not activate build trigger",
-        "buttons": {
-          "close": {
-            "label": "Close",
-            "className": "btn-primary"
-          }
-        }
-      });
-    });
-  };
-
-  $scope.cancelSetupTrigger = function() {
-    if (!$scope.currentSetupTrigger) { return; }
-
-    $('#setupTriggerModal').modal('hide');
-    $scope.deleteTrigger($scope.currentSetupTrigger);
     $scope.currentSetupTrigger = null;
+    $scope.deleteTrigger(trigger);
   };
 
   $scope.startTrigger = function(trigger) {

static/partials/repo-admin.html

@@ -377,76 +377,17 @@
 </div>
 </div>
 
-
 <!-- Auth dialog -->
 <div class="docker-auth-dialog" username="'$token'" token="shownToken.code"
      shown="!!shownToken" counter="shownTokenCounter">
   <i class="fa fa-key"></i> {{ shownToken.friendlyName }}
 </div>
 
-<!-- Modal message dialog -->
-<div class="modal fade" id="setupTriggerModal">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <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="trigger-option-section">
-          <table style="width: 100%;">
-              <tr>
-                <td style="width: 114px">
-                  <div class="context-tooltip" title="The credentials used by the builder when pulling images" bs-tooltip>
-                    Pull Credentials:
-                  </div>
-                </td>
-                <td>
-                  <div ng-if="!isNamespaceAdmin(repo.namespace)" style="color: #aaa;">
-                    In order to set pull credentials for a build trigger, you must be an Administrator of the namespace <strong>{{ repo.namespace }}</strong>
-                  </div>
-                  <div class="btn-group btn-group-sm" ng-if="isNamespaceAdmin(repo.namespace)">
-                    <button type="button" class="btn btn-default"
-                            ng-class="currentSetupTrigger._publicPull ? 'active btn-info' : ''" ng-click="currentSetupTrigger._publicPull = true">Public</button>
-                    <button type="button" class="btn btn-default"
-                            ng-class="currentSetupTrigger._publicPull ? '' : 'active btn-info'" ng-click="currentSetupTrigger._publicPull = false">
-                      <i class="fa fa-wrench"></i>
-                      Robot account
-                    </button>
-                  </div>
-                </td>
-              </tr>
-              <tr ng-show="!currentSetupTrigger._publicPull">
-                <td>                  
-                </td>
-                <td>
-                  <div class="entity-search" namespace="repo.namespace" include-teams="false"
-                       input-title="'Select robot account for pulling...'"
-                       is-organization="repo.is_organization"
-                       is-persistent="true"
-                       current-entity="currentSetupTrigger._pullEntity"
-                       filter="['robot']"></div>
-                </td>
-              </tr>
-          </table>
-        </div>
-
-        <div class="trigger-description-element trigger-option-section" ng-switch on="currentSetupTrigger.service">
-          <div ng-switch-when="github">
-            <div class="trigger-setup-github" repository="repo" trigger="currentSetupTrigger"></div>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-primary"
-                ng-disabled="!currentSetupTrigger.$ready || (!currentSetupTrigger._publicPull && !currentSetupTrigger._pullEntity)"
-                ng-click="finishSetupTrigger(currentSetupTrigger)">Finished</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-      </div>
-    </div><!-- /.modal-content -->
-  </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-
+<!-- Setup trigger dialog-->
+<div class="setup-trigger-dialog" repository="repo"
+     trigger="currentSetupTrigger"
+     canceled="cancelSetupTrigger(trigger)"
+     counter="showTriggerSetupCounter"></div>
 
 <!-- Modal message dialog -->
 <div class="modal fade" id="cannotchangeModal">