Skip to content

Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.

fix(nav): disable the company switch while it submits (#1913)

Brad Barbin23bd5d6e0b60
diff --git a/apps/erp/app/components/Layout/Navigation/CompanySwitcher.tsx b/apps/erp/app/components/Layout/Navigation/CompanySwitcher.tsx
index 249912047d..91fa8c2811 100644
--- a/apps/erp/app/components/Layout/Navigation/CompanySwitcher.tsx
+++ b/apps/erp/app/components/Layout/Navigation/CompanySwitcher.tsx
@@ -23,7 +23,13 @@ import { useLingui } from "@lingui/react/macro";
import { useMemo } from "react";
import { IoMdAdd } from "react-icons/io";
import { LuChevronsUpDown } from "react-icons/lu";
-import { Form, Link, useLocation, useParams } from "react-router";
+import {
+ Form,
+ Link,
+ useLocation,
+ useNavigation,
+ useParams
+} from "react-router";
import { useRouteData, useUser } from "~/hooks";
import type { Company } from "~/modules/settings";
import { path } from "~/utils/path";
@@ -95,6 +101,8 @@ const CompanySwitcher = () => {
const mode = useMode();
const companyGroups = useCompanyGroups();
const companyForm = useDisclosure();
+ // A switch is a full POST navigation: block a second one while it runs.
+ const navigation = useNavigation();
const hasMultipleCompanies = (routeData?.companies?.length ?? 0) > 1;
const canCreateCompany = user.admin === true;
@@ -149,7 +157,10 @@ const CompanySwitcher = () => {
asChild
disabled={isCurrent}
>
- <button type="submit">
+ <button
+ type="submit"
+ disabled={navigation.state === "submitting"}
+ >
<HStack>
<Avatar
size="xs"
diff --git a/packages/checks/src/conformance/baseline.json b/packages/checks/src/conformance/baseline.json
index 71ba7046b7..2b350ab4a2 100644
--- a/packages/checks/src/conformance/baseline.json
+++ b/packages/checks/src/conformance/baseline.json
@@ -611,8 +611,6 @@
"no-state-copy-of-loader-data::apps/mes/app/routes/x+/operations.tsx::const [items, setItems] = useState<Item[]>(initialItems);",
"no-unguarded-submit::apps/erp/app/components/AvatarMenu.tsx::<button type=\"submit\" className=\"w-full h-full flex items-center\">",
"no-unguarded-submit::apps/erp/app/components/Configurator/ConfiguratorForm/ConfiguratorForm.tsx::<Button type=\"submit\" disabled={!isStepValid} variant={isLastStep && destructive ? \"destructive\" : \"primary\"} >",
- "no-unguarded-submit::apps/erp/app/components/Layout/Topbar/Breadcrumbs.tsx::<button type=\"submit\">",
- "no-unguarded-submit::apps/erp/app/components/Layout/Topbar/CompanySwitcher.tsx::<button type=\"submit\">",
"no-unguarded-submit::apps/erp/app/components/MfaEnrollmentRequired.tsx::<Button type=\"submit\" variant=\"ghost\" size=\"md\" className=\"w-full text-muted-foreground\" >",
"no-unguarded-submit::apps/erp/app/components/RichText.tsx::<Button type=\"submit\" variant=\"link\" size=\"md\">",
"no-unguarded-submit::apps/erp/app/components/SessionLockOverlay.tsx::<Button type=\"submit\" variant=\"link\" size=\"sm\" className=\"text-muted-foreground\" >",