From 6ead57d5ed5191eaa9b7be6679a6cd730606c7ba Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Thu, 27 Mar 2025 13:43:25 -0400
Subject: [PATCH] assistant2: Fix navigation between states in manage profiles
 modal (#27613)

This PR fixes the navigation between states in the manage profiles
modal, specifically around dismissal.

Release Notes:

- N/A
---
 .../manage_profiles_modal.rs                  | 67 ++++++++++++++-----
 1 file changed, 51 insertions(+), 16 deletions(-)

diff --git a/crates/assistant2/src/assistant_configuration/manage_profiles_modal.rs b/crates/assistant2/src/assistant_configuration/manage_profiles_modal.rs
index 99867b09ba..05fadb1aed 100644
--- a/crates/assistant2/src/assistant_configuration/manage_profiles_modal.rs
+++ b/crates/assistant2/src/assistant_configuration/manage_profiles_modal.rs
@@ -13,7 +13,10 @@ use crate::assistant_configuration::tool_picker::{ToolPicker, ToolPickerDelegate
 use crate::{AssistantPanel, ManageProfiles};
 
 enum Mode {
-    ChooseProfile(Entity<ProfilePicker>),
+    ChooseProfile {
+        profile_picker: Entity<ProfilePicker>,
+        _subscription: Subscription,
+    },
     ViewProfile(ViewProfileMode),
     ConfigureTools {
         tool_picker: Entity<ToolPicker>,
@@ -21,6 +24,36 @@ enum Mode {
     },
 }
 
+impl Mode {
+    pub fn choose_profile(window: &mut Window, cx: &mut Context<ManageProfilesModal>) -> Self {
+        let this = cx.entity();
+
+        let profile_picker = cx.new(|cx| {
+            let delegate = ProfilePickerDelegate::new(
+                move |profile_id, window, cx| {
+                    this.update(cx, |this, cx| {
+                        this.view_profile(profile_id.clone(), window, cx);
+                    })
+                },
+                cx,
+            );
+            ProfilePicker::new(delegate, window, cx)
+        });
+        let dismiss_subscription = cx.subscribe_in(
+            &profile_picker,
+            window,
+            |_this, _profile_picker, _: &DismissEvent, _window, cx| {
+                cx.emit(DismissEvent);
+            },
+        );
+
+        Self::ChooseProfile {
+            profile_picker,
+            _subscription: dismiss_subscription,
+        }
+    }
+}
+
 #[derive(Clone)]
 pub struct ViewProfileMode {
     profile_id: Arc<str>,
@@ -57,26 +90,20 @@ impl ManageProfilesModal {
         cx: &mut Context<Self>,
     ) -> Self {
         let focus_handle = cx.focus_handle();
-        let handle = cx.entity();
 
         Self {
             fs,
             tools,
             focus_handle,
-            mode: Mode::ChooseProfile(cx.new(|cx| {
-                let delegate = ProfilePickerDelegate::new(
-                    move |profile_id, window, cx| {
-                        handle.update(cx, |this, cx| {
-                            this.view_profile(profile_id.clone(), window, cx);
-                        })
-                    },
-                    cx,
-                );
-                ProfilePicker::new(delegate, window, cx)
-            })),
+            mode: Mode::choose_profile(window, cx),
         }
     }
 
+    fn choose_profile(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.mode = Mode::choose_profile(window, cx);
+        self.focus_handle(cx).focus(window);
+    }
+
     pub fn view_profile(
         &mut self,
         profile_id: Arc<str>,
@@ -127,7 +154,13 @@ impl ManageProfilesModal {
 
     fn confirm(&mut self, _window: &mut Window, _cx: &mut Context<Self>) {}
 
-    fn cancel(&mut self, _window: &mut Window, _cx: &mut Context<Self>) {}
+    fn cancel(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        match &self.mode {
+            Mode::ChooseProfile { .. } => {}
+            Mode::ViewProfile(_) => self.choose_profile(window, cx),
+            Mode::ConfigureTools { .. } => {}
+        }
+    }
 }
 
 impl ModalView for ManageProfilesModal {}
@@ -135,7 +168,7 @@ impl ModalView for ManageProfilesModal {}
 impl Focusable for ManageProfilesModal {
     fn focus_handle(&self, cx: &App) -> FocusHandle {
         match &self.mode {
-            Mode::ChooseProfile(profile_picker) => profile_picker.focus_handle(cx),
+            Mode::ChooseProfile { profile_picker, .. } => profile_picker.focus_handle(cx),
             Mode::ConfigureTools { tool_picker, .. } => tool_picker.focus_handle(cx),
             Mode::ViewProfile(_) => self.focus_handle.clone(),
         }
@@ -205,7 +238,9 @@ impl Render for ManageProfilesModal {
             }))
             .on_mouse_down_out(cx.listener(|_this, _, _, cx| cx.emit(DismissEvent)))
             .child(match &self.mode {
-                Mode::ChooseProfile(profile_picker) => profile_picker.clone().into_any_element(),
+                Mode::ChooseProfile { profile_picker, .. } => {
+                    profile_picker.clone().into_any_element()
+                }
                 Mode::ViewProfile(mode) => self
                     .render_view_profile(mode.clone(), window, cx)
                     .into_any_element(),