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

Merge pull request #3377 from mabashian/root-all-groups-toggle

Browse Source 
Adds toggle for all/root groups to inventory groups view

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-03-12 14:09:45 +00:00 committed by GitHub
commit 9d0a8d2047
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 155 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
awx/ui/client/legacy/styles/lists.less
View File

@ -219,7 +219,7 @@ table, tbody {
}
.List-actionHolder--leftAlign {
margin-left: 52%;
margin-left: 50%;
justify-content: flex-start;
button {
height: 34px;
@ -230,6 +230,15 @@ table, tbody {
align-items: center;
display: flex;
margin-bottom: -34px;
.List-buttonDefault {
margin-left: 20px;
}
.List-toggleButton {
height: 30px;
line-height: 14px;
}
}
.List-auxAction {
@ -272,6 +281,10 @@ table, tbody {
opacity: 0.65;
}
.List-actionButton {
margin-left: 20px;
}
.List-searchDropdown {
border-top-left-radius: 5px!important;
border-bottom-left-radius: 5px!important;

82
awx/ui/client/src/inventories-hosts/inventories/main.js
View File

@ -3,6 +3,7 @@
*
* All Rights Reserved
*************************************************/
import { N_ } from '../../i18n';
import adhoc from './adhoc/main';
import group from './related/groups/main';
@ -294,6 +295,78 @@ angular.module('inventory', [
let relatedHostCompletedJobs = _.cloneDeep(hostCompletedJobsRoute);
relatedHostCompletedJobs.name = 'inventories.edit.hosts.edit.completed_jobs';
let inventoryRootGroupsList = _.cloneDeep(inventoryGroupsList);
inventoryRootGroupsList.name = "inventories.edit.rootGroups";
inventoryRootGroupsList.url = "/root_groups?{group_search:queryset}",
inventoryRootGroupsList.ncyBreadcrumb.label = N_("ROOT GROUPS");// jshint ignore:line
inventoryRootGroupsList.resolve.listDefinition = ['GroupList', (list) => {
const rootGroupList = _.cloneDeep(list);
rootGroupList.basePath = 'api/v2/inventories/{{$stateParams.inventory_id}}/root_groups/';
rootGroupList.fields.name.uiSref = "inventories.edit.rootGroups.edit({group_id:group.id})";
return rootGroupList;
}];
let inventoryRootGroupsAdd = _.cloneDeep(inventoryGroupsAdd);
inventoryRootGroupsAdd.name = "inventories.edit.rootGroups.add";
inventoryRootGroupsAdd.ncyBreadcrumb.parent = "inventories.edit.rootGroups";
let inventoryRootGroupsEdit = _.cloneDeep(inventoryGroupsEdit);
inventoryRootGroupsEdit.name = "inventories.edit.rootGroups.edit";
inventoryRootGroupsEdit.ncyBreadcrumb.parent = "inventories.edit.rootGroups";
inventoryRootGroupsEdit.views = {
'groupForm@inventories': {
templateProvider: function(GenerateForm, GroupForm) {
let form = _.cloneDeep(GroupForm);
form.activeEditState = 'inventories.edit.rootGroups.edit';
form.detailsClick = "$state.go('inventories.edit.rootGroups.edit')";
form.parent = 'inventories.edit.rootGroups';
form.related.nested_groups.ngClick = "$state.go('inventories.edit.rootGroups.edit.nested_groups')";
form.related.nested_hosts.ngClick = "$state.go('inventories.edit.rootGroups.edit.nested_hosts')";
return GenerateForm.buildHTML(form, {
mode: 'edit',
related: false
});
},
controller: 'GroupEditController'
}
};
inventoryGroupsEdit.views = {
'groupForm@inventories': {
templateProvider: function(GenerateForm, GroupForm) {
let form = GroupForm;
return GenerateForm.buildHTML(form, {
mode: 'edit',
related: false
});
},
controller: 'GroupEditController'
}
};
let rootGroupNestedGroupsRoute = _.cloneDeep(groupNestedGroupsRoute);
rootGroupNestedGroupsRoute.name = 'inventories.edit.rootGroups.edit.nested_groups';
rootGroupNestedGroupsRoute.ncyBreadcrumb.parent = "inventories.edit.rootGroups.edit";
let rootNestedGroupsAdd = _.cloneDeep(nestedGroupsAdd);
rootNestedGroupsAdd.name = "inventories.edit.rootGroups.edit.nested_groups.add";
rootNestedGroupsAdd.ncyBreadcrumb.parent = "inventories.edit.groups.edit.nested_groups";
let rootGroupNestedGroupsAssociateRoute = _.cloneDeep(groupNestedGroupsAssociateRoute);
rootGroupNestedGroupsAssociateRoute.name = 'inventories.edit.rootGroups.edit.nested_groups.associate';
let rootGroupNestedHostsRoute = _.cloneDeep(nestedHostsRoute);
rootGroupNestedHostsRoute.name = 'inventories.edit.rootGroups.edit.nested_hosts';
rootGroupNestedHostsRoute.ncyBreadcrumb.parent = "inventories.edit.rootGroups.edit";
let rootNestedHostsAdd = _.cloneDeep(nestedHostsAddRoute);
rootNestedHostsAdd.name = "inventories.edit.rootGroups.edit.nested_hosts.add";
rootNestedHostsAdd.ncyBreadcrumb.parent = "inventories.edit.rootGroups.edit.nested_hosts";
let rootGroupNestedHostsAssociateRoute = _.cloneDeep(nestedHostsAssociateRoute);
rootGroupNestedHostsAssociateRoute.name = 'inventories.edit.rootGroups.edit.nested_hosts.associate';
return Promise.all([
standardInventoryAdd,
standardInventoryEdit,
@ -315,10 +388,16 @@ angular.module('inventory', [
stateExtender.buildDefinition(relatedHostsAnsibleFacts),
stateExtender.buildDefinition(relatedHostsInsights),
stateExtender.buildDefinition(inventoryGroupsList),
stateExtender.buildDefinition(inventoryRootGroupsList),
stateExtender.buildDefinition(inventoryGroupsAdd),
stateExtender.buildDefinition(rootNestedGroupsAdd),
stateExtender.buildDefinition(inventoryRootGroupsAdd),
stateExtender.buildDefinition(inventoryGroupsEdit),
stateExtender.buildDefinition(inventoryRootGroupsEdit),
stateExtender.buildDefinition(groupNestedGroupsRoute),
stateExtender.buildDefinition(rootGroupNestedGroupsRoute),
stateExtender.buildDefinition(nestedHostsRoute),
stateExtender.buildDefinition(rootGroupNestedHostsRoute),
stateExtender.buildDefinition(inventoryHosts),
stateExtender.buildDefinition(smartInventoryHosts),
stateExtender.buildDefinition(inventoryHostsAdd),
@ -338,10 +417,13 @@ angular.module('inventory', [
stateExtender.buildDefinition(addSourceProject),
stateExtender.buildDefinition(editSourceProject),
stateExtender.buildDefinition(groupNestedGroupsAssociateRoute),
stateExtender.buildDefinition(rootGroupNestedGroupsAssociateRoute),
stateExtender.buildDefinition(hostNestedGroupsAssociateRoute),
stateExtender.buildDefinition(nestedHostsAssociateRoute),
stateExtender.buildDefinition(rootGroupNestedHostsAssociateRoute),
stateExtender.buildDefinition(nestedGroupsAdd),
stateExtender.buildDefinition(nestedHostsAddRoute),
stateExtender.buildDefinition(rootNestedHostsAdd),
stateExtender.buildDefinition(relatedHostCompletedJobs)
])
};

12
awx/ui/client/src/inventories-hosts/inventories/related/groups/edit/groups-edit.route.js
View File

@ -5,18 +5,6 @@ export default {
parent: "inventories.edit.groups",
label: "{{breadcrumb.group_name}}"
},
views: {
'groupForm@inventories': {
templateProvider: function(GenerateForm, GroupForm) {
let form = GroupForm;
return GenerateForm.buildHTML(form, {
mode: 'edit',
related: false
});
},
controller: 'GroupEditController'
}
},
resolve: {
groupData: ['$stateParams', 'GroupsService', function($stateParams, GroupsService) {
return GroupsService.get({ id: $stateParams.group_id }).then(response => response.data.results[0]);

1
awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.form.js
View File

@ -98,7 +98,6 @@ function(i18n){
title: i18n._('Hosts'),
iterator: 'nested_hosts'
},
}
};
}];

16
awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js
View File

@ -52,6 +52,22 @@
actionClass: 'btn List-buttonDefault',
buttonContent: i18n._('REFRESH')
},
groupsToggle: {
mode: 'all',
type: 'toggle',
buttons: [
{
text: i18n._('ALL GROUPS'),
ngClick: "$state.go('inventories.edit.groups')",
ngClass: "{'btn-primary': $state.includes('inventories.edit.groups'), 'Button-primary--hollow': $state.includes('inventories.edit.rootGroups')}"
},
{
text: i18n._('ROOT GROUPS'),
ngClick: "$state.go('inventories.edit.rootGroups')",
ngClass: "{'btn-primary': $state.includes('inventories.edit.rootGroups'), 'Button-primary--hollow': $state.includes('inventories.edit.groups')}"
}
]
},
launch: {
mode: 'all',
ngDisabled: '!groupsSelected',

26
awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.controller.js
View File

@ -4,16 +4,16 @@
* All Rights Reserved
*************************************************/
export default
['$scope', '$rootScope', '$state', '$stateParams', 'GroupList', 'InventoryUpdate',
'GroupsService', 'CancelSourceUpdate', 'rbacUiControlService', 'GetBasePath',
'GetHostsStatusMsg', 'Dataset', 'Find', 'QuerySet', 'inventoryData', 'canAdd',
['$scope', '$state', '$stateParams', 'listDefinition', 'InventoryUpdate',
'GroupsService', 'CancelSourceUpdate',
'GetHostsStatusMsg', 'Dataset', 'inventoryData', 'canAdd',
'InventoryHostsStrings', '$transitions',
function($scope, $rootScope, $state, $stateParams, GroupList, InventoryUpdate,
GroupsService, CancelSourceUpdate, rbacUiControlService, GetBasePath,
GetHostsStatusMsg, Dataset, Find, qs, inventoryData, canAdd,
function($scope, $state, $stateParams, listDefinition, InventoryUpdate,
GroupsService, CancelSourceUpdate,
GetHostsStatusMsg, Dataset, inventoryData, canAdd,
InventoryHostsStrings, $transitions){
let list = GroupList;
let list = listDefinition;
init();
@ -85,10 +85,18 @@
}
$scope.createGroup = function(){
$state.go('inventories.edit.groups.add');
if ($state.includes('inventories.edit.groups')) {
$state.go('inventories.edit.groups.add');
} else if ($state.includes('inventories.edit.rootGroups')) {
$state.go('inventories.edit.rootGroups.add');
}
};
$scope.editGroup = function(id){
$state.go('inventories.edit.groups.edit', {group_id: id});
if ($state.includes('inventories.edit.groups')) {
$state.go('inventories.edit.groups.edit', {group_id: id});
} else if ($state.includes('inventories.edit.rootGroups')) {
$state.go('inventories.edit.rootGroups.edit', {group_id: id});
}
};
$scope.goToGroupGroups = function(id){
$state.go('inventories.edit.groups.edit.nested_groups', {group_id: id});

9
awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.route.js
View File

@ -5,7 +5,8 @@ export default {
name: "inventories.edit.groups",
url: "/groups?{group_search:queryset}",
resolve: {
Dataset: ['GroupList', 'QuerySet', '$stateParams', 'GetBasePath', '$interpolate', '$rootScope',
listDefinition: ['GroupList', (list) => list],
Dataset: ['listDefinition', 'QuerySet', '$stateParams', 'GetBasePath', '$interpolate', '$rootScope',
(list, qs, $stateParams, GetBasePath, $interpolate, $rootScope) => {
// allow related list definitions to use interpolated $rootScope / $stateParams in basePath field
let path, interpolator;
@ -43,12 +44,12 @@ export default {
},
ncyBreadcrumb: {
parent: "inventories.edit",
label: N_("GROUPS")
label: N_("ALL GROUPS")
},
views: {
'related': {
templateProvider: function(GroupList, generateList, $templateRequest, $stateParams, GetBasePath) {
let list = _.cloneDeep(GroupList);
templateProvider: function(listDefinition, generateList, $templateRequest, $stateParams, GetBasePath) {
let list = _.cloneDeep(listDefinition);
if($stateParams && $stateParams.group) {
list.basePath = GetBasePath('groups') + _.last($stateParams.group) + '/children';
}

2
awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-associate.route.js
View File

@ -6,7 +6,7 @@ export default {
skip:true
},
views: {
'modal@inventories.edit.groups.edit': {
'modal@^.^': {
templateProvider: function() {
return `<associate-groups save-function="associateGroups(selectedItems)"></associate-groups>`;
},

6
awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-list.controller.js
View File

@ -127,7 +127,11 @@
};
$scope.editGroup = function(id){
$state.go('inventories.edit.groups.edit', {group_id: id});
if ($state.includes('inventories.edit.groups')) {
$state.go('inventories.edit.groups.edit', {group_id: id});
} else if ($state.includes('inventories.edit.rootGroups')) {
$state.go('inventories.edit.rootGroups.edit', {group_id: id});
}
};
$scope.goToGroupGroups = function(id){

2
awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-associate.route.js
View File

@ -6,7 +6,7 @@ export default {
skip:true
},
views: {
'modal@inventories.edit.groups.edit': {
'modal@^.^': {
templateProvider: function() {
return `<associate-hosts save-function="associateHosts(selectedItems)"></associate-hosts>`;
},

1
awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js
View File

@ -149,6 +149,7 @@ function(i18n) {
include: "GroupList",
title: i18n._('Groups'),
iterator: 'group',
tabSelected: `$state.includes('inventories.edit.groups') || $state.includes('inventories.edit.rootGroups')`,
skipGenerator: true
},
hosts: {

8
awx/ui/client/src/shared/form-generator.js
View File

@ -1469,7 +1469,13 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
`aw-tip-placement="${collection.dataPlacement}" ` +
`data-tip-watch="${collection.dataTipWatch}" `;
}
let relatedTabSelected = this.form.activeEditState ? `$state.includes('${this.form.activeEditState}.${itm}') || $state.includes('${this.form.stateTree}.edit.${itm}')` : `$state.includes('${this.form.stateTree}.edit.${itm}')`;
let relatedTabSelected;
if (this.form.related[itm].tabSelected) {
relatedTabSelected = this.form.related[itm].tabSelected;
} else {
relatedTabSelected = this.form.activeEditState ? `$state.includes('${this.form.activeEditState}.${itm}') || $state.includes('${this.form.stateTree}.edit.${itm}')` : `$state.includes('${this.form.stateTree}.edit.${itm}')`;
}
html += `ng-class="{'is-selected' : ${relatedTabSelected}` ;
if(this.form.related[itm].disabled){
html += `, 'Form-tab--disabled' : ${this.form.related[itm].disabled }`;

9
awx/ui/client/src/shared/list-generator/list-actions.partial.html
View File

@ -1,6 +1,9 @@
<span ng-repeat="(name, options) in list.actions" class="List-action" ng-hide="isHiddenByOptions(options) ||
hiddenOnCurrentPage(options.basePaths) ||
hiddenInCurrentMode(options.mode)">
<span ng-repeat="(name, options) in list.actions" class="List-action" ng-if="!isHiddenByOptions(options) &&
!hiddenOnCurrentPage(options.basePaths) &&
!hiddenInCurrentMode(options.mode)">
<div class="btn-group" ng-if="options.type && options.type === 'toggle'">
<button ng-repeat="button in options.buttons" class="btn List-toggleButton" ng-class="{{button.ngClass}}" ng-click="$eval(button.ngClick)">{{button.text}}</button>
</div>
<div ng-if="options.type && options.type === 'template'" ng-include="options.template" ng-show="{{options.ngShow}}"></div>
<div class="List-action--showTooltipOnDisabled" ng-if="options.showTipWhenDisabled" aw-tool-tip="{{options.awToolTip}}" data-tip-watch="{{options.dataTipWatch}}" data-placement="{{options.dataPlacement}}" data-container="{{options.dataContainer}}" data-title="{{options.dataTitle}}" data-tooltip-inner-class="{{options.tooltipInnerClass}}">
<div class="btn-group" ng-if="options.type === 'buttonDropdown'" ng-disabled="{{options.ngDisabled}}">