Merge pull request #22 from coreos-inc/git

git's a pretty cool guy

static/directives/create-external-notification-dialog.html

@@ -81,6 +81,7 @@
                   </span>
                   <input type="url" class="form-control" ng-model="currentConfig[field.name]"  ng-switch-when="url" required>
                   <input type="text" class="form-control" ng-model="currentConfig[field.name]"  ng-switch-when="string" required>
+                  <!-- TODO(jschorr): unify the ability to create an input box with all the usual features -->
                   <div ng-switch-when="regex">
                     <input type="text" class="form-control" ng-model="currentConfig[field.name]"
                            ng-pattern="getPattern(field)"

static/directives/credentials.html

@@ -0,0 +1,24 @@
+<div ng-switch on="trigger.service">
+  <!-- Message -->
+  <div ng-switch-when="custom-git" class="alert alert-info">
+    <p>
+      In order to use this trigger, the following first requires action:
+      <ul>
+        <li>You must give the following public key read access to the git repository.</li>
+        <li>You must set your repository to POST to the following URL to trigger a build.</li>
+      </ul>
+      For more information, refer to the <a href="http://docs.quay.io/guides/custom-trigger.html" target="_blank">Custom Git Triggers documentation</a>.
+    </p>
+  </div>
+  <div ng-switch-when="github" class="alert alert-info">
+    <p>The following key has been automatically added to your GitHub repository.</p>
+  </div>
+
+  <!-- Credentials -->
+  <div ng-repeat="credential in trigger.config.credentials">
+    <p>
+      {{ credential.name }}:
+      <div class="copy-box" value="credential.value"></div>
+    </p>
+  </div>
+</div>

static/directives/manual-trigger-build-dialog.html

@@ -18,11 +18,20 @@
                     <span ng-switch-when="option">
                       <span class="quay-spinner" ng-show="!fieldOptions[field.name]"></span>
                       <select ng-model="parameters[field.name]" ng-show="fieldOptions[field.name]"
-                              ng-options="value for value  in fieldOptions[field.name]"
+                              ng-options="value for value in fieldOptions[field.name]"
                               required>
                       </select>
                     </span>
                     <input type="text" class="form-control" ng-model="parameters[field.name]"  ng-switch-when="string" required>
+                    <!-- TODO(jschorr): unify the ability to create an input box with all the usual features -->
+                    <div ng-switch-when="regex">
+                      <input type="text" class="form-control" ng-model="parameters[field.name]"
+                             ng-pattern="getPattern(field)"
+                             placeholder="{{ field.placeholder }}"
+                             ng-name="field.name"
+                             id="{{ field.name }}"
+                             required>
+                    </div>
                   </div>
                 </td>
               </tr>

static/directives/repo-view/repo-panel-builds.html

@@ -93,7 +93,7 @@
           </button>
           <ul class="dropdown-menu dropdown-menu-right pull-right">
             <li ng-repeat="type in TriggerService.getTypes()">
-              <a href="{{ TriggerService.getRedirectUrl(type, repository.namespace, repository.name) }}">
+              <a href="{{ TriggerService.getRedirectUrl(type, repository.namespace, repository.name) }}" target="{{ TriggerService.getMetadata(type).is_external ? '' : '_self' }}">
                 <i class="fa fa-lg" ng-class="TriggerService.getMetadata(type).icon"></i>
                 {{ TriggerService.getTitle(type) }}
               </a>
@@ -135,13 +135,16 @@
 
           <tr ng-repeat="trigger in triggers | filter:{'is_active':true}">
             <td><div class="trigger-description" trigger="trigger" short="true"></div></td>
-            <td>{{ trigger.subdir || '(Root Directory)' }}</td>
-            <td>{{ trigger.config.branchtag_regex || '(All)' }}</td>
+            <td>{{ trigger.config.subdir || '/' }}</td>
+            <td>{{ trigger.config.branchtag_regex || 'All' }}</td>
             <td>
               <span class="entity-reference" entity="trigger.pull_robot" ng-if="trigger.pull_robot"></span>
             </td>
             <td>
               <span class="cor-options-menu">
+                <span ng-if="trigger.config.credentials" class="cor-option" option-click="showTriggerCredentialsModal(trigger)">
+                  <i class="fa fa-unlock-alt"></i> View Credentials
+                </span>
                 <span class="cor-option" option-click="askRunTrigger(trigger)"
                       ng-class="trigger.connected_user == user.username ? '' : 'disabled'">
                   <i class="fa fa-chevron-right"></i> Run Trigger Now
@@ -159,6 +162,11 @@
     </div>
   </div> <!-- /Build Triggers -->
 
+  <!-- Dialogs -->
+
+  <!-- Trigger Credentials dialog -->
+  <div class="trigger-credentials-dialog" trigger="triggerCredentialsModalTrigger" counter="triggerCredentialsModalCounter"></div>
+
   <!-- Delete Tag Confirm -->
   <div class="cor-confirm-dialog"
        dialog-context="deleteTriggerInfo"
@@ -190,4 +198,6 @@
        counter="showTriggerStartDialogCounter"
        start-build="startTrigger(trigger, parameters)"></div>
 
-</div>
+  <!-- /Dialogs -->
+
+</div>

static/directives/setup-trigger-dialog.html

@@ -19,6 +19,11 @@
                    next-step-counter="nextStepCounter" current-step-valid="state.stepValid"
                    analyze="checkAnalyze(isValid)"></div>
             </div>
+            <div ng-switch-when="custom-git">
+              <div class="trigger-setup-custom" repository="repository" trigger="trigger"
+                   next-step-counter="nextStepCounter" current-step-valid="state.stepValid"
+                   analyze="checkAnalyze(isValid)"></div>
+            </div>
           </div>
 
           <!-- Loading pull information -->
@@ -30,11 +35,13 @@
           <div class="trigger-option-section" ng-show="currentView == 'analyzed'">
 
             <!-- Messaging -->
-            <div class="alert alert-danger" ng-if="pullInfo.analysis.status == 'error'">
-              {{ pullInfo.analysis.message }}
-            </div>
-            <div class="alert alert-warning" ng-if="pullInfo.analysis.status == 'warning'">
-              {{ pullRequirements.message }}
+            <div ng-switch on="pullInfo.analysis.status">
+              <div ng-switch-when="error" class="alert alert-danger">{{ pullInfo.analysis.message }}</div>
+              <div ng-switch-when="warning" class="alert alert-warning">{{ pullInfo.analysis.message }}</div>
+              <div ng-switch-when="notimplemented" class="alert alert-warning">
+                <p>For {{ TriggerService.getTitle(trigger.service) }} triggers, we are unable to determine dependencies automatically.</p>
+                <p>If the git repository being built depends on a private base image, you must manually select a robot account with the proper permissions.</p>
+              </div>
             </div>
             <div class="dockerfile-found" ng-if="pullInfo.analysis.is_public === false">
               <div class="dockerfile-found-content">
@@ -54,7 +61,9 @@
               </div>
             </div>
 
-            <div style="margin-bottom: 12px">Please select the credentials to use when pulling the base image:</div>
+            <div style="margin-bottom: 12px">
+              Please select the credentials to use when pulling the base image:
+            </div>
             <div ng-if="!isNamespaceAdmin(repository.namespace)" style="color: #aaa;">
               <strong>Note:</strong> In order to set pull credentials for a build trigger, you must be an
               Administrator of the namespace <strong>{{ repository.namespace }}</strong>
@@ -101,6 +110,13 @@
 
           </div>
 
+          <div class="trigger-option-section" ng-show="currentView == 'postActivation'">
+            <div ng-if="trigger.config.credentials" class="credentials" trigger="trigger"></div>
+            <div ng-if="!trigger.config.credentials">
+              <div class="alert alert-success">The trigger has been successfully created.</div>
+            </div>
+          </div>
+
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-primary" ng-disabled="!state.stepValid"
@@ -112,7 +128,7 @@
                   ng-click="activate()"
                   ng-show="currentView == 'analyzed'">Create Trigger</button>
 
-          <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">{{ currentView == 'postActivation' ? 'Done' : 'Cancel' }}</button>
         </div>
       </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->

static/directives/trigger-credentials-dialog.html

@@ -0,0 +1,19 @@
+<!-- Modal message dialog -->
+<div class="modal fade" id="triggercredentialsmodal">
+  <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">
+          Trigger Credentials
+        </h4>
+      </div>
+      <div class="modal-body">
+        <div class="credentials" trigger="trigger"></div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Done</button>
+      </div>
+    </div> <!-- /.modal-content -->
+  </div> <!-- /.modal-dialog -->
+</div> <!-- /.modal -->

static/directives/trigger-description.html

@@ -1,4 +1,5 @@
 <span class="trigger-description-element" ng-switch on="trigger.service">
+  <!-- GitHub -->
   <span ng-switch-when="github">
     <i class="fa fa-github fa-lg" style="margin-right: 6px" data-title="GitHub" bs-tooltip="tooltip.title"></i>
     Push to GitHub <span ng-if="KeyService.isEnterprise('github-trigger')">Enterprise</span> repository
@@ -14,11 +15,24 @@
 
       <div>
         <span class="trigger-description-subtitle">Dockerfile:</span>
-        <span ng-if="trigger.config.subdir">//{{ trigger.config.subdir}}/Dockerfile</span>
-        <span ng-if="!trigger.config.subdir">//Dockerfile</span>
+        <span>{{ TriggerService.getDockerfileLocation(trigger) }}</span>
       </div>
     </div>
   </span>
+
+  <!-- Git -->
+  <span ng-switch-when="custom-git">
+    <i class="fa fa-git fa-lg" style="margin-right: 6px;" data-title="git" bs-tooltip="tooltip.title"></i>
+    Push to {{ trigger.config.build_source }}
+    <div style="margin-top: 4px; margin-left: 26px; font-size: 12px; color: gray;" ng-if="!short">
+      <div>
+        <span class="trigger-description-subtitle">Dockerfile:</span>
+        <span>{{ TriggerService.getDockerfileLocation(trigger) }}</span<
+      </div>
+    </div>
+  </span>
+
+  <!-- Who knows? -->
   <span ng-switch-default>
     Unknown
   </span>

static/directives/trigger-setup-custom.html

@@ -0,0 +1,40 @@
+<div class="trigger-setup-custom-element">
+  <div class="selected-info" ng-show="nextStepCounter > 0">
+    <table style="width: 100%;">
+      <tr ng-show="nextStepCounter > 0">
+        <td width="200px">Repository</td>
+        <td>{{ state.build_source }}</td>
+      </tr>
+
+      <tr ng-show="nextStepCounter > 1">
+        <td>Dockerfile Location:</td>
+        <td>
+          <div class="dockerfile-location">
+            <i class="fa fa-folder fa-lg"></i> {{ state.subdir || '/' }}
+          </div>
+        </td>
+    </table>
+  </div>
+
+  <!-- Step view -->
+  <div class="step-view" next-step-counter="nextStepCounter" current-step-valid="currentStepValid"
+       steps-completed="stepsCompleted()">
+
+    <!-- Git URL Input -->
+    <!-- TODO(jschorr): make nopLoad(callback) no longer required -->
+    <div class="step-view-step" complete-condition="trigger['config']['build_source']" load-callback="nopLoad(callback)"
+         load-message="Loading Git URL Input">
+      <div style="margin-bottom: 12px;">Please enter an HTTP or SSH style URL used to clone your git repository:</div>
+      <input class="form-control" type="text" placeholder="git@example.com:namespace/repository.git" style="width: 100%;"
+             ng-model="state.build_source" ng-pattern="/(((http|https):\/\/)(.+)|\w+@(.+):(.+))/">
+    </div>
+
+    <!-- Dockerfile folder select -->
+    <div class="step-view-step" complete-condition="trigger.$ready" load-callback="nopLoad(callback)"
+         load-message="Loading Folder Input">
+       <div style="margin-bottom: 12px">Dockerfile Location:</div>
+       <input class="form-control" type="text"  placeholder="/" style="width: 100%;"
+              ng-model="state.subdir" ng-pattern="/^($|\/|\/.+)/">
+    </div>
+  </div>
+</div>

static/directives/trigger-setup-github.html

@@ -33,7 +33,7 @@
         </td>
         <td>
           <div class="dockerfile-location">
-              <i class="fa fa-folder fa-lg"></i> {{ state.currentLocation || '(Repository Root)' }}
+            <i class="fa fa-folder fa-lg"></i> {{ state.currentLocation || '(Repository Root)' }}
           </div>
         </td>
       </tr>

static/directives/triggered-build-description.html

@@ -1,18 +1,17 @@
 <div class="triggered-build-description-element">
 
-<span class="tbd-content" class="manual" ng-if="!build.trigger && !build.job_config.manual_user">
-  (Manually Triggered Build)
-</span>
+  <span class="tbd-content" class="manual" ng-if="!build.trigger && !build.job_config.manual_user">
+    (Manually Triggered Build)
+  </span>
 
-<span class="tbd-content" ng-if="!build.trigger && build.job_config.manual_user">
-  <i class="fa fa-user"></i> {{ build.job_config.manual_user }}
-</span>
+  <span class="tbd-content" ng-if="!build.trigger && build.job_config.manual_user">
+    <i class="fa fa-user"></i> {{ build.job_config.manual_user }}
+  </span>
 
-<span ng-switch on="build.trigger.service" ng-if="build.trigger">
-  <!-- GitHub -->
-  <span ng-switch-when="github">
-    <!-- Full Commit Information -->
-    <span class="tbd-content" ng-if="build.job_config.trigger_metadata.commit_info">
+  <!-- Full Commit Information -->
+  <span class="tbd-content" ng-if="build.job_config.trigger_metadata.commit_info" ng-switch on="build.trigger.service">
+    <!-- GitHub -->
+    <div ng-switch-when="github">
       <div class="commit-message">
         <a ng-href="{{ getGitHubRepoURL(build) }}/commit/{{ build.job_config.trigger_metadata.commit_sha }}"
            target="_blank">
@@ -39,27 +38,63 @@
               branch-template="getGitHubRepoURL(build) + '/tree/{branch}'"
               tag-template="getGitHubRepoURL(build) + '/releases/tag/{tag}'"></span>
       </div>
-     </span>
+    </div>
 
-    <!-- Just commit SHA -->
-    <span class="tbd-content" ng-if="build.job_config.trigger_metadata && !build.job_config.trigger_metadata.commit_info">
-      Triggered by commit
+    <!-- Git -->
+    <div ng-switch-when="custom-git">
+      <div class="commit-message">
+        {{ build.job_config.trigger_metadata.commit_info.message }}
+      </div>
+      <div class="commit-information">
+        <span class="commit-who-when">
+          Authored
+          <span am-time-ago="build.job_config.trigger_metadata.commit_info.date"></span>
+          <span class="commit-who">
+            {{ build.job_config.trigger_metadata.commit_info.author.username }}
+          </span>
+        </span>
+        <span>
+          {{ build.job_config.trigger_metadata.commit_sha }}
+        </span>
+        <span>
+          {{ build.job_config.trigger_metadata.ref }}
+        </span>
+      </div>
+    </div>
+ </span>
+
+  <!-- Just commit SHA -->
+  <span class="tbd-content" ng-if="build.job_config.trigger_metadata && !build.job_config.trigger_metadata.commit_info" ng-switch on="build.trigger.service">
+    Triggered by commit
+    <!-- GitHub -->
+    <div ng-switch-when="github">
       <span class="source-commit-link"
             commit-sha="build.job_config.trigger_metadata.commit_sha"
             url-template="getGitHubRepoURL(build) + '/commit/{sha}'"></span>
-    </span>
+    </div>
 
-    <!-- No information -->
-    <span class="tbd-content" ng-if="!build.job_config.trigger_metadata">
-      Triggered by commit to
+    <!-- Git -->
+    <div ng-switch-when="custom-git">
+      <span>{{ build.job_config.trigger_metadata.commit_sha }}</span>
+    </div>
+  </span>
+
+  <!-- No information -->
+  <span class="tbd-content" ng-if="!build.job_config.trigger_metadata" ng-switch on="build.trigger.service">
+    Triggered by commit to
+    <!-- GitHub -->
+    <div ng-switch-when="github">
       <i class="fa fa-github fa-lg" data-title="GitHub" data-container="body" bs-tooltip></i>
       <a ng-href="{{ getGitHubRepoURL(build) }}" target="_new">
         {{ build.trigger.config.build_source }}
       </a>
-    </span>
+    </div>
+
+    <!-- Git -->
+    <div ng-switch-when="custom-git">
+      <i class="fa fa-git fa-lg" data-title="git" data-container="body" bs-tooltip></i>
+      {{ build.trigger.config.build_source }}
+    </div>
   </span>
 
-  <!-- Unknown -->
-  <span ng-switch-default></span>
-</span>
 </div>