mirror of
https://github.com/ansible/awx.git
synced 2024-10-27 17:55:10 +03:00
Merge pull request #11184 from akus062381/user-date-detail-revised
change locator- UserDateDetail
This commit is contained in:
commit
0b66b61dd6
@ -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>
|
||||
|
@ -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}
|
||||
|
@ -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>
|
||||
|
@ -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`}
|
||||
|
@ -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"
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user