fs
6c99c040b2
Consolidates the scattered `array_values(array_unique(array_map('intval',
$x)))` + manual positive-filter pattern behind a single lenient helper
`toIntIds(mixed $value): array` in core/Support/helpers/array.php.
- `RepositoryArrayHelper::sanitizePositiveIds()` now delegates (keeps
strict array-input contract + existing tests intact).
- Drops two private duplicates: `UserProfileViewService::normalizeIds()`
and `AddressBookService::normalizeIds()`.
- Replaces 12 inline occurrences across admin action pages with the
helper, cutting boilerplate by 3-5 lines per site.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
100 lines
3.9 KiB
PHP
100 lines
3.9 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);
|
|
$tenantAvatarService = app(\MintyPHP\Service\Tenant\TenantAvatarService::class);
|
|
$settingsDefaultsGateway = app(\MintyPHP\Service\Settings\SettingsDefaultsGateway::class);
|
|
|
|
$gridUserCountEnricher = app(\MintyPHP\Service\Data\GridUserCountEnricher::class);
|
|
$fetchRows = static function (array $tenantRows) use ($userTenantRepository, $tenantAvatarService, $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_avatar' => $tenantUuid !== '' && $tenantAvatarService->hasAvatar($tenantUuid),
|
|
];
|
|
}
|
|
|
|
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);
|