Skip to content

Commit 30ae798

Browse files
committed
Refine settings UI visibility and prompt field tooltip logic to conditionally display configuration options and buttons based on active providers and prompt types
- hide items with 'select default configuration', when there are no configurations - in some edge case state the tooltip 'voice input' never disappears - tooltip text is not nicely wrapped to multi-line
1 parent 2103848 commit 30ae798

5 files changed

Lines changed: 150 additions & 96 deletions

File tree

‎apps/editor/src/views/settings/frontend/Home/sections/ApiConfigurationsSection.tsx‎

Lines changed: 75 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -254,69 +254,81 @@ export const ApiConfigurationsSection = forwardRef<HTMLDivElement, Props>(
254254
)}
255255
/>
256256
)}
257-
<DefaultConfigurationSelector
258-
title={t('configurations.tool.intelligent-update')}
259-
value={props.defaults['intelligent-update'] || null}
260-
configurations={props.api_configurations}
261-
on_unset={() =>
262-
props.on_set_default_api_configuration(
263-
'intelligent-update',
264-
null
265-
)
266-
}
267-
on_select={() =>
268-
props.on_select_default_api_configuration('intelligent-update')
269-
}
270-
translations={{
271-
select: t('configurations.action.select-default'),
272-
unset: t('configurations.action.unset-default')
273-
}}
274-
/>
275-
<DefaultConfigurationSelector
276-
title={t('configurations.tool.code-at-cursor')}
277-
value={props.defaults['code-at-cursor'] || null}
278-
configurations={props.api_configurations}
279-
on_unset={() =>
280-
props.on_set_default_api_configuration('code-at-cursor', null)
281-
}
282-
on_select={() =>
283-
props.on_select_default_api_configuration('code-at-cursor')
284-
}
285-
translations={{
286-
select: t('configurations.action.select-default'),
287-
unset: t('configurations.action.unset-default')
288-
}}
289-
/>
290-
<DefaultConfigurationSelector
291-
title={t('configurations.tool.commit-messages')}
292-
value={props.defaults['commit-messages'] || null}
293-
configurations={props.api_configurations}
294-
on_unset={() =>
295-
props.on_set_default_api_configuration('commit-messages', null)
296-
}
297-
on_select={() =>
298-
props.on_select_default_api_configuration('commit-messages')
299-
}
300-
translations={{
301-
select: t('configurations.action.select-default'),
302-
unset: t('configurations.action.unset-default')
303-
}}
304-
/>
305-
<DefaultConfigurationSelector
306-
title={t('configurations.tool.voice-input')}
307-
value={props.defaults['voice-input'] || null}
308-
configurations={props.api_configurations}
309-
on_unset={() =>
310-
props.on_set_default_api_configuration('voice-input', null)
311-
}
312-
on_select={() =>
313-
props.on_select_default_api_configuration('voice-input')
314-
}
315-
translations={{
316-
select: t('configurations.action.select-default'),
317-
unset: t('configurations.action.unset-default')
318-
}}
319-
/>
257+
{props.api_configurations.length > 0 && (
258+
<>
259+
<DefaultConfigurationSelector
260+
title={t('configurations.tool.intelligent-update')}
261+
value={props.defaults['intelligent-update'] || null}
262+
configurations={props.api_configurations}
263+
on_unset={() =>
264+
props.on_set_default_api_configuration(
265+
'intelligent-update',
266+
null
267+
)
268+
}
269+
on_select={() =>
270+
props.on_select_default_api_configuration(
271+
'intelligent-update'
272+
)
273+
}
274+
translations={{
275+
select: t('configurations.action.select-default'),
276+
unset: t('configurations.action.unset-default')
277+
}}
278+
/>
279+
<DefaultConfigurationSelector
280+
title={t('configurations.tool.code-at-cursor')}
281+
value={props.defaults['code-at-cursor'] || null}
282+
configurations={props.api_configurations}
283+
on_unset={() =>
284+
props.on_set_default_api_configuration(
285+
'code-at-cursor',
286+
null
287+
)
288+
}
289+
on_select={() =>
290+
props.on_select_default_api_configuration('code-at-cursor')
291+
}
292+
translations={{
293+
select: t('configurations.action.select-default'),
294+
unset: t('configurations.action.unset-default')
295+
}}
296+
/>
297+
<DefaultConfigurationSelector
298+
title={t('configurations.tool.commit-messages')}
299+
value={props.defaults['commit-messages'] || null}
300+
configurations={props.api_configurations}
301+
on_unset={() =>
302+
props.on_set_default_api_configuration(
303+
'commit-messages',
304+
null
305+
)
306+
}
307+
on_select={() =>
308+
props.on_select_default_api_configuration('commit-messages')
309+
}
310+
translations={{
311+
select: t('configurations.action.select-default'),
312+
unset: t('configurations.action.unset-default')
313+
}}
314+
/>
315+
<DefaultConfigurationSelector
316+
title={t('configurations.tool.voice-input')}
317+
value={props.defaults['voice-input'] || null}
318+
configurations={props.api_configurations}
319+
on_unset={() =>
320+
props.on_set_default_api_configuration('voice-input', null)
321+
}
322+
on_select={() =>
323+
props.on_select_default_api_configuration('voice-input')
324+
}
325+
translations={{
326+
select: t('configurations.action.select-default'),
327+
unset: t('configurations.action.unset-default')
328+
}}
329+
/>
330+
</>
331+
)}
320332
</UiGroup>
321333
</div>
322334
<div ref={(el) => props.set_section_ref('instructions', el)}>

‎apps/editor/src/views/settings/frontend/Home/sections/WebConfigurationsSection.tsx‎

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,13 @@ export const WebConfigurationsSection = forwardRef<HTMLDivElement, Props>(
6060
(props, ref) => {
6161
const { t } = use_translation()
6262

63+
const has_gemini = props.web_configurations.some(
64+
(c) => c.chatbot == 'Gemini'
65+
)
66+
const has_ai_studio = props.web_configurations.some(
67+
(c) => c.chatbot == 'AI Studio'
68+
)
69+
6370
const [gemini_user_id_str, set_gemini_user_id_str] = useState('')
6471
const [ai_studio_user_id_str, set_ai_studio_user_id_str] = useState('')
6572

@@ -257,32 +264,36 @@ export const WebConfigurationsSection = forwardRef<HTMLDivElement, Props>(
257264
)}
258265
/>
259266
)}
260-
<UiItem
261-
title={t('preferences.gemini-user-id.title')}
262-
description={t('preferences.gemini-user-id.description')}
263-
slot_right={
264-
<UiInput
265-
type="number"
266-
value={gemini_user_id_str}
267-
on_change={set_gemini_user_id_str}
268-
on_blur={handle_gemini_user_id_blur}
269-
max_width={60}
270-
/>
271-
}
272-
/>
273-
<UiItem
274-
title={t('preferences.ai-studio-user-id.title')}
275-
description={t('preferences.ai-studio-user-id.description')}
276-
slot_right={
277-
<UiInput
278-
type="number"
279-
value={ai_studio_user_id_str}
280-
on_change={set_ai_studio_user_id_str}
281-
on_blur={handle_ai_studio_user_id_blur}
282-
max_width={60}
283-
/>
284-
}
285-
/>
267+
{has_gemini && (
268+
<UiItem
269+
title={t('preferences.gemini-user-id.title')}
270+
description={t('preferences.gemini-user-id.description')}
271+
slot_right={
272+
<UiInput
273+
type="number"
274+
value={gemini_user_id_str}
275+
on_change={set_gemini_user_id_str}
276+
on_blur={handle_gemini_user_id_blur}
277+
max_width={60}
278+
/>
279+
}
280+
/>
281+
)}
282+
{has_ai_studio && (
283+
<UiItem
284+
title={t('preferences.ai-studio-user-id.title')}
285+
description={t('preferences.ai-studio-user-id.description')}
286+
slot_right={
287+
<UiInput
288+
type="number"
289+
value={ai_studio_user_id_str}
290+
on_change={set_ai_studio_user_id_str}
291+
on_blur={handle_ai_studio_user_id_blur}
292+
max_width={60}
293+
/>
294+
}
295+
/>
296+
)}
286297
</UiGroup>
287298
</div>
288299
</UiSection>

‎packages/ui/src/components/editor/panel/prompts/PromptField/PromptField.tsx‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,39 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
108108
>(null)
109109

110110
useEffect(() => {
111-
if (!props.value) {
111+
const has_submit_button =
112+
(!props.is_web_mode || (props.is_web_mode && props.is_connected)) &&
113+
!props.is_recording &&
114+
(!!props.value || props.prompt_type === 'code-at-cursor')
115+
116+
if (!has_submit_button) {
112117
set_show_submit_tooltip(false)
113118
}
114-
}, [props.value])
119+
}, [
120+
props.value,
121+
props.is_recording,
122+
props.is_web_mode,
123+
props.is_connected,
124+
props.prompt_type
125+
])
126+
127+
useEffect(() => {
128+
const has_mic_button =
129+
props.is_web_mode && !props.is_connected
130+
? props.is_recording || !props.value
131+
: props.is_recording ||
132+
(!props.value && props.prompt_type !== 'code-at-cursor')
133+
134+
if (!has_mic_button) {
135+
set_is_recording_hovered(false)
136+
}
137+
}, [
138+
props.value,
139+
props.is_recording,
140+
props.is_web_mode,
141+
props.is_connected,
142+
props.prompt_type
143+
])
115144

116145
useEffect(() => {
117146
if (props.warning && input_ref.current) {

‎packages/ui/src/components/editor/panel/prompts/PromptField/components/Tooltip.module.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
}
5959

6060
&__details {
61-
margin-left: 2px;
61+
margin-left: 4px;
6262
opacity: var(--dimmed-opacity);
6363
}
6464
}

‎packages/ui/src/components/editor/panel/prompts/PromptField/components/Tooltip.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ export const Tooltip: React.FC<TooltipProps> = (params) => (
2424
: undefined
2525
}
2626
>
27-
{params.message}
28-
{params.details && (
29-
<span className={styles.tooltip__details}>{params.details}</span>
30-
)}
27+
<span>
28+
{params.message}
29+
{params.details && (
30+
<span className={styles.tooltip__details}>{params.details}</span>
31+
)}
32+
</span>
3133
</div>
3234
)

0 commit comments

Comments
 (0)