Merge pull request #4097 from jaredevantabor/projects

Adding project updates to job details, along w/ revision

awx/ui/client/legacy-styles/lists.less

@@ -328,6 +328,10 @@ table, tbody {
     padding-left: 10px!important;
 }
 
+.List-staticColumnAdjacent--monospace {
+    font-family: monospace;
+}
+
 .List-titleLockup {
     margin-left: 4px;
     margin-right: 6px;

awx/ui/client/src/job-results/job-results.block.less

@@ -94,6 +94,10 @@
     width: 100%;
 }
 
+.JobResults-resultRowText--revision{
+    font-family: monospace;
+}
+
 .JobResults-statusResultIcon {
     padding-left: 0px;
     padding-right: 10px;

awx/ui/client/src/job-results/job-results.controller.js

@@ -46,6 +46,14 @@ export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count'
     $scope.jobOptions = jobDataOptions.actions.GET;
     $scope.labels = jobLabels;
     $scope.jobFinished = jobFinished;
+    if(jobData.summary_fields && jobData.summary_fields.project_update &&
+        jobData.summary_fields.project_update.status){
+         $scope.project_status = jobData.summary_fields.project_update.status;
+    }
+    if(jobData.summary_fields && jobData.summary_fields.project_update &&
+        jobData.summary_fields.project_update.id){
+        $scope.project_update_link = `/#/scm_update/${jobData.summary_fields.project_update.id}`;
+    }
 
     // turn related api browser routes into tower routes
     getTowerLinks();
@@ -198,5 +206,9 @@ export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count'
         if (parseInt(data.unified_job_id, 10) === parseInt($scope.job.id,10)) {
             $scope.job.status = data.status;
         }
+        if (parseInt(data.project_id, 10) === parseInt($scope.job.project,10)) {
+            $scope.project_status = data.status;
+            $scope.project_update_link = `/#/scm_update/${data.unified_job_id}`;
+        }
     });
 }];

awx/ui/client/src/job-results/job-results.partial.html

@@ -148,6 +148,13 @@
                             Project
                         </label>
                         <div class="JobResults-resultRowText">
+                            <a href="{{ project_update_link }}"
+                                aw-tool-tip="View project sync results"
+                                data-placement="top">
+                                <i class="JobResults-statusResultIcon
+                                    fa icon-job-{{ project_status }}">
+                                </i>
+                            </a>
                             <a href="{{ project_link }}"
                                 aw-tool-tip="Edit the project"
                                 data-placement="top">
@@ -156,6 +163,17 @@
                         </div>
                     </div>
 
+                    <!-- REVISION DETAIL -->
+                    <div class="JobResults-resultRow"
+                        ng-show="job.scm_revision">
+                        <label class="JobResults-resultRowLabel">
+                            Revision
+                        </label>
+                        <div class="JobResults-resultRowText JobResults-resultRowText--revision">
+                            {{ job.scm_revision }}
+                        </div>
+                    </div>
+
                     <!-- PLAYBOOK DETAIL -->
                     <div class="JobResults-resultRow"
                         ng-show="job.playbook">

awx/ui/client/src/lists/Projects.js

@@ -38,6 +38,12 @@ export default
                 columnClass: "col-lg-4 col-md-4 col-sm-5 col-xs-7 List-staticColumnAdjacent",
                 modalColumnClass: 'col-md-8'
             },
+            scm_revision: {
+                label: i18n._('Revision'),
+                excludeModal: true,
+                columnClass: 'col-lg-3 col-md-2 col-sm-3 hidden-xs',
+                class: 'List-staticColumnAdjacent--monospace'
+            },
             scm_type: {
                 label: i18n._('Type'),
                 excludeModal: true,