Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
refactor(control-ui): standardize workflow access record lists
Josué98fc3ddd769e
diff --git a/control-ui/components/WorkflowAccessPanel/index.tsx b/control-ui/components/WorkflowAccessPanel/index.tsxindex 2d6fbd00f..9790db429 100644--- a/control-ui/components/WorkflowAccessPanel/index.tsx+++ b/control-ui/components/WorkflowAccessPanel/index.tsx@@ -1,11 +1,11 @@'use client'import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'+import { RecordList, RecordListRow, RowActionMenu } from '@clerum/frontend-components'import { useConfirmDialog } from '@components/ConfirmDialog'import { SelectionDropdown } from '@components/SelectionDropdown'import { TabBar } from '@components/TabBar'import { useToast } from '@components/Toast'-import { IconX } from '@components/icons'import {allowWorkflowApprovalTeam,getAdminTeams,@@ -74,6 +74,10 @@ function teamLabel(team: AccessTeamRow): string {return team.name || team.id}+function compareIdentity(left: string, right: string): number {+ return left.localeCompare(right, undefined, { numeric: true, sensitivity: 'base' })+}+function sectionCount(mode: 'create' | 'edit', loadedCount: number | null, selectedCount: number) {return mode === 'edit'? loadedCount === null@@ -217,18 +221,39 @@ export function WorkflowAccessPanel(props: WorkflowAccessPanelProps): React.JSX.[selectedApprovalTeamIds])- const displayUsers =- mode === 'edit'- ? (userGrants ?? [])- : (allUsers ?? []).filter(user => selectedUserSet.has(user.id))- const displayTeams =- mode === 'edit'- ? (teamGrants ?? [])- : (allTeams ?? []).filter(team => selectedTeamSet.has(team.id))- const displayApprovalTeams =- mode === 'edit'- ? (approvalTeams ?? [])- : (allTeams ?? []).filter(team => selectedApprovalTeamSet.has(team.id))+ const displayUsers = useMemo(+ () =>+ (mode === 'edit'+ ? (userGrants ?? [])+ : (allUsers ?? []).filter(user => selectedUserSet.has(user.id))+ ).toSorted(+ (left, right) =>+ compareIdentity(userLabel(left), userLabel(right)) || compareIdentity(left.id, right.id)+ ),+ [allUsers, mode, selectedUserSet, userGrants]+ )+ const displayTeams = useMemo(+ () =>+ (mode === 'edit'+ ? (teamGrants ?? [])+ : (allTeams ?? []).filter(team => selectedTeamSet.has(team.id))+ ).toSorted(+ (left, right) =>+ compareIdentity(teamLabel(left), teamLabel(right)) || compareIdentity(left.id, right.id)+ ),+ [allTeams, mode, selectedTeamSet, teamGrants]+ )+ const displayApprovalTeams = useMemo(+ () =>+ (mode === 'edit'+ ? (approvalTeams ?? [])+ : (allTeams ?? []).filter(team => selectedApprovalTeamSet.has(team.id))+ ).toSorted(+ (left, right) =>+ compareIdentity(teamLabel(left), teamLabel(right)) || compareIdentity(left.id, right.id)+ ),+ [allTeams, approvalTeams, mode, selectedApprovalTeamSet]+ )const ungrantedUsers = (allUsers ?? []).filter(user => !selectedUserSet.has(user.id))const ungrantedTeams = (allTeams ?? []).filter(team => !selectedTeamSet.has(team.id))@@ -655,28 +680,30 @@ function AccessUserSection({) : rows.length === 0 ? (<div className="cu-workflow-access__empty">{emptyText}</div>) : (- <div className="cu-workflow-access__rows">+ <RecordList className="cu-workflow-access__rows">{rows.map(user => (- <div className="cu-workflow-access__row" key={user.id}>+ <RecordListRow className="cu-workflow-access__row" key={user.id}><div className="cu-workflow-access__row-main"><span className="cu-workflow-access__row-title">{userLabel(user)}</span>{(user.displayName || user.name) && (<span className="cu-workflow-access__row-meta">{user.email}</span>)}</div>- <button- className="cu-btn cu-btn--icon cu-btn--danger-icon"- type="button"- disabled={busy}- aria-label={`${definition.revokeLabel}: ${user.email}`}- title={`${definition.revokeLabel}: ${user.email}`}- onClick={() => void onRevoke(user.id)}- >- <IconX width={16} height={16} />- </button>- </div>+ <RowActionMenu+ actions={[+ {+ key: 'remove',+ label: definition.revokeLabel,+ danger: true,+ disabled: busy,+ onSelect: () => void onRevoke(user.id),+ },+ ]}+ ariaLabel={`Actions for ${userLabel(user)}`}+ />+ </RecordListRow>))}- </div>+ </RecordList>)}<div className="cu-workflow-access__picker cu-workflow-access__picker--inline"><SelectionDropdown@@ -750,25 +777,27 @@ function AccessTeamSection({) : rows.length === 0 ? (<div className="cu-workflow-access__empty">{emptyText}</div>) : (- <div className="cu-workflow-access__rows">+ <RecordList className="cu-workflow-access__rows">{rows.map(team => (- <div className="cu-workflow-access__row" key={team.id}>+ <RecordListRow className="cu-workflow-access__row" key={team.id}><div className="cu-workflow-access__row-main"><span className="cu-workflow-access__row-title">{teamLabel(team)}</span></div>- <button- className="cu-btn cu-btn--icon cu-btn--danger-icon"- type="button"- disabled={busy}- aria-label={`${definition.revokeLabel}: ${teamLabel(team)}`}- title={`${definition.revokeLabel}: ${teamLabel(team)}`}- onClick={() => void onRevoke(team.id)}- >- <IconX width={16} height={16} />- </button>- </div>+ <RowActionMenu+ actions={[+ {+ key: 'remove',+ label: definition.revokeLabel,+ danger: true,+ disabled: busy,+ onSelect: () => void onRevoke(team.id),+ },+ ]}+ ariaLabel={`Actions for ${teamLabel(team)}`}+ />+ </RecordListRow>))}- </div>+ </RecordList>)}<div className="cu-workflow-access__picker cu-workflow-access__picker--inline"><SelectionDropdowndiff --git a/control-ui/components/__tests__/WorkflowAccessPanel.test.tsx b/control-ui/components/__tests__/WorkflowAccessPanel.test.tsxindex 125232631..557526d89 100644--- a/control-ui/components/__tests__/WorkflowAccessPanel.test.tsx+++ b/control-ui/components/__tests__/WorkflowAccessPanel.test.tsx@@ -153,11 +153,8 @@ describe('WorkflowAccessPanel', () => {const section = screen.getByTestId('workflow-access-trigger-users')await waitFor(() => expect(within(section).getByText(/alice@example\.com/)).toBeInTheDocument())- fireEvent.click(- within(section).getByRole('button', {- name: 'Remove member trigger access: [email protected]',- })- )+ fireEvent.click(within(section).getByRole('button', { name: 'Actions for Alice' }))+ fireEvent.click(await screen.findByRole('menuitem', { name: 'Remove member trigger access' }))expect(setWorkflowGrants).not.toHaveBeenCalled()expect(await screen.findByRole('alertdialog', { name: 'Remove Member Trigger Access' })@@ -170,6 +167,18 @@ describe('WorkflowAccessPanel', () => {)})+ it('sorts visible access records by human identity with a stable id tie-break', async () => {+ vi.mocked(listWorkflowGrants).mockResolvedValue({ items: [bobGrant, aliceGrant] })++ render(<EditHarness />)++ const section = screen.getByTestId('workflow-access-trigger-users')+ await waitFor(() => expect(within(section).getByText('Alice')).toBeInTheDocument())+ const rows = section.querySelectorAll('.cu-workflow-access__row-title')+ expect([...rows].map(row => row.textContent)).toEqual(['Alice', 'Bob'])+ expect(section.querySelector('.cu-workflow-access__rows')).toHaveAttribute('role', 'list')+ })+it('blocks live grant writes until the current edit-mode grants are loaded', async () => {const userGrants = createDeferred<{ items: (typeof aliceGrant)[] }>()const teamGrants = createDeferred<{ items: (typeof triggerTeamGrant)[] }>()diff --git a/control-ui/e2e/trigger-grants-ui.spec.ts b/control-ui/e2e/trigger-grants-ui.spec.tsindex cb498fc77..fdd06c9b5 100644--- a/control-ui/e2e/trigger-grants-ui.spec.ts+++ b/control-ui/e2e/trigger-grants-ui.spec.ts@@ -395,7 +395,7 @@ test('Control UI operator manages workflow access contracts without implicit couawait approvalTargetTeams.getByRole('button', { name: 'Allow team' }).click()await expect(approvalTargetTeams.getByRole('button', {- name: `Remove approval target team: ${approvalTeam.name}`,+ name: `Actions for ${approvalTeam.name}`,})).toBeVisible()await expect@@ -433,11 +433,13 @@ test('Control UI operator manages workflow access contracts without implicit couconst refreshedApprovalTargetTeams = page.getByTestId('workflow-access-approval-target-teams')await refreshedTriggerTeams- .getByRole('button', { name: `Revoke team trigger access: ${triggerTeam.name}` })+ .getByRole('button', { name: `Actions for ${triggerTeam.name}` }).click()+ await page.getByRole('menuitem', { name: 'Remove team trigger access' }).click()+ await page.getByRole('button', { name: 'Remove access' }).click()await expect(refreshedTriggerTeams.getByRole('button', {- name: `Revoke team trigger access: ${triggerTeam.name}`,+ name: `Actions for ${triggerTeam.name}`,})).not.toBeVisible()await expect@@ -448,11 +450,13 @@ test('Control UI operator manages workflow access contracts without implicit cou.not.toContain(triggerTeam.id)await refreshedApprovalTargetTeams- .getByRole('button', { name: `Remove approval target team: ${approvalTeam.name}` })+ .getByRole('button', { name: `Actions for ${approvalTeam.name}` }).click()+ await page.getByRole('menuitem', { name: 'Remove approval target team' }).click()+ await page.getByRole('button', { name: 'Remove target' }).click()await expect(refreshedApprovalTargetTeams.getByRole('button', {- name: `Remove approval target team: ${approvalTeam.name}`,+ name: `Actions for ${approvalTeam.name}`,})).not.toBeVisible()await expectdiff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex 380a77dea..691ca0c05 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.548",+ "version": "0.1.549","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.548",+ "version": "0.1.549","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.jsonindex a3e1a4b32..381fe25ec 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.548",+ "version": "0.1.549","private": true,"scripts": {"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",