Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
feat(control-ui): standardize relationship chooser dialogs
Josué6d17bee3c015
diff --git a/control-ui/app/profile-admin/teams/[teamId]/page.tsx b/control-ui/app/profile-admin/teams/[teamId]/page.tsxindex 7e0507d52..8b3f0093c 100644--- a/control-ui/app/profile-admin/teams/[teamId]/page.tsx+++ b/control-ui/app/profile-admin/teams/[teamId]/page.tsx@@ -4,6 +4,7 @@ import React, { useEffect, useMemo, useRef, useState } from 'react'import { useParams, useRouter } from 'next/navigation'import {DataTable,+ MultiSelectActionDialog,RecordList,RecordListRow,RowActionMenu,@@ -188,6 +189,7 @@ export default function TeamDetailsPage() {const [addMemberError, setAddMemberError] = useState('')const [showAddAgent, setShowAddAgent] = useState(false)+ const [agentAccessDialogError, setAgentAccessDialogError] = useState('')const [availableContextIds, setAvailableContextIds] = useState<string[]>([])const [contextResources, setContextResources] = useState<ContextResource[]>([])@@ -489,10 +491,11 @@ export default function TeamDetailsPage() {}}- async function saveAgents(next: string[], message: string) {- if (isNew) return+ async function saveAgents(next: string[], message: string): Promise<boolean> {+ if (isNew) return falsesetBusy(true)setError('')+ setAgentAccessDialogError('')try {const normalized = Array.from(new Set(next.map(v => v.trim()).filter(Boolean)))const [updatedAgents, updatedContexts] = await applyAgentAccessCompatibilityUpdate({@@ -525,8 +528,12 @@ export default function TeamDetailsPage() {setDeletedContextIds(contextPartition.deleted)setSelectedAgentNamesToAdd([])showToast(message, { tone: 'success' })+ return true} catch (e) {- setError(e instanceof Error ? e.message : 'Failed to update team agents')+ const message = e instanceof Error ? e.message : 'Failed to update team agents'+ setError(message)+ setAgentAccessDialogError(message)+ return false} finally {setBusy(false)}@@ -581,9 +588,10 @@ export default function TeamDetailsPage() {hostNameOptions.filter(agentName => !effectiveAgentNames.includes(agentName)).map(agentName => ({- value: agentName,+ id: agentName,label: getAgentDisplayName(agentName, hosts),description: agentName,+ searchText: `${getAgentDisplayName(agentName, hosts)} ${agentName}`,})),[effectiveAgentNames, hostNameOptions, hosts])@@ -618,7 +626,11 @@ export default function TeamDetailsPage() {<buttontype="button"className="cu-btn cu-btn--primary cu-btn--sm"- onClick={() => setShowAddAgent(true)}+ onClick={() => {+ setAgentAccessDialogError('')+ setSelectedAgentNamesToAdd([])+ setShowAddAgent(true)+ }}disabled={busy}>Add agent@@ -1229,89 +1241,33 @@ export default function TeamDetailsPage() {</div>)}- {showAddAgent && (- <div- style={{- position: 'fixed',- inset: 0,- background: 'rgba(0, 0, 0, 0.6)',- display: 'flex',- alignItems: 'center',- justifyContent: 'center',- zIndex: 1000,- padding: '1rem',- }}- role="presentation"- onClick={e => {- if (e.target === e.currentTarget && !busy) setShowAddAgent(false)- }}- >- <div- className="cu-modal-panel cu-modal-panel--selection"- role="dialog"- aria-labelledby="add-agent-title"- onClick={e => e.stopPropagation()}- >- <div className="cu-modal-panel__head">- <strong id="add-agent-title" style={{ fontSize: '1rem', lineHeight: 1.35 }}>- Add agent- </strong>- <button- type="button"- className="cu-btn cu-btn--icon cu-btn--ghost"- onClick={() => setShowAddAgent(false)}- disabled={busy}- aria-label="Close"- >- <IconX width={18} height={18} />- </button>- </div>-- <div className="cu-field">- <label htmlFor="team-agent-picker">Agents</label>- <SelectionDropdown- id="team-agent-picker"- inline- value={selectedAgentNamesToAdd}- onChange={setSelectedAgentNamesToAdd}- options={availableAgentOptions}- placeholder="Select agents"- searchPlaceholder="Search agents..."- selectionLabel="Selected agents"- emptyLabel="No available agents."- disabled={busy}- />- </div>-- <div className="cu-modal-panel__foot">- <button- type="button"- className="cu-btn cu-btn--ghost cu-btn--sm"- onClick={() => setShowAddAgent(false)}- disabled={busy}- >- Cancel- </button>- <button- type="button"- className="cu-btn cu-btn--primary"- onClick={() => {- void saveAgents(- [...effectiveAgentNames, ...selectedAgentNamesToAdd],- selectedAgentNamesToAdd.length === 1- ? 'Team agent access updated.'- : 'Team agents access updated.'- )- setShowAddAgent(false)- }}- disabled={busy || selectedAgentNamesToAdd.length === 0}- >- {selectedAgentNamesToAdd.length > 1 ? 'Add agents' : 'Add agent'}- </button>- </div>- </div>- </div>- )}+ <MultiSelectActionDialog+ actionLabel={selectedAgentNamesToAdd.length > 1 ? 'Add agents' : 'Add agent'}+ emptyMessage="No available agents."+ error={agentAccessDialogError || undefined}+ items={availableAgentOptions}+ noMatchesMessage="No matching agents."+ onAction={async selectedIds => {+ const saved = await saveAgents(+ [...effectiveAgentNames, ...selectedIds],+ selectedIds.length === 1 ? 'Team agent access updated.' : 'Team agents access updated.'+ )+ if (saved) setShowAddAgent(false)+ }}+ onDismiss={() => {+ if (busy) return+ setShowAddAgent(false)+ setSelectedAgentNamesToAdd([])+ setAgentAccessDialogError('')+ }}+ onSelectedIdsChange={setSelectedAgentNamesToAdd}+ open={showAddAgent}+ pending={busy}+ searchLabel="Search agents"+ searchPlaceholder="Search agents..."+ selectedIds={selectedAgentNamesToAdd}+ title="Add agent access"+ />{showDeleteTeamConfirm && (<divdiff --git a/control-ui/app/profile-admin/users/[userId]/page.tsx b/control-ui/app/profile-admin/users/[userId]/page.tsxindex e826cfa49..647ead064 100644--- a/control-ui/app/profile-admin/users/[userId]/page.tsx+++ b/control-ui/app/profile-admin/users/[userId]/page.tsx@@ -3,7 +3,7 @@import React, { useEffect, useMemo, useRef, useState } from 'react'import Link from 'next/link'import { useParams, useRouter } from 'next/navigation'-import { DataTable, TableViewport } from '@clerum/frontend-components'+import { DataTable, MultiSelectActionDialog, TableViewport } from '@clerum/frontend-components'import { useConfirmDialog } from '@components/ConfirmDialog'import { DetailPageShell } from '@components/DetailPageShell'import { RowActionsMenu } from '@components/RowActionsMenu'@@ -92,6 +92,7 @@ export default function UserDetailsPage() {const [initialLoading, setInitialLoading] = useState(true)const [editingContact, setEditingContact] = useState(false)const [showAddAgent, setShowAddAgent] = useState(false)+ const [agentAccessDialogError, setAgentAccessDialogError] = useState('')const [showAddTeam, setShowAddTeam] = useState(false)const [showDeleteUserConfirm, setShowDeleteUserConfirm] = useState(false)@@ -170,9 +171,10 @@ export default function UserDetailsPage() {hostNameOptions.filter(agentName => !effectiveAgentNames.includes(agentName)).map(agentName => ({- value: agentName,+ id: agentName,label: getAgentDisplayName(agentName, hosts),description: agentName,+ searchText: `${getAgentDisplayName(agentName, hosts)} ${agentName}`,})),[effectiveAgentNames, hostNameOptions, hosts])@@ -403,9 +405,10 @@ export default function UserDetailsPage() {}}- async function saveAgents(next: string[], message: string) {+ async function saveAgents(next: string[], message: string): Promise<boolean> {setBusy(true)setError('')+ setAgentAccessDialogError('')try {const normalized = Array.from(new Set(next.map(v => v.trim()).filter(Boolean)))const [updatedAgents, updatedContexts] = await applyAgentAccessCompatibilityUpdate({@@ -438,8 +441,12 @@ export default function UserDetailsPage() {setDeletedContextIds(contextPartition.deleted)setSelectedAgentNamesToAdd([])showToast(message, { tone: 'success' })+ return true} catch (e) {- setError(e instanceof Error ? e.message : 'Failed to update member agent access')+ const message = e instanceof Error ? e.message : 'Failed to update member agent access'+ setError(message)+ setAgentAccessDialogError(message)+ return false} finally {setBusy(false)}@@ -552,7 +559,11 @@ export default function UserDetailsPage() {<buttontype="button"className="cu-btn cu-btn--primary cu-btn--sm"- onClick={() => setShowAddAgent(true)}+ onClick={() => {+ setAgentAccessDialogError('')+ setSelectedAgentNamesToAdd([])+ setShowAddAgent(true)+ }}disabled={busy}>Grant agent@@ -1340,89 +1351,33 @@ export default function UserDetailsPage() {</div>)}- {showAddAgent && (- <div- style={{- position: 'fixed',- inset: 0,- background: 'rgba(0, 0, 0, 0.6)',- display: 'flex',- alignItems: 'center',- justifyContent: 'center',- zIndex: 1000,- padding: '1rem',- }}- role="presentation"- onClick={e => {- if (e.target === e.currentTarget && !busy) setShowAddAgent(false)- }}- >- <div- className="cu-modal-panel cu-modal-panel--selection"- role="dialog"- aria-labelledby="add-agent-title"- onClick={e => e.stopPropagation()}- >- <div className="cu-modal-panel__head">- <strong id="add-agent-title" style={{ fontSize: '1rem', lineHeight: 1.35 }}>- Grant agent- </strong>- <button- type="button"- className="cu-btn cu-btn--icon cu-btn--ghost"- onClick={() => setShowAddAgent(false)}- disabled={busy}- aria-label="Close"- >- <IconX width={18} height={18} />- </button>- </div>-- <div className="cu-field">- <label htmlFor="member-agent-picker">Agents</label>- <SelectionDropdown- id="member-agent-picker"- inline- value={selectedAgentNamesToAdd}- onChange={setSelectedAgentNamesToAdd}- options={availableAgentOptions}- placeholder="Select agents"- searchPlaceholder="Search agents..."- selectionLabel="Selected agents"- emptyLabel="No available agents."- disabled={busy}- />- </div>-- <div className="cu-modal-panel__foot">- <button- type="button"- className="cu-btn cu-btn--ghost cu-btn--sm"- onClick={() => setShowAddAgent(false)}- disabled={busy}- >- Cancel- </button>- <button- type="button"- className="cu-btn cu-btn--primary"- onClick={() => {- void saveAgents(- [...effectiveAgentNames, ...selectedAgentNamesToAdd],- selectedAgentNamesToAdd.length === 1- ? 'Agent access updated.'- : 'Agents access updated.'- )- setShowAddAgent(false)- }}- disabled={busy || selectedAgentNamesToAdd.length === 0}- >- {selectedAgentNamesToAdd.length > 1 ? 'Grant agents' : 'Grant agent'}- </button>- </div>- </div>- </div>- )}+ <MultiSelectActionDialog+ actionLabel={selectedAgentNamesToAdd.length > 1 ? 'Grant agents' : 'Grant agent'}+ emptyMessage="No available agents."+ error={agentAccessDialogError || undefined}+ items={availableAgentOptions}+ noMatchesMessage="No matching agents."+ onAction={async selectedIds => {+ const saved = await saveAgents(+ [...effectiveAgentNames, ...selectedIds],+ selectedIds.length === 1 ? 'Agent access updated.' : 'Agents access updated.'+ )+ if (saved) setShowAddAgent(false)+ }}+ onDismiss={() => {+ if (busy) return+ setShowAddAgent(false)+ setSelectedAgentNamesToAdd([])+ setAgentAccessDialogError('')+ }}+ onSelectedIdsChange={setSelectedAgentNamesToAdd}+ open={showAddAgent}+ pending={busy}+ searchLabel="Search agents"+ searchPlaceholder="Search agents..."+ selectedIds={selectedAgentNamesToAdd}+ title="Grant agent access"+ />{showDeleteUserConfirm && (<divdiff --git a/control-ui/components/McpServerTable.tsx b/control-ui/components/McpServerTable.tsxindex 3166b136f..81c4121da 100644--- a/control-ui/components/McpServerTable.tsx+++ b/control-ui/components/McpServerTable.tsx@@ -3,6 +3,7 @@import React, { useMemo, useState } from 'react'import {DataTable,+ MultiSelectActionDialog,TableRow,TableStateRow,TableViewport,@@ -16,7 +17,6 @@ import type {} from './McpServerTable.types'import { RowActionsMenu } from './RowActionsMenu'import { SectionSearchInput } from './SectionSearchInput'-import { SelectionDropdown } from './SelectionDropdown'import { IconCable } from './Sidebar/icons'import { TableHeaderRow } from './TableHeaderRow'import type { TableHeaderColumn } from './TableHeaderRow/types'@@ -449,91 +449,39 @@ export function McpServerTable({canAssignConnectorToContext(row.item.spec, target.contextRef)).map(target => ({- value: target.name,+ id: target.name,label: target.label,description: target.name,+ searchText: `${target.label} ${target.name}`,}))const busy = updatingAgentAccessKey === row.keyreturn (- <div- className="cu-modal-backdrop"- role="presentation"- onClick={event => {- if (event.target === event.currentTarget && !busy) closeAddAgents()+ <MultiSelectActionDialog+ actionLabel={selectedAgentNamesToAdd.length > 1 ? 'Add to agents' : 'Add to agent'}+ emptyMessage="No other agents available."+ items={agentOptions}+ noMatchesMessage="No matching agents."+ onAction={async selectedIds => {+ const selected = agentTargets.filter(target => selectedIds.includes(target.name))+ await onAddToAgents(+ { namespace: row.namespace, name: row.name },+ selected.map(target => ({+ name: target.name,+ contextRef: target.contextRef,+ }))+ )+ setSelectedAgentNamesToAdd([])+ setServerKeyAddingAgents(null)}}- >- <div- className="cu-modal-panel cu-modal-panel--selection"- role="dialog"- aria-modal="true"- aria-labelledby="add-connector-agents-title"- onClick={event => event.stopPropagation()}- >- <div className="cu-modal-panel__head">- <h3 id="add-connector-agents-title" className="cu-modal-panel__title">- Give agents access to this connector- </h3>- <button- type="button"- className="cu-btn cu-btn--icon cu-btn--ghost"- onClick={closeAddAgents}- disabled={busy}- aria-label="Close"- >- <IconX width={18} height={18} />- </button>- </div>-- <div className="cu-field">- <label htmlFor="connector-agent-picker">Agents</label>- <SelectionDropdown- id="connector-agent-picker"- inline- value={selectedAgentNamesToAdd}- onChange={setSelectedAgentNamesToAdd}- options={agentOptions}- placeholder="Select agents"- searchPlaceholder="Search agents..."- selectionLabel="Selected agents"- emptyLabel="No other agents available."- disabled={busy}- />- </div>-- <div className="cu-modal-panel__foot">- <button- type="button"- className="cu-btn cu-btn--ghost cu-btn--sm"- onClick={closeAddAgents}- disabled={busy}- >- Cancel- </button>- <button- type="button"- className="cu-btn cu-btn--primary"- onClick={async () => {- if (selectedAgentNamesToAdd.length === 0) return- const selected = agentTargets.filter(target =>- selectedAgentNamesToAdd.includes(target.name)- )- await onAddToAgents(- { namespace: row.namespace, name: row.name },- selected.map(target => ({- name: target.name,- contextRef: target.contextRef,- }))- )- setSelectedAgentNamesToAdd([])- setServerKeyAddingAgents(null)- }}- disabled={busy || selectedAgentNamesToAdd.length === 0}- >- {selectedAgentNamesToAdd.length > 1 ? 'Add to agents' : 'Add to agent'}- </button>- </div>- </div>- </div>+ onDismiss={closeAddAgents}+ onSelectedIdsChange={setSelectedAgentNamesToAdd}+ open+ pending={busy}+ searchLabel="Search agents"+ searchPlaceholder="Search agents..."+ selectedIds={selectedAgentNamesToAdd}+ title="Give agents access to this connector"+ />)})(): null}diff --git a/control-ui/components/WorkflowAccessPanel/index.tsx b/control-ui/components/WorkflowAccessPanel/index.tsxindex 1367ddedf..a2be848b9 100644--- a/control-ui/components/WorkflowAccessPanel/index.tsx+++ b/control-ui/components/WorkflowAccessPanel/index.tsx@@ -1,7 +1,12 @@'use client'import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'-import { RecordList, RecordListRow, RowActionMenu } from '@clerum/frontend-components'+import {+ MultiSelectActionDialog,+ RecordList,+ RecordListRow,+ RowActionMenu,+} from '@clerum/frontend-components'import { useConfirmDialog } from '@components/ConfirmDialog'import { SelectionDropdown } from '@components/SelectionDropdown'import { TabBar } from '@components/TabBar'@@ -261,12 +266,12 @@ export function WorkflowAccessPanel(props: WorkflowAccessPanelProps): React.JSX.team => !selectedApprovalTeamSet.has(team.id))- async function persistUserGrants(nextUserIds: string[]) {+ async function persistUserGrants(nextUserIds: string[]): Promise<boolean> {if (mode === 'create') {onSelectedUserIdsChange(nextUserIds)- return+ return true}- if (userGrants === null) return+ if (userGrants === null) return falseconst current = selectedUserIdsconst added = nextUserIds.filter(id => !current.includes(id))const removed = current.filter(id => !nextUserIds.includes(id))@@ -287,22 +292,24 @@ export function WorkflowAccessPanel(props: WorkflowAccessPanelProps): React.JSX.} else {showToast('Workflow user access updated.', { tone: 'success' })}+ return true} catch (error) {- if (!mountedRef.current) return+ if (!mountedRef.current) return falsesetSectionPatch('trigger-users', {mutateError: error instanceof Error ? error.message : 'Failed to save user grants',})+ return false} finally {if (mountedRef.current) setSectionPatch('trigger-users', { mutating: false })}}- async function persistTeamGrants(nextTeamIds: string[]) {+ async function persistTeamGrants(nextTeamIds: string[]): Promise<boolean> {if (mode === 'create') {onSelectedTeamIdsChange(nextTeamIds)- return+ return true}- if (teamGrants === null) return+ if (teamGrants === null) return falseconst current = selectedTeamIdsconst added = nextTeamIds.filter(id => !current.includes(id))const removed = current.filter(id => !nextTeamIds.includes(id))@@ -317,22 +324,24 @@ export function WorkflowAccessPanel(props: WorkflowAccessPanelProps): React.JSX.} else {showToast('Workflow team access updated.', { tone: 'success' })}+ return true} catch (error) {- if (!mountedRef.current) return+ if (!mountedRef.current) return falsesetSectionPatch('trigger-teams', {mutateError: error instanceof Error ? error.message : 'Failed to save team grants',})+ return false} finally {if (mountedRef.current) setSectionPatch('trigger-teams', { mutating: false })}}- async function persistApprovalTeams(nextTeamIds: string[]) {+ async function persistApprovalTeams(nextTeamIds: string[]): Promise<boolean> {if (mode === 'create') {onSelectedApprovalTeamIdsChange(nextTeamIds)- return+ return true}- if (approvalTeams === null) return+ if (approvalTeams === null) return falseconst current = selectedApprovalTeamIdsconst added = nextTeamIds.filter(id => !current.includes(id))const removed = current.filter(id => !nextTeamIds.includes(id))@@ -394,36 +403,41 @@ export function WorkflowAccessPanel(props: WorkflowAccessPanelProps): React.JSX.} else {showToast('Approval target teams updated.', { tone: 'success' })}+ return true} catch (error) {- if (!mountedRef.current || isSilentApiError(error)) return+ if (!mountedRef.current || isSilentApiError(error)) return falsesetSectionPatch('approval-target-teams', {mutateError:error instanceof Error ? error.message : 'Failed to save approval target teams',})+ return false} finally {if (mountedRef.current) setSectionPatch('approval-target-teams', { mutating: false })}}- async function handleGrantUser() {- if (pickUserIds.length === 0) return+ async function handleGrantUser(): Promise<boolean> {+ if (pickUserIds.length === 0) return falseconst next = uniqueIds([...selectedUserIds, ...pickUserIds])- setPickUserIds([])- await persistUserGrants(next)+ const saved = await persistUserGrants(next)+ if (saved) setPickUserIds([])+ return saved}- async function handleGrantTeam() {- if (pickTeamIds.length === 0) return+ async function handleGrantTeam(): Promise<boolean> {+ if (pickTeamIds.length === 0) return falseconst next = uniqueIds([...selectedTeamIds, ...pickTeamIds])- setPickTeamIds([])- await persistTeamGrants(next)+ const saved = await persistTeamGrants(next)+ if (saved) setPickTeamIds([])+ return saved}- async function handleAllowApprovalTeam() {- if (pickApprovalTeamIds.length === 0) return+ async function handleAllowApprovalTeam(): Promise<boolean> {+ if (pickApprovalTeamIds.length === 0) return falseconst next = uniqueIds([...selectedApprovalTeamIds, ...pickApprovalTeamIds])- setPickApprovalTeamIds([])- await persistApprovalTeams(next)+ const saved = await persistApprovalTeams(next)+ if (saved) setPickApprovalTeamIds([])+ return saved}async function handleRevokeUser(id: string) {@@ -542,6 +556,7 @@ export function WorkflowAccessPanel(props: WorkflowAccessPanelProps): React.JSX.onPickChange={setPickUserIds}onGrant={handleGrantUser}onRevoke={handleRevokeUser}+ useDialog={mode === 'edit'}emptyText={mode === 'edit'? sectionByKey['trigger-users'].emptyEdit@@ -563,6 +578,7 @@ export function WorkflowAccessPanel(props: WorkflowAccessPanelProps): React.JSX.onPickChange={setPickTeamIds}onGrant={handleGrantTeam}onRevoke={handleRevokeTeam}+ useDialog={mode === 'edit'}emptyText={mode === 'edit'? sectionByKey['trigger-teams'].emptyEdit@@ -588,6 +604,7 @@ export function WorkflowAccessPanel(props: WorkflowAccessPanelProps): React.JSX.onPickChange={setPickApprovalTeamIds}onGrant={handleAllowApprovalTeam}onRevoke={handleRevokeApprovalTeam}+ useDialog={mode === 'edit'}emptyText={mode === 'edit'? sectionByKey['approval-target-teams'].emptyEdit@@ -646,6 +663,7 @@ function AccessUserSection({onGrant,onRevoke,emptyText,+ useDialog,}: {definition: AccessSectionDefinitionrows: AccessUserRow[]@@ -658,16 +676,20 @@ function AccessUserSection({inlineError?: string | nullpickValue: string[]onPickChange: (next: string[]) => void- onGrant: () => void+ onGrant: () => Promise<boolean>onRevoke: (id: string) => voidemptyText: string+ useDialog: boolean}) {const busy = state.mutatingconst userOptions = options.map(user => ({- value: user.id,+ id: user.id,label: userLabel(user),description: user.email,+ searchText: `${userLabel(user)} ${user.email}`,}))+ const [dialogOpen, setDialogOpen] = useState(false)+ const actionLabel = pickValue.length > 1 ? 'Add members' : definition.grantLabelreturn (<SectionShelldefinition={definition}@@ -709,28 +731,68 @@ function AccessUserSection({))}</RecordList>)}- <div className="cu-workflow-access__picker cu-workflow-access__picker--inline">- <SelectionDropdown- id={`workflow-${definition.key}-picker`}- inline- value={pickValue}- onChange={onPickChange}- options={userOptions}- placeholder={options.length === 0 ? 'All users already granted' : 'Pick users'}- searchPlaceholder="Search users..."- selectionLabel="Selected users"- emptyLabel="All users already granted."- disabled={busy || options.length === 0}- />- <button- className="cu-btn cu-btn--primary cu-btn--sm"- type="button"- disabled={pickValue.length === 0 || busy}- onClick={onGrant}- >- {pickValue.length > 1 ? 'Add members' : definition.grantLabel}- </button>- </div>+ {useDialog ? (+ <>+ <button+ className="cu-btn cu-btn--primary cu-btn--sm"+ disabled={busy || !loaded || options.length === 0}+ onClick={() => setDialogOpen(true)}+ type="button"+ >+ {definition.grantLabel}+ </button>+ <MultiSelectActionDialog+ actionLabel={actionLabel}+ emptyMessage="All users already granted."+ error={state.mutateError || inlineError || undefined}+ items={userOptions}+ loading={!loaded}+ noMatchesMessage="No matching members."+ onAction={async () => {+ if (await onGrant()) setDialogOpen(false)+ }}+ onDismiss={() => {+ if (busy) return+ onPickChange([])+ setDialogOpen(false)+ }}+ onSelectedIdsChange={onPickChange}+ open={dialogOpen}+ pending={busy}+ searchLabel="Search members"+ searchPlaceholder="Search members..."+ selectedIds={pickValue}+ title={definition.grantLabel}+ />+ </>+ ) : (+ <div className="cu-workflow-access__picker cu-workflow-access__picker--inline">+ <SelectionDropdown+ id={`workflow-${definition.key}-picker`}+ inline+ value={pickValue}+ onChange={onPickChange}+ options={userOptions.map(option => ({+ value: option.id,+ label: option.label,+ description: option.description,+ }))}+ placeholder={options.length === 0 ? 'All users already granted' : 'Pick users'}+ searchPlaceholder="Search users..."+ selectionLabel="Selected users"+ emptyLabel="All users already granted."+ disabled={busy || options.length === 0}+ />+ <button+ className="cu-btn cu-btn--primary cu-btn--sm"+ type="button"+ disabled={pickValue.length === 0 || busy}+ onClick={() => void onGrant()}+ >+ {actionLabel}+ </button>+ </div>+ )}</SectionShell>)}@@ -748,6 +810,7 @@ function AccessTeamSection({onGrant,onRevoke,emptyText,+ useDialog,}: {definition: AccessSectionDefinitionrows: AccessTeamRow[]@@ -760,15 +823,24 @@ function AccessTeamSection({inlineError?: string | nullpickValue: string[]onPickChange: (next: string[]) => void- onGrant: () => void+ onGrant: () => Promise<boolean>onRevoke: (id: string) => voidemptyText: string+ useDialog: boolean}) {const busy = state.mutatingconst teamOptions = options.map(team => ({- value: team.id,+ id: team.id,label: teamLabel(team),+ searchText: teamLabel(team),}))+ const [dialogOpen, setDialogOpen] = useState(false)+ const actionLabel =+ pickValue.length > 1+ ? definition.key === 'approval-target-teams'+ ? 'Allow teams'+ : 'Add teams'+ : definition.grantLabelreturn (<SectionShelldefinition={definition}@@ -807,32 +879,64 @@ function AccessTeamSection({))}</RecordList>)}- <div className="cu-workflow-access__picker cu-workflow-access__picker--inline">- <SelectionDropdown- id={`workflow-${definition.key}-picker`}- inline- value={pickValue}- onChange={onPickChange}- options={teamOptions}- placeholder={options.length === 0 ? 'All teams already selected' : 'Pick teams'}- searchPlaceholder="Search teams..."- selectionLabel="Selected teams"- emptyLabel="All teams already selected."- disabled={busy || options.length === 0}- />- <button- className="cu-btn cu-btn--primary cu-btn--sm"- type="button"- disabled={pickValue.length === 0 || busy}- onClick={onGrant}- >- {pickValue.length > 1- ? definition.key === 'approval-target-teams'- ? 'Allow teams'- : 'Add teams'- : definition.grantLabel}- </button>- </div>+ {useDialog ? (+ <>+ <button+ className="cu-btn cu-btn--primary cu-btn--sm"+ disabled={busy || !loaded || options.length === 0}+ onClick={() => setDialogOpen(true)}+ type="button"+ >+ {definition.grantLabel}+ </button>+ <MultiSelectActionDialog+ actionLabel={actionLabel}+ emptyMessage="All teams already selected."+ error={state.mutateError || inlineError || undefined}+ items={teamOptions}+ loading={!loaded}+ noMatchesMessage="No matching teams."+ onAction={async () => {+ if (await onGrant()) setDialogOpen(false)+ }}+ onDismiss={() => {+ if (busy) return+ onPickChange([])+ setDialogOpen(false)+ }}+ onSelectedIdsChange={onPickChange}+ open={dialogOpen}+ pending={busy}+ searchLabel="Search teams"+ searchPlaceholder="Search teams..."+ selectedIds={pickValue}+ title={definition.grantLabel}+ />+ </>+ ) : (+ <div className="cu-workflow-access__picker cu-workflow-access__picker--inline">+ <SelectionDropdown+ id={`workflow-${definition.key}-picker`}+ inline+ value={pickValue}+ onChange={onPickChange}+ options={teamOptions.map(option => ({ value: option.id, label: option.label }))}+ placeholder={options.length === 0 ? 'All teams already selected' : 'Pick teams'}+ searchPlaceholder="Search teams..."+ selectionLabel="Selected teams"+ emptyLabel="All teams already selected."+ disabled={busy || options.length === 0}+ />+ <button+ className="cu-btn cu-btn--primary cu-btn--sm"+ type="button"+ disabled={pickValue.length === 0 || busy}+ onClick={() => void onGrant()}+ >+ {actionLabel}+ </button>+ </div>+ )}</SectionShell>)}diff --git a/control-ui/components/__tests__/McpServerTable.test.tsx b/control-ui/components/__tests__/McpServerTable.test.tsxindex 2ae0631ab..3b74b594a 100644--- a/control-ui/components/__tests__/McpServerTable.test.tsx+++ b/control-ui/components/__tests__/McpServerTable.test.tsx@@ -471,11 +471,11 @@ describe('McpServerTable — agent membership', () => {const dialog = screen.getByRole('dialog', { name: 'Give agents access to this connector' })expect(dialog).toBeInTheDocument()expect(dialog).toHaveAttribute('aria-modal', 'true')- expect(dialog.parentElement).toHaveClass('cu-modal-backdrop')- expect(screen.getByLabelText('Agents')).toBeInTheDocument()+ expect(dialog.parentElement).toHaveClass('eft-dialog-backdrop')+ expect(screen.getByRole('searchbox', { name: 'Search agents' })).toBeInTheDocument()expect(screen.queryByText('No other agents available.')).not.toBeInTheDocument()- fireEvent.click(screen.getByRole('option', { name: 'Sales' }))+ fireEvent.click(screen.getByRole('checkbox', { name: /Sales/ }))fireEvent.click(screen.getByRole('button', { name: 'Add to agent' }))await waitFor(() =>diff --git a/control-ui/components/__tests__/ProfileAdminAgentCompatibility.test.tsx b/control-ui/components/__tests__/ProfileAdminAgentCompatibility.test.tsxindex 2a3d00db1..f96646b4f 100644--- a/control-ui/components/__tests__/ProfileAdminAgentCompatibility.test.tsx+++ b/control-ui/components/__tests__/ProfileAdminAgentCompatibility.test.tsx@@ -175,6 +175,62 @@ describe('profile-admin agent compatibility access', () => {expect(screen.getByText('Team renamed.')).toBeInTheDocument()})+ it('grants member agent access through the shared relationship dialog', async () => {+ vi.mocked(api.getAdminUserContexts).mockResolvedValue({ userId: 'user-1', contextIds: [] })+ vi.mocked(api.getAdminUserAgents).mockResolvedValue({+ userId: 'user-1',+ agentNames: [],+ deletedAgentNames: [],+ deletedHistoryLimit: 10,+ })+ vi.mocked(api.updateAdminUserAgents).mockResolvedValue({+ userId: 'user-1',+ agentNames: ['agent-alpha'],+ deletedAgentNames: [],+ deletedHistoryLimit: 10,+ })+ vi.mocked(api.updateAdminUserContexts).mockResolvedValue({+ userId: 'user-1',+ contextIds: ['ctx-alpha'],+ })+ renderUserDetails()++ await screen.findByRole('button', { name: 'Grant agent' })+ fireEvent.click(screen.getByRole('button', { name: 'Grant agent' }))+ const dialog = screen.getByRole('dialog', { name: 'Grant agent access' })+ fireEvent.click(within(dialog).getByRole('checkbox', { name: /agent-alpha/ }))+ fireEvent.click(within(dialog).getByRole('button', { name: 'Grant agent' }))++ await waitFor(() =>+ expect(api.updateAdminUserAgents).toHaveBeenCalledWith('user-1', ['agent-alpha'], [])+ )+ expect(api.updateAdminUserContexts).toHaveBeenCalledWith('user-1', ['ctx-alpha'])+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())+ })++ it('keeps the team agent chooser open with its selection when persistence fails', async () => {+ vi.mocked(api.getAdminTeamContexts).mockResolvedValue({ teamId: 'team-1', contextIds: [] })+ vi.mocked(api.getAdminTeamAgents).mockResolvedValue({+ teamId: 'team-1',+ agentNames: [],+ deletedAgentNames: [],+ deletedHistoryLimit: 10,+ })+ vi.mocked(api.updateAdminTeamAgents).mockRejectedValue(new Error('Agent grant failed'))+ renderTeamDetails()++ await screen.findByRole('button', { name: 'Add agent' })+ fireEvent.click(screen.getByRole('button', { name: 'Add agent' }))+ const dialog = screen.getByRole('dialog', { name: 'Add agent access' })+ const checkbox = within(dialog).getByRole('checkbox', { name: /agent-alpha/ })+ fireEvent.click(checkbox)+ fireEvent.click(within(dialog).getByRole('button', { name: 'Add agent' }))++ expect(await within(dialog).findByRole('alert')).toHaveTextContent('Agent grant failed')+ expect(checkbox).toBeChecked()+ expect(screen.getByRole('dialog', { name: 'Add agent access' })).toBeInTheDocument()+ })+it('renders team agent loading skeleton rows as listitems', () => {vi.mocked(api.getAdminTeamAgents).mockReturnValue(new Promise(() => {}))diff --git a/control-ui/components/__tests__/WorkflowAccessPanel.test.tsx b/control-ui/components/__tests__/WorkflowAccessPanel.test.tsxindex 5a5c2b08b..6633e9100 100644--- a/control-ui/components/__tests__/WorkflowAccessPanel.test.tsx+++ b/control-ui/components/__tests__/WorkflowAccessPanel.test.tsx@@ -129,18 +129,21 @@ describe('WorkflowAccessPanel', () => {fireEvent.click(screen.getByRole('tab', { name: /Teams/ }))const teamSection = screen.getByTestId('workflow-access-trigger-teams')await waitFor(() => expect(within(teamSection).getByText('Trigger Team')).toBeInTheDocument())- await waitFor(() =>- expect(within(teamSection).getAllByText('Next Team').length).toBeGreaterThan(0)- )+ fireEvent.click(within(teamSection).getByRole('button', { name: 'Add team' }))+ const teamDialog = screen.getByRole('dialog', { name: 'Add team' })+ expect(within(teamDialog).getByRole('checkbox', { name: 'Next Team' })).toBeInTheDocument()expect(within(teamSection).queryByText('team-trigger')).not.toBeInTheDocument()- expect(within(teamSection).queryByText('team-next')).not.toBeInTheDocument()+ expect(within(teamDialog).queryByText('team-next')).not.toBeInTheDocument()+ fireEvent.click(within(teamDialog).getByRole('button', { name: 'Cancel' }))fireEvent.click(screen.getByRole('tab', { name: /Approval target teams/ }))const approvalSection = screen.getByTestId('workflow-access-approval-target-teams')await waitFor(() => expect(within(approvalSection).getByText('Next Team')).toBeInTheDocument())- await waitFor(() =>- expect(within(approvalSection).getAllByText('Trigger Team').length).toBeGreaterThan(0)- )+ fireEvent.click(within(approvalSection).getByRole('button', { name: 'Allow team' }))+ const approvalDialog = screen.getByRole('dialog', { name: 'Allow team' })+ expect(+ within(approvalDialog).getByRole('checkbox', { name: 'Trigger Team' })+ ).toBeInTheDocument()expect(within(approvalSection).queryByText('team-trigger')).not.toBeInTheDocument()expect(within(approvalSection).queryByText('team-next')).not.toBeInTheDocument()})@@ -264,20 +267,6 @@ describe('WorkflowAccessPanel', () => {})).toBeDisabled()- fireEvent.click(screen.getByRole('tab', { name: /Members/ }))- fireEvent.click(- within(screen.getByTestId('workflow-access-trigger-users')).getByRole('option', {- name: /Bob/,- })- )- fireEvent.click(screen.getByRole('button', { name: /^Add member$/ }))- fireEvent.click(screen.getByRole('tab', { name: /Teams/ }))- fireEvent.click(- within(screen.getByTestId('workflow-access-trigger-teams')).getByRole('option', {- name: 'Next Team',- })- )- fireEvent.click(screen.getByRole('button', { name: /^Add team$/ }))expect(setWorkflowGrants).not.toHaveBeenCalled()expect(setWorkflowTeamGrants).not.toHaveBeenCalled()@@ -295,22 +284,11 @@ describe('WorkflowAccessPanel', () => {).toBeInTheDocument())fireEvent.click(screen.getByRole('tab', { name: /Members/ }))- const loadedUserPick = within(- screen.getByTestId('workflow-access-trigger-users')- ).getByLabelText('Search users...')- expect(loadedUserPick).not.toBeDisabled()- fireEvent.click(screen.getByRole('tab', { name: /Teams/ }))- const loadedTeamSection = screen.getByTestId('workflow-access-trigger-teams')- const loadedTeamPick = within(loadedTeamSection).getByLabelText('Search teams...')- expect(loadedTeamPick).not.toBeDisabled()-- fireEvent.click(screen.getByRole('tab', { name: /Members/ }))- fireEvent.click(- within(screen.getByTestId('workflow-access-trigger-users')).getByRole('option', {- name: /Bob/,- })- )fireEvent.click(screen.getByRole('button', { name: /^Add member$/ }))+ const loadedUserPick = screen.getByRole('searchbox', { name: 'Search members' })+ expect(loadedUserPick).not.toBeDisabled()+ fireEvent.click(screen.getByRole('checkbox', { name: /Bob/ }))+ fireEvent.click(within(screen.getByRole('dialog')).getByRole('button', { name: 'Add member' }))await waitFor(() =>expect(setWorkflowGrants).toHaveBeenCalledWith('sandbox-recipes', 'installed-recipe', ['u-1',@@ -319,12 +297,11 @@ describe('WorkflowAccessPanel', () => {)fireEvent.click(screen.getByRole('tab', { name: /Teams/ }))- fireEvent.click(- within(screen.getByTestId('workflow-access-trigger-teams')).getByRole('option', {- name: 'Next Team',- })- )- fireEvent.click(screen.getByRole('button', { name: /^Add team$/ }))+ const loadedTeamSection = screen.getByTestId('workflow-access-trigger-teams')+ fireEvent.click(within(loadedTeamSection).getByRole('button', { name: 'Add team' }))+ expect(screen.getByRole('searchbox', { name: 'Search teams' })).not.toBeDisabled()+ fireEvent.click(screen.getByRole('checkbox', { name: 'Next Team' }))+ fireEvent.click(within(screen.getByRole('dialog')).getByRole('button', { name: 'Add team' }))await waitFor(() =>expect(setWorkflowTeamGrants).toHaveBeenCalledWith('sandbox-recipes', 'installed-recipe', ['team-trigger',@@ -350,10 +327,12 @@ describe('WorkflowAccessPanel', () => {const section = screen.getByTestId('workflow-access-approval-target-teams')await waitFor(() => expect(within(section).getByText('Trigger Team')).toBeInTheDocument())- fireEvent.click(within(section).getByRole('option', { name: 'Next Team' }))- fireEvent.click(within(section).getByRole('option', { name: 'Final Team' }))- fireEvent.click(within(section).getByRole('option', { name: 'Last Team' }))- fireEvent.click(within(section).getByRole('button', { name: 'Allow teams' }))+ fireEvent.click(within(section).getByRole('button', { name: 'Allow team' }))+ const dialog = screen.getByRole('dialog', { name: 'Allow team' })+ fireEvent.click(within(dialog).getByRole('checkbox', { name: 'Next Team' }))+ fireEvent.click(within(dialog).getByRole('checkbox', { name: 'Final Team' }))+ fireEvent.click(within(dialog).getByRole('checkbox', { name: 'Last Team' }))+ fireEvent.click(within(dialog).getByRole('button', { name: 'Allow teams' }))await waitFor(() => expect(allowWorkflowApprovalTeam).toHaveBeenCalledTimes(1))expect(allowWorkflowApprovalTeam).toHaveBeenCalledWith(@@ -398,10 +377,12 @@ describe('WorkflowAccessPanel', () => {fireEvent.click(screen.getByRole('tab', { name: /Approval target teams/ }))const section = screen.getByTestId('workflow-access-approval-target-teams')await waitFor(() =>- expect(within(section).getByRole('option', { name: 'Next Team' })).toBeInTheDocument()+ expect(within(section).getByRole('button', { name: 'Allow team' })).toBeEnabled())- fireEvent.click(within(section).getByRole('option', { name: 'Next Team' }))fireEvent.click(within(section).getByRole('button', { name: 'Allow team' }))+ const dialog = screen.getByRole('dialog', { name: 'Allow team' })+ fireEvent.click(within(dialog).getByRole('checkbox', { name: 'Next Team' }))+ fireEvent.click(within(dialog).getByRole('button', { name: 'Allow team' }))await waitFor(() => expect(allowWorkflowApprovalTeam).toHaveBeenCalledOnce())expect(revokeWorkflowApprovalTeam).not.toHaveBeenCalled()diff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex 14a0957d2..236d8afbb 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.623",+ "version": "0.1.624","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.623",+ "version": "0.1.624","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 831456358..a522b28c6 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.623",+ "version": "0.1.624","private": true,"scripts": {"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",