Skip to content

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

TypeScript

feat(control-ui): unify member and team add dialogs

Josuéf2f186cc74cc
diff --git a/control-ui/app/profile-admin/teams/[teamId]/page.tsx b/control-ui/app/profile-admin/teams/[teamId]/page.tsx
index 87565b038..26b8e3ef1 100644
--- a/control-ui/app/profile-admin/teams/[teamId]/page.tsx
+++ b/control-ui/app/profile-admin/teams/[teamId]/page.tsx
@@ -419,6 +419,16 @@ export default function TeamDetailsPage() {
}
}
+ function dismissAddMemberDialog() {
+ setShowAddMember(false)
+ if (addMemberMode === 'invite') {
+ setInviteName('')
+ setInviteEmail('')
+ setInviteRole('member')
+ setAddMemberError('')
+ }
+ }
+
async function resendPendingInvitation(inv: AdminTeamPendingInvitation) {
if (isNew) return
setResendingInvitationId(inv.id)
@@ -592,8 +602,7 @@ export default function TeamDetailsPage() {
.map(user => ({
value: user.id,
label: user.displayName || user.name || user.email || user.id,
- description: user.email || user.id,
- badge: user.activeTeamCount === 1 ? '1 team' : `${user.activeTeamCount} teams`,
+ badge: user.email || user.id,
})),
[existingMemberIds, users]
)
@@ -1100,160 +1109,112 @@ export default function TeamDetailsPage() {
</div>
) : null}
- {showAddMember && (
- <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 && !addingMember) setShowAddMember(false)
- }}
- >
- <div
- className="cu-modal-panel cu-modal-panel--selection"
- role="dialog"
- aria-labelledby="add-member-title"
- onClick={e => e.stopPropagation()}
- >
- <div className="cu-modal-panel__head">
- <strong id="add-member-title" style={{ fontSize: '1rem', lineHeight: 1.35 }}>
- Add member
- </strong>
- <button
- type="button"
- className="cu-btn cu-btn--icon cu-btn--ghost"
- onClick={() => setShowAddMember(false)}
+ <DialogShell
+ busy={addingMember}
+ error={addMemberError || undefined}
+ footer={
+ <>
+ <button
+ className="eft-dialog__button eft-dialog__button--secondary"
+ disabled={addingMember}
+ onClick={dismissAddMemberDialog}
+ type="button"
+ >
+ Cancel
+ </button>
+ <button
+ className="eft-dialog__button eft-dialog__button--primary"
+ disabled={
+ addingMember ||
+ (addMemberMode === 'existing'
+ ? selectedUserIdsToAdd.length === 0
+ : !inviteName.trim() || !inviteEmail.trim())
+ }
+ onClick={() => void (addMemberMode === 'existing' ? addMember() : inviteMember())}
+ type="button"
+ >
+ {addingMember
+ ? addMemberMode === 'existing'
+ ? 'Adding…'
+ : 'Sending…'
+ : addMemberMode === 'existing'
+ ? selectedUserIdsToAdd.length > 1
+ ? 'Add members'
+ : 'Add member'
+ : 'Send invite'}
+ </button>
+ </>
+ }
+ onDismiss={dismissAddMemberDialog}
+ open={showAddMember}
+ size="large"
+ title="Add member"
+ >
+ <TabBar<'existing' | 'invite'>
+ ariaLabel="Member creation mode"
+ activeValue={addMemberMode}
+ className="cu-tabs--flush"
+ onChange={setAddMemberMode}
+ options={[
+ { value: 'existing', label: 'Existing member', disabled: addingMember },
+ { value: 'invite', label: 'Invite by email', disabled: addingMember },
+ ]}
+ />
+
+ {addMemberMode === 'existing' ? (
+ <>
+ <div className="cu-field">
+ <label htmlFor="team-member-picker">Members</label>
+ <SelectionDropdown
+ id="team-member-picker"
+ inline
+ value={selectedUserIdsToAdd}
+ onChange={setSelectedUserIdsToAdd}
+ options={availableMemberOptions}
+ placeholder="Select members"
+ searchPlaceholder="Search members..."
+ selectionLabel="Selected members"
+ emptyLabel="No available members."
+ disabled={addingMember}
+ />
+ </div>
+ <div className="cu-field">
+ <label htmlFor="team-member-role">Role</label>
+ <select
+ id="team-member-role"
+ value={selectedRoleToAdd}
+ onChange={e => setSelectedRoleToAdd(e.target.value as Role)}
disabled={addingMember}
- aria-label="Close"
>
- <IconX width={18} height={18} />
- </button>
+ <option value="member">Participant</option>
+ <option value="inviter">Inviter</option>
+ <option value="admin">Leader</option>
+ </select>
</div>
-
- <TabBar<'existing' | 'invite'>
- ariaLabel="Member creation mode"
- activeValue={addMemberMode}
- className="cu-tabs--flush"
- onChange={setAddMemberMode}
- options={[
- {
- value: 'existing',
- label: 'Existing member',
- disabled: addingMember,
- },
- {
- value: 'invite',
- label: 'Invite by email',
- disabled: addingMember,
- },
- ]}
- />
-
- {addMemberMode === 'existing' ? (
- <>
- <div className="cu-field" style={{ marginBottom: 0 }}>
- <label htmlFor="team-member-picker">Members</label>
- <SelectionDropdown
- id="team-member-picker"
- inline
- value={selectedUserIdsToAdd}
- onChange={setSelectedUserIdsToAdd}
- options={availableMemberOptions}
- placeholder="Select members"
- searchPlaceholder="Search members..."
- selectionLabel="Selected members"
- emptyLabel="No available members."
- disabled={addingMember}
- />
- </div>
- <div className="cu-field" style={{ marginBottom: 0 }}>
- <label>Role</label>
- <select
- value={selectedRoleToAdd}
- onChange={e => setSelectedRoleToAdd(e.target.value as Role)}
- disabled={addingMember}
- >
- <option value="member">Participant</option>
- <option value="inviter">Inviter</option>
- <option value="admin">Leader</option>
- </select>
- </div>
- </>
- ) : (
- <InviteMemberDialog
- isOpen
- embedded
- busy={addingMember}
- error={addMemberError}
- name={inviteName}
- email={inviteEmail}
- role={inviteRole}
- teamId={teamId}
- teams={[{ id: teamId, name: teamName || teamId }]}
- lockedTeamId={teamId}
- title="Invite member by email"
- submitLabel="Send invite"
- onClose={() => {
- setShowAddMember(false)
- setInviteName('')
- setInviteEmail('')
- setInviteRole('member')
- setAddMemberError('')
- }}
- onNameChange={setInviteName}
- onEmailChange={setInviteEmail}
- onRoleChange={setInviteRole}
- onTeamChange={() => undefined}
- onSubmit={() => void inviteMember()}
- />
- )}
-
- {addMemberMode === 'existing' && addMemberError ? (
- <div className="cu-banner cu-banner--error">{addMemberError}</div>
- ) : null}
-
- {addMemberMode === 'existing' ? (
- <div className="cu-modal-panel__foot">
- <button
- type="button"
- className="cu-btn cu-btn--ghost cu-btn--sm"
- onClick={() => setShowAddMember(false)}
- disabled={addingMember}
- >
- Cancel
- </button>
- <button
- type="button"
- className="cu-btn cu-btn--primary"
- onClick={() => void (addMemberMode === 'existing' ? addMember() : inviteMember())}
- disabled={
- addingMember ||
- (addMemberMode === 'existing'
- ? selectedUserIdsToAdd.length === 0
- : !inviteName.trim() || !inviteEmail.trim())
- }
- >
- {addingMember
- ? 'Adding…'
- : addMemberMode === 'existing'
- ? selectedUserIdsToAdd.length > 1
- ? 'Add members'
- : 'Add member'
- : 'Send invite'}
- </button>
- </div>
- ) : null}
- </div>
- </div>
- )}
+ </>
+ ) : (
+ <InviteMemberDialog
+ isOpen
+ embedded
+ showFooter={false}
+ busy={addingMember}
+ name={inviteName}
+ email={inviteEmail}
+ role={inviteRole}
+ teamId={teamId}
+ teams={[{ id: teamId, name: teamName || teamId }]}
+ lockedTeamId={teamId}
+ title="Invite member by email"
+ submitLabel="Send invite"
+ onClose={dismissAddMemberDialog}
+ onNameChange={setInviteName}
+ onEmailChange={setInviteEmail}
+ onRoleChange={setInviteRole}
+ onTeamChange={() => undefined}
+ onSubmit={() => void inviteMember()}
+ />
+ )}
+ </DialogShell>
<DialogShell
busy={busy}
diff --git a/control-ui/app/profile-admin/users/[userId]/page.tsx b/control-ui/app/profile-admin/users/[userId]/page.tsx
index 491fac34d..152f500b4 100644
--- a/control-ui/app/profile-admin/users/[userId]/page.tsx
+++ b/control-ui/app/profile-admin/users/[userId]/page.tsx
@@ -102,6 +102,7 @@ export default function UserDetailsPage() {
const [showAddAgent, setShowAddAgent] = useState(false)
const [agentAccessDialogError, setAgentAccessDialogError] = useState('')
const [showAddTeam, setShowAddTeam] = useState(false)
+ const [addTeamDialogError, setAddTeamDialogError] = useState('')
const [showDeleteUserConfirm, setShowDeleteUserConfirm] = useState(false)
const [deletingUserAccount, setDeletingUserAccount] = useState(false)
@@ -415,10 +416,10 @@ export default function UserDetailsPage() {
}
}
- async function addUserToTeams() {
- if (selectedTeamIdsToAdd.length === 0) return
+ async function addUserToTeams(): Promise<boolean> {
+ if (selectedTeamIdsToAdd.length === 0) return false
setBusy(true)
- setError('')
+ setAddTeamDialogError('')
try {
await Promise.all(
selectedTeamIdsToAdd.map(teamId => addAdminTeamMember(teamId, userId, selectedRoleToAdd))
@@ -433,8 +434,10 @@ export default function UserDetailsPage() {
showToast(addedCount === 1 ? 'Member associated to team.' : 'Member associated to teams.', {
tone: 'success',
})
+ return true
} catch (e) {
- setError(e instanceof Error ? e.message : 'Failed to add member to team')
+ setAddTeamDialogError(e instanceof Error ? e.message : 'Failed to add member to team')
+ return false
} finally {
setBusy(false)
}
@@ -656,7 +659,10 @@ export default function UserDetailsPage() {
<button
type="button"
className="cu-btn cu-btn--primary cu-btn--sm"
- onClick={() => setShowAddTeam(true)}
+ onClick={() => {
+ setAddTeamDialogError('')
+ setShowAddTeam(true)
+ }}
disabled={busy}
>
Add to team
@@ -1204,97 +1210,66 @@ export default function UserDetailsPage() {
</div>
) : null}
- {showAddTeam && (
- <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) setShowAddTeam(false)
- }}
- >
- <div
- className="cu-modal-panel cu-modal-panel--selection"
- role="dialog"
- aria-labelledby="add-team-title"
- onClick={e => e.stopPropagation()}
- >
- <div className="cu-modal-panel__head">
- <strong id="add-team-title" style={{ fontSize: '1rem', lineHeight: 1.35 }}>
- Add to team
- </strong>
- <button
- type="button"
- className="cu-btn cu-btn--icon cu-btn--ghost"
- onClick={() => setShowAddTeam(false)}
- disabled={busy}
- aria-label="Close"
- >
- <IconX width={18} height={18} />
- </button>
- </div>
-
- <div className="cu-field">
- <label htmlFor="member-team-picker">Teams</label>
- <SelectionDropdown
- id="member-team-picker"
- inline
- value={selectedTeamIdsToAdd}
- onChange={setSelectedTeamIdsToAdd}
- options={availableTeamOptions}
- placeholder="Select teams"
- searchPlaceholder="Search teams..."
- selectionLabel="Selected teams"
- emptyLabel="No available teams."
- disabled={busy}
- />
- </div>
-
- <div className="cu-field">
- <label>Role</label>
- <select
- value={selectedRoleToAdd}
- onChange={e => setSelectedRoleToAdd(e.target.value as TeamRole)}
- disabled={busy}
- >
- <option value="member">{formatTeamRole('member')}</option>
- <option value="inviter">{formatTeamRole('inviter')}</option>
- <option value="admin">{formatTeamRole('admin')}</option>
- </select>
- </div>
+ <DialogShell
+ busy={busy}
+ error={addTeamDialogError || undefined}
+ footer={
+ <>
+ <button
+ className="eft-dialog__button eft-dialog__button--secondary"
+ disabled={busy}
+ onClick={() => setShowAddTeam(false)}
+ type="button"
+ >
+ Cancel
+ </button>
+ <button
+ className="eft-dialog__button eft-dialog__button--primary"
+ disabled={busy || selectedTeamIdsToAdd.length === 0}
+ onClick={async () => {
+ if (await addUserToTeams()) setShowAddTeam(false)
+ }}
+ type="button"
+ >
+ {busy ? 'Adding…' : selectedTeamIdsToAdd.length > 1 ? 'Add to teams' : 'Add to team'}
+ </button>
+ </>
+ }
+ onDismiss={() => setShowAddTeam(false)}
+ open={showAddTeam}
+ size="large"
+ title="Add to team"
+ >
+ <div className="cu-field">
+ <label htmlFor="member-team-picker">Teams</label>
+ <SelectionDropdown
+ id="member-team-picker"
+ inline
+ value={selectedTeamIdsToAdd}
+ onChange={setSelectedTeamIdsToAdd}
+ options={availableTeamOptions}
+ placeholder="Select teams"
+ searchPlaceholder="Search teams..."
+ selectionLabel="Selected teams"
+ emptyLabel="No available teams."
+ disabled={busy}
+ />
+ </div>
- <div className="cu-modal-panel__foot">
- <button
- type="button"
- className="cu-btn cu-btn--ghost cu-btn--sm"
- onClick={() => setShowAddTeam(false)}
- disabled={busy}
- >
- Cancel
- </button>
- <button
- type="button"
- className="cu-btn cu-btn--primary"
- onClick={() => {
- void addUserToTeams()
- setShowAddTeam(false)
- }}
- disabled={busy || selectedTeamIdsToAdd.length === 0}
- >
- {selectedTeamIdsToAdd.length > 1 ? 'Add to teams' : 'Add to team'}
- </button>
- </div>
- </div>
+ <div className="cu-field">
+ <label htmlFor="member-team-role">Role</label>
+ <select
+ id="member-team-role"
+ value={selectedRoleToAdd}
+ onChange={e => setSelectedRoleToAdd(e.target.value as TeamRole)}
+ disabled={busy}
+ >
+ <option value="member">{formatTeamRole('member')}</option>
+ <option value="inviter">{formatTeamRole('inviter')}</option>
+ <option value="admin">{formatTeamRole('admin')}</option>
+ </select>
</div>
- )}
+ </DialogShell>
<DialogShell
busy={busy}
diff --git a/control-ui/components/InviteMemberDialog/index.tsx b/control-ui/components/InviteMemberDialog/index.tsx
index 9bfc1c1af..c153a8be0 100644
--- a/control-ui/components/InviteMemberDialog/index.tsx
+++ b/control-ui/components/InviteMemberDialog/index.tsx
@@ -8,6 +8,7 @@ import type { InviteMemberDialogProps } from './types'
export function InviteMemberDialog({
isOpen,
embedded = false,
+ showFooter = true,
busy,
name,
email,
@@ -118,19 +119,21 @@ export function InviteMemberDialog({
{error ? <div className="cu-banner cu-banner--error">{error}</div> : null}
- <div className="cu-modal-panel__foot">
- <Button type="button" variant="ghost" size="sm" onClick={onClose} disabled={busy}>
- Cancel
- </Button>
- <Button
- type="button"
- variant="primary"
- onClick={onSubmit}
- disabled={busy || !name.trim() || !email.trim()}
- >
- {busy ? 'Sending…' : submitLabel}
- </Button>
- </div>
+ {showFooter ? (
+ <div className="cu-modal-panel__foot">
+ <Button type="button" variant="ghost" size="sm" onClick={onClose} disabled={busy}>
+ Cancel
+ </Button>
+ <Button
+ type="button"
+ variant="primary"
+ onClick={onSubmit}
+ disabled={busy || !name.trim() || !email.trim()}
+ >
+ {busy ? 'Sending…' : submitLabel}
+ </Button>
+ </div>
+ ) : null}
</>
)
diff --git a/control-ui/components/InviteMemberDialog/types.ts b/control-ui/components/InviteMemberDialog/types.ts
index 99890a820..b78e9a7e9 100644
--- a/control-ui/components/InviteMemberDialog/types.ts
+++ b/control-ui/components/InviteMemberDialog/types.ts
@@ -10,6 +10,7 @@ export type InviteTeamOption = {
export type InviteMemberDialogProps = {
isOpen: boolean
embedded?: boolean
+ showFooter?: boolean
busy: boolean
error?: string
name: string
diff --git a/control-ui/components/WorkflowAccessPanel/index.tsx b/control-ui/components/WorkflowAccessPanel/index.tsx
index a2be848b9..f169cfe49 100644
--- a/control-ui/components/WorkflowAccessPanel/index.tsx
+++ b/control-ui/components/WorkflowAccessPanel/index.tsx
@@ -1,12 +1,7 @@
'use client'
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import {
- MultiSelectActionDialog,
- RecordList,
- RecordListRow,
- RowActionMenu,
-} from '@clerum/frontend-components'
+import { DialogShell, RecordList, RecordListRow, RowActionMenu } from '@clerum/frontend-components'
import { useConfirmDialog } from '@components/ConfirmDialog'
import { SelectionDropdown } from '@components/SelectionDropdown'
import { TabBar } from '@components/TabBar'
@@ -683,10 +678,9 @@ function AccessUserSection({
}) {
const busy = state.mutating
const userOptions = options.map(user => ({
- id: user.id,
+ value: user.id,
label: userLabel(user),
- description: user.email,
- searchText: `${userLabel(user)} ${user.email}`,
+ badge: user.email,
}))
const [dialogOpen, setDialogOpen] = useState(false)
const actionLabel = pickValue.length > 1 ? 'Add members' : definition.grantLabel
@@ -741,29 +735,60 @@ function AccessUserSection({
>
{definition.grantLabel}
</button>
- <MultiSelectActionDialog
- actionLabel={actionLabel}
- emptyMessage="All users already granted."
+ <DialogShell
+ busy={busy}
error={state.mutateError || inlineError || undefined}
- items={userOptions}
- loading={!loaded}
- noMatchesMessage="No matching members."
- onAction={async () => {
- if (await onGrant()) setDialogOpen(false)
- }}
+ footer={
+ <>
+ <button
+ className="eft-dialog__button eft-dialog__button--secondary"
+ disabled={busy}
+ onClick={() => {
+ onPickChange([])
+ setDialogOpen(false)
+ }}
+ type="button"
+ >
+ Cancel
+ </button>
+ <button
+ className="eft-dialog__button eft-dialog__button--primary"
+ disabled={!loaded || busy || pickValue.length === 0}
+ onClick={async () => {
+ if (await onGrant()) setDialogOpen(false)
+ }}
+ type="button"
+ >
+ {busy ? 'Working…' : actionLabel}
+ </button>
+ </>
+ }
onDismiss={() => {
if (busy) return
onPickChange([])
setDialogOpen(false)
}}
- onSelectedIdsChange={onPickChange}
open={dialogOpen}
- pending={busy}
- searchLabel="Search members"
- searchPlaceholder="Search members..."
- selectedIds={pickValue}
+ size="large"
+ status={!loaded ? 'Loading members…' : undefined}
title={definition.grantLabel}
- />
+ >
+ <div className="cu-field">
+ <label htmlFor={`workflow-${definition.key}-picker`}>Members</label>
+ <SelectionDropdown
+ id={`workflow-${definition.key}-picker`}
+ inline
+ value={pickValue}
+ onChange={onPickChange}
+ options={userOptions}
+ placeholder="Select members"
+ searchPlaceholder="Search members..."
+ selectionLabel="Selected members"
+ emptyLabel={loaded ? 'All users already granted.' : 'Loading members…'}
+ disabled={busy || !loaded || options.length === 0}
+ />
+ </div>
+ </DialogShell>
</>
) : (
<div className="cu-workflow-access__picker cu-workflow-access__picker--inline">
@@ -772,11 +797,7 @@ function AccessUserSection({
inline
value={pickValue}
onChange={onPickChange}
- options={userOptions.map(option => ({
- value: option.id,
- label: option.label,
- description: option.description,
- }))}
+ options={userOptions}
placeholder={options.length === 0 ? 'All users already granted' : 'Pick users'}
searchPlaceholder="Search users..."
selectionLabel="Selected users"
@@ -830,9 +851,8 @@ function AccessTeamSection({
}) {
const busy = state.mutating
const teamOptions = options.map(team => ({
- id: team.id,
+ value: team.id,
label: teamLabel(team),
- searchText: teamLabel(team),
}))
const [dialogOpen, setDialogOpen] = useState(false)
const actionLabel =
@@ -889,29 +909,60 @@ function AccessTeamSection({
>
{definition.grantLabel}
</button>
- <MultiSelectActionDialog
- actionLabel={actionLabel}
- emptyMessage="All teams already selected."
+ <DialogShell
+ busy={busy}
error={state.mutateError || inlineError || undefined}
- items={teamOptions}
- loading={!loaded}
- noMatchesMessage="No matching teams."
- onAction={async () => {
- if (await onGrant()) setDialogOpen(false)
- }}
+ footer={
+ <>
+ <button
+ className="eft-dialog__button eft-dialog__button--secondary"
+ disabled={busy}
+ onClick={() => {
+ onPickChange([])
+ setDialogOpen(false)
+ }}
+ type="button"
+ >
+ Cancel
+ </button>
+ <button
+ className="eft-dialog__button eft-dialog__button--primary"
+ disabled={!loaded || busy || pickValue.length === 0}
+ onClick={async () => {
+ if (await onGrant()) setDialogOpen(false)
+ }}
+ type="button"
+ >
+ {busy ? 'Working…' : actionLabel}
+ </button>
+ </>
+ }
onDismiss={() => {
if (busy) return
onPickChange([])
setDialogOpen(false)
}}
- onSelectedIdsChange={onPickChange}
open={dialogOpen}
- pending={busy}
- searchLabel="Search teams"
- searchPlaceholder="Search teams..."
- selectedIds={pickValue}
+ size="large"
+ status={!loaded ? 'Loading teams…' : undefined}
title={definition.grantLabel}
- />
+ >
+ <div className="cu-field">
+ <label htmlFor={`workflow-${definition.key}-picker`}>Teams</label>
+ <SelectionDropdown
+ id={`workflow-${definition.key}-picker`}
+ inline
+ value={pickValue}
+ onChange={onPickChange}
+ options={teamOptions}
+ placeholder="Select teams"
+ searchPlaceholder="Search teams..."
+ selectionLabel="Selected teams"
+ emptyLabel={loaded ? 'All teams already selected.' : 'Loading teams…'}
+ disabled={busy || !loaded || options.length === 0}
+ />
+ </div>
+ </DialogShell>
</>
) : (
<div className="cu-workflow-access__picker cu-workflow-access__picker--inline">
@@ -920,7 +971,7 @@ function AccessTeamSection({
inline
value={pickValue}
onChange={onPickChange}
- options={teamOptions.map(option => ({ value: option.id, label: option.label }))}
+ options={teamOptions}
placeholder={options.length === 0 ? 'All teams already selected' : 'Pick teams'}
searchPlaceholder="Search teams..."
selectionLabel="Selected teams"
diff --git a/control-ui/components/__tests__/ProfileAdminAgentCompatibility.test.tsx b/control-ui/components/__tests__/ProfileAdminAgentCompatibility.test.tsx
index ba5362305..401de056c 100644
--- a/control-ui/components/__tests__/ProfileAdminAgentCompatibility.test.tsx
+++ b/control-ui/components/__tests__/ProfileAdminAgentCompatibility.test.tsx
@@ -145,6 +145,61 @@ afterEach(() => {
})
describe('profile-admin agent compatibility access', () => {
+ it('adds existing team members with the shared searchable chip picker and dialog', 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.addAdminTeamMember).mockResolvedValue({} as never)
+ navigationState.params = { teamId: 'team-1', tab: 'members' }
+ render(<TeamDetailsPage />)
+
+ await screen.findByRole('button', { name: 'Add member' })
+ fireEvent.click(screen.getByRole('button', { name: 'Add member' }))
+ const dialog = screen.getByRole('dialog', { name: 'Add member' })
+ expect(dialog).toHaveClass('eft-dialog')
+ fireEvent.click(within(dialog).getByRole('tab', { name: 'Existing member' }))
+ fireEvent.click(within(dialog).getByRole('option', { name: 'Member One, [email protected]' }))
+ expect(dialog.querySelector('.cu-selection-dropdown__chips')).toHaveTextContent('Member One')
+ expect(within(dialog).getByLabelText('Role')).toBeInTheDocument()
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Add member' }))
+
+ await waitFor(() =>
+ expect(api.addAdminTeamMember).toHaveBeenCalledWith('team-1', 'user-1', 'member')
+ )
+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())
+ })
+
+ it('adds members to teams through the shared searchable chip picker and 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.addAdminTeamMember).mockResolvedValue({} as never)
+ navigationState.params = { userId: 'user-1', tab: 'teams' }
+ render(<UserDetailsPage />)
+
+ await screen.findByRole('button', { name: 'Add to team' })
+ fireEvent.click(screen.getByRole('button', { name: 'Add to team' }))
+ const dialog = screen.getByRole('dialog', { name: 'Add to team' })
+ expect(dialog).toHaveClass('eft-dialog')
+ fireEvent.click(within(dialog).getByRole('option', { name: 'Platform, 1 member' }))
+ expect(dialog.querySelector('.cu-selection-dropdown__chips')).toHaveTextContent('Platform')
+ expect(within(dialog).getByLabelText('Role')).toBeInTheDocument()
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Add to team' }))
+
+ await waitFor(() =>
+ expect(api.addAdminTeamMember).toHaveBeenCalledWith('team-1', 'user-1', 'member')
+ )
+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())
+ })
+
it('renames a team through the scalar edit dialog and retains failures', async () => {
vi.mocked(api.getAdminTeam)
.mockResolvedValueOnce({ id: 'team-1', name: 'Platform' })
@@ -205,7 +260,7 @@ describe('profile-admin agent compatibility access', () => {
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('option', { name: /agent-alpha/ }))
fireEvent.click(within(dialog).getByRole('button', { name: 'Grant agent' }))
await waitFor(() =>
@@ -229,12 +284,12 @@ describe('profile-admin agent compatibility access', () => {
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)
+ const option = within(dialog).getByRole('option', { name: /agent-alpha/ })
+ fireEvent.click(option)
fireEvent.click(within(dialog).getByRole('button', { name: 'Add agent' }))
expect(await within(dialog).findByRole('alert')).toHaveTextContent('Agent grant failed')
- expect(checkbox).toBeChecked()
+ expect(option).toHaveAttribute('aria-selected', 'true')
expect(screen.getByRole('dialog', { name: 'Add agent access' })).toBeInTheDocument()
})
diff --git a/control-ui/components/__tests__/RecipeEditor.test.tsx b/control-ui/components/__tests__/RecipeEditor.test.tsx
index 670cb17b5..0aa2a40cd 100644
--- a/control-ui/components/__tests__/RecipeEditor.test.tsx
+++ b/control-ui/components/__tests__/RecipeEditor.test.tsx
@@ -1687,8 +1687,10 @@ describe('RecipeEditor — grants in editor', () => {
await waitFor(() => expect(screen.getByText(/alice@example\.com/)).toBeInTheDocument())
fireEvent.click(screen.getByRole('button', { name: /^Add member$/ }))
const addMemberDialog = await screen.findByRole('dialog', { name: 'Add member' })
- expect(within(addMemberDialog).getByLabelText('Search members')).toBeInTheDocument()
- fireEvent.click(await within(addMemberDialog).findByRole('checkbox', { name: /Bob/ }))
+ expect(within(addMemberDialog).getByLabelText('Search members...')).toBeInTheDocument()
+ fireEvent.click(
+ await within(addMemberDialog).findByRole('option', { name: 'Bob, [email protected]' })
+ )
fireEvent.click(within(addMemberDialog).getByRole('button', { name: /^Add member$/ }))
await waitFor(() =>
diff --git a/control-ui/components/__tests__/WorkflowAccessPanel.test.tsx b/control-ui/components/__tests__/WorkflowAccessPanel.test.tsx
index 6633e9100..87270fd14 100644
--- a/control-ui/components/__tests__/WorkflowAccessPanel.test.tsx
+++ b/control-ui/components/__tests__/WorkflowAccessPanel.test.tsx
@@ -131,7 +131,7 @@ describe('WorkflowAccessPanel', () => {
await waitFor(() => expect(within(teamSection).getByText('Trigger Team')).toBeInTheDocument())
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(teamDialog).getByRole('option', { name: 'Next Team' })).toBeInTheDocument()
expect(within(teamSection).queryByText('team-trigger')).not.toBeInTheDocument()
expect(within(teamDialog).queryByText('team-next')).not.toBeInTheDocument()
fireEvent.click(within(teamDialog).getByRole('button', { name: 'Cancel' }))
@@ -141,9 +141,7 @@ describe('WorkflowAccessPanel', () => {
await waitFor(() => expect(within(approvalSection).getByText('Next Team')).toBeInTheDocument())
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(approvalDialog).getByRole('option', { name: 'Trigger Team' })).toBeInTheDocument()
expect(within(approvalSection).queryByText('team-trigger')).not.toBeInTheDocument()
expect(within(approvalSection).queryByText('team-next')).not.toBeInTheDocument()
})
@@ -285,10 +283,12 @@ describe('WorkflowAccessPanel', () => {
)
fireEvent.click(screen.getByRole('tab', { name: /Members/ }))
fireEvent.click(screen.getByRole('button', { name: /^Add member$/ }))
- const loadedUserPick = screen.getByRole('searchbox', { name: 'Search members' })
+ const loadedUserPick = screen.getByRole('textbox', { 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' }))
+ const userDialog = screen.getByRole('dialog', { name: 'Add member' })
+ fireEvent.click(within(userDialog).getByRole('option', { name: 'Bob, [email protected]' }))
+ expect(userDialog.querySelector('.cu-selection-dropdown__chips')).toHaveTextContent('Bob')
+ fireEvent.click(within(userDialog).getByRole('button', { name: 'Add member' }))
await waitFor(() =>
expect(setWorkflowGrants).toHaveBeenCalledWith('sandbox-recipes', 'installed-recipe', [
'u-1',
@@ -299,9 +299,15 @@ describe('WorkflowAccessPanel', () => {
fireEvent.click(screen.getByRole('tab', { name: /Teams/ }))
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' }))
+ const addTeamDialog = screen.getByRole('dialog', { name: 'Add team' })
+ expect(
+ within(addTeamDialog).getByRole('textbox', { name: 'Search teams...' })
+ ).not.toBeDisabled()
+ fireEvent.click(within(addTeamDialog).getByRole('option', { name: 'Next Team' }))
+ expect(addTeamDialog.querySelector('.cu-selection-dropdown__chips')).toHaveTextContent(
+ 'Next Team'
+ )
+ fireEvent.click(within(addTeamDialog).getByRole('button', { name: 'Add team' }))
await waitFor(() =>
expect(setWorkflowTeamGrants).toHaveBeenCalledWith('sandbox-recipes', 'installed-recipe', [
'team-trigger',
@@ -329,9 +335,9 @@ describe('WorkflowAccessPanel', () => {
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('option', { name: 'Next Team' }))
+ fireEvent.click(within(dialog).getByRole('option', { name: 'Final Team' }))
+ fireEvent.click(within(dialog).getByRole('option', { name: 'Last Team' }))
fireEvent.click(within(dialog).getByRole('button', { name: 'Allow teams' }))
await waitFor(() => expect(allowWorkflowApprovalTeam).toHaveBeenCalledTimes(1))
@@ -381,7 +387,7 @@ describe('WorkflowAccessPanel', () => {
)
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('option', { name: 'Next Team' }))
fireEvent.click(within(dialog).getByRole('button', { name: 'Allow team' }))
await waitFor(() => expect(allowWorkflowApprovalTeam).toHaveBeenCalledOnce())
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index cf373556b..6211ee690 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.636",
+ "version": "0.1.637",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.636",
+ "version": "0.1.637",
"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 768d06c21..c76b4062b 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.636",
+ "version": "0.1.637",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",