Compare commits

..

1 Commits

Author SHA1 Message Date
741883465c feat(commissions): add editable assignment and artwork linkage 2026-02-12 22:59:53 +01:00
7 changed files with 235 additions and 9 deletions

View File

@@ -148,10 +148,10 @@ This file is the single source of truth for roadmap and delivery progress.
- [x] [P1] Users management (invite, roles, status) - [x] [P1] Users management (invite, roles, status)
- [x] [P1] Disable/ban user function and enforcement in auth/session checks - [x] [P1] Disable/ban user function and enforcement in auth/session checks
- [x] [P1] Owner/support protection rules in user management actions (cannot delete/demote) - [x] [P1] Owner/support protection rules in user management actions (cannot delete/demote)
- [~] [P1] Commissions management (request intake, owner, due date, notes, linked customer, linked artworks) - [x] [P1] Commissions management (request intake, owner, due date, notes, linked customer, linked artworks)
- [~] [P1] Customer records (contact profile, notes, consent flags, recurrence marker) - [x] [P1] Customer records (contact profile, notes, consent flags, recurrence marker)
- [~] [P1] Customer-to-commission linkage and reuse workflow (no re-entry for recurring customers) - [x] [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) - [x] [P1] Kanban workflow for commissions (new, scoped, in-progress, review, done)
- [x] [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)
@@ -368,6 +368,7 @@ This file is the single source of truth for roadmap and delivery progress.
- [2026-02-12] Page builder reusable blocks completed: admin block editor now supports full field editing + ordering controls for hero/rich-text/gallery/cta/form/price-cards; public renderer includes form-link behavior for `contact`/`commission` keys. - [2026-02-12] Page builder reusable blocks completed: admin block editor now supports full field editing + ordering controls for hero/rich-text/gallery/cta/form/price-cards; public renderer includes form-link behavior for `contact`/`commission` keys.
- [2026-02-12] Navigation management completed: admin `/navigation` now supports menu update/delete controls, nested item parent selection via menu-local dropdown, and full order/visibility updates across menus and items. - [2026-02-12] Navigation management completed: admin `/navigation` now supports menu update/delete controls, nested item parent selection via menu-local dropdown, and full order/visibility updates across menus and items.
- [2026-02-12] Users management baseline completed: admin `/users` now supports managed user creation, role changes (`admin/editor/manager`), status changes (ban/unban), and protected/system guardrails for role-change/delete/ban actions. - [2026-02-12] Users management baseline completed: admin `/users` now supports managed user creation, role changes (`admin/editor/manager`), status changes (ban/unban), and protected/system guardrails for role-change/delete/ban actions.
- [2026-02-12] Commissions management completed: admin kanban cards now include inline detail editing (assignee/customer/budget/due date/notes), linked-artwork references via `linkedArtworkIds`, and creation/edit flows use assignable users instead of raw ID entry.
- [2026-02-12] Public UX pass: commission request flow now reports explicit invalid budget range errors, and header navigation now falls back to localized defaults (`home`, `portfolio`, `news`, `commissions`) when no CMS menu exists; seed data now creates those default menu entries. - [2026-02-12] Public UX pass: commission request flow now reports explicit invalid budget range errors, and header navigation now falls back to localized defaults (`home`, `portfolio`, `news`, `commissions`) when no CMS menu exists; seed data now creates those default menu entries.
- [2026-02-12] Added `e2e/public-rendering.pw.ts` web coverage for fallback navigation visibility, portfolio routes, and commission submission validation (invalid budget range + successful submission path). - [2026-02-12] Added `e2e/public-rendering.pw.ts` web coverage for fallback navigation visibility, portfolio routes, and commission submission validation (invalid budget range + successful submission path).
- [2026-02-12] Testing execution is temporarily paused for delivery velocity: root test scripts are stubbed and CI test steps are disabled; all testing backlog is consolidated under `MVP 3: Testing and Quality`. - [2026-02-12] Testing execution is temporarily paused for delivery velocity: root test scripts are stubbed and CI test steps are disabled; all testing backlog is consolidated under `MVP 3: Testing and Quality`.

View File

@@ -2,8 +2,11 @@ import {
commissionKanbanOrder, commissionKanbanOrder,
createCommission, createCommission,
createCustomer, createCustomer,
db,
listArtworks,
listCommissions, listCommissions,
listCustomers, listCustomers,
updateCommission,
updateCommissionStatus, updateCommissionStatus,
} from "@cms/db" } from "@cms/db"
import { Button } from "@cms/ui/button" import { Button } from "@cms/ui/button"
@@ -67,6 +70,19 @@ function readNullableDate(formData: FormData, field: string): Date | null {
return parsed return parsed
} }
function readUuidList(formData: FormData, field: string): string[] {
const raw = readInputString(formData, field)
if (!raw) {
return []
}
return raw
.split(",")
.map((entry) => entry.trim())
.filter((entry) => entry.length > 0)
}
function redirectWithState(params: { notice?: string; error?: string }) { function redirectWithState(params: { notice?: string; error?: string }) {
const query = new URLSearchParams() const query = new URLSearchParams()
@@ -124,6 +140,7 @@ async function createCommissionAction(formData: FormData) {
status: readInputString(formData, "status"), status: readInputString(formData, "status"),
customerId: readNullableString(formData, "customerId"), customerId: readNullableString(formData, "customerId"),
assignedUserId: readNullableString(formData, "assignedUserId"), assignedUserId: readNullableString(formData, "assignedUserId"),
linkedArtworkIds: readUuidList(formData, "linkedArtworkIds"),
budgetMin: readNullableNumber(formData, "budgetMin"), budgetMin: readNullableNumber(formData, "budgetMin"),
budgetMax: readNullableNumber(formData, "budgetMax"), budgetMax: readNullableNumber(formData, "budgetMax"),
dueAt: readNullableDate(formData, "dueAt"), dueAt: readNullableDate(formData, "dueAt"),
@@ -136,6 +153,35 @@ async function createCommissionAction(formData: FormData) {
redirectWithState({ notice: "Commission created." }) redirectWithState({ notice: "Commission created." })
} }
async function updateCommissionAction(formData: FormData) {
"use server"
await requirePermissionForRoute({
nextPath: "/commissions",
permission: "commissions:write",
scope: "own",
})
try {
await updateCommission({
id: readInputString(formData, "id"),
title: readInputString(formData, "title"),
description: readNullableString(formData, "description"),
customerId: readNullableString(formData, "customerId"),
assignedUserId: readNullableString(formData, "assignedUserId"),
linkedArtworkIds: readUuidList(formData, "linkedArtworkIds"),
budgetMin: readNullableNumber(formData, "budgetMin"),
budgetMax: readNullableNumber(formData, "budgetMax"),
dueAt: readNullableDate(formData, "dueAt"),
})
} catch {
redirectWithState({ error: "Failed to update commission details." })
}
revalidatePath("/commissions")
redirectWithState({ notice: "Commission updated." })
}
async function updateCommissionStatusAction(formData: FormData) { async function updateCommissionStatusAction(formData: FormData) {
"use server" "use server"
@@ -166,6 +212,14 @@ function formatDate(value: Date | null) {
return value.toLocaleDateString("en-US") return value.toLocaleDateString("en-US")
} }
function formatDateInput(value: Date | null) {
if (!value) {
return ""
}
return value.toISOString().slice(0, 10)
}
export default async function CommissionsManagementPage({ export default async function CommissionsManagementPage({
searchParams, searchParams,
}: { }: {
@@ -177,10 +231,22 @@ export default async function CommissionsManagementPage({
scope: "own", scope: "own",
}) })
const [resolvedSearchParams, customers, commissions] = await Promise.all([ const [resolvedSearchParams, customers, commissions, assignees, artworks] = await Promise.all([
searchParams, searchParams,
listCustomers(200), listCustomers(200),
listCommissions(300), listCommissions(300),
db.user.findMany({
where: {
isBanned: false,
},
orderBy: [{ createdAt: "asc" }],
select: {
id: true,
name: true,
username: true,
},
}),
listArtworks(300),
]) ])
const notice = readFirstValue(resolvedSearchParams.notice) const notice = readFirstValue(resolvedSearchParams.notice)
@@ -309,11 +375,18 @@ export default async function CommissionsManagementPage({
</div> </div>
<div className="grid gap-3 md:grid-cols-3"> <div className="grid gap-3 md:grid-cols-3">
<label className="space-y-1"> <label className="space-y-1">
<span className="text-xs text-neutral-600">Assigned user id</span> <span className="text-xs text-neutral-600">Assigned user</span>
<input <select
name="assignedUserId" name="assignedUserId"
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm" className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
/> >
<option value="">(none)</option>
{assignees.map((assignee) => (
<option key={assignee.id} value={assignee.id}>
{assignee.name} @{assignee.username ?? "no-user"}
</option>
))}
</select>
</label> </label>
<label className="space-y-1"> <label className="space-y-1">
<span className="text-xs text-neutral-600">Budget min</span> <span className="text-xs text-neutral-600">Budget min</span>
@@ -344,6 +417,14 @@ export default async function CommissionsManagementPage({
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm" className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
/> />
</label> </label>
<label className="space-y-1">
<span className="text-xs text-neutral-600">Linked artwork IDs (comma separated)</span>
<textarea
name="linkedArtworkIds"
rows={2}
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
/>
</label>
<Button type="submit">Create commission</Button> <Button type="submit">Create commission</Button>
</form> </form>
</article> </article>
@@ -383,6 +464,9 @@ export default async function CommissionsManagementPage({
<p className="text-xs text-neutral-600"> <p className="text-xs text-neutral-600">
{commission.customer?.name ?? "No customer"} {commission.customer?.name ?? "No customer"}
</p> </p>
<p className="text-xs text-neutral-500">
Assignee: {commission.assignedUser?.name ?? "none"}
</p>
<p className="text-xs text-neutral-500"> <p className="text-xs text-neutral-500">
Due: {formatDate(commission.dueAt)} Due: {formatDate(commission.dueAt)}
</p> </p>
@@ -406,6 +490,99 @@ export default async function CommissionsManagementPage({
Move Move
</button> </button>
</div> </div>
<details className="mt-2 rounded border border-neutral-200 p-2 text-xs">
<summary className="cursor-pointer text-neutral-700">
Edit details
</summary>
<form action={updateCommissionAction} className="mt-2 space-y-2">
<input type="hidden" name="id" value={commission.id} />
<input
name="title"
defaultValue={commission.title}
className="w-full rounded border border-neutral-300 px-2 py-1"
/>
<textarea
name="description"
rows={2}
defaultValue={commission.description ?? ""}
className="w-full rounded border border-neutral-300 px-2 py-1"
/>
<select
name="customerId"
defaultValue={commission.customerId ?? ""}
className="w-full rounded border border-neutral-300 px-2 py-1"
>
<option value="">(no customer)</option>
{customers.map((customer) => (
<option
key={`${commission.id}-customer-${customer.id}`}
value={customer.id}
>
{customer.name}
</option>
))}
</select>
<select
name="assignedUserId"
defaultValue={commission.assignedUserId ?? ""}
className="w-full rounded border border-neutral-300 px-2 py-1"
>
<option value="">(no assignee)</option>
{assignees.map((assignee) => (
<option
key={`${commission.id}-assignee-${assignee.id}`}
value={assignee.id}
>
{assignee.name}
</option>
))}
</select>
<div className="grid grid-cols-2 gap-2">
<input
name="budgetMin"
type="number"
min={0}
step="0.01"
defaultValue={commission.budgetMin ?? ""}
placeholder="Budget min"
className="rounded border border-neutral-300 px-2 py-1"
/>
<input
name="budgetMax"
type="number"
min={0}
step="0.01"
defaultValue={commission.budgetMax ?? ""}
placeholder="Budget max"
className="rounded border border-neutral-300 px-2 py-1"
/>
</div>
<input
name="dueAt"
type="date"
defaultValue={formatDateInput(commission.dueAt)}
className="w-full rounded border border-neutral-300 px-2 py-1"
/>
<textarea
name="linkedArtworkIds"
rows={2}
defaultValue={commission.linkedArtworkIds.join(",")}
placeholder="Artwork IDs"
className="w-full rounded border border-neutral-300 px-2 py-1"
/>
<button
type="submit"
className="rounded border border-neutral-300 px-2 py-1 text-xs"
>
Save details
</button>
</form>
</details>
{commission.linkedArtworkIds.length > 0 ? (
<p className="mt-2 text-[11px] text-neutral-500">
Linked artworks: {commission.linkedArtworkIds.length}
</p>
) : null}
</form> </form>
)) ))
)} )}
@@ -449,6 +626,24 @@ export default async function CommissionsManagementPage({
</table> </table>
</div> </div>
</section> </section>
<section className="rounded-xl border border-neutral-200 p-6">
<h2 className="text-xl font-medium">Artwork Reference</h2>
<p className="mt-1 text-sm text-neutral-600">
Use these IDs when linking artworks to commissions.
</p>
<div className="mt-3 max-h-64 overflow-auto rounded border border-neutral-200 p-3 text-xs">
{artworks.length === 0 ? (
<p className="text-neutral-500">No artworks available.</p>
) : (
artworks.map((artwork) => (
<p key={artwork.id} className="font-mono text-neutral-700">
{artwork.id} - {artwork.title}
</p>
))
)}
</div>
</section>
</AdminShell> </AdminShell>
) )
} }

View File

@@ -23,7 +23,21 @@ export const createCommissionInputSchema = z.object({
description: z.string().max(4000).nullable().optional(), description: z.string().max(4000).nullable().optional(),
status: commissionStatusSchema.default("new"), status: commissionStatusSchema.default("new"),
customerId: z.string().uuid().nullable().optional(), customerId: z.string().uuid().nullable().optional(),
assignedUserId: z.string().max(120).nullable().optional(), assignedUserId: z.string().uuid().nullable().optional(),
linkedArtworkIds: z.array(z.string().uuid()).default([]),
budgetMin: z.number().nonnegative().nullable().optional(),
budgetMax: z.number().nonnegative().nullable().optional(),
dueAt: z.date().nullable().optional(),
})
export const updateCommissionInputSchema = z.object({
id: z.string().uuid(),
title: z.string().min(1).max(180).optional(),
description: z.string().max(4000).nullable().optional(),
status: commissionStatusSchema.optional(),
customerId: z.string().uuid().nullable().optional(),
assignedUserId: z.string().uuid().nullable().optional(),
linkedArtworkIds: z.array(z.string().uuid()).optional(),
budgetMin: z.number().nonnegative().nullable().optional(), budgetMin: z.number().nonnegative().nullable().optional(),
budgetMax: z.number().nonnegative().nullable().optional(), budgetMax: z.number().nonnegative().nullable().optional(),
dueAt: z.date().nullable().optional(), dueAt: z.date().nullable().optional(),
@@ -57,6 +71,7 @@ export const updateCommissionStatusInputSchema = z.object({
export type CommissionStatus = z.infer<typeof commissionStatusSchema> export type CommissionStatus = z.infer<typeof commissionStatusSchema>
export type CreateCustomerInput = z.infer<typeof createCustomerInputSchema> export type CreateCustomerInput = z.infer<typeof createCustomerInputSchema>
export type CreateCommissionInput = z.infer<typeof createCommissionInputSchema> export type CreateCommissionInput = z.infer<typeof createCommissionInputSchema>
export type UpdateCommissionInput = z.infer<typeof updateCommissionInputSchema>
export type CreatePublicCommissionRequestInput = z.infer< export type CreatePublicCommissionRequestInput = z.infer<
typeof createPublicCommissionRequestInputSchema typeof createPublicCommissionRequestInputSchema
> >

View File

@@ -0,0 +1,2 @@
ALTER TABLE "Commission"
ADD COLUMN "linkedArtworkIds" TEXT[] NOT NULL DEFAULT ARRAY[]::TEXT[];

View File

@@ -386,6 +386,7 @@ model Commission {
status String status String
customerId String? customerId String?
assignedUserId String? assignedUserId String?
linkedArtworkIds String[] @default([])
budgetMin Float? budgetMin Float?
budgetMax Float? budgetMax Float?
dueAt DateTime? dueAt DateTime?

View File

@@ -3,6 +3,7 @@ import {
createCommissionInputSchema, createCommissionInputSchema,
createCustomerInputSchema, createCustomerInputSchema,
createPublicCommissionRequestInputSchema, createPublicCommissionRequestInputSchema,
updateCommissionInputSchema,
updateCommissionStatusInputSchema, updateCommissionStatusInputSchema,
} from "@cms/content" } from "@cms/content"
@@ -57,6 +58,16 @@ export async function createCommission(input: unknown) {
}) })
} }
export async function updateCommission(input: unknown) {
const payload = updateCommissionInputSchema.parse(input)
const { id, ...data } = payload
return db.commission.update({
where: { id },
data,
})
}
export async function createPublicCommissionRequest(input: unknown) { export async function createPublicCommissionRequest(input: unknown) {
const payload = createPublicCommissionRequestInputSchema.parse(input) const payload = createPublicCommissionRequestInputSchema.parse(input)
const normalizedEmail = payload.customerEmail.trim().toLowerCase() const normalizedEmail = payload.customerEmail.trim().toLowerCase()

View File

@@ -14,6 +14,7 @@ export {
createPublicCommissionRequest, createPublicCommissionRequest,
listCommissions, listCommissions,
listCustomers, listCustomers,
updateCommission,
updateCommissionStatus, updateCommissionStatus,
} from "./commissions" } from "./commissions"
export { export {