user auth bearer updates to multiple apis and scripts
This commit is contained in:
parent
eb1a97541e
commit
b54120d88e
4 changed files with 182 additions and 160 deletions
|
|
@ -17,6 +17,37 @@ type Me = {
|
|||
|
||||
const API = (process.env.NEXT_PUBLIC_API_BASE_URL || "").replace(/\/$/, "");
|
||||
|
||||
// ─────────────────────────────────────────────────────────────
|
||||
// Local enums (no schema introspection)
|
||||
// ─────────────────────────────────────────────────────────────
|
||||
const FILL_TYPE_OPTIONS = [
|
||||
{ label: "UniDirectional", value: "uni" },
|
||||
{ label: "BiDirectional", value: "bi" },
|
||||
{ label: "Offset Fill", value: "offset" },
|
||||
];
|
||||
|
||||
const RASTER_TYPE_OPTIONS = [
|
||||
{ label: "UniDirectional", value: "uni" },
|
||||
{ label: "BiDirectional", value: "bi" },
|
||||
{ label: "Offset Fill", value: "offset" },
|
||||
];
|
||||
|
||||
const RASTER_DITHER_OPTIONS = [
|
||||
{ label: "Threshold", value: "threshold" },
|
||||
{ label: "Ordered", value: "ordered" },
|
||||
{ label: "Atkinson", value: "atkinson" },
|
||||
{ label: "Dither", value: "dither" },
|
||||
{ label: "Stucki", value: "stucki" },
|
||||
{ label: "Jarvis", value: "jarvis" },
|
||||
{ label: "Newsprint", value: "newsprint" },
|
||||
{ label: "Halftone", value: "halftone" },
|
||||
{ label: "Sketch", value: "sketch" },
|
||||
{ label: "Grayscale", value: "grayscale" },
|
||||
];
|
||||
|
||||
const toOpts = (arr: { label: string; value: string }[]): Opt[] =>
|
||||
arr.map((x) => ({ id: x.value, label: x.label }));
|
||||
|
||||
function shortId(s?: string) {
|
||||
if (!s) return "";
|
||||
return s.length <= 12 ? s : `${s.slice(0, 8)}…${s.slice(-4)}`;
|
||||
|
|
@ -108,25 +139,6 @@ function useOptions(path: string) {
|
|||
});
|
||||
};
|
||||
}
|
||||
} else if (rawPath === "repeater-choices") {
|
||||
const group = params.get("group") || "";
|
||||
const field = params.get("field") || "";
|
||||
const collection = params.get("target") || "";
|
||||
|
||||
const proxy = `/api/directus/choices?collection=${encodeURIComponent(collection)}&group=${encodeURIComponent(group)}&field=${encodeURIComponent(field)}`;
|
||||
const r = await fetch(proxy, { cache: "no-store" });
|
||||
if (!r.ok) throw new Error(`Proxy ${r.status} fetching ${proxy}`);
|
||||
const j = await r.json().catch(() => ({}));
|
||||
const mapped: Opt[] = Array.isArray(j?.data) ? j.data : [];
|
||||
|
||||
if (alive) {
|
||||
const needle = (q || "").trim().toLowerCase();
|
||||
const filtered = needle ? mapped.filter((o) => o.label.toLowerCase().includes(needle)) : mapped;
|
||||
setOpts(filtered);
|
||||
setLoading(false);
|
||||
}
|
||||
return;
|
||||
|
||||
} else {
|
||||
// unknown path → empty
|
||||
setOpts([]);
|
||||
|
|
@ -259,11 +271,11 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
useEffect(() => {
|
||||
let alive = true;
|
||||
|
||||
fetch(`/api/auth/me`, { cache: "no-store", credentials: "include" })
|
||||
// use our bearer-only API
|
||||
fetch(`/api/me`, { cache: "no-store", credentials: "include" })
|
||||
.then((r) => (r.ok ? r.json() : Promise.reject(r)))
|
||||
.then((j) => {
|
||||
if (!alive) return;
|
||||
// j is the user object directly (not wrapped in { data })
|
||||
setMe(j || null);
|
||||
})
|
||||
.catch(() => {
|
||||
|
|
@ -276,10 +288,10 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
}, []);
|
||||
|
||||
const meLabel =
|
||||
me?.display_name?.trim() ||
|
||||
[me?.first_name, me?.last_name].filter(Boolean).join(" ").trim() ||
|
||||
me?.username?.trim() ||
|
||||
me?.email?.trim() ||
|
||||
[me?.first_name, me?.last_name].filter(Boolean).join(" ").trim() ||
|
||||
me?.display_name?.trim() ||
|
||||
(me?.id ? `User ${me.id.slice(0, 8)}…${me.id.slice(-4)}` : "Unknown user");
|
||||
|
||||
// Options
|
||||
|
|
@ -293,10 +305,10 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
const srcs = useOptions(`laser_source?target=${typeForOptions}`);
|
||||
const lens = useOptions(`lens?target=${typeForOptions}`);
|
||||
|
||||
// Repeater choice options
|
||||
const fillType = useOptions(`repeater-choices?target=${target}&group=fill_settings&field=type`);
|
||||
const rasterType = useOptions(`repeater-choices?target=${target}&group=raster_settings&field=type`);
|
||||
const rasterDither = useOptions(`repeater-choices?target=${target}&group=raster_settings&field=dither`);
|
||||
// Repeater choice options (LOCAL now, no network)
|
||||
const fillType = { opts: toOpts(FILL_TYPE_OPTIONS), loading: false, setQ: (_: string) => {} };
|
||||
const rasterType = { opts: toOpts(RASTER_TYPE_OPTIONS), loading: false, setQ: (_: string) => {} };
|
||||
const rasterDither = { opts: toOpts(RASTER_DITHER_OPTIONS), loading: false, setQ: (_: string) => {} };
|
||||
|
||||
const {
|
||||
register,
|
||||
|
|
@ -361,7 +373,7 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
speed: num(r.speed),
|
||||
interval: num(r.interval),
|
||||
pass: num(r.pass),
|
||||
type: r.type || "",
|
||||
type: r.type || "", // now driven by local enum
|
||||
frequency: num(r.frequency),
|
||||
pulse: num(r.pulse),
|
||||
angle: num(r.angle),
|
||||
|
|
@ -390,8 +402,8 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
name: r.name || "",
|
||||
power: num(r.power),
|
||||
speed: num(r.speed),
|
||||
type: r.type || "",
|
||||
dither: r.dither || "",
|
||||
type: r.type || "", // now driven by local enum
|
||||
dither: r.dither || "", // now driven by local enum
|
||||
halftone_cell: num(r.halftone_cell),
|
||||
halftone_angle: num(r.halftone_angle),
|
||||
inversion: bool(r.inversion),
|
||||
|
|
@ -651,7 +663,11 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
<fieldset className="border rounded p-3 space-y-2">
|
||||
<div className="flex items-center justify-between">
|
||||
<legend className="font-semibold">Fill Settings</legend>
|
||||
<button type="button" className="px-2 py-1 border rounded" onClick={() => fills.append({})}>
|
||||
<button
|
||||
type="button"
|
||||
className="px-2 py-1 border rounded"
|
||||
onClick={() => fills.append({ type: "uni" })} // default ensures value populated
|
||||
>
|
||||
+ Add
|
||||
</button>
|
||||
</div>
|
||||
|
|
@ -663,8 +679,8 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
name={`fill_settings.${i}.type`}
|
||||
register={register}
|
||||
options={fillType.opts}
|
||||
loading={fillType.loading}
|
||||
onQuery={fillType.setQ}
|
||||
loading={false}
|
||||
onQuery={() => {}}
|
||||
placeholder="Select type"
|
||||
/>
|
||||
<input placeholder="Frequency (kHz)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.frequency`)} />
|
||||
|
|
@ -726,7 +742,11 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
<fieldset className="border rounded p-3 space-y-2">
|
||||
<div className="flex items-center justify-between">
|
||||
<legend className="font-semibold">Raster Settings</legend>
|
||||
<button type="button" className="px-2 py-1 border rounded" onClick={() => rasters.append({})}>
|
||||
<button
|
||||
type="button"
|
||||
className="px-2 py-1 border rounded"
|
||||
onClick={() => rasters.append({ type: "uni", dither: "threshold" })} // defaults ensure values are set
|
||||
>
|
||||
+ Add
|
||||
</button>
|
||||
</div>
|
||||
|
|
@ -740,8 +760,8 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
name={`raster_settings.${i}.type`}
|
||||
register={register}
|
||||
options={rasterType.opts}
|
||||
loading={rasterType.loading}
|
||||
onQuery={rasterType.setQ}
|
||||
loading={false}
|
||||
onQuery={() => {}}
|
||||
placeholder="Select type"
|
||||
/>
|
||||
<FilterableSelect
|
||||
|
|
@ -749,8 +769,8 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
name={`raster_settings.${i}.dither`}
|
||||
register={register}
|
||||
options={rasterDither.opts}
|
||||
loading={rasterDither.loading}
|
||||
onQuery={rasterDither.setQ}
|
||||
loading={false}
|
||||
onQuery={() => {}}
|
||||
placeholder="Select dither"
|
||||
/>
|
||||
<input placeholder="Power (%)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.power`)} />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue