forked from fa/breadcrumb-the-shire
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>
103 lines
4.1 KiB
PHP
103 lines
4.1 KiB
PHP
<?php
|
|
|
|
use MintyPHP\Domain\Taxonomy\TenantStatus;
|
|
use MintyPHP\Service\Access\TenantAuthorizationPolicy;
|
|
use MintyPHP\Support\Guard;
|
|
|
|
Guard::requireLogin();
|
|
gridRequireGetRequest();
|
|
|
|
$decision = Guard::requireAbilityDecisionOrForbidden(TenantAuthorizationPolicy::ABILITY_ADMIN_TENANTS_VIEW);
|
|
$capabilities = $decision->attribute('capabilities', []);
|
|
$allowedTenantIds = is_array($capabilities) ? toIntIds($capabilities['allowed_tenant_ids'] ?? []) : [];
|
|
$isStrictScope = is_array($capabilities) ? (bool) ($capabilities['is_strict_scope'] ?? false) : false;
|
|
$hasGlobalAccess = is_array($capabilities) ? (bool) ($capabilities['has_global_access'] ?? false) : false;
|
|
|
|
$filters = gridParseFiltersFromSchemaFile(__DIR__ . '/filter-schema.php');
|
|
|
|
$order = $filters['order'];
|
|
$dir = $filters['dir'];
|
|
$computedOrderKeys = ['users'];
|
|
$userTenantRepository = app(\MintyPHP\Repository\Tenant\UserTenantRepository::class);
|
|
$tenantLogoService = app(\MintyPHP\Service\Tenant\TenantLogoService::class);
|
|
$settingsDefaultsGateway = app(\MintyPHP\Service\Settings\SettingsDefaultsGateway::class);
|
|
|
|
$gridUserCountEnricher = app(\MintyPHP\Service\Data\GridUserCountEnricher::class);
|
|
$fetchRows = static function (array $tenantRows) use ($userTenantRepository, $tenantLogoService, $settingsDefaultsGateway, $gridUserCountEnricher): array {
|
|
$userCounts = $gridUserCountEnricher->computeCounts(
|
|
$tenantRows,
|
|
$userTenantRepository->countUsersByTenantIds(...),
|
|
$userTenantRepository->countActiveUsersByTenantIds(...)
|
|
);
|
|
$defaultTenantId = $settingsDefaultsGateway->getDefaultTenantId();
|
|
$rows = [];
|
|
|
|
foreach ($tenantRows as $row) {
|
|
$tenantId = (int) ($row['id'] ?? 0);
|
|
$counts = $userCounts[$tenantId] ?? ['active_users' => 0, 'inactive_users' => 0];
|
|
$tenantStatus = TenantStatus::normalizeOr((string) ($row['status'] ?? ''), TenantStatus::Active);
|
|
$tenantUuid = (string) ($row['uuid'] ?? '');
|
|
|
|
$rows[] = [
|
|
'id' => $row['id'] ?? null,
|
|
'uuid' => $tenantUuid,
|
|
'is_default' => $tenantId > 0 && $defaultTenantId === $tenantId,
|
|
'description' => $row['description'] ?? '',
|
|
'status' => $tenantStatus->value,
|
|
'status_badge' => $tenantStatus->badgeVariant(),
|
|
'status_label' => t($tenantStatus->labelToken()),
|
|
'total_users' => $counts['active_users'] + $counts['inactive_users'],
|
|
'has_logo' => $tenantUuid !== '' && (
|
|
$tenantLogoService->hasLogo($tenantUuid, \MintyPHP\Service\Tenant\TenantLogoService::THEME_LIGHT)
|
|
|| $tenantLogoService->hasLogo($tenantUuid, \MintyPHP\Service\Tenant\TenantLogoService::THEME_DARK)
|
|
),
|
|
];
|
|
}
|
|
|
|
return $rows;
|
|
};
|
|
|
|
$listOptions = [
|
|
'limit' => $filters['limit'],
|
|
'offset' => $filters['offset'],
|
|
'search' => $filters['search'],
|
|
'status' => $filters['status'],
|
|
'order' => in_array($order, $computedOrderKeys, true) ? 'description' : $order,
|
|
'dir' => $dir,
|
|
];
|
|
if (!$hasGlobalAccess) {
|
|
if ($allowedTenantIds) {
|
|
$listOptions['tenantIds'] = $allowedTenantIds;
|
|
} elseif ($isStrictScope) {
|
|
$listOptions['tenantIds'] = [];
|
|
}
|
|
}
|
|
|
|
$result = app(\MintyPHP\Service\Tenant\TenantService::class)->listPaged($listOptions);
|
|
|
|
$rows = [];
|
|
$total = (int) ($result['total'] ?? 0);
|
|
if (in_array($order, $computedOrderKeys, true)) {
|
|
$fullResult = app(\MintyPHP\Service\Tenant\TenantService::class)->listPaged([
|
|
...$listOptions,
|
|
'limit' => max(1, $total),
|
|
'offset' => 0,
|
|
'order' => 'description',
|
|
'dir' => 'asc',
|
|
]);
|
|
$rows = $fetchRows($fullResult['rows'] ?? []);
|
|
|
|
usort($rows, static function (array $a, array $b) use ($dir): int {
|
|
$cmp = ((int) $a['total_users']) <=> ((int) $b['total_users']);
|
|
if ($cmp === 0) {
|
|
$cmp = strcasecmp((string) $a['description'], (string) $b['description']);
|
|
}
|
|
return $dir === 'desc' ? -$cmp : $cmp;
|
|
});
|
|
$rows = array_slice($rows, $filters['offset'], $filters['limit']);
|
|
} else {
|
|
$rows = $fetchRows($result['rows'] ?? []);
|
|
}
|
|
|
|
gridJsonDataResult($rows, $total);
|