Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

assistant panel: Intermediate fix for focus problems (#15674)

Browse source 
This is an intermediate fix for the focus problems in the assistant
panel. Intermediate because I'm going to shred the whole
ConfigurationView now and replace the tabs inside with a list.


Release Notes:

- N/A
This commit is contained in:
Thorsten Ball 2024-08-02 11:05:30 +02:00 • committed by GitHub
parent b4dcd6d394
commit e4608e7f12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 165 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

71
crates/language_model/src/provider/anthropic.rs
View file

@ -383,18 +383,22 @@ impl LanguageModel for AnthropicModel {
}
struct ConfigurationView {
focus_handle: FocusHandle,
api_key_editor: View<Editor>,
state: gpui::Model<State>,
}
impl FocusableView for ConfigurationView {
fn focus_handle(&self, cx: &AppContext) -> FocusHandle {
self.api_key_editor.read(cx).focus_handle(cx)
}
}
impl ConfigurationView {
fn new(state: gpui::Model<State>, cx: &mut WindowContext) -> Self {
fn new(state: gpui::Model<State>, cx: &mut ViewContext<Self>) -> Self {
let focus_handle = cx.focus_handle();
cx.on_focus(&focus_handle, |this, cx| {
if this.should_render_editor(cx) {
this.api_key_editor.read(cx).focus_handle(cx).focus(cx)
}
})
.detach();
Self {
api_key_editor: cx.new_view(|cx| {
let mut editor = Editor::single_line(cx);
@ -404,6 +408,7 @@ impl ConfigurationView {
);
editor
}),
focus_handle,
state,
}
}
@ -453,6 +458,16 @@ impl ConfigurationView {
},
)
}
fn should_render_editor(&self, cx: &mut ViewContext<Self>) -> bool {
!self.state.read(cx).is_authenticated()
}
}
impl FocusableView for ConfigurationView {
fn focus_handle(&self, _cx: &AppContext) -> FocusHandle {
self.focus_handle.clone()
}
}
impl Render for ConfigurationView {
@ -464,26 +479,10 @@ impl Render for ConfigurationView {
"Paste your Anthropic API key below and hit enter to use the assistant:",
];
if self.state.read(cx).is_authenticated() {
h_flex()
.size_full()
.justify_between()
.child(
h_flex()
.gap_2()
.child(Indicator::dot().color(Color::Success))
.child(Label::new("API Key configured").size(LabelSize::Small)),
)
.child(
Button::new("reset-key", "Reset key")
.icon(Some(IconName::Trash))
.icon_size(IconSize::Small)
.icon_position(IconPosition::Start)
.on_click(cx.listener(|this, _, cx| this.reset_api_key(cx))),
)
.into_any()
} else {
if self.should_render_editor(cx) {
v_flex()
.id("anthropic-configuration-view")
.track_focus(&self.focus_handle)
.size_full()
.on_action(cx.listener(Self::save_api_key))
.children(
@ -506,6 +505,26 @@ impl Render for ConfigurationView {
.size(LabelSize::Small),
)
.into_any()
} else {
h_flex()
.id("anthropic-configuration-view")
.track_focus(&self.focus_handle)
.size_full()
.justify_between()
.child(
h_flex()
.gap_2()
.child(Indicator::dot().color(Color::Success))
.child(Label::new("API Key configured").size(LabelSize::Small)),
)
.child(
Button::new("reset-key", "Reset key")
.icon(Some(IconName::Trash))
.icon_size(IconSize::Small)
.icon_position(IconPosition::Start)
.on_click(cx.listener(|this, _, cx| this.reset_api_key(cx))),
)
.into_any()
}
}
}

63
crates/language_model/src/provider/google.rs
View file

@ -292,12 +292,22 @@ impl LanguageModel for GoogleLanguageModel {
}
struct ConfigurationView {
focus_handle: FocusHandle,
api_key_editor: View<Editor>,
state: gpui::Model<State>,
}
impl ConfigurationView {
fn new(state: gpui::Model<State>, cx: &mut WindowContext) -> Self {
fn new(state: gpui::Model<State>, cx: &mut ViewContext<Self>) -> Self {
let focus_handle = cx.focus_handle();
cx.on_focus(&focus_handle, |this, cx| {
if this.should_render_editor(cx) {
this.api_key_editor.read(cx).focus_handle(cx).focus(cx)
}
})
.detach();
Self {
api_key_editor: cx.new_view(|cx| {
let mut editor = Editor::single_line(cx);
@ -305,6 +315,7 @@ impl ConfigurationView {
editor
}),
state,
focus_handle,
}
}
@ -362,11 +373,15 @@ impl ConfigurationView {
},
)
}
fn should_render_editor(&self, cx: &mut ViewContext<Self>) -> bool {
!self.state.read(cx).is_authenticated()
}
}
impl FocusableView for ConfigurationView {
fn focus_handle(&self, cx: &AppContext) -> FocusHandle {
self.api_key_editor.read(cx).focus_handle(cx)
fn focus_handle(&self, _cx: &AppContext) -> FocusHandle {
self.focus_handle.clone()
}
}
@ -379,26 +394,10 @@ impl Render for ConfigurationView {
"Paste your Google AI API key below and hit enter to use the assistant:",
];
if self.state.read(cx).is_authenticated() {
h_flex()
.size_full()
.justify_between()
.child(
h_flex()
.gap_2()
.child(Indicator::dot().color(Color::Success))
.child(Label::new("API Key configured").size(LabelSize::Small)),
)
.child(
Button::new("reset-key", "Reset key")
.icon(Some(IconName::Trash))
.icon_size(IconSize::Small)
.icon_position(IconPosition::Start)
.on_click(cx.listener(|this, _, cx| this.reset_api_key(cx))),
)
.into_any()
} else {
if self.should_render_editor(cx) {
v_flex()
.id("google-ai-configuration-view")
.track_focus(&self.focus_handle)
.size_full()
.on_action(cx.listener(Self::save_api_key))
.children(
@ -421,6 +420,26 @@ impl Render for ConfigurationView {
.size(LabelSize::Small),
)
.into_any()
} else {
h_flex()
.id("google-ai-configuration-view")
.track_focus(&self.focus_handle)
.size_full()
.justify_between()
.child(
h_flex()
.gap_2()
.child(Indicator::dot().color(Color::Success))
.child(Label::new("API Key configured").size(LabelSize::Small)),
)
.child(
Button::new("reset-key", "Reset key")
.icon(Some(IconName::Trash))
.icon_size(IconSize::Small)
.icon_position(IconPosition::Start)
.on_click(cx.listener(|this, _, cx| this.reset_api_key(cx))),
)
.into_any()
}
}
}

63
crates/language_model/src/provider/open_ai.rs
View file

@ -302,12 +302,22 @@ pub fn count_open_ai_tokens(
}
struct ConfigurationView {
focus_handle: FocusHandle,
api_key_editor: View<Editor>,
state: gpui::Model<State>,
}
impl ConfigurationView {
fn new(state: gpui::Model<State>, cx: &mut WindowContext) -> Self {
fn new(state: gpui::Model<State>, cx: &mut ViewContext<Self>) -> Self {
let focus_handle = cx.focus_handle();
cx.on_focus(&focus_handle, |this, cx| {
if this.should_render_editor(cx) {
this.api_key_editor.read(cx).focus_handle(cx).focus(cx)
}
})
.detach();
Self {
api_key_editor: cx.new_view(|cx| {
let mut editor = Editor::single_line(cx);
@ -318,6 +328,7 @@ impl ConfigurationView {
editor
}),
state,
focus_handle,
}
}
@ -375,11 +386,15 @@ impl ConfigurationView {
},
)
}
fn should_render_editor(&self, cx: &mut ViewContext<Self>) -> bool {
!self.state.read(cx).is_authenticated()
}
}
impl FocusableView for ConfigurationView {
fn focus_handle(&self, cx: &AppContext) -> FocusHandle {
self.api_key_editor.read(cx).focus_handle(cx)
fn focus_handle(&self, _cx: &AppContext) -> FocusHandle {
self.focus_handle.clone()
}
}
@ -394,26 +409,10 @@ impl Render for ConfigurationView {
"Paste your OpenAI API key below and hit enter to use the assistant:",
];
if self.state.read(cx).is_authenticated() {
h_flex()
.size_full()
.justify_between()
.child(
h_flex()
.gap_2()
.child(Indicator::dot().color(Color::Success))
.child(Label::new("API Key configured").size(LabelSize::Small)),
)
.child(
Button::new("reset-key", "Reset key")
.icon(Some(IconName::Trash))
.icon_size(IconSize::Small)
.icon_position(IconPosition::Start)
.on_click(cx.listener(|this, _, cx| this.reset_api_key(cx))),
)
.into_any()
} else {
if self.should_render_editor(cx) {
v_flex()
.id("openai-configuration-view")
.track_focus(&self.focus_handle)
.size_full()
.on_action(cx.listener(Self::save_api_key))
.children(
@ -436,6 +435,26 @@ impl Render for ConfigurationView {
.size(LabelSize::Small),
)
.into_any()
} else {
h_flex()
.id("openai-configuration-view")
.track_focus(&self.focus_handle)
.size_full()
.justify_between()
.child(
h_flex()
.gap_2()
.child(Indicator::dot().color(Color::Success))
.child(Label::new("API Key configured").size(LabelSize::Small)),
)
.child(
Button::new("reset-key", "Reset key")
.icon(Some(IconName::Trash))
.icon_size(IconSize::Small)
.icon_position(IconPosition::Start)
.on_click(cx.listener(|this, _, cx| this.reset_api_key(cx))),
)
.into_any()
}
}
}