From 487d78cc72aa9c2e37ab03384fca8c7f701b0fac Mon Sep 17 00:00:00 2001
From: "Keith J. Grant" <barkeep@keithjgrant.com>
Date: Mon, 21 Jun 2021 11:23:15 -0700
Subject: [PATCH] Don't reload template when navigating to edit form

---
 .../screens/Template/JobTemplateEdit/JobTemplateEdit.jsx   | 3 ++-
 awx/ui_next/src/screens/Template/Template.jsx              | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
index d4e076fe87..d85e07cfa0 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
@@ -10,7 +10,7 @@ import JobTemplateForm from '../shared/JobTemplateForm';
 import ContentLoading from '../../../components/ContentLoading';
 import { CardBody } from '../../../components/Card';
 
-function JobTemplateEdit({ template }) {
+function JobTemplateEdit({ template, reloadTemplate }) {
   const history = useHistory();
   const [formSubmitError, setFormSubmitError] = useState(null);
   const [isLoading, setIsLoading] = useState(false);
@@ -64,6 +64,7 @@ function JobTemplateEdit({ template }) {
         submitInstanceGroups(instanceGroups, initialInstanceGroups),
         submitCredentials(credentials),
       ]);
+      reloadTemplate();
       history.push(detailsUrl);
     } catch (error) {
       setFormSubmitError(error);
diff --git a/awx/ui_next/src/screens/Template/Template.jsx b/awx/ui_next/src/screens/Template/Template.jsx
index cff958ab30..bc9b990d5c 100644
--- a/awx/ui_next/src/screens/Template/Template.jsx
+++ b/awx/ui_next/src/screens/Template/Template.jsx
@@ -97,7 +97,7 @@ function Template({ setBreadcrumb }) {
 
   useEffect(() => {
     loadTemplateAndRoles();
-  }, [loadTemplateAndRoles, location.pathname]);
+  }, [loadTemplateAndRoles]);
 
   useEffect(() => {
     if (template) {
@@ -205,7 +205,10 @@ function Template({ setBreadcrumb }) {
               />
             </Route>
             <Route key="edit" path="/templates/:templateType/:id/edit">
-              <JobTemplateEdit template={template} />
+              <JobTemplateEdit
+                template={template}
+                reloadTemplate={loadTemplateAndRoles}
+              />
             </Route>
             <Route key="access" path="/templates/:templateType/:id/access">
               <ResourceAccessList