From 52c8033a08b9797c3c9e12bc93bed3dd160a4c40 Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Wed, 4 Nov 2020 15:31:00 -0500
Subject: [PATCH] Fix notification list item detail pathname link

---
 .../src/components/NotificationList/NotificationList.jsx      | 2 +-
 .../src/screens/NotificationTemplate/NotificationTemplate.jsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx/ui_next/src/components/NotificationList/NotificationList.jsx b/awx/ui_next/src/components/NotificationList/NotificationList.jsx
index 1dc89d5909..49cfce25fb 100644
--- a/awx/ui_next/src/components/NotificationList/NotificationList.jsx
+++ b/awx/ui_next/src/components/NotificationList/NotificationList.jsx
@@ -219,7 +219,7 @@ function NotificationList({
           <NotificationListItem
             key={notification.id}
             notification={notification}
-            detailUrl={`/notifications/${notification.id}`}
+            detailUrl={`/notification_templates/${notification.id}/details`}
             canToggleNotifications={
               canToggleNotifications &&
               !loadingToggleIds.includes(notification.id)
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
index cd9f60f968..219bb124bd 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
@@ -18,6 +18,7 @@ import ContentError from '../../components/ContentError';
 import { NotificationTemplatesAPI } from '../../api';
 import NotificationTemplateDetail from './NotificationTemplateDetail';
 import NotificationTemplateEdit from './NotificationTemplateEdit';
+import ContentLoading from '../../components/ContentLoading';
 
 function NotificationTemplate({ setBreadcrumb, i18n }) {
   const { id: templateId } = useParams();
@@ -94,20 +95,19 @@ function NotificationTemplate({ setBreadcrumb, i18n }) {
             to="/notification_templates/:id/details"
             exact
           />
+          {isLoading && <ContentLoading />}
           {template && (
             <>
               <Route path="/notification_templates/:id/edit">
                 <NotificationTemplateEdit
                   template={template}
                   defaultMessages={defaultMessages}
-                  isLoading={isLoading}
                 />
               </Route>
               <Route path="/notification_templates/:id/details">
                 <NotificationTemplateDetail
                   template={template}
                   defaultMessages={defaultMessages}
-                  isLoading={isLoading}
                 />
               </Route>
             </>