External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-16 04:10:44 -03:30
Code Issues Packages Projects Releases Wiki Activity

Apply UI feedback changes

Browse Source 
* Remove input slider css mixin
* Remove unused dependencies
* Improve error handling by plugging in the ProcessErrors factory
This commit is contained in:
Marliana Lara 2018-01-31 12:23:36 -05:00 committed by Matthew Jones
parent e07f441e32
commit fa70d108d7
No known key found for this signature in database
GPG Key ID: 76A4C17A97590C1C
11 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
awx/ui/client/lib/components/input/_index.less
View File

@ -245,10 +245,20 @@
}
&::-webkit-slider-runnable-track {
.at-mixin-sliderTrack();
background: @at-color-input-slider-track;
cursor: pointer;
height: 1px;
width: 100%;
}
&::-webkit-slider-thumb {
.at-mixin-sliderThumb();
-webkit-appearance: none;
background: @at-color-input-slider-thumb;
border-radius: 50%;
border: none;
cursor: pointer;
height: 16px;
margin-top: -7px;
width: 16px;
}
}
}

18
awx/ui/client/lib/theme/_mixins.less
View File

@ -102,22 +102,4 @@
.at-mixin-FontFixedWidth () {
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
}
.at-mixin-sliderTrack() {
background: @at-color-input-slider-track;
cursor: pointer;
height: 1px;
width: 100%;
}
.at-mixin-sliderThumb() {
-webkit-appearance: none;
background: @at-color-input-slider-thumb;
border-radius: 50%;
border: none;
cursor: pointer;
height: 16px;
margin-top: -7px;
width: 16px;
}

4
awx/ui/client/src/instance-groups/add-edit/instance-list-policy.controller.js
View File

@ -1,4 +1,4 @@
function InstanceModalController ($scope, $state, $http, $q, models, strings) {
function InstanceModalController ($scope, $state, models, strings) {
const { instance, instanceGroup } = models;
const vm = this || {};
@ -47,8 +47,6 @@ function InstanceModalController ($scope, $state, $http, $q, models, strings) {
InstanceModalController.$inject = [
'$scope',
'$state',
'$http',
'$q',
'resolvedModels',
'InstanceGroupsStrings'
];

11
awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js
View File

@ -1,5 +1,4 @@
export default ['templateUrl', 'InstanceGroupsStrings',
function (templateUrl, strings) {
function CapacityBar (templateUrl, strings) {
return {
scope: {
capacity: '=',
@ -44,4 +43,10 @@ function (templateUrl, strings) {
}
};
}
];
CapacityBar.$inject = [
'templateUrl',
'InstanceGroupsStrings'
];
export default CapacityBar;

5
awx/ui/client/src/instance-groups/capacity-bar/main.js
View File

@ -1,5 +0,0 @@
import capacityBar from './capacity-bar.directive';
export default
angular.module('capacityBarDirective', [])
.directive('capacityBar', capacityBar);

7
awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.controller.js
View File

@ -1,5 +1,5 @@
function InstanceJobsController ($scope, GetBasePath, Rest, Dataset, Find, $filter, $state, $q, model, strings, jobStrings) {
function InstanceJobsController ($scope, $filter, $state, model, strings, jobStrings) {
const vm = this || {};
const { instance } = model;
@ -66,13 +66,8 @@ function InstanceJobsController ($scope, GetBasePath, Rest, Dataset, Find, $filt
InstanceJobsController.$inject = [
'$scope',
'GetBasePath',
'Rest',
'Dataset',
'Find',
'$filter',
'$state',
'$q',
'resolvedModels',
'InstanceGroupsStrings',
'JobStrings'

15
awx/ui/client/src/instance-groups/instances/instance-modal.controller.js
View File

@ -1,4 +1,4 @@
function InstanceModalController ($scope, $state, $http, $q, models, strings) {
function InstanceModalController ($scope, $state, models, strings, ProcessErrors) {
const { instance, instanceGroup } = models;
const vm = this || {};
@ -54,7 +54,13 @@ function InstanceModalController ($scope, $state, $http, $q, models, strings) {
});
Promise.all(defers)
.then(vm.onSaveSuccess);
.then(vm.onSaveSuccess)
.catch(({data, status}) => {
ProcessErrors($scope, data, status, null, {
hdr: 'Error!',
msg: 'Call failed. Return status: ' + status
});
});
};
vm.onSaveSuccess = () => {
@ -65,10 +71,9 @@ function InstanceModalController ($scope, $state, $http, $q, models, strings) {
InstanceModalController.$inject = [
'$scope',
'$state',
'$http',
'$q',
'resolvedModels',
'InstanceGroupsStrings'
'InstanceGroupsStrings',
'ProcessErrors'
];
export default InstanceModalController;

13
awx/ui/client/src/instance-groups/instances/instances.controller.js
View File

@ -1,4 +1,4 @@
function InstancesController ($scope, $state, $http, models, Instance, strings, Dataset) {
function InstancesController ($scope, $state, $http, models, Instance, strings, Dataset, ProcessErrors) {
const { instanceGroup } = models;
const vm = this || {};
vm.strings = strings;
@ -51,7 +51,13 @@ function InstancesController ($scope, $state, $http, models, Instance, strings,
data
};
$http(req).then(vm.onSaveSuccess);
$http(req).then(vm.onSaveSuccess)
.catch(({data, status}) => {
ProcessErrors($scope, data, status, null, {
hdr: 'Error!',
msg: 'Call failed. Return status: ' + status
});
});
};
vm.onSaveSuccess = () => {
@ -73,7 +79,8 @@ InstancesController.$inject = [
'resolvedModels',
'InstanceModel',
'InstanceGroupsStrings',
'Dataset'
'Dataset',
'ProcessErrors'
];
export default InstancesController;

7
awx/ui/client/src/instance-groups/jobs/jobs.controller.js
View File

@ -1,5 +1,5 @@
function InstanceGroupJobsController ($scope, GetBasePath, Rest, Dataset, Find, $filter, $state, $q, model, strings, jobStrings) {
function InstanceGroupJobsController ($scope, $filter, $state, model, strings, jobStrings) {
const vm = this || {};
const { instanceGroup } = model;
@ -78,13 +78,8 @@ function InstanceGroupJobsController ($scope, GetBasePath, Rest, Dataset, Find,
InstanceGroupJobsController.$inject = [
'$scope',
'GetBasePath',
'Rest',
'Dataset',
'Find',
'$filter',
'$state',
'$q',
'resolvedModels',
'InstanceGroupsStrings',
'JobStrings'

12
awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js
View File

@ -1,5 +1,5 @@
export default ['$scope', 'InstanceGroupList', 'resolvedModels', 'GetBasePath', 'Rest', 'Dataset','Find', '$state', '$q', 'ComponentsStrings',
function($scope, InstanceGroupList, resolvedModels, GetBasePath, Rest, Dataset, Find, $state, $q, strings) {
export default ['$scope', 'InstanceGroupList', 'resolvedModels', 'Dataset', '$state', 'ComponentsStrings', 'ProcessErrors',
function($scope, InstanceGroupList, resolvedModels, Dataset, $state, strings, ProcessErrors) {
let list = InstanceGroupList;
const vm = this;
const { instanceGroup } = resolvedModels;
@ -27,7 +27,13 @@ export default ['$scope', 'InstanceGroupList', 'resolvedModels', 'GetBasePath',
deletables.forEach((data) => {
let promise = instanceGroup.http.delete({resource: data});
Promise.resolve(promise).then(vm.onSaveSuccess);
Promise.resolve(promise).then(vm.onSaveSuccess)
.catch(({data, status}) => {
ProcessErrors($scope, data, status, null, {
hdr: 'Error!',
msg: 'Call failed. Return status: ' + status
});
});
});
};

5
awx/ui/client/src/instance-groups/main.js
View File

@ -1,6 +1,6 @@
import { templateUrl } from '../shared/template-url/template-url.factory';
import CapacityAdjuster from './capacity-adjuster/capacity-adjuster.directive';
import CapacityBar from './capacity-bar/main';
import CapacityBar from './capacity-bar/capacity-bar.directive';
import instanceGroupsMultiselect from '../shared/instance-groups-multiselect/instance-groups.directive';
import instanceGroupsModal from '../shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive';
@ -321,7 +321,7 @@ InstanceGroupsRun.$inject = [
'ComponentsStrings'
];
angular.module(MODULE_NAME, [CapacityBar.name])
angular.module(MODULE_NAME, [])
.service('InstanceGroupsService', service)
.factory('InstanceGroupList', list)
.controller('InstanceGroupsListController', InstanceGroupsListController)
@ -331,6 +331,7 @@ angular.module(MODULE_NAME, [CapacityBar.name])
.directive('instanceGroupsMultiselect', instanceGroupsMultiselect)
.directive('instanceGroupsModal', instanceGroupsModal)
.directive('capacityAdjuster', CapacityAdjuster)
.directive('capacityBar', CapacityBar)
.service('InstanceGroupsStrings', InstanceGroupsStrings)
.service('JobStrings', JobStrings)
.run(InstanceGroupsRun);