routing fixes

app/api/options/laser_software/route.ts

@@ -1,39 +1,11 @@
-// app/api/options/laser_software/route.ts
-export const dynamic = "force-dynamic";
+import { NextRequest } from "next/server";
+import { dFetchJSON, applyQFilter, json, Option } from "../_lib";
 
-import { NextRequest, NextResponse } from "next/server";
-
-const BASE = (process.env.DIRECTUS_URL || "").replace(/\/$/, "");
-const PATH = `/items/laser_software?fields=id,name&sort=name`;
-
-async function dFetch(bearer: string) {
-    const res = await fetch(`${BASE}${PATH}`, {
-        headers: { Accept: "application/json", Authorization: `Bearer ${bearer}` },
-        cache: "no-store",
-    });
-    const text = await res.text().catch(() => "");
-    let json: any = null;
-    try { json = text ? JSON.parse(text) : null; } catch {}
-    return { res, json, text };
-}
+type Row = { id: number | string; name?: string | null };
 
 export async function GET(req: NextRequest) {
-    try {
-        const userAt = req.cookies.get("ma_at")?.value;
-        if (!userAt) return NextResponse.json({ error: "Not authenticated" }, { status: 401 });
-
-        const r = await dFetch(userAt);
-        if (!r.res.ok) {
-            return NextResponse.json(
-                { error: `Directus ${r.res.status}: ${r.text || r.res.statusText}` },
-                { status: r.res.status }
-            );
-        }
-
-        const rows: Array<{ id: number | string; name: string }> = r.json?.data ?? [];
-        const data = rows.map(({ id, name }) => ({ id, name }));
-        return NextResponse.json({ data });
-    } catch (e: any) {
-        return NextResponse.json({ error: e?.message || "Failed to load software" }, { status: 500 });
-    }
+    const q = new URL(req.url).searchParams.get("q");
+    const { data } = await dFetchJSON<{ data: Row[] }>(req, "/items/laser_software?fields=id,name&limit=1000&sort=name");
+    const options: Option[] = data.map((r) => ({ id: r.id, label: r.name ?? String(r.id) }));
+    return json(applyQFilter(options, q, (o) => o.label));
 }