* docs(PBI-76): plan for user-settings DB-store Persists view/filter prefs in User.settings (Json) instead of localStorage. SSR-correct hydration, cross-tab sync via LISTEN/NOTIFY + SSE, cross-device persistence. Phased: 0=infra, 1=migrate flicker sources, 2=cookie consolidation. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(PBI-76): User.settings json column + migration Adds JSONB column to users table for persistent user prefs. Idempotent SQL — safe on databases where column already exists. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(PBI-76): user-settings types and merge helpers Zod schema for User.settings shape (views/devTools), deep-merge helper that replaces arrays and merges nested objects, and a safe parser that returns defaults on invalid input. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(PBI-76): updateUserSettingsAction with notify Validates patch via Zod, deep-merges with current settings in a transaction, persists to DB, and emits pg_notify on scrum4me_changes for cross-tab/cross-device sync. Demo accounts get 403, unauthenticated 401, invalid input 422. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(PBI-76): user-settings zustand store with optimistic flow Hydrate from prop (SSR-correct), setPref via path with optimistic update + rollback on server error, applyServerPatch for SSE-driven cross-tab updates. Demo accounts skip server-write entirely. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(PBI-76): SSE route for user-settings User-scoped /api/realtime/user-settings stream that filters scrum4me_changes notifications on kind=user_settings and matching userId. Forwards the patch as a data: event so other tabs can applyServerPatch without re-fetching settings. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(PBI-76): user-settings bridge mounted in app layout Hydrates the zustand store with the user's persisted settings via prop (SSR-correct, no flicker). Opens an EventSource to /api/realtime/user-settings so changes from other tabs/devices flow into the same store. Demo accounts skip the SSE subscription. Layout now selects user.settings alongside the other user fields, no extra DB roundtrip. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * test(PBI-76): user-settings lib/action/store coverage 22 vitest cases covering merge semantics (no mutation, array replace, nested merge), Zod schema strictness, server action auth/demo/validation paths, and the optimistic store flow including rollback and demo-mode skip. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(PBI-76): sync package-lock to v1.3.3 Lockfile drifted after @prisma/client reinstall during the schema regenerate. No dependency changes — just the version field tracking package.json bumped in #184. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
93 lines
3.4 KiB
TypeScript
93 lines
3.4 KiB
TypeScript
import { redirect } from 'next/navigation'
|
|
import { requireSession } from '@/lib/auth-guard'
|
|
import { prisma } from '@/lib/prisma'
|
|
import { productAccessFilter } from '@/lib/product-access'
|
|
import { resolveActiveSprint } from '@/lib/active-sprint'
|
|
import { NavBar } from '@/components/shared/nav-bar'
|
|
import { MinWidthBanner } from '@/components/shared/min-width-banner'
|
|
import { StatusBar } from '@/components/shared/status-bar'
|
|
import { SoloRealtimeBridge } from '@/components/solo/realtime-bridge'
|
|
import { NotificationsBridge } from '@/components/notifications/notifications-bridge'
|
|
import { UserSettingsBridge } from '@/components/shared/user-settings-bridge'
|
|
import { parseUserSettings } from '@/lib/user-settings'
|
|
import { AlertToast } from '@/components/shared/alert-toast'
|
|
import { Suspense } from 'react'
|
|
|
|
export default async function AppLayout({ children }: { children: React.ReactNode }) {
|
|
const session = await requireSession()
|
|
|
|
const [user, userRoles, accessibleProducts] = await Promise.all([
|
|
prisma.user.findUnique({
|
|
where: { id: session.userId },
|
|
select: { username: true, email: true, active_product_id: true, min_quota_pct: true, settings: true },
|
|
}),
|
|
prisma.userRole.findMany({
|
|
where: { user_id: session.userId },
|
|
select: { role: true },
|
|
}),
|
|
prisma.product.findMany({
|
|
where: { archived: false, ...productAccessFilter(session.userId) },
|
|
orderBy: { name: 'asc' },
|
|
select: { id: true, name: true },
|
|
}),
|
|
])
|
|
const roles = userRoles.map(r => r.role as string)
|
|
|
|
if (!user) {
|
|
redirect('/login')
|
|
}
|
|
|
|
// Resolve active product — clear stale reference if archived or inaccessible
|
|
let activeProduct: { id: string; name: string } | null = null
|
|
let hasActiveSprint = false
|
|
if (user.active_product_id) {
|
|
const product = await prisma.product.findFirst({
|
|
where: { id: user.active_product_id, archived: false, ...productAccessFilter(session.userId) },
|
|
select: { id: true, name: true },
|
|
})
|
|
if (product) {
|
|
activeProduct = product
|
|
const resolved = await resolveActiveSprint(product.id)
|
|
hasActiveSprint = !!resolved
|
|
} else {
|
|
await prisma.user.update({
|
|
where: { id: session.userId },
|
|
data: { active_product_id: null },
|
|
})
|
|
redirect('/dashboard?alert=product_unavailable')
|
|
}
|
|
}
|
|
|
|
return (
|
|
<div className="h-screen bg-background flex flex-col overflow-hidden">
|
|
<a href="#main-content" className="sr-only focus:not-sr-only focus:fixed focus:top-2 focus:left-2 focus:z-50 focus:px-4 focus:py-2 focus:bg-primary focus:text-primary-foreground focus:rounded-md focus:text-sm">
|
|
Ga naar inhoud
|
|
</a>
|
|
<NavBar
|
|
isDemo={session.isDemo}
|
|
roles={roles}
|
|
userId={session.userId}
|
|
username={user.username}
|
|
email={user.email}
|
|
activeProduct={activeProduct}
|
|
products={accessibleProducts}
|
|
hasActiveSprint={hasActiveSprint}
|
|
minQuotaPct={user.min_quota_pct}
|
|
/>
|
|
<MinWidthBanner />
|
|
<main id="main-content" className="flex-1 flex flex-col overflow-y-auto min-h-0">
|
|
{children}
|
|
</main>
|
|
<StatusBar />
|
|
<SoloRealtimeBridge productId={activeProduct?.id ?? null} />
|
|
<NotificationsBridge userId={session.userId} />
|
|
<UserSettingsBridge
|
|
initial={parseUserSettings(user.settings)}
|
|
isDemo={session.isDemo ?? false}
|
|
/>
|
|
<Suspense>
|
|
<AlertToast />
|
|
</Suspense>
|
|
</div>
|
|
)
|
|
}
|