settings overhaul and reset

This commit is contained in:
makearmy 2025-10-05 20:35:20 -04:00
parent 8b3aa65e2e
commit 7ef13e56ff
3 changed files with 486 additions and 300 deletions

View file

@ -2,12 +2,13 @@
"use client";
import { useEffect, useMemo, useState } from "react";
import { useSearchParams, useRouter } from "next/navigation";
import SettingsSubmit from "@/components/forms/SettingsSubmit";
type Rec = {
submission_id: string | number;
setting_title?: string | null;
setting_notes?: string | null;
photo?: { id?: string } | string | null;
screen?: { id?: string } | string | null;
@ -17,15 +18,15 @@ type Rec = {
mat_opacity?: { id?: string | number; opacity?: string | number | null } | null;
mat_thickness?: number | null;
laser_soft?: { id?: string | number; name?: string | null } | string | number | null;
source?: { submission_id?: string | number; make?: string | null; model?: string | null; nm?: string | null } | null;
lens?: { id?: string | number; field_size?: string | number | null; focal_length?: string | number | null } | null;
focus?: number | null;
lens_conf?: { id?: string | number; name?: string | null } | null;
lens_apt?: { id?: string | number; name?: string | null } | null;
lens_exp?: { id?: string | number; name?: string | null } | null;
focus?: number | null;
laser_soft?: { id?: string | number; name?: string | null } | string | number | null;
repeat_all?: number | null;
fill_settings?: any[] | null;
@ -34,243 +35,358 @@ type Rec = {
owner?: { id?: string | number; username?: string | null } | string | number | null;
uploader?: string | null;
last_modified_date?: string | null;
};
const API = (process.env.NEXT_PUBLIC_API_BASE_URL || "").replace(/\/$/, "");
const asset = (id?: string | number) => (id ? `${API}/assets/${id}` : "");
type Me = { id: string | number; username?: string; email?: string } | null;
async function readJson(r: Response) {
const t = await r.text();
try {
return t ? JSON.parse(t) : null;
} catch {
return null;
}
const API_BASE = (process.env.NEXT_PUBLIC_API_BASE_URL || "").replace(/\/$/, "");
const fileUrl = (id?: string) => (id ? (API_BASE ? `${API_BASE}/assets/${id}` : `/api/dx/assets/${id}`) : "");
async function readJson(res: Response) {
const t = await res.text();
try { return t ? JSON.parse(t) : null; } catch { return null; }
}
export default function CO2GalvoDetail({ id, editable = true }: { id: string | number; editable?: boolean }) {
export default function CO2GalvoDetail({ id, editable }: { id: string | number; editable?: boolean }) {
const sp = useSearchParams();
const router = useRouter();
const editParam = sp.get("edit") === "1";
const [rec, setRec] = useState<Rec | null>(null);
const [loading, setLoading] = useState(true);
const [err, setErr] = useState<string | null>(null);
const [me, setMe] = useState<Me>(null);
// robust me
useEffect(() => {
let live = true;
(async () => {
setLoading(true);
setErr(null);
const fields = [
"submission_id",
"setting_title",
"setting_notes",
"photo.id",
"screen.id",
"mat.id",
"mat.name",
"mat_coat.id",
"mat_coat.name",
"mat_color.id",
"mat_color.name",
"mat_opacity.id",
"mat_opacity.opacity",
"mat_thickness",
"laser_soft.id",
"laser_soft.name",
"source.submission_id",
"source.make",
"source.model",
"source.nm",
"lens.id",
"lens.field_size",
"lens.focal_length",
"focus",
"lens_conf.id",
"lens_conf.name",
"lens_apt.id",
"lens_apt.name",
"lens_exp.id",
"lens_exp.name",
"repeat_all",
"fill_settings",
"line_settings",
"raster_settings",
"owner.id",
"owner.username",
"uploader",
"last_modified_date",
].join(",");
try {
const r1 = await fetch(`/api/me`, { credentials: "include", cache: "no-store" });
if (r1.ok) {
const j = await readJson(r1);
const id = j?.id ?? j?.data?.id ?? null;
const username = j?.username ?? j?.data?.username ?? null;
const email = j?.email ?? j?.data?.email ?? null;
if (live && id) { setMe({ id, username: username ?? undefined, email: email ?? undefined }); return; }
}
const r2 = await fetch(`/api/dx/users/me?fields=id,username,email`, { credentials: "include", cache: "no-store" });
if (live && r2.ok) {
const j2 = await readJson(r2);
const d = j2?.data ?? j2 ?? null;
setMe(d?.id ? { id: d.id, username: d.username ?? undefined, email: d.email ?? undefined } : null);
}
} catch { if (live) setMe(null); }
})();
return () => { live = false; };
}, []);
const url = `${API}/items/settings_co2gal?fields=${encodeURIComponent(fields)}&filter[submission_id][_eq]=${encodeURIComponent(
String(id)
)}&limit=1`;
// load record (with readable fields)
useEffect(() => {
if (!id) return;
let dead = false;
const res = await fetch(url, { credentials: "include", cache: "no-store" });
if (!res.ok) {
const j = await readJson(res);
throw new Error(j?.errors?.[0]?.message || `HTTP ${res.status}`);
(async () => {
try {
setLoading(true);
setErr(null);
const fields = [
"submission_id",
"setting_title",
"setting_notes",
"photo.id",
"screen.id",
"mat.id","mat.name",
"mat_coat.id","mat_coat.name",
"mat_color.id","mat_color.name",
"mat_opacity.id","mat_opacity.opacity",
"mat_thickness",
"source.submission_id","source.make","source.model","source.nm",
"laser_soft.id","laser_soft.name",
"lens_conf.id","lens_conf.name",
"lens_apt.id","lens_apt.name",
"lens_exp.id","lens_exp.name",
"lens.id","lens.field_size","lens.focal_length",
"focus","repeat_all",
"fill_settings","line_settings","raster_settings",
"owner.id","owner.username",
"uploader",
"last_modified_date",
].join(",");
const url = `/api/dx/items/settings_co2gal?fields=${encodeURIComponent(fields)}&filter[submission_id][_eq]=${encodeURIComponent(String(id))}&limit=1`;
const r = await fetch(url, { cache: "no-store", credentials: "include" });
if (!r.ok) {
const j = await readJson(r);
throw new Error(j?.errors?.[0]?.message || `HTTP ${r.status}`);
}
const j = await readJson(r);
const row: Rec | null = Array.isArray(j?.data) ? j.data[0] || null : null;
if (!row) throw new Error("Setting not found.");
if (!dead) setRec(row);
} catch (e: any) {
if (!dead) setErr(e?.message || String(e));
} finally {
if (!dead) setLoading(false);
}
const j = await res.json();
const row = Array.isArray(j?.data) ? j.data[0] : null;
if (!row) throw new Error("Not found");
if (live) setRec(row);
})()
.catch((e: any) => live && setErr(e?.message || "Failed"))
.finally(() => live && setLoading(false));
return () => {
live = false;
};
})();
return () => { dead = true; };
}, [id]);
const photoId = typeof rec?.photo === "object" ? rec?.photo?.id : (rec?.photo as any);
const screenId = typeof rec?.screen === "object" ? rec?.screen?.id : (rec?.screen as any);
const ownerId = useMemo(() => {
if (!rec?.owner) return null;
return typeof rec.owner === "object" ? (rec.owner.id != null ? String(rec.owner.id) : null) : String(rec.owner);
}, [rec]);
const isMine = me?.id != null && ownerId != null && String(me.id) === String(ownerId);
if (loading) return <p className="p-4">Loading</p>;
if (err) return <div className="p-4 border border-red-300 bg-red-50 text-red-700 rounded">{err}</div>;
if (!rec) return <p className="p-4">Not found.</p>;
// Edit-mode initialValues shape for SettingsSubmit
const initialValues = useMemo(() => {
if (!rec) return null;
const toId = (v: any) => (v == null ? "" : typeof v === "object" ? (v.id ?? v.submission_id ?? "") : String(v));
const photoId = typeof rec.photo === "string" || typeof rec.photo === "number" ? String(rec.photo) : rec.photo?.id ?? null;
const screenId = typeof rec.screen === "string" || typeof rec.screen === "number" ? String(rec.screen) : rec.screen?.id ?? null;
const softName = typeof rec.laser_soft === "object" ? rec.laser_soft?.name ?? "—" : "—";
return {
submission_id: rec.submission_id,
setting_title: rec.setting_title ?? "",
setting_notes: rec.setting_notes ?? "",
photo: photoId,
screen: screenId,
// Material
mat: toId(rec.mat) || null,
mat_coat: toId(rec.mat_coat) || null,
mat_color: toId(rec.mat_color) || null,
mat_opacity: toId(rec.mat_opacity) || null,
mat_thickness: rec.mat_thickness ?? null,
// Rig & Optics
laser_soft: typeof rec.laser_soft === "object" ? String(rec.laser_soft?.id ?? "") : (rec.laser_soft != null ? String(rec.laser_soft) : null),
source: rec.source && typeof rec.source === "object" ? (rec.source.submission_id != null ? String(rec.source.submission_id) : null) : (rec.source as any) ?? null,
lens_conf: toId(rec.lens_conf) || null,
lens_apt: toId(rec.lens_apt) || null,
lens_exp: toId(rec.lens_exp) || null,
lens: toId(rec.lens) || null,
focus: rec.focus ?? null,
repeat_all: rec.repeat_all ?? null,
// Repeaters
fill_settings: rec.fill_settings ?? [],
line_settings: rec.line_settings ?? [],
raster_settings: rec.raster_settings ?? [],
};
}, [rec]);
function setEdit(on: boolean) {
const q = new URLSearchParams(sp.toString());
if (on) q.set("edit", "1"); else q.delete("edit");
router.replace(`?${q.toString()}`, { scroll: false });
}
if (loading) return <p className="p-6">Loading setting</p>;
if (err) return <div className="p-6"><div className="rounded-md border border-red-300 bg-red-50 px-3 py-2 text-sm text-red-700">{err}</div></div>;
if (!rec) return <p className="p-6">Setting not found.</p>;
// EDIT MODE
if (editable && editParam && initialValues) {
return (
<main className="space-y-4">
<div className="flex items-center justify-between">
<h1 className="text-xl lg:text-2xl font-semibold">Edit CO Galvo Setting</h1>
<button className="px-2 py-1 border rounded" onClick={() => setEdit(false)}>Cancel</button>
</div>
<SettingsSubmit mode="edit" submissionId={rec.submission_id} initialValues={initialValues} />
</main>
);
}
// VIEW MODE (sections + order mirrors the form)
const photoId = typeof rec.photo === "object" ? rec.photo?.id : (rec.photo as any);
const screenId = typeof rec.screen === "object" ? rec.screen?.id : (rec.screen as any);
const photoSrc = photoId ? fileUrl(String(photoId)) : "";
const screenSrc = screenId ? fileUrl(String(screenId)) : "";
const softName = typeof rec.laser_soft === "object" ? (rec.laser_soft?.name ?? "—") : "—";
return (
<div className="space-y-6">
<header className="space-y-1">
<h1 className="text-2xl font-bold">{rec.setting_title || "Untitled"}</h1>
<div className="flex items-center justify-between">
<h1 className="text-2xl font-bold break-words">{rec.setting_title || "Untitled"}</h1>
{editable && isMine ? (
<button className="px-2 py-1 border rounded text-sm" onClick={() => setEdit(true)}>Edit</button>
) : null}
</div>
<div className="text-sm text-muted-foreground">Last modified: {rec.last_modified_date || "—"}</div>
</header>
<section className="grid md:grid-cols-2 gap-6">
<div className="space-y-2 text-sm">
<div>
<span className="font-medium">Owner:</span> {typeof rec.owner === "object" ? rec.owner?.username || rec.owner?.id : rec.owner || "—"}
</div>
<div>
<span className="font-medium">Uploader:</span> {rec.uploader || "—"}
</div>
<div>
<span className="font-medium">Material:</span> {rec.mat?.name || "—"}
</div>
<div>
<span className="font-medium">Coating:</span> {rec.mat_coat?.name || "—"}
</div>
<div>
<span className="font-medium">Color:</span> {rec.mat_color?.name || "—"}
</div>
<div>
<span className="font-medium">Opacity:</span> {rec.mat_opacity?.opacity ?? "—"}
</div>
<div>
<span className="font-medium">Thickness (mm):</span> {rec.mat_thickness ?? "—"}
{/* Info */}
<section className="space-y-2">
<h2 className="text-lg font-semibold">Info</h2>
{rec.setting_notes ? <p className="text-sm whitespace-pre-wrap">{rec.setting_notes}</p> : <p className="text-sm text-muted-foreground">No notes.</p>}
</section>
{/* Images */}
{(photoSrc || screenSrc) && (
<section className="space-y-2">
<h2 className="text-lg font-semibold">Images</h2>
<div className="grid grid-cols-2 gap-4">
{photoSrc ? (
<figure className="space-y-1">
<img src={photoSrc} alt="Result" className="rounded border object-cover w-full" />
<figcaption className="text-xs text-muted-foreground">Result</figcaption>
</figure>
) : null}
{screenSrc ? (
<figure className="space-y-1">
<img src={screenSrc} alt="Settings Screenshot" className="rounded border object-cover w-full" />
<figcaption className="text-xs text-muted-foreground">Settings Screenshot</figcaption>
</figure>
) : null}
</div>
</section>
)}
{/* Material */}
<section className="space-y-2">
<h2 className="text-lg font-semibold">Material</h2>
<div className="grid md:grid-cols-2 gap-2 text-sm">
<div><span className="font-medium">Material:</span> {rec.mat?.name || "—"}</div>
<div><span className="font-medium">Coating:</span> {rec.mat_coat?.name || "—"}</div>
<div><span className="font-medium">Color:</span> {rec.mat_color?.name || "—"}</div>
<div><span className="font-medium">Opacity:</span> {rec.mat_opacity?.opacity ?? "—"}</div>
<div><span className="font-medium">Material Thickness (mm):</span> {rec.mat_thickness ?? "—"}</div>
</div>
</section>
{/* Rig & Optics (ordered) */}
<section className="space-y-2">
<h2 className="text-lg font-semibold">Rig & Optics</h2>
<div className="grid md:grid-cols-3 gap-2 text-sm">
<div><span className="font-medium">Laser Software:</span> {softName}</div>
<div>
<span className="font-medium">Laser Source:</span>{" "}
{[rec.source?.make, rec.source?.model].filter(Boolean).join(" ") || "—"}
{rec.source?.nm ? ` (${rec.source.nm})` : ""}
</div>
<div><span className="font-medium">Lens Configuration:</span> {rec.lens_conf?.name ?? "—"}</div>
<div><span className="font-medium">Scan Head Aperture:</span> {rec.lens_apt?.name ?? "—"}</div>
<div><span className="font-medium">Beam Expander:</span> {rec.lens_exp?.name ?? "—"}</div>
<div>
<span className="font-medium">Scan Lens:</span> {rec.lens?.field_size || "—"}
{rec.lens?.focal_length ? ` / ${rec.lens.focal_length} mm` : ""}
<span className="font-medium">Scan Lens:</span>{" "}
{rec.lens?.field_size || "—"}{rec.lens?.focal_length ? ` / ${rec.lens.focal_length} mm` : ""}
</div>
<div>
<span className="font-medium">Focus (mm):</span> {rec.focus ?? "—"}
</div>
<div>
<span className="font-medium">Software:</span> {softName}
</div>
<div>
<span className="font-medium">Lens Config:</span> {rec.lens_conf?.name || "—"}
</div>
<div>
<span className="font-medium">Scan Head Aperture:</span> {rec.lens_apt?.name || "—"}
</div>
<div>
<span className="font-medium">Beam Expander:</span> {rec.lens_exp?.name || "—"}
</div>
<div>
<span className="font-medium">Repeat All:</span> {rec.repeat_all ?? "—"}
<div><span className="font-medium">Focus (mm):</span> {rec.focus ?? "—"}</div>
<div><span className="font-medium">Repeat All:</span> {rec.repeat_all ?? "—"}</div>
</div>
</section>
{rec.setting_notes ? (
<div className="pt-2">
<div className="text-sm font-medium mb-1">Notes</div>
<p className="whitespace-pre-wrap">{rec.setting_notes}</p>
{/* Process Settings */}
{(rec.fill_settings?.length ?? 0) > 0 && (
<section className="space-y-2">
<h2 className="text-lg font-semibold">Fill Settings</h2>
<div className="overflow-x-auto">
<table className="w-full text-sm">
<thead className="border-b">
<tr>
<th className="px-2 py-1 text-left">Name</th>
<th className="px-2 py-1 text-left">Type</th>
<th className="px-2 py-1 text-left">Power (%)</th>
<th className="px-2 py-1 text-left">Speed (mm/s)</th>
<th className="px-2 py-1 text-left">Interval</th>
<th className="px-2 py-1 text-left">Angle</th>
<th className="px-2 py-1 text-left">Pass</th>
<th className="px-2 py-1 text-left">Freq (kHz)</th>
<th className="px-2 py-1 text-left">Pulse (ns)</th>
</tr>
</thead>
<tbody className="divide-y">
{rec.fill_settings!.map((r: any, i: number) => (
<tr key={i}>
<td className="px-2 py-1">{r.name || "—"}</td>
<td className="px-2 py-1">{r.type || "—"}</td>
<td className="px-2 py-1">{r.power ?? "—"}</td>
<td className="px-2 py-1">{r.speed ?? "—"}</td>
<td className="px-2 py-1">{r.interval ?? "—"}</td>
<td className="px-2 py-1">{r.angle ?? "—"}</td>
<td className="px-2 py-1">{r.pass ?? "—"}</td>
<td className="px-2 py-1">{r.frequency ?? "—"}</td>
<td className="px-2 py-1">{r.pulse ?? "—"}</td>
</tr>
))}
</tbody>
</table>
</div>
) : null}
</div>
<div className="grid grid-cols-2 gap-3">
{photoId ? (
<figure>
<img className="w-full rounded border" src={asset(photoId)} alt="Result" />
<figcaption className="text-xs text-muted-foreground mt-1">Result</figcaption>
</figure>
) : null}
{screenId ? (
<figure>
<img className="w-full rounded border" src={asset(screenId)} alt="Settings Screenshot" />
<figcaption className="text-xs text-muted-foreground mt-1">Settings</figcaption>
</figure>
) : null}
</div>
</section>
{/* Tables */}
{Array.isArray(rec.fill_settings) && rec.fill_settings.length > 0 && (
<Table title="Fill Settings" cols={["Name", "Type", "Power", "Speed", "Interval", "Angle", "Pass", "Freq", "Pulse"]} rows={rec.fill_settings.map((r) => [
r.name ?? "—",
r.type ?? "—",
r.power ?? "—",
r.speed ?? "—",
r.interval ?? "—",
r.angle ?? "—",
r.pass ?? "—",
r.frequency ?? "—",
r.pulse ?? "—",
])} />
</section>
)}
{Array.isArray(rec.line_settings) && rec.line_settings.length > 0 && (
<Table title="Line Settings" cols={["Name", "Power", "Speed", "Freq", "Pulse", "Pass", "Air"]} rows={rec.line_settings.map((r) => [
r.name ?? "—",
r.power ?? "—",
r.speed ?? "—",
r.frequency ?? "—",
r.pulse ?? "—",
r.pass ?? "—",
r.air ? "Yes" : "No",
])} />
{(rec.line_settings?.length ?? 0) > 0 && (
<section className="space-y-2">
<h2 className="text-lg font-semibold">Line Settings</h2>
<div className="overflow-x-auto">
<table className="w-full text-sm">
<thead className="border-b">
<tr>
<th className="px-2 py-1 text-left">Name</th>
<th className="px-2 py-1 text-left">Power</th>
<th className="px-2 py-1 text-left">Speed</th>
<th className="px-2 py-1 text-left">Freq</th>
<th className="px-2 py-1 text-left">Pulse</th>
<th className="px-2 py-1 text-left">Pass</th>
<th className="px-2 py-1 text-left">Air</th>
</tr>
</thead>
<tbody className="divide-y">
{rec.line_settings!.map((r: any, i: number) => (
<tr key={i}>
<td className="px-2 py-1">{r.name || "—"}</td>
<td className="px-2 py-1">{r.power ?? "—"}</td>
<td className="px-2 py-1">{r.speed ?? "—"}</td>
<td className="px-2 py-1">{r.frequency ?? "—"}</td>
<td className="px-2 py-1">{r.pulse ?? "—"}</td>
<td className="px-2 py-1">{r.pass ?? "—"}</td>
<td className="px-2 py-1">{r.air ? "Yes" : "No"}</td>
</tr>
))}
</tbody>
</table>
</div>
</section>
)}
{Array.isArray(rec.raster_settings) && rec.raster_settings.length > 0 && (
<Table title="Raster Settings" cols={["Name", "Type", "Dither", "Power", "Speed", "Interval", "Pass"]} rows={rec.raster_settings.map((r) => [
r.name ?? "—",
r.type ?? "—",
r.dither ?? "—",
r.power ?? "—",
r.speed ?? "—",
r.interval ?? "—",
r.pass ?? "—",
])} />
{(rec.raster_settings?.length ?? 0) > 0 && (
<section className="space-y-2">
<h2 className="text-lg font-semibold">Raster Settings</h2>
<div className="overflow-x-auto">
<table className="w-full text-sm">
<thead className="border-b">
<tr>
<th className="px-2 py-1 text-left">Name</th>
<th className="px-2 py-1 text-left">Type</th>
<th className="px-2 py-1 text-left">Dither</th>
<th className="px-2 py-1 text-left">Power</th>
<th className="px-2 py-1 text-left">Speed</th>
<th className="px-2 py-1 text-left">Interval</th>
<th className="px-2 py-1 text-left">Pass</th>
</tr>
</thead>
<tbody className="divide-y">
{rec.raster_settings!.map((r: any, i: number) => (
<tr key={i}>
<td className="px-2 py-1">{r.name || "—"}</td>
<td className="px-2 py-1">{r.type || "—"}</td>
<td className="px-2 py-1">{r.dither || "—"}</td>
<td className="px-2 py-1">{r.power ?? "—"}</td>
<td className="px-2 py-1">{r.speed ?? "—"}</td>
<td className="px-2 py-1">{r.interval ?? "—"}</td>
<td className="px-2 py-1">{r.pass ?? "—"}</td>
</tr>
))}
</tbody>
</table>
</div>
</section>
)}
</div>
);
}
function Table({ title, cols, rows }: { title: string; cols: string[]; rows: any[][] }) {
return (
<section className="space-y-2">
<h2 className="text-lg font-semibold">{title}</h2>
<div className="overflow-x-auto">
<table className="w-full text-sm">
<thead className="border-b">
<tr>{cols.map((c) => <th key={c} className="px-2 py-1 text-left">{c}</th>)}</tr>
</thead>
<tbody className="divide-y">
{rows.map((r, i) => (
<tr key={i}>{r.map((v, j) => <td key={j} className="px-2 py-1">{String(v)}</td>)}</tr>
))}
</tbody>
</table>
</div>
</section>
);
}