Priority
diff --git a/components/audit/AuditStartPanel.tsx b/components/audit/AuditStartPanel.tsx
deleted file mode 100644
index f7c41ad..0000000
--- a/components/audit/AuditStartPanel.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import Link from "next/link";
-import { useRouter } from "next/navigation";
-import { Button } from "@/components/ui/form";
-
-type AuditStartPanelProps = {
- premisesId: string;
- premisesName: string;
- hasProfile: boolean;
- draftAuditId: string | null;
-};
-
-export function AuditStartPanel({
- premisesId,
- premisesName,
- hasProfile,
- draftAuditId,
-}: AuditStartPanelProps) {
- const router = useRouter();
- const [loading, setLoading] = useState(false);
- const [error, setError] = useState
(null);
-
- async function startAudit() {
- setLoading(true);
- setError(null);
-
- try {
- const response = await fetch(`/api/premises/${premisesId}/audit`, {
- method: "POST",
- });
- const result = await response.json();
-
- if (!response.ok) {
- throw new Error(result.error ?? "Failed to start audit");
- }
-
- const firstSection = result.data.overview.sections[0]?.id;
- const url = firstSection
- ? `/premises/${premisesId}/audit/${result.data.auditId}?section=${firstSection}`
- : `/premises/${premisesId}/audit/${result.data.auditId}`;
-
- router.push(url);
- } catch (startError) {
- setError(
- startError instanceof Error ? startError.message : "Failed to start audit",
- );
- } finally {
- setLoading(false);
- }
- }
-
- if (!hasProfile) {
- return (
-
-
- Complete your premises profile first
-
-
- We need to know about your building before we can tailor the audit
- for {premisesName}.
-
-
- Set up premises profile
-
-
-
Annual safety audit
-
- Work through the Scout Association premises audit section by section.
- You can save your progress and come back later.
-
-
- {draftAuditId ? (
-
- You have a draft audit in progress.
-
- ) : null}
-
- {error ? (
-
{error}
- ) : null}
-
-
- {draftAuditId ? (
-
- {loading ? "Starting…" : "Start audit"}
-
- )}
-
-
(null);
const [savingAction, setSavingAction] = useState(false);
const [deletingActionId, setDeletingActionId] = useState(null);
+ const [completingAudit, setCompletingAudit] = useState(false);
const [error, setError] = useState(null);
+ const isReadOnly = overview.status === "COMPLETE";
+ const canCompleteAudit =
+ !isReadOnly &&
+ overview.progress.completedSections === overview.progress.totalSections &&
+ overview.progress.totalSections > 0;
+
const refreshOverview = useCallback(async () => {
const response = await fetch(`/api/audit/${auditId}`);
const result = await response.json();
@@ -341,6 +356,34 @@ export function AuditWizard({
}
}
+ async function handleCompleteAudit() {
+ setCompletingAudit(true);
+ setError(null);
+
+ try {
+ const response = await fetch(`/api/audit/${auditId}`, {
+ method: "POST",
+ });
+ const result = await response.json();
+
+ if (!response.ok) {
+ throw new Error(result.error ?? "Failed to complete audit");
+ }
+
+ setOverview(result.data);
+ router.push(`/premises/${premisesId}/audit`);
+ router.refresh();
+ } catch (completeError) {
+ setError(
+ completeError instanceof Error
+ ? completeError.message
+ : "Failed to complete audit",
+ );
+ } finally {
+ setCompletingAudit(false);
+ }
+ }
+
const activeSection = overview.sections.find(
(section) => section.id === activeSectionId,
);
@@ -359,16 +402,29 @@ export function AuditWizard({
- Template {overview.templateVersion} · Draft audit
+ Audit {formatDisplayDate(overview.auditDate)} · Template{" "}
+ {overview.templateLabel} · {isReadOnly ? "Completed" : "Draft"}
{overview.premises.name}
-
- {overview.progress.completedSections} of{" "}
- {overview.progress.totalSections} sections complete
-
+
+
+ {overview.progress.completedSections} of{" "}
+ {overview.progress.totalSections} sections complete
+
+ {canCompleteAudit ? (
+
+ {completingAudit ? "Finishing…" : "Finish audit"}
+
+ ) : null}
+
@@ -397,6 +453,13 @@ export function AuditWizard({
) : null}
+ {isReadOnly ? (
+
+ This audit is complete and read-only. Answers are frozen against
+ template {overview.templateLabel}.
+
+ ) : null}
+
{error ? (
{error}
diff --git a/components/audit/AuditsManager.tsx b/components/audit/AuditsManager.tsx
new file mode 100644
index 0000000..912224a
--- /dev/null
+++ b/components/audit/AuditsManager.tsx
@@ -0,0 +1,322 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { Button } from "@/components/ui/form";
+import type { AuditHistoryItem } from "@/types/audit";
+
+type TemplateOption = {
+ id: string;
+ version: string;
+ revision: number;
+ label: string;
+ longLabel: string;
+ isActive: boolean;
+};
+
+type AuditsManagerProps = {
+ premisesId: string;
+ premisesName: string;
+ hasProfile: boolean;
+ draftAuditId: string | null;
+ draftAuditDate?: string | null;
+};
+
+function formatDate(value: string): string {
+ return new Date(`${value}T00:00:00`).toLocaleDateString("en-GB", {
+ day: "numeric",
+ month: "short",
+ year: "numeric",
+ });
+}
+
+export function AuditsManager({
+ premisesId,
+ premisesName,
+ hasProfile,
+ draftAuditId,
+ draftAuditDate,
+}: AuditsManagerProps) {
+ const router = useRouter();
+ const [loading, setLoading] = useState(false);
+ const [error, setError] = useState
(null);
+ const [audits, setAudits] = useState([]);
+ const [templates, setTemplates] = useState([]);
+ const [activeTemplateId, setActiveTemplateId] = useState("");
+ const [selectedTemplateId, setSelectedTemplateId] = useState("");
+ const [auditDate, setAuditDate] = useState("");
+ const [canStartNewAudit, setCanStartNewAudit] = useState(false);
+ const [statusFilter, setStatusFilter] = useState<"ALL" | "DRAFT" | "COMPLETE">(
+ "ALL",
+ );
+
+ useEffect(() => {
+ if (!hasProfile) {
+ return;
+ }
+
+ async function loadAuditMeta() {
+ try {
+ const response = await fetch(`/api/premises/${premisesId}/audit`);
+ const result = await response.json();
+
+ if (!response.ok) {
+ throw new Error(result.error ?? "Failed to load audits");
+ }
+
+ const nextTemplates: TemplateOption[] = result.data.templates ?? [];
+ const active = result.data.activeTemplate;
+
+ setAudits(result.data.audits ?? []);
+ setTemplates(nextTemplates);
+ setCanStartNewAudit(Boolean(result.data.canStartNewAudit));
+ setAuditDate(result.data.defaultAuditDate ?? "");
+
+ const defaultTemplateId =
+ active?.id ??
+ nextTemplates.find((template) => template.isActive)?.id ??
+ nextTemplates[0]?.id ??
+ "";
+
+ setActiveTemplateId(defaultTemplateId);
+ setSelectedTemplateId(defaultTemplateId);
+ } catch (loadError) {
+ setError(
+ loadError instanceof Error ? loadError.message : "Failed to load audits",
+ );
+ }
+ }
+
+ loadAuditMeta();
+ }, [hasProfile, premisesId]);
+
+ async function startAudit() {
+ setLoading(true);
+ setError(null);
+
+ try {
+ const response = await fetch(`/api/premises/${premisesId}/audit`, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ action: "start",
+ auditDate,
+ templateId: selectedTemplateId || undefined,
+ }),
+ });
+ const result = await response.json();
+
+ if (!response.ok) {
+ throw new Error(result.error ?? "Failed to start audit");
+ }
+
+ const firstSection = result.data.overview.sections[0]?.id;
+ const url = firstSection
+ ? `/premises/${premisesId}/audit/${result.data.auditId}?section=${firstSection}`
+ : `/premises/${premisesId}/audit/${result.data.auditId}`;
+
+ router.push(url);
+ } catch (startError) {
+ setError(
+ startError instanceof Error ? startError.message : "Failed to start audit",
+ );
+ } finally {
+ setLoading(false);
+ }
+ }
+
+ const filteredAudits = audits.filter((audit) => {
+ if (statusFilter === "ALL") {
+ return true;
+ }
+ return audit.status === statusFilter;
+ });
+
+ if (!hasProfile) {
+ return (
+
+
+ Complete your premises profile first
+
+
+ We need to know about your building before we can tailor audits for{" "}
+ {premisesName}.
+
+
+ Set up premises profile
+
+
+ {draftAuditId ? (
+
+
Draft in progress
+
+ You have an audit in progress
+ {draftAuditDate ? ` dated ${formatDate(draftAuditDate)}` : ""}. Finish
+ or continue it before starting another.
+
+
+ Continue draft audit
+
+
+ ) : (
+
+
Start a new audit
+
+ Choose an audit template and inspection date. Each audit is pinned to
+ that template version when you start.
+
+
+
+
+
+ Audit template
+
+ setSelectedTemplateId(event.target.value)}
+ className="mt-1 w-full rounded-lg border border-slate-300 px-3 py-2 text-sm"
+ >
+ {templates.length === 0 ? (
+ No templates available
+ ) : (
+ templates.map((template) => (
+
+ {template.longLabel}
+ {template.isActive ? " · active default" : ""}
+
+ ))
+ )}
+
+
+
+
+
+ Audit date
+
+
+
+
+
+ Need a new questionnaire?{" "}
+
+
+ {error ? (
+
{error}
+ ) : null}
+
+
+ void startAudit()}
+ disabled={loading || !auditDate || !selectedTemplateId || !canStartNewAudit}
+ >
+ {loading ? "Starting…" : "Start audit"}
+
+
+
+ )}
+
+
+
+
Audit history
+
+ Status
+
+ setStatusFilter(event.target.value as typeof statusFilter)
+ }
+ className="rounded-lg border border-slate-300 px-2 py-1 text-sm"
+ >
+ All
+ Draft
+ Completed
+
+
+
+
+ {filteredAudits.length === 0 ? (
+
No audits match your filters.
+ ) : (
+
+
+
+
+ Date
+ Template
+ Status
+ Progress
+
+
+
+ {filteredAudits.map((audit) => (
+
+
+ {formatDate(audit.auditDate)}
+
+
+ {audit.templateLabel}
+
+
+
+ {audit.status === "COMPLETE" ? "Completed" : "Draft"}
+
+
+
+ {audit.progress.completedSections}/{audit.progress.totalSections}{" "}
+ sections
+
+
+
+
+ ))}
+
+
+
+ )}
+
+
+ {activeTemplateId && templates.length > 0 ? (
+
+ Organisation default template:{" "}
+ {templates.find((template) => template.id === activeTemplateId)?.longLabel ??
+ "Not set"}
+
+ ) : null}
+
+ {links.map((link) => {
+ const href = link.href(premisesId);
+ const isActive = pathname === href || pathname.startsWith(`${href}/`);
+
+ return (
+
+ );
+}
diff --git a/components/premises/PremisesPageHeader.tsx b/components/premises/PremisesPageHeader.tsx
new file mode 100644
index 0000000..c139cdf
--- /dev/null
+++ b/components/premises/PremisesPageHeader.tsx
@@ -0,0 +1,33 @@
+import { PremisesNav } from "@/components/premises/PremisesNav";
+
+type PremisesPageHeaderProps = {
+ premisesId: string;
+ premisesName: string;
+ address: string;
+ eyebrow: string;
+ description?: string;
+};
+
+export function PremisesPageHeader({
+ premisesId,
+ premisesName,
+ address,
+ eyebrow,
+ description,
+}: PremisesPageHeaderProps) {
+ return (
+
+
+
{eyebrow}
+
+ {premisesName}
+
+
{address}
+ {description ? (
+
{description}
+ ) : null}
+
+
+
(initialProfile);
+ const formRef = useRef(form);
+ formRef.current = form;
const [savedSections, setSavedSections] = useState(initialApplicableSections);
const [isSaving, setIsSaving] = useState(false);
const [error, setError] = useState(null);
@@ -70,12 +72,17 @@ export function ProfileWizard({
const currentStep = PROFILE_STEPS[stepIndex];
function updateForm(patch: Partial) {
- setForm((current) => ({ ...current, ...patch }));
+ setForm((current) => {
+ const next = { ...current, ...patch };
+ formRef.current = next;
+ return next;
+ });
setSaved(false);
setError(null);
}
- async function saveProfile() {
+ async function persistProfile(options?: { markSaved?: boolean }) {
+ const currentForm = formRef.current;
setIsSaving(true);
setError(null);
@@ -83,7 +90,7 @@ export function ProfileWizard({
const response = await fetch(`/api/premises/${premisesId}/profile`, {
method: "PUT",
headers: { "Content-Type": "application/json" },
- body: JSON.stringify(form),
+ body: JSON.stringify(currentForm),
});
const result = await response.json();
@@ -92,23 +99,71 @@ export function ProfileWizard({
throw new Error(result.error ?? "Failed to save profile");
}
+ setForm(result.data.profile);
+ formRef.current = result.data.profile;
setSavedSections(result.data.applicableSections);
- setSaved(true);
+ if (options?.markSaved) {
+ setSaved(true);
+ }
} catch (saveError) {
setError(
saveError instanceof Error ? saveError.message : "Failed to save profile",
);
+ throw saveError;
} finally {
setIsSaving(false);
}
}
+ async function saveProfile() {
+ await persistProfile({ markSaved: true });
+ }
+
async function handleNext() {
+ const currentForm = formRef.current;
+
+ if (!canProceed(stepIndex, currentForm)) {
+ setError("Please answer the required questions before continuing.");
+ return;
+ }
+
+ setError(null);
+
if (stepIndex < PROFILE_STEPS.length - 1) {
+ if (currentForm.ownershipType && currentForm.buildingAgeBand) {
+ try {
+ await persistProfile();
+ } catch {
+ return;
+ }
+ }
+
setStepIndex((index) => index + 1);
return;
}
- await saveProfile();
+
+ try {
+ await saveProfile();
+ } catch {
+ return;
+ }
+ }
+
+ function handleContinuePointerDown(
+ event: React.PointerEvent,
+ ) {
+ if (
+ event.pointerType !== "mouse" ||
+ event.button !== 0 ||
+ isSaving
+ ) {
+ return;
+ }
+
+ // Run on pointer down so the first click still works after choosing a radio
+ // (otherwise blur/focus can swallow the first click on some browsers).
+ event.preventDefault();
+ void handleNext();
}
function handleBack() {
@@ -343,8 +398,15 @@ export function ProfileWizard({
) : null}
void handleNext()}
+ onPointerDown={handleContinuePointerDown}
+ disabled={isSaving}
+ aria-disabled={!canProceed(stepIndex, form) || isSaving}
+ className={
+ !canProceed(stepIndex, form) && !isSaving
+ ? "opacity-50"
+ : undefined
+ }
>
{isSaving
? "Saving…"
diff --git a/components/templates/TemplateManager.tsx b/components/templates/TemplateManager.tsx
new file mode 100644
index 0000000..71552ea
--- /dev/null
+++ b/components/templates/TemplateManager.tsx
@@ -0,0 +1,356 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import Link from "next/link";
+import { Button } from "@/components/ui/form";
+
+type TemplateCatalogItem = {
+ id: string;
+ version: string;
+ revision: number;
+ label: string;
+ longLabel: string;
+ description: string | null;
+ publishedAt: string;
+ isActive: boolean;
+ changeType: string;
+ sectionCount: number;
+ auditCount: number;
+ supersededAt: string | null;
+};
+
+function formatDate(value: string): string {
+ return new Date(value).toLocaleDateString("en-GB", {
+ day: "numeric",
+ month: "short",
+ year: "numeric",
+ });
+}
+
+export function TemplateManager() {
+ const [templates, setTemplates] = useState([]);
+ const [loading, setLoading] = useState(true);
+ const [saving, setSaving] = useState(false);
+ const [activatingId, setActivatingId] = useState(null);
+ const [error, setError] = useState(null);
+ const [success, setSuccess] = useState(null);
+
+ const [version, setVersion] = useState("");
+ const [publishedAt, setPublishedAt] = useState(
+ new Date().toISOString().slice(0, 10),
+ );
+ const [description, setDescription] = useState("");
+ const [setActive, setSetActive] = useState(true);
+ const [jsonText, setJsonText] = useState("");
+
+ async function loadTemplates() {
+ setLoading(true);
+ setError(null);
+
+ try {
+ const response = await fetch("/api/audit-templates");
+ const result = await response.json();
+
+ if (!response.ok) {
+ throw new Error(result.error ?? "Failed to load templates");
+ }
+
+ setTemplates(result.data.templates ?? []);
+ } catch (loadError) {
+ setError(
+ loadError instanceof Error ? loadError.message : "Failed to load templates",
+ );
+ } finally {
+ setLoading(false);
+ }
+ }
+
+ useEffect(() => {
+ loadTemplates();
+ }, []);
+
+ async function handleFileUpload(event: React.ChangeEvent) {
+ const file = event.target.files?.[0];
+ if (!file) {
+ return;
+ }
+
+ try {
+ const text = await file.text();
+ setJsonText(text);
+
+ const parsed = JSON.parse(text) as Record;
+ if (typeof parsed.version === "string" && !version) {
+ setVersion(parsed.version);
+ }
+ if (typeof parsed.publishedAt === "string") {
+ setPublishedAt(parsed.publishedAt.slice(0, 10));
+ }
+ if (typeof parsed.description === "string" && !description) {
+ setDescription(parsed.description);
+ }
+
+ setSuccess(`Loaded ${file.name}. Review the fields below, then publish.`);
+ setError(null);
+ } catch {
+ setError("Could not read template file. Upload valid JSON.");
+ }
+ }
+
+ async function publishTemplate() {
+ setSaving(true);
+ setError(null);
+ setSuccess(null);
+
+ try {
+ let sections: unknown;
+ const parsed = JSON.parse(jsonText) as Record;
+ sections = parsed.sections ?? parsed;
+
+ const response = await fetch("/api/audit-templates", {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ version,
+ publishedAt,
+ description: description || null,
+ sections,
+ setActive,
+ }),
+ });
+ const result = await response.json();
+
+ if (!response.ok) {
+ throw new Error(result.error ?? "Failed to publish template");
+ }
+
+ setSuccess(`Published template ${result.data.template.longLabel}.`);
+ setJsonText("");
+ setVersion("");
+ setDescription("");
+ await loadTemplates();
+ } catch (publishError) {
+ setError(
+ publishError instanceof Error
+ ? publishError.message
+ : "Failed to publish template",
+ );
+ } finally {
+ setSaving(false);
+ }
+ }
+
+ async function activateTemplate(templateId: string) {
+ setActivatingId(templateId);
+ setError(null);
+ setSuccess(null);
+
+ try {
+ const response = await fetch(
+ `/api/audit-templates/${templateId}/activate`,
+ { method: "POST" },
+ );
+ const result = await response.json();
+
+ if (!response.ok) {
+ throw new Error(result.error ?? "Failed to activate template");
+ }
+
+ setSuccess(`Set ${result.data.template.longLabel} as the active default.`);
+ await loadTemplates();
+ } catch (activateError) {
+ setError(
+ activateError instanceof Error
+ ? activateError.message
+ : "Failed to activate template",
+ );
+ } finally {
+ setActivatingId(null);
+ }
+ }
+
+ return (
+
+
+
+ Upload a new template release
+
+
+ Import a JSON questionnaire as a new template version. Use the normalized
+ sections array format (same structure as the seeded September 2025
+ template).
+
+
+