chore(widgets): move over to bundle

Author: grampelberg

Cargo.lock

@@ -23,7 +23,7 @@ categories = ["command-line-interface"]
 [dependencies]
 ansi-to-tui = "6.0.0"
 async-trait = "0.1.82"
-bon = "2.1.1"
+bon = "2.2.1"
 cata = { version = "0.1.1" }
 chrono = { version = "0.4.38", features = ["serde"] }
 clap = { version = "4.5.17", features = ["derive", "env"] }
@@ -45,7 +45,7 @@ itertools = "0.13.0"
 json_value_merge = "2.0.0"
 jsonwebtoken = "9.3.0"
 k8s-openapi = { version = "0.22.0", features = ["earliest"] }
-kube = { version = "0.93.1", features = ["derive", "runtime", "ws"] }
+kube = { version = "0.94.1", features = ["derive", "runtime", "ws"] }
 lazy_static = "1.5.0"
 local-ip-address = "0.6.2"
 mio = "1.0.2"
@@ -72,7 +72,7 @@ ssh-key = "0.6.6"
 strum = { version = "0.26.3", features = ["derive"] }
 strum_macros = "0.26.4"
 syntect = "5.2.0"
-syntect-tui = { git = " https://github.com/grampelberg/syntect-tui.git", branch = "ratatui-0.28.1" }
+syntect-tui = "3.0.4"
 tachyonfx = "0.6.0"
 tokio = { version = "1.40.0", features = ["full", "tracing"] }
 tokio-util = { version = "0.7.12", features = ["io-util"] }

Cargo.toml

@@ -1,7 +1,20 @@
 # TODO
 
+- Implement multi-cluster.
+
 ## Documentation
 
+- Getting started needs help, in particular:
+  - Granting your user should probably go before the install instructions.
+  - Say something about the error when you don't have authorization.
+- Make the getting started on a real cluster instructions more clear. In
+  particular, it seems like it is a little difficult to see the install commands
+  and realize that's what you need to use.
+
+## `users grant`
+
+- Allow YAML output for users who don't have a `kubeconfig`.
+
 ## Authorization
 
 - Groups are probably what most users are going to want to use to configure all
@@ -26,7 +39,15 @@
 
 ## TUI
 
-- Allow wrapping around with the tabs (so left from 0 goes to the end).
+- Implement vim [key bindings](https://vim.rtorr.com).
+
+- Move navigation dispatch (up, down) into common code.
+
+- Add routing back in.
+
+- It feels like it'd be nice to just try to run the default command and if it
+  errors give the user the option to change. That way, going to the shell tab
+  will ~immediately jump into the pod.
 
 - Dashboard as a struct doesn't really make sense anymore, it should likely be
   converted over to a simple function.
@@ -82,8 +103,15 @@
 
 ## Build
 
+- Figure out why `git cliff` goes `0.2.0` -> `0.2.1` -> `0.3.0` instead of
+  `0.2.2`.
 - Move client_id and config_url to a build-time concern.
 
+## Deployment
+
+- Add `kustomize` to allow for an easier getting started.
+- Make `helm install` work if someone's checked the repo out.
+
 ## Misc
 
 - Move to [bon](https://docs.rs/bon/latest/bon/) instead of `derive_builder`.

TODO.md

@@ -11,7 +11,12 @@ pub enum Broadcast {
     Consumed,
     Ignored,
     Exited,
+    // Switch to raw mode - where input is passed directly to a single widget.
     Raw(Box<dyn Raw>),
+    // Allows a child component to communicate to a parent that there was a selection event which
+    // occurred in it. The parent is expected to handle this as part of propagating the dispatch
+    // back to the apex.
+    Selected(usize),
 }
 
 #[derive(Debug, Clone)]

src/events.rs

@@ -14,7 +14,7 @@ use ratatui::{
 };
 
 use super::{age::Age, Compare};
-use crate::widget::{table::RowStyle, TableRow};
+use crate::widget::table;
 
 #[allow(clippy::module_name_repetitions)]
 pub trait ContainerExt {
@@ -196,8 +196,8 @@ impl ContainerExt for Container {
     }
 }
 
-impl<'a> TableRow<'a> for Container {
-    fn header() -> Option<Row<'a>> {
+impl table::Row for Container {
+    fn header<'a>() -> Option<Row<'a>> {
         Some(Row::new(vec![
             Cell::from("Name"),
             Cell::from("Image"),
@@ -219,7 +219,7 @@ impl<'a> TableRow<'a> for Container {
         ]
     }
 
-    fn row(&self, style: &RowStyle) -> Row {
+    fn row(&self, style: &table::RowStyle) -> Row {
         Row::new(vec![
             Cell::from(self.name_any()),
             Cell::from(self.image()),

src/resources/container.rs

@@ -19,10 +19,7 @@ use super::{
     container::{Container, ContainerExt},
     Compare, Filter,
 };
-use crate::widget::{
-    table::{Content, RowStyle},
-    TableRow,
-};
+use crate::widget::table;
 
 pub enum Phase {
     Pending,
@@ -227,8 +224,8 @@ impl PodExt for Pod {
     }
 }
 
-impl<'a> TableRow<'a> for Arc<Pod> {
-    fn header() -> Option<Row<'a>> {
+impl table::Row for Arc<Pod> {
+    fn header<'a>() -> Option<Row<'a>> {
         Some(Row::new(vec![
             Cell::from("Namespace"),
             Cell::from("Name"),
@@ -250,7 +247,7 @@ impl<'a> TableRow<'a> for Arc<Pod> {
         ]
     }
 
-    fn row(&self, style: &RowStyle) -> Row {
+    fn row(&self, style: &table::RowStyle) -> Row {
         Row::new(vec![
             self.namespace().unwrap_or_default(),
             self.name_any(),
@@ -288,8 +285,10 @@ impl Compare for Arc<Pod> {
     }
 }
 
-impl<'a> Content<'a, Container> for Arc<Pod> {
-    fn items(&self, filter: Option<String>) -> Vec<impl TableRow<'a>> {
+impl table::Items for Arc<Pod> {
+    type Item = Container;
+
+    fn items(&self, filter: Option<String>) -> Vec<Self::Item> {
         self.containers(filter)
     }
 }

src/resources/pod.rs

@@ -15,7 +15,7 @@ use serde::de::DeserializeOwned;
 use tokio::task::JoinHandle;
 
 use super::{Compare, Filter};
-use crate::widget::{table, TableRow};
+use crate::widget::table;
 
 async fn is_ready<K>(reader: reflector::Store<K>) -> Result<(), WriterDropped>
 where
@@ -124,7 +124,7 @@ where
     }
 }
 
-impl<'a, K> table::Content<'a, Arc<K>> for Arc<Store<K>>
+impl<K> table::Items for Arc<Store<K>>
 where
     K: Filter
         + kube::Resource<DynamicType = ()>
@@ -134,9 +134,11 @@ where
         + Sync
         + DeserializeOwned
         + 'static,
-    Arc<K>: TableRow<'a> + Compare,
+    Arc<K>: table::Row + Compare,
 {
-    fn items(&self, filter: Option<String>) -> Vec<impl TableRow<'a>> {
+    type Item = Arc<K>;
+
+    fn items(&self, filter: Option<String>) -> Vec<Self::Item> {
         Store::items(self, filter)
     }
 }

src/resources/store.rs

@@ -17,7 +17,7 @@ use prometheus_static_metric::make_static_metric;
 use ratatui::{layout::Constraint, widgets::Row};
 use tokio::io::{AsyncRead, AsyncWrite};
 
-use crate::widget::{table::RowStyle, TableRow};
+use crate::widget::table;
 
 make_static_metric! {
     pub struct ResourceVec: IntCounter {
@@ -141,7 +141,19 @@ impl PartialEq for Tunnel {
 
 impl Eq for Tunnel {}
 
-impl<'a> TableRow<'a> for Tunnel {
+impl PartialOrd for Tunnel {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for Tunnel {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.addr().cmp(&other.addr())
+    }
+}
+
+impl table::Row for Tunnel {
     fn constraints() -> Vec<Constraint> {
         vec![
             Constraint::Length(10),
@@ -150,7 +162,7 @@ impl<'a> TableRow<'a> for Tunnel {
         ]
     }
 
-    fn row(&self, style: &RowStyle) -> Row {
+    fn row(&self, style: &table::RowStyle) -> Row {
         Row::new(vec![
             self.kind.to_string().to_lowercase(),
             format!("{}:{}", self.host, self.port),