diff --git a/frontend/src/lib/components/home/TreeOwnerRow.svelte b/frontend/src/lib/components/home/TreeOwnerRow.svelte index 7a815b28a2..11f8965569 100644 --- a/frontend/src/lib/components/home/TreeOwnerRow.svelte +++ b/frontend/src/lib/components/home/TreeOwnerRow.svelte @@ -18,8 +18,6 @@ toggleLabel?: string /** The line under the name, usually its item count. */ detail: Snippet - /** Controls rendered next to the name. Clicks on them do not toggle the row. */ - actions?: Snippet /** Always-visible control before the icon (e.g. a checkbox). Clicks on it do not * toggle the row. */ lead?: Snippet @@ -37,7 +35,6 @@ indent = 0, toggleLabel, detail, - actions, lead, trailing, expandable = true @@ -65,22 +62,7 @@ {/if}
-
- {name} - {#if actions} - - - -
e.stopPropagation()} - > - {@render actions()} -
- {/if} -
+ {name}
{@render detail()}
@@ -104,5 +86,8 @@ {/if} + {:else if trailing} + + {/if}
diff --git a/frontend/src/lib/components/home/TreeView.svelte b/frontend/src/lib/components/home/TreeView.svelte index 5d1e7c8fbb..aa93876cff 100644 --- a/frontend/src/lib/components/home/TreeView.svelte +++ b/frontend/src/lib/components/home/TreeView.svelte @@ -19,7 +19,7 @@ type ItemType, type UserItem } from './treeViewUtils' - import { pluralize } from '$lib/utils' + import { pluralize, type Item as MenuItem } from '$lib/utils' import { Button } from '$lib/components/common' import { inUnruledList, rowRule } from '../common/table/unruledList' import type { TreeOpenMemory } from './treeViewState.svelte' @@ -124,6 +124,33 @@ ) const mentionRoot = $derived(homeComposerContext.available ? badgeRoot : undefined) + const ownerMenuItems = $derived.by(() => { + const items: MenuItem[] = [] + if (mentionRoot) { + const path = mentionRoot + items.push({ + displayName: 'Add to AI session context', + icon: AtSign, + type: 'ai', + action: () => homeComposerContext.attach(folderContextElement(path)) + }) + } + if (onManageFolder && isFolder(item) && depth === 0) { + const folderName = item.folderName + // The Folders page's write rule. A non-owner's drawer opens read-only. + const canWrite = + $userStore?.is_admin || + $userStore?.is_super_admin || + $userStore?.folders_owners.includes(folderName) + items.push({ + displayName: canWrite ? 'Manage folder' : 'View folder', + icon: canWrite ? Pen : Eye, + action: () => onManageFolder?.(folderName) + }) + } + return items + }) + // Hidden while searching: pipelines aren't part of the text filter (the list // view hides their rows on a query too), so a folder matching the search // shouldn't surface an unrelated Pipeline row. @@ -344,39 +371,27 @@ {/if} + {#if badgeRoot} + + {#if ownerMenuItems.length > 0} + + + e.stopPropagation()} + > + + + {:else} + + {/if} + {/if} {/snippet} -{#snippet manageFolderMenu()} - {#if isFolder(item)} - {@const folderName = item.folderName} - - {@const canWrite = - $userStore?.is_admin || - $userStore?.is_super_admin || - $userStore?.folders_owners.includes(folderName)} - homeComposerContext.attach(folderContextElement(`f/${folderName}`)), - hide: !homeComposerContext.available - }, - { - displayName: canWrite ? 'Manage folder' : 'View folder', - icon: canWrite ? Pen : Eye, - action: () => onManageFolder?.(folderName) - } - ]} - /> - {/if} -{/snippet} - {#snippet ownerLeadForNode()} {#if nodePrefix != undefined} {@render ownerLead?.(nodePrefix)} @@ -392,7 +407,6 @@ onToggle={toggleOwner} expandable={!empty || opened} indent={visualDepth * 16} - actions={onManageFolder && depth === 0 && isFolder(item) ? manageFolderMenu : undefined} lead={ownerLead && nodePrefix != undefined ? ownerLeadForNode : undefined} trailing={badgeRoot ? folderTrailing : undefined} >