Skip to content

Commit b26c557

Browse files
committed
Extract browser profile deletion into a dedicated message handler
- once deleted browser profile, show confirmation notification - deleting browser profiles should use a separate backend handler and messages ├── apps │ └── editor │ └── src │ ├── i18n │ │ └── translations │ │ ├── common.ts │ │ └── views │ │ └── settings │ │ └── handlers │ │ ├── handle-delete-browser-profile.ts │ │ └── index.ts │ └── views │ └── settings │ ├── backend │ │ ├── message-handlers │ │ │ ├── handle-delete-browser-profile.ts │ │ │ ├── handle-update-browser-profiles.ts │ │ │ └── index.ts │ │ └── settings-view-provider.ts │ ├── frontend │ │ ├── Home │ │ │ ├── Home.tsx │ │ │ └── sections │ │ │ └── WebSection.tsx │ │ ├── Settings.tsx │ │ └── hooks │ │ └── use-settings.ts │ └── types │ └── messages.ts └── packages └── ui └── src └── components └── editor └── settings-view └── SortableStringList └── SortableStringList.tsx
1 parent 4ba2710 commit b26c557

12 files changed

Lines changed: 122 additions & 89 deletions

File tree

apps/editor/src/i18n/translations/views/settings/handlers/handle-update-browser-profiles.ts renamed to apps/editor/src/i18n/translations/views/settings/handlers/handle-delete-browser-profile.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,23 @@ export const translations = {
3636
cs: 'Tato akce je nevratná a trvale smaže všechna data spojená s tímto profilem.',
3737
hu: 'Ez a művelet visszafordíthatatlan, és véglegesen törli a profilhoz tartozó összes adatot.',
3838
bg: 'Това действие е необратимо и ще изтрие за постоянно всички данни, свързани с този профил.'
39+
},
40+
'settings.browser-profiles.deleted': {
41+
en: 'Browser profile "{name}" has been deleted.',
42+
pl: 'Profil przeglądarki "{name}" został usunięty.',
43+
'zh-cn': '浏览器配置文件 "{name}" 已删除。',
44+
ja: 'ブラウザプロファイル "{name}" を削除しました。',
45+
'zh-tw': '瀏覽器設定檔 "{name}" 已刪除。',
46+
de: 'Browser-Profil "{name}" wurde gelöscht.',
47+
es: 'El perfil del navegador "{name}" ha sido eliminado.',
48+
fr: 'Le profil du navigateur "{name}" a été supprimé.',
49+
'pt-br': 'O perfil do navegador "{name}" foi excluído.',
50+
ru: 'Профиль браузера "{name}" удален.',
51+
ko: '브라우저 프로필 "{name}"이(가) 삭제되었습니다.',
52+
it: 'Il profilo del browser "{name}" è stato eliminato.',
53+
tr: '"{name}" tarayıcı profili silindi.',
54+
cs: 'Profil prohlížeče "{name}" byl smazán.',
55+
hu: 'A(z) "{name}" böngészőprofil törölve lett.',
56+
bg: 'Профилът на браузъра "{name}" беше изтрит.'
3957
}
4058
} as const

‎apps/editor/src/i18n/translations/views/settings/handlers/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { translations as handle_delete_provider } from './handle-delete-provider
77
import { translations as handle_select_default_web_configuration } from './handle-select-default-web-configuration'
88
import { translations as handle_select_default_cli_configuration } from './handle-select-default-cli-configuration'
99
import { translations as handle_test_provider_connection } from './handle-test-provider-connection'
10-
import { translations as handle_update_browser_profiles } from './handle-update-browser-profiles'
10+
import { translations as handle_delete_browser_profile } from './handle-delete-browser-profile'
1111

1212
export const translations = {
1313
...handle_open_allow_patterns_settings,
@@ -19,5 +19,5 @@ export const translations = {
1919
...handle_select_default_web_configuration,
2020
...handle_select_default_cli_configuration,
2121
...handle_test_provider_connection,
22-
...handle_update_browser_profiles
22+
...handle_delete_browser_profile
2323
}
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
import * as fs from 'fs'
2+
import * as os from 'os'
3+
import * as path from 'path'
4+
import * as vscode from 'vscode'
5+
import { DeleteBrowserProfileMessage } from '@/views/settings/types/messages'
6+
import { Logger } from '@shared/utils/logger'
7+
import { t } from '@/i18n'
8+
9+
export const handle_delete_browser_profile = async (
10+
message: DeleteBrowserProfileMessage
11+
): Promise<void> => {
12+
const profile = message.name.trim()
13+
if (!profile || profile.toLowerCase() === 'default') {
14+
return
15+
}
16+
17+
const delete_button = t('common.delete')
18+
const result = await vscode.window.showWarningMessage(
19+
t('settings.browser-profiles.confirm-delete.message', {
20+
name: profile
21+
}),
22+
{
23+
modal: true,
24+
detail: t('settings.browser-profiles.confirm-delete.detail')
25+
},
26+
delete_button
27+
)
28+
29+
if (result !== delete_button) {
30+
return
31+
}
32+
33+
const config = vscode.workspace.getConfiguration('codeWebChat')
34+
const existing_profiles = config.get<string[]>('browserProfiles', []) || []
35+
const updated_profiles = existing_profiles.filter((p) => p.trim() !== profile)
36+
37+
await config.update(
38+
'browserProfiles',
39+
updated_profiles,
40+
vscode.ConfigurationTarget.Global
41+
)
42+
43+
const profiles_dir = path.join(os.homedir(), '.cwc', 'browser', 'profiles')
44+
const profile_dir = path.resolve(profiles_dir, profile)
45+
const relative = path.relative(profiles_dir, profile_dir)
46+
if (
47+
relative &&
48+
relative !== '..' &&
49+
!relative.startsWith(`..${path.sep}`) &&
50+
!path.isAbsolute(relative) &&
51+
fs.existsSync(profile_dir)
52+
) {
53+
try {
54+
await fs.promises.rm(profile_dir, {
55+
recursive: true,
56+
force: true
57+
})
58+
} catch (error) {
59+
Logger.error({
60+
function_name: 'handle_delete_browser_profile',
61+
message: `Failed to remove browser profile folder "${profile}"`,
62+
data: error
63+
})
64+
}
65+
}
66+
67+
vscode.window.showInformationMessage(
68+
t('settings.browser-profiles.deleted', {
69+
name: profile
70+
})
71+
)
72+
}
Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,13 @@
1-
import * as fs from 'fs'
2-
import * as os from 'os'
3-
import * as path from 'path'
41
import * as vscode from 'vscode'
52
import { UpdateBrowserProfilesMessage } from '@/views/settings/types/messages'
6-
import { SettingsViewProvider } from '@/views/settings/backend/settings-view-provider'
7-
import { Logger } from '@shared/utils/logger'
8-
import { t } from '@/i18n'
9-
import { handle_get_browser_profiles } from './handle-get-browser-profiles'
103

114
export const handle_update_browser_profiles = async (
12-
settings_provider: SettingsViewProvider,
135
message: UpdateBrowserProfilesMessage
146
): Promise<void> => {
157
const config = vscode.workspace.getConfiguration('codeWebChat')
16-
const existing_profiles = config.get<string[]>('browserProfiles', []) || []
17-
18-
const updated_profiles_set = new Set(
19-
message.browser_profiles.map((p) => p.trim())
20-
)
21-
const removed_profiles = Array.from(
22-
new Set(
23-
existing_profiles
24-
.map((p) => p.trim())
25-
.filter(
26-
(p) =>
27-
p.length > 0 &&
28-
p.toLowerCase() !== 'default' &&
29-
!updated_profiles_set.has(p)
30-
)
31-
)
32-
)
33-
34-
if (removed_profiles.length > 0) {
35-
const delete_button = t('common.delete')
36-
const result = await vscode.window.showWarningMessage(
37-
t('settings.browser-profiles.confirm-delete.message', {
38-
name: removed_profiles.join(', ')
39-
}),
40-
{
41-
modal: true,
42-
detail: t('settings.browser-profiles.confirm-delete.detail')
43-
},
44-
delete_button
45-
)
46-
47-
if (result !== delete_button) {
48-
await handle_get_browser_profiles(settings_provider)
49-
return
50-
}
51-
}
52-
538
await config.update(
549
'browserProfiles',
5510
message.browser_profiles,
5611
vscode.ConfigurationTarget.Global
5712
)
58-
59-
if (removed_profiles.length === 0) {
60-
return
61-
}
62-
63-
const profiles_dir = path.join(os.homedir(), '.cwc', 'browser', 'profiles')
64-
65-
for (const profile of removed_profiles) {
66-
const profile_dir = path.resolve(profiles_dir, profile)
67-
const relative = path.relative(profiles_dir, profile_dir)
68-
if (
69-
!relative ||
70-
relative === '..' ||
71-
relative.startsWith(`..${path.sep}`) ||
72-
path.isAbsolute(relative)
73-
) {
74-
continue
75-
}
76-
77-
if (fs.existsSync(profile_dir)) {
78-
try {
79-
await fs.promises.rm(profile_dir, {
80-
recursive: true,
81-
force: true
82-
})
83-
} catch (error) {
84-
Logger.error({
85-
function_name: 'handle_update_browser_profiles',
86-
message: `Failed to remove browser profile folder "${profile}"`,
87-
data: error
88-
})
89-
}
90-
}
91-
}
9213
}

‎apps/editor/src/views/settings/backend/message-handlers/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ export * from './handle-pick-agent'
6969
export * from './handle-pick-example-flags'
7070
export * from './handle-get-browser-profiles'
7171
export * from './handle-update-browser-profiles'
72+
export * from './handle-delete-browser-profile'
7273
export * from './handle-get-forwarded-ports'
7374
export * from './handle-update-forwarded-ports'
7475
export * from './handle-get-web-configurations'

‎apps/editor/src/views/settings/backend/settings-view-provider.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,9 @@ export class SettingsViewProvider {
210210
} else if (message.command === 'GET_BROWSER_PROFILES') {
211211
await handlers.handle_get_browser_profiles(this)
212212
} else if (message.command === 'UPDATE_BROWSER_PROFILES') {
213-
await handlers.handle_update_browser_profiles(this, message)
213+
await handlers.handle_update_browser_profiles(message)
214+
} else if (message.command === 'DELETE_BROWSER_PROFILE') {
215+
await handlers.handle_delete_browser_profile(message)
214216
} else if (message.command === 'GET_FORWARDED_PORTS') {
215217
await handlers.handle_get_forwarded_ports(this)
216218
} else if (message.command === 'UPDATE_FORWARDED_PORTS') {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ type Props = {
244244
on_delete_web_configuration: (name: string) => void
245245
on_toggle_pinned_web_configuration: (config: WebConfiguration) => void
246246
on_update_browser_profiles: (profiles: string[]) => void
247+
on_delete_browser_profile: (name: string) => void
247248
on_update_forwarded_ports: (ports: number[]) => void
248249
web_defaults: Record<string, string | null>
249250
on_set_default_web_configuration: (
@@ -457,6 +458,7 @@ export const Home: React.FC<Props> = (props) => {
457458
set_section_ref={set_section_ref}
458459
browser_profiles={props.browser_profiles}
459460
on_update_browser_profiles={props.on_update_browser_profiles}
461+
on_delete_browser_profile={props.on_delete_browser_profile}
460462
forwarded_ports={props.forwarded_ports}
461463
on_update_forwarded_ports={props.on_update_forwarded_ports}
462464
web_configurations={props.web_configurations}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { NavItem } from '../Home'
1818
type Props = {
1919
browser_profiles: string[]
2020
on_update_browser_profiles: (profiles: string[]) => void
21+
on_delete_browser_profile: (name: string) => void
2122
forwarded_ports: number[]
2223
on_update_forwarded_ports: (ports: number[]) => void
2324
web_configurations: WebConfiguration[]
@@ -363,6 +364,7 @@ export const WebSection = forwardRef<HTMLDivElement, Props>((props, ref) => {
363364
<SortableStringList
364365
items={props.browser_profiles}
365366
on_update={props.on_update_browser_profiles}
367+
on_delete={props.on_delete_browser_profile}
366368
locked_first_item={t('web.browser.profiles.default')}
367369
translations={{
368370
placeholder: t('web.browser.profiles.placeholder'),

‎apps/editor/src/views/settings/frontend/Settings.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ export const Settings = () => {
289289
on_update_browser_profiles={
290290
settings_hook.handle_update_browser_profiles
291291
}
292+
on_delete_browser_profile={settings_hook.handle_delete_browser_profile}
292293
forwarded_ports={settings_hook.forwarded_ports!}
293294
on_update_forwarded_ports={settings_hook.handle_update_forwarded_ports}
294295
web_configurations={settings_hook.web_configurations!}

‎apps/editor/src/views/settings/frontend/hooks/use-settings.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -324,18 +324,20 @@ export const use_settings = (vscode: any) => {
324324
}
325325

326326
const handle_update_browser_profiles = (profiles: string[]) => {
327-
const is_removal =
328-
browser_profiles !== undefined &&
329-
profiles.length < browser_profiles.length
330-
if (!is_removal) {
331-
set_browser_profiles(profiles)
332-
}
327+
set_browser_profiles(profiles)
333328
post_message(vscode, {
334329
command: 'UPDATE_BROWSER_PROFILES',
335330
browser_profiles: profiles
336331
})
337332
}
338333

334+
const handle_delete_browser_profile = (name: string) => {
335+
post_message(vscode, {
336+
command: 'DELETE_BROWSER_PROFILE',
337+
name
338+
})
339+
}
340+
339341
const handle_update_forwarded_ports = (ports: number[]) => {
340342
set_forwarded_ports(ports)
341343
post_message(vscode, {
@@ -589,6 +591,7 @@ export const use_settings = (vscode: any) => {
589591
handle_add_web_configuration,
590592
handle_delete_web_configuration,
591593
handle_update_browser_profiles,
594+
handle_delete_browser_profile,
592595
handle_update_forwarded_ports,
593596
handle_toggle_pinned_cli_configuration,
594597
handle_toggle_pinned_api_configuration,

0 commit comments

Comments
 (0)