Replace the single tenant avatar with a pair of theme-scoped brand logos.
Render only the theme-matching <img> server-side and swap src on theme
toggle via a JS hook — no reload, no double request, no CSS tricks.
Tenant logos
- TenantLogoService (ImageUploadTrait) with theme whitelist and per-theme
storage storage/tenants/{uuid}/logo/{light|dark}/, SIZES 128/256/512
- Public serving endpoint auth/tenant-logo-file so login can show the
logo pre-auth; matching authenticated admin preview endpoint
- appTenantLogoUrl(?size, ?theme) with 4-step fallback cascade; PDF +
mail always request 'light'
- Admin tenant edit: avatar block replaced by "Tenant logos" details
block inside the Master-data tab, two side-by-side slots via Pico
.grid with the core app-file-upload partial
- Policy rename ABILITY_ADMIN_TENANTS_AVATAR_VIEW -> LOGO_VIEW, action
routes logo / logo-delete / logo-file with theme body/query param
- API endpoint path kept (backward compat), internals on new service
- CLI tenant:logo-migrate-avatars moves legacy avatar/ -> logo/light/
idempotently (--dry-run, --yes, --cleanup)
- i18n "Tenant image" removed, 12 new keys synced across de/en
File upload component
- Full-width preview + filename/actions below (3D stack layout)
- Fixed 16:9 aspect ratio with 1rem inner padding for consistent
preview size across any logo aspect
- Transparency checker pattern as background so black logos stay
visible on dark mode and white logos on light mode
- form="" + deleteFormId support so the partial works with barrier
forms inside another form
Buttons
- width:100% dropped from button[type="submit"]; scoped back via
.login-main for the auth-flow primary CTA
- .outline base rule now tints background via color-mix of --app-color
so secondary/primary/danger outlines all gain a subtle surface
- .outline.secondary restyled Stripe-style in both themes: solid white
chip with soft shadow in light, solid elevated dark chip with white
text in dark; neutral border replaces role-colored border
- .app-action-success/.app-action-danger outlines get color-mix bg +
theme-aware outline-text tokens for stronger contrast
- Filled .primary/.app-action-success/.app-action-danger get raised
box-shadow (inset highlight + drop) — opt-in via class so chrome
buttons stay flat
- Dropped the legacy .secondary utility that was clobbering the
custom-property cascade with a hardcoded muted color
Theme swap
- Logo img carries data-src-light + data-src-dark; theme-toggle JS
swaps src when data-theme changes, keeping the topbar/login logo in
sync without a page reload
Quality gates: PHPUnit (2045), PHPStan L5, CS-Fixer, docs link/drift,
codex skills sync — all green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
107 lines
3.6 KiB
JavaScript
107 lines
3.6 KiB
JavaScript
import { createListPageModule } from '../core/app-list-page-module.js';
|
|
import { escapeHtml } from './app-list-utils.js';
|
|
|
|
createListPageModule({
|
|
configId: 'admin-tenants-index',
|
|
moduleId: 'admin-tenants-index',
|
|
missingGridMessage: 'Tenants grid init failed: Grid.js missing',
|
|
initErrorMessage: 'Tenants grid init failed',
|
|
setup: ({ config, gridjs, appBase, initListPage }) => {
|
|
const filterSchema = config.filterSchema ?? [];
|
|
const filterChipMeta = config.filterChipMeta ?? [];
|
|
const labels = config.labels ?? {};
|
|
|
|
const tenantUuidIndex = 2;
|
|
const initialsForRow = (row) => {
|
|
const descriptionCell = row?.cells?.[0]?.data;
|
|
const label = typeof descriptionCell === 'object' && descriptionCell !== null
|
|
? String(descriptionCell.label ?? '')
|
|
: String(descriptionCell ?? '');
|
|
const initial = label.trim().charAt(0).toUpperCase();
|
|
return initial || '?';
|
|
};
|
|
|
|
const { gridConfig } = initListPage({
|
|
grid: {
|
|
gridjs,
|
|
container: '#tenants-grid',
|
|
dataUrl: 'admin/tenants/data',
|
|
appBase,
|
|
columns: [
|
|
{
|
|
name: labels.tenant || 'Tenant',
|
|
sort: true,
|
|
width: '75%',
|
|
formatter: (cell, row) => {
|
|
const hasLogo = cell?.has_logo ? 1 : 0;
|
|
const uuid = encodeURIComponent(String(cell?.uuid ?? ''));
|
|
let avatarHtml = '';
|
|
if (hasLogo && uuid) {
|
|
const src = new URL(`admin/tenants/logo-file?uuid=${uuid}&theme=light&size=64`, appBase).toString();
|
|
avatarHtml = `<img class="grid-avatar grid-avatar-tenant" src="${src}" alt="" loading="lazy">`;
|
|
} else {
|
|
const initials = escapeHtml(initialsForRow(row));
|
|
avatarHtml = `<span class="grid-avatar grid-avatar-tenant grid-avatar-placeholder">${initials}</span>`;
|
|
}
|
|
|
|
const nameText = escapeHtml(String(cell?.label ?? ''));
|
|
|
|
return gridjs.html(
|
|
`<div class="grid-tenant-profile">` +
|
|
`${avatarHtml}` +
|
|
`<span class="grid-tenant-profile-name-text">${nameText}</span>` +
|
|
`</div>`
|
|
);
|
|
},
|
|
},
|
|
{
|
|
name: labels.users || 'Users',
|
|
sort: true,
|
|
width: '25%',
|
|
formatter: (cell) => {
|
|
const number = Number(cell ?? 0);
|
|
return gridjs.html(String(Number.isFinite(number) ? number : 0));
|
|
},
|
|
},
|
|
{
|
|
name: 'UUID',
|
|
hidden: true,
|
|
},
|
|
],
|
|
sortColumns: ['description', 'users', null],
|
|
paginationLimit: 10,
|
|
language: config.gridLang ?? {},
|
|
mapData: (data) => data.data.map((row) => [
|
|
{
|
|
uuid: row.uuid ?? '',
|
|
label: row.description ?? '',
|
|
has_logo: row.has_logo ? 1 : 0,
|
|
},
|
|
row.total_users ?? 0,
|
|
row.uuid,
|
|
]),
|
|
rowInteraction: { linkColumn: 0 },
|
|
search: config.gridSearch ?? null,
|
|
filterSchema,
|
|
urlSync: true,
|
|
rowDataset: (row) => ({
|
|
uuid: row?.cells?.[tenantUuidIndex]?.data,
|
|
}),
|
|
rowDblClick: {
|
|
getUrl: (rowData) => {
|
|
const uuid = rowData?.cells?.[tenantUuidIndex]?.data;
|
|
return uuid ? new URL(`admin/tenants/edit/${uuid}`, appBase).toString() : '';
|
|
},
|
|
},
|
|
},
|
|
filters: {
|
|
mode: 'drawer',
|
|
chipMeta: filterChipMeta,
|
|
watchInputs: ['#tenant-search'],
|
|
},
|
|
}) || {};
|
|
|
|
return gridConfig;
|
|
},
|
|
});
|