Merge pull request #1439 from jlmitch5/fixInstanceGroupsRunningJobs

update instance groups to only be running jobs

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.')
     };
 }
 

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'));
 

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">

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
         }

awx/ui/client/lib/components/list/list.directive.js

@@ -20,6 +20,7 @@ function atList () {
         templateUrl,
         scope: {
             results: '=',
+            emptyListReason: '@'
         },
         link: atListLink,
         controller: AtListController,