mirror of
https://github.com/ansible/awx.git
synced 2026-05-09 18:37:36 -02:30
Allows user to hit enter to create label, fixes console errors.
This commit is contained in:
committed by
Jake McDermott
parent
534c4e776a
commit
fbe6abfb53
@@ -86,7 +86,7 @@ class MultiSelect extends Component {
|
|||||||
this.handleSelection(e, option);
|
this.handleSelection(e, option);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.setState({ isExpanded: false });
|
this.setState({ input: '', isExpanded: false });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,17 +105,30 @@ class MultiSelect extends Component {
|
|||||||
handleAddItem(event) {
|
handleAddItem(event) {
|
||||||
const { input, chipItems } = this.state;
|
const { input, chipItems } = this.state;
|
||||||
const { onAddNewItem } = this.props;
|
const { onAddNewItem } = this.props;
|
||||||
const newChip = { name: input, id: Math.random() };
|
const isIncluded = chipItems.some(chipItem => chipItem.name === input);
|
||||||
if (event.key !== 'Tab') {
|
|
||||||
|
if (!input) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.setState({
|
|
||||||
chipItems: chipItems.concat(newChip),
|
|
||||||
isExpanded: false,
|
|
||||||
input: '',
|
|
||||||
});
|
|
||||||
|
|
||||||
onAddNewItem(input);
|
if (isIncluded) {
|
||||||
|
// This event.preventDefault prevents the form from submitting
|
||||||
|
// if the user tries to create 2 chips of the same name
|
||||||
|
event.preventDefault();
|
||||||
|
this.setState({ input: '', isExpanded: false });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (event.key === 'Enter') {
|
||||||
|
event.preventDefault();
|
||||||
|
this.setState({
|
||||||
|
chipItems: chipItems.concat({ name: input, id: input }),
|
||||||
|
isExpanded: false,
|
||||||
|
input: '',
|
||||||
|
});
|
||||||
|
onAddNewItem(input);
|
||||||
|
} else if (event.key === 'Tab') {
|
||||||
|
this.setState({ input: '' });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
handleInputChange(e) {
|
handleInputChange(e) {
|
||||||
|
|||||||
@@ -40,10 +40,10 @@ describe('<MultiSelect />', () => {
|
|||||||
const component = wrapper.find('MultiSelect');
|
const component = wrapper.find('MultiSelect');
|
||||||
component
|
component
|
||||||
.find('input[aria-label="labels"]')
|
.find('input[aria-label="labels"]')
|
||||||
.simulate('keydown', { key: 'Tab' });
|
.simulate('keydown', { key: 'Enter' });
|
||||||
component.update();
|
component.update();
|
||||||
await sleep(1);
|
await sleep(1);
|
||||||
expect(component.state().chipItems.length).toBe(3);
|
expect(component.state().chipItems.length).toBe(2);
|
||||||
});
|
});
|
||||||
test('handleAddItem adds a chip only when Tab is pressed', () => {
|
test('handleAddItem adds a chip only when Tab is pressed', () => {
|
||||||
const onAddNewItem = jest.fn();
|
const onAddNewItem = jest.fn();
|
||||||
@@ -57,7 +57,7 @@ describe('<MultiSelect />', () => {
|
|||||||
);
|
);
|
||||||
const event = {
|
const event = {
|
||||||
preventDefault: () => {},
|
preventDefault: () => {},
|
||||||
key: 'Tab',
|
key: 'Enter',
|
||||||
};
|
};
|
||||||
const component = wrapper.find('MultiSelect');
|
const component = wrapper.find('MultiSelect');
|
||||||
|
|
||||||
|
|||||||
@@ -19,10 +19,13 @@ function JobTemplateAdd({ history, i18n }) {
|
|||||||
const handleSubmit = async values => {
|
const handleSubmit = async values => {
|
||||||
setError(null);
|
setError(null);
|
||||||
try {
|
try {
|
||||||
const { data } = await JobTemplatesAPI.create(values);
|
const {
|
||||||
history.push(`/templates/${data.type}/${data.id}/details`);
|
data: { id, type },
|
||||||
} catch (err) {
|
} = await JobTemplatesAPI.create(values);
|
||||||
setError(err);
|
await Promise.all([submitLabels(id, newLabels, removedLabels)]);
|
||||||
|
history.push(`/templates/${type}/${id}/details`);
|
||||||
|
} catch (error) {
|
||||||
|
setFormSubmitError(error);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ describe('<JobTemplateForm />', () => {
|
|||||||
_JobTemplateForm.prototype,
|
_JobTemplateForm.prototype,
|
||||||
'handleNewLabel'
|
'handleNewLabel'
|
||||||
);
|
);
|
||||||
const event = { key: 'Tab' };
|
const event = { key: 'Enter', preventDefault: () => {} };
|
||||||
const wrapper = mountWithContexts(
|
const wrapper = mountWithContexts(
|
||||||
<JobTemplateForm
|
<JobTemplateForm
|
||||||
template={mockData}
|
template={mockData}
|
||||||
|
|||||||
Reference in New Issue
Block a user