[wicket] correctly wrap popup text within step logs

Cargo.toml

@@ -309,6 +309,7 @@ tempdir = "0.3"
 tempfile = "3.5"
 term = "0.7"
 termios = "0.3"
+textwrap = "0.16.0"
 test-strategy = "0.2.1"
 thiserror = "1.0"
 tofino = { git = "http://github.com/oxidecomputer/tofino", branch = "main" }
@@ -327,6 +328,7 @@ trybuild = "1.0.80"
 tufaceous = { path = "tufaceous" }
 tufaceous-lib = { path = "tufaceous-lib" }
 tui = "0.19.0"
+unicode-width = "0.1.10"
 update-engine = { path = "update-engine" }
 uuid = { version = "1.3.2", features = ["serde", "v4"] }
 usdt = "0.3"

wicket/Cargo.toml

@@ -17,6 +17,7 @@ futures.workspace = true
 hex = { workspace = true, features = ["serde"] }
 humantime.workspace = true
 indexmap.workspace = true
+itertools.workspace = true
 omicron-common.workspace = true
 once_cell.workspace = true
 reqwest.workspace = true
@@ -32,11 +33,13 @@ slog-term.workspace = true
 snafu.workspace = true
 libsw.workspace = true
 tar.workspace = true
+textwrap.workspace = true
 tokio = { workspace = true, features = ["full"] }
 tokio-util.workspace = true
 toml.workspace = true
 tui.workspace = true
 tui-tree-widget = "0.11.0"
+unicode-width.workspace = true
 
 update-engine.workspace = true
 wicket-common.workspace = true

wicket/src/ui/mod.rs

@@ -8,6 +8,7 @@ mod main;
 mod panes;
 mod splash;
 mod widgets;
+mod wrap;
 
 use crate::{Action, Cmd, State, Term};
 use slog::{o, Logger};

wicket/src/ui/panes/update.rs

@@ -13,6 +13,7 @@ use crate::ui::defaults::style;
 use crate::ui::widgets::{
     BoxConnector, BoxConnectorKind, ButtonText, IgnitionPopup, Popup,
 };
+use crate::ui::wrap::wrap_text;
 use crate::{Action, Cmd, Frame, State};
 use indexmap::IndexMap;
 use omicron_common::api::internal::nexus::KnownArtifactKind;
@@ -342,9 +343,18 @@ impl UpdatePane {
             }
         }
 
+        // Wrap the text to the maximum popup width.
+        let options = crate::ui::wrap::Options {
+            width: Popup::max_content_width(state.screen_width) as usize,
+            initial_indent: Span::raw(""),
+            subsequent_indent: Span::raw(""),
+            break_words: true,
+        };
+        let wrapped_body = wrap_text(&body, options);
+
         let popup = Popup {
             header,
-            body,
+            body: wrapped_body,
             buttons: vec![ButtonText {
                 instruction: "NAVIGATE",
                 key: "LEFT/RIGHT",

wicket/src/ui/widgets/popup.rs

@@ -9,7 +9,7 @@ use tui::{
     layout::{Constraint, Direction, Layout, Rect},
     style::Style,
     text::{Span, Spans, Text},
-    widgets::{Block, BorderType, Borders, Clear, Paragraph, Widget, Wrap},
+    widgets::{Block, BorderType, Borders, Clear, Paragraph, Widget},
 };
 
 use crate::ui::defaults::dimensions::RectExt;
@@ -69,6 +69,28 @@ impl Popup<'_> {
         });
         u16::try_from(width).unwrap()
     }
+
+    /// Returns the maximum width that this popup can have, including outer
+    /// borders.
+    ///
+    /// This is currently 80% of screen width.
+    pub fn max_width(full_screen_width: u16) -> u16 {
+        (full_screen_width as u32 * 4 / 5) as u16
+    }
+
+    /// Returns the maximum width that this popup can have, not including outer
+    /// borders.
+    pub fn max_content_width(full_screen_width: u16) -> u16 {
+        Self::max_width(full_screen_width).saturating_sub(2)
+    }
+
+    /// Returns the maximum height that this popup can have, including outer
+    /// borders.
+    ///
+    /// This is currently 80% of screen height.
+    pub fn max_height(full_screen_height: u16) -> u16 {
+        (full_screen_height as u32 * 4 / 5) as u16
+    }
 }
 
 impl Widget for Popup<'_> {
@@ -81,10 +103,9 @@ impl Widget for Popup<'_> {
             .border_type(BorderType::Rounded)
             .style(style::selected_line());
 
-        // Constrain width and height to 80% of screen width. Width and height
-        // are u16s and less than 128 so the computation shouldn't overflow.
-        let width = u16::min(self.width(), full_screen.width * 4 / 5);
-        let height = u16::min(self.height(), full_screen.height * 4 / 5);
+        let width = u16::min(self.width(), Self::max_width(full_screen.width));
+        let height =
+            u16::min(self.height(), Self::max_height(full_screen.height));
 
         let rect =
             full_screen.center_horizontally(width).center_vertically(height);
@@ -116,7 +137,8 @@ impl Widget for Popup<'_> {
             .borders(Borders::BOTTOM | Borders::LEFT | Borders::RIGHT)
             .render(chunks[1], buf);
 
-        let body = Paragraph::new(self.body).wrap(Wrap { trim: false });
+        // NOTE: wrapping should be performed externally, by e.g. wrap_text.
+        let body = Paragraph::new(self.body);
 
         let mut body_rect = chunks[1];
         // Ensure we're inside the outer border.