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

hide rows from lists where adding would be redundant

Browse Source
This commit is contained in:
John Mitchell 2019-03-15 12:33:03 -04:00
parent 3d9a47f0d9
commit 52e86cf0c3
No known key found for this signature in database
GPG Key ID: FE6A9B5BD4EB5C94
9 changed files with 126 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/access/add-rbac-resource/rbac-resource.directive.js
View File

@ -12,6 +12,7 @@ export default ['templateUrl', '$state',
return {
restrict: 'E',
scope: {
defaultParams: '=?',
usersDataset: '=',
teamsDataset: '=',
resourceData: '=',

2
awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html
View File

@ -45,7 +45,7 @@
</div>
<div id="AddPermissions-users" class="AddPermissions-list" ng-show="tab.users">
<rbac-multiselect-list view="Users" all-selected="allSelected" dataset="usersDataset" object-type="object.type"></rbac-multiselect-list>
<rbac-multiselect-list view="Users" all-selected="allSelected" default-params="defaultParams" dataset="usersDataset" object-type="object.type"></rbac-multiselect-list>
</div>
<div id="AddPermissions-teams" class="AddPermissions-list" ng-if="tab.teams">
<rbac-multiselect-list view="Teams" all-selected="allSelected" dataset="teamsDataset" object-type="object.type"></rbac-multiselect-list>

2
awx/ui/client/src/access/rbac-multiselect/permissionsUsers.list.js
View File

@ -15,7 +15,7 @@
multiSelectExtended: true,
index: false,
hover: true,
emptyListText : i18n._('No Users exist'),
emptyListText: i18n._('No Users to add'),
disableRow: "{{ objectType === 'organization' && user.summary_fields.user_capabilities.edit === false }}",
disableRowValue: "objectType === 'organization' && user.summary_fields.user_capabilities.edit === false",
disableTooltip: {

6
awx/ui/client/src/access/rbac-multiselect/rbac-multiselect-list.directive.js
View File

@ -17,6 +17,7 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
allSelected: '=',
view: '@',
dataset: '=',
defaultParams: '=?',
objectType: '='
},
template: "<div class='addPermissionsList-inner'></div>",
@ -149,6 +150,11 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
scope.list = list;
scope[`${list.iterator}_dataset`] = scope.dataset.data;
if (scope.defaultParams) {
scope[`${list.iterator}_default_params`] = scope.defaultParams;
}
scope[`${list.name}`] = scope[`${list.iterator}_dataset`].results;
scope.$watch(list.name, function(){

7
awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.controller.js
View File

@ -5,9 +5,9 @@
*************************************************/
export default ['$scope', '$rootScope', 'ProcessErrors', 'GetBasePath', 'generateList',
'$state', 'Rest', '$q', 'Wait', '$window', 'QuerySet', 'GroupList',
'$state', 'Rest', '$q', 'Wait', '$window', 'QuerySet', 'GroupList', 'i18n',
function($scope, $rootScope, ProcessErrors, GetBasePath, generateList,
$state, Rest, $q, Wait, $window, qs, GroupList) {
$state, Rest, $q, Wait, $window, qs, GroupList, i18n) {
$scope.$on("linkLists", function() {
init();
@ -26,6 +26,8 @@
if($state.params.group_id) {
$scope.associate_group_default_params.not__id = $state.params.group_id;
$scope.associate_group_queryset.not__id = $state.params.group_id;
$scope.associate_group_default_params.not__parents = $state.params.group_id;
$scope.associate_group_queryset.not__parents = $state.params.group_id;
}
let list = _.cloneDeep(GroupList);
@ -39,6 +41,7 @@
selectedRows: 'selectedItems',
availableRows: 'associate_groups'
};
list.emptyListText = i18n._('No groups to add');
delete list.actions;
delete list.fieldActions;
delete list.fields.failed_hosts;

10
awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.controller.js
View File

@ -5,9 +5,9 @@
*************************************************/
export default ['$scope', '$rootScope', 'ProcessErrors', 'GetBasePath', 'generateList',
'$state', 'Rest', '$q', 'Wait', '$window', 'QuerySet', 'RelatedHostsListDefinition',
'$state', 'Rest', '$q', 'Wait', '$window', 'QuerySet', 'RelatedHostsListDefinition', 'i18n',
function($scope, $rootScope, ProcessErrors, GetBasePath, generateList,
$state, Rest, $q, Wait, $window, qs, RelatedHostsListDefinition) {
$state, Rest, $q, Wait, $window, qs, RelatedHostsListDefinition, i18n) {
$scope.$on("linkLists", function() {
init();
@ -23,6 +23,11 @@
page_size: 5
};
if ($state.params.group_id) {
$scope.associate_host_default_params.not__groups = $state.params.group_id;
$scope.associate_host_queryset.not__groups = $state.params.group_id;
}
let list = _.cloneDeep(RelatedHostsListDefinition);
list.basePath = GetBasePath('inventory') + $state.params.inventory_id + '/hosts';
list.iterator = 'associate_host';
@ -36,6 +41,7 @@
selectedRows: 'selectedItems',
availableRows: 'associate_hosts'
};
list.emptyListText = i18n._('No hosts to add');
delete list.fields.toggleHost;
delete list.fields.active_failures;
delete list.fields.groups;

31
awx/ui/client/src/organizations/linkout/addUsers/addUsers.controller.js
View File

@ -12,9 +12,9 @@
*/
export default ['$scope', '$rootScope', 'ProcessErrors', 'GetBasePath', 'generateList',
'$state', 'Rest', '$q', 'Wait', '$window', 'QuerySet', 'UserList',
'$state', 'Rest', '$q', 'Wait', '$window', 'QuerySet', 'UserList', 'i18n',
function($scope, $rootScope, ProcessErrors, GetBasePath, generateList,
$state, Rest, $q, Wait, $window, qs, UserList) {
$state, Rest, $q, Wait, $window, qs, UserList, i18n) {
$scope.$on("linkLists", function() {
if ($state.current.name.split(".")[1] === "users") {
@ -23,18 +23,32 @@ function($scope, $rootScope, ProcessErrors, GetBasePath, generateList,
$scope.addType = "Administrators";
}
init();
let notAdminAlreadyParams = {};
if ($scope.addType === 'Administrators') {
Rest.setUrl(GetBasePath('organizations') + `${$state.params.organization_id}/object_roles`);
Rest.get().then(({data}) => {
notAdminAlreadyParams.not__roles__in = data.results
.filter(({name}) => name === i18n._('Admin'))
.map(({id}) => id)
.join(',');
notAdminAlreadyParams.is_superuser = 'false';
init();
});
} else {
init();
}
function init(){
$scope.add_user_default_params = {
$scope.add_user_default_params = Object.assign({
order_by: 'username',
page_size: 5
};
}, notAdminAlreadyParams);
$scope.add_user_queryset = {
$scope.add_user_queryset = Object.assign({
order_by: 'username',
page_size: 5
};
}, notAdminAlreadyParams);
let list = _.cloneDeep(UserList);
list.basePath = 'users';
@ -46,6 +60,9 @@ function($scope, $rootScope, ProcessErrors, GetBasePath, generateList,
list.fields.first_name.columnClass = 'col-sm-4';
list.fields.last_name.columnClass = 'col-sm-4';
list.layoutClass = 'List-staticColumnLayout--statusOrCheckbox';
if ($scope.addType === 'Administrators') {
list.emptyListText = i18n._('No users available to add as adminstrators');
}
delete list.actions;
delete list.fieldActions;

2
awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
View File

@ -54,7 +54,7 @@ let lists = [{
OrgUsersDataset: ['OrgUserList', 'QuerySet', '$stateParams', 'GetBasePath',
function(list, qs, $stateParams, GetBasePath) {
let path = GetBasePath(list.basePath) || list.basePath;
return qs.search(path, $stateParams.user_search);
return qs.search(path, $stateParams.org_user_search);
}
],
OrgUserList: ['UserList', 'GetBasePath', '$stateParams', 'i18n', function(UserList, GetBasePath, $stateParams, i18n) {

88
awx/ui/client/src/shared/stateDefinitions.factory.js
View File

@ -584,27 +584,97 @@ function($injector, $stateExtender, $log, i18n) {
squashSearchUrl: true,
url: '/add-user',
params: {
user_search: {
add_user_search: {
value: { order_by: 'username', page_size: '5' },
dynamic: true,
dynamic: true
}
},
views: {
[`modal@${formStateDefinition.name}`]: {
template: `<add-rbac-resource users-dataset="$resolve.usersDataset" selected="allSelected" resource-data="$resolve.resourceData" without-team-permissions="true" title="` + i18n._('Add Users') + `"></add-rbac-resource>`
template: `<add-rbac-resource default-params="$resolve.defaultParams" users-dataset="$resolve.usersDataset" selected="allSelected" resource-data="$resolve.resourceData" without-team-permissions="true" title="` + i18n._('Add Users') + `"></add-rbac-resource>`
}
},
ncyBreadcrumb:{
skip:true
},
resolve: {
usersDataset: ['addPermissionsUsersList', 'QuerySet', '$stateParams', 'GetBasePath',
function(list, qs, $stateParams, GetBasePath) {
let path = GetBasePath(list.basePath) || GetBasePath(list.name);
return qs.search(path, $stateParams.user_search);
orgId: ['$stateParams', 'Rest', 'GetBasePath', function($stateParams, Rest, GetBasePath) {
let id;
if ($stateParams.team_id) {
Rest.setUrl(GetBasePath('teams') + `${$stateParams.team_id}`);
id = Rest.get().then(({data}) => {
return data.summary_fields.organization.id;
});
} else {
id = null;
}
]
return id;
}],
teamRoles: ['$stateParams', 'Rest', 'GetBasePath', 'i18n', function($stateParams, Rest, GetBasePath, i18n) {
let roles = null;
if ($stateParams.team_id) {
const basePath = GetBasePath('teams') + `${$stateParams.team_id}/object_roles`;
Rest.setUrl(basePath);
roles = Rest.get().then(({data}) => {
return data.results
.filter(({name}) => name === i18n._('Member') || name === i18n._('Admin'))
.map(({id}) => id)
.join(',');
});
}
return roles;
}],
orgAdminRole: ['$stateParams', 'orgId', 'Rest', 'GetBasePath', 'i18n',
function($stateParams, orgId, Rest, GetBasePath, i18n) {
let orgIdToCheck = $stateParams.organization_id || orgId;
let role = null;
if (orgIdToCheck) {
const basePath = GetBasePath('organizations') + `${orgIdToCheck}/object_roles`;
Rest.setUrl(basePath);
role = Rest.get().then(({data}) => {
return data.results
.filter(({name}) => name === i18n._('Admin'))
.map(({id}) => id)[0];
});
}
return role;
}],
orgMemberRole: ['$stateParams', 'Rest', 'GetBasePath', 'i18n', function($stateParams, Rest, GetBasePath, i18n) {
let role = null;
if ($stateParams.organization_id) {
const basePath = GetBasePath('organizations') + `${$stateParams.organization_id}/object_roles`;
Rest.setUrl(basePath);
role = Rest.get().then(({data}) => {
return data.results
.filter(({name}) => name === i18n._('Member'))
.map(({id}) => id)[0];
});
}
return role;
}],
rolesToExclude: ['teamRoles', 'orgAdminRole', 'orgMemberRole', '$stateParams',
function(teamRoles, orgAdminRole, orgMemberRole, $stateParams) {
let roles = null;
if ($stateParams.team_id) {
roles = `${teamRoles},${orgAdminRole}`;
} else if ($stateParams.organization_id) {
roles = `${orgAdminRole},${orgMemberRole}`;
}
return roles;
}],
usersDataset: ['addPermissionsUsersList', 'QuerySet', '$stateParams', 'GetBasePath', 'rolesToExclude',
function(list, qs, $stateParams, GetBasePath, rolesToExclude) {
let path = GetBasePath(list.basePath) || GetBasePath(list.name);
if (rolesToExclude) {
$stateParams.add_user_search.not__roles__in = rolesToExclude;
$stateParams.add_user_search.is_superuser = 'false';
}
return qs.search(path, $stateParams.add_user_search);
}
],
defaultParams: ['$stateParams', 'usersDataset', function($stateParams) {
return $stateParams.add_user_search;
}]
},
onExit: function($state) {
if ($state.transition) {