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

Move repo notification create to its own page

Browse source 
Also fixes a bug around Slack setup

Fixes #1834
This commit is contained in:
Joseph Schorr 2016-09-14 16:06:52 -04:00
parent 58641cbf4f
commit 0dce935c40
12 changed files with 390 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

46
static/js/directives/ui/create-external-notification-dialog.js → static/js/directives/ui/create-external-notification.js
View file

@ -1,16 +1,15 @@
/**
* An element which displays a dialog to register a new external notification on a repository.
* An element which displays a form to register a new external notification on a repository.
*/
angular.module('quay').directive('createExternalNotificationDialog', function () {
angular.module('quay').directive('createExternalNotification', function () {
var directiveDefinitionObject = {
priority: 0,
templateUrl: '/static/directives/create-external-notification-dialog.html',
templateUrl: '/static/directives/create-external-notification.html',
replace: false,
transclude: false,
restrict: 'C',
scope: {
'repository': '=repository',
'counter': '=counter',
'notificationCreated': '&notificationCreated',
'defaultData': '=defaultData'
},
@ -27,7 +26,12 @@ angular.module('quay').directive('createExternalNotificationDialog', function ()
$scope.methods = ExternalNotificationData.getSupportedMethods();
$scope.getPattern = function(field) {
return new RegExp(field.regex);
if (field._cached_regex) {
return field._cached_regex;
}
field._cached_regex = new RegExp(field.pattern);
return field._cached_regex;
};
$scope.setEvent = function(event) {
@ -99,14 +103,6 @@ angular.module('quay').directive('createExternalNotificationDialog', function ()
ApiService.createRepoNotification(data, params).then(function(resp) {
$scope.status = '';
$scope.notificationCreated({'notification': resp});
// Used by repository-events-summary.
if (!$scope.repository._notificationCounter) {
$scope.repository._notificationCounter = 0;
}
$scope.repository._notificationCounter++;
$('#createNotificationModal').modal('hide');
});
};
@ -123,6 +119,7 @@ angular.module('quay').directive('createExternalNotificationDialog', function ()
}
$scope.unauthorizedEmail = true;
$('#authorizeEmailModal').modal({});
};
$scope.sendAuthEmail = function() {
@ -146,6 +143,11 @@ angular.module('quay').directive('createExternalNotificationDialog', function ()
}, 1000);
};
$scope.cancelEmailAuth = function() {
$scope.status = '';
$('#authorizeEmailModal').modal('hide');
};
$scope.getHelpUrl = function(field, config) {
var helpUrl = field['help_url'];
if (!helpUrl) {
@ -155,21 +157,9 @@ angular.module('quay').directive('createExternalNotificationDialog', function ()
return StringBuilderService.buildUrl(helpUrl, config);
};
$scope.$watch('counter', function(counter) {
if (counter) {
$scope.clearCounter++;
$scope.status = '';
$scope.currentEvent = null;
$scope.currentMethod = null;
$scope.unauthorizedEmail = false;
$timeout(function() {
if ($scope.defaultData && $scope.defaultData['currentEvent']) {
$scope.setEvent($scope.defaultData['currentEvent']);
}
}, 100);
$('#createNotificationModal').modal({});
$scope.$watch('defaultData', function(counter) {
if ($scope.defaultData && $scope.defaultData['currentEvent']) {
$scope.setEvent($scope.defaultData['currentEvent']);
}
});
}

8
static/js/directives/ui/repository-events-table.js
View file

@ -53,14 +53,6 @@ angular.module('quay').directive('repositoryEventsTable', function () {
loadNotifications();
$scope.handleNotificationCreated = function(notification) {
$scope.notifications.push(notification);
};
$scope.askCreateNotification = function() {
$scope.showNewNotificationCounter++;
};
$scope.findEnumValue = function(values, index) {
var found = null;
Object.keys(values).forEach(function(key) {