Adding new button 'Normal' in sensors page
- Adding a 3rd option called Normal in
addition to Critical and Warning based on the
discussion in openbmc/openbmc#2750
Fixes openbmc/openbmc#2750
Tested: Verified the 'Normal' button works.
Change-Id: Ied4d37aa9284392f08818f8111ebbcc677234586
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/app/server-health/controllers/sensors-overview-controller.html b/app/server-health/controllers/sensors-overview-controller.html
index d0abfe9..8137b84 100644
--- a/app/server-health/controllers/sensors-overview-controller.html
+++ b/app/server-health/controllers/sensors-overview-controller.html
@@ -32,6 +32,9 @@
<button class="inline" ng-click="toggleSeverity('warning')"
ng-class="selectedSeverity.warning ? 'btn-primary' : 'btn-secondary'">Warning
</button>
+ <button class="inline" ng-click="toggleSeverity('normal')"
+ ng-class="selectedSeverity.normal ? 'btn-primary' : 'btn-secondary'">Normal
+ </button>
</div>
</section> <!-- end search -->
@@ -41,6 +44,7 @@
<span ng-if="selectedSeverity.all">{{messages.NO_SENSOR_DATA}}</span>
<span ng-if="selectedSeverity.critical">{{messages.CRITICAL_NO_SENSOR_DATA}}</span>
<span ng-if="selectedSeverity.warning">{{messages.WARNING_NO_SENSOR_DATA}}</span>
+ <span ng-if="selectedSeverity.normal">{{messages.NORMAL_NO_SENSOR_DATA}}</span>
<!-- end message -->
</section>
diff --git a/app/server-health/controllers/sensors-overview-controller.js b/app/server-health/controllers/sensors-overview-controller.js
index 04502ca..bd86833 100644
--- a/app/server-health/controllers/sensors-overview-controller.js
+++ b/app/server-health/controllers/sensors-overview-controller.js
@@ -75,6 +75,7 @@
$scope.selectedSeverity.all = !$scope.selectedSeverity.all;
if($scope.selectedSeverity.all){
+ $scope.selectedSeverity.normal = false;
$scope.selectedSeverity.warning = false;
$scope.selectedSeverity.critical = false;
}
@@ -83,9 +84,10 @@
$scope.toggleSeverity = function(severity){
$scope.selectedSeverity[severity] = !$scope.selectedSeverity[severity];
- if(['warning', 'critical'].indexOf(severity) > -1){
+ if(['normal', 'warning', 'critical'].indexOf(severity) > -1){
if($scope.selectedSeverity[severity] == false &&
- (!$scope.selectedSeverity.warning &&
+ (!$scope.selectedSeverity.normal &&
+ !$scope.selectedSeverity.warning &&
!$scope.selectedSeverity.critical
)){
$scope.selectedSeverity.all = true;
@@ -93,9 +95,11 @@
}
}
- if($scope.selectedSeverity.warning &&
+ if($scope.selectedSeverity.normal &&
+ $scope.selectedSeverity.warning &&
$scope.selectedSeverity.critical){
$scope.selectedSeverity.all = true;
+ $scope.selectedSeverity.normal = false;
$scope.selectedSeverity.warning = false;
$scope.selectedSeverity.critical = false;
}else{
diff --git a/app/server-health/styles/sensors.scss b/app/server-health/styles/sensors.scss
index 522c65e..fa44a46 100644
--- a/app/server-health/styles/sensors.scss
+++ b/app/server-health/styles/sensors.scss
@@ -140,7 +140,7 @@
.content__search {
max-width: 100%;
@media(min-width: 1300px) {
- max-width: 70%;
+ max-width: 59%;
}
}
.toggle-filter {