Skip to content

Commit 5422e68

Browse files
committed
Implement dynamic quick pick item filtering on value change for provider and model selection
- 'enter manually' should not appear in search results - make sure users can't search for the phrase 'enter manually' - also fix for [Pasted text] [Changes] └── apps └── editor └── src ├── commands │ ├── history-command │ │ └── history-command.ts │ └── select-files-of-commit-command.ts ├── features │ └── search-files │ ├── search-modes │ │ └── perform-intelligent-search-mode.ts │ └── utils │ ├── prompt-for-config.ts │ └── show-search-results-quick-pick.ts ├── i18n │ └── translations │ ├── commands │ │ └── history-command.ts │ ├── common.ts │ └── views │ └── shared │ └── actions │ └── api │ └── update │ └── interactions │ └── edit-model-for-api-config.ts ├── services │ └── model-fetcher.ts ├── utils │ ├── group-quick-pick-items.ts │ └── show-configurations-quick-pick.ts └── views ├── prompt │ └── backend │ └── message-handlers │ └── handle-at-sign-quick-pick.ts ├── settings │ └── backend │ └── message-handlers │ └── add-provider │ └── pick-provider-source.ts └── shared └── actions └── api ├── create │ └── interactions │ └── initial-select-model.ts └── update └── interactions └── edit-model-for-api-config.ts
1 parent c9b115e commit 5422e68

3 files changed

Lines changed: 81 additions & 41 deletions

File tree

‎apps/editor/src/views/settings/backend/message-handlers/add-provider/pick-provider-source.ts‎

Lines changed: 51 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ export const pick_provider_source = async (params?: {
1313
)
1414
const available_built_in = Object.entries(PROVIDERS)
1515

16+
const providers_only_items: vscode.QuickPickItem[] = available_built_in.map(
17+
([id, info]) => ({
18+
label: id,
19+
detail: info.base_url
20+
})
21+
)
22+
1623
const items: vscode.QuickPickItem[] = [
1724
{
1825
label: custom_label,
@@ -30,10 +37,7 @@ export const pick_provider_source = async (params?: {
3037
label: t('views.shared.actions.api.upsert-provider.options.predefined'),
3138
kind: vscode.QuickPickItemKind.Separator
3239
},
33-
...available_built_in.map(([id, info]) => ({
34-
label: id,
35-
detail: info.base_url
36-
}))
40+
...providers_only_items
3741
]
3842

3943
const quick_pick = vscode.window.createQuickPick()
@@ -55,31 +59,51 @@ export const pick_provider_source = async (params?: {
5559
}
5660

5761
return new Promise((resolve) => {
58-
quick_pick.onDidTriggerButton((button) => {
59-
if (button === vscode.QuickInputButtons.Back) {
60-
quick_pick.hide()
61-
resolve('BACK')
62-
} else if (button === close_button) {
62+
let is_resolved = false
63+
const disposables: vscode.Disposable[] = []
64+
65+
disposables.push(
66+
quick_pick.onDidChangeValue((value) => {
67+
if (value) {
68+
quick_pick.items = providers_only_items
69+
} else {
70+
quick_pick.items = items
71+
}
72+
}),
73+
quick_pick.onDidTriggerButton((button) => {
74+
if (button === vscode.QuickInputButtons.Back) {
75+
is_resolved = true
76+
quick_pick.hide()
77+
resolve('BACK')
78+
} else if (button === close_button) {
79+
quick_pick.hide()
80+
}
81+
}),
82+
quick_pick.onDidAccept(() => {
83+
const selected = quick_pick.selectedItems[0]
6384
quick_pick.hide()
64-
}
65-
})
66-
quick_pick.onDidAccept(() => {
67-
const selected = quick_pick.selectedItems[0]
68-
quick_pick.hide()
69-
if (!selected) return resolve(null)
85+
if (!selected) {
86+
is_resolved = true
87+
return resolve(null)
88+
}
7089

71-
if (selected.label === custom_label) {
72-
resolve({})
73-
} else if (selected.label === extended_label) {
74-
resolve({ is_extended: true })
75-
} else {
76-
resolve({ id: selected.label })
77-
}
78-
})
79-
quick_pick.onDidHide(() => {
80-
quick_pick.dispose()
81-
resolve(null)
82-
})
90+
is_resolved = true
91+
if (selected.label === custom_label) {
92+
resolve({})
93+
} else if (selected.label === extended_label) {
94+
resolve({ is_extended: true })
95+
} else {
96+
resolve({ id: selected.label })
97+
}
98+
}),
99+
quick_pick.onDidHide(() => {
100+
if (!is_resolved) {
101+
resolve(null)
102+
}
103+
disposables.forEach((d) => d.dispose())
104+
quick_pick.dispose()
105+
})
106+
)
83107
quick_pick.show()
84108
})
85109
}

‎apps/editor/src/views/shared/actions/api/create/interactions/initial-select-model.ts‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,24 @@ export const initial_select_model = async (
3939

4040
if (models.length > 0) {
4141
const manual_entry_item: vscode.QuickPickItem = {
42-
label: `$(add) ${t('common.action.enter-manually')}`,
43-
alwaysShow: true
42+
label: `$(add) ${t('common.action.enter-manually')}`
4443
}
4544

4645
const separator_item: vscode.QuickPickItem = {
4746
label: '',
4847
kind: vscode.QuickPickItemKind.Separator
4948
}
5049

50+
const models_only_items: vscode.QuickPickItem[] = models.map((model) => ({
51+
label: model.name || model.id,
52+
description: model.name ? model.id : undefined,
53+
detail: model.description
54+
}))
55+
5156
const model_items: vscode.QuickPickItem[] = [
5257
manual_entry_item,
5358
separator_item,
54-
...models.map((model) => ({
55-
label: model.name || model.id,
56-
description: model.name ? model.id : undefined,
57-
detail: model.description
58-
}))
59+
...models_only_items
5960
]
6061

6162
let last_selected_model_id: string | undefined
@@ -91,6 +92,13 @@ export const initial_select_model = async (
9192
const disposables: vscode.Disposable[] = []
9293

9394
disposables.push(
95+
quick_pick.onDidChangeValue((value) => {
96+
if (value) {
97+
quick_pick.items = models_only_items
98+
} else {
99+
quick_pick.items = model_items
100+
}
101+
}),
94102
quick_pick.onDidAccept(() => {
95103
accepted = true
96104
resolve(quick_pick.selectedItems[0])

‎apps/editor/src/views/shared/actions/api/update/interactions/edit-model-for-api-config.ts‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,24 @@ export const edit_model_for_api_configuration = async (params: {
5959

6060
if (models.length > 0) {
6161
const manual_entry_item: vscode.QuickPickItem = {
62-
label: `$(add) ${t('common.action.enter-manually')}`,
63-
alwaysShow: true
62+
label: `$(add) ${t('common.action.enter-manually')}`
6463
}
6564

6665
const separator_item: vscode.QuickPickItem = {
6766
label: '',
6867
kind: vscode.QuickPickItemKind.Separator
6968
}
7069

70+
const models_only_items: vscode.QuickPickItem[] = models.map((model) => ({
71+
label: model.name || model.id,
72+
description: model.name ? model.id : undefined,
73+
detail: model.description
74+
}))
75+
7176
const model_items: vscode.QuickPickItem[] = [
7277
manual_entry_item,
7378
separator_item,
74-
...models.map((model) => ({
75-
label: model.name || model.id,
76-
description: model.name ? model.id : undefined,
77-
detail: model.description
78-
}))
79+
...models_only_items
7980
]
8081

8182
let last_selected_model_id = params.api_configuration.model
@@ -107,6 +108,13 @@ export const edit_model_for_api_configuration = async (params: {
107108
const disposables: vscode.Disposable[] = []
108109

109110
disposables.push(
111+
quick_pick.onDidChangeValue((value) => {
112+
if (value) {
113+
quick_pick.items = models_only_items
114+
} else {
115+
quick_pick.items = model_items
116+
}
117+
}),
110118
quick_pick.onDidAccept(() => {
111119
accepted = true
112120
resolve(quick_pick.selectedItems[0])

0 commit comments

Comments
 (0)