From 725cbe6457595559895b854290dc159755419992 Mon Sep 17 00:00:00 2001
From: Rash419 <rasheshpadia419@gmail.com>
Date: Sat, 7 Nov 2020 18:13:45 +0530
Subject: [PATCH] admin: added vex-dialog in admin panel when WSD shutdowns

Signed-off-by: Rash419 <rasheshpadia419@gmail.com>
Change-Id: I16f9a2a55b7b17fe10ae14266c7db574bd2751ac
---
 loleaflet/admin/admintemplate.html          |  1 +
 loleaflet/admin/src/AdminSocketAnalytics.js |  1 +
 loleaflet/admin/src/AdminSocketBase.js      | 24 ++++++++++++++-------
 loleaflet/admin/src/AdminSocketHistory.js   |  2 +-
 loleaflet/admin/src/AdminSocketLog.js       |  2 +-
 loleaflet/admin/src/AdminSocketOverview.js  |  1 +
 loleaflet/admin/src/AdminSocketSettings.js  |  1 +
 7 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/loleaflet/admin/admintemplate.html b/loleaflet/admin/admintemplate.html
index 89b7e1f8c..fe5d311f4 100644
--- a/loleaflet/admin/admintemplate.html
+++ b/loleaflet/admin/admintemplate.html
@@ -12,6 +12,7 @@
     <title>Collabora Online - Admin console</title>
     <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/admin-bundle.js"></script>
     <link rel=StyleSheet href="%SERVICE_ROOT%/loleaflet/%VERSION%/admin/css/bulma.min.css" type="text/css" />
+    <link rel=StyleSheet href="%SERVICE_ROOT%/loleaflet/%VERSION%/vex.css" type="text/css" />
 
     <style>
         @font-face {
diff --git a/loleaflet/admin/src/AdminSocketAnalytics.js b/loleaflet/admin/src/AdminSocketAnalytics.js
index bf78a3b75..3b4c01b61 100644
--- a/loleaflet/admin/src/AdminSocketAnalytics.js
+++ b/loleaflet/admin/src/AdminSocketAnalytics.js
@@ -519,6 +519,7 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
 
 	onSocketClose: function() {
 		clearInterval(this._basicStatsIntervalId);
+		this.base.call(this);
 	}
 });
 
diff --git a/loleaflet/admin/src/AdminSocketBase.js b/loleaflet/admin/src/AdminSocketBase.js
index a8c136d6d..bc705f0f9 100644
--- a/loleaflet/admin/src/AdminSocketBase.js
+++ b/loleaflet/admin/src/AdminSocketBase.js
@@ -15,7 +15,7 @@ if (typeof String.prototype.startsWith !== 'function') {
 var AdminSocketBase = Base.extend({
 	socket: null,
 
-	constructor: function(host) {
+	constructor: function (host) {
 		// because i am abstract
 		if (this.constructor === AdminSocketBase) {
 			throw new Error('Cannot instantiate abstract class');
@@ -33,24 +33,32 @@ var AdminSocketBase = Base.extend({
 		}
 	},
 
-	onSocketOpen: function() {
+	onSocketOpen: function () {
 		// Authenticate
 		var cookie = Util.getCookie('jwt');
 		this.socket.send('auth ' + cookie);
 	},
 
-	onSocketMessage: function() {
+	onSocketMessage: function () {
 		/* Implemented by child */
 	},
 
-	onSocketClose: function() {
-		this.socket.onerror = function() {};
-		this.socket.onclose = function() {};
-		this.socket.onmessage = function() {};
+	onSocketClose: function () {
+		this.socket.onerror = function () { };
+		this.socket.onclose = function () { };
+		this.socket.onmessage = function () { };
+
+		this.vexInstance = vex.open({
+			content: _('Server has been shutdown please reload the page'),
+			contentClassName: 'loleaflet-user-idle',
+			showCloseButton: false,
+			overlayClosesOnClick: false,
+			escapeButtonCloses: false,
+		});
 		this.socket.close();
 	},
 
-	onSocketError: function() {
+	onSocketError: function () {
 		vex.dialog.alert(_('Connection error'));
 	}
 });
diff --git a/loleaflet/admin/src/AdminSocketHistory.js b/loleaflet/admin/src/AdminSocketHistory.js
index a07f0af6a..4a4aef01e 100644
--- a/loleaflet/admin/src/AdminSocketHistory.js
+++ b/loleaflet/admin/src/AdminSocketHistory.js
@@ -41,7 +41,7 @@ var AdminSocketHistory = AdminSocketBase.extend({
 	},
 
 	onSocketClose: function() {
-
+		this.base.call(this);
 	}
 });
 
diff --git a/loleaflet/admin/src/AdminSocketLog.js b/loleaflet/admin/src/AdminSocketLog.js
index 3f3e1edb4..9645dc517 100644
--- a/loleaflet/admin/src/AdminSocketLog.js
+++ b/loleaflet/admin/src/AdminSocketLog.js
@@ -113,7 +113,7 @@ var AdminSocketLog = AdminSocketBase.extend({
 	},
 
 	onSocketClose: function() {
-
+		this.base.call(this);
 	}
 });
 
diff --git a/loleaflet/admin/src/AdminSocketOverview.js b/loleaflet/admin/src/AdminSocketOverview.js
index 1a4989bf3..0dee776c8 100644
--- a/loleaflet/admin/src/AdminSocketOverview.js
+++ b/loleaflet/admin/src/AdminSocketOverview.js
@@ -388,6 +388,7 @@ var AdminSocketOverview = AdminSocketBase.extend({
 	onSocketClose: function() {
 		clearInterval(this._basicStatsIntervalId);
 		clearInterval(this._docElapsedTimeIntervalId);
+		this.base.call(this);
 	}
 });
 
diff --git a/loleaflet/admin/src/AdminSocketSettings.js b/loleaflet/admin/src/AdminSocketSettings.js
index e10d0ddce..ead638ebe 100644
--- a/loleaflet/admin/src/AdminSocketSettings.js
+++ b/loleaflet/admin/src/AdminSocketSettings.js
@@ -100,6 +100,7 @@ var AdminSocketSettings = AdminSocketBase.extend({
 
 	onSocketClose: function() {
 		clearInterval(this._basicStatsIntervalId);
+		this.base.call(this);
 	}
 });