Compare commits
3 Commits
todo/mvp1-
...
todo/mvp1-
| Author | SHA1 | Date | |
|---|---|---|---|
|
d1face36c5
|
|||
|
39178c2d8d
|
|||
|
24676bd384
|
11
TODO.md
11
TODO.md
@@ -160,7 +160,7 @@ This file is the single source of truth for roadmap and delivery progress.
|
|||||||
- [~] [P1] Customer records (contact profile, notes, consent flags, recurrence marker)
|
- [~] [P1] Customer records (contact profile, notes, consent flags, recurrence marker)
|
||||||
- [~] [P1] Customer-to-commission linkage and reuse workflow (no re-entry for recurring customers)
|
- [~] [P1] Customer-to-commission linkage and reuse workflow (no re-entry for recurring customers)
|
||||||
- [~] [P1] Kanban workflow for commissions (new, scoped, in-progress, review, done)
|
- [~] [P1] Kanban workflow for commissions (new, scoped, in-progress, review, done)
|
||||||
- [ ] [P1] Header banner management (message, CTA, active window)
|
- [x] [P1] Header banner management (message, CTA, active window)
|
||||||
- [~] [P1] Announcements management (prominent site notices with schedule, priority, and audience targeting)
|
- [~] [P1] Announcements management (prominent site notices with schedule, priority, and audience targeting)
|
||||||
- [~] [P2] News/blog editorial workflow (draft/review/publish, authoring metadata)
|
- [~] [P2] News/blog editorial workflow (draft/review/publish, authoring metadata)
|
||||||
|
|
||||||
@@ -174,7 +174,7 @@ This file is the single source of truth for roadmap and delivery progress.
|
|||||||
- [ ] [P1] Translation-ready content model for public entities (pages/news/navigation labels)
|
- [ ] [P1] Translation-ready content model for public entities (pages/news/navigation labels)
|
||||||
- [ ] [P2] Artwork views and listing filters
|
- [ ] [P2] Artwork views and listing filters
|
||||||
- [ ] [P1] Commission request submission flow
|
- [ ] [P1] Commission request submission flow
|
||||||
- [ ] [P1] Header banner render logic and fallbacks
|
- [x] [P1] Header banner render logic and fallbacks
|
||||||
- [ ] [P1] Announcement render slots (homepage + optional global/top banner position)
|
- [ ] [P1] Announcement render slots (homepage + optional global/top banner position)
|
||||||
|
|
||||||
### News / Blog (Secondary Track)
|
### News / Blog (Secondary Track)
|
||||||
@@ -186,10 +186,10 @@ This file is the single source of truth for roadmap and delivery progress.
|
|||||||
|
|
||||||
### Testing
|
### Testing
|
||||||
|
|
||||||
- [ ] [P1] Unit tests for content schemas and service logic
|
- [x] [P1] Unit tests for content schemas and service logic
|
||||||
- [ ] [P1] Component tests for admin forms (pages/media/navigation)
|
- [ ] [P1] Component tests for admin forms (pages/media/navigation)
|
||||||
- [ ] [P1] Integration tests for owner invariant and hidden support-user protection
|
- [ ] [P1] Integration tests for owner invariant and hidden support-user protection
|
||||||
- [ ] [P1] Integration tests for registration allow/deny behavior
|
- [x] [P1] Integration tests for registration allow/deny behavior
|
||||||
- [ ] [P1] Integration tests for translated content CRUD and locale-specific validation
|
- [ ] [P1] Integration tests for translated content CRUD and locale-specific validation
|
||||||
- [~] [P1] E2E happy paths: create page, publish, see on public app
|
- [~] [P1] E2E happy paths: create page, publish, see on public app
|
||||||
- [~] [P1] E2E happy paths: media upload + artwork refinement display
|
- [~] [P1] E2E happy paths: media upload + artwork refinement display
|
||||||
@@ -280,6 +280,9 @@ This file is the single source of truth for roadmap and delivery progress.
|
|||||||
- [2026-02-12] Announcements/news baseline added: admin `/announcements` + `/news` management screens and public announcement rendering slots (`global_top`, `homepage`).
|
- [2026-02-12] Announcements/news baseline added: admin `/announcements` + `/news` management screens and public announcement rendering slots (`global_top`, `homepage`).
|
||||||
- [2026-02-12] Public news routes now exist at `/news` and `/news/:slug` (detail restricted to published posts).
|
- [2026-02-12] Public news routes now exist at `/news` and `/news/:slug` (detail restricted to published posts).
|
||||||
- [2026-02-12] Added `e2e/happy-paths.pw.ts` covering admin login, page publish/public rendering, announcement rendering, media upload, and commission status transition.
|
- [2026-02-12] Added `e2e/happy-paths.pw.ts` covering admin login, page publish/public rendering, announcement rendering, media upload, and commission status transition.
|
||||||
|
- [2026-02-12] Expanded unit coverage for content/domain schemas and post service behavior (`packages/content/src/domain-schemas.test.ts`, `packages/db/src/posts.test.ts`).
|
||||||
|
- [2026-02-12] Added auth flow integration tests for `/login`, `/register`, `/welcome` to validate registration allow/deny and owner bootstrap redirects.
|
||||||
|
- [2026-02-12] Admin settings now manage public header banner (enabled/message/CTA), backed by `system_setting` and consumed by public layout rendering.
|
||||||
|
|
||||||
## How We Use This File
|
## How We Use This File
|
||||||
|
|
||||||
|
|||||||
67
apps/admin/src/app/login/page.test.tsx
Normal file
67
apps/admin/src/app/login/page.test.tsx
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
import type { ReactElement } from "react"
|
||||||
|
import { beforeEach, describe, expect, it, vi } from "vitest"
|
||||||
|
|
||||||
|
const { redirectMock, resolveRoleFromServerContextMock, hasOwnerUserMock } = vi.hoisted(() => ({
|
||||||
|
redirectMock: vi.fn((path: string) => {
|
||||||
|
throw new Error(`REDIRECT:${path}`)
|
||||||
|
}),
|
||||||
|
resolveRoleFromServerContextMock: vi.fn(),
|
||||||
|
hasOwnerUserMock: vi.fn(),
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("next/navigation", () => ({
|
||||||
|
redirect: redirectMock,
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("@/lib/access-server", () => ({
|
||||||
|
resolveRoleFromServerContext: resolveRoleFromServerContextMock,
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("@/lib/auth/server", () => ({
|
||||||
|
hasOwnerUser: hasOwnerUserMock,
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("./login-form", () => ({
|
||||||
|
LoginForm: ({ mode }: { mode: string }) => ({ type: "login-form", props: { mode } }),
|
||||||
|
}))
|
||||||
|
|
||||||
|
import LoginPage from "./page"
|
||||||
|
|
||||||
|
function expectRedirect(call: () => Promise<unknown>, path: string) {
|
||||||
|
return expect(call()).rejects.toThrow(`REDIRECT:${path}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("login page", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
redirectMock.mockClear()
|
||||||
|
resolveRoleFromServerContextMock.mockReset()
|
||||||
|
hasOwnerUserMock.mockReset()
|
||||||
|
})
|
||||||
|
|
||||||
|
it("redirects authenticated users to dashboard", async () => {
|
||||||
|
resolveRoleFromServerContextMock.mockResolvedValue("manager")
|
||||||
|
|
||||||
|
await expectRedirect(() => LoginPage({ searchParams: Promise.resolve({}) }), "/")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("redirects to welcome if owner is missing", async () => {
|
||||||
|
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||||
|
hasOwnerUserMock.mockResolvedValue(false)
|
||||||
|
|
||||||
|
await expectRedirect(
|
||||||
|
() => LoginPage({ searchParams: Promise.resolve({ next: "/settings" }) }),
|
||||||
|
"/welcome?next=%2Fsettings",
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("renders sign-in mode once owner exists", async () => {
|
||||||
|
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||||
|
hasOwnerUserMock.mockResolvedValue(true)
|
||||||
|
|
||||||
|
const page = (await LoginPage({ searchParams: Promise.resolve({}) })) as ReactElement<{
|
||||||
|
mode: string
|
||||||
|
}>
|
||||||
|
|
||||||
|
expect(page.props.mode).toBe("signin")
|
||||||
|
})
|
||||||
|
})
|
||||||
91
apps/admin/src/app/register/page.test.tsx
Normal file
91
apps/admin/src/app/register/page.test.tsx
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
import type { ReactElement } from "react"
|
||||||
|
import { beforeEach, describe, expect, it, vi } from "vitest"
|
||||||
|
|
||||||
|
const {
|
||||||
|
redirectMock,
|
||||||
|
resolveRoleFromServerContextMock,
|
||||||
|
hasOwnerUserMock,
|
||||||
|
isSelfRegistrationEnabledMock,
|
||||||
|
} = vi.hoisted(() => ({
|
||||||
|
redirectMock: vi.fn((path: string) => {
|
||||||
|
throw new Error(`REDIRECT:${path}`)
|
||||||
|
}),
|
||||||
|
resolveRoleFromServerContextMock: vi.fn(),
|
||||||
|
hasOwnerUserMock: vi.fn(),
|
||||||
|
isSelfRegistrationEnabledMock: vi.fn(),
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("next/navigation", () => ({
|
||||||
|
redirect: redirectMock,
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("@/lib/access-server", () => ({
|
||||||
|
resolveRoleFromServerContext: resolveRoleFromServerContextMock,
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("@/lib/auth/server", () => ({
|
||||||
|
hasOwnerUser: hasOwnerUserMock,
|
||||||
|
isSelfRegistrationEnabled: isSelfRegistrationEnabledMock,
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("@/app/login/login-form", () => ({
|
||||||
|
LoginForm: ({ mode }: { mode: string }) => ({ type: "login-form", props: { mode } }),
|
||||||
|
}))
|
||||||
|
|
||||||
|
import RegisterPage from "./page"
|
||||||
|
|
||||||
|
function expectRedirect(call: () => Promise<unknown>, path: string) {
|
||||||
|
return expect(call()).rejects.toThrow(`REDIRECT:${path}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("register page", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
redirectMock.mockClear()
|
||||||
|
resolveRoleFromServerContextMock.mockReset()
|
||||||
|
hasOwnerUserMock.mockReset()
|
||||||
|
isSelfRegistrationEnabledMock.mockReset()
|
||||||
|
})
|
||||||
|
|
||||||
|
it("redirects authenticated users to dashboard", async () => {
|
||||||
|
resolveRoleFromServerContextMock.mockResolvedValue("admin")
|
||||||
|
|
||||||
|
await expectRedirect(
|
||||||
|
() => RegisterPage({ searchParams: Promise.resolve({ next: "/pages" }) }),
|
||||||
|
"/",
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("redirects to welcome when no owner exists", async () => {
|
||||||
|
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||||
|
hasOwnerUserMock.mockResolvedValue(false)
|
||||||
|
|
||||||
|
await expectRedirect(
|
||||||
|
() => RegisterPage({ searchParams: Promise.resolve({ next: "/pages" }) }),
|
||||||
|
"/welcome?next=%2Fpages",
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("shows disabled mode when self registration is off", async () => {
|
||||||
|
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||||
|
hasOwnerUserMock.mockResolvedValue(true)
|
||||||
|
isSelfRegistrationEnabledMock.mockResolvedValue(false)
|
||||||
|
|
||||||
|
const page = (await RegisterPage({ searchParams: Promise.resolve({}) })) as ReactElement<{
|
||||||
|
mode: string
|
||||||
|
}>
|
||||||
|
|
||||||
|
expect(page.props.mode).toBe("signup-disabled")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("shows sign-up mode when self registration is enabled", async () => {
|
||||||
|
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||||
|
hasOwnerUserMock.mockResolvedValue(true)
|
||||||
|
isSelfRegistrationEnabledMock.mockResolvedValue(true)
|
||||||
|
|
||||||
|
const page = (await RegisterPage({ searchParams: Promise.resolve({}) })) as ReactElement<{
|
||||||
|
mode: string
|
||||||
|
}>
|
||||||
|
|
||||||
|
expect(page.props.mode).toBe("signup-user")
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -1,4 +1,9 @@
|
|||||||
import { isAdminSelfRegistrationEnabled, setAdminSelfRegistrationEnabled } from "@cms/db"
|
import {
|
||||||
|
getPublicHeaderBannerConfig,
|
||||||
|
isAdminSelfRegistrationEnabled,
|
||||||
|
setAdminSelfRegistrationEnabled,
|
||||||
|
setPublicHeaderBannerConfig,
|
||||||
|
} from "@cms/db"
|
||||||
import { Button } from "@cms/ui/button"
|
import { Button } from "@cms/ui/button"
|
||||||
import { revalidatePath } from "next/cache"
|
import { revalidatePath } from "next/cache"
|
||||||
import Link from "next/link"
|
import Link from "next/link"
|
||||||
@@ -79,6 +84,53 @@ async function updateRegistrationPolicyAction(formData: FormData) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function updatePublicHeaderBannerAction(formData: FormData) {
|
||||||
|
"use server"
|
||||||
|
|
||||||
|
await requireSettingsPermission()
|
||||||
|
const t = await getSettingsTranslator()
|
||||||
|
const enabled = formData.get("bannerEnabled") === "on"
|
||||||
|
const message = toSingleValue(formData.get("bannerMessage")?.toString())?.trim() ?? ""
|
||||||
|
const ctaLabel = toSingleValue(formData.get("bannerCtaLabel")?.toString())?.trim() ?? ""
|
||||||
|
const ctaHref = toSingleValue(formData.get("bannerCtaHref")?.toString())?.trim() ?? ""
|
||||||
|
|
||||||
|
if (enabled && message.length === 0) {
|
||||||
|
redirect(
|
||||||
|
`/settings?error=${encodeURIComponent(
|
||||||
|
t(
|
||||||
|
"settings.banner.errors.messageRequired",
|
||||||
|
"Banner message is required while banner is enabled.",
|
||||||
|
),
|
||||||
|
)}`,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await setPublicHeaderBannerConfig({
|
||||||
|
enabled,
|
||||||
|
message,
|
||||||
|
ctaLabel: ctaLabel || null,
|
||||||
|
ctaHref: ctaHref || null,
|
||||||
|
})
|
||||||
|
} catch {
|
||||||
|
redirect(
|
||||||
|
`/settings?error=${encodeURIComponent(
|
||||||
|
t(
|
||||||
|
"settings.banner.errors.updateFailed",
|
||||||
|
"Saving banner settings failed. Ensure database migrations are applied.",
|
||||||
|
),
|
||||||
|
)}`,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
revalidatePath("/settings")
|
||||||
|
redirect(
|
||||||
|
`/settings?notice=${encodeURIComponent(
|
||||||
|
t("settings.banner.success.updated", "Public header banner settings updated."),
|
||||||
|
)}`,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
export default async function SettingsPage({ searchParams }: { searchParams: SearchParamsInput }) {
|
export default async function SettingsPage({ searchParams }: { searchParams: SearchParamsInput }) {
|
||||||
const role = await requirePermissionForRoute({
|
const role = await requirePermissionForRoute({
|
||||||
nextPath: "/settings",
|
nextPath: "/settings",
|
||||||
@@ -86,10 +138,11 @@ export default async function SettingsPage({ searchParams }: { searchParams: Sea
|
|||||||
scope: "global",
|
scope: "global",
|
||||||
})
|
})
|
||||||
|
|
||||||
const [params, locale, isRegistrationEnabled] = await Promise.all([
|
const [params, locale, isRegistrationEnabled, publicBanner] = await Promise.all([
|
||||||
searchParams,
|
searchParams,
|
||||||
resolveAdminLocale(),
|
resolveAdminLocale(),
|
||||||
isAdminSelfRegistrationEnabled(),
|
isAdminSelfRegistrationEnabled(),
|
||||||
|
getPublicHeaderBannerConfig(),
|
||||||
])
|
])
|
||||||
const messages = await getAdminMessages(locale)
|
const messages = await getAdminMessages(locale)
|
||||||
const t = (key: string, fallback: string) => translateMessage(messages, key, fallback)
|
const t = (key: string, fallback: string) => translateMessage(messages, key, fallback)
|
||||||
@@ -175,6 +228,72 @@ export default async function SettingsPage({ searchParams }: { searchParams: Sea
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section className="rounded-xl border border-neutral-200 p-6">
|
||||||
|
<div className="space-y-5">
|
||||||
|
<div className="space-y-2">
|
||||||
|
<h2 className="text-xl font-medium">
|
||||||
|
{t("settings.banner.title", "Public header banner")}
|
||||||
|
</h2>
|
||||||
|
<p className="text-sm text-neutral-600">
|
||||||
|
{t(
|
||||||
|
"settings.banner.description",
|
||||||
|
"Control the top banner shown on the public app header.",
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form action={updatePublicHeaderBannerAction} className="space-y-4">
|
||||||
|
<label className="flex items-center gap-3 text-sm">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
name="bannerEnabled"
|
||||||
|
defaultChecked={publicBanner.enabled}
|
||||||
|
className="h-4 w-4 rounded border-neutral-300"
|
||||||
|
/>
|
||||||
|
<span>{t("settings.banner.enabledLabel", "Enable public header banner")}</span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label className="space-y-1 text-sm">
|
||||||
|
<span className="text-xs text-neutral-600">
|
||||||
|
{t("settings.banner.messageLabel", "Message")}
|
||||||
|
</span>
|
||||||
|
<input
|
||||||
|
name="bannerMessage"
|
||||||
|
defaultValue={publicBanner.message}
|
||||||
|
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div className="grid gap-3 md:grid-cols-2">
|
||||||
|
<label className="space-y-1 text-sm">
|
||||||
|
<span className="text-xs text-neutral-600">
|
||||||
|
{t("settings.banner.ctaLabelLabel", "CTA label (optional)")}
|
||||||
|
</span>
|
||||||
|
<input
|
||||||
|
name="bannerCtaLabel"
|
||||||
|
defaultValue={publicBanner.ctaLabel ?? ""}
|
||||||
|
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label className="space-y-1 text-sm">
|
||||||
|
<span className="text-xs text-neutral-600">
|
||||||
|
{t("settings.banner.ctaHrefLabel", "CTA URL (optional)")}
|
||||||
|
</span>
|
||||||
|
<input
|
||||||
|
name="bannerCtaHref"
|
||||||
|
defaultValue={publicBanner.ctaHref ?? ""}
|
||||||
|
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Button type="submit">
|
||||||
|
{t("settings.banner.actions.save", "Save banner settings")}
|
||||||
|
</Button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
</AdminShell>
|
</AdminShell>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
70
apps/admin/src/app/welcome/page.test.tsx
Normal file
70
apps/admin/src/app/welcome/page.test.tsx
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
import type { ReactElement } from "react"
|
||||||
|
import { beforeEach, describe, expect, it, vi } from "vitest"
|
||||||
|
|
||||||
|
const { redirectMock, resolveRoleFromServerContextMock, hasOwnerUserMock } = vi.hoisted(() => ({
|
||||||
|
redirectMock: vi.fn((path: string) => {
|
||||||
|
throw new Error(`REDIRECT:${path}`)
|
||||||
|
}),
|
||||||
|
resolveRoleFromServerContextMock: vi.fn(),
|
||||||
|
hasOwnerUserMock: vi.fn(),
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("next/navigation", () => ({
|
||||||
|
redirect: redirectMock,
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("@/lib/access-server", () => ({
|
||||||
|
resolveRoleFromServerContext: resolveRoleFromServerContextMock,
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("@/lib/auth/server", () => ({
|
||||||
|
hasOwnerUser: hasOwnerUserMock,
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("@/app/login/login-form", () => ({
|
||||||
|
LoginForm: ({ mode }: { mode: string }) => ({ type: "login-form", props: { mode } }),
|
||||||
|
}))
|
||||||
|
|
||||||
|
import WelcomePage from "./page"
|
||||||
|
|
||||||
|
function expectRedirect(call: () => Promise<unknown>, path: string) {
|
||||||
|
return expect(call()).rejects.toThrow(`REDIRECT:${path}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("welcome page", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
redirectMock.mockClear()
|
||||||
|
resolveRoleFromServerContextMock.mockReset()
|
||||||
|
hasOwnerUserMock.mockReset()
|
||||||
|
})
|
||||||
|
|
||||||
|
it("redirects authenticated users to dashboard", async () => {
|
||||||
|
resolveRoleFromServerContextMock.mockResolvedValue("admin")
|
||||||
|
|
||||||
|
await expectRedirect(
|
||||||
|
() => WelcomePage({ searchParams: Promise.resolve({ next: "/media" }) }),
|
||||||
|
"/",
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("redirects to login after owner exists", async () => {
|
||||||
|
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||||
|
hasOwnerUserMock.mockResolvedValue(true)
|
||||||
|
|
||||||
|
await expectRedirect(
|
||||||
|
() => WelcomePage({ searchParams: Promise.resolve({ next: "/media" }) }),
|
||||||
|
"/login?next=%2Fmedia",
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("renders owner sign-up mode when owner is missing", async () => {
|
||||||
|
resolveRoleFromServerContextMock.mockResolvedValue(null)
|
||||||
|
hasOwnerUserMock.mockResolvedValue(false)
|
||||||
|
|
||||||
|
const page = (await WelcomePage({ searchParams: Promise.resolve({}) })) as ReactElement<{
|
||||||
|
mode: string
|
||||||
|
}>
|
||||||
|
|
||||||
|
expect(page.props.mode).toBe("signup-owner")
|
||||||
|
})
|
||||||
|
})
|
||||||
67
packages/content/src/domain-schemas.test.ts
Normal file
67
packages/content/src/domain-schemas.test.ts
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
import { describe, expect, it } from "vitest"
|
||||||
|
|
||||||
|
import {
|
||||||
|
createAnnouncementInputSchema,
|
||||||
|
createCommissionInputSchema,
|
||||||
|
createCustomerInputSchema,
|
||||||
|
createNavigationMenuInputSchema,
|
||||||
|
createPageInputSchema,
|
||||||
|
updateCommissionStatusInputSchema,
|
||||||
|
updateNavigationItemInputSchema,
|
||||||
|
} from "./index"
|
||||||
|
|
||||||
|
describe("domain schemas", () => {
|
||||||
|
it("applies announcement defaults", () => {
|
||||||
|
const result = createAnnouncementInputSchema.parse({
|
||||||
|
title: "Notice",
|
||||||
|
message: "Open slots",
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(result.placement).toBe("global_top")
|
||||||
|
expect(result.priority).toBe(100)
|
||||||
|
expect(result.isVisible).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("validates customer and commission payloads", () => {
|
||||||
|
const customer = createCustomerInputSchema.safeParse({
|
||||||
|
name: "Ada",
|
||||||
|
email: "ada@example.com",
|
||||||
|
})
|
||||||
|
const commission = createCommissionInputSchema.safeParse({
|
||||||
|
title: "Portrait",
|
||||||
|
status: "new",
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(customer.success).toBe(true)
|
||||||
|
expect(commission.success).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("rejects invalid commission status updates", () => {
|
||||||
|
const result = updateCommissionStatusInputSchema.safeParse({
|
||||||
|
id: "550e8400-e29b-41d4-a716-446655440000",
|
||||||
|
status: "invalid",
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(result.success).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("validates page and navigation payload constraints", () => {
|
||||||
|
const page = createPageInputSchema.safeParse({
|
||||||
|
title: "About",
|
||||||
|
slug: "about",
|
||||||
|
content: "About page",
|
||||||
|
})
|
||||||
|
const menu = createNavigationMenuInputSchema.safeParse({
|
||||||
|
name: "Primary",
|
||||||
|
slug: "primary",
|
||||||
|
})
|
||||||
|
const navUpdate = updateNavigationItemInputSchema.safeParse({
|
||||||
|
id: "550e8400-e29b-41d4-a716-446655440000",
|
||||||
|
sortOrder: -1,
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(page.success).toBe(true)
|
||||||
|
expect(menu.success).toBe(true)
|
||||||
|
expect(navUpdate.success).toBe(false)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -57,9 +57,11 @@ export {
|
|||||||
registerPostCrudAuditHook,
|
registerPostCrudAuditHook,
|
||||||
updatePost,
|
updatePost,
|
||||||
} from "./posts"
|
} from "./posts"
|
||||||
export type { PublicHeaderBanner } from "./settings"
|
export type { PublicHeaderBanner, PublicHeaderBannerConfig } from "./settings"
|
||||||
export {
|
export {
|
||||||
getPublicHeaderBanner,
|
getPublicHeaderBanner,
|
||||||
|
getPublicHeaderBannerConfig,
|
||||||
isAdminSelfRegistrationEnabled,
|
isAdminSelfRegistrationEnabled,
|
||||||
setAdminSelfRegistrationEnabled,
|
setAdminSelfRegistrationEnabled,
|
||||||
|
setPublicHeaderBannerConfig,
|
||||||
} from "./settings"
|
} from "./settings"
|
||||||
|
|||||||
75
packages/db/src/posts.test.ts
Normal file
75
packages/db/src/posts.test.ts
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
import { beforeEach, describe, expect, it, vi } from "vitest"
|
||||||
|
|
||||||
|
const { mockDb } = vi.hoisted(() => ({
|
||||||
|
mockDb: {
|
||||||
|
post: {
|
||||||
|
create: vi.fn(),
|
||||||
|
findMany: vi.fn(),
|
||||||
|
findUnique: vi.fn(),
|
||||||
|
update: vi.fn(),
|
||||||
|
delete: vi.fn(),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("./client", () => ({
|
||||||
|
db: mockDb,
|
||||||
|
}))
|
||||||
|
|
||||||
|
import { createPost, getPostBySlug, listPosts, updatePost } from "./posts"
|
||||||
|
|
||||||
|
describe("posts service", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
for (const fn of Object.values(mockDb.post)) {
|
||||||
|
if (typeof fn === "function") {
|
||||||
|
fn.mockReset()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
it("lists posts ordered by update date desc", async () => {
|
||||||
|
mockDb.post.findMany.mockResolvedValue([])
|
||||||
|
|
||||||
|
await listPosts()
|
||||||
|
|
||||||
|
expect(mockDb.post.findMany).toHaveBeenCalledTimes(1)
|
||||||
|
expect(mockDb.post.findMany.mock.calls[0]?.[0]).toMatchObject({
|
||||||
|
orderBy: {
|
||||||
|
updatedAt: "desc",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
it("parses create and update payloads through crud service", async () => {
|
||||||
|
mockDb.post.create.mockResolvedValue({ id: "post-1" })
|
||||||
|
mockDb.post.findUnique.mockResolvedValue({ id: "550e8400-e29b-41d4-a716-446655440000" })
|
||||||
|
mockDb.post.update.mockResolvedValue({ id: "post-1" })
|
||||||
|
|
||||||
|
await createPost({
|
||||||
|
title: "A title",
|
||||||
|
slug: "a-title",
|
||||||
|
body: "Body",
|
||||||
|
status: "draft",
|
||||||
|
})
|
||||||
|
|
||||||
|
await updatePost("550e8400-e29b-41d4-a716-446655440000", {
|
||||||
|
title: "Updated",
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(mockDb.post.create).toHaveBeenCalledTimes(1)
|
||||||
|
expect(mockDb.post.update).toHaveBeenCalledTimes(1)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("finds posts by slug", async () => {
|
||||||
|
mockDb.post.findUnique.mockResolvedValue({ id: "post-1", slug: "hello" })
|
||||||
|
|
||||||
|
await getPostBySlug("hello")
|
||||||
|
|
||||||
|
expect(mockDb.post.findUnique).toHaveBeenCalledTimes(1)
|
||||||
|
expect(mockDb.post.findUnique).toHaveBeenCalledWith({
|
||||||
|
where: {
|
||||||
|
slug: "hello",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
92
packages/db/src/settings.test.ts
Normal file
92
packages/db/src/settings.test.ts
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
import { beforeEach, describe, expect, it, vi } from "vitest"
|
||||||
|
|
||||||
|
const { mockDb } = vi.hoisted(() => ({
|
||||||
|
mockDb: {
|
||||||
|
systemSetting: {
|
||||||
|
findUnique: vi.fn(),
|
||||||
|
upsert: vi.fn(),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}))
|
||||||
|
|
||||||
|
vi.mock("./client", () => ({
|
||||||
|
db: mockDb,
|
||||||
|
}))
|
||||||
|
|
||||||
|
import {
|
||||||
|
getPublicHeaderBanner,
|
||||||
|
getPublicHeaderBannerConfig,
|
||||||
|
isAdminSelfRegistrationEnabled,
|
||||||
|
setPublicHeaderBannerConfig,
|
||||||
|
} from "./settings"
|
||||||
|
|
||||||
|
describe("settings service", () => {
|
||||||
|
const previousEnv = process.env.CMS_ADMIN_SELF_REGISTRATION_ENABLED
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
mockDb.systemSetting.findUnique.mockReset()
|
||||||
|
mockDb.systemSetting.upsert.mockReset()
|
||||||
|
process.env.CMS_ADMIN_SELF_REGISTRATION_ENABLED = previousEnv
|
||||||
|
})
|
||||||
|
|
||||||
|
it("falls back to env flag when registration setting is missing", async () => {
|
||||||
|
process.env.CMS_ADMIN_SELF_REGISTRATION_ENABLED = "true"
|
||||||
|
mockDb.systemSetting.findUnique.mockResolvedValue(null)
|
||||||
|
|
||||||
|
const enabled = await isAdminSelfRegistrationEnabled()
|
||||||
|
|
||||||
|
expect(enabled).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("reads active public header banner payload", async () => {
|
||||||
|
mockDb.systemSetting.findUnique.mockResolvedValue({
|
||||||
|
value: JSON.stringify({
|
||||||
|
enabled: true,
|
||||||
|
message: "Commissions open",
|
||||||
|
ctaLabel: "Book now",
|
||||||
|
ctaHref: "/contact",
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
|
||||||
|
const banner = await getPublicHeaderBanner()
|
||||||
|
|
||||||
|
expect(banner).toEqual({
|
||||||
|
message: "Commissions open",
|
||||||
|
ctaLabel: "Book now",
|
||||||
|
ctaHref: "/contact",
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
it("returns a disabled default config for invalid data", async () => {
|
||||||
|
mockDb.systemSetting.findUnique.mockResolvedValue({
|
||||||
|
value: "not-json",
|
||||||
|
})
|
||||||
|
|
||||||
|
const config = await getPublicHeaderBannerConfig()
|
||||||
|
|
||||||
|
expect(config).toEqual({
|
||||||
|
enabled: false,
|
||||||
|
message: "",
|
||||||
|
ctaLabel: null,
|
||||||
|
ctaHref: null,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
it("writes banner config to system settings", async () => {
|
||||||
|
mockDb.systemSetting.upsert.mockResolvedValue({})
|
||||||
|
|
||||||
|
await setPublicHeaderBannerConfig({
|
||||||
|
enabled: true,
|
||||||
|
message: "Holiday schedule",
|
||||||
|
ctaLabel: "Details",
|
||||||
|
ctaHref: "/news",
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(mockDb.systemSetting.upsert).toHaveBeenCalledTimes(1)
|
||||||
|
expect(mockDb.systemSetting.upsert.mock.calls[0]?.[0]).toMatchObject({
|
||||||
|
where: {
|
||||||
|
key: "public.header_banner",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -16,6 +16,13 @@ export type PublicHeaderBanner = {
|
|||||||
ctaHref?: string
|
ctaHref?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type PublicHeaderBannerConfig = {
|
||||||
|
enabled: boolean
|
||||||
|
message: string
|
||||||
|
ctaLabel: string | null
|
||||||
|
ctaHref: string | null
|
||||||
|
}
|
||||||
|
|
||||||
function resolveEnvFallback(): boolean {
|
function resolveEnvFallback(): boolean {
|
||||||
return process.env.CMS_ADMIN_SELF_REGISTRATION_ENABLED === "true"
|
return process.env.CMS_ADMIN_SELF_REGISTRATION_ENABLED === "true"
|
||||||
}
|
}
|
||||||
@@ -114,3 +121,69 @@ export async function getPublicHeaderBanner(): Promise<PublicHeaderBanner | null
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function getPublicHeaderBannerConfig(): Promise<PublicHeaderBannerConfig> {
|
||||||
|
try {
|
||||||
|
const setting = await db.systemSetting.findUnique({
|
||||||
|
where: { key: PUBLIC_HEADER_BANNER_KEY },
|
||||||
|
select: { value: true },
|
||||||
|
})
|
||||||
|
|
||||||
|
if (!setting) {
|
||||||
|
return {
|
||||||
|
enabled: false,
|
||||||
|
message: "",
|
||||||
|
ctaLabel: null,
|
||||||
|
ctaHref: null,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const parsed = parsePublicHeaderBanner(setting.value)
|
||||||
|
|
||||||
|
if (!parsed) {
|
||||||
|
return {
|
||||||
|
enabled: false,
|
||||||
|
message: "",
|
||||||
|
ctaLabel: null,
|
||||||
|
ctaHref: null,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
enabled: parsed.enabled,
|
||||||
|
message: parsed.message,
|
||||||
|
ctaLabel: parsed.ctaLabel ?? null,
|
||||||
|
ctaHref: parsed.ctaHref ?? null,
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
return {
|
||||||
|
enabled: false,
|
||||||
|
message: "",
|
||||||
|
ctaLabel: null,
|
||||||
|
ctaHref: null,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function setPublicHeaderBannerConfig(input: PublicHeaderBannerConfig): Promise<void> {
|
||||||
|
await db.systemSetting.upsert({
|
||||||
|
where: { key: PUBLIC_HEADER_BANNER_KEY },
|
||||||
|
create: {
|
||||||
|
key: PUBLIC_HEADER_BANNER_KEY,
|
||||||
|
value: JSON.stringify({
|
||||||
|
enabled: input.enabled,
|
||||||
|
message: input.message,
|
||||||
|
ctaLabel: input.ctaLabel ?? undefined,
|
||||||
|
ctaHref: input.ctaHref ?? undefined,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
update: {
|
||||||
|
value: JSON.stringify({
|
||||||
|
enabled: input.enabled,
|
||||||
|
message: input.message,
|
||||||
|
ctaLabel: input.ctaLabel ?? undefined,
|
||||||
|
ctaHref: input.ctaHref ?? undefined,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user