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

Use ApiService to get error message

Browse source
This commit is contained in:
Evan Cordell 2016-04-11 17:28:49 -04:00
parent b5db41920f
commit 7c361c07f9
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
endpoints/api/error.py
View file

@ -17,7 +17,7 @@ def error_view(error_type):
@resource('/v1/error/<error_type>') @resource('/v1/error/<error_type>')
@path_param('error_type', 'The error code identifying the type of error.') @path_param('error_type', 'The error code identifying the type of error.')
class Error(ApiResource): class Error(ApiResource):
""" Resource for manging an organization's teams. """ """ Resource for Error Descriptions"""
schemas = { schemas = {
'ApiErrorDescription': { 'ApiErrorDescription': {
'type': 'object', 'type': 'object',

1
static/js/app.js
View file

@ -211,6 +211,7 @@ quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', 'PlanServi
// Handle session expiration. // Handle session expiration.
Restangular.setErrorInterceptor(function(response) { Restangular.setErrorInterceptor(function(response) {
//TODO: remove check for error_type (old style errors)
var invalid_token = response.data['title'] == 'invalid_token' || response.data['error_type'] == 'invalid_token'; var invalid_token = response.data['title'] == 'invalid_token' || response.data['error_type'] == 'invalid_token';
if (response.status == 401 && invalid_token && response.data['session_required'] !== false) { if (response.status == 401 && invalid_token && response.data['session_required'] !== false) {
$('#sessionexpiredModal').modal({}); $('#sessionexpiredModal').modal({});

2
static/js/directives/ui/signup-form.js
View file

@ -46,7 +46,7 @@ angular.module('quay').directive('signupForm', function () {
UserService.load(); UserService.load();
}, function(result) { }, function(result) {
$scope.registering = false; $scope.registering = false;
UIService.showFormError('#signupButton', result); UIService.showFormError('#signupButton', result, null, ApiService);
}); });
}; };
} }

2
static/js/services/api-service.js
View file

@ -124,6 +124,7 @@ angular.module('quay').factory('ApiService', ['Restangular', '$q', 'UtilService'
var deferred = $q.defer(); var deferred = $q.defer();
// If the error is a fresh login required, show the dialog. // If the error is a fresh login required, show the dialog.
// TODO: remove error_type (old style error)
var fresh_login_required = resp.data['title'] == 'fresh_login_required' || resp.data['error_type'] == 'fresh_login_required'; var fresh_login_required = resp.data['title'] == 'fresh_login_required' || resp.data['error_type'] == 'fresh_login_required';
if (resp.status == 401 && fresh_login_required) { if (resp.status == 401 && fresh_login_required) {
var retryOperation = function() { var retryOperation = function() {
@ -294,6 +295,7 @@ angular.module('quay').factory('ApiService', ['Restangular', '$q', 'UtilService'
apiService.getErrorMessage = function(resp, defaultMessage) { apiService.getErrorMessage = function(resp, defaultMessage) {
var message = defaultMessage; var message = defaultMessage;
if (resp['data']) { if (resp['data']) {
//TODO: remove error_message and error_description (old style error)
message = resp['data']['detail'] || resp['data']['error_message'] || resp['data']['message'] || resp['data']['error_description'] || message; message = resp['data']['detail'] || resp['data']['error_message'] || resp['data']['message'] || resp['data']['error_description'] || message;
} }

5
static/js/services/ui-service.js
View file

@ -1,7 +1,7 @@
/** /**
* Service which provides helper methods for performing some simple UI operations. * Service which provides helper methods for performing some simple UI operations.
*/ */
angular.module('quay').factory('UIService', ['$timeout', '$rootScope', '$location', function($timeout, $rootScope, $location) { angular.module('quay').factory('UIService', ['$timeout', '$rootScope', '$location', 'ApiService', function($timeout, $rootScope, $location, ApiService) {
var CheckStateController = function(items, itemKey) { var CheckStateController = function(items, itemKey) {
this.items = items; this.items = items;
this.checked = []; this.checked = [];
@ -12,6 +12,7 @@ angular.module('quay').factory('UIService', ['$timeout', '$rootScope', '$locatio
this.itemKey_ = itemKey; this.itemKey_ = itemKey;
this.listeners_ = []; this.listeners_ = [];
this.page_ = null; this.page_ = null;
this.ApiService = ApiService
}; };
CheckStateController.prototype.listen = function(callback) { CheckStateController.prototype.listen = function(callback) {
@ -138,7 +139,7 @@ angular.module('quay').factory('UIService', ['$timeout', '$rootScope', '$locatio
}; };
uiService.showFormError = function(elem, result, opt_placement) { uiService.showFormError = function(elem, result, opt_placement) {
var message = result.data['message'] || result.data['error_description'] || result.data['detail'] || ''; var message = ApiService.getErrorMessage(result, 'error');
if (message) { if (message) {
uiService.showPopover(elem, message, opt_placement || 'bottom'); uiService.showPopover(elem, message, opt_placement || 'bottom');
} else { } else {