Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(frontend): restore disabled row action reasons

Josué726032793dfe
diff --git a/control-ui/components/ControlAdminsPanel/index.tsx b/control-ui/components/ControlAdminsPanel/index.tsx
index 3439bb321..d4cf5a19e 100644
--- a/control-ui/components/ControlAdminsPanel/index.tsx
+++ b/control-ui/components/ControlAdminsPanel/index.tsx
@@ -571,16 +571,17 @@ export function ControlAdminsPanel({
: []),
{
key: 'delete',
- label: currentAdmin
- ? 'Current admin cannot be deleted'
- : admin.passwordPending
- ? deletingAdminId === admin.id
- ? 'Canceling setup…'
- : 'Cancel admin setup'
- : deletingAdminId === admin.id
- ? 'Deleting…'
- : 'Delete admin',
+ label: admin.passwordPending
+ ? deletingAdminId === admin.id
+ ? 'Canceling setup…'
+ : 'Cancel admin setup'
+ : deletingAdminId === admin.id
+ ? 'Deleting…'
+ : 'Delete admin',
disabled: currentAdmin || deletingAdminId === admin.id,
+ disabledReason: currentAdmin
+ ? 'Current admin cannot be deleted.'
+ : undefined,
onClick: () => void handleDeleteAdmin(admin),
danger: true,
},
diff --git a/control-ui/components/RowActionsMenu/index.tsx b/control-ui/components/RowActionsMenu/index.tsx
index f226a83c8..35b6e5cbf 100644
--- a/control-ui/components/RowActionsMenu/index.tsx
+++ b/control-ui/components/RowActionsMenu/index.tsx
@@ -15,6 +15,7 @@ export function RowActionsMenu({ ariaLabel, actions, horizontalTrigger }: RowAct
onSelect: action.onClick,
danger: action.danger,
disabled: action.disabled,
+ disabledReason: action.disabledReason,
}))}
ariaLabel={ariaLabel}
menuClassName="cu-kebab__menu--portal"
diff --git a/control-ui/components/RowActionsMenu/types.ts b/control-ui/components/RowActionsMenu/types.ts
index b2482527b..8952ca489 100644
--- a/control-ui/components/RowActionsMenu/types.ts
+++ b/control-ui/components/RowActionsMenu/types.ts
@@ -1,3 +1,5 @@
+import type { ReactNode } from 'react'
+
/**
* One entry inside the kebab menu. This is the menu's own item shape, distinct
* from `RowActions`' `RowAction` descriptor: the menu renders text entries and
@@ -8,6 +10,7 @@ export type RowActionMenuItem = {
label: string
onClick: () => void
disabled?: boolean
+ disabledReason?: ReactNode
danger?: boolean
}
diff --git a/control-ui/components/__tests__/ControlAdminsPanel.gfsOperatorLink.test.tsx b/control-ui/components/__tests__/ControlAdminsPanel.gfsOperatorLink.test.tsx
index 2c6c083be..580ba2345 100644
--- a/control-ui/components/__tests__/ControlAdminsPanel.gfsOperatorLink.test.tsx
+++ b/control-ui/components/__tests__/ControlAdminsPanel.gfsOperatorLink.test.tsx
@@ -1,6 +1,7 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
import {
+ deleteControlAdmin,
getControlAdmins,
reactivateControlAdminGfsOperatorLink,
revokeControlAdminGfsOperatorLink,
@@ -39,6 +40,7 @@ vi.mock('@lib/api', async () => {
const actual = await vi.importActual<typeof import('@lib/api')>('@lib/api')
return {
...actual,
+ deleteControlAdmin: vi.fn(),
getControlAdmins: vi.fn(),
reactivateControlAdminGfsOperatorLink: vi.fn(),
revokeControlAdminGfsOperatorLink: vi.fn(),
@@ -185,6 +187,23 @@ describe('ControlAdminsPanel GFS operator link lifecycle', () => {
)
})
+ it('keeps the current admin delete action disabled and inert inside the row menu', async () => {
+ render(<ControlAdminsPanel />)
+
+ fireEvent.click(
+ await screen.findByRole('button', {
+ name: 'Actions for initial-admin ([email protected])',
+ })
+ )
+ const deleteItem = screen.getByRole('menuitem', { name: /Delete admin/ })
+
+ expect(deleteItem).toHaveAttribute('aria-disabled', 'true')
+ expect(deleteItem).toHaveTextContent('Current admin cannot be deleted.')
+ fireEvent.click(deleteItem)
+
+ expect(deleteControlAdmin).not.toHaveBeenCalled()
+ })
+
it('creates a member from an admin without a matching member', async () => {
vi.mocked(getControlAdmins).mockResolvedValueOnce({
admins: [
diff --git a/control-ui/components/__tests__/FrontendComponents.test.tsx b/control-ui/components/__tests__/FrontendComponents.test.tsx
index 52e933f0e..dfae63538 100644
--- a/control-ui/components/__tests__/FrontendComponents.test.tsx
+++ b/control-ui/components/__tests__/FrontendComponents.test.tsx
@@ -231,4 +231,33 @@ describe('shared frontend components', () => {
expect(screen.queryByRole('menu')).not.toBeInTheDocument()
expect(onDelete).not.toHaveBeenCalled()
})
+
+ it('keeps disabled action reasons reachable without running unavailable actions', () => {
+ const onDelete = vi.fn()
+ render(
+ <RowActionMenu
+ ariaLabel="Actions for Alpha"
+ actions={[
+ {
+ key: 'delete',
+ label: 'Delete',
+ danger: true,
+ disabled: true,
+ disabledReason: 'Only owners can delete this record.',
+ onSelect: onDelete,
+ },
+ ]}
+ />
+ )
+
+ const trigger = screen.getByRole('button', { name: 'Actions for Alpha' })
+ expect(trigger).not.toBeDisabled()
+ fireEvent.click(trigger)
+ const deleteAction = screen.getByRole('menuitem', { name: /Delete/ })
+ expect(deleteAction).toHaveFocus()
+ expect(deleteAction).toHaveAttribute('aria-disabled', 'true')
+ expect(deleteAction).toHaveTextContent('Only owners can delete this record.')
+ fireEvent.click(deleteAction)
+ expect(onDelete).not.toHaveBeenCalled()
+ })
})
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index 754a1b63e..f559d2d8a 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.560",
+ "version": "0.1.561",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.560",
+ "version": "0.1.561",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/frontend-components": "file:../packages/frontend-components",
diff --git a/control-ui/package.json b/control-ui/package.json
index 626735bb6..c099da0e6 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.560",
+ "version": "0.1.561",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",
diff --git a/packages/frontend-components/src/index.tsx b/packages/frontend-components/src/index.tsx
index d6fb67c59..5cbae0db0 100644
--- a/packages/frontend-components/src/index.tsx
+++ b/packages/frontend-components/src/index.tsx
@@ -370,9 +370,10 @@ export type RowAction = {
onSelect: () => void
danger?: boolean
disabled?: boolean
+ disabledReason?: ReactNode
}
-function enabledItems(menu: HTMLDivElement | null) {
+function focusableItems(menu: HTMLDivElement | null) {
return menu
? Array.from(menu.querySelectorAll<HTMLButtonElement>('[role="menuitem"]:not(:disabled)'))
: []
@@ -396,7 +397,8 @@ export function RowActionMenu({
const menuRef = useRef<HTMLDivElement>(null)
const initialFocusRef = useRef<'first' | 'last'>('first')
const [position, setPosition] = useState<{ left: number; top: number } | null>(null)
- const triggerDisabled = actions.every(action => action.disabled)
+ const hasDisabledReason = actions.some(action => action.disabled && action.disabledReason)
+ const triggerDisabled = actions.every(action => action.disabled) && !hasDisabledReason
const close = useCallback((restoreFocus = false) => {
setOpen(false)
@@ -442,7 +444,7 @@ export function RowActionMenu({
setPosition({ left, top: above ? anchor.top - bounds.height - inset : anchor.bottom + inset })
}
place()
- const items = enabledItems(menuRef.current)
+ const items = focusableItems(menuRef.current)
;(initialFocusRef.current === 'last' ? items.at(-1) : items[0])?.focus()
window.addEventListener('resize', place)
window.addEventListener('scroll', place, true)
@@ -486,7 +488,7 @@ export function RowActionMenu({
className={classNames('eft-row-actions__menu', menuClassName)}
onClick={event => event.stopPropagation()}
onKeyDown={event => {
- const items = enabledItems(menuRef.current)
+ const items = focusableItems(menuRef.current)
const current = items.indexOf(document.activeElement as HTMLButtonElement)
if (event.key === 'Escape') {
event.preventDefault()
@@ -511,24 +513,34 @@ export function RowActionMenu({
role="menu"
style={position ? position : { left: 0, top: 0, visibility: 'hidden' }}
>
- {actions.map(action => (
- <button
- className={classNames(
- 'eft-row-actions__item',
- action.danger && 'eft-row-actions__item--danger'
- )}
- disabled={action.disabled}
- key={action.key}
- onClick={() => {
- close(true)
- action.onSelect()
- }}
- role="menuitem"
- type="button"
- >
- {action.label}
- </button>
- ))}
+ {actions.map(action => {
+ const disabledReason = action.disabled ? action.disabledReason : undefined
+ const disabledWithReason = Boolean(disabledReason)
+ return (
+ <button
+ aria-disabled={action.disabled ? true : undefined}
+ className={classNames(
+ 'eft-row-actions__item',
+ action.danger && 'eft-row-actions__item--danger'
+ )}
+ disabled={action.disabled && !disabledWithReason}
+ key={action.key}
+ onClick={() => {
+ if (action.disabled) return
+ close(true)
+ action.onSelect()
+ }}
+ role="menuitem"
+ title={typeof disabledReason === 'string' ? disabledReason : undefined}
+ type="button"
+ >
+ <span>{action.label}</span>
+ {disabledReason ? (
+ <span className="eft-row-actions__item-reason">{disabledReason}</span>
+ ) : null}
+ </button>
+ )
+ })}
</div>,
document.body
)
diff --git a/packages/frontend-components/styles.css b/packages/frontend-components/styles.css
index c9028c9a5..e2981c4ad 100644
--- a/packages/frontend-components/styles.css
+++ b/packages/frontend-components/styles.css
@@ -314,7 +314,20 @@
padding: 0.5rem 0.625rem;
text-align: left;
}
-.eft-row-actions__item:hover:not(:disabled),
+.eft-row-actions__item[aria-disabled='true'] {
+ cursor: not-allowed;
+ opacity: 0.65;
+}
+.eft-row-actions__item-reason {
+ color: var(--eft-muted);
+ display: block;
+ font-size: 0.75rem;
+ line-height: 1.3;
+ margin-top: 0.2rem;
+ max-width: 16rem;
+ white-space: normal;
+}
+.eft-row-actions__item:hover:not(:disabled):not([aria-disabled='true']),
.eft-row-actions__item:focus-visible {
background: var(--eft-surface-muted);
outline: none;
diff --git a/profile-ui/app/members/[userId]/page.tsx b/profile-ui/app/members/[userId]/page.tsx
index 77e542c7b..a63f3771d 100644
--- a/profile-ui/app/members/[userId]/page.tsx
+++ b/profile-ui/app/members/[userId]/page.tsx
@@ -274,6 +274,9 @@ export default function MemberDetailsPage() {
key: 'edit',
label: 'Edit permissions',
disabled: busy || !team.canEdit,
+ disabledReason: !team.canEdit
+ ? 'Only team leaders can edit member permissions.'
+ : undefined,
onSelect: () => {
if (!team.canEdit) return
setEditTeam(team)
@@ -286,6 +289,9 @@ export default function MemberDetailsPage() {
label: 'Remove from team',
danger: true,
disabled: busy || !team.canDelete,
+ disabledReason: !team.canDelete
+ ? 'Only team leaders can remove this member from the team.'
+ : undefined,
onSelect: () => void removeMemberFromTeam(team),
},
]}
diff --git a/profile-ui/app/members/page.tsx b/profile-ui/app/members/page.tsx
index dceb0ac06..befcf3aa7 100644
--- a/profile-ui/app/members/page.tsx
+++ b/profile-ui/app/members/page.tsx
@@ -337,6 +337,9 @@ export default function MembersPage() {
label: 'Delete member',
danger: true,
disabled: busy || !deleteAllowed,
+ disabledReason: !deleteAllowed
+ ? memberDeleteTooltip(member, currentUserId)
+ : undefined,
onSelect: () => void deleteMemberAccount(member),
},
]}
diff --git a/profile-ui/package-lock.json b/profile-ui/package-lock.json
index 72f5ea807..5587df005 100644
--- a/profile-ui/package-lock.json
+++ b/profile-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-profile-ui",
- "version": "0.1.135",
+ "version": "0.1.136",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-profile-ui",
- "version": "0.1.135",
+ "version": "0.1.136",
"dependencies": {
"@clerum/desktop-app-links": "file:../packages/desktop-app-links",
"@clerum/frontend-components": "file:../packages/frontend-components",
diff --git a/profile-ui/package.json b/profile-ui/package.json
index 4bfc8fcb3..b0b29951a 100644
--- a/profile-ui/package.json
+++ b/profile-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-profile-ui",
- "version": "0.1.135",
+ "version": "0.1.136",
"private": true,
"scripts": {
"dev": "next dev",