From 23e3864c83d6cf6384312428713c3cf1c287b59e Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Sat, 11 May 2024 14:52:29 -0700
Subject: [PATCH] status: move ping to front

---
 framework/ndn-testbed-status/src/App.vue | 38 +++++++++++-------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/framework/ndn-testbed-status/src/App.vue b/framework/ndn-testbed-status/src/App.vue
index 88cfb25..27b79c9 100644
--- a/framework/ndn-testbed-status/src/App.vue
+++ b/framework/ndn-testbed-status/src/App.vue
@@ -7,11 +7,12 @@
           <th>Prefix</th>
           <th>HTTPS</th>
 
-          <th>Revision</th>
           <th>Status</th>
-
           <th>TLS Expiry</th>
           <th>WSS</th>
+          <th>Revision</th>
+
+          <th v-for="node in routers">{{ node.shortname }}</th>
 
           <th>Host OS</th>
           <th>Kernel</th>
@@ -22,8 +23,6 @@
           <th>NLSR Version</th>
 
           <th v-for="service in services">{{ service }}</th>
-
-          <th v-for="node in routers"> {{ node.shortname }} </th>
         </tr>
       </thead>
 
@@ -40,17 +39,9 @@
           <td>{{ router.prefix }}</td>
           <td><a :href="`https://${router.host}`" target="_blank">{{ router.host }}</a></td>
 
-          <td>
-            <a v-if="router.status?.revision"
-                :href="getRevUrl(router)"
-                target="_blank">
-                {{ router.status?.revision }}
-            </a>
-          </td>
           <td :class="{
             warning: getFromNow(router.status?.timestamp ?? 0) < -1800,
           }">{{ getFromNowStr(router.status?.timestamp, 'seconds')  }}</td>
-
           <td :class="{
             warning: (router.status?.tls?.expiry ?? -1) < 0,
             okay: getFromNow(router.status?.tls?.expiry ?? -1) > 7 * 86400,
@@ -58,6 +49,21 @@
           <td :class="{ okay: router.status?.['ws-tls']}">
             {{ router.status?.['ws-tls'] ? 'OK' : '' }}
           </td>
+          <td>
+            <a v-if="router.status?.revision"
+                :href="getRevUrl(router)"
+                target="_blank">
+                {{ router.status?.revision }}
+            </a>
+          </td>
+
+          <td v-for="node in routers" :class="{
+              error: !router.status?.ndnping[node.shortname],
+              okay: (router.shortname != node.shortname) && (router.status?.ndnping[node.shortname] ?? 0 > 0),
+              blue: (router.shortname == node.shortname),
+            }">
+              {{ router.status?.ndnping[node.shortname] || '' }}
+          </td>
 
           <td>{{ router.status?.host_info?.os }}</td>
           <td>{{ router.status?.host_info?.kernel }}</td>
@@ -74,14 +80,6 @@
               {{ router.status.services[service].status }}
             </span>
           </td>
-
-          <td v-for="node in routers" :class="{
-              error: !router.status?.ndnping[node.shortname],
-              okay: (router.shortname != node.shortname) && (router.status?.ndnping[node.shortname] ?? 0 > 0),
-              blue: (router.shortname == node.shortname),
-            }">
-              {{ router.status?.ndnping[node.shortname] || '' }}
-          </td>
         </tr>
       </tbody>
     </table>