Mail-logo als vooraf samengestelde witte badge (geen grijze plaat); succes-toast bij rolwijziging
- themes/asf/logo-mail.png (+ make-mail-logo.py), geleverd als /admin/brand-logo-mail.png; ASF Email:LogoUrl wijst ernaar - Renderer: plaat weggehaald, licht logo 56px, dark-swap naar LogoDarkUrl blijft - UsersPage: toast na geslaagde rolwijziging (nl+en, ook Owner-bevestiging) Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -247,3 +247,44 @@ describe('UsersPage keeps up with changes made elsewhere', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('UsersPage role change confirmation', () => {
|
||||
it('shows a success toast with the name and the new role', async () => {
|
||||
mockAuthenticated();
|
||||
renderApp('/users');
|
||||
await screen.findByTestId('users-table');
|
||||
|
||||
await userEvent.click(screen.getByTestId('user-actions-22222222-2222-2222-2222-222222222222'));
|
||||
await userEvent.click(await screen.findByTestId('user-change-role-22222222-2222-2222-2222-222222222222'));
|
||||
await userEvent.click(await screen.findByRole('menuitem', { name: 'User' }));
|
||||
|
||||
expect(await screen.findByText('Role of Admin User changed to User')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('shows the toast after the Owner confirmation too', async () => {
|
||||
mockAuthenticated();
|
||||
renderApp('/users');
|
||||
await screen.findByTestId('users-table');
|
||||
|
||||
await userEvent.click(screen.getByTestId('user-actions-22222222-2222-2222-2222-222222222222'));
|
||||
await userEvent.click(await screen.findByTestId('user-change-role-22222222-2222-2222-2222-222222222222'));
|
||||
await userEvent.click(await screen.findByRole('menuitem', { name: 'Owner' }));
|
||||
await userEvent.click(await screen.findByRole('button', { name: 'Make Owner' }));
|
||||
|
||||
expect(await screen.findByText('Role of Admin User changed to Owner')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('shows no success toast when the change is refused', async () => {
|
||||
server.use(http.put(`${USERS_URL}/:userId/role`, () => HttpResponse.json({}, { status: 403 })));
|
||||
mockAuthenticated();
|
||||
renderApp('/users');
|
||||
await screen.findByTestId('users-table');
|
||||
|
||||
await userEvent.click(screen.getByTestId('user-actions-22222222-2222-2222-2222-222222222222'));
|
||||
await userEvent.click(await screen.findByTestId('user-change-role-22222222-2222-2222-2222-222222222222'));
|
||||
await userEvent.click(await screen.findByRole('menuitem', { name: 'User' }));
|
||||
|
||||
await screen.findByText(/permission/i);
|
||||
expect(screen.queryByText(/changed to/)).not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -171,9 +171,15 @@ export function UsersPage() {
|
||||
void executeRoleChange(user.id, newRole);
|
||||
};
|
||||
|
||||
const announceRoleChange = (userId: string, newRole: UserRole, name?: string) => {
|
||||
const shown = name ?? users?.find((u) => u.id === userId)?.name ?? '';
|
||||
toast.success(t('users.actions.roleChanged', { name: shown, role: t(`users.roles.${newRole}`) }));
|
||||
};
|
||||
|
||||
const executeRoleChange = async (userId: string, newRole: UserRole) => {
|
||||
try {
|
||||
await changeRole.mutateAsync({ userId, newRole });
|
||||
announceRoleChange(userId, newRole);
|
||||
} catch (err) {
|
||||
if (err instanceof ProblemDetailsError) {
|
||||
if (err.status === 400) {
|
||||
@@ -209,6 +215,7 @@ export function UsersPage() {
|
||||
if (!ownerAssignTarget) return;
|
||||
try {
|
||||
await changeRole.mutateAsync({ userId: ownerAssignTarget.userId, newRole: 'Owner' });
|
||||
announceRoleChange(ownerAssignTarget.userId, 'Owner', ownerAssignTarget.userName);
|
||||
setOwnerAssignTarget(null);
|
||||
} catch (err) {
|
||||
setOwnerAssignTarget(null);
|
||||
|
||||
@@ -135,7 +135,8 @@
|
||||
"deactivate": "Deactivate",
|
||||
"activate": "Activate",
|
||||
"delete": "Delete user",
|
||||
"linkCopied": "Invite link copied to clipboard"
|
||||
"linkCopied": "Invite link copied to clipboard",
|
||||
"roleChanged": "Role of {{name}} changed to {{role}}"
|
||||
},
|
||||
"active": {
|
||||
"successDeactivated": "{{name}} has been deactivated.",
|
||||
|
||||
@@ -135,7 +135,8 @@
|
||||
"deactivate": "Deactiveren",
|
||||
"activate": "Activeren",
|
||||
"delete": "Gebruiker verwijderen",
|
||||
"linkCopied": "Uitnodigingslink gekopieerd naar klembord"
|
||||
"linkCopied": "Uitnodigingslink gekopieerd naar klembord",
|
||||
"roleChanged": "Rol van {{name}} gewijzigd naar {{role}}"
|
||||
},
|
||||
"active": {
|
||||
"successDeactivated": "{{name}} is gedeactiveerd.",
|
||||
|
||||
Reference in New Issue
Block a user