boot_diags/src/app.rs

@@ -529,10 +529,6 @@ impl App {
     }
 
     fn queue_boot_scan_tasks(&mut self) -> Result<()> {
-        self.diag_groups.reset();
-        if let Ok(mut results) = self.results.lock() {
-            results.clear();
-        }
         let disk_list = self.clone.disk_list.lock().unwrap();
         if let Some(disk_index) = self.clone.disk_index_dest {
             if let Some(disk) = disk_list.get(disk_index) {
@@ -751,10 +747,10 @@ fn get_chunks(r: Rect) -> Vec<Rect> {
     chunks.push(centered_rect(60, 25, r));
 
     // Progress
-    chunks.push(centered_rect(60, 70, r));
+    chunks.push(centered_rect(60, 80, chunks[1]));
 
     // Results
-    chunks.push(centered_rect(60, 70, r));
+    chunks.push(centered_rect(60, 80, chunks[1]));
 
     // Done
     chunks
@@ -762,13 +758,14 @@ fn get_chunks(r: Rect) -> Vec<Rect> {
 
 fn build_footer_string(cur_mode: Mode) -> String {
     match cur_mode {
+        Mode::BootDiags => String::from("(r) to refresh / (q) to quit"),
         Mode::BootScan | Mode::BootSetup | Mode::Home | Mode::ScanDisks => {
             String::from("(q) to quit")
         }
         Mode::InstallDrivers | Mode::InjectDrivers | Mode::SetBootMode => {
             String::from("(Enter) to select / (q) to quit")
         }
-        Mode::BootDiags | Mode::DiagMenu | Mode::SelectParts => {
+        Mode::DiagMenu | Mode::SelectParts => {
             String::from("(Enter) to select / (s) to start over / (q) to quit")
         }
         Mode::Done => String::from("(Enter) to continue / (q) to quit"),

boot_diags/src/components/progress.rs

@@ -16,7 +16,7 @@
 use color_eyre::Result;
 use ratatui::{
     Frame,
-    layout::{Alignment, Rect},
+    layout::Rect,
     style::{Color, Style, Stylize},
     text::{Line, Span},
     widgets::{Block, Borders, Clear, Paragraph},
@@ -96,10 +96,7 @@ impl Component for Progress {
                     line.running = false;
                 }
             }
-            Action::SetMode(mode) => {
-                self.mode = mode;
-                self.lines.clear();
-            }
+            Action::SetMode(mode) => self.mode = mode,
             _ => {}
         };
         Ok(None)
@@ -139,19 +136,12 @@ impl Component for Progress {
         });
 
         // Build block
-        let outer_block = Block::default()
+        let block = Block::default()
             .borders(Borders::ALL)
             .style(Style::default().bold());
-        let inner_block = Block::default()
-            .borders(Borders::NONE)
-            .style(Style::default().bold())
-            .title("Progress")
-            .title_alignment(Alignment::Center);
-        let inner = outer_block.inner(area);
-        let body = Paragraph::new(body_text).block(inner_block);
+        let body = Paragraph::new(body_text).block(block);
         frame.render_widget(Clear, area);
-        frame.render_widget(outer_block, area);
-        frame.render_widget(body, inner);
+        frame.render_widget(body, area);
         Ok(())
     }
 }

boot_diags/src/components/results.rs

@@ -84,8 +84,6 @@ impl Component for Results {
             }
             Action::SetMode(mode) => {
                 self.show = mode == Mode::BootDiags;
-                self.key_index = 0;
-                self.line_index = 0;
             }
             _ => {}
         };
@@ -93,7 +91,6 @@ impl Component for Results {
     }
 
     fn draw(&mut self, frame: &mut Frame, rect: Rect) -> Result<()> {
-        return Ok(());
         if !self.show {
             return Ok(());
         }

boot_diags/src/diags.rs

@@ -48,11 +48,6 @@ impl Groups {
         lines
     }
 
-    pub fn reset(&mut self) {
-        self.items.clear();
-        self.order.clear();
-    }
-
     pub fn start(&mut self, title: String) {
         self.order.push(title.clone());
         self.items.insert(

config/config.json5

@@ -112,7 +112,6 @@
       "<Left>": "KeyLeft",
       "<Right>": "KeyRight",
       "<r>": "BootScan",
-      "<s>": "ScanDisks",
       "<q>": "Quit",
       "<Ctrl-d>": "Quit",
       "<Ctrl-c>": "Quit",