fix: eliminate $_SESSION drift in SessionProvider and add notification UI states

Pass AppContainer to SessionProvider::clear() so all module providers use
SessionStoreInterface consistently instead of raw $_SESSION. Also add
loading and error states to the notification bell dropdown (GR-UI-014).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-03-20 22:49:03 +01:00
parent 5f37562796
commit 975651b183
12 changed files with 121 additions and 46 deletions

View File

@@ -5,6 +5,8 @@
"Mark as read": "Als gelesen markieren",
"Dismiss": "Verwerfen",
"Action failed": "Aktion fehlgeschlagen",
"Loading notifications…": "Benachrichtigungen werden geladen…",
"Failed to load notifications": "Benachrichtigungen konnten nicht geladen werden",
"New user: %s": "Neuer Benutzer: %s",
"User deleted: %s": "Benutzer gelöscht: %s",
"User activated: %s": "Benutzer aktiviert: %s",

View File

@@ -5,6 +5,8 @@
"Mark as read": "Mark as read",
"Dismiss": "Dismiss",
"Action failed": "Action failed",
"Loading notifications…": "Loading notifications…",
"Failed to load notifications": "Failed to load notifications",
"New user: %s": "New user: %s",
"User deleted: %s": "User deleted: %s",
"User activated: %s": "User activated: %s",

View File

@@ -13,15 +13,19 @@ final class NotificationsSessionProvider implements SessionProvider
public function populate(array $user, AppContainer $container): void
{
$userId = (int) ($user['id'] ?? 0);
if ($userId <= 0) {
unset($_SESSION[self::SESSION_KEY]);
$sessionStore = $container->get(SessionStoreInterface::class);
if (!$sessionStore instanceof SessionStoreInterface) {
return;
}
$userId = (int) ($user['id'] ?? 0);
if ($userId <= 0) {
$sessionStore->remove(self::SESSION_KEY);
return;
}
$sessionStore = $container->get(SessionStoreInterface::class);
$service = $container->get(NotificationService::class);
if (!$sessionStore instanceof SessionStoreInterface || !$service instanceof NotificationService) {
if (!$service instanceof NotificationService) {
return;
}
@@ -30,8 +34,11 @@ final class NotificationsSessionProvider implements SessionProvider
$sessionStore->set(self::SESSION_KEY, $service->unreadCount($userId, $tenantId > 0 ? $tenantId : null));
}
public function clear(): void
public function clear(AppContainer $container): void
{
unset($_SESSION[self::SESSION_KEY]);
$sessionStore = $container->get(SessionStoreInterface::class);
if ($sessionStore instanceof SessionStoreInterface) {
$sessionStore->remove(self::SESSION_KEY);
}
}
}

View File

@@ -26,6 +26,14 @@ $unreadCount = (int) ($notifNav['unread_count'] ?? 0);
</button>
</li>
<li class="app-notification-dropdown__body" data-notification-list>
<div class="app-notification-loading" data-notification-loading style="display:none;">
<span class="app-notification-loading__spinner"></span>
<span class="app-notification-loading__text"><?php e(t('Loading notifications…')); ?></span>
</div>
<div class="app-notification-error" data-notification-error style="display:none;">
<i class="bi bi-exclamation-triangle"></i>
<span><?php e(t('Failed to load notifications')); ?></span>
</div>
<?php
$emptyState = [
'message' => t('No notifications'),

View File

@@ -156,4 +156,33 @@
color: var(--app-notification-text);
background: var(--app-notification-border);
}
.app-notification-loading,
.app-notification-error {
display: flex;
align-items: center;
justify-content: center;
gap: 8px;
padding: 24px 16px;
font-size: 13px;
color: var(--app-notification-muted);
}
.app-notification-error {
color: var(--app-danger, #c0392b);
}
.app-notification-loading__spinner {
display: inline-block;
width: 16px;
height: 16px;
border: 2px solid var(--app-notification-border);
border-top-color: var(--app-primary);
border-radius: 50%;
animation: app-notification-spin 0.6s linear infinite;
}
@keyframes app-notification-spin {
to { transform: rotate(360deg); }
}
}

View File

@@ -59,6 +59,8 @@ export function initNotificationBell(root = document, config = {}) {
const badge = details.querySelector('[data-notification-badge]');
const list = dropdown.querySelector('[data-notification-list]');
const emptyEl = list?.querySelector('.app-empty-state');
const loadingEl = list?.querySelector('[data-notification-loading]');
const errorEl = list?.querySelector('[data-notification-error]');
const markAllBtn = dropdown.querySelector('[data-notification-mark-all]');
const ac = new AbortController();
@@ -77,18 +79,25 @@ export function initNotificationBell(root = document, config = {}) {
}
}
// --- State management ---
function showState(state) {
if (loadingEl) loadingEl.style.display = state === 'loading' ? '' : 'none';
if (errorEl) errorEl.style.display = state === 'error' ? '' : 'none';
if (emptyEl) emptyEl.style.display = state === 'empty' ? '' : 'none';
}
// --- Render ---
function renderNotifications(notifications) {
if (!list) return;
// Remove rendered items, keep empty state partial
// Remove rendered items, keep state elements
list.querySelectorAll('.app-notification-item').forEach(el => el.remove());
if (notifications.length === 0) {
if (emptyEl) emptyEl.style.display = '';
showState('empty');
return;
}
if (emptyEl) emptyEl.style.display = 'none';
showState('success');
const frag = document.createDocumentFragment();
for (const n of notifications) {
@@ -161,14 +170,19 @@ export function initNotificationBell(root = document, config = {}) {
// --- API ---
async function loadNotifications() {
showState('loading');
list?.querySelectorAll('.app-notification-item').forEach(el => el.remove());
try {
const data = await fetchJson(endpoint('notifications/list-data'), { signal });
if (data.ok) {
renderNotifications(data.notifications || []);
updateBadge(data.unread_count ?? 0);
} else {
showState('error');
}
} catch (err) {
if (err instanceof DOMException && err.name === 'AbortError') return;
showState('error');
telemetry.capture('warn_once', {
message: 'Notification bell: load failed',
meta: { module: 'notifications', component: 'notification-bell', action: 'load' },