From a9b9ad2931c655a5bdbd741e451b733847048603 Mon Sep 17 00:00:00 2001 From: Sluijsens Date: Mon, 9 Nov 2026 16:11:33 +0100 Subject: [PATCH] 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 --- .../features/users/pages/UsersPage.test.tsx | 41 ++++++++++++++++++ .../src/features/users/pages/UsersPage.tsx | 7 +++ frontend/src/i18n/locales/en/translation.json | 3 +- frontend/src/i18n/locales/nl/translation.json | 3 +- frontend/themes/asf/logo-mail.png | Bin 0 -> 10065 bytes frontend/themes/asf/make-mail-logo.py | 27 ++++++++++++ frontend/themes/resolveTheme.test.ts | 8 ++++ frontend/themes/resolveTheme.ts | 6 ++- frontend/vite.config.ts | 3 +- .../HostConfigurationTests.cs | 2 +- .../appsettings.json | 2 +- .../Email/EmailRulesAndRendererTests.cs | 12 ++--- .../Email/MailTemplateRenderer.cs | 15 +++---- 13 files changed, 107 insertions(+), 22 deletions(-) create mode 100644 frontend/themes/asf/logo-mail.png create mode 100644 frontend/themes/asf/make-mail-logo.py diff --git a/frontend/src/features/users/pages/UsersPage.test.tsx b/frontend/src/features/users/pages/UsersPage.test.tsx index 4905c10..7118fc1 100644 --- a/frontend/src/features/users/pages/UsersPage.test.tsx +++ b/frontend/src/features/users/pages/UsersPage.test.tsx @@ -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(); + }); +}); + diff --git a/frontend/src/features/users/pages/UsersPage.tsx b/frontend/src/features/users/pages/UsersPage.tsx index cc45082..5a016d5 100644 --- a/frontend/src/features/users/pages/UsersPage.tsx +++ b/frontend/src/features/users/pages/UsersPage.tsx @@ -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); diff --git a/frontend/src/i18n/locales/en/translation.json b/frontend/src/i18n/locales/en/translation.json index a0e7c2d..9d8df90 100644 --- a/frontend/src/i18n/locales/en/translation.json +++ b/frontend/src/i18n/locales/en/translation.json @@ -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.", diff --git a/frontend/src/i18n/locales/nl/translation.json b/frontend/src/i18n/locales/nl/translation.json index f06a873..a2fe6bc 100644 --- a/frontend/src/i18n/locales/nl/translation.json +++ b/frontend/src/i18n/locales/nl/translation.json @@ -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.", diff --git a/frontend/themes/asf/logo-mail.png b/frontend/themes/asf/logo-mail.png new file mode 100644 index 0000000000000000000000000000000000000000..2fb2624df3400f94c00227dd09d7d46821adad7a GIT binary patch literal 10065 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 literal 0 HcmV?d00001 diff --git a/frontend/themes/asf/make-mail-logo.py b/frontend/themes/asf/make-mail-logo.py new file mode 100644 index 0000000..f18d78e --- /dev/null +++ b/frontend/themes/asf/make-mail-logo.py @@ -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)") diff --git a/frontend/themes/resolveTheme.test.ts b/frontend/themes/resolveTheme.test.ts index aec0ee6..0f5460c 100644 --- a/frontend/themes/resolveTheme.test.ts +++ b/frontend/themes/resolveTheme.test.ts @@ -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 { diff --git a/frontend/themes/resolveTheme.ts b/frontend/themes/resolveTheme.ts index 6e552f6..d3b9fd9 100644 --- a/frontend/themes/resolveTheme.ts +++ b/frontend/themes/resolveTheme.ts @@ -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, }; } diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 087af08..b05dbaf 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -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 = 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', diff --git a/src/SlpModularCms.Api.AndreaSlopFotografie.Tests/HostConfigurationTests.cs b/src/SlpModularCms.Api.AndreaSlopFotografie.Tests/HostConfigurationTests.cs index de0ea90..0063cf6 100644 --- a/src/SlpModularCms.Api.AndreaSlopFotografie.Tests/HostConfigurationTests.cs +++ b/src/SlpModularCms.Api.AndreaSlopFotografie.Tests/HostConfigurationTests.cs @@ -84,7 +84,7 @@ public class HostConfigurationTests config["Email:Smtp:Username"].Should().BeNullOrEmpty(); config["Email:Smtp:Password"].Should().BeNullOrEmpty(); config["Email:FromAddress"].Should().NotBeNullOrEmpty(); - config["Email:LogoUrl"].Should().Be("/admin/brand-logo-on-light.png"); + config["Email:LogoUrl"].Should().Be("/admin/brand-logo-mail.png"); config["Email:LogoDarkUrl"].Should().Be("/admin/brand-logo-on-dark.png"); } } diff --git a/src/SlpModularCms.Api.AndreaSlopFotografie/appsettings.json b/src/SlpModularCms.Api.AndreaSlopFotografie/appsettings.json index 9840e68..957375a 100644 --- a/src/SlpModularCms.Api.AndreaSlopFotografie/appsettings.json +++ b/src/SlpModularCms.Api.AndreaSlopFotografie/appsettings.json @@ -57,7 +57,7 @@ "FromAddress": "no-reply@slpsoftware.nl", "FromName": "Andrea Slop Fotografie", "AllowedFromAddresses": [], - "LogoUrl": "/admin/brand-logo-on-light.png", + "LogoUrl": "/admin/brand-logo-mail.png", "LogoDarkUrl": "/admin/brand-logo-on-dark.png", "BrandColor": "#5f6a58", "Smtp": { diff --git a/src/SlpModularCms.Core.Tests/Email/EmailRulesAndRendererTests.cs b/src/SlpModularCms.Core.Tests/Email/EmailRulesAndRendererTests.cs index d8c27b2..6a973f5 100644 --- a/src/SlpModularCms.Core.Tests/Email/EmailRulesAndRendererTests.cs +++ b/src/SlpModularCms.Core.Tests/Email/EmailRulesAndRendererTests.cs @@ -240,17 +240,19 @@ public class MailTemplateRendererTests html.Should().MatchRegex("class=\"mail-logo-dark\"[^>]*display:none;[^>]*mso-hide:all"); // ... and the dark block swaps them and drops the plate html.Should().Contain(".mail-logo-light{display:none !important").And.Contain(".mail-logo-dark{display:block !important") - .And.Contain(".mail-plate{background:transparent !important"); +; + html.Should().NotContain("mail-plate"); // no grey plate any more } [Fact] - public void WithoutADarkLogo_ThereIsNoSwap_AndTheLightLogoKeepsItsLightPlate() + public void WithoutADarkLogo_ThereIsNoSwap_AndNoPlateEither() { var html = _renderer.Render(MailKind.Invitation, "nl", Model()).Html; - html.Should().NotContain("mail-logo-dark").And.NotContain(".mail-logo-light{").And.NotContain(".mail-plate{"); - // the plate survives clients that invert backgrounds or ignore the media query - html.Should().Contain("class=\"mail-plate\" bgcolor=\"#f3f4f6\"").And.Contain("background-image:linear-gradient(#f3f4f6,#f3f4f6)"); + html.Should().NotContain("mail-logo-dark").And.NotContain(".mail-logo-light{").And.NotContain("mail-plate") + .And.NotContain("#f3f4f6;background-image"); + // the logo is shown as the image it is (a badge baked into the file), at its display height + html.Should().Contain("class=\"mail-logo-light\" src=\"https://t.nl/admin/brand-logo-on-light.png\" alt=\"Andrea Slop Fotografie\" height=\"56\""); } [Fact] diff --git a/src/SlpModularCms.Core/Email/MailTemplateRenderer.cs b/src/SlpModularCms.Core/Email/MailTemplateRenderer.cs index 36ec701..1fd6982 100644 --- a/src/SlpModularCms.Core/Email/MailTemplateRenderer.cs +++ b/src/SlpModularCms.Core/Email/MailTemplateRenderer.cs @@ -160,7 +160,6 @@ public sealed class MailTemplateRenderer : IMailTemplateRenderer private const string DarkPage = "#111827"; private const string DarkCard = "#1f2937"; - private const string PlateColour = "#f3f4f6"; private static string BuildHtml( MailModel model, string site, string colour, string? greeting, string heading, string intro, @@ -187,10 +186,9 @@ public sealed class MailTemplateRenderer : IMailTemplateRenderer sb.Append(".mail-muted{color:#9ca3af !important;}.mail-rule{border-color:#374151 !important;}"); if (hasDarkLogo) { - // Swap: hide the light logo and its plate, show the dark variant. + // Swap: hide the light logo, show the dark variant. sb.Append(".mail-logo-light{display:none !important;max-height:0 !important;overflow:hidden !important;mso-hide:all !important;}"); sb.Append(".mail-logo-dark{display:block !important;max-height:none !important;overflow:visible !important;mso-hide:none !important;}"); - sb.Append(".mail-plate{background:transparent !important;background-image:none !important;padding:0 !important;}"); } sb.Append("}"); sb.Append(""); @@ -199,15 +197,12 @@ public sealed class MailTemplateRenderer : IMailTemplateRenderer sb.Append($""); if (!string.IsNullOrEmpty(model.LogoUrl)) { - // The light-background logo sits on a light plate (bgcolor + a flat gradient image, which clients that - // invert backgrounds, like the Gmail and Outlook apps, leave alone), so it stays readable even when the - // client ignores the dark-mode rules. With a dark variant, dark mode swaps the two and drops the plate. - sb.Append(""); - sb.Append($"
"); - sb.Append($"\"{E(site)}\""); + // The default logo is meant to be a self-contained image (ASF: a white badge baked into the PNG), so it is + // readable in every client, also those that invert colours themselves and ignore the dark-mode rules. + // With a dark variant, clients that support prefers-color-scheme swap to it. + sb.Append($"\"{E(site)}\""); if (hasDarkLogo) sb.Append($"\"{E(site)}\""); - sb.Append("
"); } else sb.Append($"{E(site)}");