shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Code Releases Activity

Merge pull request #3408 from marshmalien/feat-toolbar-sort-instance-groups-list

Browse Source 
Add sort toolbar to instance groups list

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-03-15 13:21:08 +00:00 committed by GitHub
commit d0571c2cab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/instance-groups/instance-groups.strings.js
View File

@ -63,6 +63,10 @@ function InstanceGroupsStrings (BaseString) {
MISSING_PARAMETER: t.s('Instance Group parameter is missing.'),
};
ns.sort = {
NAME_ASCENDING: t.s('Name (Ascending)'),
NAME_DESCENDING: t.s('Name (Descending)')
};
}
InstanceGroupsStrings.$inject = ['BaseStringService'];

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

@ -2,6 +2,7 @@ export default ['$scope', '$filter', '$state', 'Alert', 'resolvedModels', 'Datas
function($scope, $filter, $state, Alert, resolvedModels, Dataset, strings, ProcessErrors, Prompt, Wait) {
const vm = this;
const { instanceGroup } = resolvedModels;
let paginateQuerySet = {};
vm.strings = strings;
vm.isSuperuser = $scope.$root.user_is_superuser;
@ -23,16 +24,59 @@ export default ['$scope', '$filter', '$state', 'Alert', 'resolvedModels', 'Datas
$scope[$scope.list.name] = $scope[`${$scope.list.iterator}_dataset`].results;
$scope.instanceGroupCount = Dataset.data.count;
$scope.$on('updateDataset', function(e, dataset) {
$scope.$on('updateDataset', function(e, dataset, queryset) {
$scope[`${$scope.list.iterator}_dataset`] = dataset;
$scope[$scope.list.name] = dataset.results;
paginateQuerySet = queryset;
});
}
$scope.$watch('$state.params.instance_group_id', () => {
$scope.$watchCollection('$state.params', () => {
vm.activeId = parseInt($state.params.instance_group_id);
setToolbarSort();
});
const toolbarSortDefault = {
label: `${strings.get('sort.NAME_ASCENDING')}`,
value: 'name'
};
vm.toolbarSortOptions = [
toolbarSortDefault,
{
label: `${strings.get('sort.NAME_DESCENDING')}`,
value: '-name'
}
];
vm.toolbarSortValue = toolbarSortDefault;
function setToolbarSort () {
const orderByValue = _.get($state.params, 'instance_group_search.order_by');
const sortValue = _.find(vm.toolbarSortOptions, (option) => option.value === orderByValue);
if (sortValue) {
vm.toolbarSortValue = sortValue;
} else {
vm.toolbarSortValue = toolbarSortDefault;
}
}
vm.onToolbarSort = (sort) => {
vm.toolbarSortValue = sort;
const queryParams = Object.assign(
{},
$state.params.instance_group_search,
paginateQuerySet,
{ order_by: sort.value }
);
// Update URL with params
$state.go('.', {
instance_group_search: queryParams
}, { notify: false, location: 'replace' });
};
vm.tooltips = {
add: strings.get('tooltips.ADD_INSTANCE_GROUP')
};

8
awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
View File

@ -31,7 +31,13 @@
</button>
</div>
</div>
<at-list-toolbar
ng-if="instance_groups.length > 0"
sort-only="true"
sort-value="vm.toolbarSortValue"
sort-options="vm.toolbarSortOptions"
on-sort="vm.onToolbarSort">
</at-list-toolbar>
<at-list results="instance_groups">
<at-row ng-repeat="instance_group in instance_groups"
ng-class="{'at-Row--active': (instance_group.id === vm.activeId)}">