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

setting owner fixes + laser_soft write update

Browse source
This commit is contained in:
makearmy 2025-10-01 13:55:47 -04:00
parent 273ca51829
commit 3800cba048
6 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/settings/co2-galvo/page.tsx
View file

@ -6,6 +6,7 @@ import Link from "next/link";
import Image from "next/image";
type Owner = {
username?: string | null;
id?: string | number;
first_name?: string | null;
last_name?: string | null;
@ -36,7 +37,7 @@ export default function CO2GalvoSettingsPage() {
"submission_id",
"setting_title",
"uploader",
"owner.id",
"owner.id", "owner.username",
"owner.first_name",
"owner.last_name",
"owner.email",
@ -64,8 +65,7 @@ export default function CO2GalvoSettingsPage() {
const ownerLabel = (o?: Owner) => {
if (!o) return "—";
const name = [o.first_name, o.last_name].filter(Boolean).join(" ").trim();
return name || o.email || "—";
return o.username || "—";
};
const highlight = (text?: string) => {

6
app/settings/co2-gantry/page.tsx
View file

@ -6,6 +6,7 @@ import Link from "next/link";
import Image from "next/image";
type Owner = {
username?: string | null;
id?: string | number;
first_name?: string | null;
last_name?: string | null;
@ -36,7 +37,7 @@ export default function CO2GantrySettingsPage() {
"submission_id",
"setting_title",
"uploader",
"owner.id",
"owner.id", "owner.username",
"owner.first_name",
"owner.last_name",
"owner.email",
@ -65,8 +66,7 @@ export default function CO2GantrySettingsPage() {
const ownerLabel = (o?: Owner) => {
if (!o) return "—";
const name = [o.first_name, o.last_name].filter(Boolean).join(" ").trim();
return name || o.email || "—";
return o.username || "—";
};
const highlight = (text?: string) => {

4
app/settings/fiber/page.tsx
View file

@ -31,7 +31,7 @@ export default function FiberSettingsPage() {
"submission_id",
"setting_title",
"uploader",
"owner.display_name",
"owner.username",
"owner.first_name",
"owner.last_name",
"owner.email",
@ -55,6 +55,8 @@ export default function FiberSettingsPage() {
const ownerName = (row: any) => {
const o = row?.owner || {};
return o.username || "—";
};
return (
o.display_name ||
[o.first_name, o.last_name].filter(Boolean).join(" ") ||

6
app/settings/uv/page.tsx
View file

@ -6,6 +6,7 @@ import Link from "next/link";
import Image from "next/image";
type Owner = {
username?: string | null;
id?: string | number;
first_name?: string | null;
last_name?: string | null;
@ -37,7 +38,7 @@ export default function UVSettingsPage() {
"setting_title",
"uploader",
// owner (M2O) – minimal, safe fields
"owner.id",
"owner.id", "owner.username",
"owner.first_name",
"owner.last_name",
"owner.email",
@ -65,8 +66,7 @@ export default function UVSettingsPage() {
const ownerLabel = (o?: Owner) => {
if (!o) return "—";
const name = [o.first_name, o.last_name].filter(Boolean).join(" ").trim();
return name || o.email || "—";
return o.username || "—";
};
const highlight = (text?: string) => {