diff --git a/app/settings/co2-galvo/[id]/co2-galvo.tsx b/app/settings/co2-galvo/[id]/co2-galvo.tsx index df5609c8..31fcefa4 100644 --- a/app/settings/co2-galvo/[id]/co2-galvo.tsx +++ b/app/settings/co2-galvo/[id]/co2-galvo.tsx @@ -1,18 +1,13 @@ -// app/settings/co2-galvo/[id]/co2-galvo.tsx "use client"; import { useEffect, useState } from "react"; import { useParams } from "next/navigation"; -import Image from "next/image"; import Markdown from "react-markdown"; export default function CO2GalvoSettingDetailPage() { const { id } = useParams<{ id: string }>(); const [setting, setSetting] = useState(null); const [loading, setLoading] = useState(true); - const [claimBusy, setClaimBusy] = useState(false); - const [claimMsg, setClaimMsg] = useState(null); - const [claimErr, setClaimErr] = useState(null); useEffect(() => { if (!id) return; @@ -21,58 +16,23 @@ export default function CO2GalvoSettingDetailPage() { "submission_id", "setting_title", "uploader", - - // include parent + subfields to survive restricted expansion + // ✅ parent + subfields for resilient owner "owner", "owner.id", "owner.username", "owner.first_name", "owner.last_name", "owner.email", - - "setting_notes", - "photo.filename_disk", - "photo.title", - "screen.filename_disk", - "screen.title", - "mat.name", - "mat_coat.name", - "mat_color.name", - "mat_opacity.opacity", - "mat_thickness", - "source.make", - "source.model", - "lens.field_size", - "lens.focal_length", - "lens_conf.name", - "lens_apt.name", - "lens_exp.name", - "focus", - - // string-or-relation safe - "laser_soft", - "laser_soft.name", - - "repeat_all", - "fill_settings", - "line_settings", - "raster_settings", + // ... (rest of your fields) ].join(","); - // use the authenticated proxy (sends ma_at automatically) - const url = `/api/dx/items/settings_co2gal/${encodeURIComponent(String(id))}?fields=${fields}`; + const url = `/api/dx/items/settings_co2gal/${encodeURIComponent(String(id))}?fields=${encodeURIComponent(fields)}`; - setLoading(true); fetch(url, { cache: "no-store", credentials: "include" }) .then(async (res) => { const txt = await res.text(); - let j: any = null; - try { - j = txt ? JSON.parse(txt) : null; - } catch {} - if (!res.ok) { - throw new Error(j?.errors?.[0]?.message || j?.message || `HTTP ${res.status}`); - } + const j = txt ? JSON.parse(txt) : null; + if (!res.ok) throw new Error(j?.errors?.[0]?.message || j?.message || `HTTP ${res.status}`); return j; }) .then((json) => setSetting(json?.data ?? null)) @@ -86,87 +46,34 @@ export default function CO2GalvoSettingDetailPage() { if (loading) return

Loading setting...

; if (!setting) return

Setting not found.

; - // Owner label: username → name → email → id → — - const ownerDisplay: string = + const ownerDisplay = typeof setting?.owner === "object" - ? (setting.owner?.username - || [setting.owner?.first_name, setting.owner?.last_name].filter(Boolean).join(" ").trim() - || setting.owner?.email - || setting.owner?.id - || "—") - : typeof setting?.owner === "string" - ? setting.owner + ? (setting.owner?.username || + [setting.owner?.first_name, setting.owner?.last_name].filter(Boolean).join(" ").trim() || + setting.owner?.email || + setting.owner?.id || + "—") + : typeof setting?.owner === "string" || typeof setting?.owner === "number" + ? String(setting.owner) : "—"; - const softwareLabel: string = - typeof setting?.laser_soft === "object" - ? (setting.laser_soft?.name ?? "—") - : (setting?.laser_soft ?? "—"); - - const formatBoolean = (val: any) => - val ? "Enabled" : val === false ? "Disabled" : "—"; - - const onClaim = async () => { - setClaimBusy(true); - setClaimErr(null); - setClaimMsg(null); - try { - const r = await fetch("/api/claims", { - method: "POST", - headers: { "Content-Type": "application/json" }, - credentials: "include", - body: JSON.stringify({ - target_collection: "settings_co2gal", - target_id: setting.submission_id, - }), - }); - const j = await r.json().catch(() => ({})); - if (!r.ok) throw new Error(j?.error || j?.message || `HTTP ${r.status}`); - setClaimMsg("Claim request submitted. We'll update the owner shortly."); - } catch (e: any) { - setClaimErr(e?.message || "Failed to submit claim."); - } finally { - setClaimBusy(false); - } - }; - return (
-
- {/* Title / Meta / Ownership */} -
-
-

{setting.setting_title}

+
+

{setting.setting_title || "Untitled"}

- {/* DEBUG: remove after verifying */} - 
+    {/* TEMP DEBUG — remove once owner shows */}
+    
     {JSON.stringify({ owner: setting?.owner }, null, 2)}
     

 
-    

-    
Owner: {ownerDisplay}

+    

+    
Owner: {ownerDisplay}

     
Uploader: {setting.uploader || "—"}

     

-
-    {ownerDisplay === "—" && (
-      

-      
-      {claimErr && {claimErr}}
-      {claimMsg && {claimMsg}}
-      

-    )}
-
- {/* ... rest of your panels ... */} -
- {/* ... rest of the component ... */} + {/* …rest of the page… */}
); } diff --git a/app/settings/co2-galvo/page.tsx b/app/settings/co2-galvo/page.tsx index 55ea82e6..ed9651b6 100644 --- a/app/settings/co2-galvo/page.tsx +++ b/app/settings/co2-galvo/page.tsx @@ -2,16 +2,14 @@ import { useEffect, useState, useMemo } from "react"; import Link from "next/link"; -import Image from "next/image"; import { useSearchParams } from "next/navigation"; -type Owner = { - id?: string | number; - username?: string | null; - first_name?: string | null; - last_name?: string | null; - email?: string | null; -}; +type Owner = +| string +| number +| { id?: string | number; username?: string | null; first_name?: string | null; last_name?: string | null; email?: string | null } +| null +| undefined; export default function CO2GalvoSettingsPage() { const searchParams = useSearchParams(); @@ -22,28 +20,23 @@ export default function CO2GalvoSettingsPage() { const [settings, setSettings] = useState([]); const [loading, setLoading] = useState(true); - const detailHref = (id: string | number) => `/settings/co2-galvo/${id}`; - useEffect(() => { const t = setTimeout(() => setDebouncedQuery(query), 300); return () => clearTimeout(t); }, [query]); useEffect(() => { - // Use the auth proxy and request BOTH the parent field and subfields. - // This guarantees you get a raw id when expansion is restricted. + // ✅ include parent field `owner` AND subfields; use auth proxy const fields = [ "submission_id", "setting_title", "uploader", - // owner (m2o -> directus_users) - "owner", + "owner", // parent → ensures raw id comes through if expansion blocked "owner.id", "owner.username", "owner.first_name", "owner.last_name", "owner.email", - // assets / denorms "photo.id", "photo.title", "mat.name", @@ -52,10 +45,7 @@ export default function CO2GalvoSettingsPage() { "lens.field_size", ].join(","); - const url = - `/api/dx/items/settings_co2gal` + - `?fields=${encodeURIComponent(fields)}` + - `&limit=-1`; + const url = `/api/dx/items/settings_co2gal?fields=${encodeURIComponent(fields)}&limit=-1`; fetch(url, { cache: "no-store", credentials: "include" }) .then(async (res) => { @@ -67,14 +57,13 @@ export default function CO2GalvoSettingsPage() { }) .then((json) => setSettings(json?.data || [])) .catch((e) => { - console.error("CO2 Galvo settings fetch failed:", e); + console.error("CO2 Galvo list fetch failed:", e); setSettings([]); }) .finally(() => setLoading(false)); }, []); - // Robust owner label: object → username | name | email | id; primitive → id; missing → — - const ownerLabel = (o?: any) => { + const ownerLabel = (o: Owner) => { if (!o) return "—"; if (typeof o === "string" || typeof o === "number") return String(o); return ( @@ -87,7 +76,7 @@ export default function CO2GalvoSettingsPage() { const highlight = (text?: string) => { if (!debouncedQuery) return text || ""; - const regex = new RegExp(`(${debouncedQuery})`, "gi"); + const regex = new RegExp(`(${debouncedQuery.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")})`, "gi"); return (text || "").replace(regex, "$1"); }; @@ -109,27 +98,8 @@ export default function CO2GalvoSettingsPage() { }); }, [settings, debouncedQuery]); - const total = settings.length; - const uniqueMaterials = new Set( - settings.map((s) => s.mat?.name).filter(Boolean) - ).size; - - const lensCounts = settings.reduce((acc: Record, cur) => { - const v = cur.lens?.field_size; - if (v) acc[v] = (acc[v] || 0) + 1; - return acc; - }, {}); - return ( -
-
-

CO₂ Galvo Settings

-

- Browse community CO₂ galvo settings. Use search to narrow results. -

-
- - {/* search box */} +
- {/* stats */} -
-
-

How to Use

-

- Click a row to view full configuration, notes, and photos. -

-
-
-

Stats Summary

-
    -
  • Total Settings: {total}
    • -
  • Unique Materials: {uniqueMaterials}
    • -
  • - Lens Fields:{" "} - {Object.entries(lensCounts) - .map(([k, v]) => `${k} (${v})`) - .join(", ") || "—"} -
    • -
-
-
- - {/* table */} - {loading ? ( -

Loading…

- ) : ( -
- - - - - - - - - + {loading ? ( +

Loading…

+ ) : ( +
+
TitleOwnerMaterialCoatingModelField
+ + + + + + + + + + + + {filtered.map((s) => ( + + + + + + - - - {filtered.map((s) => ( - - - - ))} - -
TitleOwnerMaterialCoatingModelField
+ + + + + {s.mat?.name || "—"}{s.mat_coat?.name || "—"}{s.source?.model || "—"}{s.lens?.field_size || "—"}
- - - - - - - - -
-
- )} + ))} + +
+ )} +
); }