From 8037cddfe589c8b4458d2a5bf13e3165662df541 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Thu, 24 Jan 2019 12:19:24 -0500
Subject: [PATCH] Adds environment to output details for jts and inv syncs

---
 .../client/features/output/details.component.js  | 16 +++++++++++++++-
 .../client/features/output/details.partial.html  |  6 ++++++
 awx/ui/client/features/output/output.strings.js  |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/features/output/details.component.js b/awx/ui/client/features/output/details.component.js
index 2b9cb2a931..4a0bd3c5cc 100644
--- a/awx/ui/client/features/output/details.component.js
+++ b/awx/ui/client/features/output/details.component.js
@@ -113,6 +113,18 @@ function getVerbosityDetails () {
     return { label, value };
 }
 
+function getEnvironmentDetails () {
+    const value = resource.model.get('custom_virtualenv');
+
+    if (!value || value === '') {
+        return null;
+    }
+
+    const label = strings.get('labels.ENVIRONMENT');
+
+    return { label, value };
+}
+
 function getSourceWorkflowJobDetails () {
     const sourceWorkflowJob = resource.model.get('summary_fields.source_workflow_job');
 
@@ -711,6 +723,7 @@ function JobDetailsController (
         vm.launchedBy = getLaunchedByDetails();
         vm.jobExplanation = getJobExplanationDetails();
         vm.verbosity = getVerbosityDetails();
+        vm.environment = getEnvironmentDetails();
         vm.credentials = getCredentialDetails();
         vm.forks = getForkDetails();
         vm.limit = getLimitDetails();
@@ -735,11 +748,12 @@ function JobDetailsController (
         vm.toggleLabels = toggleLabels;
         vm.showLabels = showLabels;
 
-        unsubscribe = subscribe(({ status, started, finished, scm }) => {
+        unsubscribe = subscribe(({ status, started, finished, scm, environment }) => {
             vm.started = getStartDetails(started);
             vm.finished = getFinishDetails(finished);
             vm.projectUpdate = getProjectUpdateDetails(scm.id);
             vm.projectStatus = getProjectStatusDetails(scm.status);
+            vm.environment = getEnvironmentDetails(environment);
             vm.status = getStatusDetails(status);
             vm.job.status = status;
         });
diff --git a/awx/ui/client/features/output/details.partial.html b/awx/ui/client/features/output/details.partial.html
index 9e42ad9c5c..c56772dbee 100644
--- a/awx/ui/client/features/output/details.partial.html
+++ b/awx/ui/client/features/output/details.partial.html
@@ -268,6 +268,12 @@
     <div class="JobResults-resultRowText">{{ vm.verbosity.value }}</div>
 </div>
 
+<!-- ENVIRONMENT DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.environment">
+    <label class="JobResults-resultRowLabel">{{ vm.environment.label }}</label>
+    <div class="JobResults-resultRowText">{{ vm.environment.value }}</div>
+</div>
+
 <!-- IG DETAIL -->
 <div class="JobResults-resultRow" ng-if="vm.instanceGroup">
     <label class="JobResults-resultRowLabel">{{ vm.instanceGroup.label }}</label>
diff --git a/awx/ui/client/features/output/output.strings.js b/awx/ui/client/features/output/output.strings.js
index 1f89700a36..c1684649c1 100644
--- a/awx/ui/client/features/output/output.strings.js
+++ b/awx/ui/client/features/output/output.strings.js
@@ -48,6 +48,7 @@ function OutputStrings (BaseString) {
 
     ns.labels = {
         CREDENTIAL: t.s('Credential'),
+        ENVIRONMENT: t.s('Environment'),
         EXTRA_VARS: t.s('Extra Variables'),
         FINISHED: t.s('Finished'),
         FORKS: t.s('Forks'),