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

makes the inventory file field creatable

Browse Source
This commit is contained in:
Alex Corey 2021-02-22 18:05:09 -05:00
parent 189804932e
commit a54352898e
2 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.jsx
View File

@ -26,6 +26,7 @@ import {
const SCMSubForm = ({ autoPopulateProject, i18n }) => {
const [isOpen, setIsOpen] = useState(false);
const [sourcePath, setSourcePath] = useState([]);
const { setFieldValue, setFieldTouched } = useFormikContext();
const [credentialField] = useField('credential');
const [projectField, projectMeta, projectHelpers] = useField({
@ -37,14 +38,10 @@ const SCMSubForm = ({ autoPopulateProject, i18n }) => {
validate: required(i18n._(t`Select a value for this field`), i18n),
});
const {
error: sourcePathError,
request: fetchSourcePath,
result: sourcePath,
} = useRequest(
const { error: sourcePathError, request: fetchSourcePath } = useRequest(
useCallback(async projectId => {
const { data } = await ProjectsAPI.readInventories(projectId);
return [...data, '/ (project root)'];
setSourcePath([...data, '/ (project root)']);
}, []),
[]
);
@ -122,12 +119,27 @@ const SCMSubForm = ({ autoPopulateProject, i18n }) => {
!sourcePathError?.message
}
onSelect={(event, value) => {
setIsOpen(false);
value = value.trim();
if (!value.endsWith('/')) {
value += '/';
}
sourcePathHelpers.setValue(value);
}}
isCreateable={false}
aria-label={i18n._(t`Select source path`)}
placeholder={i18n._(t`Select source path`)}
isCreatable
onCreateOption={value => {
value.trim();
if (!value.endsWith('/')) {
value += '/';
}
setSourcePath([...sourcePath, value]);
}}
>
{sourcePath.map(path => (
<SelectOption key={path} value={path} />
<SelectOption key={path} id={path} value={path} />
))}
</Select>
</FormGroup>

33
awx/ui_next/src/screens/Inventory/shared/InventorySourceSubForms/SCMSubForm.test.jsx
View File

@ -99,7 +99,7 @@ describe('<SCMSubForm />', () => {
});
wrapper.update();
expect(wrapper.find('Select#source_path').prop('selections')).toEqual(
'bar'
'bar/'
);
await act(async () => {
@ -111,4 +111,35 @@ describe('<SCMSubForm />', () => {
wrapper.update();
expect(wrapper.find('Select#source_path').prop('selections')).toEqual('');
});
test('should be able to create custom source path', async () => {
const customInitialValues = {
credential: { id: 1, name: 'Credential' },
custom_virtualenv: '',
overwrite: false,
overwrite_vars: false,
source_path: '/path',
source_project: { id: 1, name: 'Source project' },
source_script: null,
source_vars: '---\n',
update_cache_timeout: 0,
update_on_launch: true,
update_on_project_update: false,
verbosity: 1,
};
let customWrapper;
await act(async () => {
customWrapper = mountWithContexts(
<Formik initialValues={customInitialValues}>
<SCMSubForm />
</Formik>
);
});
await act(async () => {
customWrapper.find('Select').invoke('onSelect')({}, 'newPath');
});
customWrapper.update();
expect(customWrapper.find('Select').prop('selections')).toBe('newPath/');
});
});