From e3d9ac6fdef4b9390e5d164b47b4c0a12b718652 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Fri, 12 Apr 2019 16:12:31 -0700
Subject: [PATCH] Added diagnostic agent connection status.

---
 meshagent.js             | 16 ++++++++++++++--
 package.json             |  2 +-
 views/default.handlebars |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/meshagent.js b/meshagent.js
index 971ee27a..8bd468b0 100644
--- a/meshagent.js
+++ b/meshagent.js
@@ -778,7 +778,13 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
             if (nodes.length == 1)
             {
                 self.realNodeKey = nodes[0].raid;
-                self.send(JSON.stringify({ action: 'diagnostic', value: { command: 'query', value: self.realNodeKey } }));
+
+                // Get agent connection state
+                var agentConnected = false;
+                var state = parent.parent.GetConnectivityState(self.realNodeKey);
+                if (state) { agentConnected = ((state.connectivity & 1) != 0) }
+
+                self.send(JSON.stringify({ action: 'diagnostic', value: { command: 'query', value: self.realNodeKey, agent: agentConnected } }));
             } else
             {
                 self.send(JSON.stringify({ action: 'diagnostic', value: { command: 'query', value: null } }));
@@ -1124,7 +1130,13 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
                                         db.Get('da' + obj.dbNodeKey, function (err, nodes) {
                                             if (nodes.length == 1) {
                                                 obj.realNodeKey = nodes[0].raid;
-                                                obj.send(JSON.stringify({ action: 'diagnostic', value: { command: 'query', value: obj.realNodeKey } }));
+
+                                                // Get agent connection state
+                                                var agentConnected = false;
+                                                var state = parent.parent.GetConnectivityState(obj.realNodeKey);
+                                                if (state) { agentConnected = ((state.connectivity & 1) != 0) }
+
+                                                obj.send(JSON.stringify({ action: 'diagnostic', value: { command: 'query', value: obj.realNodeKey, agent: agentConnected } }));
                                             } else {
                                                 obj.send(JSON.stringify({ action: 'diagnostic', value: { command: 'query', value: null } }));
                                             }
diff --git a/package.json b/package.json
index 88b79aa6..640795b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.3.2-k",
+  "version": "0.3.2-l",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/views/default.handlebars b/views/default.handlebars
index 017a2279..2e911020 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -7577,7 +7577,7 @@
             QV('topbar', x != 0);
             if ((x == 0) && (webPageFullScreen)) {
                 QC('body').add("arg_hide");
-                QS('column_l').height = 'calc(100vh - 110px)';
+                QS('column_l').height = 'calc(100vh - 111px)';
 
                 // Please check. I think this part is not needed anymore. Removing class will revert to default style
                 //QS('page_content').position = '';