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

my-settings tab update

Browse source
This commit is contained in:
makearmy 2025-10-02 22:15:06 -04:00
parent 3796a1afd7
commit b41fbd98a0
3 changed files with 280 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
components/portal/SettingsSwitcher.tsx
View file

@ -18,18 +18,22 @@ const SettingsSubmit = dynamic(
);
type DataTab = "fiber" | "uv" | "co2-gantry" | "co2-galvo";
type Tab = DataTab | "add";
type Tab = DataTab | "add" | "my";
const TABS: { key: Tab; label: string }[] = [
{ key: "fiber", label: "Fiber" },
{ key: "uv", label: "UV" },
{ key: "co2-gantry", label: "CO₂ Gantry" },
{ key: "co2-galvo", label: "CO₂ Galvo" },
{ key: "my", label: "My Settings" }, // ← NEW
{ key: "add", label: "Add Setting" },
];
const isDataTab = (k: string): k is DataTab =>
k === "fiber" || k === "uv" || k === "co2-gantry" || k === "co2-galvo";
k === "fiber" || k === "uv" || k === "co2-ganry" || k === "co2-gantry" || k === "co2-galvo"
// keep typo guard for "co2-ganry" if you want; remove if unnecessary
? true
: (k === "fiber" || k === "uv" || k === "co2-gantry" || k === "co2-galvo");
const tabToTarget: Record<DataTab,
"settings_fiber" | "settings_uv" | "settings_co2gan" | "settings_co2gal"
@ -53,6 +57,16 @@ function Panel({ tab, lastDataTab }: { tab: Tab; lastDataTab: DataTab }) {
<SettingsSubmit initialTarget={tabToTarget[lastDataTab]} />
</div>
);
case "my":
// We navigate away for "My Settings", so this branch is not normally rendered.
// Fallback content (just in case someone forces ?t=my on this page):
return (
<div className="rounded-md border p-4">
<p className="text-sm">
Opening <span className="font-medium">My Settings</span>…
</p>
</div>
);
default:
return <FiberPanel />;
}
@ -67,21 +81,25 @@ export default function SettingsSwitcher() {
// last data tab is taken from ?last=… (or fallback to current active if it’s a data tab)
const lastParam = (sp.get("last") || (isDataTab(active) ? active : "fiber")).toLowerCase();
const lastDataTab: DataTab = isDataTab(lastParam) ? lastParam : "fiber";
const lastDataTab: DataTab = isDataTab(lastParam) ? (lastParam as DataTab) : "fiber";
function setTab(nextKey: Tab) {
// NEW: "My Settings" navigates to its own page
if (nextKey === "my") {
router.push("/portal/my-settings");
return;
}
const q = new URLSearchParams(sp.toString());
q.set("t", nextKey);
// keep track of last data tab so the Add tab knows which target to preselect
if (nextKey === "add") {
q.set("last", isDataTab(active) ? active : lastDataTab);
} else {
q.set("last", isDataTab(active) ? (active as DataTab) : lastDataTab);
} else if (isDataTab(nextKey)) {
q.set("last", nextKey);
}
// optional: clear detail id if switching away from a data tab you don’t want to show
// (leaving as-is preserves your existing behavior)
router.replace(`/portal/laser-settings?${q.toString()}`, { scroll: false });
}