fix(log): handle errors better

Author: grampelberg

src/widget/log.rs

@@ -12,6 +12,8 @@ use kube::{api::LogParams, Api, ResourceExt};
 use ratatui::{
     buffer::Buffer,
     layout::{Position, Rect},
+    style::{palette::tailwind, Style},
+    widgets::Paragraph,
     Frame,
 };
 use tokio::{
@@ -34,7 +36,7 @@ use crate::{
 };
 
 pub struct Log {
-    task: JoinHandle<Result<()>>,
+    task: Option<JoinHandle<Result<()>>>,
 
     rx: mpsc::UnboundedReceiver<String>,
     buffer: Vec<String>,
@@ -74,7 +76,7 @@ impl Log {
         ));
 
         Self {
-            task,
+            task: Some(task),
             rx,
             buffer: Vec::new(),
 
@@ -134,8 +136,8 @@ impl Widget for Log {
             self.position.y = u16::MAX;
         }
 
-        if self.task.is_finished() {
-            let task = &mut self.task;
+        if self.task.as_ref().map_or(false, JoinHandle::is_finished) {
+            let task = self.task.take().expect("task is finished");
 
             match futures::executor::block_on(async move { task.await? }) {
                 Ok(()) => return Err(eyre!("Log task finished unexpectedly")),
@@ -151,17 +153,30 @@ impl Widget for Log {
             }
         }
 
-        Viewport::builder()
+        let result = Viewport::builder()
             .buffer(&self.buffer)
             .view(self.position)
             .build()
-            .draw(frame, area)
+            .draw(frame, area);
+
+        if self.task.is_none() {
+            frame.render_widget(
+                Paragraph::new("Log stream ended, come back to restart")
+                    .style(Style::default().fg(tailwind::RED.c300))
+                    .centered(),
+                area,
+            );
+        }
+
+        result
     }
 }
 
 impl Drop for Log {
     fn drop(&mut self) {
-        self.task.abort();
+        if let Some(task) = self.task.as_ref() {
+            task.abort();
+        }
     }
 }
 

src/widget/tabs.rs

@@ -56,11 +56,6 @@ impl Widget for Bar {
         if let Some(Movement::X(x)) = move_cursor(key, area) {
             self.idx = self
                 .idx
-                // TODO: this isn't a great solution, it effectively means that if the middle tab
-                // has an error, you can never get to the last tab. It should be
-                // possible to navigate between things when an error is displayed.
-                // This gets weird though when you think about scrolling the error
-                // dialog.
                 .wrapping_add_signed(x.into())
                 .clamp(0, self.items.len().saturating_sub(1));
 
@@ -131,37 +126,41 @@ impl TabbedView {
             items: tabs,
         }
     }
+
+    fn select(&mut self, idx: usize, buffer: &Buffer) {
+        let start = if self.current < idx {
+            Start::Left
+        } else {
+            Start::Right
+        };
+
+        self.current = idx;
+
+        // TODO: this is *probably* a valid assumption, but it might need to be actually
+        // checked.
+        self.view.pop();
+        self.view.push(
+            Animated::builder()
+                .widget(self.items[idx].widget())
+                .effect(fx::parallel(&[
+                    fx::coalesce(EffectTimer::from_ms(500, Interpolation::SineInOut)),
+                    horizontal_wipe()
+                        .buffer(buffer.clone())
+                        .timer(EffectTimer::from_ms(500, Interpolation::SineInOut))
+                        .start(start)
+                        .call(),
+                ]))
+                .build()
+                .boxed(),
+        );
+    }
 }
 
 impl Widget for TabbedView {
     fn dispatch(&mut self, event: &Event, buffer: &Buffer, area: Rect) -> Result<Broadcast> {
         match self.view.dispatch(event, buffer, area)? {
             Broadcast::Selected(idx) => {
-                let start = if self.current < idx {
-                    Start::Left
-                } else {
-                    Start::Right
-                };
-
-                self.current = idx;
-
-                // TODO: this is *probably* a valid assumption, but it might need to be actually
-                // checked.
-                self.view.pop();
-                self.view.push(
-                    Animated::builder()
-                        .widget(self.items[idx].widget())
-                        .effect(fx::parallel(&[
-                            fx::coalesce(EffectTimer::from_ms(500, Interpolation::SineInOut)),
-                            horizontal_wipe()
-                                .buffer(buffer.clone())
-                                .timer(EffectTimer::from_ms(500, Interpolation::SineInOut))
-                                .start(start)
-                                .call(),
-                        ]))
-                        .build()
-                        .boxed(),
-                );
+                self.select(idx, buffer);
 
                 Ok(Broadcast::Consumed)
             }