From b042beeef76d20dc78ac6ee46c78ea6c4504d2e5 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 19 Apr 2018 18:15:35 -0400
Subject: [PATCH] update instance groups to only be running jobs

---
 awx/ui/client/features/jobs/jobs.strings.js                   | 1 +
 awx/ui/client/features/jobs/jobsList.controller.js            | 4 ++++
 awx/ui/client/features/jobs/jobsList.view.html                | 2 +-
 awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js | 3 ++-
 awx/ui/client/lib/components/list/list.directive.js           | 1 +
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/features/jobs/jobs.strings.js b/awx/ui/client/features/jobs/jobs.strings.js
index 703b771219..a902cc4109 100644
--- a/awx/ui/client/features/jobs/jobs.strings.js
+++ b/awx/ui/client/features/jobs/jobs.strings.js
@@ -13,6 +13,7 @@ function JobsStrings (BaseString) {
         ROW_ITEM_LABEL_INVENTORY: t.s('Inventory'),
         ROW_ITEM_LABEL_PROJECT: t.s('Project'),
         ROW_ITEM_LABEL_CREDENTIALS: t.s('Credentials'),
+        NO_RUNNING: t.s('There are no running jobs.')
     };
 }
 
diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js
index d64e1870a5..6715c84e99 100644
--- a/awx/ui/client/features/jobs/jobsList.controller.js
+++ b/awx/ui/client/features/jobs/jobsList.controller.js
@@ -44,6 +44,10 @@ function ListJobsController (
             });
     });
 
+    if ($state.includes('instanceGroups')) {
+        vm.emptyListReason = strings.get('list.NO_RUNNING');
+    }
+
     vm.jobTypes = mapChoices(unifiedJob
         .options('actions.GET.type.choices'));
 
diff --git a/awx/ui/client/features/jobs/jobsList.view.html b/awx/ui/client/features/jobs/jobsList.view.html
index e9325b18f1..5a01cf4f28 100644
--- a/awx/ui/client/features/jobs/jobsList.view.html
+++ b/awx/ui/client/features/jobs/jobsList.view.html
@@ -12,7 +12,7 @@
             query-set="querySet">
         </smart-search>
     </div>
-    <at-list results="jobs">
+    <at-list results="jobs" empty-list-reason="{{ vm.emptyListReason }}">
         <!-- TODO: implement resources are missing red indicator as present in mockup -->
         <at-row ng-repeat="job in jobs" job-id="{{ job.id }}">
             <div class="at-Row-items">
diff --git a/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js b/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js
index fe86b78774..7bfda756bc 100644
--- a/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js
+++ b/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js
@@ -16,7 +16,8 @@ export default {
         job_search: {
             value: {
                 page_size: '10',
-                order_by: '-finished'
+                order_by: '-id',
+                status: 'running'
             },
             dynamic: true
         }
diff --git a/awx/ui/client/lib/components/list/list.directive.js b/awx/ui/client/lib/components/list/list.directive.js
index 6ff88e506f..7c6a1c1adc 100644
--- a/awx/ui/client/lib/components/list/list.directive.js
+++ b/awx/ui/client/lib/components/list/list.directive.js
@@ -20,6 +20,7 @@ function atList () {
         templateUrl,
         scope: {
             results: '=',
+            emptyListReason: '@'
         },
         link: atListLink,
         controller: AtListController,