Finished connecting to new UI. Added an event for updating the tasks …

…in the table

crates/turborepo-lib/src/commands/run.rs

@@ -44,10 +44,7 @@ pub async fn run(base: CommandBase, telemetry: CommandEventBuilder) -> Result<i3
             .build(&handler, telemetry)
             .await?;
 
-        let (sender, handle) = run
-            .has_experimental_ui()
-            .then(|| run.start_experimental_ui())
-            .unzip();
+        let (sender, handle) = run.start_experimental_ui().unzip();
 
         let result = run.run(sender.clone()).await;
 

crates/turborepo-lib/src/run/mod.rs

@@ -122,12 +122,16 @@ impl Run {
         self.experimental_ui
     }
 
-    pub fn start_experimental_ui(&self) -> (AppSender, JoinHandle<Result<(), tui::Error>>) {
+    pub fn start_experimental_ui(&self) -> Option<(AppSender, JoinHandle<Result<(), tui::Error>>)> {
+        if !self.experimental_ui {
+            return None;
+        }
+
         let task_names = self.engine.tasks_with_command(&self.pkg_dep_graph);
         let (sender, receiver) = AppSender::new();
         let handle = tokio::task::spawn_blocking(move || tui::run_app(task_names, receiver));
 
-        (sender, handle)
+        Some((sender, handle))
     }
 
     pub async fn run(&mut self, experimental_ui_sender: Option<AppSender>) -> Result<i32, Error> {

crates/turborepo-lib/src/run/watch.rs

@@ -91,6 +91,8 @@ pub enum Error {
     SignalInterrupt,
     #[error("package change error")]
     PackageChange(#[from] tonic::Status),
+    #[error("could not connect to UI thread")]
+    UISendError(String),
 }
 
 impl WatchClient {
@@ -112,10 +114,7 @@ impl WatchClient {
             .build(&handler, telemetry.clone())
             .await?;
 
-        let (sender, handle) = run
-            .has_experimental_ui()
-            .then(|| run.start_experimental_ui())
-            .unzip();
+        let (sender, handle) = run.start_experimental_ui().unzip();
 
         let connector = DaemonConnector {
             can_start_server: true,
@@ -298,18 +297,11 @@ impl WatchClient {
                     .build(&self.handler, self.telemetry.clone())
                     .await?;
 
-                if self.run.has_experimental_ui() {
-                    if let Some(handle) = &self.ui_handle {
-                        handle.abort();
-                    }
-
-                    let (sender, handle) = self
-                        .run
-                        .has_experimental_ui()
-                        .then(|| self.run.start_experimental_ui())
-                        .unzip();
-                    self.ui_sender = sender;
-                    self.ui_handle = handle;
+                if let Some(sender) = &self.ui_sender {
+                    let task_names = self.run.engine.tasks_with_command(&self.run.pkg_dep_graph);
+                    sender
+                        .update_tasks(task_names)
+                        .map_err(|err| Error::UISendError(err.to_string()))?;
                 }
 
                 if self.run.has_persistent_tasks() {

crates/turborepo-ui/src/tui/app.rs

@@ -77,6 +77,10 @@ impl<I> App<I> {
     pub fn term_size(&self) -> (u16, u16) {
         self.pane.term_size()
     }
+
+    pub fn update_tasks(&mut self, tasks: Vec<String>) {
+        self.table = TaskTable::new(tasks.clone());
+    }
 }
 
 impl<I: std::io::Write> App<I> {
@@ -238,6 +242,10 @@ fn update(
         Event::SetStdin { task, stdin } => {
             app.pane.insert_stdin(&task, Some(stdin))?;
         }
+        Event::UpdateTasks { tasks } => {
+            app.update_tasks(tasks);
+            app.table.tick();
+        }
     }
     Ok(None)
 }

crates/turborepo-ui/src/tui/event.rs

@@ -29,6 +29,9 @@ pub enum Event {
     Input {
         bytes: Vec<u8>,
     },
+    UpdateTasks {
+        tasks: Vec<String>,
+    },
 }
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]

crates/turborepo-ui/src/tui/handle.rs

@@ -56,6 +56,11 @@ impl AppSender {
         // it'll be a no-op.
         self.primary.send(Event::Stop).ok();
     }
+
+    /// Update the list of tasks displayed in the TUI
+    pub fn update_tasks(&self, tasks: Vec<String>) -> Result<(), mpsc::SendError<Event>> {
+        self.primary.send(Event::UpdateTasks { tasks })
+    }
 }
 
 impl AppReceiver {

crates/turborepo-ui/src/tui/input.rs

@@ -23,7 +23,7 @@ pub fn input(interact: bool) -> Result<Option<Event>, Error> {
     }
 }
 
-/// Converts a crostterm key event into a TUI interaction event
+/// Converts a crossterm key event into a TUI interaction event
 fn translate_key_event(interact: bool, key_event: KeyEvent) -> Option<Event> {
     // On Windows events for releasing a key are produced
     // We skip these to avoid emitting 2 events per key press.