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

Merge pull request #5654 from AlexSCorey/5619-BranchFieldMissing

Browse Source 
Fixes navigation bug in InventoryAdd Adds SCM Branch field on JTForm

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-01-17 21:46:45 +00:00 committed by GitHub
commit a6539d66d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 81 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui_next/src/screens/Inventory/InventoryAdd/InventoryAdd.jsx
View File

@ -57,7 +57,9 @@ function InventoryAdd() {
);
await Promise.all(associatePromises);
}
const url = history.location.pathname.search('smart')
const url = history.location.pathname.startsWith(
'/inventories/smart_inventory'
)
? `/inventories/smart_inventory/${inventoryId}/details`
: `/inventories/inventory/${inventoryId}/details`;

4
awx/ui_next/src/screens/Inventory/InventoryAdd/InventoryAdd.test.jsx
View File

@ -41,8 +41,7 @@ describe('<InventoryAdd />', () => {
test('Initially renders successfully', () => {
expect(wrapper.length).toBe(1);
});
test('handleSubmit should call the api', async () => {
test('handleSubmit should call the api and redirect to details page', async () => {
const instanceGroups = [{ name: 'Bizz', id: 1 }, { name: 'Buzz', id: 2 }];
await waitForElement(wrapper, 'isLoading', el => el.length === 0);
@ -64,6 +63,7 @@ describe('<InventoryAdd />', () => {
IG.id
)
);
expect(history.location.pathname).toBe('/inventories/inventory/13/details');
});
test('handleCancel should return the user back to the inventories list', async () => {

1
awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.test.jsx
View File

@ -26,6 +26,7 @@ const jobTemplateData = {
allow_simultaneous: false,
use_fact_cache: false,
host_config_key: '',
scm_branch: '',
};
describe('<JobTemplateAdd />', () => {

1
awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
View File

@ -196,6 +196,7 @@ class JobTemplateDetail extends Component {
) : (
renderMissingDataDetail(i18n._(t`Project`))
)}
<Detail label={i18n._(t`SCM Branch`)} value={template.scm_branch} />
<Detail label={i18n._(t`Playbook`)} value={playbook} />
<Detail label={i18n._(t`Forks`)} value={forks || '0'} />
<Detail label={i18n._(t`Limit`)} value={limit} />

15
awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.test.jsx
View File

@ -143,4 +143,19 @@ describe('<JobTemplateDetail />', () => {
template.summary_fields.credentials[0]
);
});
test('should render SCM_Branch', async () => {
const mockTemplate = { ...template };
mockTemplate.scm_branch = 'Foo branch';
const wrapper = mountWithContexts(
<JobTemplateDetail template={mockTemplate} />
);
await waitForElement(
wrapper,
'JobTemplateDetail',
el => el.state('hasContentLoading') === false
);
const SCMBranch = wrapper.find('Detail[label="SCM Branch"]');
expect(SCMBranch.prop('value')).toBe('Foo branch');
});
});

6
awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx
View File

@ -29,6 +29,7 @@ const mockJobTemplate = {
allow_simultaneous: false,
use_fact_cache: false,
host_config_key: '',
scm_branch: '',
summary_fields: {
user_capabilities: {
edit: true,
@ -161,6 +162,11 @@ describe('<JobTemplateEdit />', () => {
JobTemplatesAPI.readInstanceGroups.mockReturnValue({
data: { results: mockInstanceGroups },
});
ProjectsAPI.readDetail.mockReturnValue({
id: 1,
allow_override: true,
name: 'foo',
});
});
afterEach(() => {

37
awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
View File

@ -28,7 +28,7 @@ import {
ProjectLookup,
MultiCredentialsLookup,
} from '@components/Lookup';
import { JobTemplatesAPI } from '@api';
import { JobTemplatesAPI, ProjectsAPI } from '@api';
import LabelSelect from './LabelSelect';
import PlaybookSelect from './PlaybookSelect';
@ -81,16 +81,31 @@ class JobTemplateForm extends Component {
this.loadRelatedInstanceGroups = this.loadRelatedInstanceGroups.bind(this);
this.handleProjectUpdate = this.handleProjectUpdate.bind(this);
this.setContentError = this.setContentError.bind(this);
this.fetchProject = this.fetchProject.bind(this);
}
componentDidMount() {
const { validateField } = this.props;
this.setState({ contentError: null, hasContentLoading: true });
// TODO: determine when LabelSelect has finished loading labels
Promise.all([this.loadRelatedInstanceGroups()]).then(() => {
this.setState({ hasContentLoading: false });
validateField('project');
});
Promise.all([this.loadRelatedInstanceGroups(), this.fetchProject()]).then(
() => {
this.setState({ hasContentLoading: false });
validateField('project');
}
);
}
async fetchProject() {
const { project } = this.state;
if (project && project.id) {
try {
const { data: projectData } = await ProjectsAPI.readDetail(project.id);
this.setState({ project: projectData });
} catch (err) {
this.setState({ contentError: err });
}
}
}
async loadRelatedInstanceGroups() {
@ -124,6 +139,8 @@ class JobTemplateForm extends Component {
handleProjectUpdate(project) {
const { setFieldValue } = this.props;
setFieldValue('project', project.id);
setFieldValue('playbook', 0);
setFieldValue('scm_branch', '');
this.setState({ project });
}
@ -147,6 +164,7 @@ class JobTemplateForm extends Component {
i18n,
template,
} = this.props;
const jobTypeOptions = [
{
value: '',
@ -269,6 +287,14 @@ class JobTemplateForm extends Component {
/>
)}
</Field>
{project && project.allow_override && (
<FormField
id="scm_branch"
name="scm_branch"
type="text"
label={i18n._(t`SCM Branch`)}
/>
)}
<Field
name="playbook"
validate={required(i18n._(t`Select a value for this field`), i18n)}
@ -583,6 +609,7 @@ const FormikApp = withFormik({
job_type: template.job_type || 'run',
inventory: template.inventory || '',
project: template.project || '',
scm_branch: template.scm_branch || '',
playbook: template.playbook || '',
labels: summary_fields.labels.results || [],
forks: template.forks || 0,

20
awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx
View File

@ -17,6 +17,7 @@ describe('<JobTemplateForm />', () => {
project: 3,
playbook: 'Baz',
type: 'job_template',
scm_branch: 'Foo',
summary_fields: {
inventory: {
id: 2,
@ -88,6 +89,11 @@ describe('<JobTemplateForm />', () => {
ProjectsAPI.readPlaybooks.mockReturnValue({
data: ['debug.yml'],
});
ProjectsAPI.readDetail.mockReturnValue({
name: 'foo',
id: 1,
allow_override: true,
});
});
afterEach(() => {
@ -126,7 +132,6 @@ describe('<JobTemplateForm />', () => {
/>
);
});
await waitForElement(wrapper, 'EmptyStateBody', el => el.length === 0);
await act(async () => {
wrapper.find('input#template-name').simulate('change', {
@ -145,16 +150,27 @@ describe('<JobTemplateForm />', () => {
wrapper.find('ProjectLookup').invoke('onChange')({
id: 4,
name: 'project',
allow_override: true,
});
});
wrapper.update();
await act(async () => {
wrapper.find('input#scm_branch').simulate('change', {
target: { value: 'devel', name: 'scm_branch' },
});
wrapper.find('AnsibleSelect[name="playbook"]').simulate('change', {
target: { value: 'new baz type', name: 'playbook' },
});
});
await act(async () => {
wrapper
.find('CredentialChip')
.at(0)
.prop('onClick')();
});
wrapper.update();
expect(wrapper.find('input#template-name').prop('value')).toEqual(
'new foo'
);
@ -171,7 +187,9 @@ describe('<JobTemplateForm />', () => {
expect(wrapper.find('ProjectLookup').prop('value')).toEqual({
id: 4,
name: 'project',
allow_override: true,
});
expect(wrapper.find('input#scm_branch').prop('value')).toEqual('devel');
expect(
wrapper.find('AnsibleSelect[name="playbook"]').prop('value')
).toEqual('new baz type');

3
awx/ui_next/src/screens/Template/shared/PlaybookSelect.jsx
View File

@ -15,6 +15,7 @@ function PlaybookSelect({
i18n,
}) {
const [options, setOptions] = useState([]);
useEffect(() => {
if (!projectId) {
return;
@ -28,6 +29,7 @@ function PlaybookSelect({
label: playbook,
isDisabled: false,
}));
opts.unshift({
value: '',
key: '',
@ -40,7 +42,6 @@ function PlaybookSelect({
}
})();
}, [projectId, i18n, onError]);
return (
<AnsibleSelect
id="template-playbook"