From 46a7ca4dc36c0344ff74d4200e9a1d1ee3b321cd Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Tue, 14 Jan 2020 12:01:02 -0500
Subject: [PATCH] Fixes navigation bug in InventoryAdd Adds SCM Branch field on
 JTForm

---
 .../Inventory/InventoryAdd/InventoryAdd.jsx       |  4 +++-
 .../Inventory/InventoryAdd/InventoryAdd.test.jsx  |  4 ++--
 .../JobTemplateDetail/JobTemplateDetail.jsx       |  6 ++++++
 .../JobTemplateDetail/JobTemplateDetail.test.jsx  | 15 +++++++++++++++
 .../screens/Template/shared/JobTemplateForm.jsx   | 12 ++++++++++++
 .../Template/shared/JobTemplateForm.test.jsx      |  3 +++
 6 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/awx/ui_next/src/screens/Inventory/InventoryAdd/InventoryAdd.jsx b/awx/ui_next/src/screens/Inventory/InventoryAdd/InventoryAdd.jsx
index db7f5be27c..e01a336390 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryAdd/InventoryAdd.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryAdd/InventoryAdd.jsx
@@ -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`;
 
diff --git a/awx/ui_next/src/screens/Inventory/InventoryAdd/InventoryAdd.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryAdd/InventoryAdd.test.jsx
index 1616d17499..26b0619a7d 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryAdd/InventoryAdd.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryAdd/InventoryAdd.test.jsx
@@ -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 () => {
diff --git a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
index 8783e93297..44390be54d 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
@@ -196,6 +196,12 @@ class JobTemplateDetail extends Component {
             ) : (
               renderMissingDataDetail(i18n._(t`Project`))
             )}
+            {template.scm_branch && (
+              <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} />
diff --git a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.test.jsx b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.test.jsx
index a06d1e8db5..7ae6b0319c 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.test.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.test.jsx
@@ -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');
+  });
 });
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
index b62f7603ec..74d5687f25 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
@@ -124,6 +124,9 @@ class JobTemplateForm extends Component {
   handleProjectUpdate(project) {
     const { setFieldValue } = this.props;
     setFieldValue('project', project.id);
+    if (!project.allow_override) {
+      setFieldValue('scm_branch', null);
+    }
     this.setState({ project });
   }
 
@@ -269,6 +272,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 +594,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,
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx
index 5e6b3ec9b6..41d218c01a 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx
@@ -17,6 +17,7 @@ describe('<JobTemplateForm />', () => {
     project: 3,
     playbook: 'Baz',
     type: 'job_template',
+    scm_branch: 'Foo',
     summary_fields: {
       inventory: {
         id: 2,
@@ -26,6 +27,7 @@ describe('<JobTemplateForm />', () => {
       project: {
         id: 3,
         name: 'qux',
+        allow_override: true,
       },
       labels: { results: [{ name: 'Sushi', id: 1 }, { name: 'Major', id: 2 }] },
       credentials: [
@@ -145,6 +147,7 @@ describe('<JobTemplateForm />', () => {
       wrapper.find('ProjectLookup').invoke('onChange')({
         id: 4,
         name: 'project',
+        allow_override: true,
       });
       wrapper.find('AnsibleSelect[name="playbook"]').simulate('change', {
         target: { value: 'new baz type', name: 'playbook' },