From c86d4341c87e25545960ac8418d93e1b2128220b Mon Sep 17 00:00:00 2001
From: Sajith Sasidharan <sajith@hcoop.net>
Date: Mon, 27 Apr 2020 16:52:54 -0400
Subject: [PATCH] Render "connected to introducers" status

---
 src/allmydata/web/root.py | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/allmydata/web/root.py b/src/allmydata/web/root.py
index 1bcafde56..45f17a9ae 100644
--- a/src/allmydata/web/root.py
+++ b/src/allmydata/web/root.py
@@ -206,12 +206,6 @@ class Root(MultiFormatResource):
 
     addSlash = True
 
-    _connectedalts = {
-        "not-configured": "Not Configured",
-        "yes": "Connected",
-        "no": "Disconnected",
-        }
-
     def __init__(self, client, clock=None, now_fn=None):
         super(Root, self).__init__()
         self.client = client
@@ -320,6 +314,12 @@ class RootElement(Element):
         super(RootElement, self).__init__()
         self._client = client
 
+    _connectedalts = {
+        "not-configured": "Not Configured",
+        "yes": "Connected",
+        "no": "Disconnected",
+        }
+
     @renderer
     def my_nodeid(self, req, tag):
         tubid_s = "TubID: "+self._client.get_long_tubid()
@@ -329,6 +329,21 @@ class RootElement(Element):
     def my_nickname(self, req, tag):
         return tag(self._client.nickname)
 
+    def _connected_introducers(self):
+        return len([1 for cs in self._client.introducer_connection_statuses()
+                    if cs.connected])
+
+    @renderer
+    def connected_to_at_least_one_introducer(self, req, tag):
+        if self._connected_introducers():
+            return "yes"
+        return "no"
+
+    @renderer
+    def connected_to_at_least_one_introducer_alt(self, req, tag):
+        state = self.connected_to_at_least_one_introducer(req, tag)
+        return self._connectedalts.get(state)
+
     def render_services(self, ctx, data):
         ul = T.ul()
         try:
@@ -366,18 +381,6 @@ class RootElement(Element):
     def data_total_introducers(self, ctx, data):
         return len(self.client.introducer_connection_statuses())
 
-    def data_connected_introducers(self, ctx, data):
-        return len([1 for cs in self.client.introducer_connection_statuses()
-                    if cs.connected])
-
-    def data_connected_to_at_least_one_introducer(self, ctx, data):
-        if self.data_connected_introducers(ctx, data):
-            return "yes"
-        return "no"
-
-    def data_connected_to_at_least_one_introducer_alt(self, ctx, data):
-        return self._connectedalts[self.data_connected_to_at_least_one_introducer(ctx, data)]
-
     # In case we configure multiple introducers
     def data_introducers(self, ctx, data):
         return self.client.introducer_connection_statuses()