From f61029a8ca54855e817c6b0fbb10573d2da4599f Mon Sep 17 00:00:00 2001 From: makearmy Date: Wed, 1 Oct 2025 20:39:16 -0400 Subject: [PATCH] co2 galvo owner test --- app/settings/co2-galvo/page.tsx | 52 ++++++++++----------------------- 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/app/settings/co2-galvo/page.tsx b/app/settings/co2-galvo/page.tsx index 2051fbc5..5d7af485 100644 --- a/app/settings/co2-galvo/page.tsx +++ b/app/settings/co2-galvo/page.tsx @@ -34,8 +34,10 @@ export default function CO2GalvoSettingsPage() { "submission_id", "setting_title", "uploader", + // ensure relation expands "owner.id", "owner.username", + // assets / denorms "photo.id", "photo.title", "mat.name", @@ -44,6 +46,7 @@ export default function CO2GalvoSettingsPage() { "lens.field_size", ].join(","); + // IMPORTANT: go through our proxy so the user's ma_at cookie is used const url = `/api/dx/items/settings_co2gal?fields=${encodeURIComponent(fields)}&limit=-1`; fetch(url, { cache: "no-store", credentials: "include" }) @@ -89,9 +92,7 @@ export default function CO2GalvoSettingsPage() { }, [settings, debouncedQuery]); const total = settings.length; - const uniqueMaterials = new Set( - settings.map((s) => s.mat?.name).filter(Boolean) - ).size; + 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; @@ -100,9 +101,7 @@ export default function CO2GalvoSettingsPage() { return acc; }, {}); const mostCommonLens = - Object.entries(lensCounts).sort( - (a, b) => (Number(b[1]) || 0) - (Number(a[1]) || 0) - )[0]?.[0] || "—"; + Object.entries(lensCounts).sort((a, b) => (Number(b[1]) || 0) - (Number(a[1]) || 0))[0]?.[0] || "—"; const srcCounts = settings.reduce((acc: Record, cur) => { const v = cur.source?.model; @@ -111,13 +110,9 @@ export default function CO2GalvoSettingsPage() { return acc; }, {}); const mostCommonSource = - Object.entries(srcCounts).sort( - (a, b) => (Number(b[1]) || 0) - (Number(a[1]) || 0) - )[0]?.[0] || "—"; + Object.entries(srcCounts).sort((a, b) => (Number(b[1]) || 0) - (Number(a[1]) || 0))[0]?.[0] || "—"; - const recent = [...settings] - .sort((a, b) => Number(b.submission_id) - Number(a.submission_id)) - .slice(0, 5); + const recent = [...settings].sort((a, b) => Number(b.submission_id) - Number(a.submission_id)).slice(0, 5); return (
@@ -172,10 +167,7 @@ export default function CO2GalvoSettingsPage() {
    {recent.map((s) => (
  • - + {s.setting_title || "Untitled"} {" "} @@ -228,46 +220,32 @@ export default function CO2GalvoSettingsPage() { ))}