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

Fix host filter chips on smart inventory

Browse Source 
Fix host filter chips on smart inventory

See: https://github.com/ansible/awx/issues/8890
This commit is contained in:
nixocio 2021-05-25 15:58:40 -04:00
parent 87dcc49429
commit 9a0c159943
3 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
awx/ui_next/src/components/Lookup/HostFilterLookup.jsx
View File

@ -32,7 +32,9 @@ import {
} from './shared/HostFilterUtils';
const ChipHolder = styled.div`
--pf-c-form-control--Height: auto;
&& {
--pf-c-form-control--Height: auto;
}
.pf-c-chip-group {
margin-right: 8px;
}
@ -271,6 +273,27 @@ function HostFilterLookup({
))}
</ChipGroup>
))}
{/* Parse advanced search chips */}
{Object.keys(chips).length > 0 &&
Object.keys(chips)
.filter(val => chips[val].chips.length > 0)
.filter(
val => searchColumns.map(val2 => val2.key).indexOf(val) === -1
)
.map(leftoverKey => (
<ChipGroup
categoryName={chips[leftoverKey].key}
key={chips[leftoverKey].key}
numChips={5}
totalChips={chips[leftoverKey]?.chips?.length || 0}
>
{chips[leftoverKey]?.chips?.map(chip => (
<Chip key={chip.key} isReadOnly>
{chip.node}
</Chip>
))}
</ChipGroup>
))}
</ChipHolder>
</InputGroup>
);

1
awx/ui_next/src/screens/Inventory/SmartInventory.jsx
View File

@ -1,5 +1,4 @@
import React, { useCallback, useEffect } from 'react';
import { t } from '@lingui/macro';
import {
Link,

32
awx/ui_next/src/screens/Inventory/shared/SmartInventoryForm.test.jsx
View File

@ -122,12 +122,44 @@ describe('<SmartInventoryForm />', () => {
expect(groupChipGroup.find('Chip').length).toBe(1);
});
test('should display filter chips for advanced host filter', async () => {
await act(async () => {
wrapper.find('HostFilterLookup').invoke('onBlur')();
wrapper.find('HostFilterLookup').invoke('onChange')(
'name__contains=f or name__contains=o'
);
});
wrapper.update();
const nameChipGroup = wrapper.find(
'HostFilterLookup ChipGroup[categoryName="name__contains"]'
);
expect(nameChipGroup.find('Chip').length).toBe(2);
expect(
nameChipGroup
.find('Chip')
.at(0)
.prop('children')
).toBe('f');
expect(
nameChipGroup
.find('Chip')
.at(1)
.prop('children')
).toBe('o');
});
test('should submit expected form values on save', async () => {
await act(async () => {
wrapper.find('InstanceGroupsLookup').invoke('onChange')(
mockFormValues.instance_groups
);
});
await act(async () => {
wrapper.find('HostFilterLookup').invoke('onBlur')();
wrapper.find('HostFilterLookup').invoke('onChange')(
mockFormValues.host_filter
);
});
wrapper.update();
await act(async () => {
wrapper.find('button[aria-label="Save"]').simulate('click');