Skip to content

Commit 76f874c

Browse files
committed
Refactor preset and configuration collapse state management to use static keys instead of prompt-type-specific identifiers
1 parent 79387d8 commit 76f874c

5 files changed

Lines changed: 27 additions & 72 deletions

File tree

‎apps/editor/src/constants/state-keys.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,8 @@ export const RECENTLY_USED_INTELLIGENT_UPDATE_CONFIG_IDS_STATE_KEY =
7070
export const RECENTLY_USED_VOICE_INPUT_CONFIG_IDS_STATE_KEY =
7171
'recently-used-voice-input-config-ids'
7272

73-
export const get_presets_collapsed_state_key = (web_prompt_type: string) =>
74-
`presets-collapsed-${web_prompt_type}`
75-
export const get_configurations_collapsed_state_key = (
76-
api_prompt_type: string
77-
) => `configurations-collapsed-${api_prompt_type}`
73+
export const PRESETS_COLLAPSED_STATE_KEY = 'presets-collapsed'
74+
export const CONFIGURATIONS_COLLAPSED_STATE_KEY = 'configurations-collapsed'
7875

7976
export const get_recently_used_presets_or_groups_key = (
8077
web_prompt_type: string

‎apps/editor/src/views/panel/backend/message-handlers/handle-get-collapsed-states.ts‎

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,21 @@
11
import {
22
ARE_TASKS_COLLAPSED_STATE_KEY,
3-
get_configurations_collapsed_state_key,
4-
get_presets_collapsed_state_key,
3+
CONFIGURATIONS_COLLAPSED_STATE_KEY,
4+
PRESETS_COLLAPSED_STATE_KEY,
55
IS_TIMELINE_COLLAPSED_STATE_KEY
66
} from '@/constants/state-keys'
77
import { PanelProvider } from '@/views/panel/backend/panel-provider'
8-
import { ApiPromptType, WebPromptType } from '@shared/types/prompt-types'
98

109
export const handle_get_collapsed_states = (panel_provider: PanelProvider) => {
11-
const WEB_PROMPT_TYPES: WebPromptType[] = [
12-
'ask-about-context',
13-
'edit-context',
14-
'code-at-cursor',
15-
'no-context'
16-
]
17-
const API_PROMPT_TYPES: ApiPromptType[] = ['edit-context', 'code-at-cursor']
18-
1910
panel_provider.send_message({
2011
command: 'COLLAPSED_STATES',
21-
presets_collapsed_by_web_mode: Object.fromEntries(
22-
WEB_PROMPT_TYPES.map((mode) => [
23-
mode,
24-
panel_provider.context.globalState.get<boolean>(
25-
get_presets_collapsed_state_key(mode),
26-
false
27-
)
28-
])
12+
presets_collapsed: panel_provider.context.globalState.get<boolean>(
13+
PRESETS_COLLAPSED_STATE_KEY,
14+
false
2915
),
30-
configurations_collapsed_by_api_mode: Object.fromEntries(
31-
API_PROMPT_TYPES.map((mode) => [
32-
mode,
33-
panel_provider.context.globalState.get<boolean>(
34-
get_configurations_collapsed_state_key(mode),
35-
false
36-
)
37-
])
16+
configurations_collapsed: panel_provider.context.globalState.get<boolean>(
17+
CONFIGURATIONS_COLLAPSED_STATE_KEY,
18+
false
3819
),
3920
is_timeline_collapsed: panel_provider.context.workspaceState.get<boolean>(
4021
IS_TIMELINE_COLLAPSED_STATE_KEY,

‎apps/editor/src/views/panel/backend/message-handlers/handle-save-component-collapsed-state.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
import {
22
ARE_TASKS_COLLAPSED_STATE_KEY,
3-
get_configurations_collapsed_state_key,
4-
get_presets_collapsed_state_key,
3+
CONFIGURATIONS_COLLAPSED_STATE_KEY,
4+
PRESETS_COLLAPSED_STATE_KEY,
55
IS_TIMELINE_COLLAPSED_STATE_KEY
66
} from '@/constants/state-keys'
77
import { PanelProvider } from '@/views/panel/backend/panel-provider'
88
import { SaveComponentCollapsedStateMessage } from '@/views/panel/types/messages'
9-
import { ApiPromptType, WebPromptType } from '@shared/types/prompt-types'
109

1110
export const handle_save_component_collapsed_state = async (
1211
panel_provider: PanelProvider,
1312
message: SaveComponentCollapsedStateMessage
1413
): Promise<void> => {
1514
if (message.component == 'presets') {
1615
await panel_provider.context.globalState.update(
17-
get_presets_collapsed_state_key(message.prompt_type as WebPromptType),
16+
PRESETS_COLLAPSED_STATE_KEY,
1817
message.is_collapsed
1918
)
2019
} else if (message.component == 'configurations') {
2120
await panel_provider.context.globalState.update(
22-
get_configurations_collapsed_state_key(
23-
message.prompt_type as ApiPromptType
24-
),
21+
CONFIGURATIONS_COLLAPSED_STATE_KEY,
2522
message.is_collapsed
2623
)
2724
} else if (message.component == 'timeline') {

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

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,11 @@ export const use_panel = (vscode: any) => {
4343
const [context_size_warning_threshold, set_context_size_warning_threshold] =
4444
useState<number>()
4545
const [can_undo, set_can_undo] = useState<boolean>(false)
46-
const [presets_collapsed_by_web_mode, set_presets_collapsed_by_web_mode] =
47-
useState<{ [mode in WebPromptType]?: boolean }>({})
46+
const [presets_collapsed, set_presets_collapsed] = useState(false)
4847
const [send_with_shift_enter, set_send_with_shift_enter] = useState(false)
4948
const [is_timeline_collapsed, set_is_timeline_collapsed] = useState(false)
50-
const [
51-
configurations_collapsed_by_api_mode,
52-
set_configurations_collapsed_by_api_mode
53-
] = useState<{ [mode in ApiPromptType]?: boolean }>({})
49+
const [configurations_collapsed, set_configurations_collapsed] =
50+
useState(false)
5451
const [is_recording, set_is_recording] = useState(false)
5552
const [setup_progress, set_setup_progress] = useState<SetupProgress>()
5653
const [
@@ -130,10 +127,8 @@ export const use_panel = (vscode: any) => {
130127
} else if (message.command == 'API_PROMPT_TYPE') {
131128
set_api_mode(message.prompt_type)
132129
} else if (message.command == 'COLLAPSED_STATES') {
133-
set_presets_collapsed_by_web_mode(message.presets_collapsed_by_web_mode)
134-
set_configurations_collapsed_by_api_mode(
135-
message.configurations_collapsed_by_api_mode
136-
)
130+
set_presets_collapsed(message.presets_collapsed)
131+
set_configurations_collapsed(message.configurations_collapsed)
137132
set_is_timeline_collapsed(message.is_timeline_collapsed)
138133
} else if (message.command == 'CHECKPOINTS') {
139134
set_checkpoints(message.checkpoints)
@@ -234,30 +229,20 @@ export const use_panel = (vscode: any) => {
234229
}
235230

236231
const handle_presets_collapsed_change = (is_collapsed: boolean) => {
237-
if (!web_prompt_type) return
238-
set_presets_collapsed_by_web_mode((prev) => ({
239-
...prev,
240-
[web_prompt_type]: is_collapsed
241-
}))
232+
set_presets_collapsed(is_collapsed)
242233
post_message(vscode, {
243234
command: 'SAVE_COMPONENT_COLLAPSED_STATE',
244235
component: 'presets',
245-
is_collapsed,
246-
prompt_type: web_prompt_type
236+
is_collapsed
247237
})
248238
}
249239

250240
const handle_configurations_collapsed_change = (is_collapsed: boolean) => {
251-
if (!api_prompt_type) return
252-
set_configurations_collapsed_by_api_mode((prev) => ({
253-
...prev,
254-
[api_prompt_type]: is_collapsed
255-
}))
241+
set_configurations_collapsed(is_collapsed)
256242
post_message(vscode, {
257243
command: 'SAVE_COMPONENT_COLLAPSED_STATE',
258244
component: 'configurations',
259-
is_collapsed,
260-
prompt_type: api_prompt_type
245+
is_collapsed
261246
})
262247
}
263248

@@ -287,13 +272,9 @@ export const use_panel = (vscode: any) => {
287272
set_chat_input_focus_and_select_key,
288273
context_size_warning_threshold,
289274
can_undo,
290-
presets_collapsed: web_prompt_type
291-
? (presets_collapsed_by_web_mode[web_prompt_type] ?? false)
292-
: false,
275+
presets_collapsed,
293276
send_with_shift_enter,
294-
configurations_collapsed: api_prompt_type
295-
? (configurations_collapsed_by_api_mode[api_prompt_type] ?? false)
296-
: false,
277+
configurations_collapsed,
297278
is_timeline_collapsed,
298279
handle_task_forward,
299280
handle_instructions_change,

‎apps/editor/src/views/panel/types/messages.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,6 @@ export interface SaveComponentCollapsedStateMessage extends BaseMessage {
405405
command: 'SAVE_COMPONENT_COLLAPSED_STATE'
406406
component: 'presets' | 'configurations' | 'timeline' | 'tasks'
407407
is_collapsed: boolean
408-
prompt_type?: WebPromptType | ApiPromptType
409408
}
410409

411410
export interface GetCheckpointsMessage extends BaseMessage {
@@ -879,8 +878,8 @@ export interface UpdateFileInPreviewMessage extends BaseMessage {
879878

880879
export interface CollapsedStatesMessage extends BaseMessage {
881880
command: 'COLLAPSED_STATES'
882-
presets_collapsed_by_web_mode: { [mode in WebPromptType]?: boolean }
883-
configurations_collapsed_by_api_mode: { [mode in ApiPromptType]?: boolean }
881+
presets_collapsed: boolean
882+
configurations_collapsed: boolean
884883
are_tasks_collapsed: boolean
885884
is_timeline_collapsed: boolean
886885
}

0 commit comments

Comments
 (0)