Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(frontend): preserve legacy context-only agent grants
Josué7b32f18bacc7
diff --git a/control-ui/app/profile-admin/teams/[teamId]/page.tsx b/control-ui/app/profile-admin/teams/[teamId]/page.tsxindex f5a1ff2cc..d73b412c4 100644--- a/control-ui/app/profile-admin/teams/[teamId]/page.tsx+++ b/control-ui/app/profile-admin/teams/[teamId]/page.tsx@@ -17,7 +17,10 @@ import { TeamRolePermissionEditor } from '@components/TeamRolePermissionEditor'import { useToast } from '@components/Toast'import { CONTROL_ROUTES } from '@constants/routes'import { partitionVisibleAccess } from '@lib/accessVisibility'-import { applyAgentAccessCompatibilityUpdate } from '@lib/agentAccessCompatibility'+import {+ applyAgentAccessCompatibilityUpdate,+ effectiveAgentNamesForAccess,+} from '@lib/agentAccessCompatibility'import { getAgentDisplayName } from '@lib/agentName'import { InviteMemberDialog } from '../../../../components/InviteMemberDialog'import { IconUsers } from '../../../../components/Sidebar/icons'@@ -201,6 +204,16 @@ export default function TeamDetailsPage() {).sort((a, b) => a.localeCompare(b)),[hosts])+ const effectiveAgentNames = useMemo(+ () =>+ effectiveAgentNamesForAccess({+ assignedAgentNames,+ assignedContextIds,+ contexts: contextResources,+ hosts,+ }),+ [assignedAgentNames, assignedContextIds, contextResources, hosts]+ )function contextIdFromResource(item: {metadata?: { name?: string }@@ -526,7 +539,7 @@ export default function TeamDetailsPage() {if (!shouldRevoke) returnawait saveAgents(- assignedAgentNames.filter(name => name !== agentName),+ effectiveAgentNames.filter(name => name !== agentName),'Team agent access updated.')}@@ -563,13 +576,13 @@ export default function TeamDetailsPage() {const availableAgentOptions = useMemo(() =>hostNameOptions- .filter(agentName => !assignedAgentNames.includes(agentName))+ .filter(agentName => !effectiveAgentNames.includes(agentName)).map(agentName => ({value: agentName,label: getAgentDisplayName(agentName, hosts),description: agentName,})),- [assignedAgentNames, hostNameOptions, hosts]+ [effectiveAgentNames, hostNameOptions, hosts])useEffect(() => {@@ -966,13 +979,13 @@ export default function TeamDetailsPage() {</div>))}</div>- ) : assignedAgentNames.length === 0 ? (+ ) : effectiveAgentNames.length === 0 ? (<div className="cu-empty" style={{ padding: '0.5rem 0' }}>No agent access yet.</div>) : (<RecordList>- {assignedAgentNames.map(agentName => (+ {effectiveAgentNames.map(agentName => (<RecordListRow key={agentName} className="cu-access-row"><buttontype="button"@@ -1294,7 +1307,7 @@ export default function TeamDetailsPage() {className="cu-btn cu-btn--primary"onClick={() => {void saveAgents(- [...assignedAgentNames, ...selectedAgentNamesToAdd],+ [...effectiveAgentNames, ...selectedAgentNamesToAdd],selectedAgentNamesToAdd.length === 1? 'Team agent access updated.': 'Team agents access updated.'diff --git a/control-ui/app/profile-admin/users/[userId]/page.tsx b/control-ui/app/profile-admin/users/[userId]/page.tsxindex 5862424d4..6cbaaa33b 100644--- a/control-ui/app/profile-admin/users/[userId]/page.tsx+++ b/control-ui/app/profile-admin/users/[userId]/page.tsx@@ -13,7 +13,10 @@ import { useToast } from '@components/Toast'import { CheckboxField } from '@components/ui'import { CONTROL_ROUTES } from '@constants/routes'import { partitionVisibleAccess } from '@lib/accessVisibility'-import { applyAgentAccessCompatibilityUpdate } from '@lib/agentAccessCompatibility'+import {+ applyAgentAccessCompatibilityUpdate,+ effectiveAgentNamesForAccess,+} from '@lib/agentAccessCompatibility'import { getAgentDisplayName } from '@lib/agentName'import type { DeleteCandidateTeam } from '@lib/profileAdminDelete'import { formatTeamNames, getSoloMemberTeamsForUser } from '@lib/profileAdminDelete'@@ -141,6 +144,16 @@ export default function UserDetailsPage() {).sort((a, b) => a.localeCompare(b)),[hosts])+ const effectiveAgentNames = useMemo(+ () =>+ effectiveAgentNamesForAccess({+ assignedAgentNames,+ assignedContextIds,+ contexts: contextResources,+ hosts,+ }),+ [assignedAgentNames, assignedContextIds, contextResources, hosts]+ )const availableTeamOptions = useMemo(() =>allTeams@@ -155,13 +168,13 @@ export default function UserDetailsPage() {const availableAgentOptions = useMemo(() =>hostNameOptions- .filter(agentName => !assignedAgentNames.includes(agentName))+ .filter(agentName => !effectiveAgentNames.includes(agentName)).map(agentName => ({value: agentName,label: getAgentDisplayName(agentName, hosts),description: agentName,})),- [assignedAgentNames, hostNameOptions, hosts]+ [effectiveAgentNames, hostNameOptions, hosts])const userCommunicationConversations = useMemo(() =>@@ -442,7 +455,7 @@ export default function UserDetailsPage() {if (!shouldRevoke) returnawait saveAgents(- assignedAgentNames.filter(name => name !== agentName),+ effectiveAgentNames.filter(name => name !== agentName),'Agent access updated.')}@@ -1099,7 +1112,7 @@ export default function UserDetailsPage() {</tbody></DataTable></TableViewport>- ) : assignedAgentNames.length === 0 ? (+ ) : effectiveAgentNames.length === 0 ? (<div className="cu-empty" style={{ padding: '0.5rem 0' }}>No agent access yet.</div>@@ -1113,7 +1126,7 @@ export default function UserDetailsPage() {</tr></thead><tbody>- {assignedAgentNames.map(agentName => (+ {effectiveAgentNames.map(agentName => (<tr key={agentName}><td><button@@ -1375,7 +1388,7 @@ export default function UserDetailsPage() {className="cu-btn cu-btn--primary"onClick={() => {void saveAgents(- [...assignedAgentNames, ...selectedAgentNamesToAdd],+ [...effectiveAgentNames, ...selectedAgentNamesToAdd],selectedAgentNamesToAdd.length === 1? 'Agent access updated.': 'Agents access updated.'diff --git a/control-ui/components/__tests__/ProfileAdminAgentCompatibility.test.tsx b/control-ui/components/__tests__/ProfileAdminAgentCompatibility.test.tsxindex 7ade3fc4c..9e1c591e4 100644--- a/control-ui/components/__tests__/ProfileAdminAgentCompatibility.test.tsx+++ b/control-ui/components/__tests__/ProfileAdminAgentCompatibility.test.tsx@@ -171,6 +171,89 @@ describe('profile-admin agent compatibility access', () => {expect(api.updateAdminUserContexts).toHaveBeenCalledWith('user-1', ['ctx-unrelated'])})+ it('renders and revokes a member Agent grant represented only by legacy Context access', async () => {+ vi.mocked(api.getAdminUserContexts)+ .mockResolvedValueOnce({ userId: 'user-1', contextIds: ['ctx-alpha', 'ctx-unrelated'] })+ .mockResolvedValueOnce({ userId: 'user-1', contextIds: ['ctx-alpha', 'ctx-unrelated'] })+ vi.mocked(api.getAdminUserAgents).mockResolvedValue({+ userId: 'user-1',+ agentNames: ['agent-beta'],+ deletedAgentNames: [],+ deletedHistoryLimit: 10,+ })+ vi.mocked(api.updateAdminUserAgents).mockResolvedValue({+ userId: 'user-1',+ agentNames: ['agent-beta'],+ deletedAgentNames: ['agent-alpha'],+ deletedHistoryLimit: 10,+ })+ vi.mocked(api.updateAdminUserContexts).mockResolvedValue({+ userId: 'user-1',+ contextIds: ['ctx-beta', 'ctx-unrelated'],+ })++ renderUserDetails()++ await screen.findByRole('button', { name: 'Actions for agent-alpha' })+ expect(screen.getByRole('button', { name: 'Actions for agent-beta' })).toBeInTheDocument()+ fireEvent.click(screen.getByRole('button', { name: 'Actions for agent-alpha' }))+ fireEvent.click(screen.getByRole('menuitem', { name: 'Revoke access' }))+ fireEvent.click((await screen.findByRole('alertdialog')).querySelector('.cu-btn--danger')!)++ await waitFor(() => {+ expect(api.updateAdminUserAgents).toHaveBeenCalledWith(+ 'user-1',+ ['agent-beta'],+ ['agent-beta']+ )+ })+ expect(api.updateAdminUserContexts).toHaveBeenCalledWith('user-1', [+ 'ctx-beta',+ 'ctx-unrelated',+ ])+ })++ it('preserves a member legacy Context-only Agent when a direct Agent is revoked', async () => {+ vi.mocked(api.getAdminUserContexts)+ .mockResolvedValueOnce({ userId: 'user-1', contextIds: ['ctx-alpha', 'ctx-unrelated'] })+ .mockResolvedValueOnce({ userId: 'user-1', contextIds: ['ctx-alpha', 'ctx-unrelated'] })+ vi.mocked(api.getAdminUserAgents).mockResolvedValue({+ userId: 'user-1',+ agentNames: ['agent-beta'],+ deletedAgentNames: [],+ deletedHistoryLimit: 10,+ })+ vi.mocked(api.updateAdminUserAgents).mockResolvedValue({+ userId: 'user-1',+ agentNames: ['agent-alpha'],+ deletedAgentNames: ['agent-beta'],+ deletedHistoryLimit: 10,+ })+ vi.mocked(api.updateAdminUserContexts).mockResolvedValue({+ userId: 'user-1',+ contextIds: ['ctx-alpha', 'ctx-unrelated'],+ })++ renderUserDetails()++ await screen.findByRole('button', { name: 'Actions for agent-alpha' })+ fireEvent.click(screen.getByRole('button', { name: 'Actions for agent-beta' }))+ fireEvent.click(screen.getByRole('menuitem', { name: 'Revoke access' }))+ fireEvent.click((await screen.findByRole('alertdialog')).querySelector('.cu-btn--danger')!)++ await waitFor(() => {+ expect(api.updateAdminUserAgents).toHaveBeenCalledWith(+ 'user-1',+ ['agent-alpha'],+ ['agent-beta']+ )+ })+ expect(api.updateAdminUserContexts).toHaveBeenCalledWith('user-1', [+ 'ctx-alpha',+ 'ctx-unrelated',+ ])+ })+it('removes only owned Context grants when a team loses final agent access', async () => {vi.mocked(api.getAdminTeamContexts).mockResolvedValueOnce({ teamId: 'team-1', contextIds: ['ctx-alpha', 'ctx-unrelated'] })@@ -204,4 +287,87 @@ describe('profile-admin agent compatibility access', () => {})expect(api.updateAdminTeamContexts).toHaveBeenCalledWith('team-1', ['ctx-unrelated'])})++ it('renders and revokes a team Agent grant represented only by legacy Context access', async () => {+ vi.mocked(api.getAdminTeamContexts)+ .mockResolvedValueOnce({ teamId: 'team-1', contextIds: ['ctx-alpha', 'ctx-unrelated'] })+ .mockResolvedValueOnce({ teamId: 'team-1', contextIds: ['ctx-alpha', 'ctx-unrelated'] })+ vi.mocked(api.getAdminTeamAgents).mockResolvedValue({+ teamId: 'team-1',+ agentNames: ['agent-beta'],+ deletedAgentNames: [],+ deletedHistoryLimit: 10,+ })+ vi.mocked(api.updateAdminTeamAgents).mockResolvedValue({+ teamId: 'team-1',+ agentNames: ['agent-beta'],+ deletedAgentNames: ['agent-alpha'],+ deletedHistoryLimit: 10,+ })+ vi.mocked(api.updateAdminTeamContexts).mockResolvedValue({+ teamId: 'team-1',+ contextIds: ['ctx-beta', 'ctx-unrelated'],+ })++ renderTeamDetails()++ await screen.findByRole('button', { name: 'Actions for agent agent-alpha' })+ expect(screen.getByRole('button', { name: 'Actions for agent agent-beta' })).toBeInTheDocument()+ fireEvent.click(screen.getByRole('button', { name: 'Actions for agent agent-alpha' }))+ fireEvent.click(screen.getByRole('menuitem', { name: 'Revoke agent access' }))+ fireEvent.click((await screen.findByRole('alertdialog')).querySelector('.cu-btn--danger')!)++ await waitFor(() => {+ expect(api.updateAdminTeamAgents).toHaveBeenCalledWith(+ 'team-1',+ ['agent-beta'],+ ['agent-beta']+ )+ })+ expect(api.updateAdminTeamContexts).toHaveBeenCalledWith('team-1', [+ 'ctx-beta',+ 'ctx-unrelated',+ ])+ })++ it('preserves a team legacy Context-only Agent when a direct Agent is revoked', async () => {+ vi.mocked(api.getAdminTeamContexts)+ .mockResolvedValueOnce({ teamId: 'team-1', contextIds: ['ctx-alpha', 'ctx-unrelated'] })+ .mockResolvedValueOnce({ teamId: 'team-1', contextIds: ['ctx-alpha', 'ctx-unrelated'] })+ vi.mocked(api.getAdminTeamAgents).mockResolvedValue({+ teamId: 'team-1',+ agentNames: ['agent-beta'],+ deletedAgentNames: [],+ deletedHistoryLimit: 10,+ })+ vi.mocked(api.updateAdminTeamAgents).mockResolvedValue({+ teamId: 'team-1',+ agentNames: ['agent-alpha'],+ deletedAgentNames: ['agent-beta'],+ deletedHistoryLimit: 10,+ })+ vi.mocked(api.updateAdminTeamContexts).mockResolvedValue({+ teamId: 'team-1',+ contextIds: ['ctx-alpha', 'ctx-unrelated'],+ })++ renderTeamDetails()++ await screen.findByRole('button', { name: 'Actions for agent agent-alpha' })+ fireEvent.click(screen.getByRole('button', { name: 'Actions for agent agent-beta' }))+ fireEvent.click(screen.getByRole('menuitem', { name: 'Revoke agent access' }))+ fireEvent.click((await screen.findByRole('alertdialog')).querySelector('.cu-btn--danger')!)++ await waitFor(() => {+ expect(api.updateAdminTeamAgents).toHaveBeenCalledWith(+ 'team-1',+ ['agent-alpha'],+ ['agent-beta']+ )+ })+ expect(api.updateAdminTeamContexts).toHaveBeenCalledWith('team-1', [+ 'ctx-alpha',+ 'ctx-unrelated',+ ])+ })})diff --git a/control-ui/lib/__tests__/agentAccessCompatibility.test.ts b/control-ui/lib/__tests__/agentAccessCompatibility.test.tsindex aaef1813f..c80fb6356 100644--- a/control-ui/lib/__tests__/agentAccessCompatibility.test.ts+++ b/control-ui/lib/__tests__/agentAccessCompatibility.test.ts@@ -2,6 +2,7 @@ import { describe, expect, it, vi } from 'vitest'import {agentNamesForContextAccess,applyAgentAccessCompatibilityUpdate,+ effectiveAgentNamesForAccess,planAgentAccessUpdate,} from '../agentAccessCompatibility'import type { ContextResource, HostResource } from '../api'@@ -20,6 +21,17 @@ const contexts: ContextResource[] = []describe('planAgentAccessUpdate', () => {+ it('derives the effective Agent grant set from direct and Context-only access', () => {+ expect(+ effectiveAgentNamesForAccess({+ assignedAgentNames: ['agent-beta'],+ assignedContextIds: ['ctx-alpha', 'member-private-scope'],+ contexts,+ hosts,+ })+ ).toEqual(['agent-alpha', 'agent-beta'])+ })+it('keeps only the member’s already-assigned unowned scopes', () => {const result = planAgentAccessUpdate(['member-private-scope'], ['agent-alpha'], hosts)diff --git a/control-ui/lib/agentAccessCompatibility.ts b/control-ui/lib/agentAccessCompatibility.tsindex f94624707..83eedcb99 100644--- a/control-ui/lib/agentAccessCompatibility.ts+++ b/control-ui/lib/agentAccessCompatibility.ts@@ -71,6 +71,25 @@ export function agentNamesForContextAccess(.sort((left, right) => left.localeCompare(right))}+export function effectiveAgentNamesForAccess({+ assignedAgentNames,+ assignedContextIds,+ hosts,+ contexts,+}: {+ assignedAgentNames: readonly string[]+ assignedContextIds: readonly string[]+ hosts: readonly HostResource[]+ contexts: readonly ContextResource[]+}): string[] {+ return Array.from(+ new Set([+ ...assignedAgentNames.map(value => value.trim()).filter(Boolean),+ ...agentNamesForContextAccess(assignedContextIds, hosts, contexts),+ ])+ ).sort((left, right) => left.localeCompare(right))+}+/*** Plans the compatibility payload for an Agent-centric access update.*diff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex 747129c34..2887e1495 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.557",+ "version": "0.1.558","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.557",+ "version": "0.1.558","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 0b06b4858..1c7dfd81b 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.557",+ "version": "0.1.558","private": true,"scripts": {"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",