From 1f2ecf4e0c5ccc042baad6970f8848cd1da2fbca Mon Sep 17 00:00:00 2001
From: Leigh Johnson <ljohnson@redhat.com>
Date: Wed, 20 Apr 2016 09:57:22 -0400
Subject: [PATCH] reduce duplication in JobDetailService, use strict equiv
 checks where possible

---
 .../host-summary/host-summary.partial.html    |  4 +--
 .../src/job-detail/job-detail.service.js      | 36 +++++--------------
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/awx/ui/client/src/job-detail/host-summary/host-summary.partial.html b/awx/ui/client/src/job-detail/host-summary/host-summary.partial.html
index f20aff88e4..84d3b3aba5 100644
--- a/awx/ui/client/src/job-detail/host-summary/host-summary.partial.html
+++ b/awx/ui/client/src/job-detail/host-summary/host-summary.partial.html
@@ -14,9 +14,9 @@
             <div class="btn-group" >
                 <button 
                 ng-click="setFilter('all')"
-                class="JobDetail-tableToggle btn btn-xs" ng-class="{'btn-default': filter == 'failed', 'btn-primary': filter == 'all'}">All</button>
+                class="JobDetail-tableToggle btn btn-xs" ng-class="{'btn-default': filter === 'failed', 'btn-primary': filter === 'all'}">All</button>
                 <button ng-click="setFilter('failed')"
-                ng-class="{'btn-default': filter == 'all', 'btn-primary': filter == 'failed'}" ng-disabled='count.failures == 0' class="JobDetail-tableToggle btn btn-xs">Failed</button>
+                ng-class="{'btn-default': filter === 'all', 'btn-primary': filter === 'failed'}" ng-disabled='count.failures == 0' class="JobDetail-tableToggle btn btn-xs">Failed</button>
             </div>
         </div>
     </div>
diff --git a/awx/ui/client/src/job-detail/job-detail.service.js b/awx/ui/client/src/job-detail/job-detail.service.js
index b9ad44ff61..b50d14630b 100644
--- a/awx/ui/client/src/job-detail/job-detail.service.js
+++ b/awx/ui/client/src/job-detail/job-detail.service.js
@@ -2,13 +2,10 @@ export default
     ['$rootScope', 'Rest', 'GetBasePath', 'ProcessErrors', function($rootScope, Rest, GetBasePath, ProcessErrors){
         return {
 
-        /* 
-        * For ES6 
-        * it might be useful to set some default params here, e.g.
-        * getJobHostSummaries: function(id, page_size=200, order='host_name'){}
-        * without ES6, we'd have to supply defaults like this:
-        * this.page_size = params.page_size ? params.page_size : 200;
-        */
+        stringifyParams: function(params){
+            return  _.reduce(params, (result, value, key) => {
+                return result + key + '=' + value + '&'}, '');
+        },
 
         // the the API passes through Ansible's event_data response
         // we need to massage away the verbose and redundant properties
@@ -129,10 +126,7 @@ export default
         // ?parent=206&event__startswith=runner&page_size=200&order=host_name,counter
         getRelatedJobEvents: function(id, params){
             var url = GetBasePath('jobs');
-            url = url + id + '/job_events/?' +
-                 _.reduce(params, (result, value, key) => {
-                return result + key + '=' + value + '&'
-                }, '');
+            url = url + id + '/job_events/?' + this.stringifyParams(params);
             Rest.setUrl(url);
             return Rest.get()
                 .success(function(data){
@@ -160,10 +154,7 @@ export default
         // e.g. ?page_size=200&order=host_name
         getJobHostSummaries: function(id, params){
             var url = GetBasePath('jobs');
-            url = url + id + '/job_host_summaries/?' + 
-                _.reduce(params, (result, value, key) => {
-                return result + key + '=' + value + '&'
-                }, '');
+            url = url + id + '/job_host_summaries/?' + this.stringifyParams(params);
             Rest.setUrl(url);
             return Rest.get()
                 .success(function(data){
@@ -178,10 +169,7 @@ export default
         // e.g. ?page_size=200
         getJobPlays: function(id, params){
             var url = GetBasePath('jobs');
-            url = url + id + '/job_plays/?' + 
-                _.reduce(params, (result, value, key) => {
-                return result + key + '=' + value + '&'
-                }, '');
+            url = url + id + '/job_plays/?' + this.stringifyParams(params);
             Rest.setUrl(url);
             return Rest.get()
                 .success(function(data){
@@ -194,10 +182,7 @@ export default
         },
         getJobTasks: function(id, params){
             var url = GetBasePath('jobs');
-            url = url + id + '/job_tasks/?' + 
-                _.reduce(params, (result, value, key) => {
-                return result + key + '=' + value + '&'
-                }, '');
+            url = url + id + '/job_tasks/?' + this.stringifyParams(params);
             Rest.setUrl(url);
             return Rest.get()
                 .success(function(data){
@@ -209,10 +194,7 @@ export default
                 });                 
         },
         getJob: function(params){
-            var url = GetBasePath('unified_jobs') + '?'; +
-                 _.reduce(params, (result, value, key) => {
-                return result + key + '=' + value + '&'
-                }, '');
+            var url = GetBasePath('unified_jobs') + '?' + this.stringifyParams(params);
             Rest.setUrl(url);
             return Rest.get()
                 .success(function(data){