From 4ea757c91a6127f07a3ed65429841484df786be8 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 23 Nov 2020 14:38:36 -0500
Subject: [PATCH 1/2] Move jt/wfjt created/modified details to the end right
 before the full width details

---
 .../JobTemplateDetail/JobTemplateDetail.jsx   | 20 +++++++-------
 .../WorkflowJobTemplateDetail.jsx             | 26 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
index e25032e527..8f3fe4ffcd 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
@@ -219,16 +219,6 @@ function JobTemplateDetail({ i18n, template }) {
           value={verbosityDetails[0].details}
         />
         <Detail label={i18n._(t`Timeout`)} value={timeout || '0'} />
-        <UserDateDetail
-          label={i18n._(t`Created`)}
-          date={created}
-          user={summary_fields.created_by}
-        />
-        <UserDateDetail
-          label={i18n._(t`Last Modified`)}
-          date={modified}
-          user={summary_fields.modified_by}
-        />
         <Detail
           label={i18n._(t`Show Changes`)}
           value={diff_mode ? i18n._(t`On`) : i18n._(t`Off`)}
@@ -278,6 +268,16 @@ function JobTemplateDetail({ i18n, template }) {
         {renderOptionsField && (
           <Detail label={i18n._(t`Options`)} value={renderOptions} />
         )}
+        <UserDateDetail
+          label={i18n._(t`Created`)}
+          date={created}
+          user={summary_fields.created_by}
+        />
+        <UserDateDetail
+          label={i18n._(t`Last Modified`)}
+          date={modified}
+          user={summary_fields.modified_by}
+        />
         {summary_fields.credentials && summary_fields.credentials.length > 0 && (
           <Detail
             fullWidth
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
index 2f6b99821a..2a5242b9a0 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
@@ -135,9 +135,6 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
             )}
           />
         )}
-        {renderOptionsField && (
-          <Detail label={i18n._(t`Options`)} value={renderOptions} />
-        )}
         <Detail
           label={i18n._(t`Webhook Service`)}
           value={toTitleCase(template.webhook_service)}
@@ -162,6 +159,19 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
             }
           />
         )}
+        {renderOptionsField && (
+          <Detail label={i18n._(t`Options`)} value={renderOptions} />
+        )}
+        <UserDateDetail
+          label={i18n._(t`Created`)}
+          date={created}
+          user={summary_fields.created_by}
+        />
+        <UserDateDetail
+          label={i18n._(t`Modified`)}
+          date={modified}
+          user={summary_fields.modified_by}
+        />
         {summary_fields.labels?.results?.length > 0 && (
           <Detail
             fullWidth
@@ -185,16 +195,6 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
           value={extra_vars}
           rows={4}
         />
-        <UserDateDetail
-          label={i18n._(t`Created`)}
-          date={created}
-          user={summary_fields.created_by}
-        />
-        <UserDateDetail
-          label={i18n._(t`Modified`)}
-          date={modified}
-          user={summary_fields.modified_by}
-        />
       </DetailList>
       <CardActionsRow>
         {summary_fields.user_capabilities &&

From 0b3d9b026dafb5c4f251be986d906ed17c09e655 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 4 Jan 2021 16:17:46 -0500
Subject: [PATCH 2/2] Adds created/modified details to several areas

---
 .../ApplicationDetails/ApplicationDetails.jsx       | 11 ++++++++++-
 awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx | 13 ++++++++++++-
 .../NotificationTemplateDetail.jsx                  | 13 +++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.jsx b/awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.jsx
index 5e55cb1611..80d7a8c916 100644
--- a/awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.jsx
+++ b/awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.jsx
@@ -7,7 +7,11 @@ import { Button } from '@patternfly/react-core';
 import useRequest, { useDismissableError } from '../../../util/useRequest';
 import AlertModal from '../../../components/AlertModal';
 import { CardBody, CardActionsRow } from '../../../components/Card';
-import { Detail, DetailList } from '../../../components/DetailList';
+import {
+  Detail,
+  DetailList,
+  UserDateDetail,
+} from '../../../components/DetailList';
 import { ApplicationsAPI } from '../../../api';
 import DeleteButton from '../../../components/DeleteButton';
 import ErrorDetail from '../../../components/ErrorDetail';
@@ -98,6 +102,11 @@ function ApplicationDetails({
           value={getClientType(application.client_type)}
           dataCy="app-detail-client-type"
         />
+        <UserDateDetail label={i18n._(t`Created`)} date={application.created} />
+        <UserDateDetail
+          label={i18n._(t`Last Modified`)}
+          date={application.modified}
+        />
       </DetailList>
       <CardActionsRow>
         {application.summary_fields.user_capabilities &&
diff --git a/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx b/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
index 9963fbbba8..9255b27af1 100644
--- a/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
+++ b/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
@@ -7,7 +7,11 @@ import { Button, Chip, Label } from '@patternfly/react-core';
 import styled from 'styled-components';
 
 import AlertModal from '../../../components/AlertModal';
-import { DetailList, Detail } from '../../../components/DetailList';
+import {
+  DetailList,
+  Detail,
+  UserDateDetail,
+} from '../../../components/DetailList';
 import { CardBody, CardActionsRow } from '../../../components/Card';
 import ChipGroup from '../../../components/ChipGroup';
 import CredentialChip from '../../../components/CredentialChip';
@@ -80,6 +84,7 @@ const getLaunchedByDetails = ({ summary_fields = {}, related = {} }) => {
 
 function JobDetail({ job, i18n }) {
   const {
+    created_by,
     credential,
     credentials,
     instance_group: instanceGroup,
@@ -289,6 +294,12 @@ function JobDetail({ job, i18n }) {
             }
           />
         )}
+        <UserDateDetail
+          label={i18n._(t`Created`)}
+          date={job.created}
+          user={created_by}
+        />
+        <UserDateDetail label={i18n._(t`Last Modified`)} date={job.modified} />
       </DetailList>
       {job.extra_vars && (
         <VariablesInput
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.jsx
index 5761e737a3..b9becea72f 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.jsx
@@ -10,6 +10,7 @@ import {
   ArrayDetail,
   DetailList,
   DeletedDetail,
+  UserDateDetail,
 } from '../../../components/DetailList';
 import CodeDetail from '../../../components/DetailList/CodeDetail';
 import DeleteButton from '../../../components/DeleteButton';
@@ -23,6 +24,8 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
   const history = useHistory();
 
   const {
+    created,
+    modified,
     notification_configuration: configuration,
     summary_fields,
     messages,
@@ -324,6 +327,16 @@ function NotificationTemplateDetail({ i18n, template, defaultMessages }) {
             />
           </>
         )}
+        <UserDateDetail
+          label={i18n._(t`Created`)}
+          date={created}
+          user={summary_fields?.created_by}
+        />
+        <UserDateDetail
+          label={i18n._(t`Last Modified`)}
+          date={modified}
+          user={summary_fields?.modified_by}
+        />
         {hasCustomMessages(messages, typeMessageDefaults) && (
           <CustomMessageDetails
             messages={messages}