Changing the server name from Quiesced to Standby in header and power operation page
Change-Id: I5a2358fa4783a58d1d6ab73f9901e1f8fa2f54a8
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>
diff --git a/app/common/directives/app-header.html b/app/common/directives/app-header.html
index 4513b92..ff20a6f 100644
--- a/app/common/directives/app-header.html
+++ b/app/common/directives/app-header.html
@@ -17,8 +17,8 @@
<a class="header__info" ng-click="toggle = !toggle"><span>Server Info</span><i class="icon icon-angle" aria-hidden="true"></i></a>
<a href="#/server-health/event-log" class="header__server-health">Server health
<i class="icon icon-angle" aria-hidden="true"></i><span ng-class="{'status-light__error': dataService.server_health == 'Critical', 'status-light__warn': dataService.server_health == 'Warning', 'status-light__good': dataService.server_health == 'Good'}">{{dataService.server_health}}</span></a>
- <a href="#/server-control/power-operations" class="header__server-power" role="button">Server power
- <i class="icon icon-angle" aria-hidden="true"></i><span ng-class="{'status-light__off': dataService.server_state == 'Off', 'status-light__disabled': dataService.server_state == 'Unreachable', 'status-light__good': dataService.server_state == 'Running', 'status-light__warn': dataService.server_state == 'Standby'}">{{dataService.server_state}}</span></a>
+ <a href="#/server-control/power-operations" class="header__server-power" role="button">Server power
+ <i class="icon icon-angle" aria-hidden="true"></i><span ng-class="{'status-light__off': dataService.server_state == 'Off', 'status-light__disabled': dataService.server_state == 'Unreachable', 'status-light__good': dataService.server_state == 'Running', 'status-light__warn': dataService.server_state == 'Quiesced'}">{{dataService.server_state | quiescedToStandBy}}</span></a>
<p class="header__refresh">Data last refreshed<span>{{dataService.last_updated |date:'h:mm:ss MMM dd yyyy'}}</span>
</p>
<button class="header__page-refresh" ng-click="refresh()" aria-label="refresh page data">
diff --git a/app/common/filters/index.js b/app/common/filters/index.js
index 26323fe..c840866 100644
--- a/app/common/filters/index.js
+++ b/app/common/filters/index.js
@@ -10,6 +10,16 @@
});
return data.length;
}
- });
+ })
+ .filter('quiescedToStandBy', function () {
+ return function (state) {
+ if(state.toLowerCase() == 'quiesced'){
+ return 'Standby';
+ }else{
+ return state;
+ }
+ }
+ })
+ ;
})(window.angular);
diff --git a/app/server-control/controllers/power-operations-controller.html b/app/server-control/controllers/power-operations-controller.html
index b41df07..7a872f5 100644
--- a/app/server-control/controllers/power-operations-controller.html
+++ b/app/server-control/controllers/power-operations-controller.html
@@ -1,3 +1,4 @@
+<loader loading="dataService.loading"></loader>
<div id="power-operations">
<div class="row column">
@@ -10,7 +11,7 @@
<div class="row column">
<div id="power-indicator-bar" class="power__indicator-bar" ng-class="{'power__state-on': dataService.server_state == 'Running', 'power__state-off': dataService.server_state == 'Off', 'power__state-indet': dataService.server_state == 'Standby'}">
<p class="inline">{{dataService.hostname}} - {{dataService.server_id}}</p>
- <h3 class="power__state inline no-margin h3"><span>{{dataService.server_state}}</span></h3>
+ <h3 class="power__state inline no-margin h3"><span>{{dataService.server_state | quiescedToStandBy}}</span></h3>
</div>
</div>
<div class="row column">
@@ -19,7 +20,7 @@
</div>
<!-- Power on displays only when server is shutdown -->
- <div class="row column power-option" ng-hide="dataService.server_state == 'Running' || dataService.server_state == 'Standby'" ng-class="{disabled: dataService.server_unreachable || (confirm && !power_confirm) || dataService.loading, transitionAll: confirm && power_confirm}">
+ <div class="row column power-option" ng-hide="dataService.server_state == 'Running' || dataService.server_state == 'Quiesced'" ng-class="{disabled: dataService.server_unreachable || (confirm && !power_confirm) || dataService.loading, transitionAll: confirm && power_confirm}">
<button id="power__power-on" class="btn-secondary inline" ng-click="togglePower()" role="button" ng-disabled="dataService.server_unreachable"><img src="assets/images/icon-power.svg" alt="power on" aria-hidden="true">Power on</button>
<p class="inline">Attempts to power on the server</p>
</div>