private/desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asdasd
All checks were successful
Deploy / deploy-staging (push) Successful in 29s
Details
Deploy / deploy-production (push) Has been skipped
Details

Browse Source
This commit is contained in:
Lars Gebhardt-Kusche
2026-06-22 01:51:56 +02:00
parent cfcb37ca7e
commit 7d4c3e4378
5 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/App/App.php
View File

@@ -56,6 +56,19 @@ final class App
$apps = AppIconResolver::decorate($enabledApps, $activeSkin);
$windows = (new WindowManager($registry))->defaultWindows();
$activeWidgetIds = array_values(array_map('strval', (array) ($userSettings['widgets']['active_ids'] ?? DesktopState::defaultWidgetIds())));
$trayItems = DesktopState::trayItems();
foreach ($enabledApps as $app) {
if (empty($app['supports_tray']) || (string) ($app['app_id'] ?? '') !== 'fx-rates') {
continue;
}
$trayItems[] = [
'id' => 'app-' . (string) $app['app_id'],
'label' => (string) ($app['icon'] ?? 'FX'),
'app_id' => (string) ($app['app_id'] ?? ''),
'title' => (string) ($app['title'] ?? ''),
];
}
$displayName = (string) ($authUser['name'] ?? $authUser['username'] ?? 'Gast');
$storageScope = $isAuthenticated
? strtolower((string) ($authUser['username'] ?? $authUser['sub'] ?? 'user'))
@@ -94,7 +107,7 @@ final class App
'registry' => $widgetRegistry->all(),
'active_ids' => $activeWidgetIds,
],
'tray' => DesktopState::trayItems(),
'tray' => $trayItems,
'session' => [
'display_name' => $displayName,
'authenticated' => $isAuthenticated,

32
src/App/UserSelfManagementService.php
View File

@@ -196,6 +196,10 @@ final class UserSelfManagementService
static fn (array $app): string => (string) ($app['app_id'] ?? ''),
$visibleApps
)));
$defaultEnabledAppIds = array_values(array_filter(array_map(
static fn (array $app): ?string => ($app['enabled_by_default'] ?? false) ? (string) ($app['app_id'] ?? '') : null,
$visibleApps
)));
$defaultWidgetIds = array_values(array_filter(array_map(
static fn (array $widget): ?string => ($widget['default_enabled'] ?? false) ? (string) ($widget['widget_id'] ?? '') : null,
$widgets
@@ -204,13 +208,35 @@ final class UserSelfManagementService
static fn (array $widget): string => (string) ($widget['widget_id'] ?? ''),
$widgets
)));
$storedEnabledAppIds = array_key_exists('enabled_ids', (array) ($settings['apps'] ?? []))
? $this->sanitizeSelection($settings['apps']['enabled_ids'] ?? [], $visibleAppIds)
: $visibleAppIds;
$knownAppIds = $this->sanitizeSelection(
$settings['apps']['known_ids'] ?? [],
$visibleAppIds
);
$newDefaultAppIds = array_values(array_filter(
$defaultEnabledAppIds,
static fn (string $appId): bool => !in_array($appId, $knownAppIds, true)
));
$enabledAppIds = $this->sanitizeSelection(
$settings['apps']['enabled_ids'] ?? $visibleAppIds,
array_merge($storedEnabledAppIds, $newDefaultAppIds),
$visibleAppIds,
[self::APP_ID]
);
$storedActiveWidgetIds = array_key_exists('active_ids', (array) ($settings['widgets'] ?? []))
? $this->sanitizeSelection($settings['widgets']['active_ids'] ?? [], $allWidgetIds)
: $defaultWidgetIds;
$knownWidgetIds = $this->sanitizeSelection(
$settings['widgets']['known_ids'] ?? [],
$allWidgetIds
);
$newDefaultWidgetIds = array_values(array_filter(
$defaultWidgetIds,
static fn (string $widgetId): bool => !in_array($widgetId, $knownWidgetIds, true)
));
$activeWidgetIds = $this->sanitizeSelection(
$settings['widgets']['active_ids'] ?? $defaultWidgetIds,
array_merge($storedActiveWidgetIds, $newDefaultWidgetIds),
$allWidgetIds
);
$profile = [];
@@ -240,9 +266,11 @@ final class UserSelfManagementService
],
'apps' => [
'enabled_ids' => $enabledAppIds,
'known_ids' => $visibleAppIds,
],
'widgets' => [
'active_ids' => $activeWidgetIds,
'known_ids' => $allWidgetIds,
],
'integration' => [
'ldap_write_status' => 'planned',