fix: Add failsafe to prevent workspace list from flashing between pro…

…jects
janekbaraniewski · Nov 20, 2024 · 7bf0537 · 7bf0537
1 parent d703f83
commit 7bf0537
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/desktop/src-tauri/src/server.rs b/desktop/src-tauri/src/server.rs
@@ -60,7 +60,7 @@ async fn signal_handler(
     AxumState(server): AxumState<ServerState>,
     Json(payload): Json<SendSignalMessage>,
 ) -> impl IntoResponse {
-    info!("received request to send signa {} to process {}", payload.signal, payload.process_id.to_string());
+    info!("received request to send signal {} to process {}", payload.signal, payload.process_id.to_string());
     #[cfg(not(windows))]
     {
         use nix::sys::signal::{self, kill, Signal};

diff --git a/desktop/src/contexts/DevPodContext/Pro/ProProvider.tsx b/desktop/src/contexts/DevPodContext/Pro/ProProvider.tsx
@@ -53,7 +53,13 @@ export function ProProvider({ host, children }: { host: string; children: ReactN
     }
     setIsLoadingWorkspaces(true)
 
-    return client.watchWorkspaces(currentProject.metadata.name, (workspaces) => {
+    let canceled = false
+
+    const toCancel = client.watchWorkspaces(currentProject.metadata.name, (workspaces) => {
+      if (canceled) {
+        return
+      }
+
       // sort by last activity (newest > oldest)
       const sorted = workspaces.slice().sort((a, b) => {
         const lastActivityA = a.metadata?.annotations?.[Annotations.SleepModeLastActivity]
@@ -70,6 +76,11 @@ export function ProProvider({ host, children }: { host: string; children: ReactN
         setIsLoadingWorkspaces(false)
       }, 1_000)
     })
+
+    return () => {
+      canceled = true
+      toCancel()
+    }
   }, [client, store, currentProject])
 
   const handleProjectChanged = (newProject: ManagementV1Project) => {