Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(control-ui): r1-m2 sort readonly workflow access lists
Josuée7cf38328566
diff --git a/control-ui/components/RecipeStatusContent/index.tsx b/control-ui/components/RecipeStatusContent/index.tsxindex 2f20553c0..6a051af68 100644--- a/control-ui/components/RecipeStatusContent/index.tsx+++ b/control-ui/components/RecipeStatusContent/index.tsx@@ -1,6 +1,6 @@'use client'-import React, { useEffect, useRef, useState } from 'react'+import React, { useEffect, useMemo, useRef, useState } from 'react'import { RecordList, RecordListRow, RowActionMenu } from '@clerum/frontend-components'import { useConfirmDialog } from '@components/ConfirmDialog'import { useToast } from '@components/Toast'@@ -300,6 +300,18 @@ function WorkflowAccessEditor({ namespace, recipeName, activeSection }: GrantsRe)}+function readonlyUserLabel(user: WorkflowGrantUser): string {+ return user.displayName || user.name || user.email+}++function readonlyTeamLabel(team: WorkflowGrantTeam | WorkflowApprovalAllowedTeam): string {+ return team.name || team.id+}++function compareReadonlyIdentity(left: string, right: string): number {+ return left.localeCompare(right, undefined, { numeric: true, sensitivity: 'base' })+}+function WorkflowAccessReadonly({ namespace, recipeName }: GrantsReadonlyPanelProps) {const [grants, setGrants] = useState<WorkflowGrantUser[] | null>(null)const [teamGrants, setTeamGrants] = useState<WorkflowGrantTeam[] | null>(null)@@ -329,6 +341,34 @@ function WorkflowAccessReadonly({ namespace, recipeName }: GrantsReadonlyPanelPr}}, [namespace, recipeName])+ const sortedGrants = useMemo(+ () =>+ grants?.toSorted(+ (left, right) =>+ compareReadonlyIdentity(readonlyUserLabel(left), readonlyUserLabel(right)) ||+ compareReadonlyIdentity(left.id, right.id)+ ),+ [grants]+ )+ const sortedTeamGrants = useMemo(+ () =>+ teamGrants?.toSorted(+ (left, right) =>+ compareReadonlyIdentity(readonlyTeamLabel(left), readonlyTeamLabel(right)) ||+ compareReadonlyIdentity(left.id, right.id)+ ),+ [teamGrants]+ )+ const sortedApprovalTeams = useMemo(+ () =>+ approvalTeams?.toSorted(+ (left, right) =>+ compareReadonlyIdentity(readonlyTeamLabel(left), readonlyTeamLabel(right)) ||+ compareReadonlyIdentity(left.id, right.id)+ ),+ [approvalTeams]+ )+return (<div className="cu-workflow-access" data-testid="grants-readonly-panel"><div className="cu-workflow-access__readonly-header">@@ -345,19 +385,19 @@ function WorkflowAccessReadonly({ namespace, recipeName }: GrantsReadonlyPanelPremptyText="No users authorized to trigger this recipe yet."loaded={grants !== null}>- {grants && grants.length > 0 && (- <div className="cu-workflow-access__rows">- {grants.map(g => (- <div className="cu-workflow-access__row" key={g.id}>+ {sortedGrants && sortedGrants.length > 0 && (+ <RecordList className="cu-workflow-access__rows" aria-label="Trigger users">+ {sortedGrants.map(g => (+ <RecordListRow className="cu-workflow-access__row" data-access-id={g.id} key={g.id}><span className="cu-workflow-access__row-title">{g.displayName || g.name || g.email}</span>{(g.displayName || g.name) && (<span className="cu-workflow-access__row-meta">({g.email})</span>)}- </div>+ </RecordListRow>))}- </div>+ </RecordList>)}</ReadonlyAccessGroup>@@ -366,16 +406,20 @@ function WorkflowAccessReadonly({ namespace, recipeName }: GrantsReadonlyPanelPremptyText="No teams authorized to trigger this recipe yet."loaded={teamGrants !== null}>- {teamGrants && teamGrants.length > 0 && (- <div className="cu-workflow-access__rows">- {teamGrants.map(team => (- <div className="cu-workflow-access__row" key={team.id}>+ {sortedTeamGrants && sortedTeamGrants.length > 0 && (+ <RecordList className="cu-workflow-access__rows" aria-label="Trigger teams">+ {sortedTeamGrants.map(team => (+ <RecordListRow+ className="cu-workflow-access__row"+ data-access-id={team.id}+ key={team.id}+ ><div className="cu-workflow-access__row-main"><span className="cu-workflow-access__row-title">{team.name}</span></div>- </div>+ </RecordListRow>))}- </div>+ </RecordList>)}</ReadonlyAccessGroup>@@ -384,16 +428,20 @@ function WorkflowAccessReadonly({ namespace, recipeName }: GrantsReadonlyPanelPremptyText="No teams allowed as approval targets yet."loaded={approvalTeams !== null}>- {approvalTeams && approvalTeams.length > 0 && (- <div className="cu-workflow-access__rows">- {approvalTeams.map(team => (- <div className="cu-workflow-access__row" key={team.id}>+ {sortedApprovalTeams && sortedApprovalTeams.length > 0 && (+ <RecordList className="cu-workflow-access__rows" aria-label="Approval target teams">+ {sortedApprovalTeams.map(team => (+ <RecordListRow+ className="cu-workflow-access__row"+ data-access-id={team.id}+ key={team.id}+ ><div className="cu-workflow-access__row-main"><span className="cu-workflow-access__row-title">{team.name}</span></div>- </div>+ </RecordListRow>))}- </div>+ </RecordList>)}</ReadonlyAccessGroup></div>diff --git a/control-ui/components/__tests__/RecipeStatusContent.test.tsx b/control-ui/components/__tests__/RecipeStatusContent.test.tsxindex 579dab3b8..cc5e7fcfe 100644--- a/control-ui/components/__tests__/RecipeStatusContent.test.tsx+++ b/control-ui/components/__tests__/RecipeStatusContent.test.tsx@@ -550,6 +550,77 @@ describe('RecipeStatusContent — GrantsReadonlyPanel', () => {expect(screen.queryByText('team-approval')).not.toBeInTheDocument()})+ it('sorts readonly access groups by visible identity with stable id tie-breaks', async () => {+ mockListGrants.mockResolvedValueOnce({+ items: [+ { id: 'u-z', email: '[email protected]', name: 'Zed', displayName: null },+ { id: 'u-10', email: '[email protected]', name: 'Same', displayName: null },+ { id: 'u-2', email: '[email protected]', name: 'Same', displayName: null },+ { id: 'u-a', email: '[email protected]', name: null, displayName: 'Alpha' },+ ],+ })+ mockListTeamGrants.mockResolvedValueOnce({+ items: [+ { id: 'team-z', name: 'Zulu' },+ { id: 'team-10', name: 'Same Team' },+ { id: 'team-2', name: 'Same Team' },+ { id: 'team-a', name: 'Alpha Team' },+ ],+ })+ mockListApprovalAllowedTeams.mockResolvedValueOnce({+ items: [+ { id: 'approval-z', name: 'Zulu Approval', createdAt: '2026-05-21T00:00:00Z' },+ { id: 'approval-10', name: 'Same Approval', createdAt: '2026-05-21T00:00:00Z' },+ { id: 'approval-2', name: 'Same Approval', createdAt: '2026-05-21T00:00:00Z' },+ { id: 'approval-a', name: 'Alpha Approval', createdAt: '2026-05-21T00:00:00Z' },+ ],+ })++ render(<RecipeStatusContent {...DEFAULT_PROPS} />)++ const triggerUsers = await screen.findByRole('list', { name: 'Trigger users' })+ const triggerTeams = await screen.findByRole('list', { name: 'Trigger teams' })+ const approvalTargetTeams = await screen.findByRole('list', {+ name: 'Approval target teams',+ })++ expect(+ within(triggerUsers)+ .getAllByRole('listitem')+ .map(row => row.textContent)+ ).toEqual([+ 'Alpha([email protected])',+ 'Same([email protected])',+ 'Same([email protected])',+ 'Zed([email protected])',+ ])+ expect(+ within(triggerUsers)+ .getAllByRole('listitem')+ .map(row => row.getAttribute('data-access-id'))+ ).toEqual(['u-a', 'u-2', 'u-10', 'u-z'])+ expect(+ within(triggerTeams)+ .getAllByRole('listitem')+ .map(row => row.textContent)+ ).toEqual(['Alpha Team', 'Same Team', 'Same Team', 'Zulu'])+ expect(+ within(triggerTeams)+ .getAllByRole('listitem')+ .map(row => row.getAttribute('data-access-id'))+ ).toEqual(['team-a', 'team-2', 'team-10', 'team-z'])+ expect(+ within(approvalTargetTeams)+ .getAllByRole('listitem')+ .map(row => row.textContent)+ ).toEqual(['Alpha Approval', 'Same Approval', 'Same Approval', 'Zulu Approval'])+ expect(+ within(approvalTargetTeams)+ .getAllByRole('listitem')+ .map(row => row.getAttribute('data-access-id'))+ ).toEqual(['approval-a', 'approval-2', 'approval-10', 'approval-z'])+ })+it('ignores stale grants responses after switching recipes', async () => {const first = createDeferred<Awaited<ReturnType<typeof listWorkflowGrants>>>()const second = createDeferred<Awaited<ReturnType<typeof listWorkflowGrants>>>()