Skip to content

Commit 1bdab37

Browse files
committed
Consolidate configuration selection by replacing specific quick pick utilities with a unified show_configuration_quick_pick function
- make the `apps/editor/src/utils/show-api-configuration-quick-pick.ts` universal (including file name change) so that it can handle web configurations quick pick as well in `apps/editor/src/views/panel/backend/message-handlers/handle-send-to-browser.ts`
1 parent 3aa138c commit 1bdab37

11 files changed

Lines changed: 268 additions & 297 deletions

File tree

‎apps/editor/src/commands/code-at-cursor-command/utils/get-code-at-cursor-config.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ import { LAST_USED_CODE_AT_CURSOR_CONFIG_ID_STATE_KEY } from '@/constants/state-
99
import { PanelProvider } from '@/views/panel/backend/panel-provider'
1010
import { dictionary } from '@shared/constants/dictionary'
1111
import { t } from '@/i18n'
12-
import { show_api_configuration_quick_pick } from '@/utils/show-api-configuration-quick-pick'
12+
import {
13+
show_configuration_quick_pick,
14+
map_api_configuration_to_item
15+
} from '@/utils/show-configuration-quick-pick'
1316

1417
export const get_code_at_cursor_api_configuration = async (params: {
1518
model_providers_manager: ModelProvidersManager
@@ -65,8 +68,9 @@ export const get_code_at_cursor_api_configuration = async (params: {
6568
LAST_USED_CODE_AT_CURSOR_CONFIG_ID_STATE_KEY
6669
)
6770

68-
const result = await show_api_configuration_quick_pick({
69-
api_configurations: code_at_cursor_api_configurations,
71+
const result = await show_configuration_quick_pick({
72+
items: code_at_cursor_api_configurations,
73+
map_item: map_api_configuration_to_item,
7074
last_selected_id,
7175
placeholder: t('command.code-at-cursor.config.placeholder')
7276
})
@@ -75,7 +79,7 @@ export const get_code_at_cursor_api_configuration = async (params: {
7579
return undefined
7680
}
7781

78-
const { api_configuration, id } = result
82+
const { item: api_configuration, id } = result
7983

8084
params.context.workspaceState.update(
8185
LAST_USED_CODE_AT_CURSOR_CONFIG_ID_STATE_KEY,

‎apps/editor/src/commands/search-files-command/utils/prompt-for-config.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ import {
88
import { LAST_USED_FIND_RELEVANT_FILES_CONFIG_ID_STATE_KEY } from '../../../constants/state-keys'
99
import { display_token_count } from '../../../utils/display-token-count'
1010
import { t } from '@/i18n'
11-
import { show_api_configuration_quick_pick } from '../../../utils/show-api-configuration-quick-pick'
11+
import {
12+
show_configuration_quick_pick,
13+
map_api_configuration_to_item
14+
} from '../../../utils/show-configuration-quick-pick'
1215

1316
export const prompt_for_api_configuration = async (params: {
1417
model_providers_manager: ModelProvidersManager
@@ -51,16 +54,17 @@ export const prompt_for_api_configuration = async (params: {
5154
tokens: display_token_count(params.tokens_to_process)
5255
})
5356

54-
const result = await show_api_configuration_quick_pick({
55-
api_configurations: params.api_configurations,
57+
const result = await show_configuration_quick_pick({
58+
items: params.api_configurations,
59+
map_item: map_api_configuration_to_item,
5660
last_selected_id,
5761
placeholder,
5862
show_back_button: true
5963
})
6064

6165
if (result === 'back') return 'back'
6266
if (!result) return 'cancel'
63-
selected_api_configuration = result.api_configuration
67+
selected_api_configuration = result.item
6468
}
6569

6670
if (selected_api_configuration) {

‎apps/editor/src/features/commit-messages/utils/get-commit-message-config.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ import { Logger } from '@shared/utils/logger'
55
import { display_token_count } from '@/utils/display-token-count'
66
import { LAST_USED_COMMIT_MESSAGES_CONFIG_ID_STATE_KEY } from '@/constants/state-keys'
77
import { t } from '@/i18n'
8-
import { show_api_configuration_quick_pick } from '@/utils/show-api-configuration-quick-pick'
8+
import {
9+
show_configuration_quick_pick,
10+
map_api_configuration_to_item
11+
} from '@/utils/show-configuration-quick-pick'
912

1013
export interface CommitMessageApiConfiguration {
1114
model_provider_name: string
@@ -63,8 +66,9 @@ export const get_commit_message_api_configuration = async (
6366
})
6467
: t('common.config.placeholder')
6568

66-
const result = await show_api_configuration_quick_pick({
67-
api_configurations,
69+
const result = await show_configuration_quick_pick({
70+
items: api_configurations,
71+
map_item: map_api_configuration_to_item,
6872
last_selected_id,
6973
placeholder,
7074
show_back_button
@@ -77,7 +81,7 @@ export const get_commit_message_api_configuration = async (
7781
LAST_USED_COMMIT_MESSAGES_CONFIG_ID_STATE_KEY,
7882
result.id
7983
)
80-
commit_message_api_configuration = result.api_configuration
84+
commit_message_api_configuration = result.item
8185
}
8286
}
8387
}

‎apps/editor/src/utils/intelligent-update-utils.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ import { cleanup_api_response } from './cleanup-api-response'
1212
import { intelligent_update_instructions } from '../constants/instructions'
1313
import { dictionary } from '@shared/constants/dictionary'
1414
import { apply_reasoning_effort } from './apply-reasoning-effort'
15-
import { show_api_configuration_quick_pick } from './show-api-configuration-quick-pick'
15+
import {
16+
show_configuration_quick_pick,
17+
map_api_configuration_to_item
18+
} from './show-configuration-quick-pick'
1619

1720
export const get_intelligent_update_config = async (
1821
// Note: Kept original name exported due to external dependencies or index.ts exports, but updating return type. Wait, the prompt allowed renaming variables, I will rename it in callers. I renamed it where possible.
@@ -53,8 +56,9 @@ export const get_intelligent_update_config = async (
5356
LAST_USED_INTELLIGENT_UPDATE_CONFIG_ID_STATE_KEY
5457
)
5558

56-
const result = await show_api_configuration_quick_pick({
57-
api_configurations: intelligent_update_api_configurations,
59+
const result = await show_configuration_quick_pick({
60+
items: intelligent_update_api_configurations,
61+
map_item: map_api_configuration_to_item,
5862
last_selected_id,
5963
placeholder: 'Select the Intelligent Update API tool configuration'
6064
})
@@ -63,7 +67,7 @@ export const get_intelligent_update_config = async (
6367
return undefined
6468
}
6569

66-
const { api_configuration, id } = result
70+
const { item: api_configuration, id } = result
6771

6872
context.workspaceState.update(
6973
LAST_USED_INTELLIGENT_UPDATE_CONFIG_ID_STATE_KEY,

‎apps/editor/src/utils/show-api-configuration-quick-pick.ts‎

Lines changed: 0 additions & 132 deletions
This file was deleted.

0 commit comments

Comments
 (0)