Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(gfs): add nested share actions
M74eb1de80add
diff --git a/control-ui/app/globals.css b/control-ui/app/globals.cssindex c4e340662..058a2395b 100644--- a/control-ui/app/globals.css+++ b/control-ui/app/globals.css@@ -12570,6 +12570,24 @@ button.cu-gfs-tree__button:focus-visible,scrollbar-width: thin;}+.cu-gfs-resource-menu__submenu {+ position: fixed;+ top: auto;+ right: auto;+ z-index: 61;+ width: min(15rem, calc(100vw - (var(--cu-space-4) * 2)));+ max-height: calc(100vh - (var(--cu-space-4) * 2));+ display: grid;+ gap: 0;+ overflow-y: auto;+ padding: var(--cu-space-1);+ border: 1px solid var(--cu-border);+ border-radius: var(--cu-radius);+ background: var(--cu-bg-elevated);+ box-shadow: var(--cu-shadow);+ scrollbar-width: thin;+}+.cu-gfs-resource-menu__group {display: grid;}@@ -12591,6 +12609,21 @@ button.cu-gfs-tree__button:focus-visible,background: var(--cu-surface-hover);}+.cu-gfs-resource-menu__trailing {+ width: 1.5rem;+ height: 1.5rem;+ flex: 0 0 1.5rem;+ display: grid;+ place-items: center;+ margin-left: auto;+ color: var(--cu-text-muted);+}++.cu-gfs-resource-menu__trailing svg {+ width: 1.125rem;+ height: 1.125rem;+}+.cu-gfs-resource-menu__icon {width: 1.5rem;height: 1.5rem;@@ -12605,6 +12638,23 @@ button.cu-gfs-tree__button:focus-visible,height: 1.125rem;}+.cu-gfs-resource-menu__submenu .cu-gfs-resource-menu__item.cu-kebab__item {+ min-height: 2.75rem;+ padding: 0 var(--cu-space-3);+ gap: var(--cu-space-2);+ border-radius: calc(var(--cu-radius-sm) - 2px);+ color: var(--cu-text);+ font-size: var(--cu-font-size-md);+ font-weight: var(--cu-font-weight-medium);+ line-height: normal;+}++.cu-gfs-resource-menu__submenu .cu-gfs-resource-menu__item.cu-kebab__item:hover:not(:disabled),+.cu-gfs-resource-menu__submenu .cu-gfs-resource-menu__item.cu-kebab__item:focus-visible {+ color: var(--cu-text);+ background: var(--cu-surface-hover);+}+.cu-gfs-resource-menu__item.cu-kebab__item--danger {color: var(--cu-danger);}diff --git a/control-ui/components/GfsResourceMenu/index.tsx b/control-ui/components/GfsResourceMenu/index.tsxindex 64892aa82..e0e30143a 100644--- a/control-ui/components/GfsResourceMenu/index.tsx+++ b/control-ui/components/GfsResourceMenu/index.tsx@@ -3,13 +3,15 @@import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'import type { KeyboardEvent as ReactKeyboardEvent, ReactNode } from 'react'import { createPortal } from 'react-dom'-import { IconFolder, IconSharedFiles } from '@components/Sidebar/icons'+import { IconFolder } from '@components/Sidebar/icons'import {+ IconChevronRight,IconCopy,IconDotsVertical,IconDownload,IconEye,IconPencil,+ IconShare,IconTrash,IconUpload,} from '@components/icons'@@ -22,6 +24,7 @@ type GfsResourceMenuAction = {key: stringlabel: stringonClick: () => void+ submenu?: boolean}function menuAction(@@ -29,7 +32,7 @@ function menuAction(label: string,icon: ReactNode,onClick: (() => void) | undefined,- options?: Pick<GfsResourceMenuAction, 'danger' | 'disabled'>+ options?: Pick<GfsResourceMenuAction, 'danger' | 'disabled' | 'submenu'>): GfsResourceMenuAction | null {return onClick ? { ...options, icon, key, label, onClick } : null}@@ -52,18 +55,30 @@ export function GfsResourceMenu({resourceUri,}: GfsResourceMenuProps) {const [open, setOpen] = useState(false)+ const [shareOpen, setShareOpen] = useState(false)const rootRef = useRef<HTMLDivElement | null>(null)const menuRef = useRef<HTMLDivElement | null>(null)+ const submenuRef = useRef<HTMLDivElement | null>(null)+ const shareTriggerRef = useRef<HTMLButtonElement | null>(null)const triggerRef = useRef<HTMLButtonElement | null>(null)const replaceInputRef = useRef<HTMLInputElement | null>(null)const [menuPosition, setMenuPosition] = useState<{ left: number; top: number } | null>(null)- const closeMenu = useCallback(() => setOpen(false), [])+ const [submenuPosition, setSubmenuPosition] = useState<{ left: number; top: number } | null>(null)+ const closeMenu = useCallback(() => {+ setOpen(false)+ setShareOpen(false)+ }, [])useEffect(() => {if (!open) returnfunction handlePointerDown(event: MouseEvent) {const target = event.target as Node- if (rootRef.current?.contains(target) || menuRef.current?.contains(target)) return+ if (+ rootRef.current?.contains(target) ||+ menuRef.current?.contains(target) ||+ submenuRef.current?.contains(target)+ )+ returncloseMenu()}document.addEventListener('mousedown', handlePointerDown)@@ -108,21 +123,88 @@ export function GfsResourceMenu({}}, [open, positionMenu])+ const positionSubmenu = useCallback(() => {+ const trigger = shareTriggerRef.current+ const submenu = submenuRef.current+ if (!trigger || !submenu) return++ const triggerRect = trigger.getBoundingClientRect()+ const submenuRect = submenu.getBoundingClientRect()+ const edgeInset = 8+ const gap = 6+ const viewportWidth = window.innerWidth+ const viewportHeight = window.innerHeight+ const opensLeft = triggerRect.right + gap + submenuRect.width > viewportWidth - edgeInset+ const preferredLeft = opensLeft+ ? triggerRect.left - submenuRect.width - gap+ : triggerRect.right + gap+ const maxLeft = Math.max(edgeInset, viewportWidth - submenuRect.width - edgeInset)+ const left = Math.min(Math.max(edgeInset, preferredLeft), maxLeft)+ const maxTop = Math.max(edgeInset, viewportHeight - submenuRect.height - edgeInset)+ const top = Math.min(Math.max(edgeInset, triggerRect.top), maxTop)++ setSubmenuPosition({ left, top })+ }, [])++ useLayoutEffect(() => {+ if (!shareOpen) {+ setSubmenuPosition(null)+ return+ }++ positionSubmenu()+ window.addEventListener('resize', positionSubmenu)+ window.addEventListener('scroll', positionSubmenu, true)+ return () => {+ window.removeEventListener('resize', positionSubmenu)+ window.removeEventListener('scroll', positionSubmenu, true)+ }+ }, [positionSubmenu, shareOpen])+useEffect(() => {if (!open) returnmenuRef.current?.querySelector<HTMLButtonElement>('[role="menuitem"]:not(:disabled)')?.focus()function handleKeyDown(event: KeyboardEvent) {if (event.key === 'Escape') {- closeMenu()- triggerRef.current?.focus()+ if (shareOpen) {+ event.preventDefault()+ setShareOpen(false)+ shareTriggerRef.current?.focus()+ } else {+ closeMenu()+ triggerRef.current?.focus()+ }}}document.addEventListener('keydown', handleKeyDown)return () => document.removeEventListener('keydown', handleKeyDown)- }, [closeMenu, open])+ }, [closeMenu, open, shareOpen])++ useEffect(() => {+ if (!shareOpen) return+ submenuRef.current+ ?.querySelector<HTMLButtonElement>('[role="menuitem"]:not(:disabled)')+ ?.focus()+ }, [shareOpen])function handleMenuKeyDown(event: ReactKeyboardEvent<HTMLElement>): void {- if (!open || !['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return+ if (!open) return+ if (event.key === 'ArrowRight' && event.target === shareTriggerRef.current) {+ event.preventDefault()+ setShareOpen(true)+ return+ }+ if (+ event.key === 'ArrowLeft' &&+ shareOpen &&+ submenuRef.current?.contains(document.activeElement)+ ) {+ event.preventDefault()+ setShareOpen(false)+ shareTriggerRef.current?.focus()+ return+ }+ if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) returnconst items = Array.from(event.currentTarget.querySelectorAll<HTMLButtonElement>('[role="menuitem"]:not(:disabled)'))@@ -144,7 +226,14 @@ export function GfsResourceMenu({const actionGroups: GfsResourceMenuAction[][] = [[- menuAction('share', 'Share', <IconSharedFiles />, onManage),+ menuAction(+ 'share',+ 'Share',+ <IconShare />,+ onManage ? () => setShareOpen(value => !value) : undefined,+ { submenu: true }+ ),+ onManage ? null : menuAction('copy-link', 'Copy link', <IconCopy />, onCopyLink),menuAction('preview', 'Preview', <IconEye />, onPreview),].filter(isMenuAction),[@@ -165,7 +254,6 @@ export function GfsResourceMenu({),].filter(isMenuAction),[- menuAction('copy-link', 'Copy GFS link', <IconCopy />, onCopyLink),menuAction('rename', 'Rename', <IconPencil />, onRename),menuAction('move', 'Move to…', <IconFolder />, onMove),].filter(isMenuAction),@@ -185,53 +273,122 @@ export function GfsResourceMenu({ref={triggerRef}onClick={event => {event.stopPropagation()- setOpen(current => !current)+ if (open) {+ closeMenu()+ } else {+ setOpen(true)+ }}}><IconDotsVertical width={18} height={18} /></button>{open? createPortal(- <div- className="cu-gfs-resource-menu__menu cu-kebab__menu"- ref={menuRef}- role="menu"- style={- menuPosition- ? { left: menuPosition.left, top: menuPosition.top }- : { left: 0, top: 0, visibility: 'hidden' }- }- onKeyDown={handleMenuKeyDown}- >- {actionGroups.map((group, groupIndex) => (- <span key={`group-${groupIndex}`} className="cu-gfs-resource-menu__group">- {groupIndex > 0 ? (- <span className="cu-gfs-resource-menu__separator" role="separator" />- ) : null}- {group.map(action => (+ <>+ <div+ className="cu-gfs-resource-menu__menu cu-kebab__menu"+ ref={menuRef}+ role="menu"+ aria-label={`Actions for ${resourceName}`}+ style={+ menuPosition+ ? { left: menuPosition.left, top: menuPosition.top }+ : { left: 0, top: 0, visibility: 'hidden' }+ }+ onKeyDown={handleMenuKeyDown}+ >+ {actionGroups.map((group, groupIndex) => (+ <span key={`group-${groupIndex}`} className="cu-gfs-resource-menu__group">+ {groupIndex > 0 ? (+ <span className="cu-gfs-resource-menu__separator" role="separator" />+ ) : null}+ {group.map(action => (+ <button+ aria-expanded={action.submenu ? shareOpen : undefined}+ aria-haspopup={action.submenu ? 'menu' : undefined}+ data-gfs-action={action.key}+ key={action.key}+ type="button"+ role="menuitem"+ className={`cu-gfs-resource-menu__item cu-kebab__item${+ action.danger ? ' cu-kebab__item--danger' : ''+ }`}+ disabled={action.disabled}+ ref={action.submenu ? shareTriggerRef : undefined}+ title={action.key === 'copy-link' ? resourceUri : undefined}+ onMouseEnter={() => setShareOpen(action.submenu === true)}+ onClick={event => {+ event.stopPropagation()+ if (action.submenu) {+ action.onClick()+ } else {+ run(action.onClick)+ }+ }}+ >+ <span className="cu-gfs-resource-menu__icon" aria-hidden="true">+ {action.icon}+ </span>+ <span>{action.label}</span>+ {action.submenu ? (+ <span className="cu-gfs-resource-menu__trailing" aria-hidden="true">+ <IconChevronRight width={18} height={18} />+ </span>+ ) : null}+ </button>+ ))}+ </span>+ ))}+ </div>+ {shareOpen && onManage ? (+ <div+ aria-label={`Share options for ${resourceName}`}+ className="cu-gfs-resource-menu__submenu"+ ref={submenuRef}+ role="menu"+ style={+ submenuPosition+ ? { left: submenuPosition.left, top: submenuPosition.top }+ : { left: 0, top: 0, visibility: 'hidden' }+ }+ onKeyDown={handleMenuKeyDown}+ >+ <button+ type="button"+ role="menuitem"+ className="cu-gfs-resource-menu__item cu-kebab__item"+ data-gfs-action="share-access"+ onClick={event => {+ event.stopPropagation()+ run(onManage)+ }}+ >+ <span className="cu-gfs-resource-menu__icon" aria-hidden="true">+ <IconShare />+ </span>+ <span>Share</span>+ </button>+ {onCopyLink ? (<button- key={action.key}type="button"role="menuitem"- className={`cu-gfs-resource-menu__item cu-kebab__item${- action.danger ? ' cu-kebab__item--danger' : ''- }`}- disabled={action.disabled}- title={action.key === 'copy-link' ? resourceUri : undefined}+ className="cu-gfs-resource-menu__item cu-kebab__item"+ data-gfs-action="copy-link"+ title={resourceUri}onClick={event => {event.stopPropagation()- run(action.onClick)+ run(onCopyLink)}}><span className="cu-gfs-resource-menu__icon" aria-hidden="true">- {action.icon}+ <IconCopy /></span>- <span>{action.label}</span>+ <span>Copy link</span></button>- ))}- </span>- ))}- </div>,+ ) : null}+ </div>+ ) : null}+ </>,document.body): null}diff --git a/control-ui/components/__tests__/GfsBrowser.test.tsx b/control-ui/components/__tests__/GfsBrowser.test.tsxindex 3389ad17f..db79f28a9 100644--- a/control-ui/components/__tests__/GfsBrowser.test.tsx+++ b/control-ui/components/__tests__/GfsBrowser.test.tsx@@ -111,6 +111,12 @@ async function openResourceMenu(resourceName: string) {async function openManage(resourceName: string) {await openResourceMenu(resourceName)fireEvent.click(screen.getByRole('menuitem', { name: 'Share' }))+ fireEvent.click(+ within(screen.getByRole('menu', { name: `Share options for ${resourceName}` })).getByRole(+ 'menuitem',+ { name: 'Share' }+ )+ )}function child(name: string, kind: string, n: number) {@@ -201,9 +207,11 @@ describe('GfsBrowser', () => {)await openResourceMenu('readme.md')- expect(screen.getByRole('menuitem', { name: 'Copy GFS link' }).getAttribute('title')).toBe(- 'gfs://main/r2'- )+ fireEvent.click(screen.getByRole('menuitem', { name: 'Share' }))+ const shareMenu = screen.getByRole('menu', { name: 'Share options for readme.md' })+ expect(+ within(shareMenu).getByRole('menuitem', { name: 'Copy link' }).getAttribute('title')+ ).toBe('gfs://main/r2')expect(mockApiGet).toHaveBeenCalledWith('/api/v1/gfs/tree', { drive: 'main' })})@@ -1256,9 +1264,9 @@ describe('GfsBrowser', () => {renderBrowser()await openResourceMenu('report.md')- const manageItem = screen.getByRole('menuitem', { name: 'Share' })- await waitFor(() => expect(document.activeElement).toBe(manageItem))- fireEvent.keyDown(manageItem, { key: 'ArrowDown' })+ const shareItem = screen.getByRole('menuitem', { name: 'Share' })+ await waitFor(() => expect(document.activeElement).toBe(shareItem))+ fireEvent.keyDown(shareItem, { key: 'ArrowDown' })expect(document.activeElement).toBe(screen.getByRole('menuitem', { name: 'Preview' }))fireEvent.keyDown(document.activeElement!, { key: 'End' })expect(document.activeElement).toBe(screen.getByRole('menuitem', { name: 'Delete' }))@@ -1474,7 +1482,7 @@ describe('GfsBrowser', () => {const manageMenu = screen.getByRole('menu')expect(within(manageMenu).getByRole('menuitem', { name: 'Download' })).toBeTruthy()expect(within(manageMenu).getByRole('menuitem', { name: 'Replace file' })).toBeTruthy()- expect(within(manageMenu).getByRole('menuitem', { name: 'Copy GFS link' })).toBeTruthy()+ expect(within(manageMenu).getByRole('menuitem', { name: 'Copy link' })).toBeTruthy()expect(within(manageMenu).getByRole('menuitem', { name: 'Rename' })).toBeTruthy()expect(within(manageMenu).getByRole('menuitem', { name: 'Delete' })).toBeTruthy()expect(within(manageMenu).queryByRole('menuitem', { name: 'Share' })).toBeNull()@@ -1522,6 +1530,12 @@ describe('GfsBrowser', () => {const rowMenu = screen.getByRole('menu')expect(within(rowMenu).queryByRole('menuitem', { name: 'Create share' })).toBeNull()fireEvent.click(within(rowMenu).getByRole('menuitem', { name: 'Share' }))+ fireEvent.click(+ within(screen.getByRole('menu', { name: 'Share options for team-folder' })).getByRole(+ 'menuitem',+ { name: 'Share' }+ )+ )expect(screen.queryByText('Manage folder')).toBeNull()await waitFor(() => expect(mockGetAdminUsers).toHaveBeenCalledWith(''))expect(diff --git a/control-ui/components/__tests__/GfsResourceMenu.test.tsx b/control-ui/components/__tests__/GfsResourceMenu.test.tsxindex a229de252..7b17bd22f 100644--- a/control-ui/components/__tests__/GfsResourceMenu.test.tsx+++ b/control-ui/components/__tests__/GfsResourceMenu.test.tsx@@ -1,6 +1,6 @@// @vitest-environment jsdomimport { afterEach, describe, expect, it, vi } from 'vitest'-import { cleanup, fireEvent, render, screen } from '@testing-library/react'+import { cleanup, fireEvent, render, screen, within } from '@testing-library/react'import { GfsResourceMenu } from '../GfsResourceMenu'describe('GfsResourceMenu', () => {@@ -9,12 +9,13 @@ describe('GfsResourceMenu', () => {})it('presents the Share action in an icon-led, grouped menu', () => {+ const onManage = vi.fn()render(<GfsResourceMenuonCopyLink={vi.fn()}onDelete={vi.fn()}onDownload={vi.fn()}- onManage={vi.fn()}+ onManage={onManage}onPreview={vi.fn()}onRename={vi.fn()}onReplace={vi.fn()}@@ -36,11 +37,33 @@ describe('GfsResourceMenu', () => {fireEvent.click(trigger)- const menu = screen.getByRole('menu')+ const menu = screen.getByRole('menu', { name: 'Actions for report.txt' })expect(menu.classList.contains('cu-gfs-resource-menu__menu')).toBe(true)expect(menu.querySelectorAll('[role="separator"]')).toHaveLength(3)- expect(menu.querySelectorAll('.cu-gfs-resource-menu__icon')).toHaveLength(7)- expect(screen.getByRole('menuitem', { name: 'Share' })).toBeTruthy()- expect(screen.queryByRole('menuitem', { name: 'Manage access' })).toBeNull()+ expect(menu.querySelectorAll('.cu-gfs-resource-menu__icon')).toHaveLength(6)+ const shareItem = within(menu).getByRole('menuitem', { name: 'Share' })+ expect(shareItem.getAttribute('aria-haspopup')).toBe('menu')+ expect(shareItem.getAttribute('aria-expanded')).toBe('false')+ expect(+ menu+ .querySelector('[data-gfs-action="share"] .cu-gfs-resource-menu__icon path')+ ?.getAttribute('d')+ ).toBe('M5 7a4 4 0 1 0 8 0a4 4 0 0 0 -8 0')+ expect(within(menu).queryByRole('menuitem', { name: 'Copy link' })).toBeNull()++ fireEvent.click(shareItem)+ const shareMenu = screen.getByRole('menu', { name: 'Share options for report.txt' })+ expect(shareItem.getAttribute('aria-expanded')).toBe('true')+ expect(within(shareMenu).getByRole('menuitem', { name: 'Share' })).toBeTruthy()+ expect(within(shareMenu).getByRole('menuitem', { name: 'Copy link' })).toBeTruthy()+ expect(within(shareMenu).queryByRole('menuitem', { name: 'Manage access' })).toBeNull()+ expect(+ shareMenu+ .querySelector('[data-gfs-action="share-access"] .cu-gfs-resource-menu__icon path')+ ?.getAttribute('d')+ ).toBe('M5 7a4 4 0 1 0 8 0a4 4 0 0 0 -8 0')+ fireEvent.click(within(shareMenu).getByRole('menuitem', { name: 'Share' }))+ expect(onManage).toHaveBeenCalledOnce()+ expect(screen.queryByRole('menu', { name: 'Actions for report.txt' })).toBeNull()})})diff --git a/control-ui/components/icons/index.tsx b/control-ui/components/icons/index.tsxindex 8aad99fb9..093e64390 100644--- a/control-ui/components/icons/index.tsx+++ b/control-ui/components/icons/index.tsx@@ -69,6 +69,29 @@ export function IconCopy({ title, ...props }: IconProps) {)}+export function IconShare({ title, ...props }: IconProps) {+ const p = iconSize(props)+ return (+ <svg+ viewBox="0 0 24 24"+ fill="none"+ stroke="currentColor"+ strokeWidth="2"+ strokeLinecap="round"+ strokeLinejoin="round"+ aria-hidden+ {...p}+ >+ {title ? <title>{title}</title> : null}+ <path d="M5 7a4 4 0 1 0 8 0a4 4 0 0 0 -8 0" />+ <path d="M3 21v-2a4 4 0 0 1 4 -4h4c.96 0 1.84 .338 2.53 .901" />+ <path d="M16 3.13a4 4 0 0 1 0 7.75" />+ <path d="M16 19h6" />+ <path d="M19 16v6" />+ </svg>+ )+}+export function IconX({ title, ...props }: IconProps) {const p = iconSize(props)return (diff --git a/control-ui/e2e/support/gfs-resource-crud-journey.test.ts b/control-ui/e2e/support/gfs-resource-crud-journey.test.tsindex d936f2d3c..bc307298e 100644--- a/control-ui/e2e/support/gfs-resource-crud-journey.test.ts+++ b/control-ui/e2e/support/gfs-resource-crud-journey.test.ts@@ -27,7 +27,9 @@ export async function exerciseGfsResourceCrudJourney({await expect(row).toBeVisible({ timeout: 20_000 })const actionsButton = row.getByRole('button', { name: `Actions for ${fixture.name}` })await actionsButton.click()- const copyButton = page.getByRole('menuitem', { name: 'Copy GFS link' })+ await page.getByRole('menuitem', { name: 'Share' }).hover()+ const shareMenu = page.getByRole('menu', { name: `Share options for ${fixture.name}` })+ const copyButton = shareMenu.getByRole('menuitem', { name: 'Copy link' })await page.context().grantPermissions(['clipboard-read', 'clipboard-write'], {origin: new URL(baseUi).origin,})@@ -35,7 +37,11 @@ export async function exerciseGfsResourceCrudJourney({await copyButton.click()await expect.poll(() => page.evaluate(() => navigator.clipboard.readText())).toBe(fixture.uri)await actionsButton.click()- await page.getByRole('menuitem', { name: 'Manage access' }).click()+ await page.getByRole('menuitem', { name: 'Share' }).hover()+ await page+ .getByRole('menu', { name: `Share options for ${fixture.name}` })+ .getByRole('menuitem', { name: 'Share' })+ .click()await expect(page.getByRole('dialog', { name: `Manage folder ${fixture.name}`, exact: true })).toBeVisible()diff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex 5e68a1e21..fd8596443 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.500",+ "version": "0.1.501","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.500",+ "version": "0.1.501","dependencies": {"@clerum/display-field": "file:../packages/display-field","@clerum/llm-providers": "file:../packages/llm-providers",diff --git a/control-ui/package.json b/control-ui/package.jsonindex da72fd0cf..3a106de86 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.500",+ "version": "0.1.501","private": true,"scripts": {"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",diff --git a/desktop-app/ui/src/components/GfsResourceMenu/GfsResourceMenu.test.tsx b/desktop-app/ui/src/components/GfsResourceMenu/GfsResourceMenu.test.tsxindex 1a03d0560..66daf832c 100644--- a/desktop-app/ui/src/components/GfsResourceMenu/GfsResourceMenu.test.tsx+++ b/desktop-app/ui/src/components/GfsResourceMenu/GfsResourceMenu.test.tsx@@ -1,6 +1,6 @@// @vitest-environment jsdomimport { afterEach, describe, expect, it, vi } from 'vitest'-import { cleanup, fireEvent, render, screen } from '@testing-library/react'+import { cleanup, fireEvent, render, screen, within } from '@testing-library/react'import { GfsResourceMenu } from './index'describe('GfsResourceMenu', () => {@@ -9,11 +9,12 @@ describe('GfsResourceMenu', () => {})it('uses a vertical kebab and presents an icon-led menu panel', () => {+ const onManage = vi.fn()render(<GfsResourceMenuonCopyLink={vi.fn()}onDelete={vi.fn()}- onManage={vi.fn()}+ onManage={onManage}onPreview={vi.fn()}resourceName="report.txt"/>@@ -32,13 +33,33 @@ describe('GfsResourceMenu', () => {fireEvent.click(trigger)- const menu = screen.getByRole('menu')+ const menu = screen.getByRole('menu', { name: 'Actions for report.txt' })expect(menu.tagName).toBe('DIV')expect(menu.classList.contains('da-gfs-resource-menu__panel')).toBe(true)- expect(menu.querySelectorAll('[role="separator"]')).toHaveLength(2)- expect(menu.querySelectorAll('.ui-menu-item__icon')).toHaveLength(4)- expect(screen.getByRole('menuitem', { name: 'Share' })).toBeTruthy()- expect(screen.queryByRole('menuitem', { name: 'Manage' })).toBeNull()- expect(screen.getByRole('menuitem', { name: 'Preview' })).toBeTruthy()+ expect(menu.querySelectorAll('[role="separator"]')).toHaveLength(1)+ expect(menu.querySelectorAll('.ui-menu-item__icon')).toHaveLength(3)+ const shareItem = within(menu).getByRole('menuitem', { name: 'Share' })+ expect(shareItem.getAttribute('aria-haspopup')).toBe('menu')+ expect(shareItem.getAttribute('aria-expanded')).toBe('false')+ expect(+ menu.querySelector('[data-gfs-action="share"] .ui-menu-item__icon path')?.getAttribute('d')+ ).toBe('M5 7a4 4 0 1 0 8 0a4 4 0 0 0 -8 0')+ expect(within(menu).queryByRole('menuitem', { name: 'Copy link' })).toBeNull()+ expect(within(menu).getByRole('menuitem', { name: 'Preview' })).toBeTruthy()++ fireEvent.click(shareItem)+ const shareMenu = screen.getByRole('menu', { name: 'Share options for report.txt' })+ expect(shareItem.getAttribute('aria-expanded')).toBe('true')+ expect(within(shareMenu).getByRole('menuitem', { name: 'Share' })).toBeTruthy()+ expect(within(shareMenu).getByRole('menuitem', { name: 'Copy link' })).toBeTruthy()+ expect(within(shareMenu).queryByRole('menuitem', { name: 'Manage access' })).toBeNull()+ expect(+ shareMenu+ .querySelector('[data-gfs-action="share-access"] .ui-menu-item__icon path')+ ?.getAttribute('d')+ ).toBe('M5 7a4 4 0 1 0 8 0a4 4 0 0 0 -8 0')+ fireEvent.click(within(shareMenu).getByRole('menuitem', { name: 'Share' }))+ expect(onManage).toHaveBeenCalledOnce()+ expect(screen.queryByRole('menu', { name: 'Actions for report.txt' })).toBeNull()})})diff --git a/desktop-app/ui/src/components/GfsResourceMenu/index.tsx b/desktop-app/ui/src/components/GfsResourceMenu/index.tsxindex e6dd95621..9f4f96c69 100644--- a/desktop-app/ui/src/components/GfsResourceMenu/index.tsx+++ b/desktop-app/ui/src/components/GfsResourceMenu/index.tsx@@ -3,6 +3,7 @@ import type { KeyboardEvent as ReactKeyboardEvent, ReactNode } from 'react'import { createPortal } from 'react-dom'import { IconButton, MenuItem } from '@components/Common'import {+ IconChevronRight,IconConnectors,IconContexts,IconCopy,@@ -11,7 +12,7 @@ import {IconEye,IconMoreVertical,IconPlus,- IconTeams,+ IconShare,IconTrash,} from '@components/SidebarNav/icons'import type { GfsResourceMenuProps } from './types'@@ -22,6 +23,7 @@ type GfsResourceMenuAction = {key: stringlabel: stringonClick: () => void+ submenu?: boolean}function menuAction(@@ -29,9 +31,9 @@ function menuAction(label: string,icon: ReactNode,onClick: (() => void) | undefined,- color?: GfsResourceMenuAction['color']+ options: Pick<GfsResourceMenuAction, 'color' | 'submenu'> = {}): GfsResourceMenuAction | null {- return onClick ? { color, icon, key, label, onClick } : null+ return onClick ? { ...options, icon, key, label, onClick } : null}function isMenuAction(action: GfsResourceMenuAction | null): action is GfsResourceMenuAction {@@ -53,11 +55,18 @@ export function GfsResourceMenu({onMove,}: GfsResourceMenuProps) {const [open, setOpen] = useState(false)+ const [shareOpen, setShareOpen] = useState(false)const menuRef = useRef<HTMLSpanElement | null>(null)const panelRef = useRef<HTMLDivElement | null>(null)+ const submenuRef = useRef<HTMLDivElement | null>(null)+ const shareTriggerRef = useRef<HTMLButtonElement | null>(null)const triggerRef = useRef<HTMLButtonElement | null>(null)const [panelPosition, setPanelPosition] = useState<{ left: number; top: number } | null>(null)- const closeMenu = useCallback(() => setOpen(false), [])+ const [submenuPosition, setSubmenuPosition] = useState<{ left: number; top: number } | null>(null)+ const closeMenu = useCallback(() => {+ setOpen(false)+ setShareOpen(false)+ }, [])const onOpenChangeRef = useRef(onOpenChange)const prevOpenRef = useRef(false)@@ -82,7 +91,12 @@ export function GfsResourceMenu({if (!open) returnconst handlePointerDown = (event: MouseEvent) => {const target = event.target as Node- if (menuRef.current?.contains(target) || panelRef.current?.contains(target)) return+ if (+ menuRef.current?.contains(target) ||+ panelRef.current?.contains(target) ||+ submenuRef.current?.contains(target)+ )+ returncloseMenu()}document.addEventListener('mousedown', handlePointerDown)@@ -133,21 +147,88 @@ export function GfsResourceMenu({}}, [open, positionPanel])+ const positionSubmenu = useCallback(() => {+ const trigger = shareTriggerRef.current+ const submenu = submenuRef.current+ if (!trigger || !submenu) return++ const triggerRect = trigger.getBoundingClientRect()+ const submenuRect = submenu.getBoundingClientRect()+ const edgeInset = 8+ const gap = 6+ const viewportWidth = window.innerWidth+ const viewportHeight = window.innerHeight+ const opensLeft = triggerRect.right + gap + submenuRect.width > viewportWidth - edgeInset+ const preferredLeft = opensLeft+ ? triggerRect.left - submenuRect.width - gap+ : triggerRect.right + gap+ const maxLeft = Math.max(edgeInset, viewportWidth - submenuRect.width - edgeInset)+ const left = Math.min(Math.max(edgeInset, preferredLeft), maxLeft)+ const maxTop = Math.max(edgeInset, viewportHeight - submenuRect.height - edgeInset)+ const top = Math.min(Math.max(edgeInset, triggerRect.top), maxTop)++ setSubmenuPosition({ left, top })+ }, [])++ useLayoutEffect(() => {+ if (!shareOpen) {+ setSubmenuPosition(null)+ return+ }++ positionSubmenu()+ window.addEventListener('resize', positionSubmenu)+ window.addEventListener('scroll', positionSubmenu, true)+ return () => {+ window.removeEventListener('resize', positionSubmenu)+ window.removeEventListener('scroll', positionSubmenu, true)+ }+ }, [positionSubmenu, shareOpen])+useEffect(() => {if (!open) returnpanelRef.current?.querySelector<HTMLButtonElement>('[role="menuitem"]:not(:disabled)')?.focus()const handleKeyDown = (event: KeyboardEvent) => {if (event.key === 'Escape') {- closeMenu()- triggerRef.current?.focus()+ if (shareOpen) {+ event.preventDefault()+ setShareOpen(false)+ shareTriggerRef.current?.focus()+ } else {+ closeMenu()+ triggerRef.current?.focus()+ }}}window.addEventListener('keydown', handleKeyDown)return () => window.removeEventListener('keydown', handleKeyDown)- }, [closeMenu, open])+ }, [closeMenu, open, shareOpen])++ useEffect(() => {+ if (!shareOpen) return+ submenuRef.current+ ?.querySelector<HTMLButtonElement>('[role="menuitem"]:not(:disabled)')+ ?.focus()+ }, [shareOpen])const handleMenuKeyDown = (event: ReactKeyboardEvent<HTMLElement>) => {- if (!open || !['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) return+ if (!open) return+ if (event.key === 'ArrowRight' && event.target === shareTriggerRef.current) {+ event.preventDefault()+ setShareOpen(true)+ return+ }+ if (+ event.key === 'ArrowLeft' &&+ shareOpen &&+ submenuRef.current?.contains(document.activeElement)+ ) {+ event.preventDefault()+ setShareOpen(false)+ shareTriggerRef.current?.focus()+ return+ }+ if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) returnconst items = Array.from(event.currentTarget.querySelectorAll<HTMLButtonElement>('[role="menuitem"]:not(:disabled)'))@@ -169,7 +250,14 @@ export function GfsResourceMenu({const actionGroups = [[- menuAction('manage', 'Share', <IconTeams />, onManage),+ menuAction(+ 'share',+ 'Share',+ <IconShare />,+ onManage ? () => setShareOpen(value => !value) : undefined,+ { submenu: true }+ ),+ onManage ? null : menuAction('copy-link', 'Copy link', <IconCopy />, onCopyLink),menuAction('open-folder', 'Open folder', <IconContexts />, onOpen),menuAction('open-gfs-link', 'Open GFS link', <IconConnectors />, onOpenGfsLink),menuAction('preview', 'Preview', <IconEye />, onPreview),@@ -179,11 +267,10 @@ export function GfsResourceMenu({menuAction('rename', 'Rename', <IconEdit />, onRename),menuAction('move', 'Move to…', <IconContexts />, onMove),].filter(isMenuAction),- [- menuAction('download', 'Download', <IconDownload />, onDownload),- menuAction('copy-link', 'Copy GFS link', <IconCopy />, onCopyLink),- ].filter(isMenuAction),- [menuAction('delete', 'Delete', <IconTrash />, onDelete, 'danger')].filter(isMenuAction),+ [menuAction('download', 'Download', <IconDownload />, onDownload)].filter(isMenuAction),+ [menuAction('delete', 'Delete', <IconTrash />, onDelete, { color: 'danger' })].filter(+ isMenuAction+ ),].filter(group => group.length > 0)return (@@ -199,7 +286,11 @@ export function GfsResourceMenu({aria-expanded={open}onClick={event => {event.stopPropagation()- setOpen(value => !value)+ if (open) {+ closeMenu()+ } else {+ setOpen(true)+ }}}ref={triggerRef}size="sm"@@ -209,36 +300,84 @@ export function GfsResourceMenu({</IconButton>{open? createPortal(- <div- className="da-gfs-resource-menu__panel"- ref={panelRef}- role="menu"- style={- panelPosition- ? { left: panelPosition.left, top: panelPosition.top }- : { left: 0, top: 0, visibility: 'hidden' }- }- onKeyDown={handleMenuKeyDown}- >- {actionGroups.map((group, groupIndex) => (- <Fragment key={`group-${groupIndex}`}>- {groupIndex > 0 ? (- <div className="da-gfs-resource-menu__separator" role="separator" />- ) : null}- {group.map(action => (+ <Fragment>+ <div+ className="da-gfs-resource-menu__panel"+ ref={panelRef}+ role="menu"+ aria-label={`Actions for ${resourceName}`}+ style={+ panelPosition+ ? { left: panelPosition.left, top: panelPosition.top }+ : { left: 0, top: 0, visibility: 'hidden' }+ }+ onKeyDown={handleMenuKeyDown}+ >+ {actionGroups.map((group, groupIndex) => (+ <Fragment key={`group-${groupIndex}`}>+ {groupIndex > 0 ? (+ <div className="da-gfs-resource-menu__separator" role="separator" />+ ) : null}+ {group.map(action => (+ <MenuItem+ aria-expanded={action.submenu ? shareOpen : undefined}+ aria-haspopup={action.submenu ? 'menu' : undefined}+ color={action.color}+ data-gfs-action={action.key}+ key={action.key}+ leadingIcon={action.icon}+ role="menuitem"+ ref={action.submenu ? shareTriggerRef : undefined}+ trailingIcon={action.submenu ? <IconChevronRight /> : undefined}+ onMouseEnter={() => setShareOpen(action.submenu === true)}+ onClick={() => {+ if (action.submenu) {+ action.onClick()+ } else {+ runAction(action.onClick)+ }+ }}+ >+ {action.label}+ </MenuItem>+ ))}+ </Fragment>+ ))}+ </div>+ {shareOpen && onManage ? (+ <div+ aria-label={`Share options for ${resourceName}`}+ className="da-gfs-resource-menu__submenu"+ ref={submenuRef}+ role="menu"+ style={+ submenuPosition+ ? { left: submenuPosition.left, top: submenuPosition.top }+ : { left: 0, top: 0, visibility: 'hidden' }+ }+ onKeyDown={handleMenuKeyDown}+ >+ <MenuItem+ data-gfs-action="share-access"+ leadingIcon={<IconShare />}+ role="menuitem"+ onClick={() => runAction(onManage)}+ >+ Share+ </MenuItem>+ {onCopyLink ? (<MenuItem- color={action.color}- key={action.key}- leadingIcon={action.icon}+ data-gfs-action="copy-link"+ leadingIcon={<IconCopy />}role="menuitem"- onClick={() => runAction(action.onClick)}+ onClick={() => runAction(onCopyLink)}>- {action.label}+ Copy link</MenuItem>- ))}- </Fragment>- ))}- </div>,+ ) : null}+ </div>+ ) : null}+ </Fragment>,document.body): null}diff --git a/desktop-app/ui/src/components/SidebarNav/icons.tsx b/desktop-app/ui/src/components/SidebarNav/icons.tsxindex 60cc3d333..eed313a33 100644--- a/desktop-app/ui/src/components/SidebarNav/icons.tsx+++ b/desktop-app/ui/src/components/SidebarNav/icons.tsx@@ -47,6 +47,18 @@ export function IconTeams(props: IconProps) {)}+export function IconShare(props: IconProps) {+ return (+ <svg viewBox="0 0 24 24" aria-hidden="true" {...BASE_STROKE_PROPS} {...props}>+ <path d="M5 7a4 4 0 1 0 8 0a4 4 0 0 0 -8 0" />+ <path d="M3 21v-2a4 4 0 0 1 4 -4h4c.96 0 1.84 .338 2.53 .901" />+ <path d="M16 3.13a4 4 0 0 1 0 7.75" />+ <path d="M16 19h6" />+ <path d="M19 16v6" />+ </svg>+ )+}+export function IconContexts(props: IconProps) {return (<svgdiff --git a/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx b/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsxindex 0ad758bb9..bfe91d271 100644--- a/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx+++ b/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx@@ -95,6 +95,14 @@ async function openManageDialog(resourceName: string) {await act(async () => {fireEvent.click(screen.getByRole('menuitem', { name: 'Share' }))})+ await act(async () => {+ fireEvent.click(+ within(screen.getByRole('menu', { name: `Share options for ${resourceName}` })).getByRole(+ 'menuitem',+ { name: 'Share' }+ )+ )+ })}async function chooseManageAction(resourceName: string, actionName: string) {@@ -1175,6 +1183,14 @@ describe('FilesPage', () => {await act(async () => {fireEvent.click(screen.getByRole('menuitem', { name: 'Share' }))})+ await act(async () => {+ fireEvent.click(+ within(screen.getByRole('menu', { name: 'Share options for notes.txt' })).getByRole(+ 'menuitem',+ { name: 'Share' }+ )+ )+ })// The manage modal opens (titled for the current selection — the mocked// controller does not navigate, so it stays on the parent folder).expect(screen.getByRole('dialog')).toBeTruthy()@@ -2994,15 +3010,20 @@ describe('FilesPage', () => {expect(openChild).toHaveBeenCalledWith(nestedFolder)fireEvent.click(screen.getByRole('button', { name: 'Options for Nested' }))- const manageItem = screen.getByRole('menuitem', { name: 'Share' })- await waitFor(() => expect(document.activeElement).toBe(manageItem))- fireEvent.keyDown(manageItem, { key: 'ArrowDown' })+ const shareItem = screen.getByRole('menuitem', { name: 'Share' })+ await waitFor(() => expect(document.activeElement).toBe(shareItem))+ fireEvent.keyDown(shareItem, { key: 'ArrowDown' })expect(document.activeElement).toBe(screen.getByRole('menuitem', { name: 'Open folder' }))fireEvent.click(screen.getByRole('menuitem', { name: 'Open folder' }))expect(openChild).toHaveBeenCalledTimes(2)fireEvent.click(screen.getByRole('button', { name: 'Options for Nested' }))- fireEvent.click(screen.getByRole('menuitem', { name: 'Copy GFS link' }))+ fireEvent.click(screen.getByRole('menuitem', { name: 'Share' }))+ fireEvent.click(+ within(screen.getByRole('menu', { name: 'Share options for Nested' })).getByRole('menuitem', {+ name: 'Copy link',+ })+ )await waitFor(() => expect(writeText).toHaveBeenCalledWith('gfs://main/nested-1'))})diff --git a/desktop-app/ui/src/styles.css b/desktop-app/ui/src/styles.cssindex be9ca76bb..a36bba821 100644--- a/desktop-app/ui/src/styles.css+++ b/desktop-app/ui/src/styles.css@@ -14770,7 +14770,24 @@ pre {scrollbar-width: thin;}-.da-gfs-resource-menu__panel .ui-menu-item {+.da-gfs-resource-menu__submenu {+ position: fixed;+ z-index: calc(var(--layer-dropdown) + 61);+ width: min(240px, calc(100vw - (var(--space-4) * 2)));+ max-height: calc(100vh - (var(--space-4) * 2));+ display: grid;+ gap: 0;+ overflow-y: auto;+ padding: var(--space-1-5);+ border: 1px solid rgba(var(--edge-rgb), 0.46);+ border-radius: var(--radius-md);+ background: var(--bg-elev-2);+ box-shadow: var(--shadow-hard);+ scrollbar-width: thin;+}++.da-gfs-resource-menu__panel .ui-menu-item,+.da-gfs-resource-menu__submenu .ui-menu-item {min-height: 44px;padding: 0 var(--space-2-5);gap: var(--space-2);@@ -14782,30 +14799,49 @@ pre {}.da-gfs-resource-menu__panel .ui-menu-item:hover:enabled,-.da-gfs-resource-menu__panel .ui-menu-item:focus-visible {+.da-gfs-resource-menu__panel .ui-menu-item:focus-visible,+.da-gfs-resource-menu__submenu .ui-menu-item:hover:enabled,+.da-gfs-resource-menu__submenu .ui-menu-item:focus-visible {border-color: transparent;background: var(--surface-hover);color: var(--text);}-.da-gfs-resource-menu__panel .ui-menu-item__icon {+.da-gfs-resource-menu__panel .ui-menu-item__icon,+.da-gfs-resource-menu__submenu .ui-menu-item__icon {width: 24px;height: 24px;flex: 0 0 24px;color: var(--text-dim);}-.da-gfs-resource-menu__panel .ui-menu-item__icon svg {+.da-gfs-resource-menu__panel .ui-menu-item__icon svg,+.da-gfs-resource-menu__submenu .ui-menu-item__icon svg {+ width: 18px;+ height: 18px;+}++.da-gfs-resource-menu__panel .ui-menu-item__trailing {+ width: 18px;+ height: 18px;+ margin-left: auto;+ color: var(--text-dim);+}++.da-gfs-resource-menu__panel .ui-menu-item__trailing svg {width: 18px;height: 18px;}-.da-gfs-resource-menu__panel .ui-menu-item--danger {+.da-gfs-resource-menu__panel .ui-menu-item--danger,+.da-gfs-resource-menu__submenu .ui-menu-item--danger {color: var(--danger);}.da-gfs-resource-menu__panel .ui-menu-item--danger:hover:enabled,-.da-gfs-resource-menu__panel .ui-menu-item--danger:focus-visible {+.da-gfs-resource-menu__panel .ui-menu-item--danger:focus-visible,+.da-gfs-resource-menu__submenu .ui-menu-item--danger:hover:enabled,+.da-gfs-resource-menu__submenu .ui-menu-item--danger:focus-visible {background: rgba(var(--danger-rgb), 0.12);color: var(--danger);}