From 4016627da43e9ea1e1ed091dfc22cd836bb909f0 Mon Sep 17 00:00:00 2001
From: Noor Yameen <noor.yameen@exalt.ps>
Date: Thu, 24 Jan 2019 09:20:45 +0200
Subject: [PATCH] Support auto-refresh in Vitrage Alarm view

Change-Id: I2041f0edf9f403837dfa250d55dae566e10dfe64
story: #2004726
task: #28764
---
 .../project/alarmList/alarmList.controller.js |  28 ++++++++++++++++--
 .../project/alarmList/alarmList.html          |   8 +++--
 .../project/alarmList/alarmList.scss          |   5 ++++
 .../dashboard/project/assets/spinner.gif      | Bin 0 -> 1555 bytes
 4 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 vitrage_dashboard/dashboard/static/dashboard/project/assets/spinner.gif

diff --git a/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.controller.js b/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.controller.js
index fdf436a..7354744 100644
--- a/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.controller.js
+++ b/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.controller.js
@@ -60,6 +60,15 @@
       opened: false
     };
 
+    alarmList.autoRefreshChanged = function () {
+      if (alarmList.checkboxAutoRefresh && alarmList.radioModel !== 'historyAlarms') {
+        startCollectData();
+      } else {
+        stopCollectData();
+      }
+    };
+
+
     alarmList.getHistoryData = function (nextPrev) {
       if (nextPrev === 'next' && !alarmList.nextEnabled) {
         return;
@@ -104,9 +113,12 @@
 
 
       if (alarmList.radioModel === 'historyAlarms') {
-        vitrageTopologySrv.getHistoryAlarms(config).then(function (result) {
+          $("#table").hide();
+          $("#spinner").show();
+          vitrageTopologySrv.getHistoryAlarms(config).then(function (result) {
           alarmList.alarms = result.data;
-
+          $("#spinner").hide();
+          $("#table").show();
           alarmList.nextEnabled = result.data.length === LIMIT;
           alarmList.prevEnabled = true;
         });
@@ -123,6 +135,18 @@
 
     alarmList.getHistoryData();
 
+    function startCollectData() {
+      if (angular.isDefined(alarmList.alarmInterval)) return;
+      alarmList.alarmInterval = alarmList.$interval(alarmList.getHistoryData,10000);
+    }
+
+    function stopCollectData() {
+      if (angular.isDefined(alarmList.alarmInterval)) {
+        alarmList.$interval.cancel(alarmList.alarmInterval);
+        alarmList.alarmInterval = undefined;
+      }
+    }
+
     alarmList.sortBy = function (fieldName) {
       if (fieldName === alarmList.sortByFieldName) {
         alarmList.sortOrder = alarmList.sortOrder === 'asc' ? 'desc' : 'asc';
diff --git a/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.html b/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.html
index 67e3136..669f15c 100644
--- a/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.html
+++ b/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.html
@@ -15,7 +15,10 @@
                        ng-click="alarmList.getHistoryData('')"
                        uib-btn-radio="'historyAlarms'">Alarm History</label>
             </div>
-
+            <div ng-hide="alarmList.radioModel === 'historyAlarms'"  class="themable-checkbox refreshBtn" >
+                 <input type="checkbox" ng-model="alarmList.checkboxAutoRefresh" id="themable-checkbox"                         ng-change="alarmList.autoRefreshChanged()">
+                 <label for="themable-checkbox" >Auto Refresh</label>
+             </div>
             <div ng-show="alarmList.radioModel === 'historyAlarms'" style="display: inline;">
                 <label>Started</label>
 
@@ -58,7 +61,7 @@ fa-angle-double-right prev-next-btn"
 
     <div class="panel panel-default">
 
-        <table st-table='alarmList.ialarms' st-safe-src="alarmList.alarms"
+        <table id="table"  st-table='alarmList.ialarms' st-safe-src="alarmList.alarms"
                class="table-striped table-rsp table-detail modern alarm-table" hz-table>
             <thead>
             <tr>
@@ -123,5 +126,6 @@ fa-angle-double-right prev-next-btn"
             </tr>
             </tbody>
         </table>
+       <img id="spinner" ng-src="{$STATIC_URL$}dashboard/project/assets/spinner.gif" class="spinner" >
     </div>
 </div>
diff --git a/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.scss b/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.scss
index cc3e00e..ac9f6ad 100644
--- a/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.scss
+++ b/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.scss
@@ -20,6 +20,11 @@
     }
   }
 
+  .spinner{
+    display:none;
+    margin-left:45%;
+  }
+
   .td-red {
     background: #f67171 !important;
   }
diff --git a/vitrage_dashboard/dashboard/static/dashboard/project/assets/spinner.gif b/vitrage_dashboard/dashboard/static/dashboard/project/assets/spinner.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7de75b15b1a42a0851ce607b94cc6e5ef566e840
GIT binary patch
literal 1555
zcmYk+drVVT90%~*_TKik_iAZ-DcA?4P}))|AkTtm;PxsMu+)MM6%Dc~Oc^WH2{skl
z(y~@4QmBXy4HSH%L1o4f+<eqGaXy%FN)|VXGYgrCV{S8MTM;$;@8tY*KIeOW-;=9Z
zs>)c80T}QH37B{^v31+li619QR+bE(9R|tZ=*TEK7oC1N{pO!H4!h&c>o?P{rl)?L
z>e<(Wak24x<GwCm^``39ovowajAkv)QYw@dv!!fZS=s8c0sp|*&9TX6lLDTAz=_G9
zC#!3!2M!GwHW~s~1BLm8#8P7T^zhVgQxd6U@Z=y!1$z$kpbS(JCBfL3ufvy>nKgK9
zFeNReL|@`)b|~YOh6=;j?XmF(<AMl*rNPqL)*84JNJ&a5)D{8&ApRH8E-5Ki=jfIs
z#V1loGh2UybQB-~%HTS9Nelp}yDwOcD)5Qx`hanTe9#wwD)TmVI52lK>jV~$=iX;s
zIC_=P-cJe$DSaDr9HYGz`P#$1{_H-1__IbG94*6<Xv9I{Ga)9Q6t%@eF(s4OU5@T$
z`%pgWNpJ7)<jKA`ilc0KGH`4`t0vNvTBbf%uaTP|5s}VzX%?H91C5bvoSf>FdZgoS
z(bx%H&O0d?P|mP9Z>7F$n^A5^3`)zNnyY<xvim|pOoEU}#w)C~?4;LvS8?RDI{fo0
zjC=^9)pDxjVFP#z<vc~Z!-lAvY-E{4A(2UG(&hwXf@hb_Tbw|4+FU!W%|vc54o0!Q
zB-2GYsd0r`3>{xbp;SZ}<%CR3CySKDO3@yOqKh*^aR^CHvE)bJtmtPbl#CBhU<OJG
zLOH=mJF=}txbz``_)QrKZ0V&da9?1p_HMLV6*oL|xxhB0jOe)|wztbERW$wMwc2|x
z{@P%d_Q!xR<a)lgh#X<BTUNDwxg}+rCtt=6<#-7JFP)G$Qwju3tpPw4&QJhmu}XN(
zG&R>5MNiZwBI!<+n$J~8=8&C`9ZX|&AHvaoh*{!^j*0oC;C-G!CJ<y|Z<(GTQ&o6y
z=H-8?i187DQz|HA^@t(=d+Q@c#)hz+XZH41#nd<pWNK&q^<}4)17Fqmb=3?plykP%
zTB;f#h0JKGp+?mKn?J3|kIm%k5EY!4P^;+9Lt@HBM5uWcz)#0j<^&?roSRv@3eIr#
z;c#SV0#aBTUnF9U>Lj(nbLV7c%KjhZjBqx{&KV&FyYem^9%n6ZL=<&Ak1Y+wpALz6
ztc4FQmGcxXm)}@50`G94SIQSHiw9d?msl0OZDs(b!jbDEZ2+aBd8NzNLa{Vh%`gZ9
zbwzHCsN3A5=F=MXY8W)hcAT_cilc|ogU~uWb|ozrq|rcJ0tsbAEQx<{r6f4tSImr$
z_N$RtDZTi8lGND_%}%B_yU8dYFIDpVdU~u1X+LPp;RjG}<wbGoodf;Pl1EBYU1xr|
zHI#YMVV}R?Sr$BEb(*F}>h_o$t>MCOn;oT!i^O&+PswZ1dh9#}4+)QNZlk(!`T;#6
z=vT{9q42dK^J2FY9V(ay3H>;rgt%@XDG9)1g<<)CSca3dB=xyQPzxS5Hhg&RcTJy7
zvpv{!Iha>X_UpfXjxpvpx1Z6ylxik^cXOs0%**Y6T6)57<CO~@FFt0w(G?c*P-4yA
zyygief)*Kx$TeKLTE^EGppo2UO+ja8oFvZI39M1=#Z`%_)nx}rz5Bbm4;~*pLD18f
zEFTirpzde-;-EAF=AOrqg&Y@2khb+()incjYY+|%g*)Fy388@S{dY9eowf^Y!ID>{
zpnlU27cs^>srTbNX~cKeDr!%myyEH&cW-3%dn?yxryS{AYRL7U4Vkwaw`z1R+;mtk
z1lcS@lOAM%IG@CK3mKajXem?EMB7B$1MPM96w!pcyl!6+qaz;-^PK3w*yJX_MQ|au
d9)RW+aJW=;$PppJDt9By)u#y#rzr<m_#a-;?z;d0

literal 0
HcmV?d00001