External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 15:36:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10402 from AlexSCorey/10350-TeamAddLoop

Browse Source 
Stops infinte REST calls on ResourcesAccessAdd workflow

SUMMARY
resolves #10350
There is no functionality changes, I just moved the location of the variables so they are defined outside of the component.
E2E test triggered
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

UI

Reviewed-by: Kersom <None>
Reviewed-by: Jake McDermott <yo@jakemcdermott.me>
Reviewed-by: Tiago Góes <tiago.goes2009@gmail.com>
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-06-09 15:33:11 +00:00
committed by GitHub
parent 87dcc49429 27a2c842ac
commit 493109782d
1 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
awx/ui_next/src/components/AddRole/AddResourceRole.jsx
View File

@@ -17,6 +17,57 @@ const readTeams = async queryParams => TeamsAPI.read(queryParams);
const readTeamsOptions = async () => TeamsAPI.readOptions();
const userSearchColumns = [
{
name: t`Username`,
key: 'username__icontains',
isDefault: true,
},
{
name: t`First Name`,
key: 'first_name__icontains',
},
{
name: t`Last Name`,
key: 'last_name__icontains',
},
];
const userSortColumns = [
{
name: t`Username`,
key: 'username',
},
{
name: t`First Name`,
key: 'first_name',
},
{
name: t`Last Name`,
key: 'last_name',
},
];
const teamSearchColumns = [
{
name: t`Name`,
key: 'name',
isDefault: true,
},
{
name: t`Created By (Username)`,
key: 'created_by__username',
},
{
name: t`Modified By (Username)`,
key: 'modified_by__username',
},
];
const teamSortColumns = [
{
name: t`Name`,
key: 'name',
},
];
function AddResourceRole({ onSave, onClose, roles, resource, onError }) {
const history = useHistory();
@@ -119,58 +170,6 @@ function AddResourceRole({ onSave, onClose, roles, resource, onError }) {
});
}
const userSearchColumns = [
{
name: t`Username`,
key: 'username__icontains',
isDefault: true,
},
{
name: t`First Name`,
key: 'first_name__icontains',
},
{
name: t`Last Name`,
key: 'last_name__icontains',
},
];
const userSortColumns = [
{
name: t`Username`,
key: 'username',
},
{
name: t`First Name`,
key: 'first_name',
},
{
name: t`Last Name`,
key: 'last_name',
},
];
const teamSearchColumns = [
{
name: t`Name`,
key: 'name',
isDefault: true,
},
{
name: t`Created By (Username)`,
key: 'created_by__username',
},
{
name: t`Modified By (Username)`,
key: 'modified_by__username',
},
];
const teamSortColumns = [
{
name: t`Name`,
key: 'name',
},
];
let wizardTitle = '';
switch (selectedResource) {