vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

custom trigger: more wizard progress

Browse source
This commit is contained in:
Jimmy Zelinskie 2015-03-31 17:12:40 -04:00
parent 7d1d53ebcb
commit d2f9a8838c
4 changed files with 43 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
static/directives/setup-trigger-dialog.html
View file

@ -21,7 +21,7 @@
</div> </div>
<div ng-switch-when="custom"> <div ng-switch-when="custom">
<div class="trigger-setup-custom" repository="repository" trigger="trigger" <div class="trigger-setup-custom" repository="repository" trigger="trigger"
next-set-counter="nextStepCounter" current-setp-valid="state.stepValid" next-step-counter="nextStepCounter" current-step-valid="state.stepValid"
analyze="checkAnalyze(isValid)"></div> analyze="checkAnalyze(isValid)"></div>
</div> </div>
</div> </div>
@ -35,7 +35,7 @@
<div class="trigger-option-section" ng-show="currentView == 'analyzed'"> <div class="trigger-option-section" ng-show="currentView == 'analyzed'">
<!-- Messaging --> <!-- Messaging -->
<div class="alert alert-danger" ng-if="pullInfo.analysis.status == 'error'"> <div class="alert alert-danger" ng-if="pullInfo.analysis.status == 'error' && !(trigger.service == 'custom')">
{{ pullInfo.analysis.message }} {{ pullInfo.analysis.message }}
</div> </div>
<div class="alert alert-warning" ng-if="pullInfo.analysis.status == 'warning'"> <div class="alert alert-warning" ng-if="pullInfo.analysis.status == 'warning'">
@ -59,7 +59,10 @@
</div> </div>
</div> </div>
<div style="margin-bottom: 12px">Please select the credentials to use when pulling the base image:</div> <div style="margin-bottom: 12px">
<p>Because Dockerfiles may depend on other private images, you may need to use a robot account to build this repository.</p>
Please select the credentials to use when pulling the base image:
</div>
<div ng-if="!isNamespaceAdmin(repository.namespace)" style="color: #aaa;"> <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 <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> Administrator of the namespace <strong>{{ repository.namespace }}</strong>

31
static/directives/trigger-setup-custom.html
View file

@ -1,6 +1,19 @@
<div class="trigger-setup-custom-element"> <div class="trigger-setup-custom-element">
<!-- Current selected info, is this even necessary? -->
<div class="selected-info" ng-show="nextStepCounter > 0"> <div class="selected-info" ng-show="nextStepCounter > 0">
<table style="width: 100%;">
<tr ng-show="nextStepCounter > 0">
<td width="200px">Repository</td>
<td>{{ state.gitURL }}</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.currentLocation || '(Repository Root)' }}
</div>
</td>
</table>
</div> </div>
<!-- Step view --> <!-- Step view -->
@ -8,9 +21,19 @@
steps-completed="stepsCompleted()"> steps-completed="stepsCompleted()">
<!-- Git URL Input --> <!-- Git URL Input -->
<div class="step-view-step" complete-condition="state.gitURL"> <div class="step-view-step" complete-condition="state.gitURL" load-callback="nopLoad(callback)"
<div style="margin-bottom: 12px;">Please enter the URL used to clone the your git repository:</div> load-message="Loading Git URL Input">
<input type="text" ng-pattern=""> <div style="margin-bottom: 12px;">Please enter the 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.gitURL" ng-pattern="/(git|http|https):\/\/(.*)(\.git)/">
</div>
<!-- Dockerfile folder select -->
<div class="step-view-step" complete-condition="state.currentLocation" 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.currentLocation">
</div> </div>
</div> </div>
</div> </div>

7
static/js/directives/ui/trigger-setup-custom.js
View file

@ -23,10 +23,15 @@ angular.module('quay').directive('triggerSetupCustom', function() {
$scope.state = { $scope.state = {
'gitURL': null, 'gitURL': null,
'subdir': null,
}; };
$scope.stepsCompleted = function() { $scope.stepsCompleted = function() {
$scope.analyze({'isValid': $scope.state.gitURL != null}); $scope.analyze({'isValid': $scope.state.gitURL != null && $scope.subdir != null});
};
$scope.nopLoad = function(callback) {
callback();
}; };
} }
}; };