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:
2026-11-09 16:11:33 +01:00
co-authored by Claude Sonnet 5.5
parent 07bad14453
commit a9b9ad2931
13 changed files with 107 additions and 22 deletions
@@ -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.",
Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

+27
View File
@@ -0,0 +1,27 @@
"""
One-off tool: builds logo-mail.png, the logo for e-mail headers, from logo-on-light.png.
Mail clients that invert colours themselves (the Gmail and Outlook apps) turn a dark logo on a transparent
background into a dark logo on a dark header. A white rounded badge baked into the PNG is the same in every client:
on the white mail card it disappears into the page, on a dark header it is a tidy white badge.
Run from this folder with Pillow installed: python make-mail-logo.py
Displayed height in the mail is 56 px; the file is 3x that for sharp rendering on high-density screens.
"""
from PIL import Image, ImageDraw
SCALE = 3
CONTENT_H = 40 * SCALE # the logo itself, 40 px high when displayed
PAD = 8 * SCALE # white margin around it
RADIUS = 8 * SCALE
src = Image.open("logo-on-light.png").convert("RGBA")
src = src.crop(src.getchannel("A").getbbox()) # drop the transparent margin of the original
logo = src.resize((round(src.width * CONTENT_H / src.height), CONTENT_H), Image.LANCZOS)
w, h = logo.width + 2 * PAD, CONTENT_H + 2 * PAD
badge = Image.new("RGBA", (w, h), (0, 0, 0, 0))
ImageDraw.Draw(badge).rounded_rectangle((0, 0, w - 1, h - 1), radius=RADIUS, fill=(255, 255, 255, 255))
badge.alpha_composite(logo, (PAD, PAD))
badge.save("logo-mail.png", optimize=True)
print(f"logo-mail.png {w}x{h} (display height {h // SCALE}px)")
+8
View File
@@ -29,6 +29,14 @@ describe('resolveTheme', () => {
expect(fs.existsSync(logo!.onLight) && fs.existsSync(logo!.onDark)).toBe(true);
});
it('ships the asf e-mail logo (white badge) next to the others', () => {
const { logo } = resolveTheme('asf');
expect(logo?.mail).not.toBeNull();
expect(fs.existsSync(logo!.mail!)).toBe(true);
expect(fs.readFileSync(logo!.mail!).subarray(1, 4).toString()).toBe('PNG');
});
it('treats a theme with only one logo variant as having no logo', () => {
const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'themes-'));
try {
+4 -2
View File
@@ -11,7 +11,7 @@ export interface ResolvedTheme {
* ink), or null when the theme ships none. Both or neither: a logo that is invisible in one
* colour mode is worse than none.
*/
logo: { onLight: string; onDark: string } | null;
logo: { onLight: string; onDark: string; mail: string | null } | null;
}
const THEMES_DIR = import.meta.dirname;
@@ -47,9 +47,11 @@ export function resolveTheme(name: string | undefined, dir: string = THEMES_DIR)
const favicon = path.join(dir, trimmed, 'favicon.png');
const onLight = path.join(dir, trimmed, 'logo-on-light.png');
const onDark = path.join(dir, trimmed, 'logo-on-dark.png');
// Optional: the logo for e-mail headers, on a baked-in white badge (see themes/asf/make-mail-logo.py).
const mail = path.join(dir, trimmed, 'logo-mail.png');
return {
css: path.join(dir, trimmed, 'theme.css'),
favicon: fs.existsSync(favicon) ? favicon : null,
logo: fs.existsSync(onLight) && fs.existsSync(onDark) ? { onLight, onDark } : null,
logo: fs.existsSync(onLight) && fs.existsSync(onDark) ? { onLight, onDark, mail: fs.existsSync(mail) ? mail : null } : null,
};
}
+2 -1
View File
@@ -16,12 +16,13 @@ function themeFor(mode: string) {
* Per-site favicon (VITE_THEME): the page links the theme favicon instead of the default one.
* Build emits it as an asset; the dev server serves it from the theme folder.
*/
function themeFavicon(faviconPath: string | null, logo: { onLight: string; onDark: string } | null): Plugin {
function themeFavicon(faviconPath: string | null, logo: { onLight: string; onDark: string; mail: string | null } | null): Plugin {
const publicName = 'favicon-theme.png';
// Brand logo files, served/emitted next to the favicon (see src/lib/brand.ts for the names' consumer).
const logoFiles: Record<string, string> = logo === null ? {} : {
'brand-logo-on-light.png': logo.onLight,
'brand-logo-on-dark.png': logo.onDark,
...(logo.mail === null ? {} : { 'brand-logo-mail.png': logo.mail }),
};
return {
name: 'cms-theme-favicon',