shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Create an InstancePolicyList directive to replace the pre-existing

Browse Source 
modal implementation

* Remove Instance-List-Policy controller
* Replace let with const when values aren't being reassigned
* Update CapacityAdjuster directive to use replace:true
* Assign less values that are specific to element
* Add more error handling
This commit is contained in:
Marliana Lara 2018-02-01 11:22:09 -05:00 committed by Matthew Jones
parent fa70d108d7
commit f9265ee329
No known key found for this signature in database
GPG Key ID: 76A4C17A97590C1C
11 changed files with 117 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,54 +0,0 @@
function InstanceModalController ($scope, $state, models, strings) {
const { instance, instanceGroup } = models;
const vm = this || {};
vm.setInstances = () => {
vm.instances = instance.get('results').map(instance => {
instance.isSelected = false;
return instance;
});
};
vm.setRelatedInstances = () => {
vm.instanceGroupName = instanceGroup.get('name');
vm.relatedInstances = instanceGroup.get('policy_instance_list');
vm.instances = instance.get('results').map(instance => {
instance.isSelected = vm.relatedInstances.includes(instance.hostname);
return instance;
});
};
init();
function init() {
vm.strings = strings;
vm.instanceGroupId = instanceGroup.get('id');
vm.defaultParams = { page_size: '10', order_by: 'hostname' };
if (vm.instanceGroupId === undefined) {
vm.setInstances();
} else {
vm.setRelatedInstances();
}
}
$scope.$watch('vm.instances', function() {
vm.selectedRows = _.filter(vm.instances, 'isSelected');
vm.deselectedRows = _.filter(vm.instances, 'isSelected', false);
}, true);
vm.submit = () => {
$scope.$parent.$parent.$parent.state.policy_instance_list._value = vm.selectedRows;
$state.go("^.^");
};
}
InstanceModalController.$inject = [
'$scope',
'$state',
'resolvedModels',
'InstanceGroupsStrings'
];
export default InstanceModalController;

84
awx/ui/client/src/instance-groups/add-edit/instance-list-policy.directive.js Normal file
View File

@ -0,0 +1,84 @@
const templateUrl = require('./instance-list-policy.partial.html');
function InstanceListPolicyLink (scope, el, attrs, controllers) {
const instancePolicyController = controllers[0];
const formController = controllers[1];
const models = scope.$resolve.resolvedModels;
instancePolicyController.init(formController, models);
}
function InstanceListPolicyController ($scope, $state, strings) {
const vm = this || {};
let form;
let instance;
let instanceGroup;
vm.init = (_form_, _models_) => {
form = _form_;
({ instance, instanceGroup} = _models_);
vm.strings = strings;
vm.instanceGroupId = instanceGroup.get('id');
vm.defaultParams = { page_size: '10', order_by: 'hostname' };
if (vm.instanceGroupId === undefined) {
vm.setInstances();
} else {
vm.setRelatedInstances();
}
};
vm.setInstances = () => {
vm.instances = instance.get('results').map(instance => {
instance.isSelected = false;
return instance;
});
};
vm.setRelatedInstances = () => {
vm.instanceGroupName = instanceGroup.get('name');
vm.relatedInstances = instanceGroup.get('policy_instance_list');
vm.instances = instance.get('results').map(instance => {
instance.isSelected = vm.relatedInstances.includes(instance.hostname);
return instance;
});
};
$scope.$watch('vm.instances', function() {
vm.selectedRows = _.filter(vm.instances, 'isSelected');
vm.deselectedRows = _.filter(vm.instances, 'isSelected', false);
}, true);
vm.submit = () => {
form.components
.filter(component => component.category === 'input')
.filter(component => component.state.id === 'policy_instance_list')
.map(component => {
component.state._value = vm.selectedRows;
});
$state.go("^.^");
};
}
InstanceListPolicyController.$inject = [
'$scope',
'$state',
'InstanceGroupsStrings'
];
function instanceListPolicy () {
return {
restrict: 'E',
link: InstanceListPolicyLink,
controller: InstanceListPolicyController,
controllerAs: 'vm',
require: ['instanceListPolicy', '^atForm'],
templateUrl
};
}
export default instanceListPolicy;

2
awx/ui/client/src/instance-groups/capacity-adjuster/capacity-adjuster.block.less
View File

@ -1,4 +1,4 @@
capacity-adjuster {
.CapacityAdjuster {
.at-InputSlider {
align-items: center;
margin-right: @at-space-4x;

9
awx/ui/client/src/instance-groups/capacity-adjuster/capacity-adjuster.directive.js
View File

@ -5,8 +5,9 @@ function CapacityAdjuster (templateUrl) {
},
templateUrl: templateUrl('instance-groups/capacity-adjuster/capacity-adjuster'),
restrict: 'E',
replace: true,
link: function(scope) {
let adjustment_values = [{
const adjustment_values = [{
label: 'CPU',
value: scope.state.cpu_capacity,
},{
@ -22,10 +23,10 @@ function CapacityAdjuster (templateUrl) {
const vm = this || {};
vm.slide = (state) => {
let data = {
"capacity_adjustment": state.capacity_adjustment
const data = {
"capacity_adjustment": `${state.capacity_adjustment}`
};
let req = {
const req = {
method: 'PUT',
url: state.url,
data

22
awx/ui/client/src/instance-groups/capacity-adjuster/capacity-adjuster.partial.html
View File

@ -1,11 +1,13 @@
<div class="at-InputSlider">
<p>{{min_capacity.label}} {{min_capacity.value}}</p>
<input string-to-number
type="range"
ng-model="state.capacity_adjustment"
min="0"
max="1"
step="0.1"
ng-change="vm.slide(state)"/>
<p>{{max_capacity.label}} {{max_capacity.value}}</p>
<div class="CapacityAdjuster">
<div class="at-InputSlider">
<p>{{min_capacity.label}} {{min_capacity.value}}</p>
<input string-to-number
type="range"
ng-model="state.capacity_adjustment"
min="0"
max="1"
step="0.1"
ng-change="vm.slide(state)"/>
<p>{{max_capacity.label}} {{max_capacity.value}}</p>
</div>
</div>

2
awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.block.less
View File

@ -1,6 +1,6 @@
capacity-bar {
align-items: center;
color: @at-gray-70;
color: @at-color-body-background-dark;
display: flex;
font-size: @at-font-size;
min-width: 100px;

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

@ -39,14 +39,14 @@ function InstanceModalController ($scope, $state, models, strings, ProcessErrors
}, true);
vm.submit = () => {
let associate = vm.selectedRows
const associate = vm.selectedRows
.map(instance => ({id: instance.id}));
let disassociate = vm.deselectedRows
const disassociate = vm.deselectedRows
.map(instance => ({id: instance.id, disassociate: true}));
let all = associate.concat(disassociate);
let defers = all.map((data) => {
let config = {
const all = associate.concat(disassociate);
const defers = all.map((data) => {
const config = {
url: `${vm.instanceGroupId}/instances/`,
data: data
};

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

@ -38,14 +38,14 @@ function InstancesController ($scope, $state, $http, models, Instance, strings,
};
vm.toggle = (toggled) => {
let instance = _.find(vm.instances, 'id', toggled.id);
const instance = _.find(vm.instances, 'id', toggled.id);
instance.enabled = !instance.enabled;
let data = {
const data = {
"enabled": instance.enabled
};
let req = {
const req = {
method: 'PUT',
url: instance.url,
data

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

@ -6,7 +6,7 @@ function InstanceGroupJobsController ($scope, $filter, $state, model, strings, j
init();
function init(){
let instance_group_id = instanceGroup.get('id');
const instance_group_id = instanceGroup.get('id');
vm.strings = strings;
vm.jobStrings = jobStrings;
vm.queryset = { page_size: '10', order_by: '-finished', instance_group_id: instance_group_id };

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

@ -1,6 +1,6 @@
export default ['$scope', 'InstanceGroupList', 'resolvedModels', 'Dataset', '$state', 'ComponentsStrings', 'ProcessErrors',
function($scope, InstanceGroupList, resolvedModels, Dataset, $state, strings, ProcessErrors) {
let list = InstanceGroupList;
const list = InstanceGroupList;
const vm = this;
const { instanceGroup } = resolvedModels;

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

@ -7,8 +7,7 @@ import instanceGroupsModal from '../shared/instance-groups-multiselect/instance-
import AddEditTemplate from './add-edit/add-edit-instance-groups.view.html';
import AddInstanceGroupController from './add-edit/add-instance-group.controller';
import EditInstanceGroupController from './add-edit/edit-instance-group.controller';
import InstanceListPolicyTemplate from './add-edit/instance-list-policy.partial.html';
import InstanceListPolicyController from './add-edit/instance-list-policy.controller.js';
import InstanceListPolicy from './add-edit/instance-list-policy.directive.js';
import InstanceGroupsTemplate from './list/instance-groups-list.partial.html';
import InstanceGroupsListController from './list/instance-groups-list.controller';
@ -147,9 +146,7 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
},
views: {
"modal": {
templateUrl: InstanceListPolicyTemplate,
controller: InstanceListPolicyController,
controllerAs: 'vm'
template: '<instance-list-policy></instance-list-policy>',
}
},
resolvedModels: InstanceGroupsResolve
@ -195,9 +192,7 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
},
views: {
"modal": {
templateUrl: InstanceListPolicyTemplate,
controller: InstanceListPolicyController,
controllerAs: 'vm'
template: '<instance-list-policy></instance-list-policy>',
}
},
resolvedModels: InstanceGroupsResolve
@ -328,6 +323,7 @@ angular.module(MODULE_NAME, [])
.controller('InstanceGroupJobsListController', InstanceGroupJobsListController)
.controller('InstanceListController', InstanceListController)
.controller('InstanceJobsListController', InstanceJobsListController)
.directive('instanceListPolicy', InstanceListPolicy)
.directive('instanceGroupsMultiselect', instanceGroupsMultiselect)
.directive('instanceGroupsModal', instanceGroupsModal)
.directive('capacityAdjuster', CapacityAdjuster)