From 0bc4702a2641b5c815cc9414f370d01d840e6c63 Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Fri, 9 Apr 2021 14:40:59 -0400
Subject: [PATCH] Add execution environment detail to template expanded row

---
 .../src/components/TemplateList/TemplateListItem.jsx      | 8 +++++++-
 .../src/components/TemplateList/TemplateListItem.test.jsx | 1 +
 .../src/components/TemplateList/data.job_template.json    | 7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/awx/ui_next/src/components/TemplateList/TemplateListItem.jsx b/awx/ui_next/src/components/TemplateList/TemplateListItem.jsx
index ac14dd281c..2e056b17d5 100644
--- a/awx/ui_next/src/components/TemplateList/TemplateListItem.jsx
+++ b/awx/ui_next/src/components/TemplateList/TemplateListItem.jsx
@@ -17,6 +17,7 @@ import { ActionsTd, ActionItem } from '../PaginatedTable';
 import { DetailList, Detail, DeletedDetail } from '../DetailList';
 import ChipGroup from '../ChipGroup';
 import CredentialChip from '../CredentialChip';
+import ExecutionEnvironmentDetail from '../ExecutionEnvironmentDetail';
 import { timeOfDay, formatDateString } from '../../util/dates';
 
 import { JobTemplatesAPI, WorkflowJobTemplatesAPI } from '../../api';
@@ -258,7 +259,8 @@ function TemplateListItem({
                   dataCy={`template-${template.id}-inventory`}
                 />
               ) : (
-                !askInventoryOnLaunch && (
+                !askInventoryOnLaunch &&
+                template.type === 'job_template' && (
                   <DeletedDetail label={i18n._(t`Inventory`)} />
                 )
               )}
@@ -273,6 +275,10 @@ function TemplateListItem({
                   dataCy={`template-${template.id}-project`}
                 />
               )}
+              <ExecutionEnvironmentDetail
+                virtualEnvironment={template.custom_virtualenv}
+                executionEnvironment={summaryFields?.execution_environment}
+              />
               <Detail
                 label={i18n._(t`Last Modified`)}
                 value={formatDateString(template.modified)}
diff --git a/awx/ui_next/src/components/TemplateList/TemplateListItem.test.jsx b/awx/ui_next/src/components/TemplateList/TemplateListItem.test.jsx
index 79945665cd..c4bbf11e60 100644
--- a/awx/ui_next/src/components/TemplateList/TemplateListItem.test.jsx
+++ b/awx/ui_next/src/components/TemplateList/TemplateListItem.test.jsx
@@ -419,6 +419,7 @@ describe('<TemplateListItem />', () => {
     assertDetail('Organization', "Mike's Org");
     assertDetail('Inventory', "Mike's Inventory");
     assertDetail('Project', "Mike's Project");
+    assertDetail('Execution Environment', 'Mock EE 1.2.3');
     expect(
       wrapper.find('Detail[label="Credentials"]').containsAllMatchingElements([
         <span>
diff --git a/awx/ui_next/src/components/TemplateList/data.job_template.json b/awx/ui_next/src/components/TemplateList/data.job_template.json
index ff5994da47..8e1a41b473 100644
--- a/awx/ui_next/src/components/TemplateList/data.job_template.json
+++ b/awx/ui_next/src/components/TemplateList/data.job_template.json
@@ -138,6 +138,12 @@
             "id": "1",
             "name": "Webhook Credential"
 
+        },
+        "execution_environment": {
+            "description": "",
+            "id": 1,
+            "image": "foo.io/mock/test-ee:1.2.3",
+            "name": "Mock EE 1.2.3"
         }
     },
     "created": "2019-09-30T16:18:34.564820Z",
@@ -179,6 +185,7 @@
     "diff_mode": false,
     "allow_simultaneous": false,
     "custom_virtualenv": null,
+    "execution_environment": 1,
     "job_slice_count": 1,
     "webhook_credential": 1,
     "webhook_key": "asertdyuhjkhgfd234567kjgfds",