Skip to content

SigNoz is an open-source, OpenTelemetry-native observability platform for your team and their AI agents. Get logs, metrics, and traces in one tool with features like APM, distributed tracing, log management, infra monitoring, etc. Combined with SigNoz MCP and a native AI teammate (in SigNoz Cloud) it helps you build more resilient apps.

feat(invite): accept multiple roles per invited member (#12476)

Vikrant Gupta40aa322cc3d0
diff --git a/frontend/src/components/InviteMembers/InviteMembers.tsx b/frontend/src/components/InviteMembers/InviteMembers.tsx
index 8b6c31e444..1f973356be 100644
--- a/frontend/src/components/InviteMembers/InviteMembers.tsx
+++ b/frontend/src/components/InviteMembers/InviteMembers.tsx
@@ -80,7 +80,7 @@ function InviteMembers({
weight="semibold"
className={styles.headerCellRole}
>
- Role
+ Roles
</Typography.Text>
<div className={styles.headerCellAction} />
</div>
@@ -108,11 +108,10 @@ function InviteMembers({
<div className={styles.cellRole}>
<RolesSelect
- mode="single"
- value={row.roleId || undefined}
- onChange={(roleId): void => updateRole(row.id, roleId)}
- placeholder="Select role"
- allowClear={false}
+ mode="multiple"
+ value={row.roleIds}
+ onChange={(roleIds): void => updateRole(row.id, roleIds)}
+ placeholder="Select roles"
id={`invite-role-${row.id}`}
/>
</div>
diff --git a/frontend/src/components/InviteMembers/__tests__/InviteMembers.edgeCases.test.tsx b/frontend/src/components/InviteMembers/__tests__/InviteMembers.edgeCases.test.tsx
index 00cfdafed2..ea2f658790 100644
--- a/frontend/src/components/InviteMembers/__tests__/InviteMembers.edgeCases.test.tsx
+++ b/frontend/src/components/InviteMembers/__tests__/InviteMembers.edgeCases.test.tsx
@@ -68,8 +68,8 @@ describe('InviteMembers - Edge Cases', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], VALID_EMAIL);
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.click(screen.getByTestId('submit-btn'));
await expect(
@@ -100,8 +100,8 @@ describe('InviteMembers - Edge Cases', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], VALID_EMAIL);
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.click(screen.getByTestId('submit-btn'));
await expect(
@@ -132,17 +132,17 @@ describe('InviteMembers - Edge Cases', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], VALID_EMAIL);
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.click(screen.getByTestId('submit-btn'));
await expect(
screen.findByTestId('invite-api-error'),
).resolves.toBeInTheDocument();
- const viewerElements = screen.getAllByText('Viewer');
+ const viewerElements = screen.getAllByTitle('Viewer');
await user.click(viewerElements[0]);
- const editorOptions = await screen.findAllByText('Editor');
+ const editorOptions = await screen.findAllByTitle('Editor');
await user.click(editorOptions[editorOptions.length - 1]);
await waitFor(() => {
@@ -189,8 +189,8 @@ describe('InviteMembers - Edge Cases', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], VALID_EMAIL);
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
const submitBtn = screen.getByTestId('submit-btn');
await user.click(submitBtn);
@@ -226,8 +226,8 @@ describe('InviteMembers - Edge Cases', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], ' [email protected] ');
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.click(screen.getByTestId('submit-btn'));
diff --git a/frontend/src/components/InviteMembers/__tests__/InviteMembers.rendering.test.tsx b/frontend/src/components/InviteMembers/__tests__/InviteMembers.rendering.test.tsx
index ef6245cc8c..f7c469f3d5 100644
--- a/frontend/src/components/InviteMembers/__tests__/InviteMembers.rendering.test.tsx
+++ b/frontend/src/components/InviteMembers/__tests__/InviteMembers.rendering.test.tsx
@@ -32,14 +32,14 @@ describe('InviteMembers - Rendering', () => {
render(<InviteMembers />);
expect(screen.getByText('Email address')).toBeInTheDocument();
- expect(screen.getByText('Role')).toBeInTheDocument();
+ expect(screen.getByText('Roles')).toBeInTheDocument();
});
it('hides header when showHeader is false', () => {
render(<InviteMembers showHeader={false} />);
expect(screen.queryByText('Email address')).not.toBeInTheDocument();
- expect(screen.queryByText('Role')).not.toBeInTheDocument();
+ expect(screen.queryByText('Roles')).not.toBeInTheDocument();
});
it('renders add button by default', () => {
@@ -89,7 +89,7 @@ describe('InviteMembers - Rendering', () => {
it('renders role select for each row', () => {
render(<InviteMembers initialRowCount={2} />);
- const roleSelects = screen.getAllByText('Select role');
+ const roleSelects = screen.getAllByText('Select roles');
expect(roleSelects).toHaveLength(2);
});
});
diff --git a/frontend/src/components/InviteMembers/__tests__/InviteMembers.submission.test.tsx b/frontend/src/components/InviteMembers/__tests__/InviteMembers.submission.test.tsx
index b86c0eafca..719a57f508 100644
--- a/frontend/src/components/InviteMembers/__tests__/InviteMembers.submission.test.tsx
+++ b/frontend/src/components/InviteMembers/__tests__/InviteMembers.submission.test.tsx
@@ -40,8 +40,8 @@ describe('InviteMembers - Submission', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], '[email protected]');
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.click(screen.getByTestId('submit-btn'));
@@ -73,17 +73,17 @@ describe('InviteMembers - Submission', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], '[email protected]');
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.type(emailInputs[1], '[email protected]');
- await user.click(screen.getAllByText('Select role')[0]);
- const editorOptions = await screen.findAllByText('Editor');
+ await user.click(screen.getAllByText('Select roles')[0]);
+ const editorOptions = await screen.findAllByTitle('Editor');
await user.click(editorOptions[editorOptions.length - 1]);
await user.type(emailInputs[2], '[email protected]');
- await user.click(screen.getAllByText('Select role')[0]);
- const adminOptions = await screen.findAllByText('Admin');
+ await user.click(screen.getAllByText('Select roles')[0]);
+ const adminOptions = await screen.findAllByTitle('Admin');
await user.click(adminOptions[adminOptions.length - 1]);
await user.click(screen.getByTestId('submit-btn'));
@@ -125,8 +125,8 @@ describe('InviteMembers - Submission', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], VALID_EMAIL);
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.click(screen.getByTestId('submit-btn'));
@@ -154,8 +154,8 @@ describe('InviteMembers - Submission', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], VALID_EMAIL);
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.click(screen.getByTestId('submit-btn'));
@@ -218,12 +218,12 @@ describe('InviteMembers - Submission', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], '[email protected]');
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.type(emailInputs[1], '[email protected]');
- await user.click(screen.getAllByText('Select role')[0]);
- const editorOptions = await screen.findAllByText('Editor');
+ await user.click(screen.getAllByText('Select roles')[0]);
+ const editorOptions = await screen.findAllByTitle('Editor');
await user.click(editorOptions[editorOptions.length - 1]);
await user.click(screen.getByTestId('submit-btn'));
@@ -276,8 +276,8 @@ describe('InviteMembers - Submission', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], VALID_EMAIL);
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.click(screen.getByTestId('submit-btn'));
@@ -303,8 +303,8 @@ describe('InviteMembers - Submission', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], VALID_EMAIL);
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.click(screen.getByTestId('submit-btn'));
diff --git a/frontend/src/components/InviteMembers/__tests__/InviteMembers.validation.test.tsx b/frontend/src/components/InviteMembers/__tests__/InviteMembers.validation.test.tsx
index 5e0f3b1110..5de57cf7a2 100644
--- a/frontend/src/components/InviteMembers/__tests__/InviteMembers.validation.test.tsx
+++ b/frontend/src/components/InviteMembers/__tests__/InviteMembers.validation.test.tsx
@@ -35,8 +35,8 @@ describe('InviteMembers - Validation', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], INVALID_EMAIL);
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.click(screen.getByTestId('submit-btn'));
@@ -60,8 +60,8 @@ describe('InviteMembers - Validation', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], INVALID_EMAIL);
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.click(screen.getByTestId('submit-btn'));
@@ -85,8 +85,8 @@ describe('InviteMembers - Validation', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], INVALID_EMAIL);
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.click(screen.getByTestId('submit-btn'));
await expect(
@@ -149,8 +149,8 @@ describe('InviteMembers - Validation', () => {
screen.findByText('Please select roles for team members'),
).resolves.toBeInTheDocument();
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await waitFor(() => {
expect(
@@ -204,8 +204,8 @@ describe('InviteMembers - Validation', () => {
const emailInputs = screen.getAllByPlaceholderText('e.g. [email protected]');
await user.type(emailInputs[0], VALID_EMAIL);
- await user.click(screen.getAllByText('Select role')[0]);
- await user.click(await screen.findByText('Viewer'));
+ await user.click(screen.getAllByText('Select roles')[0]);
+ await user.click(await screen.findByTitle('Viewer'));
await user.click(screen.getByTestId('submit-btn'));
diff --git a/frontend/src/components/InviteMembers/types.ts b/frontend/src/components/InviteMembers/types.ts
index 787b1617fd..68bbee023c 100644
--- a/frontend/src/components/InviteMembers/types.ts
+++ b/frontend/src/components/InviteMembers/types.ts
@@ -3,7 +3,7 @@ import { ReactNode } from 'react';
export interface InviteMemberRow {
id: string;
email: string;
- roleId: string;
+ roleIds: string[];
}
export interface InviteResult {
@@ -38,7 +38,7 @@ export interface UseInviteMembersReturn {
addRow: () => void;
removeRow: (id: string) => void;
updateEmail: (id: string, email: string) => void;
- updateRole: (id: string, roleId: string | undefined) => void;
+ updateRole: (id: string, roleIds: string[]) => void;
reset: () => void;
submit: () => Promise<InviteResult[]>;
diff --git a/frontend/src/components/InviteMembers/useInviteMembers.ts b/frontend/src/components/InviteMembers/useInviteMembers.ts
index 00276263fb..c64fd24fd8 100644
--- a/frontend/src/components/InviteMembers/useInviteMembers.ts
+++ b/frontend/src/components/InviteMembers/useInviteMembers.ts
@@ -18,11 +18,11 @@ import {
const createEmptyRow = (): InviteMemberRow => ({
id: uuid(),
email: '',
- roleId: '',
+ roleIds: [],
});
const isRowTouched = (row: InviteMemberRow): boolean =>
- row.email.trim() !== '' || row.roleId !== '';
+ row.email.trim() !== '' || row.roleIds.length > 0;
export function useInviteMembers(
options: UseInviteMembersOptions = {},
@@ -78,7 +78,7 @@ export function useInviteMembers(
touched.forEach((row) => {
const emailValid = EMAIL_REGEX.test(row.email);
- const roleValid = row.roleId !== '';
+ const roleValid = row.roleIds.length > 0;
if (!emailValid || !row.email) {
isValid = false;
@@ -139,12 +139,12 @@ export function useInviteMembers(
);
const updateRole = useCallback(
- (id: string, roleId: string | undefined): void => {
+ (id: string, roleIds: string[]): void => {
setRows((prev) => {
const updated = cloneDeep(prev);
const row = updated.find((r) => r.id === id);
if (row) {
- row.roleId = roleId ?? '';
+ row.roleIds = roleIds;
}
return updated;
});
@@ -187,7 +187,7 @@ export function useInviteMembers(
await createUser({
email: row.email.trim(),
frontendBaseUrl: getBaseUrl(),
- userRoles: [{ id: row.roleId }],
+ userRoles: row.roleIds.map((id) => ({ id })),
});
results.push({ email: row.email, success: true });
} catch (err) {
diff --git a/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/InviteTeamMembers.tsx b/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/InviteTeamMembers.tsx
index 2d43e540ec..c71ff68d01 100644
--- a/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/InviteTeamMembers.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/InviteTeamMembers.tsx
@@ -14,7 +14,7 @@ import './InviteTeamMembers.styles.scss';
interface TeamMember {
email: string;
- role: string;
+ roles: string[];
name: string;
frontendBaseUrl: string;
id: string;
@@ -45,7 +45,7 @@ function InviteTeamMembers({
const toTeamMembers = (rows: InviteMemberRow[]): TeamMember[] =>
rows.map((row) => ({
email: row.email,
- role: roleIdToName[row.roleId] ?? row.roleId,
+ roles: row.roleIds.map((roleId) => roleIdToName[roleId] ?? roleId),
name: '',
frontendBaseUrl: getBaseUrl(),
id: row.id,
diff --git a/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/__tests__/InviteTeamMembers.test.tsx b/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/__tests__/InviteTeamMembers.test.tsx
index 843455ba95..7710a36b92 100644
--- a/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/__tests__/InviteTeamMembers.test.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/__tests__/InviteTeamMembers.test.tsx
@@ -166,8 +166,8 @@ describe('InviteTeamMembers', () => {
{ email: '[email protected]', success: true },
];
const mockRows: InviteMemberRow[] = [
- { id: 'row-1', email: '[email protected]', roleId: 'role-viewer-id' },
- { id: 'row-2', email: '[email protected]', roleId: 'role-editor-id' },
+ { id: 'row-1', email: '[email protected]', roleIds: ['role-viewer-id'] },
+ { id: 'row-2', email: '[email protected]', roleIds: ['role-editor-id'] },
];
mockInviteMembersProps?.onSuccess?.(mockResults, mockRows);
@@ -177,14 +177,14 @@ describe('InviteTeamMembers', () => {
teamMembers: [
{
- role: 'VIEWER',
+ roles: ['VIEWER'],
name: '',
frontendBaseUrl: 'http://localhost:3301',
id: 'row-1',
},
{
- role: 'EDITOR',
+ roles: ['EDITOR'],
name: '',
frontendBaseUrl: 'http://localhost:3301',
id: 'row-2',
@@ -211,8 +211,8 @@ describe('InviteTeamMembers', () => {
{ email: '[email protected]', success: false, error: 'Already exists' },
];
const mockRows: InviteMemberRow[] = [
- { id: 'row-1', email: '[email protected]', roleId: 'role-viewer-id' },
- { id: 'row-2', email: '[email protected]', roleId: 'role-admin-id' },
+ { id: 'row-1', email: '[email protected]', roleIds: ['role-viewer-id'] },
+ { id: 'row-2', email: '[email protected]', roleIds: ['role-admin-id'] },
];
mockInviteMembersProps?.onPartialSuccess?.(mockResults, mockRows);
@@ -222,14 +222,14 @@ describe('InviteTeamMembers', () => {
teamMembers: [
{
- role: 'VIEWER',
+ roles: ['VIEWER'],
name: '',
frontendBaseUrl: 'http://localhost:3301',
id: 'row-1',
},
{
- role: 'ADMIN',
+ roles: ['ADMIN'],
name: '',
frontendBaseUrl: 'http://localhost:3301',
id: 'row-2',
@@ -252,8 +252,8 @@ describe('InviteTeamMembers', () => {
{ email: '[email protected]', success: false, error: 'Error 2' },
];
const mockRows: InviteMemberRow[] = [
- { id: 'row-1', email: '[email protected]', roleId: 'role-editor-id' },
- { id: 'row-2', email: '[email protected]', roleId: 'role-viewer-id' },
+ { id: 'row-1', email: '[email protected]', roleIds: ['role-editor-id'] },
+ { id: 'row-2', email: '[email protected]', roleIds: ['role-viewer-id'] },
];
mockInviteMembersProps?.onAllFailed?.(mockResults, mockRows);
@@ -263,14 +263,14 @@ describe('InviteTeamMembers', () => {
teamMembers: [
{
- role: 'EDITOR',
+ roles: ['EDITOR'],
name: '',
frontendBaseUrl: 'http://localhost:3301',
id: 'row-1',
},
{
- role: 'VIEWER',
+ roles: ['VIEWER'],
name: '',
frontendBaseUrl: 'http://localhost:3301',
id: 'row-2',