* feat(PBI-76): extend UserSettings schema with layout Adds layout.splitPanePositions and layout.activeSprints. These will hold values currently kept in client-side and server-side cookies (Phase 2). Two new tests cover the shape. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(PBI-76): migrate SplitPane positions to user-settings store Outside of a drag the store is the source of truth (cross-tab updates flow in for free). During a drag we keep splits in local state so mousemove does not round-trip through the store. On mouseup we persist the final splits via setPref. Removes document.cookie reads/writes — cookieKey is reused as the store-key for backwards compat. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(PBI-76): resolveActiveSprint reads from User.settings lib/active-sprint: - New helpers: getActiveSprintIdFromSettings, setActiveSprintInSettings, clearActiveSprintInSettings — all read/write user.settings.layout.activeSprints. - resolveActiveSprint(productId, userId) — userId now required, falls back to first OPEN, then most recent CLOSED sprint. - Cookie helpers (getActiveSprintIdFromCookie/setActiveSprintCookie/ clearActiveSprintCookie) removed. Callers updated to pass session.userId. The cookie-based fallback path is gone — `actions/active-sprint.ts` and `actions/sprints.ts` will be updated in the next commit (T-917). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(PBI-76): rewrite setActiveSprint callers to use settings setActiveSprintAction, syncActiveSprintCookieAction, and the two sprint-creation paths in actions/sprints.ts now write through setActiveSprintInSettings (which also emits pg_notify for cross-tab sync) instead of dropping a cookie. The action names keep the 'cookie' suffix in the user-visible API for now — clean rename can come later. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(PBI-76): migration helper v2 — handle legacy cookies Bumps marker version to 'v2'. buildMigrationPatch now also scans document.cookie for `sp:*` (split-pane positions) and `active_sprint_*` (active sprint per product) and lifts them into layout.splitPanePositions / layout.activeSprints. clearLegacyStorage replaces clearLegacyLocalStorage and clears both keys and cookies. clearLegacyLocalStorage stays as a deprecated alias so the bridge upgrade is a single rename. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * test(PBI-76): align tests with new SplitPane and active-sprint flow - split-pane.test.tsx: seed positions via Zustand store instead of document.cookie; mock @/actions/user-settings so the prisma client is not transitively initialised in jsdom. - backlog-split-pane.test.tsx: same action mock. - sprint-dates.test.ts: add user.findUnique/update + $executeRaw mocks because createSprintAction now writes to user-settings. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
89 lines
2.7 KiB
TypeScript
89 lines
2.7 KiB
TypeScript
import { z } from 'zod'
|
|
|
|
const PriorityFilter = z.union([
|
|
z.number().int().min(1).max(4),
|
|
z.literal('all'),
|
|
])
|
|
|
|
const SortDir = z.enum(['asc', 'desc'])
|
|
|
|
const SprintBacklogPrefs = z.object({
|
|
filterPriority: PriorityFilter.optional(),
|
|
filterStatus: z.enum(['OPEN', 'IN_SPRINT', 'DONE', 'all']).optional(),
|
|
sort: z.enum(['priority', 'status', 'code']).optional(),
|
|
sortDir: SortDir.optional(),
|
|
collapsedPbis: z.array(z.string()).optional(),
|
|
filterPopoverOpen: z.boolean().optional(),
|
|
}).strict()
|
|
|
|
const PbiListPrefs = z.object({
|
|
sort: z.enum(['priority', 'code', 'date']).optional(),
|
|
filterPriority: PriorityFilter.optional(),
|
|
filterStatus: z.enum(['ready', 'blocked', 'done', 'all']).optional(),
|
|
sortDir: SortDir.optional(),
|
|
}).strict()
|
|
|
|
const StoryPanelPrefs = z.object({
|
|
sort: z.enum(['priority', 'code', 'date']).optional(),
|
|
}).strict()
|
|
|
|
const JobsColumnPrefs = z.object({
|
|
kinds: z.array(z.string()),
|
|
statuses: z.array(z.string()),
|
|
}).strict()
|
|
|
|
const ViewsPrefs = z.object({
|
|
sprintBacklog: SprintBacklogPrefs.optional(),
|
|
pbiList: PbiListPrefs.optional(),
|
|
storyPanel: StoryPanelPrefs.optional(),
|
|
jobsColumns: z.record(z.string(), JobsColumnPrefs).optional(),
|
|
}).strict()
|
|
|
|
const DevToolsPrefs = z.object({
|
|
debugMode: z.boolean().optional(),
|
|
}).strict()
|
|
|
|
const LayoutPrefs = z.object({
|
|
splitPanePositions: z.record(z.string(), z.array(z.number())).optional(),
|
|
activeSprints: z.record(z.string(), z.string()).optional(),
|
|
}).strict()
|
|
|
|
export const UserSettingsSchema = z.object({
|
|
views: ViewsPrefs.optional(),
|
|
devTools: DevToolsPrefs.optional(),
|
|
layout: LayoutPrefs.optional(),
|
|
}).strict()
|
|
|
|
export type UserSettings = z.infer<typeof UserSettingsSchema>
|
|
|
|
export const DEFAULT_USER_SETTINGS: UserSettings = {}
|
|
|
|
function isPlainObject(value: unknown): value is Record<string, unknown> {
|
|
return typeof value === 'object' && value !== null && !Array.isArray(value)
|
|
}
|
|
|
|
export function mergeSettings(
|
|
prev: UserSettings,
|
|
patch: Partial<UserSettings>,
|
|
): UserSettings {
|
|
const out: Record<string, unknown> = { ...prev }
|
|
for (const [key, patchValue] of Object.entries(patch)) {
|
|
if (patchValue === undefined) continue
|
|
const prevValue = (prev as Record<string, unknown>)[key]
|
|
if (isPlainObject(patchValue) && isPlainObject(prevValue)) {
|
|
out[key] = mergeSettings(
|
|
prevValue as UserSettings,
|
|
patchValue as Partial<UserSettings>,
|
|
)
|
|
} else {
|
|
out[key] = patchValue
|
|
}
|
|
}
|
|
return out as UserSettings
|
|
}
|
|
|
|
export function parseUserSettings(raw: unknown): UserSettings {
|
|
if (raw === null || raw === undefined) return DEFAULT_USER_SETTINGS
|
|
const result = UserSettingsSchema.safeParse(raw)
|
|
return result.success ? result.data : DEFAULT_USER_SETTINGS
|
|
}
|