External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-10 15:32:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8658 from mabashian/5683-created-modified-details

Browse Source 
Move jt/wfjt created/modified details to the end right before the full width details

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2021-01-04 22:49:40 +00:00 committed by GitHub
commit f52b23f298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui_next/src/screens/Application/ApplicationDetails/ApplicationDetails.jsx
View File

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

13
awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx
View File

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

13
awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.jsx
View File

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

20
awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
View File

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

26
awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
View File

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