implementing the Error displaying.

Propfend · Propfend · commit a3ce20ef9220 · 2024-12-04T14:40:51.000Z
diff --git a/src/cmd/dashboard/app.rs b/src/cmd/dashboard/app.rs
@@ -29,6 +29,7 @@ pub struct App {
     pub scroll_state: ScrollbarState,
     pub state: TableState,
     pub ticks: u128,
+    pub error: Option<String>,
 }
 
 impl App {
@@ -41,6 +42,7 @@ impl App {
             scroll_state: ScrollbarState::new(0),
             state: TableState::default().with_selected(0),
             ticks: 0,
+            error: None,
         })
     }
 
@@ -124,6 +126,7 @@ impl App {
     }
 
     fn render_table(&mut self, frame: &mut Frame, area: Rect) -> ioResult<()> {
+  
         match self.items.clone() {
             Some(items) => {
                 let header_style = Style::default()
@@ -191,11 +194,15 @@ impl App {
                 frame.render_stateful_widget(t, area, &mut self.state);
             }
             None => {
-                let t = Paragraph::new(if self.is_initial_load {
-                    "Loading agents..."
+                let message = if let Some(error) = &self.error {
+                    error.to_string()
+                } else if self.is_initial_load {
+                    "Loading agents...".to_string()
                 } else {
-                    "There are no agents registered. If agents are running, please give them a few seconds to register."
-                }.white())
+                    "There are no agents registered. If agents are running, please give them a few seconds to register.".to_string()
+                };
+
+                let t = Paragraph::new(message.white())
                     .centered()
                     .bg(self.colors.buffer_bg);
 
@@ -249,6 +256,10 @@ impl App {
 
         Ok(())
     }
+
+    // pub fn render_app_error(&mut self, app_error: AppError) {
+
+    // }
 }
 
 fn ref_array(peer: UpstreamPeer) -> Result<[String; 6]> {
diff --git a/src/cmd/dashboard/mod.rs b/src/cmd/dashboard/mod.rs
@@ -4,20 +4,23 @@ use crossterm::{
     terminal::{disable_raw_mode, LeaveAlternateScreen},
 };
 use futures::{FutureExt, StreamExt};
-use log::error;
 use ratatui::prelude::CrosstermBackend;
 use ratatui::Terminal;
 use std::io::Stdout;
 use std::{io::stdout, net::SocketAddr};
 use tokio::{
     runtime::Runtime,
-    sync::{broadcast, mpsc},
+    sync::{
+        broadcast,
+        mpsc::{self},
+    },
     task::JoinHandle,
     time::{interval, Duration, MissedTickBehavior},
 };
 
 use crate::{
-    balancer::upstream_peer_pool::UpstreamPeerPool, cmd::dashboard::app::App,
+    balancer::upstream_peer_pool::UpstreamPeerPool,
+    cmd::dashboard::app::App,
     errors::result::Result,
 };
 
@@ -43,6 +46,10 @@ pub async fn ratatui_main(management_addr: &SocketAddr) -> Result<()> {
 
     let (app_needs_to_stop_tx, mut app_needs_to_stop_rx_update) = broadcast::channel::<bool>(1);
     let (upstream_peer_pool_tx, mut upstream_peer_pool_rx) = mpsc::channel::<UpstreamPeerPool>(1);
+    let (app_needs_to_render_error_tx, mut app_needs_to_render_error_rx) =
+        mpsc::channel::<String>(1);
+
+    let app_needs_to_render_error_app_error_tx = app_needs_to_render_error_tx.clone();
 
     let update_handle: JoinHandle<Result<()>> = tokio::spawn(async move {
         let mut ticker = interval(Duration::from_millis(500));
@@ -52,19 +59,19 @@ pub async fn ratatui_main(management_addr: &SocketAddr) -> Result<()> {
         loop {
             tokio::select! {
                 _ = app_needs_to_stop_rx_update.recv() => {
-                    return Ok(())
+                    break Ok(())
                 },
                 _ = ticker.tick() => {
                     let upstream_peer_pool = fetch_registered_agents(management_clone).await;
 
                     match upstream_peer_pool {
                         Ok(upstream_peer_pool) => {
-                            if let Err(err) = upstream_peer_pool_tx.send(upstream_peer_pool).await {
-                                error!("Error sending upstream peer pool: {}", err);
+                            if let Err(_) = upstream_peer_pool_tx.send(upstream_peer_pool).await {
+                                app_needs_to_render_error_tx.send("Error sending upstream peer pool".to_string()).await.ok();
                             }
                         },
-                        Err(err) => {
-                            error!("Error fetching agents: {}", err);
+                        Err(_) => {
+                            app_needs_to_render_error_app_error_tx.send("Error fetching agents. Is the management address correct?".to_string()).await.ok();
                         }
                     }
                 }
@@ -87,6 +94,9 @@ pub async fn ratatui_main(management_addr: &SocketAddr) -> Result<()> {
 
                     return Ok(())
                 },
+                Some(app_error) = app_needs_to_render_error_rx.recv() => {
+                    app.error = Some(app_error);
+                },
                 Some(upstream_peer_pool) = upstream_peer_pool_rx.recv() => {
                     app.set_registered_agents(upstream_peer_pool)?;
                 },
