Merge pull request #3067 from mabashian/2264-custom-venv

Adds environment to output details for jts and inv syncs

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

awx/ui/client/features/output/details.component.js

@@ -113,6 +113,18 @@ function getVerbosityDetails () {
     return { label, value };
 }
 
+function getEnvironmentDetails (virtualenv) {
+    const value = virtualenv || 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;
         });

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>

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'),

awx/ui/client/features/output/status.service.js

@@ -39,6 +39,7 @@ function JobStatusService (moment, message) {
             elapsed: model.get('elapsed'),
             started: model.get('started'),
             finished: model.get('finished'),
+            environment: model.get('custom_virtualenv'),
             scm: {
                 id: model.get('summary_fields.project_update.id'),
                 status: model.get('summary_fields.project_update.status')
@@ -255,6 +256,12 @@ function JobStatusService (moment, message) {
         this.updateRunningState();
     };
 
+    this.setEnvironment = env => {
+        if (!env) return;
+
+        this.state.environment = env;
+    };
+
     this.setStatsEvent = data => {
         if (!data) return;
 
@@ -296,6 +303,7 @@ function JobStatusService (moment, message) {
                 this.setElapsed(model.get('elapsed'));
                 this.setStarted(model.get('started'));
                 this.setJobStatus(model.get('status'));
+                this.setEnvironment(model.get('custom_virtualenv'));
 
                 this.initHostStatusCounts({ model });
                 this.initPlaybookCounts({ model });