diff --git a/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx b/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx
index 720595e013..5a123ebe49 100644
--- a/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx
+++ b/awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx
@@ -21,6 +21,7 @@ function ExecutionEnvironmentDetail({
isDefaultEnvironment,
virtualEnvironment,
verifyMissingVirtualEnv,
+ helpText,
}) {
const label = isDefaultEnvironment
? t`Default Execution Environment`
@@ -37,6 +38,7 @@ function ExecutionEnvironmentDetail({
{executionEnvironment.name}
}
+ helpText={helpText}
dataCy="execution-environment-detail"
/>
);
@@ -95,6 +97,7 @@ ExecutionEnvironmentDetail.propTypes = {
isDefaultEnvironment: bool,
virtualEnvironment: string,
verifyMissingVirtualEnv: bool,
+ helpText: string,
};
ExecutionEnvironmentDetail.defaultProps = {
@@ -102,6 +105,7 @@ ExecutionEnvironmentDetail.defaultProps = {
executionEnvironment: null,
virtualEnvironment: '',
verifyMissingVirtualEnv: true,
+ helpText: '',
};
export default ExecutionEnvironmentDetail;
diff --git a/awx/ui_next/src/components/JobList/JobListItem.jsx b/awx/ui_next/src/components/JobList/JobListItem.jsx
index ade6f62c20..85d2ade5bd 100644
--- a/awx/ui_next/src/components/JobList/JobListItem.jsx
+++ b/awx/ui_next/src/components/JobList/JobListItem.jsx
@@ -14,6 +14,7 @@ import ChipGroup from '../ChipGroup';
import CredentialChip from '../CredentialChip';
import ExecutionEnvironmentDetail from '../ExecutionEnvironmentDetail';
import { formatDateString } from '../../util/dates';
+import { isJobRunning } from '../../util/jobs';
import { JOB_TYPE_URL_SEGMENTS } from '../../constants';
import JobCancelButton from '../JobCancelButton';
@@ -32,7 +33,7 @@ function JobListItem({
const jobTypes = {
project_update: t`Source Control Update`,
inventory_update: t`Inventory Sync`,
- job: t`Playbook Run`,
+ job: job.job_type === 'check' ? t`Playbook Check` : t`Playbook Run`,
ad_hoc_command: t`Command`,
system_job: t`Management Job`,
workflow_job: t`Workflow Job`,
@@ -202,10 +203,12 @@ function JobListItem({
dataCy={`job-${job.id}-project`}
/>
)}
-
+ {job.type !== 'workflow_job' && !isJobRunning(job.status) && (
+
+ )}
{credentials && credentials.length > 0 && (
-
+ {job.type !== 'workflow_job' && !isJobRunning(job.status) && (
+
+ )}
{instanceGroup && !instanceGroup?.is_container_group && (
;
}
-
return (
@@ -212,7 +211,10 @@ function JobTemplateDetail({ template }) {
)}
diff --git a/awx/ui_next/src/screens/Template/shared/data.job_template.json b/awx/ui_next/src/screens/Template/shared/data.job_template.json
index fa516d46db..4d4eb77af1 100644
--- a/awx/ui_next/src/screens/Template/shared/data.job_template.json
+++ b/awx/ui_next/src/screens/Template/shared/data.job_template.json
@@ -139,6 +139,12 @@
"name": "Default EE",
"description": "",
"image": "quay.io/ansible/awx-ee"
+ },
+ "resolved_environment": {
+ "id": 1,
+ "name": "Default EE",
+ "description": "",
+ "image": "quay.io/ansible/awx-ee"
}
},
"created": "2019-09-30T16:18:34.564820Z",