From 65770e2a53591e6dd12fc15a896c5c60c626a55f Mon Sep 17 00:00:00 2001
From: Mikhail Petrov <mike@nspcc.ru>
Date: Wed, 16 Apr 2025 14:25:54 +0300
Subject: [PATCH] web: Make number of active nodes more clear, closes #115

Signed-off-by: Mikhail Petrov <mike@nspcc.ru>
---
 get_webstat_metrics.py | 16 ++++++++--------
 src/Home.tsx           |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/get_webstat_metrics.py b/get_webstat_metrics.py
index 97779c6..5e091d1 100755
--- a/get_webstat_metrics.py
+++ b/get_webstat_metrics.py
@@ -151,8 +151,8 @@ async def main():
                 output['containers']['mainnet'] = family.samples[0].value
             if family.name == 'neo_exporter_netmap':
                 for sample in family.samples:
-                    node_mainnet_count += sample.value
-                    sample.labels['nodes']=[{'net': 'main', 'value': sample.value }]
+                    node_mainnet_count += int(sample.value)
+                    sample.labels['nodes']=[{'net': 'main', 'value': int(sample.value) }]
                     map_node.append( sample.labels )
 
         output['node_map'] = map_node
@@ -162,10 +162,10 @@ async def main():
 
         if node_mainnet_count <= 3:
             output['status']['mainnet'] = "Severe"
-            output['statusmsgs']['mainnet'].append(f"{node_mainnet_count} / 5 nodes is available")
+            output['statusmsgs']['mainnet'].append(f"{node_mainnet_count} out of 5 nodes {'is' if node_mainnet_count == 1 else 'are'} available")
         elif node_mainnet_count <= 4:
             output['status']['mainnet'] = "Degraded"
-            output['statusmsgs']['mainnet'].append(f"{node_mainnet_count} / 5 nodes is available")
+            output['statusmsgs']['mainnet'].append(f"{node_mainnet_count} out of 5 nodes {'is' if node_mainnet_count == 1 else 'are'} available")
     except:
         # Connection error
         output['status']['mainnet'] = "Unknown"
@@ -181,8 +181,8 @@ async def main():
                 output['containers']['testnet'] = family.samples[0].value
             if family.name == 'neo_exporter_netmap':
                 for sample in family.samples:
-                    node_testnet_count += sample.value
-                    sample.labels['nodes']=[{'net': 'test', 'value': sample.value }]
+                    node_testnet_count += int(sample.value)
+                    sample.labels['nodes']=[{'net': 'test', 'value': int(sample.value) }]
                     map_node.append( sample.labels )
 
         output['node_map'] = map_node
@@ -192,10 +192,10 @@ async def main():
 
         if node_testnet_count <= 2:
             output['status']['testnet'] = "Severe"
-            output['statusmsgs']['testnet'].append(f"{node_testnet_count} / 4 nodes is available")
+            output['statusmsgs']['testnet'].append(f"{node_testnet_count} out of 4 nodes {'is' if node_testnet_count == 1 else 'are'} available")
         elif node_testnet_count <= 3:
             output['status']['testnet'] = "Degraded"
-            output['statusmsgs']['testnet'].append(f"{node_testnet_count} / 4 nodes is available")
+            output['statusmsgs']['testnet'].append(f"{node_testnet_count} out of 4 nodes {'is' if node_testnet_count == 1 else 'are'} available")
     except:
         # Connection error
         output['status']['testnet'] = "Unknown"
diff --git a/src/Home.tsx b/src/Home.tsx
index c9be04f..b417f47 100644
--- a/src/Home.tsx
+++ b/src/Home.tsx
@@ -166,7 +166,7 @@ const Home = ({
 										key={statusMsgItem}
 										subtitle
 										size={6}
-									>{`- ${statusMsgItem}`}</Heading>
+									>{`• ${statusMsgItem}`}</Heading>
 								))}
 							</Tile>
 							<Tile kind="ancestor" style={{ marginTop: '1.5rem' }} id="main">