Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(gfs): align control UI action menus
Ma89b46547b37
diff --git a/control-ui/app/globals.css b/control-ui/app/globals.cssindex d81ee048b..dc2ad036f 100644--- a/control-ui/app/globals.css+++ b/control-ui/app/globals.css@@ -12539,6 +12539,75 @@ button.cu-gfs-tree__button:focus-visible,min-width: 11.5rem;}+.cu-gfs-resource-menu__menu {+ position: fixed;+ top: auto;+ right: auto;+ z-index: 60;+ width: min(22.5rem, 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;+}++.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__item.cu-kebab__item:hover:not(:disabled),+.cu-gfs-resource-menu__item.cu-kebab__item:focus-visible {+ color: var(--cu-text);+ background: var(--cu-surface-hover);+}++.cu-gfs-resource-menu__icon {+ width: 1.5rem;+ height: 1.5rem;+ flex: 0 0 1.5rem;+ display: grid;+ place-items: center;+ color: var(--cu-text-muted);+}++.cu-gfs-resource-menu__icon svg {+ width: 1.125rem;+ height: 1.125rem;+}++.cu-gfs-resource-menu__item.cu-kebab__item--danger {+ color: var(--cu-danger);+}++.cu-gfs-resource-menu__item.cu-kebab__item--danger:hover:not(:disabled),+.cu-gfs-resource-menu__item.cu-kebab__item--danger:focus-visible {+ color: var(--cu-danger-hover);+ background: rgba(var(--cu-danger-rgb), 0.1);+}++.cu-gfs-resource-menu__separator {+ height: 1px;+ margin: var(--cu-space-1) 0;+ background: var(--cu-border-subtle);+}+.cu-gfs-image-preview-modal,.cu-gfs-markdown-preview-modal,.cu-gfs-video-preview-modal {diff --git a/control-ui/components/GfsResourceMenu/index.tsx b/control-ui/components/GfsResourceMenu/index.tsxindex add97230c..1b0c89ea9 100644--- a/control-ui/components/GfsResourceMenu/index.tsx+++ b/control-ui/components/GfsResourceMenu/index.tsx@@ -1,10 +1,43 @@'use client'-import { useEffect, useRef, useState } from 'react'-import type { KeyboardEvent as ReactKeyboardEvent } from 'react'-import { IconMoreHorizontal } from '@components/icons'+import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'+import type { KeyboardEvent as ReactKeyboardEvent, ReactNode } from 'react'+import { createPortal } from 'react-dom'+import { IconSharedFiles } from '@components/Sidebar/icons'+import {+ IconCopy,+ IconDotsVertical,+ IconDownload,+ IconEye,+ IconPencil,+ IconTrash,+ IconUpload,+} from '@components/icons'import type { GfsResourceMenuProps } from './types'+type GfsResourceMenuAction = {+ danger?: boolean+ disabled?: boolean+ icon: ReactNode+ key: string+ label: string+ onClick: () => void+}++function menuAction(+ key: string,+ label: string,+ icon: ReactNode,+ onClick: (() => void) | undefined,+ options?: Pick<GfsResourceMenuAction, 'danger' | 'disabled'>+): GfsResourceMenuAction | null {+ return onClick ? { ...options, icon, key, label, onClick } : null+}++function isMenuAction(action: GfsResourceMenuAction | null): action is GfsResourceMenuAction {+ return action !== null+}+export function GfsResourceMenu({downloading = false,onCopyLink,@@ -19,33 +52,78 @@ export function GfsResourceMenu({}: GfsResourceMenuProps) {const [open, setOpen] = useState(false)const rootRef = useRef<HTMLDivElement | null>(null)+ const menuRef = useRef<HTMLDivElement | 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), [])useEffect(() => {if (!open) return- rootRef.current?.querySelector<HTMLButtonElement>('[role="menuitem"]:not(:disabled)')?.focus()function handlePointerDown(event: MouseEvent) {- if (!rootRef.current?.contains(event.target as Node)) setOpen(false)+ const target = event.target as Node+ if (rootRef.current?.contains(target) || menuRef.current?.contains(target)) return+ closeMenu()+ }+ document.addEventListener('mousedown', handlePointerDown)+ return () => document.removeEventListener('mousedown', handlePointerDown)+ }, [closeMenu, open])++ const positionMenu = useCallback(() => {+ const trigger = triggerRef.current+ const menu = menuRef.current+ if (!trigger || !menu) return++ const triggerRect = trigger.getBoundingClientRect()+ const menuRect = menu.getBoundingClientRect()+ const edgeInset = 8+ const gap = 6+ const maxLeft = Math.max(edgeInset, window.innerWidth - menuRect.width - edgeInset)+ const left = Math.min(Math.max(edgeInset, triggerRect.right - menuRect.width), maxLeft)+ const opensAbove =+ triggerRect.bottom + gap + menuRect.height > window.innerHeight - edgeInset &&+ triggerRect.top - gap - menuRect.height >= edgeInset+ const unclampedTop = opensAbove+ ? triggerRect.top - menuRect.height - gap+ : triggerRect.bottom + gap+ const maxTop = Math.max(edgeInset, window.innerHeight - menuRect.height - edgeInset)+ const top = Math.min(Math.max(edgeInset, unclampedTop), maxTop)++ setMenuPosition({ left, top })+ }, [])++ useLayoutEffect(() => {+ if (!open) {+ setMenuPosition(null)+ return}++ positionMenu()+ window.addEventListener('resize', positionMenu)+ window.addEventListener('scroll', positionMenu, true)+ return () => {+ window.removeEventListener('resize', positionMenu)+ window.removeEventListener('scroll', positionMenu, true)+ }+ }, [open, positionMenu])++ useEffect(() => {+ if (!open) return+ menuRef.current?.querySelector<HTMLButtonElement>('[role="menuitem"]:not(:disabled)')?.focus()function handleKeyDown(event: KeyboardEvent) {if (event.key === 'Escape') {- setOpen(false)+ closeMenu()triggerRef.current?.focus()}}- document.addEventListener('mousedown', handlePointerDown)document.addEventListener('keydown', handleKeyDown)- return () => {- document.removeEventListener('mousedown', handlePointerDown)- document.removeEventListener('keydown', handleKeyDown)- }- }, [open])+ return () => document.removeEventListener('keydown', handleKeyDown)+ }, [closeMenu, open])- function handleMenuKeyDown(event: ReactKeyboardEvent<HTMLDivElement>): void {+ function handleMenuKeyDown(event: ReactKeyboardEvent<HTMLElement>): void {if (!open || !['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) returnconst items = Array.from(- rootRef.current?.querySelectorAll<HTMLButtonElement>('[role="menuitem"]:not(:disabled)') ?? []+ event.currentTarget.querySelectorAll<HTMLButtonElement>('[role="menuitem"]:not(:disabled)'))if (!items.length) returnevent.preventDefault()@@ -59,12 +137,43 @@ export function GfsResourceMenu({}const run = (action: () => void) => {- setOpen(false)+ closeMenu()action()}+ const actionGroups: GfsResourceMenuAction[][] = [+ [+ menuAction('share', 'Share', <IconSharedFiles />, onManage),+ menuAction('preview', 'Preview', <IconEye />, onPreview),+ ].filter(isMenuAction),+ [+ menuAction(+ 'download',+ downloading ? 'Downloading…' : 'Download',+ <IconDownload />,+ onDownload,+ {+ disabled: downloading,+ }+ ),+ menuAction(+ 'replace',+ 'Replace file',+ <IconUpload />,+ onReplace ? () => replaceInputRef.current?.click() : undefined+ ),+ ].filter(isMenuAction),+ [+ menuAction('copy-link', 'Copy GFS link', <IconCopy />, onCopyLink),+ menuAction('rename', 'Rename', <IconPencil />, onRename),+ ].filter(isMenuAction),+ [menuAction('delete', 'Delete', <IconTrash />, onDelete, { danger: true })].filter(+ isMenuAction+ ),+ ].filter(group => group.length > 0)+return (- <div className="cu-kebab cu-gfs-resource-menu" ref={rootRef} onKeyDown={handleMenuKeyDown}>+ <div className="cu-kebab cu-gfs-resource-menu" ref={rootRef}><buttontype="button"aria-label={`Actions for ${resourceName}`}@@ -72,94 +181,72 @@ export function GfsResourceMenu({aria-expanded={open}className="cu-btn cu-btn--icon cu-btn--ghost cu-kebab__trigger"ref={triggerRef}- onClick={() => setOpen(current => !current)}+ onClick={event => {+ event.stopPropagation()+ setOpen(current => !current)+ }}>- <IconMoreHorizontal width={18} height={18} />+ <IconDotsVertical width={18} height={18} /></button>- {open ? (- <div className="cu-kebab__menu cu-kebab__menu--nowrap" role="menu">- {onManage ? (- <button- type="button"- role="menuitem"- className="cu-kebab__item"- onClick={() => run(onManage)}- >- Manage access- </button>- ) : null}- {onPreview ? (- <button- type="button"- role="menuitem"- className="cu-kebab__item"- onClick={() => run(onPreview)}- >- Preview- </button>- ) : null}- {onDownload ? (- <button- type="button"- role="menuitem"- className="cu-kebab__item"- disabled={downloading}- onClick={() => run(onDownload)}+ {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}>- {downloading ? 'Downloading…' : 'Download'}- </button>- ) : null}- {onReplace ? (- <>- <button- type="button"- role="menuitem"- className="cu-kebab__item"- onClick={() => replaceInputRef.current?.click()}- >- Replace file- </button>- <input- aria-label={`Replace ${resourceName}`}- className="sr-only"- ref={replaceInputRef}- type="file"- onChange={event => {- const file = event.currentTarget.files?.[0]- event.currentTarget.value = ''- if (!file) return- setOpen(false)- onReplace(file)- }}- />- </>- ) : null}- <button- type="button"- role="menuitem"- className="cu-kebab__item"- title={resourceUri}- onClick={() => run(onCopyLink)}- >- Copy GFS link- </button>- <button- type="button"- role="menuitem"- className="cu-kebab__item"- onClick={() => run(onRename)}- >- Rename- </button>- <button- type="button"- role="menuitem"- className="cu-kebab__item cu-kebab__item--danger"- onClick={() => run(onDelete)}- >- Delete- </button>- </div>+ {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+ 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}+ onClick={event => {+ event.stopPropagation()+ run(action.onClick)+ }}+ >+ <span className="cu-gfs-resource-menu__icon" aria-hidden="true">+ {action.icon}+ </span>+ <span>{action.label}</span>+ </button>+ ))}+ </span>+ ))}+ </div>,+ document.body+ )+ : null}+ {onReplace ? (+ <input+ aria-label={`Replace ${resourceName}`}+ className="sr-only"+ ref={replaceInputRef}+ type="file"+ onChange={event => {+ const file = event.currentTarget.files?.[0]+ event.currentTarget.value = ''+ if (!file) return+ closeMenu()+ onReplace(file)+ }}+ />) : null}</div>)diff --git a/control-ui/components/__tests__/GfsBrowser.test.tsx b/control-ui/components/__tests__/GfsBrowser.test.tsxindex f3eefdf8c..a8059b67d 100644--- a/control-ui/components/__tests__/GfsBrowser.test.tsx+++ b/control-ui/components/__tests__/GfsBrowser.test.tsx@@ -110,7 +110,7 @@ async function openResourceMenu(resourceName: string) {async function openManage(resourceName: string) {await openResourceMenu(resourceName)- fireEvent.click(screen.getByRole('menuitem', { name: 'Manage access' }))+ fireEvent.click(screen.getByRole('menuitem', { name: 'Share' }))}function child(name: string, kind: string, n: number) {@@ -1191,7 +1191,7 @@ describe('GfsBrowser', () => {renderBrowser()await openResourceMenu('report.md')- const manageItem = screen.getByRole('menuitem', { name: 'Manage access' })+ const manageItem = screen.getByRole('menuitem', { name: 'Share' })await waitFor(() => expect(document.activeElement).toBe(manageItem))fireEvent.keyDown(manageItem, { key: 'ArrowDown' })expect(document.activeElement).toBe(screen.getByRole('menuitem', { name: 'Preview' }))@@ -1406,13 +1406,13 @@ describe('GfsBrowser', () => {expect(within(manageDialog).queryByRole('button', { name: 'Replace file' })).toBeNull()expect(within(manageDialog).queryByText('Quick actions')).toBeNull()fireEvent.click(manageMenuTrigger)- const manageMenu = within(manageDialog).getByRole('menu')+ 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: 'Rename' })).toBeTruthy()expect(within(manageMenu).getByRole('menuitem', { name: 'Delete' })).toBeTruthy()- expect(within(manageMenu).queryByRole('menuitem', { name: 'Manage access' })).toBeNull()+ expect(within(manageMenu).queryByRole('menuitem', { name: 'Share' })).toBeNull()fireEvent.click(manageMenuTrigger)await openSubjectPicker()fireEvent.click(await screen.findByRole('option', { name: 'Ada Lovelace' }))@@ -1456,7 +1456,7 @@ describe('GfsBrowser', () => {await openResourceMenu('team-folder')const rowMenu = screen.getByRole('menu')expect(within(rowMenu).queryByRole('menuitem', { name: 'Create share' })).toBeNull()- fireEvent.click(within(rowMenu).getByRole('menuitem', { name: 'Manage access' }))+ fireEvent.click(within(rowMenu).getByRole('menuitem', { name: 'Share' }))expect(screen.queryByText('Manage folder')).toBeNull()await waitFor(() => expect(mockGetAdminUsers).toHaveBeenCalledWith(''))expect(@@ -1468,9 +1468,7 @@ describe('GfsBrowser', () => {})expect(within(manageDialog).queryByRole('button', { name: 'Upload file' })).toBeNull()fireEvent.click(manageMenuTrigger)- expect(- within(manageDialog).queryByRole('menuitem', { name: 'Create share' })- ).toBeNull()+ expect(within(manageDialog).queryByRole('menuitem', { name: 'Create share' })).toBeNull()fireEvent.click(manageMenuTrigger)await openSubjectPicker()fireEvent.click(await screen.findByRole('option', { name: 'Ada Lovelace' }))diff --git a/control-ui/components/__tests__/GfsResourceMenu.test.tsx b/control-ui/components/__tests__/GfsResourceMenu.test.tsxnew file mode 100644index 000000000..a229de252--- /dev/null+++ b/control-ui/components/__tests__/GfsResourceMenu.test.tsx@@ -0,0 +1,46 @@+// @vitest-environment jsdom+import { afterEach, describe, expect, it, vi } from 'vitest'+import { cleanup, fireEvent, render, screen } from '@testing-library/react'+import { GfsResourceMenu } from '../GfsResourceMenu'++describe('GfsResourceMenu', () => {+ afterEach(() => {+ cleanup()+ })++ it('presents the Share action in an icon-led, grouped menu', () => {+ render(+ <GfsResourceMenu+ onCopyLink={vi.fn()}+ onDelete={vi.fn()}+ onDownload={vi.fn()}+ onManage={vi.fn()}+ onPreview={vi.fn()}+ onRename={vi.fn()}+ onReplace={vi.fn()}+ resourceName="report.txt"+ resourceUri="gfs://main/report.txt"+ />+ )++ const trigger = screen.getByRole('button', { name: 'Actions for report.txt' })+ const dotPositions = Array.from(trigger.querySelectorAll('circle')).map(circle => [+ circle.getAttribute('cx'),+ circle.getAttribute('cy'),+ ])+ expect(dotPositions).toEqual([+ ['12', '5'],+ ['12', '12'],+ ['12', '19'],+ ])++ fireEvent.click(trigger)++ const menu = screen.getByRole('menu')+ 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()+ })+})diff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex 3409d994f..da2202e58 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.498",+ "version": "0.1.499","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.498",+ "version": "0.1.499","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 7572241c9..39f181a43 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.498",+ "version": "0.1.499","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 f9df8c469..1a03d0560 100644--- a/desktop-app/ui/src/components/GfsResourceMenu/GfsResourceMenu.test.tsx+++ b/desktop-app/ui/src/components/GfsResourceMenu/GfsResourceMenu.test.tsx@@ -13,6 +13,7 @@ describe('GfsResourceMenu', () => {<GfsResourceMenuonCopyLink={vi.fn()}onDelete={vi.fn()}+ onManage={vi.fn()}onPreview={vi.fn()}resourceName="report.txt"/>@@ -35,7 +36,9 @@ describe('GfsResourceMenu', () => {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(3)+ 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()})})diff --git a/desktop-app/ui/src/components/GfsResourceMenu/index.tsx b/desktop-app/ui/src/components/GfsResourceMenu/index.tsxindex ebc78306d..e6dd95621 100644--- a/desktop-app/ui/src/components/GfsResourceMenu/index.tsx+++ b/desktop-app/ui/src/components/GfsResourceMenu/index.tsx@@ -11,7 +11,7 @@ import {IconEye,IconMoreVertical,IconPlus,- IconSettings,+ IconTeams,IconTrash,} from '@components/SidebarNav/icons'import type { GfsResourceMenuProps } from './types'@@ -169,7 +169,7 @@ export function GfsResourceMenu({const actionGroups = [[- menuAction('manage', 'Manage', <IconSettings />, onManage),+ menuAction('manage', 'Share', <IconTeams />, onManage),menuAction('open-folder', 'Open folder', <IconContexts />, onOpen),menuAction('open-gfs-link', 'Open GFS link', <IconConnectors />, onOpenGfsLink),menuAction('preview', 'Preview', <IconEye />, onPreview),diff --git a/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx b/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsxindex 2b5c6016c..c98cd2f7b 100644--- a/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx+++ b/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx@@ -93,7 +93,7 @@ async function openManageDialog(resourceName: string) {fireEvent.click(screen.getByRole('button', { name: `Options for ${resourceName}` }))})await act(async () => {- fireEvent.click(screen.getByRole('menuitem', { name: 'Manage' }))+ fireEvent.click(screen.getByRole('menuitem', { name: 'Share' }))})}@@ -2755,7 +2755,7 @@ describe('FilesPage', () => {expect(openChild).toHaveBeenCalledWith(nestedFolder)fireEvent.click(screen.getByRole('button', { name: 'Options for Nested' }))- const manageItem = screen.getByRole('menuitem', { name: 'Manage' })+ const manageItem = screen.getByRole('menuitem', { name: 'Share' })await waitFor(() => expect(document.activeElement).toBe(manageItem))fireEvent.keyDown(manageItem, { key: 'ArrowDown' })expect(document.activeElement).toBe(screen.getByRole('menuitem', { name: 'Open folder' }))