Stefan Lazic
ec5583f972
Owner Administration is complete. Summary of this final stretch of work: Seed data extended with an inactive staff member, a pending invitation, a redeemed-reward fixture, a service with no eligible staff, and a future-appointment fixture for conflict testing — all idempotent, verified against the dev DB. Testing brought to 179 unit / 86 integration / 27 E2E tests, all passing together on a freshly seeded, disposable Postgres: Unit tests for every new pure validator (business hours, categories/services, booking rules, loyalty config, staff creation). Integration tests covering opening-hours conflicts, last-owner protection, staff deactivation/eligibility conflicts, loyalty redemption's atomic race-guard, and owner-vs-barber/business-isolation authorization — all against a real Postgres. 12 new Playwright owner journeys, which surfaced and fixed two genuine issues along the way: a cookie-clearing race condition in the sign-out-mid-test flow (a real, reproducible timing bug, not just a test artifact), and confirmation that seed fixtures upserted by deterministic ID go stale once "today" has moved on — now handled defensively. Desktop responsiveness: converted the single-column Business Details, Booking Rules, and Loyalty Configuration forms to a genuine two-column layout at the lg: breakpoint (verified via measured element positions, not just screenshots), confirmed mobile stacking is unaffected. Final verification: clean tsc, eslint, and next build, plus the full three-suite run against one fresh database as the authoritative pass.
50 lines
1.7 KiB
TypeScript
50 lines
1.7 KiB
TypeScript
import type { Metadata } from "next";
|
|
import { redirect } from "next/navigation";
|
|
import { auth } from "@/auth";
|
|
import { prisma } from "@/lib/db/prisma";
|
|
import { hasPermission } from "@/lib/auth/permissions";
|
|
import { Permission } from "@/generated/prisma/enums";
|
|
import { listCategories } from "@/services/catalogue/service-catalogue.service";
|
|
import { CatalogueManager } from "@/features/owner/components/catalogue-manager";
|
|
|
|
export const metadata: Metadata = { title: "Services" };
|
|
export const dynamic = "force-dynamic";
|
|
|
|
export default async function OwnerServicesPage() {
|
|
const session = await auth();
|
|
if (!session?.user) redirect("/sign-in");
|
|
|
|
const canManage = await hasPermission(session.user.id, Permission.MANAGE_SERVICES);
|
|
if (!canManage) redirect("/staff");
|
|
|
|
const owner = await prisma.staffProfile.findUnique({ where: { userId: session.user.id } });
|
|
if (!owner) redirect("/staff");
|
|
|
|
const categories = await listCategories(prisma, owner.businessId);
|
|
|
|
return (
|
|
<div className="px-6 pt-12 pb-12 lg:max-w-3xl">
|
|
<h1 className="mb-6 text-2xl font-bold tracking-tight">Services</h1>
|
|
<CatalogueManager
|
|
categories={categories.map((c) => ({
|
|
id: c.id,
|
|
name: c.name,
|
|
isActive: c.isActive,
|
|
services: c.services.map((s) => ({
|
|
id: s.id,
|
|
categoryId: s.categoryId,
|
|
name: s.name,
|
|
description: s.description ?? "",
|
|
durationMinutes: s.durationMinutes,
|
|
price: s.price.toString(),
|
|
bufferBeforeMinutes: s.bufferBeforeMinutes,
|
|
bufferAfterMinutes: s.bufferAfterMinutes,
|
|
isActive: s.isActive,
|
|
allowOnlineBooking: s.allowOnlineBooking,
|
|
})),
|
|
}))}
|
|
/>
|
|
</div>
|
|
);
|
|
}
|