makearmy/makearmy-app
1
0
Fork 0
Code Issues 11 Pull requests Projects Releases Packages Wiki Activity Actions

co2 galvo owner test

Browse source
This commit is contained in:
makearmy 2025-10-01 19:29:52 -04:00
parent cd526dced4
commit 715be11ff9
1 changed files with 5 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/settings/co2-galvo/[id]/co2-galvo.tsx
View file

@ -5,22 +5,6 @@ import { useParams } from "next/navigation";
import Image from "next/image"; import Image from "next/image";
import Markdown from "react-markdown"; import Markdown from "react-markdown";
function getMaToken(): string | null {
if (typeof window === "undefined") return null;
// cookie first
const c = document.cookie
.split("; ")
.find((x) => x.startsWith("ma_at="))
?.split("=")[1];
if (c) return decodeURIComponent(c);
// localStorage fallback (if you ever store it there)
try {
const ls = window.localStorage.getItem("ma_at");
if (ls) return ls;
} catch {}
return null;
}
export default function CO2GalvoSettingDetailPage() { export default function CO2GalvoSettingDetailPage() {
const { id } = useParams<{ id: string }>(); const { id } = useParams<{ id: string }>();
const [setting, setSetting] = useState<any>(null); const [setting, setSetting] = useState<any>(null);
@ -36,7 +20,7 @@ export default function CO2GalvoSettingDetailPage() {
"submission_id", "submission_id",
"setting_title", "setting_title",
"uploader", "uploader",
// need username explicitly for M2O // make sure owner expands
"owner.id", "owner.id",
"owner.username", "owner.username",
"setting_notes", "setting_notes",
@ -57,7 +41,7 @@ export default function CO2GalvoSettingDetailPage() {
"lens_apt.name", "lens_apt.name",
"lens_exp.name", "lens_exp.name",
"focus", "focus",
// laser_soft may be string OR relation // string-or-relation
"laser_soft", "laser_soft",
"laser_soft.name", "laser_soft.name",
"repeat_all", "repeat_all",
@ -66,21 +50,11 @@ export default function CO2GalvoSettingDetailPage() {
"raster_settings", "raster_settings",
].join(","); ].join(",");
const url = const url = `/api/dx/items/settings_co2gal/${encodeURIComponent(String(id))}` +
`${process.env.NEXT_PUBLIC_API_BASE_URL}/items/settings_co2gal/` +
encodeURIComponent(String(id)) +
`?fields=${encodeURIComponent(fields)}`; `?fields=${encodeURIComponent(fields)}`;
const token = getMaToken();
setLoading(true); setLoading(true);
fetch(url, { cache: "no-store", credentials: "include" })
fetch(url, {
method: "GET",
headers: token ? { Authorization: `Bearer ${token}` } : {},
cache: "no-store",
// do NOT rely on cross-site cookies; we send the bearer explicitly
credentials: "omit",
})
.then(async (res) => { .then(async (res) => {
if (!res.ok) { if (!res.ok) {
const j = await res.json().catch(() => ({})); const j = await res.json().catch(() => ({}));
@ -99,7 +73,7 @@ export default function CO2GalvoSettingDetailPage() {
if (loading) return <p className="p-6">Loading setting...</p>; if (loading) return <p className="p-6">Loading setting...</p>;
if (!setting) return <p className="p-6">Setting not found.</p>; if (!setting) return <p className="p-6">Setting not found.</p>;
// ----- presentation helpers ----- // ---- display helpers ----
const ownerDisplay: string = const ownerDisplay: string =
typeof setting?.owner === "object" typeof setting?.owner === "object"
? (setting.owner?.username ?? setting.owner?.id ?? "—") ? (setting.owner?.username ?? setting.owner?.id ?? "—")