From 36774c9f41f20e076116e4a0a001c43380f9a8be Mon Sep 17 00:00:00 2001
From: Joseph Nuthalapati <njoseph@thoughtworks.com>
Date: Fri, 10 Aug 2018 18:02:06 +0530
Subject: [PATCH] turbolinks: Reload page using JavaScript

Using the existing meta tag for refresh as a noscript fallback.

Fixes #1350

Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 .../diagnostics/templates/diagnostics.html    | 13 ++++++++-
 .../monkeysphere/templates/monkeysphere.html  | 12 +++++++-
 plinth/modules/openvpn/templates/openvpn.html | 11 ++++++-
 plinth/modules/tor/templates/tor.html         | 10 ++++++-
 .../modules/upgrades/templates/upgrades.html  | 10 ++++++-
 plinth/templates/setup.html                   | 15 ++++++++--
 static/themes/default/js/refresh.js           | 29 +++++++++++++++++++
 7 files changed, 92 insertions(+), 8 deletions(-)
 create mode 100644 static/themes/default/js/refresh.js

diff --git a/plinth/modules/diagnostics/templates/diagnostics.html b/plinth/modules/diagnostics/templates/diagnostics.html
index 08d0fcd77..797d1356f 100644
--- a/plinth/modules/diagnostics/templates/diagnostics.html
+++ b/plinth/modules/diagnostics/templates/diagnostics.html
@@ -19,11 +19,14 @@
 {% endcomment %}
 
 {% load i18n %}
+{% load static %}
 
 {% block page_head %}
 
   {% if is_running %}
-    <meta http-equiv="refresh" content="3" />
+    <noscript>
+      <meta http-equiv="refresh" content="3" />
+    </noscript>
   {% endif %}
 
 {% endblock %}
@@ -73,3 +76,11 @@
   {% endif %}
 
 {% endblock %}
+
+
+{% block page_js %}
+  {% if is_running %}
+    <script type="text/javascript" src="{% static 'theme/js/refresh.js' %}"></script>
+  {% endif %}
+{% endblock %}
+
diff --git a/plinth/modules/monkeysphere/templates/monkeysphere.html b/plinth/modules/monkeysphere/templates/monkeysphere.html
index ebac142df..b230d53e8 100644
--- a/plinth/modules/monkeysphere/templates/monkeysphere.html
+++ b/plinth/modules/monkeysphere/templates/monkeysphere.html
@@ -20,11 +20,14 @@
 
 {% load bootstrap %}
 {% load i18n %}
+{% load static %}
 
 {% block page_head %}
 
   {% if running %}
-    <meta http-equiv="refresh" content="3"/>
+    <noscript>
+      <meta http-equiv="refresh" content="3" />
+    </noscript>
   {% endif %}
 
   <style type="text/css">
@@ -157,3 +160,10 @@
   </table>
 
 {% endblock %}
+
+{% block page_js %}
+  {% if running %}
+    <script type="text/javascript" src="{% static 'theme/js/refresh.js' %}"></script>
+  {% endif %}
+{% endblock %}
+
diff --git a/plinth/modules/openvpn/templates/openvpn.html b/plinth/modules/openvpn/templates/openvpn.html
index f267b19dd..8041aa7ca 100644
--- a/plinth/modules/openvpn/templates/openvpn.html
+++ b/plinth/modules/openvpn/templates/openvpn.html
@@ -20,11 +20,14 @@
 
 {% load bootstrap %}
 {% load i18n %}
+{% load static %}
 
 {% block page_head %}
 
   {% if status.setup_running %}
-    <meta http-equiv="refresh" content="3" />
+    <noscript>
+      <meta http-equiv="refresh" content="3" />
+    </noscript>
   {% endif %}
 
 {% endblock %}
@@ -126,3 +129,9 @@
   {% endif %}
 
 {% endblock %}
+
+{% block page_js %}
+  {% if status.setup_running %}
+    <script type="text/javascript" src="{% static 'theme/js/refresh.js' %}"></script>
+  {% endif %}
+{% endblock %}
diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html
index 66f7fc21a..c16934bd4 100644
--- a/plinth/modules/tor/templates/tor.html
+++ b/plinth/modules/tor/templates/tor.html
@@ -20,11 +20,14 @@
 
 {% load bootstrap %}
 {% load i18n %}
+{% load static %}
 
 {% block page_head %}
 
   {% if config_running %}
-    <meta http-equiv="refresh" content="3" />
+    <noscript>
+      <meta http-equiv="refresh" content="3" />
+    </noscript>
   {% endif %}
 
 {% endblock %}
@@ -168,4 +171,9 @@
   // @license-end
   </script>
 
+  {% if config_running %}
+    <script type="text/javascript" src="{% static 'theme/js/refresh.js' %}"></script>
+  {% endif %}
+
 {% endblock %}
+
diff --git a/plinth/modules/upgrades/templates/upgrades.html b/plinth/modules/upgrades/templates/upgrades.html
index d440b6c50..effafee80 100644
--- a/plinth/modules/upgrades/templates/upgrades.html
+++ b/plinth/modules/upgrades/templates/upgrades.html
@@ -19,11 +19,14 @@
 {% endcomment %}
 
 {% load i18n %}
+{% load static %}
 
 {% block page_head %}
 
   {% if is_busy %}
-    <meta http-equiv="refresh" content="3"/>
+    <noscript>
+      <meta http-equiv="refresh" content="3" />
+    </noscript>
   {% endif %}
 
 {% endblock %}
@@ -72,4 +75,9 @@
       $('.details').toggle("slow");
     });
   </script>
+
+  {% if is_busy %}
+    <script type="text/javascript" src="{% static 'theme/js/refresh.js' %}"></script>
+  {% endif %}
 {% endblock %}
+
diff --git a/plinth/templates/setup.html b/plinth/templates/setup.html
index e00bace70..08c9ff131 100644
--- a/plinth/templates/setup.html
+++ b/plinth/templates/setup.html
@@ -23,11 +23,11 @@
 {% load static %}
 
 {% block page_head %}
-
   {% if setup_helper.current_operation %}
-    <meta http-equiv="refresh" content="3" />
+    <noscript>
+      <meta http-equiv="refresh" content="3" />
+    </noscript>
   {% endif %}
-
 {% endblock %}
 
 {% block content %}
@@ -131,3 +131,12 @@
   {% endif %}
 
 {% endblock %}
+
+
+{% block page_js %}
+
+  {% if setup_helper.current_operation %}
+    <script type="text/javascript" src="{% static 'theme/js/refresh.js' %}"></script>
+  {% endif %}
+
+{% endblock %}
diff --git a/static/themes/default/js/refresh.js b/static/themes/default/js/refresh.js
new file mode 100644
index 000000000..891d9abdb
--- /dev/null
+++ b/static/themes/default/js/refresh.js
@@ -0,0 +1,29 @@
+/*
+ This file is part of FreedomBox.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+// Refresh the page once in n seconds
+async function refresh(ms) {
+    await sleep(ms);
+    window.location.reload();
+}
+
+refresh(3000);
+