From 189a10e35a110de335ce8dcf8ea0981630c9b9c1 Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Mon, 6 Apr 2020 17:53:54 -0400
Subject: [PATCH] Fix playbook error message and JT save bug

---
 .../src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx | 5 +----
 awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx  | 3 ++-
 awx/ui_next/src/types.js                                     | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
index f653d1082c..5b5c36cbcc 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
@@ -108,10 +108,7 @@ class JobTemplateEdit extends Component {
     try {
       await JobTemplatesAPI.update(template.id, remainingValues);
       await Promise.all([
-        this.submitLabels(
-          labels,
-          values.project.summary_fields.organization.id
-        ),
+        this.submitLabels(labels, template?.organization),
         this.submitInstanceGroups(instanceGroups, initialInstanceGroups),
         this.submitCredentials(credentials),
       ]);
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
index 531809062b..8d63295196 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
@@ -52,7 +52,7 @@ function JobTemplateForm({
   i18n,
 }) {
   const [contentError, setContentError] = useState(false);
-  const [project, setProject] = useState(null);
+  const [project, setProject] = useState(template?.summary_fields?.project);
   const [inventory, setInventory] = useState(
     template?.summary_fields?.inventory
   );
@@ -282,6 +282,7 @@ function JobTemplateForm({
         <FormGroup
           fieldId="template-playbook"
           helperTextInvalid={playbookMeta.error}
+          isValid={!playbookMeta.touched || !playbookMeta.error}
           isRequired
           label={i18n._(t`Playbook`)}
         >
diff --git a/awx/ui_next/src/types.js b/awx/ui_next/src/types.js
index 612a03afc5..c1b592cb5a 100644
--- a/awx/ui_next/src/types.js
+++ b/awx/ui_next/src/types.js
@@ -70,7 +70,7 @@ export const JobTemplate = shape({
   inventory: number,
   job_type: oneOf(['run', 'check']),
   playbook: string,
-  project: shape({}),
+  project: number,
 });
 
 export const Inventory = shape({