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

Fix display of triggered builds if their trigger has been deleted

Browse source 
Before this change, if a build was triggered by a build trigger that was subsequently deleted, we'd display "Manually triggered" for the build in the UI, even though we have sufficient metadata to show *nearly the same* normal build information. After this change, if we have said trigger metadata, we still display as much as we can.

Fixes https://jira.coreos.com/browse/QUAY-855
This commit is contained in:
Joseph Schorr 2018-05-14 15:30:52 -04:00
parent e5b86d4763
commit 99c986df6c
3 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
static/directives/build-info-bar.html
View file

@ -13,6 +13,6 @@
</div> </div>
</div> </div>
<div class="triggered-build-description" build="build" ng-if="build.trigger"></div> <div class="triggered-build-description" build="build" ng-if="build.trigger || build.trigger_metadata"></div>
<div ng-if="!build.trigger">Manually Started Build</div> <div ng-if="!build.trigger && !build.trigger_metadata">Manually Started Build</div>
</div> </div>

20
static/js/directives/ui/triggered-build-description.js
View file

@ -46,23 +46,17 @@ angular.module('quay').directive('triggeredBuildDescription', function () {
if (!build) { return; } if (!build) { return; }
var triggerMetadata = build.trigger_metadata || {}; var triggerMetadata = build.trigger_metadata || {};
if (triggerMetadata.commit_info) {
if (!build.trigger && !build.manual_user) {
$scope.infoDisplay = 'manual';
return;
}
if (!build.trigger && build.manual_user) {
$scope.infoDisplay = 'manual+user';
return;
}
if (build.trigger && triggerMetadata.commit_info) {
$scope.infoDisplay = 'fullcommit'; $scope.infoDisplay = 'fullcommit';
return; return;
} }
if (build.trigger && build.trigger.build_source && TriggerService.getCommitSHA(triggerMetadata)) { if (!build.trigger) {
$scope.infoDisplay = build.manual_user ? 'manual+user' : 'manual';
return;
}
if (build.trigger.build_source && TriggerService.getCommitSHA(triggerMetadata)) {
$scope.infoDisplay = 'commitsha'; $scope.infoDisplay = 'commitsha';
return; return;
} }

7
static/js/services/trigger-service.js
View file

@ -147,8 +147,11 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
}; };
triggerService.getFullLinkTemplate = function(build, templateName) { triggerService.getFullLinkTemplate = function(build, templateName) {
var name = build.trigger.service; if (!build.trigger) {
var type = triggerTypes[name]; return null;
}
var type = triggerTypes[build.trigger.service];
if (!type) { if (!type) {
return null; return null;
} }