Skip to content

Commit c9b115e

Browse files
committed
Add back navigation from model selection to provider selection in API configuration creation
- should not prevent out-click for 'new configration' quick pick (because it's a very first quick pick) - prevent further ones - add 'close' button in top right corner of the quick pick 'models' (it's a second quick pick in the flow) └── apps └── editor └── src ├── i18n │ └── translations │ └── views │ └── shared │ └── actions │ └── api │ └── create │ └── interactions │ └── initial-select-provider.ts ├── services │ ├── model-fetcher.ts │ └── providers-manager.ts └── views ├── prompt │ └── backend │ └── message-handlers │ └── configurations │ └── handle-create-api-configuration.ts ├── settings │ └── backend │ └── message-handlers │ └── handle-create-api-configuration.ts └── shared └── actions └── api ├── create │ ├── create.ts │ └── interactions │ ├── index.ts │ ├── initial-select-model.ts │ └── initial-select-provider.ts └── update └── interactions └── edit-model-for-api-config.ts
1 parent a33ffc6 commit c9b115e

3 files changed

Lines changed: 23 additions & 7 deletions

File tree

‎apps/editor/src/views/shared/actions/api/create/create.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,16 @@ export const create = async (params: {
7979
)
8080
if (!selected_provider) return undefined
8181

82-
selected_model = await initial_select_model(
82+
const model_result = await initial_select_model(
8383
model_fetcher,
8484
selected_provider
8585
)
86-
if (selected_model) break
86+
87+
if (model_result === 'back') continue
88+
if (!model_result) return undefined
89+
90+
selected_model = model_result
91+
break
8792
}
8893

8994
const api_configuration_to_add: ApiConfiguration = {

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { get_error_message } from '@/utils/get-error-message'
1212
export const initial_select_model = async (
1313
model_fetcher: ModelFetcher,
1414
provider: Provider
15-
): Promise<string | undefined> => {
15+
): Promise<string | 'back' | undefined> => {
1616
let base_url: string | undefined
1717

1818
try {
@@ -62,14 +62,20 @@ export const initial_select_model = async (
6262

6363
while (true) {
6464
const selected_model_item = await new Promise<
65-
vscode.QuickPickItem | undefined
65+
vscode.QuickPickItem | 'back' | undefined
6666
>((resolve) => {
6767
const quick_pick =
6868
vscode.window.createQuickPick<vscode.QuickPickItem>()
69+
quick_pick.ignoreFocusOut = true
6970
quick_pick.items = model_items
7071
quick_pick.title = t('common.select-model.title')
7172
quick_pick.placeholder = t('common.select-model.placeholder')
72-
quick_pick.buttons = [vscode.QuickInputButtons.Back]
73+
74+
const close_button: vscode.QuickInputButton = {
75+
iconPath: new vscode.ThemeIcon('close'),
76+
tooltip: t('common.close')
77+
}
78+
quick_pick.buttons = [vscode.QuickInputButtons.Back, close_button]
7379

7480
if (last_selected_model_id) {
7581
const active = model_items.find(
@@ -92,6 +98,10 @@ export const initial_select_model = async (
9298
}),
9399
quick_pick.onDidTriggerButton((button) => {
94100
if (button === vscode.QuickInputButtons.Back) {
101+
accepted = true
102+
resolve('back')
103+
quick_pick.hide()
104+
} else if (button === close_button) {
95105
quick_pick.hide()
96106
}
97107
}),
@@ -104,6 +114,7 @@ export const initial_select_model = async (
104114
quick_pick.show()
105115
})
106116

117+
if (selected_model_item === 'back') return 'back'
107118
if (!selected_model_item) return undefined
108119

109120
if (selected_model_item === manual_entry_item) {
@@ -156,7 +167,8 @@ export const initial_select_model = async (
156167
while (true) {
157168
const input = await vscode.window.showInputBox({
158169
title: t('common.select-model.title'),
159-
prompt: t('common.prompt.enter-model-name')
170+
prompt: t('common.prompt.enter-model-name'),
171+
ignoreFocusOut: true
160172
})
161173

162174
if (!input) return undefined

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export const initial_select_provider = async (
3535
label: string
3636
provider?: Provider
3737
}>()
38-
quick_pick.ignoreFocusOut = true
3938
quick_pick.items = provider_items
4039
quick_pick.title = t(
4140
'views.shared.actions.api.create.interactions.initial-select-provider.title'

0 commit comments

Comments
 (0)