Skip to content

Commit 2acd959

Browse files
committed
Remove support for the "Ungrouped" preset category to simplify preset management and drag-and-drop functionality
1 parent feaa3b2 commit 2acd959

3 files changed

Lines changed: 86 additions & 262 deletions

File tree

‎packages/ui/src/components/editor/panel/Configurations/Configurations.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ export const Configurations: React.FC<Configurations.Props> = (props) => {
134134
}
135135
}}
136136
animation={150}
137-
handle={`.${styles.configurations__item__left__drag_handle}`}
138137
disabled={!props.on_reorder}
139138
>
140139
{props.configurations.map((i) =>

‎packages/ui/src/components/editor/panel/Presets/Presets.tsx‎

Lines changed: 34 additions & 180 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export const chatbot_to_icon: Record<keyof typeof CHATBOTS, Icon.Variant> = {
3232
'Z.AI': 'Z_AI'
3333
}
3434

35-
const UNGROUPED_ID = '__ungrouped_drag_handle__'
3635
const TRAILING_GROUP_ID = '__trailing_group_drag_handle__'
3736
const TRAILING_SEPARATOR_ID = '__trailing_separator_drag_handle__'
3837

@@ -91,26 +90,6 @@ const with_ids = (
9190
}
9291

9392
export const Presets: React.FC<Presets.Props> = (props) => {
94-
const { ungrouped_selected_count, ungrouped_preset_count } = (() => {
95-
let selected_count = 0
96-
let preset_count = 0
97-
if (props.presets[0]?.chatbot !== undefined) {
98-
for (const p of props.presets) {
99-
if (!p.chatbot) {
100-
break
101-
}
102-
preset_count++
103-
if (p.is_selected) {
104-
selected_count++
105-
}
106-
}
107-
}
108-
return {
109-
ungrouped_selected_count: selected_count,
110-
ungrouped_preset_count: preset_count
111-
}
112-
})()
113-
11493
const pinned_presets = props.presets.filter((p) => p.is_pinned && p.chatbot)
11594

11695
const get_visible_presets = (
@@ -136,16 +115,27 @@ export const Presets: React.FC<Presets.Props> = (props) => {
136115
return visible_presets
137116
}
138117

118+
const is_preset_in_group = (original_index: number | undefined): boolean => {
119+
if (original_index === undefined || original_index === 0) {
120+
return false
121+
}
122+
for (let i = original_index - 1; i >= 0; i--) {
123+
const p = props.presets[i]
124+
// group header
125+
if (!p.chatbot && p.name) {
126+
return true
127+
}
128+
// separator
129+
if (!p.chatbot && !p.name) {
130+
return false
131+
}
132+
}
133+
return false
134+
}
135+
139136
const sortable_list = (() => {
140137
let list: (Presets.Preset & { id: string; original_index?: number })[] =
141138
with_ids(get_visible_presets(props.presets))
142-
if (props.presets[0]?.chatbot !== undefined) {
143-
const ungrouped_item: Presets.Preset & { id: string } = {
144-
name: 'Ungrouped',
145-
id: UNGROUPED_ID
146-
}
147-
list = [ungrouped_item, ...list]
148-
}
149139
const last_preset = props.presets[props.presets.length - 1]
150140
// A group is a preset without a `chatbot` property
151141
const is_last_item_a_group =
@@ -208,6 +198,7 @@ export const Presets: React.FC<Presets.Props> = (props) => {
208198
props.on_preset_click(preset.name!)
209199
}}
210200
role="button"
201+
title="Initialize"
211202
>
212203
<div className={styles.presets__item__left}>
213204
<div className={styles.presets__item__left__icon}>
@@ -302,57 +293,6 @@ export const Presets: React.FC<Presets.Props> = (props) => {
302293
<ReactSortable
303294
list={sortable_list}
304295
setList={(new_state) => {
305-
const ungrouped_item = new_state.find(
306-
(item) => item.id == UNGROUPED_ID
307-
)
308-
const ungrouped_was_moved = ungrouped_item
309-
? new_state[0].id !== UNGROUPED_ID
310-
: false
311-
312-
// Handle ungrouped item drag
313-
if (ungrouped_item && ungrouped_was_moved) {
314-
const ungrouped_item_index = new_state.findIndex(
315-
(item) => item.id == UNGROUPED_ID
316-
)
317-
const new_state_without_ungrouped = new_state.filter(
318-
(item) => item.id != UNGROUPED_ID
319-
)
320-
321-
// Determine where to insert the new group
322-
let target_full_index: number
323-
324-
if (
325-
ungrouped_item_index < new_state_without_ungrouped.length
326-
) {
327-
// Dropped between items - find the preset at or after this position
328-
const preset_at_drop_location =
329-
new_state_without_ungrouped[ungrouped_item_index]
330-
331-
if (preset_at_drop_location) {
332-
target_full_index = props.presets.findIndex(
333-
(p) => p.name == preset_at_drop_location.name
334-
)
335-
336-
// Fallback if preset not found
337-
if (target_full_index == -1) {
338-
target_full_index = props.presets.length
339-
}
340-
} else {
341-
target_full_index = props.presets.length
342-
}
343-
} else {
344-
// Dropped at the end
345-
target_full_index = props.presets.length
346-
}
347-
348-
// Create group at calculated position
349-
props.on_create_group({
350-
create_on_index: target_full_index,
351-
instant: true
352-
})
353-
return
354-
}
355-
356296
// Handle trailing separator item drag
357297
const trailing_separator_item = new_state.find(
358298
(item) => item.id == TRAILING_SEPARATOR_ID
@@ -388,13 +328,9 @@ export const Presets: React.FC<Presets.Props> = (props) => {
388328
]
389329

390330
if (preset_at_drop_location) {
391-
if (preset_at_drop_location.id == UNGROUPED_ID) {
392-
target_full_index = 0
393-
} else {
394-
target_full_index = props.presets.findIndex(
395-
(p) => p.name == preset_at_drop_location.name
396-
)
397-
}
331+
target_full_index = props.presets.findIndex(
332+
(p) => p.name == preset_at_drop_location.name
333+
)
398334

399335
// Fallback if preset not found
400336
if (target_full_index == -1) {
@@ -463,13 +399,9 @@ export const Presets: React.FC<Presets.Props> = (props) => {
463399
]
464400

465401
if (preset_at_drop_location) {
466-
if (preset_at_drop_location.id == UNGROUPED_ID) {
467-
target_full_index = 0
468-
} else {
469-
target_full_index = props.presets.findIndex(
470-
(p) => p.name == preset_at_drop_location.name
471-
)
472-
}
402+
target_full_index = props.presets.findIndex(
403+
(p) => p.name == preset_at_drop_location.name
404+
)
473405

474406
// Fallback if preset not found
475407
if (target_full_index == -1) {
@@ -495,7 +427,6 @@ export const Presets: React.FC<Presets.Props> = (props) => {
495427
const new_visible_presets = new_state
496428
.filter(
497429
(item) =>
498-
item.id !== UNGROUPED_ID &&
499430
item.id !== TRAILING_GROUP_ID &&
500431
item.id !== TRAILING_SEPARATOR_ID
501432
)
@@ -535,7 +466,6 @@ export const Presets: React.FC<Presets.Props> = (props) => {
535466
props.on_presets_reorder(reordered_presets)
536467
}}
537468
animation={150}
538-
handle={`.${styles.presets__item__left__drag_handle}`}
539469
>
540470
{sortable_list.map((preset) => {
541471
if (preset.id == TRAILING_SEPARATOR_ID) {
@@ -599,87 +529,6 @@ export const Presets: React.FC<Presets.Props> = (props) => {
599529
)
600530
}
601531

602-
if (preset.id == UNGROUPED_ID) {
603-
return (
604-
<div
605-
key={UNGROUPED_ID}
606-
className={cn(styles.presets__item, {
607-
[styles['presets__item--ungrouped']]: true,
608-
[styles['presets__item--highlighted']]:
609-
props.selected_preset_name == 'Ungrouped'
610-
})}
611-
onClick={() => {
612-
props.on_create_group({
613-
add_on_top: true,
614-
instant: true
615-
})
616-
}}
617-
role="button"
618-
>
619-
<div className={styles.presets__item__left}>
620-
<div
621-
className={styles.presets__item__left__drag_handle}
622-
onClick={(e) => {
623-
e.stopPropagation()
624-
}}
625-
>
626-
<span className="codicon codicon-gripper" />
627-
</div>
628-
<div
629-
className={
630-
styles['presets__item__left__collapse-icon']
631-
}
632-
>
633-
<span
634-
className={cn('codicon', {
635-
'codicon-chevron-down': true
636-
})}
637-
/>
638-
</div>
639-
<div className={styles.presets__item__left__text}>
640-
<span>Ungrouped</span>
641-
{props.is_collapsed && (
642-
<span>
643-
{`${ungrouped_preset_count} ${
644-
ungrouped_preset_count == 1
645-
? 'preset'
646-
: 'presets'
647-
}${
648-
ungrouped_selected_count > 0
649-
? ` · ${ungrouped_selected_count} selected`
650-
: ''
651-
}`}
652-
</span>
653-
)}
654-
</div>
655-
</div>
656-
<div
657-
className={styles.presets__item__right}
658-
onClick={(e) => {
659-
e.stopPropagation()
660-
}}
661-
>
662-
<IconButton
663-
codicon_icon="run-coverage"
664-
title="Run Selected Presets"
665-
on_click={(e) => {
666-
e.stopPropagation()
667-
props.on_group_click('Ungrouped')
668-
}}
669-
/>
670-
<IconButton
671-
codicon_icon="edit"
672-
title="Edit"
673-
on_click={(e) => {
674-
e.stopPropagation()
675-
props.on_create_group({ add_on_top: true })
676-
}}
677-
/>
678-
</div>
679-
</div>
680-
)
681-
}
682-
683532
if (preset.id == TRAILING_GROUP_ID) {
684533
return (
685534
<div
@@ -796,6 +645,7 @@ export const Presets: React.FC<Presets.Props> = (props) => {
796645
}
797646
}}
798647
role="button"
648+
title="Initialize"
799649
>
800650
<div className={styles.presets__item__left}>
801651
<div
@@ -808,16 +658,20 @@ export const Presets: React.FC<Presets.Props> = (props) => {
808658
</div>
809659
{preset.chatbot && (
810660
<Checkbox
811-
checked={!!preset.is_selected}
661+
checked={
662+
!!preset.is_selected &&
663+
is_preset_in_group(preset.original_index)
664+
}
812665
on_change={() =>
813666
props.on_toggle_selected_preset(preset.name!)
814667
}
815668
on_click={(e) => e.stopPropagation()}
816669
title={
817-
preset.is_selected
818-
? 'Unset as selected'
819-
: 'Set as selected'
670+
!is_preset_in_group(preset.original_index)
671+
? 'Place in a group to select'
672+
: ''
820673
}
674+
disabled={!is_preset_in_group(preset.original_index)}
821675
/>
822676
)}
823677
{preset.chatbot && (

0 commit comments

Comments
 (0)