From 81e044c97cac43e949e86e0f06664ed864a97a16 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Fri, 19 Feb 2016 10:27:05 -0500 Subject: [PATCH] Added standard out details to inventory sync, management jobs and scm updates. --- .../standard-out-inventory-sync.partial.html | 90 +++++++++++++++++++ .../standard-out-management-jobs.partial.html | 42 +++++++++ .../standard-out-scm-update.partial.html | 55 ++++++++++++ .../standard-out/standard-out.controller.js | 76 +++++++++++++++- 4 files changed, 261 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html index 747bfc9bfc..63835c3c80 100644 --- a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html +++ b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html @@ -8,6 +8,15 @@
+
+
NAME
+
+ + {{ inventory_source_name }} + +
+
+
STATUS
@@ -16,6 +25,87 @@
+
+
LICENSE ERROR
+
+ {{ job.license_error }} +
+
+ +
+
STARTED
+
+ {{ job.started | date:'MM/dd/yy HH:mm:ss' }} +
+
+ +
+
FINISHED
+
+ {{ job.finished | date:'MM/dd/yy HH:mm:ss' }} +
+
+ +
+
ELAPSED
+
+ {{ job.elapsed }} seconds +
+
+ +
+
LAUNCH TYPE
+
+ {{ job.launch_type }} +
+
+ +
+
CREDENTIAL
+
+ + {{ credential_name }} + +
+
+ +
+
GROUP
+
+ + {{ inventory_source_name }} + +
+
+ +
+
SOURCE
+
+ {{ source }} +
+
+ +
+
REGIONS
+
+ {{ source_regions }} +
+
+ +
+
OVERWRITE
+
+ {{ job.overwrite }} +
+
+ +
+
OVERWRITE VARS
+
+ {{ job.overwrite_vars }} +
+
+
diff --git a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html index 747bfc9bfc..f268e9569a 100644 --- a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html +++ b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html @@ -8,6 +8,11 @@
+
+
NAME
+
{{ job.name }}
+
+
STATUS
@@ -16,6 +21,43 @@
+
+
STARTED
+
+ {{ job.started | date:'MM/dd/yy HH:mm:ss' }} +
+
+ +
+
FINISHED
+
+ {{ job.finished | date:'MM/dd/yy HH:mm:ss' }} +
+
+ +
+
ELAPSED
+
+ {{ job.elapsed }} seconds +
+
+ +
+
LAUNCH TYPE
+
+ {{ job.launch_type }} +
+
+ + + +
+
EXTRA VARS
+
+ {{ job.extra_vars }} +
+
+
diff --git a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html index 747bfc9bfc..883d382c20 100644 --- a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html +++ b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html @@ -8,6 +8,15 @@
+
+
NAME
+
+ + {{ project_name }} + +
+
+
STATUS
@@ -16,6 +25,52 @@
+
+
STARTED
+
+ {{ job.started | date:'MM/dd/yy HH:mm:ss' }} +
+
+ +
+
FINISHED
+
+ {{ job.finished | date:'MM/dd/yy HH:mm:ss' }} +
+
+ +
+
ELAPSED
+
+ {{ job.elapsed }} seconds +
+
+ +
+
LAUNCH TYPE
+
+ {{ job.launch_type }} +
+
+ +
+
PROJECT
+
+ + {{ project_name }} + +
+
+ +
+
CREDENTIAL
+
+ + {{ credential_name }} + +
+
+
diff --git a/awx/ui/client/src/standard-out/standard-out.controller.js b/awx/ui/client/src/standard-out/standard-out.controller.js index efca57eeb1..f95eaab1fb 100644 --- a/awx/ui/client/src/standard-out/standard-out.controller.js +++ b/awx/ui/client/src/standard-out/standard-out.controller.js @@ -11,7 +11,7 @@ */ -export function JobStdoutController ($location, $log, $rootScope, $scope, $compile, $state, $stateParams, ClearScope, GetBasePath, Wait, Rest, ProcessErrors, ModelToBasePathKey) { +export function JobStdoutController ($location, $log, $rootScope, $scope, $compile, $state, $stateParams, ClearScope, GetBasePath, Wait, Rest, ProcessErrors, ModelToBasePathKey, Empty, GetChoices, LookUpName) { ClearScope(); @@ -182,6 +182,78 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi $scope.verbosity = data.verbosity; $scope.job_tags = data.job_tags; stdout_url = data.related.stdout; + + // If we have a source then we have to go get the source choices from the server + if (!Empty(data.source)) { + if ($scope.removeChoicesReady) { + $scope.removeChoicesReady(); + } + $scope.removeChoicesReady = $scope.$on('ChoicesReady', function() { + $scope.source_choices.every(function(e) { + if (e.value === data.source) { + $scope.source = e.label; + return false; + } + return true; + }); + }); + // GetChoices can be found in the helper: LogViewer.js + // It attaches the source choices to $scope.source_choices. + // Then, when the callback is fired, $scope.source is bound + // to the corresponding label. + GetChoices({ + scope: $scope, + url: GetBasePath('inventory_sources'), + field: 'source', + variable: 'source_choices', + choice_name: 'choices', + callback: 'ChoicesReady' + }); + } + + // LookUpName can be found in the helper: LogViewer.js + // It attaches the name that it gets (based on the url) + // to the $scope variable defined by the attribute scope_var. + if (!Empty(data.credential)) { + LookUpName({ + scope: $scope, + scope_var: 'credential', + url: GetBasePath('credentials') + data.credential + '/' + }); + } + + if (!Empty(data.inventory)) { + LookUpName({ + scope: $scope, + scope_var: 'inventory', + url: GetBasePath('inventory') + data.inventory + '/' + }); + } + + if (!Empty(data.project)) { + LookUpName({ + scope: $scope, + scope_var: 'project', + url: GetBasePath('projects') + data.project + '/' + }); + } + + if (!Empty(data.cloud_credential)) { + LookUpName({ + scope: $scope, + scope_var: 'cloud_credential', + url: GetBasePath('credentials') + data.cloud_credential + '/' + }); + } + + if (!Empty(data.inventory_source)) { + LookUpName({ + scope: $scope, + scope_var: 'inventory_source', + url: GetBasePath('inventory_sources') + data.inventory_source + '/' + }); + } + // if (data.status === 'successful' || data.status === 'failed' || data.status === 'error' || data.status === 'canceled') { // live_event_processing = false; // if ($rootScope.jobStdOutInterval) { @@ -281,4 +353,4 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi } -JobStdoutController.$inject = [ '$location', '$log', '$rootScope', '$scope', '$compile', '$state', '$stateParams', 'ClearScope', 'GetBasePath', 'Wait', 'Rest', 'ProcessErrors', 'ModelToBasePathKey']; +JobStdoutController.$inject = [ '$location', '$log', '$rootScope', '$scope', '$compile', '$state', '$stateParams', 'ClearScope', 'GetBasePath', 'Wait', 'Rest', 'ProcessErrors', 'ModelToBasePathKey', 'Empty', 'GetChoices', 'LookUpName'];