From cd40aede14e5d43494a7201b5fed773c19c70287 Mon Sep 17 00:00:00 2001
From: Floran Brutel <contact@floran.fr>
Date: Sat, 20 Apr 2019 10:42:49 +0200
Subject: [PATCH] :bug: Fix use of isLinux in the web ui

---
 .../js/components/plugin-cpu/controller.js    |   2 +
 .../static/js/components/plugin-cpu/view.html |   2 +-
 .../js/components/plugin-system/controller.js |   1 +
 .../js/components/plugin-system/view.html     |   5 +--
 glances/outputs/static/package-lock.json      |  41 +++++++++++++-----
 glances/outputs/static/public/glances.js      | Bin 2188585 -> 2188622 bytes
 glances/outputs/static/public/glances.map.js  | Bin 2616324 -> 2616374 bytes
 7 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/glances/outputs/static/js/components/plugin-cpu/controller.js b/glances/outputs/static/js/components/plugin-cpu/controller.js
index 44090d2a..7a6e0bbf 100644
--- a/glances/outputs/static/js/components/plugin-cpu/controller.js
+++ b/glances/outputs/static/js/components/plugin-cpu/controller.js
@@ -28,6 +28,8 @@ export default function GlancesPluginCpuController($scope, GlancesStats) {
         var stats = data.stats['cpu'];
         _view = data.views['cpu'];
 
+        vm.isLinux = data.isLinux;
+
         vm.total = stats.total;
         vm.user = stats.user;
         vm.system = stats.system;
diff --git a/glances/outputs/static/js/components/plugin-cpu/view.html b/glances/outputs/static/js/components/plugin-cpu/view.html
index ac6fd4d8..265adc7e 100644
--- a/glances/outputs/static/js/components/plugin-cpu/view.html
+++ b/glances/outputs/static/js/components/plugin-cpu/view.html
@@ -72,7 +72,7 @@
                         {{ vm.soft_interrupts }}
                     </div>
                 </div>
-                <div class="table-row" ng-if="!statsSystem.isLinux() && vm.syscalls">
+                <div class="table-row" ng-if="!vm.isLinux && vm.syscalls">
                     <div class="table-cell text-left">syscal:</div>
                     <div class="table-cell">
                         {{ vm.syscalls }}
diff --git a/glances/outputs/static/js/components/plugin-system/controller.js b/glances/outputs/static/js/components/plugin-system/controller.js
index 72bd6d5d..a271cabd 100644
--- a/glances/outputs/static/js/components/plugin-system/controller.js
+++ b/glances/outputs/static/js/components/plugin-system/controller.js
@@ -25,6 +25,7 @@ export default function GlancesPluginSystemController($scope, GlancesStats) {
     var loadData = function (data) {
         var stats = data.stats['system'];
 
+        vm.isLinux = data.isLinux;
         vm.hostname = stats['hostname'];
         vm.platform = stats['platform'];
         vm.os.name = stats['os_name'];
diff --git a/glances/outputs/static/js/components/plugin-system/view.html b/glances/outputs/static/js/components/plugin-system/view.html
index 2e1e0824..4ef9586c 100644
--- a/glances/outputs/static/js/components/plugin-system/view.html
+++ b/glances/outputs/static/js/components/plugin-system/view.html
@@ -1,7 +1,6 @@
 <section id="system">
     <span ng-if="vm.isDisconnected" class="critical">Disconnected from</span>
     <span class="title">{{ vm.hostname }}</span>
-    <span ng-if="vm.stats.isLinux" class="hidden-xs hidden-sm">({{ vm.humanReadableName }} / {{ vm.os.name }} {{ vm.os.version }})</span>
-    <span ng-if="!vm.stats.isLinux"
-          class="hidden-xs hidden-sm">({{ vm.os.name }} {{ vm.os.version }} {{ vm.platform }})</span>
+    <span ng-if="vm.isLinux" class="hidden-xs hidden-sm">({{ vm.humanReadableName }} / {{ vm.os.name }} {{ vm.os.version }})</span>
+    <span ng-if="!vm.isLinux" class="hidden-xs hidden-sm">({{ vm.os.name }} {{ vm.os.version }} {{ vm.platform }})</span>
 </section>
diff --git a/glances/outputs/static/package-lock.json b/glances/outputs/static/package-lock.json
index ec89b6f1..4445a4e1 100644
--- a/glances/outputs/static/package-lock.json
+++ b/glances/outputs/static/package-lock.json
@@ -2003,7 +2003,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -2024,12 +2025,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2044,17 +2047,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2171,7 +2177,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2183,6 +2190,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2197,6 +2205,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -2204,12 +2213,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -2228,6 +2239,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2308,7 +2320,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2320,6 +2333,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -2405,7 +2419,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -2441,6 +2456,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2460,6 +2476,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -2503,12 +2520,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js
index 0cebb34cdc9019daec8d504c4338a1f9c42181b4..13d63ce74934e8c74bdf3325b16bad872452bd45 100644
GIT binary patch
delta 217
zcmZ2^s+I8^5I3|iwlK9Yx3ILZwy?FZw{Wy@ws5s@xA3&^w(zy^w+OTdwg|Ndw}`Ze
zwuo&JZ(1OcS?rUUS6ZQ9tB{gdlBfseT60aGqb(u1y?=pth7ea-E=;_gXS4Wrp3M?1
z4&pd8Zg2T4k;%jfm5ouFt{5mTGhO1FL@JtC`{r*FKr9KwQa~&X#4<oE3&e6jEWds8
IH-)l10CQPWZ~y=R

delta 183
zcmX?is+Dmi5I3|iwlK9Yx3ILZwy?FZw{Wy@ws5s@xA3&^w(zy^w+OTdwg|Ndw}`Ze
zwuo&JZ(6W@*#hxWA<^QJ#FFCR%HopLT)oU<pUk|{3JuM6)y?ADRX0ntIBY-jSt6E+
z6|8Ey#y5#>DKHbJG)5^VPXPv|D+Y?oO!xaH!8N_~n}l53cZs&|l5O9m+P+J-eV1wb
QF5C7UC@8<}yMkXH0H4f7i~s-t

diff --git a/glances/outputs/static/public/glances.map.js b/glances/outputs/static/public/glances.map.js
index 5a192e31a225c6ae06a68cd91806deb316036991..eafa61951d463a90c621521ff83efa5ad072469b 100644
GIT binary patch
delta 489
zcmZ|Ky-OQ$7zc3feo4GLtH!q`YRtv>QiMa3fYJJfPily$lP(!tE-^}mDpJ$a$qGv7
zmU6>0Nu9b$p`bUIq5TgWR2-{y5f>etI;3Bv-Rkgp;CY2-=i;+;1f_V>>$sUQb4x>+
z_)sP@kc~y7gE9NN)XtT%+q-S;TGFm1A6laClJCgf%O95I2uH$lv;Fg|oA+;oDkXXJ
zN_=W4%n=plj2uyJgy>EG`V?<piyzMZFR|8TM|>VGRfNI|_d<!UP7|$8Kg}AONutf9
zVI_#HgfT-jV`Pc4Mv5q9<WbEhj2LEONlq&+U5=WMclWqXb9wmWqolF-L4@qm7mdH(
z3Z<A<T~1ncpMLxAZ^enS8$3`23aFq#HN1ctsD(Q4LOnD<BQ!xXyaXTkp#@r@4Fb+Y
zx&1iRl7BawUny*a#zKqcy4m+P9a&i6Ee^IiiYr)Y)ZV}S*C+=3K_}qXC&RvHHl6ul
h{aoh$G2MO)14VUQhY)l?7&@T~x}nEW$6x(E_yZAQsc`@R

delta 528
zcmZwDO)M*M5CHJ({&)4uqwBR)pLVPCd16yrnx@EWGV7y)TjRDNtUdIhm9$dgBq6;L
zhq?K<iGzrQJv<UucLztrNyL#O^ZHUJll+pIWHK|E^V>acgKQ-{W^6XD8ht$p(}>OV
zB$BE+m)yDH0_eOH-Rq^z61Q36&q^$MkLo_xi|RX5F_h%|xE16jJgE_EeD@G)4{W<(
zJ_9hHQA_}H0AMh-Jc`^Ci{iv9%j511^P=h$A}9-jYiH>oh<B5`4X4*QH}1Cx;%6!0
zb2D>WosaCL4Hw^--M=sh{|17R9|OpbRW>MH!vI~FvI}xYd;}mqq8I>%k_JdCSq&ho
z{m-lC{4qYS*~8GW=)&9^vy}~pU>Oea=Jd-~l*cbbQbTOSP8`HZT%?wKBXy*nxQRp>
z$amr)UeZXKh>tWAKlwpgtnrJ$-?XI&!CH^EP@E|iGOLB6xfsnBCbGHZm0z7@%@?#Z
zpF9+{j{4<mUaWMXn35BC_*<R|RO)KKuIpi4&xNW{mQpeakya8WZKRz<$WKd3bwrLo
E03Rl<7ytkO