From 7cf29c68a1b2428112040c9e1cabfc610268a63f Mon Sep 17 00:00:00 2001
From: Ankush Behl <cloudbehl@gmail.com>
Date: Mon, 9 Oct 2017 13:51:47 +0530
Subject: [PATCH] Bug Fixes tendrl-bug-id's: #660, #659, #658, #654, #651,
 #656, #669, https://github.com/Tendrl/gluster-integration/issues/405

---
 src/commons/scss/_base.scss                    |  4 ++--
 src/commons/stores/brick-store.js              | 13 +++++++++----
 src/commons/stores/cluster-store.js            |  2 +-
 src/commons/stores/node-store.js               |  1 +
 src/commons/stores/volume-store.js             |  2 +-
 .../bricks/host-bricks/host-bricks.html        |  4 ++--
 .../bricks/host-bricks/host-bricks.scss        |  4 ++--
 .../bricks/volume-bricks/volume-bricks.html    |  2 +-
 .../clusters/cluster-list/cluster-list.html    | 18 +++++-------------
 .../clusters/cluster-list/cluster-list.scss    |  8 +++++++-
 .../import-cluster/import-cluster.html         |  2 +-
 src/modules/hosts/host-list/host-list.html     | 10 +++++-----
 src/modules/hosts/host-list/host-list.scss     |  4 ++--
 src/modules/tasks/task-list/tasks.html         |  2 +-
 .../volumes/volume-list/volume-list.html       |  6 +++---
 .../volumes/volume-list/volume-list.scss       |  4 ++--
 16 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/src/commons/scss/_base.scss b/src/commons/scss/_base.scss
index 4641c3e7..5fbf991a 100644
--- a/src/commons/scss/_base.scss
+++ b/src/commons/scss/_base.scss
@@ -113,9 +113,9 @@
             display: flex;
             flex-direction: row;
             flex-wrap: nowrap;
-            justify-content: space-between;
+            justify-content: space-evenly;
             .btn {
-                width: 90px;
+                /*width: 90px;*/
                 white-space: nowrap;
                 overflow: hidden;
                 text-overflow: ellipsis;
diff --git a/src/commons/stores/brick-store.js b/src/commons/stores/brick-store.js
index 4866ddf1..c5d9513c 100644
--- a/src/commons/stores/brick-store.js
+++ b/src/commons/stores/brick-store.js
@@ -94,14 +94,19 @@
             function _calcUtilization(bricks) {
                 var len = bricks.length,
                     utilization = { used: 0, total: 0 },
-                    i;
+                    i,
+                    percent_used,
+                    used,
+                    total;
 
                 for (i = 0; i < len; i++) {
-                    utilization.used += parseFloat(bricks[i].utilization.used);
+                    used = parseFloat(bricks[i].utilization.used);
+                    total = parseFloat(bricks[i].utilization.total);
+                    utilization.used += (used * total) / 100;
                     utilization.total += parseFloat(bricks[i].utilization.total);
                 }
-
-                utilization.used = utilization.used.toFixed(2);
+                percent_used = (utilization.used / utilization.total) * 100;
+                utilization.used = percent_used.toFixed(2);
                 utilization.total = utilization.total;
 
                 return utilization;
diff --git a/src/commons/stores/cluster-store.js b/src/commons/stores/cluster-store.js
index f5b85e77..653afc92 100644
--- a/src/commons/stores/cluster-store.js
+++ b/src/commons/stores/cluster-store.js
@@ -111,7 +111,7 @@
          */
         store.importCluster = function(cluster, enableProfiling) {
             var requestData = {
-                    "Cluster.enable_volume_profiling": enableProfiling ? "yes" : "no"
+                    "enable_volume_profiling": enableProfiling ? "yes" : "no"
                 },
                 deferred;
 
diff --git a/src/commons/stores/node-store.js b/src/commons/stores/node-store.js
index 8bf4df91..986cfc21 100644
--- a/src/commons/stores/node-store.js
+++ b/src/commons/stores/node-store.js
@@ -95,6 +95,7 @@
                     host.role = store.findRole(list[i].tags).role;
                     host.integrationId = list[i].cluster.integration_id;
                     host.managed = _getManagedState(clusters, host);
+                    host.alerts = list[i].alerts ? list[i].alerts : 0;
 
                     hostList.push(host);
                 }
diff --git a/src/commons/stores/volume-store.js b/src/commons/stores/volume-store.js
index 80ed5d96..e6dd5d26 100644
--- a/src/commons/stores/volume-store.js
+++ b/src/commons/stores/volume-store.js
@@ -46,7 +46,7 @@
                     temp.clusterId = data[i].cluster_id;
                     temp.rebalStatus = data[i].rebal_status;
                     temp.brickCount = data[i].brick_count;
-                    temp.alertCount = data[i].alert_count;
+                    temp.alertCount = data[i].alert_count ? data[i].alert_count : 0;
                     volumeList.push(temp);
                 }
                 return volumeList;
diff --git a/src/modules/bricks/host-bricks/host-bricks.html b/src/modules/bricks/host-bricks/host-bricks.html
index 7bbd1b04..b8ab7ee9 100644
--- a/src/modules/bricks/host-bricks/host-bricks.html
+++ b/src/modules/bricks/host-bricks/host-bricks.html
@@ -52,7 +52,7 @@ <h1>No Bricks Detected.</h1>
             <div class="ft-row list-group-item ft-header">
                 <div class="ft-column">Volume</div>
                 <div class="ft-column">Brick Path</div>
-                <div class="ft-column ft-main">Utilisation</div>
+                <div class="ft-column ft-main">Utilization</div>
                 <div class="ft-column">Devices</div>
                 <div class="ft-column">Port</div>
                 <div class="ft-column ft-actions"></div>
@@ -74,7 +74,7 @@ <h1>No Bricks Detected.</h1>
                     {{brick.port}}
                 </div>
                 <div class="ft-column ft-actions">
-                    <button class="btn btn-default launch-btn" ng-click="vm.redirectToGrafana(brick, $event)" uib-tooltip="Launch Dashboard" tooltip-placement="auto bottom-left">Launch Dashboard</button>
+                    <button class="btn btn-default launch-btn" ng-click="vm.redirectToGrafana(brick, $event)" tooltip-placement="auto bottom-left">Dashboard</button>
                 </div>
             </div>
         </div>
diff --git a/src/modules/bricks/host-bricks/host-bricks.scss b/src/modules/bricks/host-bricks/host-bricks.scss
index 131647ea..1904a301 100644
--- a/src/modules/bricks/host-bricks/host-bricks.scss
+++ b/src/modules/bricks/host-bricks/host-bricks.scss
@@ -7,9 +7,9 @@
                 margin-right: 4px;
             }
             &.ft-actions {
-                .launch-btn {
+                /*.launch-btn {
                     width: 125px;
-                }
+                }*/
             }
             &.ft-main {
                 flex-grow: 1.5;
diff --git a/src/modules/bricks/volume-bricks/volume-bricks.html b/src/modules/bricks/volume-bricks/volume-bricks.html
index 02a5b05f..119a767f 100644
--- a/src/modules/bricks/volume-bricks/volume-bricks.html
+++ b/src/modules/bricks/volume-bricks/volume-bricks.html
@@ -107,7 +107,7 @@ <h1>No Bricks Detected.</h1>
                         <div class="list-group list-view-pf list-view-pf-view " ng-repeat="brick in subVolume.bricks | orderBy: 'fqdn'">
                             <div class="list-group-item">
                                 <div class="list-view-pf-actions">
-                                    <button class="btn btn-default" ng-click="vm.redirectToGrafana(brick, $event)">Launch Dashboard</button>
+                                    <button class="btn btn-default" ng-click="vm.redirectToGrafana(brick, $event)">Dashboard</button>
                                 </div>
                                 <div class="list-view-pf-main-info">
                                     <div class="list-view-pf-body">
diff --git a/src/modules/clusters/cluster-list/cluster-list.html b/src/modules/clusters/cluster-list/cluster-list.html
index 4d77af38..309ea71b 100644
--- a/src/modules/clusters/cluster-list/cluster-list.html
+++ b/src/modules/clusters/cluster-list/cluster-list.html
@@ -67,18 +67,10 @@ <h1>No Clusters Detected.</h1>
                     <span class="fa fa-angle-down" ng-show="cluster.isExpanded" ng-click="clusterCntrl.expandCluster($event, cluster)"></span>
                 </div>
                 <div class="list-view-pf-actions">
-                    <button class="btn btn-default" ng-click="clusterCntrl.goToClusterDetail(cluster)" ng-class="{'hide-button': cluster.managed !== 'Yes'}">Cluster Details</button>
-                    <button class="btn btn-default import-btn" ng-show="cluster.managed === 'No'" ng-disabled="cluster.message === 'Cluster Misconfigured' || cluster.importStatus === 'in_progress'" ng-click="clusterCntrl.goToImportFlow(cluster)" ng-class="{'hide-button': ($root.userRole ==='limited' || cluster.managed !== 'No')}">Import Cluster</button>
-                    <button class="btn btn-default" ng-show="cluster.managed === 'Yes'" ng-click="clusterCntrl.redirectToGrafana(cluster, $event)">Launch Dashboard</button>
-                    <div class="dropdown pull-right dropdown-kebab-pf" ng-class="{'hide-button': (cluster.managed !== 'Yes' || $root.userRole === 'limited')}">
-                        <button class="btn btn-link dropdown-toggle" type="button" id="dropdownKebabRight12" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" ng-click="clusterCntrl.showKababMenu($event, cluster)">
-                            <span class="fa fa-ellipsis-v"></span>
-                        </button>
-                        <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownKebabRight12" ng-class="{display: cluster.isKababOpened}">
-                            <li><a ng-show="cluster.isProfilingEnabled === 'Enabled'" ng-click="clusterCntrl.doProfilingAction($event, cluster, 'Disable', cluster.clusterId)">Disable Profiling</a></li>
-                            <li><a ng-show="cluster.isProfilingEnabled !== 'Enabled'" ng-click="clusterCntrl.doProfilingAction($event, cluster, 'Enable',  cluster.clusterId)">Enable Profiling</a></li>
-                        </ul>
-                    </div>
+                    <button class="btn btn-default" ng-click="clusterCntrl.goToClusterDetail(cluster)" ng-class="{'hide-button': cluster.managed !== 'Yes'}">Details</button>
+                    <button class="btn btn-default import-btn" ng-show="cluster.managed === 'No'" ng-disabled="cluster.message === 'Cluster Misconfigured' || cluster.importStatus === 'in_progress'" ng-click="clusterCntrl.goToImportFlow(cluster)" ng-class="{'hide-button': ($root.userRole ==='limited' || cluster.managed !== 'No')}">Import</button>
+                    <button class="btn btn-default" ng-show="cluster.managed === 'Yes'" ng-click="clusterCntrl.redirectToGrafana(cluster, $event)">Dashboard</button>
+                    <button class="btn btn-default" ng-class="{'hide-button': (cluster.managed !== 'Yes' || $root.userRole === 'limited')}" ng-show="cluster.managed === 'Yes'" ng-click="clusterCntrl.doProfilingAction($event, cluster, cluster.isProfilingEnabled === 'Enabled' ? 'Disable' : 'Enable', cluster.clusterId)">{{cluster.isProfilingEnabled === 'Enabled' ? "Disable Profiling" : "Enable Profiling"}}</button>
                 </div>
                 <div class="list-view-pf-main-info">
                     <div class="list-view-pf-left">
@@ -103,7 +95,7 @@ <h5 class="pull-left counts">{{cluster.sdsName}} {{cluster.sdsVersion}}</h5>
                                 <h5 class="pull-left counts">{{cluster.managed}}</h5>
                             </div>
                             <div class="list-view-pf-additional-info-item list-view-pf-additional-info-item-stacked">
-                                <div class="bold-text">Volume Profile</div>
+                                <div class="bold-text">Volume Profiling</div>
                                 <h5 class="pull-left counts">{{cluster.isProfilingEnabled}}</h5>
                             </div>
                         </div>
diff --git a/src/modules/clusters/cluster-list/cluster-list.scss b/src/modules/clusters/cluster-list/cluster-list.scss
index c175ea1d..e2806682 100644
--- a/src/modules/clusters/cluster-list/cluster-list.scss
+++ b/src/modules/clusters/cluster-list/cluster-list.scss
@@ -59,9 +59,15 @@
                 .display {
                     display: block;
                 }
-                .btn-default {
+                /*.btn-default {
                     width: 124px;
                     overflow: hidden;
+                }*/
+                .btn {
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    margin-left: 5px;
                 }
             }
             .list-view-pf-main-info {
diff --git a/src/modules/clusters/import-cluster/import-cluster.html b/src/modules/clusters/import-cluster/import-cluster.html
index 1ff1c125..1123ab02 100644
--- a/src/modules/clusters/import-cluster/import-cluster.html
+++ b/src/modules/clusters/import-cluster/import-cluster.html
@@ -98,7 +98,7 @@ <h1><label>Import Cluster Task Submitted</label></h1>
             <small> An import cluster task has been submitted. You will be notified when processing is complete and the cluster is ready for use. </small>
         </div>
         <div class="blank-slate-pf-main-action">
-            <button class="btn btn-default btn-lg" ng-click="vm.importCancel()">Return</button>
+            <button class="btn btn-default btn-lg" ng-click="vm.importCancel()">Close</button>
             <button class="btn btn-primary btn-lg cancel-button" ng-click="vm.viewTaskProgress()">View Task Progress</button>
         </div>
     </div>
diff --git a/src/modules/hosts/host-list/host-list.html b/src/modules/hosts/host-list/host-list.html
index 26cda62b..b7095912 100644
--- a/src/modules/hosts/host-list/host-list.html
+++ b/src/modules/hosts/host-list/host-list.html
@@ -5,7 +5,7 @@
         <h1 class="bold-text">Hosts</h1>
         <!-- Actions section -->
         <div class="row toolbar-pf">
-            <div class="col-sm-12">
+            <div class="col-md-12">
                 <form class="toolbar-pf-actions">
                     <div class="form-group toolbar-pf-filter">
                         <label class="sr-only" for="filter">Name</label>
@@ -70,7 +70,7 @@ <h1>No Hosts Detected.</h1>
                 <div class="ft-column ft-main host-name bold-text" uib-tooltip-html="'{{host.name}}'" tooltip-placement="auto bottom-left">{{host.name}}</div>
                 <div class="ft-column list-view-pf-additional-info-item list-view-pf-additional-info-item-stacked">
                     <div class="bold-text">Cluster</div>
-                    <div class="pull-left cluster-name" uib-tooltip-html="'{{host.cluster_name}}'" tooltip-placement="auto bottom-left">{{host.cluster_name || "NA"}}</div>
+                    <div class="pull-left cluster-name" uib-tooltip-html="'{{host.cluster_name}}'" tooltip-placement="auto bottom-left">{{host.cluster_name || "None"}}</div>
                 </div>
                 <div class="ft-column list-view-pf-additional-info-item list-view-pf-additional-info-item-stacked">
                     <div class="bold-text">Role</div>
@@ -78,11 +78,11 @@ <h1>No Hosts Detected.</h1>
                 </div>
                 <div class="ft-column list-view-pf-additional-info-item list-view-pf-additional-info-item-stacked">
                     <div class="bold-text">Alerts</div>
-                    <div class="pull-left counts">{{host.alerts || "NA"}}</div>
+                    <div class="pull-left counts">{{host.alerts}}</div>
                 </div>
                 <div class="ft-column ft-actions">
-                    <button class="btn btn-default" ng-click="hostCntrl.goToHostDetail(host)" uib-tooltip="Host Details" tooltip-placement="auto bottom-left" ng-show="hostCntrl.showDetailBtn">Host Details</button>
-                    <button ng-show ="host.role !== 'Tendrl Server'" class="btn btn-default dashboard-btn" uib-tooltip="Launch Dashboard" tooltip-placement="auto bottom-left" ng-click="hostCntrl.redirectToGrafana(host, $event)" ng-disabled="host.managed !== 'Yes'">Launch Dashboard</button>
+                    <button class="btn btn-default" ng-click="hostCntrl.goToHostDetail(host)" ng-show="hostCntrl.showDetailBtn">Details</button>
+                    <button ng-show ="host.role !== 'Tendrl Server'" class="btn btn-default dashboard-btn" ng-click="hostCntrl.redirectToGrafana(host, $event)" ng-disabled="host.managed !== 'Yes'">Dashboard</button>
                 </div>
             </div>
         </div>
diff --git a/src/modules/hosts/host-list/host-list.scss b/src/modules/hosts/host-list/host-list.scss
index b34d2851..dad3ff0b 100644
--- a/src/modules/hosts/host-list/host-list.scss
+++ b/src/modules/hosts/host-list/host-list.scss
@@ -25,9 +25,9 @@
             }
 
             &.ft-actions {
-                .dashboard-btn {
+                /*.dashboard-btn {
                     width: 125px;
-                }
+                }*/
             }
         }
     }
diff --git a/src/modules/tasks/task-list/tasks.html b/src/modules/tasks/task-list/tasks.html
index f1016a9e..cd54f7ad 100644
--- a/src/modules/tasks/task-list/tasks.html
+++ b/src/modules/tasks/task-list/tasks.html
@@ -73,7 +73,7 @@ <h1>No Tasks Detected.</h1>
     </center>
     <div ng-if="taskCntrl.isDataLoading" class="spinner spinner-lg"></div>
     <div class="flex-table list-group list-view-pf list-view-pf-view task-list-table" ng-show="!taskCntrl.isDataLoading">
-        <div class="ft-row list-group-item" ng-repeat="task in taskCntrl.filteredTaskList = (taskCntrl.taskList | filter: taskCntrl.searchBy | filter:taskCntrl.filterByStatus | filter: taskCntrl.filterByCreatedDate| orderBy: ['-created_at', 'job_id'])" ">
+        <div class="ft-row list-group-item" ng-repeat="task in taskCntrl.filteredTaskList = (taskCntrl.taskList | filter: taskCntrl.searchBy | filter:taskCntrl.filterByStatus | filter: taskCntrl.filterByCreatedDate| orderBy: ['-created_at', 'job_id'])">
             <div class="ft-column ft-icon ">
                 <i ng-class="{ 'pficon pficon-error-circle-o': (task.status==='failed' ), 'pficon pficon-ok': (task.status==='finished' ), 'pficon pficon-warning-triangle-o': (task.status==='warning' ), 'fa fa-spinner': (task.status==='processing' || task.status==='new' )} "></i>
             </div>
diff --git a/src/modules/volumes/volume-list/volume-list.html b/src/modules/volumes/volume-list/volume-list.html
index c754514f..c8ca7b9f 100644
--- a/src/modules/volumes/volume-list/volume-list.html
+++ b/src/modules/volumes/volume-list/volume-list.html
@@ -74,7 +74,7 @@ <h1>No Volumes Detected.</h1>
                 </div>
                 <div class="ft-column list-view-pf-additional-info-item list-view-pf-additional-info-item-stacked">
                     <div class="bold-text">Alerts</div>
-                    <div class="pull-left counts">{{volume.alertCount || "NA"}}</div>
+                    <div class="pull-left counts">{{volume.alertCount}}</div>
                 </div>
                 <div class="ft-column list-view-pf-additional-info-item list-view-pf-additional-info-item-stacked">
                     <div class="bold-text">Running</div>
@@ -85,8 +85,8 @@ <h1>No Volumes Detected.</h1>
                     <div class="pull-left counts">{{volumeCntrl.getRebalStatus(volume)}}</div>
                 </div>
                 <div class="ft-column ft-actions">
-                    <button class="btn btn-default dashboard-btn" ng-click="volumeCntrl.goToVolumeDetail(volume)" uib-tooltip="Volume Details" tooltip-placement="auto bottom-left">Volume Details</button>
-                    <button class="btn btn-default dashboard-btn" uib-tooltip="Launch Dashboard" tooltip-placement="auto bottom-left" ng-click="volumeCntrl.redirectToGrafana(volume, $event)">Launch Dashboard</button>
+                    <button class="btn btn-default dashboard-btn" ng-click="volumeCntrl.goToVolumeDetail(volume)">Details</button>
+                    <button class="btn btn-default dashboard-btn" ng-click="volumeCntrl.redirectToGrafana(volume, $event)">Dashboard</button>
                 </div>
             </div>
         </div>
diff --git a/src/modules/volumes/volume-list/volume-list.scss b/src/modules/volumes/volume-list/volume-list.scss
index 2cfea5ef..15c2e406 100644
--- a/src/modules/volumes/volume-list/volume-list.scss
+++ b/src/modules/volumes/volume-list/volume-list.scss
@@ -20,9 +20,9 @@
     .flex-table {
         .ft-actions {
             flex-grow: 1.2;
-            .dashboard-btn {
+            /*.dashboard-btn {
                 width: 125px;
-            }
+            } */
         }
     }
 }