[wicket] update to ratatui 0.26 (#4991)

Just a couple small updates.
oxidecomputer · Feb 6, 2024 · 8f8cca5 · 8f8cca5
1 parent ddd0367
commit 8f8cca5
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 50 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -314,7 +314,7 @@ propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev
 proptest = "1.4.0"
 quote = "1.0"
 rand = "0.8.5"
-ratatui = "0.25.0"
+ratatui = "0.26.0"
 rayon = "1.8"
 rcgen = "0.12.1"
 reedline = "0.28.0"
@@ -400,7 +400,7 @@ trust-dns-server = "0.22"
 trybuild = "1.0.89"
 tufaceous = { path = "tufaceous" }
 tufaceous-lib = { path = "tufaceous-lib" }
-tui-tree-widget = "0.16.0"
+tui-tree-widget = "0.17.0"
 unicode-width = "0.1.11"
 update-common = { path = "update-common" }
 update-engine = { path = "update-engine" }

diff --git a/wicket/src/ui/panes/update.rs b/wicket/src/ui/panes/update.rs
@@ -1435,12 +1435,13 @@ impl UpdatePane {
             Constraint::Length(cell_width),
             Constraint::Length(cell_width),
         ];
-        let header_table = Table::new(std::iter::empty(), &width_constraints)
-            .header(
-                Row::new(vec!["COMPONENT", "VERSION", "TARGET", "STATUS"])
-                    .style(header_style),
-            )
-            .block(block.clone().title("OVERVIEW (* = active)"));
+        let header_table =
+            Table::new(std::iter::empty::<Row>(), &width_constraints)
+                .header(
+                    Row::new(vec!["COMPONENT", "VERSION", "TARGET", "STATUS"])
+                        .style(header_style),
+                )
+                .block(block.clone().title("OVERVIEW (* = active)"));
         frame.render_widget(header_table, self.table_headers_rect);
 
         // For the selected item, draw the version table.

diff --git a/wicket/src/ui/widgets/ignition.rs b/wicket/src/ui/widgets/ignition.rs
@@ -61,29 +61,26 @@ impl IgnitionPopup {
                 format!("IGNITION: {}", component.to_string_uppercase()),
                 style::header(true),
             )]),
-            body: Text {
-                lines: vec![
-                    Line::from(vec![Span::styled(
-                        "Power On",
-                        style::line(
-                            self.selected_command == IgnitionCommand::PowerOn,
-                        ),
-                    )]),
-                    Line::from(vec![Span::styled(
-                        "Power Off",
-                        style::line(
-                            self.selected_command == IgnitionCommand::PowerOff,
-                        ),
-                    )]),
-                    Line::from(vec![Span::styled(
-                        "Power Reset",
-                        style::line(
-                            self.selected_command
-                                == IgnitionCommand::PowerReset,
-                        ),
-                    )]),
-                ],
-            },
+            body: Text::from(vec![
+                Line::from(vec![Span::styled(
+                    "Power On",
+                    style::line(
+                        self.selected_command == IgnitionCommand::PowerOn,
+                    ),
+                )]),
+                Line::from(vec![Span::styled(
+                    "Power Off",
+                    style::line(
+                        self.selected_command == IgnitionCommand::PowerOff,
+                    ),
+                )]),
+                Line::from(vec![Span::styled(
+                    "Power Reset",
+                    style::line(
+                        self.selected_command == IgnitionCommand::PowerReset,
+                    ),
+                )]),
+            ]),
             buttons: vec![ButtonText::new("Close", "Esc")],
         }
     }