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

Update advanced search for Smart Inventories

Browse Source 
Update usage of conditional operators for advanced search for Smart Inventories

Not is not supported yet - See: https://github.com/ansible/awx/issues/2817

See: https://github.com/ansible/awx/issues/9232
This commit is contained in:
nixocio 2021-06-02 17:44:05 -04:00
parent 2ad84b60b3
commit be48d3eefd
2 changed files with 60 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
awx/ui_next/src/components/Lookup/shared/HostFilterUtils.jsx
View File

@ -35,7 +35,6 @@ export function toSearchParams(string = '') {
*/
export function toQueryString(config, searchParams = {}) {
if (Object.keys(searchParams).length === 0) return '';
return Object.keys(searchParams)
.flatMap(key => {
if (Array.isArray(searchParams[key])) {
@ -59,14 +58,40 @@ export function toQueryString(config, searchParams = {}) {
* @return {string} Host filter string
*/
export function toHostFilter(searchParams = {}) {
return Object.keys(searchParams)
const flattenSearchParams = Object.keys(searchParams)
.sort()
.flatMap(key => {
if (Array.isArray(searchParams[key])) {
return searchParams[key].map(val => `${key}=${val}`);
}
return `${key}=${searchParams[key]}`;
})
.join(' and ');
});
const filteredSearchParams = flattenSearchParams.filter(
el => el.indexOf('or__') === -1
);
const conditionalSearchParams = flattenSearchParams.filter(
el => !filteredSearchParams.includes(el)
);
const conditionalQuery = conditionalSearchParams
.map(el => el.replace('or__', 'or '))
.join(' ')
.trim();
if (filteredSearchParams.length === 0 && conditionalQuery) {
// when there are just or operators the first one should be removed from the query
// `name=foo or name__contains=bar or name__iexact=foo` instead of
// `or name=foo or name__contains=bar or name__iexact=foo` that is the reason of the slice(3)
return conditionalQuery.slice(3);
}
if (conditionalQuery) {
return filteredSearchParams.join(' and ').concat(' ', conditionalQuery);
}
return filteredSearchParams.join(' and ').trim();
}
/**

31
awx/ui_next/src/components/Lookup/shared/HostFilterUtils.test.jsx
View File

@ -77,6 +77,37 @@ describe('toHostFilter', () => {
'isa=2 and tatlo=foo and tatlo=bar and tatlo=baz'
);
});
test('should return a host filter with mixed conditionals', () => {
const object = {
or__name__contains: 'bar',
or__name__iexact: 'foo',
enabled: 'true',
name__contains: 'x',
or__name: 'foo',
};
expect(toHostFilter(object)).toEqual(
'enabled=true and name__contains=x or name=foo or name__contains=bar or name__iexact=foo'
);
});
test('should return a host filter with and conditional', () => {
const object = {
enabled: 'true',
name__contains: 'x',
};
expect(toHostFilter(object)).toEqual('enabled=true and name__contains=x');
});
test('should return a host filter with or conditional', () => {
const object = {
or__name__contains: 'bar',
or__name__iexact: 'foo',
or__name: 'foo',
};
expect(toHostFilter(object)).toEqual(
'name=foo or name__contains=bar or name__iexact=foo'
);
});
});
describe('removeNamespacedKeys', () => {