From 7c011a1796d44931c11520e785d04086c27412f1 Mon Sep 17 00:00:00 2001
From: akus062381 <sarah.akus@gmail.com>
Date: Fri, 1 Oct 2021 13:47:21 -0400
Subject: [PATCH] fix commit problem, user date detail

fix commit problem, user date detail
---
 awx/ui/src/components/DetailList/UserDateDetail.js        | 4 ++--
 .../Credential/CredentialDetail/CredentialDetail.js       | 2 --
 .../ExecutionEnvironmentDetails.js                        | 2 --
 awx/ui/src/screens/Host/HostDetail/HostDetail.js          | 8 +-------
 awx/ui/src/screens/Job/JobDetail/JobDetail.js             | 7 +------
 .../src/screens/User/UserTokenDetail/UserTokenDetail.js   | 2 --
 .../WorkflowApprovalDetail/WorkflowApprovalDetail.js      | 5 -----
 7 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/awx/ui/src/components/DetailList/UserDateDetail.js b/awx/ui/src/components/DetailList/UserDateDetail.js
index ca42adde3c..407fb6d7ee 100644
--- a/awx/ui/src/components/DetailList/UserDateDetail.js
+++ b/awx/ui/src/components/DetailList/UserDateDetail.js
@@ -11,13 +11,13 @@ const Detail = styled(_Detail)`
   word-break: break-word;
 `;
 
-function UserDateDetail({ label, date, user, dataCy = null }) {
+function UserDateDetail({ label, date, user }) {
   const dateStr = formatDateString(date);
   const username = user ? user.username : '';
   return (
     <Detail
       label={label}
-      dataCy={dataCy}
+      dataCy="user-date-detail"
       value={
         user ? (
           <Trans>
diff --git a/awx/ui/src/screens/Credential/CredentialDetail/CredentialDetail.js b/awx/ui/src/screens/Credential/CredentialDetail/CredentialDetail.js
index a0818e8403..7b06e280db 100644
--- a/awx/ui/src/screens/Credential/CredentialDetail/CredentialDetail.js
+++ b/awx/ui/src/screens/Credential/CredentialDetail/CredentialDetail.js
@@ -238,14 +238,12 @@ function CredentialDetail({ credential }) {
         {fields.map((field) => renderDetail(field))}
 
         <UserDateDetail
-          dataCy="credential-created-detail"
           id="credential-created-detail"
           label={t`Created`}
           date={created}
           user={created_by}
         />
         <UserDateDetail
-          dataCy="credential-last_modified-detail"
           id="credential-last_modified-detail"
           label={t`Last Modified`}
           date={modified}
diff --git a/awx/ui/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.js b/awx/ui/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.js
index 2c6702c81a..59d1aa70b2 100644
--- a/awx/ui/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.js
+++ b/awx/ui/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.js
@@ -99,13 +99,11 @@ function ExecutionEnvironmentDetails({ executionEnvironment }) {
           label={t`Created`}
           date={executionEnvironment.created}
           user={executionEnvironment.summary_fields.created_by}
-          dataCy="execution-environment-created"
         />
         <UserDateDetail
           label={t`Last Modified`}
           date={executionEnvironment.modified}
           user={executionEnvironment.summary_fields.modified_by}
-          dataCy="execution-environment-modified"
         />
       </DetailList>
       <CardActionsRow>
diff --git a/awx/ui/src/screens/Host/HostDetail/HostDetail.js b/awx/ui/src/screens/Host/HostDetail/HostDetail.js
index 2ef2202e4c..18d26e0982 100644
--- a/awx/ui/src/screens/Host/HostDetail/HostDetail.js
+++ b/awx/ui/src/screens/Host/HostDetail/HostDetail.js
@@ -80,17 +80,11 @@ function HostDetail({ host }) {
             </Link>
           }
         />
-        <UserDateDetail
-          date={created}
-          label={t`Created`}
-          user={created_by}
-          dataCy="host-created-by"
-        />
+        <UserDateDetail date={created} label={t`Created`} user={created_by} />
         <UserDateDetail
           date={modified}
           label={t`Last Modified`}
           user={modified_by}
-          dataCy="host-last-modified-by"
         />
         <VariablesDetail
           label={t`Variables`}
diff --git a/awx/ui/src/screens/Job/JobDetail/JobDetail.js b/awx/ui/src/screens/Job/JobDetail/JobDetail.js
index da17e529c5..535ed3936f 100644
--- a/awx/ui/src/screens/Job/JobDetail/JobDetail.js
+++ b/awx/ui/src/screens/Job/JobDetail/JobDetail.js
@@ -404,16 +404,11 @@ function JobDetail({ job, inventorySourceLabels }) {
           value={job.module_args}
         />
         <UserDateDetail
-          dataCy="job-created"
           label={t`Created`}
           date={job.created}
           user={created_by}
         />
-        <UserDateDetail
-          dataCy="job-last-modified"
-          label={t`Last Modified`}
-          date={job.modified}
-        />
+        <UserDateDetail label={t`Last Modified`} date={job.modified} />
         {job.extra_vars && (
           <VariablesDetail
             css="margin: 20px 0"
diff --git a/awx/ui/src/screens/User/UserTokenDetail/UserTokenDetail.js b/awx/ui/src/screens/User/UserTokenDetail/UserTokenDetail.js
index 7507da3414..f9b7753992 100644
--- a/awx/ui/src/screens/User/UserTokenDetail/UserTokenDetail.js
+++ b/awx/ui/src/screens/User/UserTokenDetail/UserTokenDetail.js
@@ -57,13 +57,11 @@ function UserTokenDetail({ token }) {
           label={t`Created`}
           date={created}
           user={summary_fields.user}
-          dataCy="application-token-detail-created"
         />
         <UserDateDetail
           label={t`Last Modified`}
           date={modified}
           user={summary_fields.user}
-          dataCy="application-token-detail-last-modified"
         />
       </DetailList>
       <CardActionsRow>
diff --git a/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.js b/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.js
index 0ca1e081cc..504ec2751e 100644
--- a/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.js
+++ b/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.js
@@ -150,27 +150,22 @@ function WorkflowApprovalDetail({ workflowApproval }) {
           label={t`Created`}
           date={workflowApproval.created}
           user={workflowApproval.summary_fields.created_by}
-          dataCy="wa-detail-created-by"
         />
         <Detail
           label={t`Last Modified`}
           value={formatDateString(workflowApproval.modified)}
-          dataCy="wa-detail-last-modified"
         />
         <Detail
           label={t`Finished`}
           value={formatDateString(workflowApproval.finished)}
-          dataCy="wa-detail-finished"
         />
         <Detail
           label={t`Canceled`}
           value={formatDateString(workflowApproval.canceled_on)}
-          dataCy="wa-detail-canceled"
         />
         <Detail
           label={t`Elapsed`}
           value={secondsToHHMMSS(workflowApproval.elapsed)}
-          dataCy="wa-detail-elapsed"
         />
       </DetailList>
       <CardActionsRow>