From 69710366b6ca80ca30e8f3c6a886229708d781c1 Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Wed, 30 Aug 2017 13:30:21 -0400
Subject: [PATCH] Revert capacity bar to display consumed_capacity instead of
 percent_capacity_remaining

---
 .../instance-groups/capacity-bar/capacity-bar.directive.js  | 2 +-
 .../instance-groups/capacity-bar/capacity-bar.partial.html  | 2 +-
 awx/ui/client/src/instance-groups/instance-group.block.less | 2 +-
 awx/ui/client/src/instance-groups/instance-groups.list.js   | 2 +-
 .../instances/instance-jobs/instance-jobs.route.js          | 2 +-
 .../instance-groups/instances/instances-list.partial.html   | 6 +++---
 .../client/src/instance-groups/instances/instances.list.js  | 2 +-
 .../client/src/instance-groups/instances/instances.route.js | 2 +-
 .../instance-groups/list/instance-groups-list.partial.html  | 6 +++---
 .../instance-groups-modal.directive.js                      | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js
index 37fd496349..76dcf08323 100644
--- a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js
+++ b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.directive.js
@@ -8,7 +8,7 @@ export default ['templateUrl',
             restrict: 'E',
             link: function(scope) {
                 scope.$watch('capacity', function() {
-                    scope.PercentRemainingStyle = {
+                    scope.CapacityStyle = {
                         'flex-grow': scope.capacity * 0.01
                     };
                 }, true);
diff --git a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html
index aac4ccd7b0..b1b925fb06 100644
--- a/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html
+++ b/awx/ui/client/src/instance-groups/capacity-bar/capacity-bar.partial.html
@@ -1,4 +1,4 @@
 <div class="CapacityBar">
-    <div class="CapacityBar-remaining" ng-style="PercentRemainingStyle"></div>
+    <div class="CapacityBar-remaining" ng-style="CapacityStyle"></div>
     <div class="CapacityBar-consumed"></div>
 </div>
\ No newline at end of file
diff --git a/awx/ui/client/src/instance-groups/instance-group.block.less b/awx/ui/client/src/instance-groups/instance-group.block.less
index 1feaff9b38..210b124f5d 100644
--- a/awx/ui/client/src/instance-groups/instance-group.block.less
+++ b/awx/ui/client/src/instance-groups/instance-group.block.less
@@ -38,7 +38,7 @@
         }
     }
 
-    .List-tableCell--capacityRemainingColumn {
+    .List-tableCell--capacityColumn {
         display: flex;
         height: 40px;
         align-items: center;
diff --git a/awx/ui/client/src/instance-groups/instance-groups.list.js b/awx/ui/client/src/instance-groups/instance-groups.list.js
index 37eaf0d23d..6d22e6cd39 100644
--- a/awx/ui/client/src/instance-groups/instance-groups.list.js
+++ b/awx/ui/client/src/instance-groups/instance-groups.list.js
@@ -18,7 +18,7 @@ export default ['i18n', function(i18n) {
                 uiSref: 'instanceGroups.instances.list({instance_group_id: instance_group.id})',
                 ngClass: "{'isActive' : isActive()}"
             },
-            percent_capacity_remaining: {
+            consumed_capacity: {
                 label: i18n._('Capacity'),
                 nosort: true,
             },
diff --git a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.route.js b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.route.js
index 73af9259b5..def896523a 100644
--- a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.route.js
+++ b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.route.js
@@ -12,7 +12,7 @@ export default {
             templateUrl: templateUrl('./instance-groups/instances/instance-jobs/instance-jobs'),
             controller: function($scope, $rootScope, instance) {
                 $scope.instanceName = instance.hostname;
-                $scope.instanceCapacity = instance.percent_capacity_remaining;
+                $scope.instanceCapacity = instance.consumed_capacity;
                 $scope.instanceJobsRunning = instance.jobs_running;
                 $rootScope.breadcrumb.instance_name = instance.hostname;
             }
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 aa1f2daef8..0f22e3a447 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
@@ -15,7 +15,7 @@
                         "{{'Name' | translate}}"
                         <i ng-if="columnNoSort !== 'true'" class="fa columnSortIcon fa-sort-up" ng-class="orderByIcon()"></i>
                     </th>
-                    <th id="instance-percent_capacity_remaining-header" class="List-tableHeader list-header  list-header-noSort" translate>
+                    <th id="instance-consumed_capacity-header" class="List-tableHeader list-header  list-header-noSort" translate>
                         Capacity
                     </th>
                     <th id="instance-jobs_running-header" class="List-tableHeader list-header  list-header-noSort" translate>
@@ -28,8 +28,8 @@
                 <tr ng-class="{isActive: isActive(instance.id)}" id="instance.id" class="List-tableRow instance_class ng-scope" ng-repeat="instance in instances">
                     <td class="List-tableCell hostname-column col-md-5 col-sm-5 col-xs-5">
                         <a ui-sref="instanceGroups.instances.list.job.list({instance_id: instance.id})" class="ng-binding">{{ instance.hostname }}</a></td>
-                    <td class="List-tableCell List-tableCell--capacityRemainingColumn ng-binding">
-                        <capacity-bar capacity="instance.percent_capacity_remaining"></capacity-bar><span>{{ instance.percent_capacity_remaining }}%</span>
+                    <td class="List-tableCell List-tableCell--capacityColumn ng-binding">
+                        <capacity-bar capacity="instance.consumed_capacity"></capacity-bar><span>{{ instance.consumed_capacity }}%</span>
                     </td>
                     <td class="List-tableCell jobs_running-column ng-binding">
                         <a ui-sref="instanceGroups.instances.jobs({instance_group_id: $stateParams.instance_group_id})">
diff --git a/awx/ui/client/src/instance-groups/instances/instances.list.js b/awx/ui/client/src/instance-groups/instances/instances.list.js
index b3966884d8..048279d6c8 100644
--- a/awx/ui/client/src/instance-groups/instances/instances.list.js
+++ b/awx/ui/client/src/instance-groups/instances/instances.list.js
@@ -16,7 +16,7 @@ export default ['i18n', function(i18n) {
                 modalColumnClass: 'col-md-8',
                 uiSref: 'instanceGroups.instances.list.job({instance_id: instance.id})'
             },
-            percent_capacity_remaining: {
+            consumed_capacity: {
                 label: i18n._('Capacity'),
                 nosort: true,
             },
diff --git a/awx/ui/client/src/instance-groups/instances/instances.route.js b/awx/ui/client/src/instance-groups/instances/instances.route.js
index 0662052c67..43153cb9fc 100644
--- a/awx/ui/client/src/instance-groups/instances/instances.route.js
+++ b/awx/ui/client/src/instance-groups/instances/instances.route.js
@@ -9,7 +9,7 @@ export default {
             templateUrl: templateUrl('./instance-groups/instance-group'),
             controller: function($scope, $rootScope, instanceGroup) {
                 $scope.instanceGroupName = instanceGroup.name;
-                $scope.instanceGroupCapacity = instanceGroup.percent_capacity_remaining;
+                $scope.instanceGroupCapacity = instanceGroup.consumed_capacity;
                 $scope.instanceGroupJobsRunning = instanceGroup.jobs_running;
                 $rootScope.breadcrumb.instance_group_name = instanceGroup.name;
             }
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 51e9b7976d..476d56b03e 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
@@ -26,7 +26,7 @@
                     "{{'Name' | translate}}"
                     <i ng-if="columnNoSort !== 'true'" class="fa columnSortIcon fa-sort-up" ng-class="orderByIcon()"></i>
                 </th>
-                <th id="instance_group-percent_capacity_remaining-header" class="List-tableHeader list-header list-header-noSort" translate>
+                <th id="instance_group-consumed_capacity-header" class="List-tableHeader list-header list-header-noSort" translate>
                     Capacity
                 </th>
                 <th id="instance_group-jobs_running-header" class="List-tableHeader list-header list-header-noSort" translate>
@@ -41,8 +41,8 @@
                     <a ui-sref="instanceGroups.instances.list({instance_group_id: instance_group.id})" class="ng-binding" >{{ instance_group.name }}</a>
                     <span class="badge List-titleBadge">{{ instance_group.instances }}</span>
                 </td>
-                <td class="List-tableCell List-tableCell--capacityRemainingColumn ng-binding">
-                    <capacity-bar capacity="instance_group.percent_capacity_remaining"></capacity-bar><span>{{ instance_group.percent_capacity_remaining }}%</span>
+                <td class="List-tableCell List-tableCell--capacityColumn ng-binding">
+                    <capacity-bar capacity="instance_group.consumed_capacity"></capacity-bar><span>{{ instance_group.consumed_capacity }}%</span>
                 </td>
                 <td class="List-tableCell jobs_running-column ng-binding">
                     <a ui-sref="instanceGroups.instances.jobs({instance_group_id: instance_group.id})">
diff --git a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js
index 0b579a1135..5a993c8dfe 100644
--- a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js
+++ b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js
@@ -52,7 +52,7 @@ export default ['templateUrl', '$window', function(templateUrl, $window) {
                             };
                             instanceGroupList.fields.name.ngClick = "linkoutInstanceGroup(instance_group)";
                             instanceGroupList.fields.name.columnClass = 'col-md-11 col-sm-11 col-xs-11';
-                            delete instanceGroupList.fields.percent_capacity_remaining;
+                            delete instanceGroupList.fields.consumed_capacity;
                             delete instanceGroupList.fields.jobs_running;
 
                             let html = `${GenerateList.build({