From c114243082b1499efa5c58d97a5b4827d1ab9714 Mon Sep 17 00:00:00 2001 From: kialam Date: Thu, 7 Feb 2019 07:59:45 -0700 Subject: [PATCH] Add artifacts as a subscriber to job details status service. - This will emerge the artifacts field values if they become available to the UI from the API once a job has completed successfully. --- awx/ui/client/features/output/details.component.js | 6 ++++-- awx/ui/client/features/output/status.service.js | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/features/output/details.component.js b/awx/ui/client/features/output/details.component.js index 10fbd33655..004f0a2395 100644 --- a/awx/ui/client/features/output/details.component.js +++ b/awx/ui/client/features/output/details.component.js @@ -577,8 +577,8 @@ function getExtraVarsDetails () { return { label, tooltip, value, disabled, name }; } -function getArtifactsDetails () { - const artifacts = resource.model.get('artifacts'); +function getArtifactsDetails (val) { + const artifacts = val || resource.model.get('artifacts'); if (!artifacts) { return null; @@ -823,6 +823,7 @@ function JobDetailsController ( scm, inventoryScm, environment, + artifacts, executionNode }) => { vm.started = getStartDetails(started); @@ -830,6 +831,7 @@ function JobDetailsController ( vm.projectUpdate = getProjectUpdateDetails(scm.id); vm.projectStatus = getProjectStatusDetails(scm.status); vm.environment = getEnvironmentDetails(environment); + vm.artifacts = getArtifactsDetails(artifacts); vm.executionNode = getExecutionNodeDetails(executionNode); vm.inventoryScm = getInventoryScmDetails(inventoryScm.id, inventoryScm.status); vm.status = getStatusDetails(status); diff --git a/awx/ui/client/features/output/status.service.js b/awx/ui/client/features/output/status.service.js index 17c3655a4f..19cad5b540 100644 --- a/awx/ui/client/features/output/status.service.js +++ b/awx/ui/client/features/output/status.service.js @@ -40,6 +40,7 @@ function JobStatusService (moment, message) { started: model.get('started'), finished: model.get('finished'), environment: model.get('custom_virtualenv'), + artifacts: model.get('artifacts'), scm: { id: model.get('summary_fields.project_update.id'), status: model.get('summary_fields.project_update.status') @@ -279,6 +280,12 @@ function JobStatusService (moment, message) { this.state.environment = env; }; + this.setArtifacts = val => { + if (!val) return; + + this.state.artifacts = val; + }; + this.setExecutionNode = node => { if (!node) return; @@ -327,6 +334,7 @@ function JobStatusService (moment, message) { this.setStarted(model.get('started')); this.setJobStatus(model.get('status')); this.setEnvironment(model.get('custom_virtualenv')); + this.setArtifacts(model.get('artifacts')); this.setExecutionNode(model.get('execution_node')); this.initHostStatusCounts({ model });