From c8ab4d46239fc467623af5755ea6a81b0d6cb629 Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Wed, 6 Jun 2018 14:52:36 -0400
Subject: [PATCH] Add link to running and total jobs for instance groups and
 instances

---
 .../jobs/routes/instanceGroupJobs.route.js       |  3 +--
 .../features/jobs/routes/instanceJobs.route.js   |  2 +-
 .../lib/components/list/row-item.partial.html    |  2 +-
 .../instance-groups/instance-groups.partial.html |  4 +---
 .../instances/instances-list.partial.html        | 13 ++++++++++---
 .../list/instance-groups-list.partial.html       | 16 +++++++++++-----
 6 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js b/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js
index 7bfda756bc..fe86b78774 100644
--- a/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js
+++ b/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js
@@ -16,8 +16,7 @@ export default {
         job_search: {
             value: {
                 page_size: '10',
-                order_by: '-id',
-                status: 'running'
+                order_by: '-finished'
             },
             dynamic: true
         }
diff --git a/awx/ui/client/features/jobs/routes/instanceJobs.route.js b/awx/ui/client/features/jobs/routes/instanceJobs.route.js
index 06019bcf22..c7ec885e96 100644
--- a/awx/ui/client/features/jobs/routes/instanceJobs.route.js
+++ b/awx/ui/client/features/jobs/routes/instanceJobs.route.js
@@ -9,7 +9,7 @@ export default {
     name: 'instanceGroups.instanceJobs',
     url: '/:instance_group_id/instances/:instance_id/jobs',
     ncyBreadcrumb: {
-        parent: 'instanceGroups.edit',
+        parent: 'instanceGroups.instances',
         label: N_('JOBS')
     },
     views: {
diff --git a/awx/ui/client/lib/components/list/row-item.partial.html b/awx/ui/client/lib/components/list/row-item.partial.html
index 7698ba85a9..6f3306d393 100644
--- a/awx/ui/client/lib/components/list/row-item.partial.html
+++ b/awx/ui/client/lib/components/list/row-item.partial.html
@@ -27,7 +27,7 @@
             {{ labelValue }}
         </div>
         <div class="at-RowItem-label" ng-if="labelValue && labelState">
-            <a ui-sref="{{ labelState }}"  ui-sref-opts="{reload: true, notify: true}">{{ labelValue }}</a>
+            <a ui-sref="{{ labelState }}"  ui-sref-opts="{reload: true, notify: true, inherit: false}">{{ labelValue }}</a>
         </div>
         <div class="at-RowItem-value" ng-if="value && valueLink">
             <a ng-href="{{ valueLink }}">{{ value }}</a>
diff --git a/awx/ui/client/src/instance-groups/instance-groups.partial.html b/awx/ui/client/src/instance-groups/instance-groups.partial.html
index bdc05274b6..562676ffdc 100644
--- a/awx/ui/client/src/instance-groups/instance-groups.partial.html
+++ b/awx/ui/client/src/instance-groups/instance-groups.partial.html
@@ -3,12 +3,10 @@
     <div ui-view="add"></div>
     <div ui-view="edit"></div>
 
-    <div ui-view="instanceJobs"></div>
+    <div ui-view="instanceJobsContainer"></div>
 
     <div ui-view="instances"></div>
 
-    <div ui-view="instanceJobsContainer"></div>
-
     <div ui-view="instanceGroupsJobsContainer"></div>
 
     <div ui-view="list"></div>
diff --git a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
index 01868ef35d..ecb3d8e600 100644
--- a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
+++ b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
@@ -61,17 +61,24 @@
                 <div class="at-Row-items">
                     <at-row-item header-value="{{ instance.hostname }}"></at-row-item>
                     <at-row-item
-                        label-value="Running Jobs"
-                        label-state="instanceGroups.instanceJobs({instance_group_id: {{vm.instance_group_id}}, instance_id: {{instance.id}}})"
+                        label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_RUNNING_JOBS') }}"
+                        label-state="instanceGroups.instanceJobs({instance_group_id: {{vm.instance_group_id}}, instance_id: {{instance.id}}, job_search: {status__in: ['running,waiting']}})"
                         value="{{ instance.jobs_running }}"
                         inline="true"
                         badge="true">
                     </at-row-item>
+                    <at-row-item
+                        label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_TOTAL_JOBS') }}"
+                        label-state="instanceGroups.instanceJobs({instance_group_id: {{vm.instance_group_id}}, instance_id: {{instance.id}}})"
+                        value="{{ instance.jobs_total }}"
+                        inline="true"
+                        badge="true">
+                    </at-row-item>
                 </div>
 
                 <div class="at-Row-actions">
                     <capacity-adjuster state="instance" disabled="{{vm.rowAction.capacity_adjustment._disabled}}"></capacity-adjuster>
-                    <capacity-bar label-value="Used Capacity" capacity="instance.consumed_capacity" total-capacity="instance.capacity"></capacity-bar>
+                    <capacity-bar label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_USED_CAPACITY') }}" capacity="instance.consumed_capacity" total-capacity="instance.capacity"></capacity-bar>
                 </div>
             </at-row>
         </at-list>
diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
index 5aa48b1f29..7e07fb4d5f 100644
--- a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
+++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
@@ -45,25 +45,31 @@
 
                     <div class="at-Row--inline">
                         <at-row-item
-                            label-value="Instances"
+                            label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_INSTANCES') }}"
                             label-link="/#/instance_groups/{{ instance_group.id }}/instances"
                             value="{{ instance_group.instances }}"
                             inline="true"
                             badge="true">
                         </at-row-item>
-
                         <at-row-item
-                            label-value="Running Jobs"
-                            label-link="/#/instance_groups/{{ instance_group.id }}/jobs"
+                            label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_RUNNING_JOBS') }}"
+                            label-state="instanceGroups.jobs({instance_group_id: {{ instance_group.id }}, job_search: {status__in: ['running,waiting']}})"
                             value="{{ instance_group.jobs_running }}"
                             inline="true"
                             badge="true">
                         </at-row-item>
+                        <at-row-item
+                            label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_TOTAL_JOBS') }}"
+                            label-state="instanceGroups.jobs({instance_group_id: {{ instance_group.id }}})"
+                            value="{{ instance_group.jobs_total }}"
+                            inline="true"
+                            badge="true">
+                        </at-row-item>
                     </div>
                 </div>
 
                 <div class="at-Row-actions">
-                    <capacity-bar label-value="Used Capacity" capacity="instance_group.consumed_capacity" total-capacity="instance_group.capacity"></capacity-bar>
+                    <capacity-bar label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_USED_CAPACITY') }}" capacity="instance_group.consumed_capacity" total-capacity="instance_group.capacity"></capacity-bar>
                     <at-row-action icon="fa-trash" ng-click="vm.deleteInstanceGroup(instance_group)" ng-if="vm.rowAction.trash(instance_group)">
                     </at-row-action>
                 </div>