shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-27 17:55:10 +03:00
Code Releases Activity

Merge pull request #11184 from akus062381/user-date-detail-revised

Browse Source 
change locator- UserDateDetail
This commit is contained in:
Sarah Akus 2021-10-01 15:07:24 -04:00 committed by GitHub
commit 0b66b61dd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/src/components/DetailList/UserDateDetail.js
View File

@ -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>

2
awx/ui/src/screens/Credential/CredentialDetail/CredentialDetail.js
View File

@ -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}

2
awx/ui/src/screens/ExecutionEnvironment/ExecutionEnvironmentDetails/ExecutionEnvironmentDetails.js
View File

@ -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>

8
awx/ui/src/screens/Host/HostDetail/HostDetail.js
View File

@ -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`}

7
awx/ui/src/screens/Job/JobDetail/JobDetail.js
View File

@ -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"

2
awx/ui/src/screens/User/UserTokenDetail/UserTokenDetail.js
View File

@ -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>

5
awx/ui/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.js
View File

@ -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>