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.
TypeScript ai-agentsbill-of-materialserpinventory-managementleanmanufacturingmanufacturing-execution-systemmcp-servermesmrpopen-source-erppostgresqlproduction-planningqmsquality-management-systemreact-routerself-hostedsupabasetraceabilitytypescript
refactor: architecture hardening (#1836)
Sidb0437fbfe477
diff --git a/.ai/plans/2026-10-04-frontend-hardening.md b/.ai/plans/2026-10-04-frontend-hardening.mdnew file mode 100644index 0000000000..c176642159--- /dev/null+++ b/.ai/plans/2026-10-04-frontend-hardening.md@@ -0,0 +1,62 @@+# Frontend hardening — 2026-10-04++Branch `refactor/architecture-hardening` (created as `refactor/frontend-hardening`), one commit per piece.+Out of scope (separate session): the TanStack Query caching layer (`cachedClientLoader`,+root invalidation middleware, `useLoaderQuery`/`useAction`) and the realtime list provider+rebuild that depends on it.++Verification per piece: `pnpm exec turbo run typecheck --filter=<pkg> --concurrency=1`+(one filter at a time), `pnpm exec biome check <paths>`, scoped tests where they exist.++## Pieces++- [x] 1. `framer-motion` → `motion` (imports, catalog, unused deps in starter/tiptap)+- [x] 2. Motion + UI polish in shared components+ - button press scale 0.98, page overscroll off+ - `Modal` broken exit class, `Drawer` exit animation + overlay blur+ - popovers scale from their trigger; tooltips share one provider+ - reduced motion: `MotionConfig reducedMotion="user"` + global CSS rule+ - summary-card `y: 50` entrance, `scale: 0`, `ease-in`, BoM/BoP row durations+- [x] 3. Accessibility: pinch-zoom, dialog titles, combobox ARIA state+- [x] 4. Redirects safe by default+ - `redirect` / `redirectExternal` / `safePath` in `@carbon/utils`; home-page fallback+ - codemod every `redirect` import; delete `safeRedirect`+ - `@carbon/checks` rule: no `redirect` import from `react-router`+- [x] 5. Redirect fixes: magic link, already-signed-in, dev bypass, verify, company switchers+- [x] 6. Error boundaries on the `x+` layouts so a failed loader keeps the shell+- [x] 7. Client state: client-only nanostores → zustand; jotai (tiptap) → zustand+- [x] 8. Shared ERP/MES code — first step+ - [x] `useIdle`, `Enumerable` → `@carbon/react`; apps keep re-exports+ - [x] `no-duplicated-app-file` check; the 20 remaining duplicates are baselined+ - [ ] auth routes (login, callback, mfa, unlock, refresh-session) → `@carbon/auth`+ — needs a running stack to verify each login path; not done blind+ - [ ] the 20 baselined files: each imports its app's `path`, `useUser` or stores,+ so sharing means passing those in — decide the shape before moving them+- [x] 9. Route modals close to their parent route instead of `navigate(-1)`+- [x] 10. Small leftovers: unused Radix deps, `h-dvh` in MES, lazy images, `@ts-ignore` → `@ts-expect-error`++## Added after the first pass++- [x] Stable `Card` / `ToggleGroup` context, `aria-sort`, modal overlay blur, three `transition-all`+- [x] PDF engine out of the client entry; PostHog web vitals+- [x] `downloadUrl` checks the response at the 12 file-download sites++## Verified in the browser (local, dev bypass login)++Redirect destinations, route modal close, in-shell error boundary, dialog and+drawer behaviour, overscroll and zoom, the hub nav item and home card.++## Still to check on staging++- Magic-link, OAuth, passkey, SSO and Stripe redirects+- The company switcher with a multi-company user+- Auth routes → `@carbon/auth` (not started)++## Needs its own plan (not in this branch)++- Bill of process / bill of material / make-method-tools triplication+- `Table` boolean flags → composed toolbar+- Filter components (71% overlap — reconcile before sharing)+- `root` / `entry.*` bootstrap sharing+- The 20 baselined duplicates: a per-app provider for `path` / user / stores+- Six components that sync state to their parent from an effectdiff --git a/.claude/rules/authz-manifest.md b/.claude/rules/authz-manifest.mdindex d6e2756408..3f1538e59f 100644--- a/.claude/rules/authz-manifest.md+++ b/.claude/rules/authz-manifest.md@@ -110,6 +110,7 @@ RLS helpers — `loadHelpers()` reads both directories, and a `Helper` carries ipnpm --filter @carbon/database authz check # what sync would change (exit 3 = drift)pnpm --filter @carbon/database authz sync # make the local database matchpnpm --filter @carbon/database authz migration <name> # ship unshipped rules/helpers+pnpm --filter @carbon/database authz migration <name> --tables=a,b # also re-ship these tablespnpm --filter @carbon/database exec vitest run src/authz```@@ -117,6 +118,12 @@ Behaviour tests (run against a local database, each rolls back):`supabase/tests/authz-pieces.test.sql` (one case per piece),`authz-fixes.test.sql`, `journal-update-tenant-check.test.sql`.+A table still on its `baseline.json` hash keeps the policy TEXT production had at takeover.+The meaning equals its rule; the wording may not — production's `agentThread` policies called+`auth.uid()` bare, which Postgres re-evaluates per row, while the manifest renders+`(SELECT auth.uid())`. `--tables` re-lands a named table's rule as rendered+(`20261003223948_rls-caller-lookup-once.sql`).+## Gotchas- A filtered `UPDATE … WHERE` also checks the new row against the SELECT policy, so a test ofdiff --git a/.claude/rules/billing-system.md b/.claude/rules/billing-system.mdindex 73ad440356..483ca0cd61 100644--- a/.claude/rules/billing-system.md+++ b/.claude/rules/billing-system.md@@ -201,6 +201,23 @@ whom it deleted.- Each warn or delete batch that still fails after its retries is logged and skipped.It never ends the run, so the training reminders after it still go out.+- **One exception to "warned first": the manual purge.** `purge-inactive-companies`+ (`scheduled/purge-inactive-companies.ts`) runs only when someone presses Invoke on it+ in the Inngest dashboard, on Carbon Cloud. `purgeRefusal` (tested) is the first thing+ the run checks: any edition but Cloud is refused, and so is any run whose event is not+ `inngest/function.invoked`, so sending `carbon/purge-inactive-companies` with the event+ key does nothing. Off Cloud the function is not registered at all+ (`packages/jobs/src/inngest/index.ts`). It deletes inactive+ companies immediately, with no email and no waiting period, including ones the weekly+ job warned for a later date. The inactivity rule is the weekly job's, unchanged+ (`loadInactiveCompanies` and the in-transaction `inactiveCompanyOwner`, both in+ `scheduled/company-cleanup.ts`, shared by the two). It is a DRY RUN unless the payload+ says `{ "dryRun": false }` (`resolvePurgeOptions`, tested): an Invoke with an empty+ payload returns the companies it would delete and deletes none. `limit` caps a run, 500+ at most. An ownerless company is still never deleted.+- **Caps.** Both paths handle at most 500 companies a run, ten per Inngest step+ (`MAX_COMPANY_DELETIONS_PER_RUN`, `MAX_COMPANIES_PER_RUN`).+- **The group is the unit** (`selectInactiveCompanies`, `inactive-companies.ts`, tested).A company goes when it has no `companyPlan` row, no company in its group has one, it isover 7 days old, and it is not protected. `companyPlan` rows are written only by Stripe@@ -226,9 +243,11 @@ whom it deleted.rolls the delete back, so the company row stays as the retry target and nothing isorphaned once a delete commits. A company whose cleanup failed part-way may havelost some files; it is still warned and due, so the next run finishes it. The search- index is dropped after the commit, and a failure there is only logged. Provider+ index and audit log tables (`searchIndex_<id>`, `auditLog_<id>`: named after the+ company, so outside the catalog) are dropped after the commit by `deleteCompanies`+ (`company-cleanup.ts`), and a failure there is only logged. Providertokens are not revoked at the provider.-- At most 100 companies per run (Inngest's per-run step limit), 10 per step. Oldest go first.+- At most 500 companies per run (Inngest's per-run step limit), 10 per step. Oldest go first.- A company with live intercompany history (`intercompanyTransaction` is NO ACTION) failsits delete, is logged, and is retried every week.diff --git a/.claude/rules/coding-conventions.md b/.claude/rules/coding-conventions.mdindex dbe02d7364..bc386c9287 100644--- a/.claude/rules/coding-conventions.md+++ b/.claude/rules/coding-conventions.md@@ -41,7 +41,13 @@ rules — this file does not repeat them:`@carbon/notifications`, `@carbon/stripe`, `@carbon/tiptap`, `@carbon/kv`,`@carbon/lib`, `@carbon/locale`, `@carbon/ee`, `@carbon/env`, `@carbon/config`.- `react-router` is the framework import for `LoaderFunctionArgs`,- `ActionFunctionArgs`, `redirect`, `data`, `useNavigate`, etc.+ `ActionFunctionArgs`, `data`, `useNavigate`, etc. — but NOT `redirect`.+- `redirect` comes from `@carbon/utils`. It only goes to a path on this origin;+ anything else (an absolute URL, `//host`, an empty value) lands on the home+ page, so a destination read from a query string or a form needs no validation+ at the call site. Leaving the origin on purpose (OAuth provider, Stripe, ERP ↔+ MES) is `redirectExternal`, with a URL the server built. Enforced by the+ `no-raw-redirect` check (`@carbon/checks`).- Server-only auth helpers come from subpaths:`@carbon/auth/auth.server` (`requirePermissions`), `@carbon/auth/session.server`(`flash`), and `@carbon/auth` (`error`, `success`, `assertIsPost`).@@ -104,11 +110,14 @@ MES is lighter: services live under `apps/mes/app/services/`, components underre-runs every matched loader on every navigation otherwise. Use`isUnaffectedByNavigation(args, { params, search })` from `@carbon/utils`, naming theroute params the loader reads and either the search params it reads or `search: "all"`- for a list loader. Shell data that does not gate rendering is returned as a promise.- Render it through `Await` when it is visible on first paint, so it streams in the- server HTML (`ImplementationData` in `~/hooks/useImplementationNavItem` is the- pattern); read it with `useResolved` (`~/hooks/useResolved`) when a late value is- harmless. `useResolved` keeps the last value while a revalidation is pending, so a+ for a list loader. Shell data that does not gate rendering is returned as a promise+ and read with `useResolved` (`~/hooks/useResolved`) when a late value is harmless.+ Data that adds or removes something on first paint (a nav item, a card) is awaited+ instead: streamed in, it arrives after the page is drawn and pushes it around — the+ Implementation Hub's nav item and home card did exactly that. Await only the part+ that decides whether the thing exists (the hub row) and stream what fills it in+ (its progress), holding the layout until it lands.+ `useResolved` keeps the last value while a revalidation is pending, so acomponent that stays mounted across records passes the record id as its thirdargument (`useResolved(promise, null, itemId)`), or it shows the previous record'svalue until the new one arrives.@@ -140,6 +149,10 @@ MES is lighter: services live under `apps/mes/app/services/`, components under`bg-*`/`text-*` classes.- App-level shared components live in `apps/erp/app/components/` and arere-exported from its `index.ts`.+- A component or hook both ERP and MES need lives in a package (`@carbon/react`,+ `@carbon/auth`, `@carbon/utils`), not as a copy in each app. An app file of the+ same name may only re-export it. Enforced by the `no-duplicated-app-file` check+ (`@carbon/checks`); the copies that predate it are baselined.- Functional components, props typed inline or via `type`/`z.infer<typeof validator>`.- Styling is Tailwind. Theme colors are CSS variables — use `hsl(var(--primary))`for theme-aware fills (e.g. Recharts), not hard-coded colors.@@ -157,8 +170,10 @@ MES is lighter: services live under `apps/mes/app/services/`, components under- **Client read-through cache**: TanStack React Query (`window.clientCache`);query keys are company-scoped, e.g. `["things", companyId]`(`apps/erp/app/utils/react-query.ts`).-- **Global UI state**: nanostores atoms + `@nanostores/react`- (e.g. `apps/erp/app/stores/items.ts`).+- **Global UI state**: zustand (`apps/erp/app/stores/ui.ts`). nanostores is+ legacy: it now only holds the realtime lists (`stores/items.ts`, `customers.ts`,+ `suppliers.ts`, `people.ts`) and goes when that provider is rebuilt — do not add+ new atoms.## Path Helpersdiff --git a/.claude/rules/conventions-ui.md b/.claude/rules/conventions-ui.mdindex 46de6cb2db..61c3d487b2 100644--- a/.claude/rules/conventions-ui.md+++ b/.claude/rules/conventions-ui.md@@ -215,12 +215,12 @@ For dynamic numbers, prevent layout shift with `tabular-nums` (used in### 4. Scale on Press-Tactile button feedback. `Button` itself applies `active:scale-[0.96]+Tactile button feedback. `Button` itself applies `active:scale-[0.98]active:duration-75`; reuse `Button`/`IconButton` rather than reimplementing. When-hand-rolling a pressable element, match `0.96` (never below `0.95`).+hand-rolling a pressable element, match `0.98` (a deeper press reads as the layout moving; never below `0.95`).```typescript-<button className="active:scale-[0.96] transition-transform">+<button className="active:scale-[0.98] transition-transform">```### 5. Minimum Hit Area@@ -246,8 +246,8 @@ className="transition-all"### 7. AnimatePresence-Motion uses `framer-motion` (imported as `from "framer-motion"`, e.g.-`apps/erp/app/components/DirectionAwareTabs.tsx`). Skip animation on page load with+Motion uses `motion` (imported as `from "motion/react"`; `framer-motion` is no longer a dependency), e.g.+`apps/erp/app/components/DirectionAwareTabs.tsx`. Skip animation on page load with`initial={false}`:```typescriptdiff --git a/apps/academy/app/routes/_auth+/callback.tsx b/apps/academy/app/routes/_auth+/callback.tsxindex 8a5353ec64..856845ad1d 100644--- a/apps/academy/app/routes/_auth+/callback.tsx+++ b/apps/academy/app/routes/_auth+/callback.tsx@@ -6,8 +6,7 @@ import {assertIsPost,callbackValidator,carbonClient,- error,- safeRedirect+ error} from "@carbon/auth";import { refreshAccessToken } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";@@ -28,13 +27,13 @@ import {CarbonPulse,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { useEffect, useRef, useState } from "react";import { LuTriangleAlert } from "react-icons/lu";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";import {data,Link,- redirect,useFetcher,useLocation,useSearchParams@@ -95,7 +94,7 @@ export async function action({ request }: ActionFunctionArgs) {authSession});const companyIdCookie = setCompanyId(authSession.companyId);- return redirect(safeRedirect(redirectTo, path.to.root), {+ return redirect(redirectTo || path.to.root, {headers: [["Set-Cookie", sessionCookie],["Set-Cookie", companyIdCookie]diff --git a/apps/academy/app/routes/_auth+/login.tsx b/apps/academy/app/routes/_auth+/login.tsxindex 10e428ef03..12528ab36e 100644--- a/apps/academy/app/routes/_auth+/login.tsx+++ b/apps/academy/app/routes/_auth+/login.tsx@@ -33,20 +33,14 @@ import {useBotProtection,VStack} from "@carbon/react";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import { LuCircleAlert } from "react-icons/lu";import type {ActionFunctionArgs,LoaderFunctionArgs,MetaFunction} from "react-router";-import {- data,- redirect,- useFetcher,- useLoaderData,- useSearchParams-} from "react-router";+import { data, useFetcher, useLoaderData, useSearchParams } from "react-router";import { path } from "~/utils/path";diff --git a/apps/academy/app/routes/_auth+/logout.tsx b/apps/academy/app/routes/_auth+/logout.tsxindex 5cffcb25ef..283c42f817 100644--- a/apps/academy/app/routes/_auth+/logout.tsx+++ b/apps/academy/app/routes/_auth+/logout.tsx@@ -4,9 +4,8 @@import { assertIsPost } from "@carbon/auth";import { destroyAuthSession } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";-import { path } from "~/utils/path";export async function action({ request }: ActionFunctionArgs) {diff --git a/apps/academy/app/routes/_auth+/mfa.tsx b/apps/academy/app/routes/_auth+/mfa.tsxindex 98e6d04296..d2b242f744 100644--- a/apps/academy/app/routes/_auth+/mfa.tsx+++ b/apps/academy/app/routes/_auth+/mfa.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { assertIsPost, error, RATE_LIMIT, safeRedirect } from "@carbon/auth";+import { assertIsPost, error, RATE_LIMIT } from "@carbon/auth";import { userHasVerifiedTotpFactor } from "@carbon/auth/mfa.server";import {completeMfaChallenge,@@ -27,7 +27,7 @@ import {Heading,VStack} from "@carbon/react";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import { useEffect, useRef } from "react";import { LuCircleAlert } from "react-icons/lu";import type {@@ -35,13 +35,7 @@ import type {LoaderFunctionArgs,MetaFunction} from "react-router";-import {- data,- Form,- redirect,- useFetcher,- useSearchParams-} from "react-router";+import { data, Form, useFetcher, useSearchParams } from "react-router";import { z } from "zod";import { path } from "~/utils/path";@@ -115,7 +109,7 @@ export async function action({ request }: ActionFunctionArgs) {);}- return redirect(safeRedirect(result.redirectTo ?? redirectTo, path.to.root), {+ return redirect((result.redirectTo ?? redirectTo) || path.to.root, {headers: [["Set-Cookie", result.sessionCookie]]});}diff --git a/apps/academy/app/routes/_auth+/refresh-session.tsx b/apps/academy/app/routes/_auth+/refresh-session.tsxindex 5c14f2f71c..e8534e7424 100644--- a/apps/academy/app/routes/_auth+/refresh-session.tsx+++ b/apps/academy/app/routes/_auth+/refresh-session.tsx@@ -8,9 +8,9 @@ import {refreshAuthSession,setAuthSession} from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";-+import { data, useNavigate } from "react-router";import { path } from "~/utils/path";export async function loader() {diff --git a/apps/erp/app/components/ActionTasks/ActionTaskCard.tsx b/apps/erp/app/components/ActionTasks/ActionTaskCard.tsxindex 4ee1516cb5..b5ef9b2eeb 100644--- a/apps/erp/app/components/ActionTasks/ActionTaskCard.tsx+++ b/apps/erp/app/components/ActionTasks/ActionTaskCard.tsx@@ -13,7 +13,7 @@ import {} from "@carbon/react";import { Editor } from "@carbon/react/Editor";import { useLingui } from "@lingui/react/macro";-import type { DragControls } from "framer-motion";+import type { DragControls } from "motion/react";import type { ReactElement, ReactNode } from "react";import {LuChevronRight,diff --git a/apps/erp/app/components/ActionTasks/ActionTaskList.tsx b/apps/erp/app/components/ActionTasks/ActionTaskList.tsxindex 4f1aa72ef9..9175aebaad 100644--- a/apps/erp/app/components/ActionTasks/ActionTaskList.tsx+++ b/apps/erp/app/components/ActionTasks/ActionTaskList.tsx@@ -12,8 +12,8 @@ import {VStack} from "@carbon/react";import { Trans } from "@lingui/react/macro";-import type { DragControls } from "framer-motion";-import { Reorder, useDragControls } from "framer-motion";+import type { DragControls } from "motion/react";+import { Reorder, useDragControls } from "motion/react";import { type ReactNode, useEffect, useState } from "react";import { useFetcher } from "react-router";import type { ListItem } from "~/types";diff --git a/apps/erp/app/components/AnimatedSizeContainer.tsx b/apps/erp/app/components/AnimatedSizeContainer.tsxindex 8ff0a88bff..62dc7c3b80 100644--- a/apps/erp/app/components/AnimatedSizeContainer.tsx+++ b/apps/erp/app/components/AnimatedSizeContainer.tsx@@ -3,7 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { cn } from "@carbon/react";-import { motion } from "framer-motion";+import { motion } from "motion/react";import type { ComponentPropsWithoutRef, PropsWithChildren } from "react";import { forwardRef } from "react";import useMeasure from "react-use-measure";diff --git a/apps/erp/app/components/ChangelogPanel.tsx b/apps/erp/app/components/ChangelogPanel.tsxindex c3a1b70ece..16d84c6d3c 100644--- a/apps/erp/app/components/ChangelogPanel.tsx+++ b/apps/erp/app/components/ChangelogPanel.tsx@@ -4,7 +4,7 @@import { Badge, Button, IconButton } from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { AnimatePresence, motion } from "framer-motion";+import { AnimatePresence, motion } from "motion/react";import { LuExternalLink, LuX } from "react-icons/lu";import type { ChangelogPanelEntry } from "~/modules/account";import { path } from "~/utils/path";diff --git a/apps/erp/app/components/DefaultAttachmentsPanel.tsx b/apps/erp/app/components/DefaultAttachmentsPanel.tsxindex 659ae45870..04012a5ff4 100644--- a/apps/erp/app/components/DefaultAttachmentsPanel.tsx+++ b/apps/erp/app/components/DefaultAttachmentsPanel.tsx@@ -3,7 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { useCarbon } from "@carbon/auth";-import { convertKbToString, downloadBlob, storage } from "@carbon/files";+import { convertKbToString, downloadUrl, storage } from "@carbon/files";import { wasConvertedFromHeic } from "@carbon/files/media";import { getLogger } from "@carbon/logger";import {@@ -107,8 +107,7 @@ export default function DefaultAttachmentsPanel({async (name: string) => {const url = path.to.file.previewFile(`private/${fullPath(name)}`);try {- const response = await fetch(url);- downloadBlob(await response.blob(), name);+ await downloadUrl(url, name);} catch (err) {toast.error(t`Error downloading file`);logger.error("Error", { error: err });@@ -199,7 +198,7 @@ export default function DefaultAttachmentsPanel({<DocumentPreviewbucket="private"pathToFile={filePath}- // @ts-ignore — type is a string union the preview accepts+ // @ts-expect-error — type is a string union the preview acceptstype={type}>{f.name}diff --git a/apps/erp/app/components/DirectionAwareTabs.tsx b/apps/erp/app/components/DirectionAwareTabs.tsxindex 02066e24ce..2c423552bc 100644--- a/apps/erp/app/components/DirectionAwareTabs.tsx+++ b/apps/erp/app/components/DirectionAwareTabs.tsx@@ -5,7 +5,7 @@"use client";import { cn } from "@carbon/react";-import { AnimatePresence, MotionConfig, motion } from "framer-motion";+import { AnimatePresence, MotionConfig, motion } from "motion/react";import type { ReactNode } from "react";import { useMemo, useState } from "react";import useMeasure from "react-use-measure";diff --git a/apps/erp/app/components/Documents.tsx b/apps/erp/app/components/Documents.tsxindex a5d3383ca4..46d3f21db4 100644--- a/apps/erp/app/components/Documents.tsx+++ b/apps/erp/app/components/Documents.tsx@@ -3,7 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { useCarbon } from "@carbon/auth";-import { convertKbToString, downloadBlob, storage } from "@carbon/files";+import { convertKbToString, downloadUrl, storage } from "@carbon/files";import { getLogger } from "@carbon/logger";import {Card,@@ -174,8 +174,7 @@ const Documents = ({async (file: StorageItem) => {const url = path.to.file.previewFile(`private/${getReadPath(file)}`);try {- const response = await fetch(url);- downloadBlob(await response.blob(), file.name);+ await downloadUrl(url, file.name);} catch (error) {toast.error(t`Error downloading file`);logger.error("Error", { error: error });@@ -370,7 +369,7 @@ const Documents = ({<DocumentPreviewbucket="private"pathToFile={getReadPath(file)}- // @ts-ignore+ // @ts-expect-errortype={getDocumentType(file.name)}>{file.name}diff --git a/apps/erp/app/components/Editable/EditableNumber.tsx b/apps/erp/app/components/Editable/EditableNumber.tsxindex 9324835b8e..b4cd5001b2 100644--- a/apps/erp/app/components/Editable/EditableNumber.tsx+++ b/apps/erp/app/components/Editable/EditableNumber.tsx@@ -56,7 +56,7 @@ const EditableNumber = <T extends object>(onUpdate({ [accessorKey]: next });- // @ts-ignore+ // @ts-expect-errormutation(accessorKey, isEmpty ? "" : next, row).then(({ error }) => {if (error) {diff --git a/apps/erp/app/components/Enumerable.tsx b/apps/erp/app/components/Enumerable.tsxindex b3236e6b64..b573b4d4b6 100644--- a/apps/erp/app/components/Enumerable.tsx+++ b/apps/erp/app/components/Enumerable.tsx@@ -2,26 +2,4 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import type { BadgeProps } from "@carbon/react";-import { Badge, useMode } from "@carbon/react";-import type { Color } from "@carbon/utils";-import { getColor, getColorByValue } from "@carbon/utils";--type EnumerableProps = BadgeProps & {- value: string | null;- color?: Color;-};--const Enumerable = ({ value, color, ...props }: EnumerableProps) => {- const mode = useMode();- if (!value) return null;-- const style = color ? getColor(color, mode) : getColorByValue(value, mode);- return (- <Badge style={{ ...style, borderColor: `${style.color}33` }} {...props}>- {value}- </Badge>- );-};--export { Enumerable };+export { Enumerable } from "@carbon/react";diff --git a/apps/erp/app/components/Form/ConversionFactor.tsx b/apps/erp/app/components/Form/ConversionFactor.tsxindex ce29d2b25a..0727f70270 100644--- a/apps/erp/app/components/Form/ConversionFactor.tsx+++ b/apps/erp/app/components/Form/ConversionFactor.tsx@@ -18,6 +18,7 @@ import {ModalBody,ModalContent,ModalFooter,+ ModalTitle,NumberDecrementStepper,NumberField,NumberIncrementStepper,@@ -246,7 +247,9 @@ const ConversionFactor = forwardRef<<ModalBody><VStack spacing={8}><VStack className="w-full text-center">- <div className="w-full text-lg">{description}</div>+ <ModalTitle className="w-full text-lg font-normal leading-normal">+ {description}+ </ModalTitle><div className="w-full"><ButtononClick={switchDirection}diff --git a/apps/erp/app/components/Form/RichText.tsx b/apps/erp/app/components/Form/RichText.tsxindex 226189ac8d..9efe5da733 100644--- a/apps/erp/app/components/Form/RichText.tsx+++ b/apps/erp/app/components/Form/RichText.tsx@@ -56,7 +56,6 @@ const RichText = ({ name, output = "html", ...props }: RichTextProps) => {<RichTextBase {...props} editor={richText} /><input{...getInputProps({- // @ts-ignoreid: name})}value={value}diff --git a/apps/erp/app/components/Form/Shape.tsx b/apps/erp/app/components/Form/Shape.tsxindex 1bcbc6d406..ec38e952a5 100644--- a/apps/erp/app/components/Form/Shape.tsx+++ b/apps/erp/app/components/Form/Shape.tsx@@ -23,7 +23,7 @@ const ShapePreview = (options: { value: string; label: string | React.ReactNode }[]) => {const shape = options.find((o) => o.value === value);- // @ts-ignore+ // @ts-expect-errorreturn <Enumerable value={shape?.label ?? null} />;};diff --git a/apps/erp/app/components/Form/Substance.tsx b/apps/erp/app/components/Form/Substance.tsxindex f678f2dbda..a5e6af0d68 100644--- a/apps/erp/app/components/Form/Substance.tsx+++ b/apps/erp/app/components/Form/Substance.tsx@@ -23,7 +23,7 @@ const SubstancePreview = (options: { value: string; label: string | React.ReactNode; helper?: string }[]) => {const substance = options.find((o) => o.value === value);- // @ts-ignore+ // @ts-expect-errorreturn <Enumerable value={substance?.label ?? null} />;};diff --git a/apps/erp/app/components/Form/SupplierProcess.tsx b/apps/erp/app/components/Form/SupplierProcess.tsxindex 8cc638019b..a6f511caa8 100644--- a/apps/erp/app/components/Form/SupplierProcess.tsx+++ b/apps/erp/app/components/Form/SupplierProcess.tsx@@ -57,7 +57,6 @@ const SupplierProcess = ({ref={triggerRef}options={options}{...props}- // @ts-ignorelabel={props?.label ?? "Work Center"}emptyMessage={emptyMessage}onCreateOption={(option) => {diff --git a/apps/erp/app/components/Gantt/Gantt.tsx b/apps/erp/app/components/Gantt/Gantt.tsxindex 4954dd7faf..46bfaf877f 100644--- a/apps/erp/app/components/Gantt/Gantt.tsx+++ b/apps/erp/app/components/Gantt/Gantt.tsx@@ -1130,7 +1130,7 @@ function SpanWithDuration({? segments: [{ startMs: props.startMs, durationMs: props.durationMs }];- // Plain divs, not framer-motion `layoutId`s: every scroll frame re-renders+ // Plain divs, not motion `layoutId`s: every scroll frame re-renders// the visible rows, and a layout node measures itself before and after each// render — hundreds of forced reflows per frame on a large board.diff --git a/apps/erp/app/components/Grid/components/Row.tsx b/apps/erp/app/components/Grid/components/Row.tsxindex 6498c6326d..87ad773c39 100644--- a/apps/erp/app/components/Grid/components/Row.tsx+++ b/apps/erp/app/components/Grid/components/Row.tsx@@ -56,7 +56,7 @@ const Row = <T extends object>({key={cell.id}cell={cell}columnIndex={columnIndex}- // @ts-ignore+ // @ts-expect-erroreditableComponents={editableComponents}editedCells={editedCells}isSelected={isSelected}diff --git a/apps/erp/app/components/Grid/utils.ts b/apps/erp/app/components/Grid/utils.tsindex 0161deb973..242e573c32 100644--- a/apps/erp/app/components/Grid/utils.ts+++ b/apps/erp/app/components/Grid/utils.ts@@ -18,9 +18,9 @@ export function updateNestedProperty(if (typeof path == "string")return updateNestedProperty(obj, path.split("_"), value);else if (path.length == 1 && value !== undefined)- // @ts-ignore+ // @ts-expect-errorreturn (obj[path[0]] = value);else if (path.length == 0) return obj;- // @ts-ignore+ // @ts-expect-errorelse return updateNestedProperty(obj[path[0]], path.slice(1), value);}diff --git a/apps/erp/app/components/ItemThumbnail.tsx b/apps/erp/app/components/ItemThumbnail.tsxindex e01219f8f1..fb1d50964a 100644--- a/apps/erp/app/components/ItemThumbnail.tsx+++ b/apps/erp/app/components/ItemThumbnail.tsx@@ -85,6 +85,8 @@ const ItemThumbnail = ({return thumbnailPath && failedPath !== thumbnailPath ? (<img+ loading="lazy"+ decoding="async"alt="thumbnail"className={itemVariants({ size, withPadding: false })}key={thumbnailPath}diff --git a/apps/erp/app/components/Layout/Navigation/CollapsibleSidebar.tsx b/apps/erp/app/components/Layout/Navigation/CollapsibleSidebar.tsxindex 72f6ba6df3..275699e3db 100644--- a/apps/erp/app/components/Layout/Navigation/CollapsibleSidebar.tsx+++ b/apps/erp/app/components/Layout/Navigation/CollapsibleSidebar.tsx@@ -11,7 +11,7 @@ import {useIsMobile} from "@carbon/react";import { Trans } from "@lingui/react/macro";-import { motion, useReducedMotion } from "framer-motion";+import { motion, useReducedMotion } from "motion/react";import type { ComponentProps, PropsWithChildren } from "react";import {createContext,diff --git a/apps/erp/app/components/Layout/Navigation/GroupedContentSidebar.tsx b/apps/erp/app/components/Layout/Navigation/GroupedContentSidebar.tsxindex 5bebea6f52..b3b43fc3b0 100644--- a/apps/erp/app/components/Layout/Navigation/GroupedContentSidebar.tsx+++ b/apps/erp/app/components/Layout/Navigation/GroupedContentSidebar.tsx@@ -18,7 +18,7 @@ import {VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { Reorder } from "framer-motion";+import { Reorder } from "motion/react";import { useEffect, useState } from "react";import {LuChevronDown,diff --git a/apps/erp/app/components/Layout/Topbar/Breadcrumbs.tsx b/apps/erp/app/components/Layout/Topbar/Breadcrumbs.tsxindex b1fae0f309..9438f46d56 100644--- a/apps/erp/app/components/Layout/Topbar/Breadcrumbs.tsx+++ b/apps/erp/app/components/Layout/Topbar/Breadcrumbs.tsx@@ -54,6 +54,7 @@ import type { Company } from "~/modules/settings";import { companyValidator } from "~/modules/settings/settings.models";import type { BreadcrumbSegment } from "~/utils/handle";import { path } from "~/utils/path";+import { useCompanySwitchRedirect } from "./CompanySwitcher";export const BreadcrumbHandle = z.object({breadcrumb: z.any(),@@ -141,6 +142,7 @@ const Breadcrumbs = () => {};function CompanyBreadcrumb() {+ const switchRedirect = useCompanySwitchRedirect();const { t } = useLingui();const routeData = useRouteData<{ company: Company; companies: Company[] }>(path.to.authenticatedRoot@@ -235,6 +237,13 @@ function CompanyBreadcrumb() {method="post"action={path.to.companySwitch(c.companyId!)}>+ {switchRedirect && (+ <input+ type="hidden"+ name="redirectTo"+ value={switchRedirect}+ />+ )}<DropdownMenuItemclassName="flex items-center justify-between w-full"asChilddiff --git a/apps/erp/app/components/Layout/Topbar/CompanySwitcher.tsx b/apps/erp/app/components/Layout/Topbar/CompanySwitcher.tsxindex 7856da0cba..8462e63db4 100644--- a/apps/erp/app/components/Layout/Topbar/CompanySwitcher.tsx+++ b/apps/erp/app/components/Layout/Topbar/CompanySwitcher.tsx@@ -22,12 +22,21 @@ import { Trans, useLingui } from "@lingui/react/macro";import { useMemo } from "react";import { BsFillHexagonFill } from "react-icons/bs";import { LuChevronsUpDown, LuHouse } from "react-icons/lu";-import { Form, Link } from "react-router";+import { Form, Link, useLocation, useParams } from "react-router";import { useRouteData, useUser } from "~/hooks";import type { Company } from "~/modules/settings";import { path } from "~/utils/path";+// Switching company keeps a page that exists in every company (a list, a+// settings page). A record's page does not, so that goes to the home page.+export function useCompanySwitchRedirect() {+ const params = useParams();+ const { pathname, search } = useLocation();+ return Object.keys(params).length === 0 ? `${pathname}${search}` : undefined;+}+const CompanySwitcher = () => {+ const switchRedirect = useCompanySwitchRedirect();const { t } = useLingui();const routeData = useRouteData<{ company: Company; companies: Company[] }>(path.to.authenticatedRoot@@ -154,6 +163,13 @@ const CompanySwitcher = () => {method="post"action={path.to.companySwitch(c.companyId!)}>+ {switchRedirect && (+ <input+ type="hidden"+ name="redirectTo"+ value={switchRedirect}+ />+ )}<DropdownMenuItemclassName="flex items-center justify-between w-full"asChilddiff --git a/apps/erp/app/components/Layout/Topbar/Search/SearchEmptyState.tsx b/apps/erp/app/components/Layout/Topbar/Search/SearchEmptyState.tsxindex 40fb9ed932..4a4a72e2cd 100644--- a/apps/erp/app/components/Layout/Topbar/Search/SearchEmptyState.tsx+++ b/apps/erp/app/components/Layout/Topbar/Search/SearchEmptyState.tsx@@ -4,7 +4,7 @@import { Skeleton } from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { motion } from "framer-motion";+import { motion } from "motion/react";import { LuSearch } from "react-icons/lu";import type { SearchEmptyStateProps } from "./types";diff --git a/apps/erp/app/components/MapExtractedLinesModal.tsx b/apps/erp/app/components/MapExtractedLinesModal.tsxindex 2890b710b0..03b7bdfc38 100644--- a/apps/erp/app/components/MapExtractedLinesModal.tsx+++ b/apps/erp/app/components/MapExtractedLinesModal.tsx@@ -16,6 +16,7 @@ import {ModalFooter,ModalHeader,ModalOverlay,+ ModalTitle,SelectContent,SelectItem,SelectTrigger,@@ -135,7 +136,7 @@ export default function MapExtractedLinesModal({<ModalContent size="xlarge"><ValidatedForm validator={dummyValidator} onSubmit={handleSubmit}><ModalHeader>- {title}+ <ModalTitle>{title}</ModalTitle><ModalClose /></ModalHeader><ModalBody>diff --git a/apps/erp/app/components/RealtimeDataProvider.tsx b/apps/erp/app/components/RealtimeDataProvider.tsxindex c92e23f5fb..50da81fd66 100644--- a/apps/erp/app/components/RealtimeDataProvider.tsx+++ b/apps/erp/app/components/RealtimeDataProvider.tsx@@ -78,7 +78,7 @@ const RealtimeDataProvider = ({ children }: { children: React.ReactNode }) => {if (data && fresh()) setSuppliers(data as ListItem[], true);});idb.getItem(`people:${requestedCompanyId}`).then((data) => {- // @ts-ignore+ // @ts-expect-errorif (data && fresh()) setPeople(data, true);});}@@ -456,7 +456,6 @@ const RealtimeDataProvider = ({ children }: { children: React.ReactNode }) => {.eq("companyId", companyId).order("name");if (data) {- // @ts-ignoresetPeople(data);}}diff --git a/apps/erp/app/components/RecordDocuments.tsx b/apps/erp/app/components/RecordDocuments.tsxindex 2605d2c432..7fb1d67a8f 100644--- a/apps/erp/app/components/RecordDocuments.tsx+++ b/apps/erp/app/components/RecordDocuments.tsx@@ -3,7 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { useCarbon } from "@carbon/auth";-import { convertKbToString, storage } from "@carbon/files";+import { convertKbToString, downloadUrl, storage } from "@carbon/files";import { getLogger } from "@carbon/logger";import {Card,@@ -153,7 +153,7 @@ const RecordDocuments = ({<DocumentPreviewbucket="private"pathToFile={getPath(file)}- // @ts-ignore+ // @ts-expect-errortype={getDocumentType(file.name)}>{file.name}@@ -321,16 +321,7 @@ export const useRecordDocuments = ({async (file: FileObject) => {const url = path.to.file.previewFile(`private/${getPath(file)}`);try {- const response = await fetch(url);- const blob = await response.blob();- const blobUrl = window.URL.createObjectURL(blob);- const a = document.createElement("a");- document.body.appendChild(a);- a.href = blobUrl;- a.download = file.name;- a.click();- window.URL.revokeObjectURL(blobUrl);- document.body.removeChild(a);+ await downloadUrl(url, file.name);} catch (error) {toast.error(t`Error downloading file`);logger.error("Error", { error });diff --git a/apps/erp/app/components/RichText.tsx b/apps/erp/app/components/RichText.tsxindex 48307812e2..2a888a0bfe 100644--- a/apps/erp/app/components/RichText.tsx+++ b/apps/erp/app/components/RichText.tsx@@ -38,17 +38,15 @@ const RichText = ({ documentId, notes }: RichTextProps) => {throw new Error("Invalid user");return (<Fragment key={note.id}>- {/* @ts-ignore */}+ {/* @ts-expect-error */}<Avatar path={note.user.avatarUrl} name={note.user?.fullName} /><VStack spacing={1}>- {/* @ts-ignore */}<p className="font-bold">{note.user?.fullName!}</p><HTML text={note.note} /><HStack spacing={4}><span className="text-sm text-muted-foreground"><DateTime value={note.createdAt} variant="relative" /></span>- {/* @ts-ignore */}{user.id === note.user.id && (<Form method="post" action={path.to.deleteNote(note.id)}><Button type="submit" variant="link" size="md">diff --git a/apps/erp/app/components/SortableList.tsx b/apps/erp/app/components/SortableList.tsxindex d8d469786a..f786e94c79 100644--- a/apps/erp/app/components/SortableList.tsx+++ b/apps/erp/app/components/SortableList.tsx@@ -12,7 +12,7 @@ import {motion,Reorder,useDragControls-} from "framer-motion";+} from "motion/react";import type { ReactNode } from "react";import { useEffect, useRef, useState } from "react";import { flushSync } from "react-dom";diff --git a/apps/erp/app/components/Table/Table.tsx b/apps/erp/app/components/Table/Table.tsxindex e364c7c2f2..7b2602dc70 100644--- a/apps/erp/app/components/Table/Table.tsx+++ b/apps/erp/app/components/Table/Table.tsx@@ -1239,6 +1239,13 @@ const Table = <T extends object>({key={header.id}colSpan={header.colSpan}id={`header-${header.id}`}+ aria-sort={+ sorted === 1+ ? "ascending"+ : sorted === -1+ ? "descending"+ : undefined+ }className={cn("py-3 whitespace-nowrap bg-card",header.column.id === "Select" ? "px-2" : "px-4",diff --git a/apps/erp/app/components/Table/components/Columns.tsx b/apps/erp/app/components/Table/components/Columns.tsxindex a150d4e953..b943f79037 100644--- a/apps/erp/app/components/Table/components/Columns.tsx+++ b/apps/erp/app/components/Table/components/Columns.tsx@@ -18,7 +18,7 @@ import {} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";import type { Column, ColumnOrderState } from "@tanstack/react-table";-import { Reorder } from "framer-motion";+import { Reorder } from "motion/react";import {LuColumns2,LuEye,diff --git a/apps/erp/app/components/Table/components/Row.tsx b/apps/erp/app/components/Table/components/Row.tsxindex a70bd1fef5..2269ad1b9b 100644--- a/apps/erp/app/components/Table/components/Row.tsx+++ b/apps/erp/app/components/Table/components/Row.tsx@@ -77,7 +77,7 @@ const Row = <T extends object>({key={cell.id}cell={cell}columnIndex={columnIndex}- // @ts-ignore+ // @ts-expect-erroreditableComponents={editableComponents}editedCells={editedCells}isRowSelected={isRowSelected}diff --git a/apps/erp/app/components/Table/components/Sort/Sort.tsx b/apps/erp/app/components/Table/components/Sort/Sort.tsxindex 450d001381..8dc96119d4 100644--- a/apps/erp/app/components/Table/components/Sort/Sort.tsx+++ b/apps/erp/app/components/Table/components/Sort/Sort.tsx@@ -23,7 +23,7 @@ import {TooltipTrigger} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { Reorder } from "framer-motion";+import { Reorder } from "motion/react";import { BsChevronDown, BsSortUp } from "react-icons/bs";import { IoMdClose } from "react-icons/io";import { LuArrowUpDown, LuGripVertical } from "react-icons/lu";diff --git a/apps/erp/app/components/Table/utils.ts b/apps/erp/app/components/Table/utils.tsindex 0008abba65..47e336fafb 100644--- a/apps/erp/app/components/Table/utils.ts+++ b/apps/erp/app/components/Table/utils.ts@@ -147,9 +147,9 @@ export function updateNestedProperty(if (typeof path == "string")return updateNestedProperty(obj, path.split("_"), value);else if (path.length == 1 && value !== undefined)- // @ts-ignore+ // @ts-expect-errorreturn (obj[path[0]] = value);else if (path.length == 0) return obj;- // @ts-ignore+ // @ts-expect-errorelse return updateNestedProperty(obj[path[0]], path.slice(1), value);}diff --git a/apps/erp/app/components/TimeCardWarning.tsx b/apps/erp/app/components/TimeCardWarning.tsxindex 838f351029..b77fd37c1c 100644--- a/apps/erp/app/components/TimeCardWarning.tsx+++ b/apps/erp/app/components/TimeCardWarning.tsx@@ -101,10 +101,8 @@ export function TimeCardWarning({ openClockEntry }: TimeCardWarningProps) {return (<Modal+ // No onOpenChange: the prompt must be answered, so it has no close button.open- onOpenChange={() => {- /* intentionally non-dismissable */- }}><ModalContent><ModalHeader>diff --git a/apps/erp/app/components/TrainingPanel.tsx b/apps/erp/app/components/TrainingPanel.tsxindex d61a1e9a25..3352a74d27 100644--- a/apps/erp/app/components/TrainingPanel.tsx+++ b/apps/erp/app/components/TrainingPanel.tsx@@ -4,7 +4,7 @@import { Button, IconButton } from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { AnimatePresence, motion } from "framer-motion";+import { AnimatePresence, motion } from "motion/react";import { LuExternalLink, LuX } from "react-icons/lu";import type { TrainingVideo } from "~/utils/training";import { getVideoEmbedUrl } from "~/utils/training";diff --git a/apps/erp/app/components/TreeView/TreeView.tsx b/apps/erp/app/components/TreeView/TreeView.tsxindex bfeed8f5a9..8f1e0a4c17 100644--- a/apps/erp/app/components/TreeView/TreeView.tsx+++ b/apps/erp/app/components/TreeView/TreeView.tsx@@ -5,7 +5,7 @@import { cn } from "@carbon/react";import type { VirtualItem, Virtualizer } from "@tanstack/react-virtual";import { useVirtualizer } from "@tanstack/react-virtual";-import { motion } from "framer-motion";+import { motion } from "motion/react";import type { MutableRefObject, RefObject } from "react";import { useCallback, useEffect, useMemo, useReducer, useRef } from "react";import type { NodeState, NodesState } from "./reducer";diff --git a/apps/erp/app/entry.client.tsx b/apps/erp/app/entry.client.tsxindex 0f8735dec0..50109da1e6 100644--- a/apps/erp/app/entry.client.tsx+++ b/apps/erp/app/entry.client.tsx@@ -2,12 +2,6 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { registerReactPdfWorker } from "@carbon/files/pdf/worker";-import { startTransition } from "react";-import { pdfjs } from "react-pdf";--registerReactPdfWorker(pdfjs);-import {CONTROLLED_ENVIRONMENT,POSTHOG_API_HOST,@@ -15,6 +9,7 @@ import {} from "@carbon/auth";import { ensureLoggingConfigured } from "@carbon/logger/config.client";import posthog from "posthog-js";+import { startTransition } from "react";import { hydrateRoot } from "react-dom/client";import { HydratedRouter } from "react-router/dom";import { preloadCatalog } from "~/services/lingui";@@ -35,7 +30,10 @@ ensureLoggingConfigured();// U.S.-Persons-only environment leaves it, even if the key is set.if (POSTHOG_PROJECT_PUBLIC_KEY?.startsWith("phc_") && !CONTROLLED_ENVIRONMENT) {posthog.init(POSTHOG_PROJECT_PUBLIC_KEY, {- api_host: POSTHOG_API_HOST+ api_host: POSTHOG_API_HOST,+ // LCP, INP and CLS from real sessions: the only way to know which pages are+ // slow for the people using them.+ capture_performance: { web_vitals: true }});}diff --git a/apps/erp/app/hooks/index.ts b/apps/erp/app/hooks/index.tsindex f28b4df01f..1e0421a07f 100644--- a/apps/erp/app/hooks/index.ts+++ b/apps/erp/app/hooks/index.ts@@ -4,6 +4,7 @@import { usePrinting } from "@carbon/printing/ui";import {+ useIdle,useNanoStore,useOptimisticLocation,useRouteData,@@ -26,7 +27,6 @@ import { useFileUpload } from "./useFileUpload";import { useFlags } from "./useFlags";import { useGooglePlaces } from "./useGooglePlaces";import { useHighlightFlash } from "./useHighlightFlash";-import { useIdle } from "./useIdle";import { useImageUpload } from "./useImageUpload";import { useModelUpload } from "./useModelUpload";import { useAllModules, useModules, useSettingsModule } from "./useModules";diff --git a/apps/erp/app/hooks/useCustomerPreview.tsx b/apps/erp/app/hooks/useCustomerPreview.tsxindex 065ecd6c0e..cdc54be858 100644--- a/apps/erp/app/hooks/useCustomerPreview.tsx+++ b/apps/erp/app/hooks/useCustomerPreview.tsx@@ -2,39 +2,44 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { useRouteData } from "@carbon/react";import { useSyncExternalStore } from "react";+import { path } from "~/utils/path";// Customer preview lets an internal Carbon user render the hub as the customer-// sees it — carbon-only pages hidden, carbon-owned fields locked. Persisted in-// sessionStorage so it survives navigation + reloads within the tab/session-// (scoped to that session, not leaked across tabs or restarts).-const KEY = "carbon:hub:previewAsCustomer";-// sessionStorage fires no `storage` event in the same tab, so the setter-// broadcasts this custom event to sync every live hook instance.+// sees it — carbon-only pages hidden, carbon-owned fields locked.+//+// It lives in a session cookie scoped to the hub, not sessionStorage: the+// server has to know it too. Rendered without it, a reload painted the staff+// view first and swapped to the preview on hydration — the internal pages and+// the bar flashed, and the page moved.+const COOKIE = "hubPreviewAsCustomer";const EVENT = "carbon:hub:previewAsCustomer";+/** Whether the request carries the preview cookie (for the hub's loader). */+export function isCustomerPreview(cookieHeader: string | null): boolean {+ return (cookieHeader ?? "").split(/;\s*/).includes(`${COOKIE}=1`);+}+function read(): boolean {- if (typeof window === "undefined") return false;- return window.sessionStorage.getItem(KEY) === "1";+ return isCustomerPreview(document.cookie);}function subscribe(onChange: () => void): () => void {window.addEventListener(EVENT, onChange);- window.addEventListener("storage", onChange);- return () => {- window.removeEventListener(EVENT, onChange);- window.removeEventListener("storage", onChange);- };+ return () => window.removeEventListener(EVENT, onChange);}export function useCustomerPreview(): boolean {- // Server snapshot is always false — preview is a client-only, internal-only view.- return useSyncExternalStore(subscribe, read, () => false);+ const server =+ useRouteData<{ previewAsCustomer?: boolean }>(path.to.getStarted)+ ?.previewAsCustomer ?? false;+ return useSyncExternalStore(subscribe, read, () => server);}export function setCustomerPreview(on: boolean): void {if (typeof window === "undefined") return;- if (on) window.sessionStorage.setItem(KEY, "1");- else window.sessionStorage.removeItem(KEY);+ // No expiry: gone when the browser closes, like the sessionStorage flag was.+ document.cookie = `${COOKIE}=${on ? "1" : ""}; path=${path.to.getStarted}; SameSite=Lax${on ? "" : "; max-age=0"}`;window.dispatchEvent(new Event(EVENT));}diff --git a/apps/erp/app/hooks/useImplementationNavItem.tsx b/apps/erp/app/hooks/useImplementationNavItem.tsxindex ed7b2c4def..6c1ba14be5 100644--- a/apps/erp/app/hooks/useImplementationNavItem.tsx+++ b/apps/erp/app/hooks/useImplementationNavItem.tsx@@ -16,9 +16,8 @@ import {import { useRouteData } from "@carbon/react";import type { I18n } from "@lingui/core";import { useLingui } from "@lingui/react/macro";-import { type ReactNode, Suspense } from "react";+import type { ReactNode } from "react";import { LuRocket } from "react-icons/lu";-import { Await } from "react-router";import type { Authenticated, NavItem } from "~/types";import { path } from "~/utils/path";import { useResolved } from "./useResolved";@@ -31,46 +30,53 @@ const NO_SIGNALS = {hasTrackedEntity: false};+type ImplementationProgress = {+ checkStates: CheckStateRow[];+ signals: Signals | null;+};+export type ImplementationHubData = {implementationHub: { tier: Tier; status: HubStatus } | null;implementationCheckStates: CheckStateRow[];implementationSignals: Signals | null;+ // False until the streamed progress lands. Until then the counts are not+ // known: show the item and the card, leave the numbers out.+ ready: boolean;};const isFinished = (status: HubStatus) =>status === "complete" || status === "archived";-// Shared reader: the enrolled hub (a row only exists once the company is-// enrolled), or null. Both nav entries below key off this.-function useImplementationPromise() {- return useRouteData<{ implementation?: Promise<ImplementationHubData> }>(- path.to.authenticatedRoot- )?.implementation;+// Shared reader. The hub row (null until the company enrols) is awaited by the+// layout loader; progress is streamed and fills in after.+function useImplementation(): ImplementationHubData | undefined {+ const data = useRouteData<{+ implementationHub?: ImplementationHubData["implementationHub"];+ implementationProgress?: Promise<ImplementationProgress>;+ }>(path.to.authenticatedRoot);+ const progress = useResolved(data?.implementationProgress, null);+ if (!data) return undefined;+ return {+ implementationHub: data.implementationHub ?? null,+ implementationCheckStates: progress?.checkStates ?? [],+ implementationSignals: progress?.signals ?? null,+ ready: progress !== null+ };}-// Rendered through Await so it streams in the server HTML. The last value is-// the fallback, so a revalidation doesn't blank what is on screen.+// Whether the item and the card exist is known at first paint, so neither+// arrives late and pushes the page around.export function ImplementationData({children}: {children: (data: ImplementationHubData) => ReactNode;}) {- const promise = useImplementationPromise();- const last = useResolved(promise, null);- if (!promise) return null;- const fallback = <>{last ? children(last) : null}</>;- return (- <Suspense fallback={fallback}>- {/* Without errorElement a rejected stream reaches the route error boundary. */}- <Await resolve={promise} errorElement={fallback}>- {children}- </Await>- </Suspense>- );+ const data = useImplementation();+ return data ? <>{children(data)}</> : null;}function useHub() {- return useResolved(useImplementationPromise(), null)?.implementationHub;+ return useImplementation()?.implementationHub;}// The pinned "Get Started" primary-nav entry with a remaining-gates badge. Shown@@ -94,7 +100,7 @@ export function getImplementationNavItem(name: i18n._(labelForTier(hub.tier)),to: path.to.getStarted,icon: LuRocket,- tag: remaining > 0 ? remaining : undefined+ tag: data.ready && remaining > 0 ? remaining : undefined};}diff --git a/apps/erp/app/modules/account/ui/UserAttributes/UserAttributesForm.tsx b/apps/erp/app/modules/account/ui/UserAttributes/UserAttributesForm.tsxindex 15de032515..dc804c5d29 100644--- a/apps/erp/app/modules/account/ui/UserAttributes/UserAttributesForm.tsx+++ b/apps/erp/app/modules/account/ui/UserAttributes/UserAttributesForm.tsx@@ -83,7 +83,7 @@ const UserAttributesForm = ({ attributeCategory }: UserAttributesFormProps) => {<VStack spacing={4}>{attributeCategory.userAttribute.map((attribute) => {const genericProps = getGenericProps(- // @ts-ignore+ // @ts-expect-errorattribute as PublicAttributes["userAttribute"],optimisticUpdates[attribute.id]);@@ -101,7 +101,6 @@ const UserAttributesForm = ({ attributeCategory }: UserAttributesFormProps) => {[attribute.id]: value}))}- // @ts-ignoreupdateFetcher={updateFetcher}userId={userId}{...genericProps}diff --git a/apps/erp/app/modules/accounting/ui/AccountDefaults/AccountDefaultsForm.tsx b/apps/erp/app/modules/accounting/ui/AccountDefaults/AccountDefaultsForm.tsxindex 8917b7fbbe..ef30a27951 100644--- a/apps/erp/app/modules/accounting/ui/AccountDefaults/AccountDefaultsForm.tsx+++ b/apps/erp/app/modules/accounting/ui/AccountDefaults/AccountDefaultsForm.tsx@@ -11,12 +11,12 @@ import {Heading,HStack,IconButton,- LabelWithHelp+ LabelWithHelp,+ useCloseRoute} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";import { useCallback, useMemo, useState } from "react";import { LuDownload } from "react-icons/lu";-import { useNavigate } from "react-router";import { Combobox, Hidden, Submit } from "~/components/Form";import { usePermissions } from "~/hooks";import { path } from "~/utils/path";@@ -69,8 +69,8 @@ const AccountDefaultsForm = ({}: AccountDefaultsFormProps) => {const { t } = useLingui();const permissions = usePermissions();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const [salesAccount, setSalesAccount] = useState(initialValues.salesAccount);const isDisabled = !permissions.can("update", "accounting");@@ -636,7 +636,7 @@ const AccountDefaultsForm = ({{group.fields.map((field) => (<divkey={field.name}- className="group rounded-lg border border-border p-4 transition-all hover:border-muted-foreground/30"+ className="group rounded-lg border border-border p-4 transition-colors hover:border-muted-foreground/30"><div className="flex items-start justify-between gap-4"><div className="flex-1 min-w-0">diff --git a/apps/erp/app/modules/accounting/ui/ExchangeRates/ExchangeRateForm.tsx b/apps/erp/app/modules/accounting/ui/ExchangeRates/ExchangeRateForm.tsxindex 04c9228281..6be3b293f0 100644--- a/apps/erp/app/modules/accounting/ui/ExchangeRates/ExchangeRateForm.tsx+++ b/apps/erp/app/modules/accounting/ui/ExchangeRates/ExchangeRateForm.tsx@@ -32,6 +32,7 @@ import {TooltipContent,TooltipTrigger,Tr,+ useCloseRoute,VStack} from "@carbon/react";import type { ChartConfig } from "@carbon/react/Chart";@@ -50,7 +51,7 @@ import { useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";import { useCallback, useMemo } from "react";import { LuDownload } from "react-icons/lu";-import { useFetcher, useNavigate } from "react-router";+import { useFetcher } from "react-router";import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from "recharts";import type { z } from "zod";import { DateTime } from "~/components";@@ -91,8 +92,8 @@ const CurrencyForm = ({}: CurrencyFormProps) => {const { t } = useLingui();const permissions = usePermissions();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const { locale } = useLocale();const resetFetcher = useFetcher<{}>();diff --git a/apps/erp/app/modules/accounting/ui/FiscalYear/FiscalYearSettingsForm.tsx b/apps/erp/app/modules/accounting/ui/FiscalYear/FiscalYearSettingsForm.tsxindex c7cd39f6f7..e4698a0b62 100644--- a/apps/erp/app/modules/accounting/ui/FiscalYear/FiscalYearSettingsForm.tsx+++ b/apps/erp/app/modules/accounting/ui/FiscalYear/FiscalYearSettingsForm.tsx@@ -4,10 +4,15 @@import type { TermId } from "@carbon/content/glossary";import { ValidatedForm } from "@carbon/form";-import { Button, Heading, HStack, LabelWithHelp } from "@carbon/react";+import {+ Button,+ Heading,+ HStack,+ LabelWithHelp,+ useCloseRoute+} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";import { useMemo } from "react";-import { useNavigate } from "react-router";import type { z } from "zod";import { Select, Submit } from "~/components/Form";import { usePermissions } from "~/hooks";@@ -34,8 +39,8 @@ const FiscalYearSettingsForm = ({}: FiscalYearSettingsFormProps) => {const { t } = useLingui();const permissions = usePermissions();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const isDisabled =!permissions.can("update", "accounting") || !permissions.is("employee");@@ -93,7 +98,7 @@ const FiscalYearSettingsForm = ({{fields.map((field) => (<divkey={field.name}- className="group rounded-lg border border-border p-4 transition-all hover:border-muted-foreground/30"+ className="group rounded-lg border border-border p-4 transition-colors hover:border-muted-foreground/30"><div className="flex items-start justify-between gap-4"><div className="flex-1 min-w-0">diff --git a/apps/erp/app/modules/documents/documents.service.ts b/apps/erp/app/modules/documents/documents.service.tsindex 2ea2105d90..82676a1185 100644--- a/apps/erp/app/modules/documents/documents.service.ts+++ b/apps/erp/app/modules/documents/documents.service.ts@@ -197,7 +197,7 @@ export async function upsertDocument(return (client.from("document")- // @ts-ignore+ // @ts-expect-error.insert({ ...document, type }).select("*").single()@@ -386,7 +386,7 @@ export async function updateDocumentLabels(.eq("userId", document.userId).then(() => {return client.from("documentLabel").insert(- // @ts-ignore+ // @ts-expect-errordocument.labels.map((label) => ({documentId: document.documentId,label,diff --git a/apps/erp/app/modules/documents/ui/Documents/DocumentForm.tsx b/apps/erp/app/modules/documents/ui/Documents/DocumentForm.tsxindex 9b06bd27dc..30e0c3fb1d 100644--- a/apps/erp/app/modules/documents/ui/Documents/DocumentForm.tsx+++ b/apps/erp/app/modules/documents/ui/Documents/DocumentForm.tsx@@ -12,10 +12,10 @@ import {DrawerHeader,DrawerTitle,HStack,+ useCloseRoute,VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { useNavigate } from "react-router";import type { z } from "zod";import { Hidden, Input, Submit, TextArea, Users } from "~/components/Form";import { usePermissions } from "~/hooks";@@ -30,8 +30,8 @@ type DocumentFormProps = {const DocumentForm = ({ initialValues, ownerId }: DocumentFormProps) => {const { t } = useLingui();const permissions = usePermissions();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const isDisabled = !permissions.can("update", "documents");diff --git a/apps/erp/app/modules/documents/ui/Documents/PdfViewer.tsx b/apps/erp/app/modules/documents/ui/Documents/PdfViewer.tsxindex 7b5291e1b9..5d9e24aa5a 100644--- a/apps/erp/app/modules/documents/ui/Documents/PdfViewer.tsx+++ b/apps/erp/app/modules/documents/ui/Documents/PdfViewer.tsx@@ -2,9 +2,14 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { registerReactPdfWorker } from "@carbon/files/pdf/worker";import { Skeleton } from "@carbon/react";import { useState } from "react";-import { Document, Page } from "react-pdf";+import { Document, Page, pdfjs } from "react-pdf";++// Registered here, not in the client entry: this module is lazy, so the PDF+// engine stays out of every page that shows no PDF.+registerReactPdfWorker(pdfjs);function SkeletonDocument() {return (diff --git a/apps/erp/app/modules/documents/ui/Documents/useDocument.ts b/apps/erp/app/modules/documents/ui/Documents/useDocument.tsindex fe94dc3116..89a06933dd 100644--- a/apps/erp/app/modules/documents/ui/Documents/useDocument.ts+++ b/apps/erp/app/modules/documents/ui/Documents/useDocument.ts@@ -3,7 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { useCarbon } from "@carbon/auth";-import { downloadBlob, storage } from "@carbon/files";+import { downloadUrl, storage } from "@carbon/files";import { getLogger } from "@carbon/logger";import { toast } from "@carbon/react";import { useCallback } from "react";@@ -28,7 +28,6 @@ export const useDocument = () => {(doc: DocumentType) => {return (!permissions.can("delete", "documents") ||- // @ts-ignore!doc.writeGroups?.some((group) => user?.groups.includes(group)));},@@ -39,7 +38,6 @@ export const useDocument = () => {(document: DocumentType) => {return (!permissions.can("update", "documents") ||- // @ts-ignore!document.writeGroups?.some((group) => user?.groups.includes(group)));},@@ -82,8 +80,7 @@ export const useDocument = () => {const url = path.to.file.previewFile(`private/${doc.path}`);try {- const response = await fetch(url);- downloadBlob(await response.blob(), doc.name ?? "File");+ await downloadUrl(url, doc.name ?? "File");} catch (error) {toast.error("Error downloading file");logger.error("Error", { error: error });diff --git a/apps/erp/app/modules/inventory/ui/StockTransfers/StockTransferLineForm.tsx b/apps/erp/app/modules/inventory/ui/StockTransfers/StockTransferLineForm.tsxindex 2042f0ada3..ee56dc2ab1 100644--- a/apps/erp/app/modules/inventory/ui/StockTransfers/StockTransferLineForm.tsx+++ b/apps/erp/app/modules/inventory/ui/StockTransfers/StockTransferLineForm.tsx@@ -169,7 +169,6 @@ const StockTransferLineForm = ({? t`Consumable`: t`Item`}- // @ts-ignoretype={itemType}// Only stockable types can be transferred — Services are// Non-Inventory and must not be selectable here.diff --git a/apps/erp/app/modules/inventory/ui/StorageRules/ItemFilterSelector.tsx b/apps/erp/app/modules/inventory/ui/StorageRules/ItemFilterSelector.tsxindex b159d3a8e7..6fcef22e9b 100644--- a/apps/erp/app/modules/inventory/ui/StorageRules/ItemFilterSelector.tsx+++ b/apps/erp/app/modules/inventory/ui/StorageRules/ItemFilterSelector.tsx@@ -14,7 +14,7 @@ import {ToggleGroupItem} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { AnimatePresence, motion } from "framer-motion";+import { AnimatePresence, motion } from "motion/react";import { LuBox, LuDroplet, LuFilter, LuLayers, LuWrench } from "react-icons/lu";import { MultiSelect } from "~/components/Form";import { useItemPostingGroups } from "~/components/Form/ItemPostingGroup";diff --git a/apps/erp/app/modules/inventory/ui/Traceability/TrackedEntitiesTable.tsx b/apps/erp/app/modules/inventory/ui/Traceability/TrackedEntitiesTable.tsxindex 09a1d3bab1..1aabca86ff 100644--- a/apps/erp/app/modules/inventory/ui/Traceability/TrackedEntitiesTable.tsx+++ b/apps/erp/app/modules/inventory/ui/Traceability/TrackedEntitiesTable.tsx@@ -322,7 +322,7 @@ function SourceDocumentLink({const item = items.find((item) => item.id === data.sourceDocumentId);if (!item) return <Enumerable value={data.sourceDocument} />;return (- // @ts-ignore+ // @ts-expect-error<Hyperlink to={getLinkToItemDetails(item.type, item.id)}><Enumerable value={data.sourceDocument} /></Hyperlink>diff --git a/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/PurchaseInvoiceSummary.tsx b/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/PurchaseInvoiceSummary.tsxindex b1d779651c..d6059d5dd6 100644--- a/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/PurchaseInvoiceSummary.tsx+++ b/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/PurchaseInvoiceSummary.tsx@@ -21,7 +21,7 @@ import {import { getItemReadableId } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";-import { motion } from "framer-motion";+import { motion } from "motion/react";import { useState } from "react";import { LuChevronRight, LuImage } from "react-icons/lu";import { Link, useParams } from "react-router";@@ -105,9 +105,9 @@ const LineItems = ({return (<motion.divkey={line.id}- initial={{ opacity: 0, y: 50 }}+ initial={{ opacity: 0, y: 8 }}animate={{ opacity: 1, y: 0 }}- transition={{ duration: 0.5 }}+ transition={{ duration: 0.2, ease: "easeOut" }}className="border-b border-input py-6 w-full"><HStack spacing={4} className="items-start">@@ -194,7 +194,7 @@ const LineItems = ({>{line.quantity}<MethodIcon- // @ts-ignore+ // @ts-expect-errortype={line.methodType ?? "Pull from Inventory"}/></Badge>diff --git a/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/PurchaseInvoicesTable.tsx b/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/PurchaseInvoicesTable.tsxindex fdccca17cc..3fb8c79057 100644--- a/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/PurchaseInvoicesTable.tsx+++ b/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/PurchaseInvoicesTable.tsx@@ -82,7 +82,7 @@ const PurchaseInvoicesTable = memo(<ItemThumbnailsize="sm"thumbnailPath={row.original.thumbnailPath}- // @ts-ignore+ // @ts-expect-errortype={row.original.itemType}/><Hyperlink to={path.to.purchaseInvoiceDetails(row.original.id!)}>diff --git a/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/usePurchaseInvoiceAutoFill.ts b/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/usePurchaseInvoiceAutoFill.tsindex 9a60a34e3e..6b1c38f020 100644--- a/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/usePurchaseInvoiceAutoFill.ts+++ b/apps/erp/app/modules/invoicing/ui/PurchaseInvoice/usePurchaseInvoiceAutoFill.ts@@ -117,7 +117,6 @@ export function usePurchaseInvoiceAutoFill(});const [supplierDetails, paymentTermData] = await Promise.all([- // @ts-ignore Supabase composite key issuecarbon.from("supplier").select(diff --git a/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceExplorer.tsx b/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceExplorer.tsxindex 771ff01402..356eccafea 100644--- a/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceExplorer.tsx+++ b/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceExplorer.tsx@@ -223,7 +223,6 @@ export default function SalesInvoiceExplorer() {</VStack>{newSalesInvoiceLineDisclosure.isOpen && (<SalesInvoiceLineForm- // @ts-ignoreinitialValues={salesInvoiceLineInitialValues}type="modal"onClose={newSalesInvoiceLineDisclosure.onClose}diff --git a/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceForm.tsx b/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceForm.tsxindex beea51d2c0..136316cc0c 100644--- a/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceForm.tsx+++ b/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceForm.tsx@@ -110,7 +110,6 @@ const SalesInvoiceForm = ({ initialValues }: SalesInvoiceFormProps) => {});const [customerData, paymentTermData] = await Promise.all([- // @ts-ignore TS2589: the composite customerShipping embed sits on the// instantiation-depth cliff — the cliff shifts as unrelated modules// join the program (same class as the purchasing.service// suppression). ts-ignore (not ts-expect-error) is used so itdiff --git a/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceSummary.tsx b/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceSummary.tsxindex 7a5914c72c..3e622637d3 100644--- a/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceSummary.tsx+++ b/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoiceSummary.tsx@@ -21,7 +21,7 @@ import {import { getItemReadableId } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";-import { motion } from "framer-motion";+import { motion } from "motion/react";import { useState } from "react";import { LuChevronRight, LuImage } from "react-icons/lu";import { Link, useParams } from "react-router";@@ -107,9 +107,9 @@ const LineItems = ({return (<motion.divkey={line.id}- initial={{ opacity: 0, y: 50 }}+ initial={{ opacity: 0, y: 8 }}animate={{ opacity: 1, y: 0 }}- transition={{ duration: 0.5 }}+ transition={{ duration: 0.2, ease: "easeOut" }}className="border-b border-input py-6 w-full"><HStack spacing={4} className="items-start">diff --git a/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoicesTable.tsx b/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoicesTable.tsxindex 454f361014..79f7369ceb 100644--- a/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoicesTable.tsx+++ b/apps/erp/app/modules/invoicing/ui/SalesInvoice/SalesInvoicesTable.tsx@@ -75,7 +75,7 @@ const SalesInvoicesTable = memo(({ data, count }: SalesInvoicesTableProps) => {<ItemThumbnailsize="sm"thumbnailPath={row.original.thumbnailPath}- // @ts-ignore+ // @ts-expect-errortype={row.original.itemType || "Part"}/><Hyperlink to={path.to.salesInvoiceDetails(row.original.id!)}>diff --git a/apps/erp/app/modules/items/items.service.ts b/apps/erp/app/modules/items/items.service.tsindex 70e6b4ab84..2bfb0a98a1 100644--- a/apps/erp/app/modules/items/items.service.ts+++ b/apps/erp/app/modules/items/items.service.ts@@ -1869,7 +1869,7 @@ function getMethodTreeArrayToTree(items: Method[]): MethodTreeItem[] {const parentId = item.parentMaterialId;if (!Object.prototype.hasOwnProperty.call(lookup, itemId)) {- // @ts-ignore+ // @ts-expect-errorlookup[itemId] = { id: itemId, children: [] };}@@ -1882,7 +1882,7 @@ function getMethodTreeArrayToTree(items: Method[]): MethodTreeItem[] {rootItems.push(treeItem);} else {if (!Object.prototype.hasOwnProperty.call(lookup, parentId)) {- // @ts-ignore+ // @ts-expect-errorlookup[parentId] = { id: parentId, children: [] };}@@ -4376,15 +4376,12 @@ export async function upsertItemPostingGroup(.select("*").single();}- return (- client- .from("itemPostingGroup")- .update(sanitize(itemPostingGroup))- // @ts-ignore- .eq("id", itemPostingGroup.id)- .select("id")- .single()- );+ return client+ .from("itemPostingGroup")+ .update(sanitize(itemPostingGroup))+ .eq("id", itemPostingGroup.id)+ .select("id")+ .single();}/** @mcp upsert */@@ -5995,15 +5992,12 @@ export async function upsertMaterialForm(.select("*").single();}- return (- client- .from("materialForm")- .update(sanitize(materialForm))- // @ts-ignore- .eq("id", materialForm.id)- .select("id")- .single()- );+ return client+ .from("materialForm")+ .update(sanitize(materialForm))+ .eq("id", materialForm.id)+ .select("id")+ .single();}/**@@ -6151,15 +6145,12 @@ export async function upsertMaterialSubstance(.select("*").single();}- return (- client- .from("materialSubstance")- .update(sanitize(materialSubstance))- // @ts-ignore- .eq("id", materialSubstance.id)- .select("id")- .single()- );+ return client+ .from("materialSubstance")+ .update(sanitize(materialSubstance))+ .eq("id", materialSubstance.id)+ .select("id")+ .single();}/**diff --git a/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeActions.tsx b/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeActions.tsxindex 68b18185c4..425ef9421a 100644--- a/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeActions.tsx+++ b/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeActions.tsx@@ -5,7 +5,7 @@import { useCarbon } from "@carbon/auth";import { IconButton, type JSONContent, useDebounce } from "@carbon/react";import { useLingui } from "@lingui/react/macro";-import type { DragControls } from "framer-motion";+import type { DragControls } from "motion/react";import { useCallback, useState } from "react";import { LuTrash2 } from "react-icons/lu";import { useFetcher } from "react-router";diff --git a/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeHeader.tsx b/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeHeader.tsxindex 8606db5198..dd8fbe4674 100644--- a/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeHeader.tsx+++ b/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeHeader.tsx@@ -40,7 +40,7 @@ import {} from "../../items.models";import type { ChangeNotice } from "../../types";import ChangeNoticeStatus from "./ChangeNoticeStatus";-import { releaseDialogOpenAtom } from "./releaseDialog.store";+import { setReleaseDialogOpen } from "./releaseDialog.store";const ChangeNoticeHeader = () => {const { id } = useParams();@@ -209,7 +209,7 @@ const ChangeNoticeHeader = () => {leftIcon={<LuCircleCheck />}variant="primary"isDisabled={!permissions.can("update", "parts")}- onClick={() => releaseDialogOpenAtom.set(true)}+ onClick={() => setReleaseDialogOpen(true)}>{t`Release`}</Button>diff --git a/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeProperties.tsx b/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeProperties.tsxindex cc5b6d9475..2f9020332e 100644--- a/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeProperties.tsx+++ b/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeProperties.tsx@@ -147,7 +147,7 @@ const ChangeNoticeProperties = () => {className="w-96 flex-shrink-0 bg-background/30 h-full overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-accent border-l border-border px-4 pt-2 pb-12 text-sm">{/* Release is triggered from the header button (opens this confirmation- dialog via releaseDialogOpenAtom). The dialog is mounted here — headless+ dialog via the release dialog store). The dialog is mounted here — headlessuntil opened — so it renders nothing in the panel itself. */}{isImplementation && changeNotice && (<ChangeNoticeReleaseMergediff --git a/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeReleaseMerge.tsx b/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeReleaseMerge.tsxindex 7740676557..d9095aa3c3 100644--- a/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeReleaseMerge.tsx+++ b/apps/erp/app/modules/items/ui/ChangeNotice/ChangeNoticeReleaseMerge.tsx@@ -16,7 +16,6 @@ import {VStack} from "@carbon/react";import { Trans } from "@lingui/react/macro";-import { useStore } from "@nanostores/react";import { useEffect } from "react";import { LuCircleCheck } from "react-icons/lu";import { useFetcher } from "react-router";@@ -26,7 +25,10 @@ import type {ChangeNoticeItemDiff} from "../../items.models";import ChangeNoticeDiffViewer from "./ChangeNoticeDiffViewer";-import { releaseDialogOpenAtom } from "./releaseDialog.store";+import {+ setReleaseDialogOpen,+ useReleaseDialogOpen+} from "./releaseDialog.store";// One affected item's read-only changes, shown in the release confirmation.export type ReleaseChange = {@@ -44,7 +46,7 @@ export type ReleaseChange = {// The Implementation → Done release control, rendered as a confirmation dialog// (opened from the header button or the rail's Release section via-// releaseDialogOpenAtom). Releasing just activates each affected item's edited+// the release dialog store). Releasing just activates each affected item's edited// Draft make method as a new Active version and archives the prior one — the// prior version is kept as history, so there is no merge/conflict step. The user// reviews each item's changes, then confirms. Release is never a one-click action.@@ -58,25 +60,25 @@ export default function ChangeNoticeReleaseMerge({changes: ReleaseChange[];}) {const fetcher = useFetcher<{ success?: boolean }>();- const open = useStore(releaseDialogOpenAtom);+ const open = useReleaseDialogOpen();useEffect(() => {const data = fetcher.data as| { error?: { message: string }; success?: boolean }| undefined;if (data?.error) toast.error(data.error.message);- if (data?.success) releaseDialogOpenAtom.set(false);+ if (data?.success) setReleaseDialogOpen(false);}, [fetcher.data]);// Close the dialog if this control unmounts (e.g. navigating away).- useEffect(() => () => releaseDialogOpenAtom.set(false), []);+ useEffect(() => () => setReleaseDialogOpen(false), []);if (status !== "Implementation") return null;const isSubmitting = fetcher.state !== "idle";return (- <Modal open={open} onOpenChange={(v) => releaseDialogOpenAtom.set(v)}>+ <Modal open={open} onOpenChange={(v) => setReleaseDialogOpen(v)}><ModalContent className="w-[90vw] p-0 sm:max-w-3xl"><ModalHeader className="px-6 pt-6"><ModalTitle>@@ -116,7 +118,7 @@ export default function ChangeNoticeReleaseMerge({<HStack spacing={2} className="w-full justify-end"><Buttonvariant="secondary"- onClick={() => releaseDialogOpenAtom.set(false)}+ onClick={() => setReleaseDialogOpen(false)}isDisabled={isSubmitting}><Trans>Cancel</Trans>diff --git a/apps/erp/app/modules/items/ui/ChangeNotice/releaseDialog.store.ts b/apps/erp/app/modules/items/ui/ChangeNotice/releaseDialog.store.tsindex 1d312c46a0..d624c3964f 100644--- a/apps/erp/app/modules/items/ui/ChangeNotice/releaseDialog.store.ts+++ b/apps/erp/app/modules/items/ui/ChangeNotice/releaseDialog.store.ts@@ -2,10 +2,12 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { atom } from "nanostores";+import { create } from "zustand";// Cross-subtree open-state for the Change Notice release dialog. The header// "Release" button and the rail's Release section live in separate React// subtrees under the $id route, so neither can pass the other a callback; both-// toggle this atom instead. The dialog itself is rendered once (in the rail).-export const releaseDialogOpenAtom = atom(false);+// toggle this store instead. The dialog itself is rendered once (in the rail).+export const useReleaseDialogOpen = create<boolean>()(() => false);+export const setReleaseDialogOpen = (open: boolean) =>+ useReleaseDialogOpen.setState(open, true);diff --git a/apps/erp/app/modules/items/ui/Item/BillOfMaterial.tsx b/apps/erp/app/modules/items/ui/Item/BillOfMaterial.tsxindex 66707b65a5..3969053a77 100644--- a/apps/erp/app/modules/items/ui/Item/BillOfMaterial.tsx+++ b/apps/erp/app/modules/items/ui/Item/BillOfMaterial.tsx@@ -33,7 +33,7 @@ import {} from "@carbon/react";import { getItemById, getItemReadableId } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";-import { motion } from "framer-motion";+import { motion } from "motion/react";import { nanoid } from "nanoid";import type { Dispatch, ReactNode, SetStateAction } from "react";import { useCallback, useEffect, useRef, useState } from "react";@@ -1126,7 +1126,7 @@ function MaterialForm({transition={{type: "spring",bounce: 0,- duration: 0.55+ duration: 0.25}}><motion.divdiff --git a/apps/erp/app/modules/items/ui/Item/BillOfProcess.tsx b/apps/erp/app/modules/items/ui/Item/BillOfProcess.tsxindex 765a1d2470..df9ea73f26 100644--- a/apps/erp/app/modules/items/ui/Item/BillOfProcess.tsx+++ b/apps/erp/app/modules/items/ui/Item/BillOfProcess.tsx@@ -47,8 +47,8 @@ import { Editor } from "@carbon/react/Editor";import { getItemById, INPUT_FORMAT } from "@carbon/utils";import { getLocalTimeZone, today } from "@internationalized/date";import { Trans, useLingui } from "@lingui/react/macro";-import type { DragControls } from "framer-motion";-import { motion, Reorder, useDragControls } from "framer-motion";+import type { DragControls } from "motion/react";+import { motion, Reorder, useDragControls } from "motion/react";import { nanoid } from "nanoid";import type { Dispatch, ReactNode, SetStateAction } from "react";import { useEffect, useMemo, useRef, useState } from "react";@@ -901,7 +901,6 @@ const BillOfProcess = ({<ConfigurationEditorconfiguration={configuration}open={configuratorDisclosure.isOpen}- // @ts-ignoreparameters={parameters ?? []}onClose={configuratorDisclosure.onClose}/>@@ -1836,7 +1835,7 @@ function OperationForm({transition={{type: "spring",bounce: 0,- duration: 0.55+ duration: 0.25}}><motion.div layout className="ml-auto mr-1 pt-2">diff --git a/apps/erp/app/modules/items/ui/Item/CustomerPartForm.tsx b/apps/erp/app/modules/items/ui/Item/CustomerPartForm.tsxindex 3cee76a894..d931107734 100644--- a/apps/erp/app/modules/items/ui/Item/CustomerPartForm.tsx+++ b/apps/erp/app/modules/items/ui/Item/CustomerPartForm.tsx@@ -12,10 +12,11 @@ import {DrawerHeader,DrawerTitle,HStack,+ useCloseRoute,VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { useNavigate, useParams } from "react-router";+import { useParams } from "react-router";import type { z } from "zod";import { Customer, Hidden, Input, Submit } from "~/components/Form";import { usePermissions } from "~/hooks";@@ -30,7 +31,7 @@ type CustomerPartFormProps = {const CustomerPartForm = ({ initialValues }: CustomerPartFormProps) => {const permissions = usePermissions();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();const { itemId } = useParams();if (!itemId) throw new Error("itemId not found");@@ -40,7 +41,7 @@ const CustomerPartForm = ({ initialValues }: CustomerPartFormProps) => {? !permissions.can("update", "parts"): !permissions.can("create", "parts");- const onClose = () => navigate(-1);+ const onClose = () => closeRoute();return (<Drawerdiff --git a/apps/erp/app/modules/items/ui/Item/FileBadge.tsx b/apps/erp/app/modules/items/ui/Item/FileBadge.tsxindex 3f322e1289..82defa3af5 100644--- a/apps/erp/app/modules/items/ui/Item/FileBadge.tsx+++ b/apps/erp/app/modules/items/ui/Item/FileBadge.tsx@@ -32,7 +32,7 @@ export function FileBadge({<DocumentPreviewbucket="private"pathToFile={getPath(file)}- // @ts-ignore+ // @ts-expect-errortype={type}><Badge variant="secondary" className={cn("max-w-[240px]", className)}>diff --git a/apps/erp/app/modules/items/ui/Item/ItemDocuments.tsx b/apps/erp/app/modules/items/ui/Item/ItemDocuments.tsxindex cb4812995e..21fcbc76d1 100644--- a/apps/erp/app/modules/items/ui/Item/ItemDocuments.tsx+++ b/apps/erp/app/modules/items/ui/Item/ItemDocuments.tsx@@ -3,7 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { useCarbon } from "@carbon/auth";-import { convertKbToString, downloadBlob, storage } from "@carbon/files";+import { convertKbToString, downloadUrl, storage } from "@carbon/files";import { getLogger } from "@carbon/logger";import {Card,@@ -230,7 +230,7 @@ const ItemDocuments = ({<DocumentPreviewbucket="private"pathToFile={getPath(file)}- // @ts-ignore+ // @ts-expect-errortype={type}>{file.name}@@ -407,8 +407,7 @@ export const useItemDocuments = ({ itemId, type }: Props) => {async (file: FileObject) => {const url = path.to.file.previewFile(`private/${getPath(file)}`);try {- const response = await fetch(url);- downloadBlob(await response.blob(), file.name);+ await downloadUrl(url, file.name);} catch (error) {toast.error(t`Error downloading file`);logger.error("Error", { error: error });diff --git a/apps/erp/app/modules/items/ui/Item/ItemForm.tsx b/apps/erp/app/modules/items/ui/Item/ItemForm.tsxindex dfad1b9923..bad74f2e86 100644--- a/apps/erp/app/modules/items/ui/Item/ItemForm.tsx+++ b/apps/erp/app/modules/items/ui/Item/ItemForm.tsx@@ -122,7 +122,7 @@ const ItemForm = ({ initialValues, type }: ItemFormProps) => {</DropdownMenuTrigger><DropdownMenuContent align="end"><DropdownMenuItem shortcut={MENU_ITEM_SHORTCUTS.view} asChild>- {/* @ts-ignore */}+ {/* @ts-expect-error */}<Link to={getLinkToItemDetails(type, initialValues.id)}><Trans>View Item Master</Trans></Link>diff --git a/apps/erp/app/modules/items/ui/Item/ItemPlanningForm.tsx b/apps/erp/app/modules/items/ui/Item/ItemPlanningForm.tsxindex a410954476..9b048f1b34 100644--- a/apps/erp/app/modules/items/ui/Item/ItemPlanningForm.tsx+++ b/apps/erp/app/modules/items/ui/Item/ItemPlanningForm.tsx@@ -95,7 +95,7 @@ const ItemPlanningForm = ({value: policy}))}onChange={(selected) => {- // @ts-ignore+ // @ts-expect-errorsetPolicy(selected?.value || "Manual Reorder");}}/>diff --git a/apps/erp/app/modules/items/ui/Materials/MaterialProperties.tsx b/apps/erp/app/modules/items/ui/Materials/MaterialProperties.tsxindex a063dbb909..acda9d4a02 100644--- a/apps/erp/app/modules/items/ui/Materials/MaterialProperties.tsx+++ b/apps/erp/app/modules/items/ui/Materials/MaterialProperties.tsx@@ -248,7 +248,7 @@ const MaterialProperties = ({ data }: MaterialPropertiesProps) => {].includes(field)) {setMaterialPropertyUpdate({- // @ts-ignore+ // @ts-expect-errorfield,value});@@ -867,7 +867,7 @@ const MaterialProperties = ({ data }: MaterialPropertiesProps) => {}}onConfirm={() => {onUpdate(- // @ts-ignore+ // @ts-expect-errormaterialPropertyUpdate?.field,materialPropertyUpdate?.value);diff --git a/apps/erp/app/modules/items/ui/Methods/MethodMaterialsTable.tsx b/apps/erp/app/modules/items/ui/Methods/MethodMaterialsTable.tsxindex ba1374960b..b78b800518 100644--- a/apps/erp/app/modules/items/ui/Methods/MethodMaterialsTable.tsx+++ b/apps/erp/app/modules/items/ui/Methods/MethodMaterialsTable.tsx@@ -34,16 +34,14 @@ const MethodMaterialsTable = memo(<HStack className="py-1"><Hyperlinkto={getPathToMakeMethod(- // @ts-ignore+ // @ts-expect-errorrow.original.makeMethod?.item?.type,- // @ts-ignorerow.original.makeMethod?.item?.id,- // @ts-ignore+ // @ts-expect-errorrow.original.makeMethod?.id)}className="max-w-[260px] truncate">- {/* @ts-ignore */}{row.original.makeMethod?.item?.readableIdWithRevision}</Hyperlink></HStack>diff --git a/apps/erp/app/modules/items/ui/Methods/MethodOperationsTable.tsx b/apps/erp/app/modules/items/ui/Methods/MethodOperationsTable.tsxindex 1a618862ac..7b29987053 100644--- a/apps/erp/app/modules/items/ui/Methods/MethodOperationsTable.tsx+++ b/apps/erp/app/modules/items/ui/Methods/MethodOperationsTable.tsx@@ -33,11 +33,10 @@ const MethodOperationsTable = memo(cell: ({ row }) => (<Hyperlinkto={getPathToMakeMethod(- // @ts-ignore+ // @ts-expect-errorrow.original.makeMethod?.item?.type,- // @ts-ignorerow.original.makeMethod?.item?.id,- // @ts-ignore+ // @ts-expect-errorrow.original.makeMethod?.id)}className="max-w-[260px] truncate"@@ -50,7 +49,6 @@ const MethodOperationsTable = memo(accessorKey: "makeMethod.item.readableIdWithRevision",header: t`Item ID`,cell: ({ row }) => {- // @ts-ignorereturn row.original.makeMethod?.item?.readableIdWithRevision;},meta: {diff --git a/apps/erp/app/modules/people/people.service.ts b/apps/erp/app/modules/people/people.service.tsindex 1123259a45..a724af369c 100644--- a/apps/erp/app/modules/people/people.service.ts+++ b/apps/erp/app/modules/people/people.service.ts@@ -335,42 +335,37 @@ export async function getPeople(attributeCategories.data.reduce<PersonAttributes>((acc, category) => {if (!category.userAttribute || !Array.isArray(category.userAttribute))return acc;- category.userAttribute.forEach(- // @ts-ignore- (attribute) => {- if (- attribute.userAttributeValue &&- Array.isArray(attribute.userAttributeValue) &&- !Array.isArray(attribute.attributeDataType)- ) {- const userAttributeId = attribute.id;- const userAttributeValue = attribute.userAttributeValue.find(- // @ts-ignore- (attributeValue) => attributeValue.userId === userId- );- const value =- typeof userAttributeValue?.valueBoolean === "boolean"- ? userAttributeValue.valueBoolean- : userAttributeValue?.valueDate ||- userAttributeValue?.valueNumeric ||- userAttributeValue?.valueText ||- userAttributeValue?.valueUser ||- userAttributeValue?.valueFile;-- if (value && userAttributeValue?.id) {- acc[userAttributeId] = {- userAttributeValueId: userAttributeValue.id,- // @ts-ignore- dataType: attribute.attributeDataType?.id as DataType,- value,- user: !Array.isArray(userAttributeValue.user)- ? userAttributeValue.user- : undefined- };- }+ category.userAttribute.forEach((attribute) => {+ if (+ attribute.userAttributeValue &&+ Array.isArray(attribute.userAttributeValue) &&+ !Array.isArray(attribute.attributeDataType)+ ) {+ const userAttributeId = attribute.id;+ const userAttributeValue = attribute.userAttributeValue.find(+ (attributeValue) => attributeValue.userId === userId+ );+ const value =+ typeof userAttributeValue?.valueBoolean === "boolean"+ ? userAttributeValue.valueBoolean+ : userAttributeValue?.valueDate ||+ userAttributeValue?.valueNumeric ||+ userAttributeValue?.valueText ||+ userAttributeValue?.valueUser ||+ userAttributeValue?.valueFile;++ if (value && userAttributeValue?.id) {+ acc[userAttributeId] = {+ userAttributeValueId: userAttributeValue.id,+ dataType: attribute.attributeDataType?.id as DataType,+ value,+ user: !Array.isArray(userAttributeValue.user)+ ? userAttributeValue.user+ : undefined+ };}}- );+ });return acc;}, {});diff --git a/apps/erp/app/modules/people/ui/Attributes/AttributeCategoryDetail.tsx b/apps/erp/app/modules/people/ui/Attributes/AttributeCategoryDetail.tsxindex 8339023e3a..ca5e334e2e 100644--- a/apps/erp/app/modules/people/ui/Attributes/AttributeCategoryDetail.tsx+++ b/apps/erp/app/modules/people/ui/Attributes/AttributeCategoryDetail.tsx@@ -22,7 +22,7 @@ import {useDisclosure} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { Reorder } from "framer-motion";+import { Reorder } from "motion/react";import { useEffect, useMemo, useState } from "react";import { AiOutlineNumber } from "react-icons/ai";import { BiText } from "react-icons/bi";@@ -54,7 +54,7 @@ const AttributeCategoryDetail = ({() =>Array.isArray(attributeCategory.userAttribute)? attributeCategory.userAttribute.reduce<Record<string, Attribute>>(- // @ts-ignore+ // @ts-expect-error(acc, attribute) => {if (!attribute) return acc;return {@@ -193,21 +193,18 @@ const AttributeCategoryDetail = ({variant="ghost"/><p className="flex-grow text-foreground">- {- // @ts-ignore- attributeMap[sortId]?.name- }+ {attributeMap[sortId]?.name}</p><ButtonisDisabledleftIcon={getIcon(- // @ts-ignore+ // @ts-expect-errorattributeMap[sortId]?.attributeDataType)}variant="ghost">{- // @ts-ignore+ // @ts-expect-errorattributeMap[sortId]?.attributeDataType?.label ??t`Unknown`}diff --git a/apps/erp/app/modules/people/ui/Holidays/HolidayForm.tsx b/apps/erp/app/modules/people/ui/Holidays/HolidayForm.tsxindex d4d9291e67..aea53bff24 100644--- a/apps/erp/app/modules/people/ui/Holidays/HolidayForm.tsx+++ b/apps/erp/app/modules/people/ui/Holidays/HolidayForm.tsx@@ -12,10 +12,10 @@ import {DrawerHeader,DrawerTitle,HStack,+ useCloseRoute,VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { useNavigate } from "react-router";import type { z } from "zod";import {CustomFormFields,@@ -35,8 +35,8 @@ type HolidayFormProps = {const HolidayForm = ({ initialValues }: HolidayFormProps) => {const { t } = useLingui();const permissions = usePermissions();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const isEditing = initialValues.id !== undefined;const isDisabled = isEditingdiff --git a/apps/erp/app/modules/people/ui/Shifts/ShiftForm.tsx b/apps/erp/app/modules/people/ui/Shifts/ShiftForm.tsxindex 385876b91c..db47f2a2d7 100644--- a/apps/erp/app/modules/people/ui/Shifts/ShiftForm.tsx+++ b/apps/erp/app/modules/people/ui/Shifts/ShiftForm.tsx@@ -14,10 +14,10 @@ import {FormControl,FormLabel,HStack,+ useCloseRoute,VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { useNavigate } from "react-router";import type { z } from "zod";import {Boolean,@@ -39,8 +39,8 @@ type ShiftFormProps = {const ShiftForm = ({ initialValues }: ShiftFormProps) => {const { t } = useLingui();const permissions = usePermissions();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const isEditing = initialValues.id !== undefined;const isDisabled = isEditingdiff --git a/apps/erp/app/modules/people/ui/Shifts/ShiftsTable.tsx b/apps/erp/app/modules/people/ui/Shifts/ShiftsTable.tsxindex c4d9528bd8..87097752f5 100644--- a/apps/erp/app/modules/people/ui/Shifts/ShiftsTable.tsx+++ b/apps/erp/app/modules/people/ui/Shifts/ShiftsTable.tsx@@ -149,7 +149,6 @@ const ShiftsTable = memo(({ data, count, locations }: ShiftsTableProps) => {{id: "days",header: t`Days`,- // @ts-ignorecell: ({ row }) => renderDays(row.original),meta: {icon: <LuCalendarDays />,diff --git a/apps/erp/app/modules/people/ui/Timecards/TimecardForm.tsx b/apps/erp/app/modules/people/ui/Timecards/TimecardForm.tsxindex 7155f528bf..8404e55b13 100644--- a/apps/erp/app/modules/people/ui/Timecards/TimecardForm.tsx+++ b/apps/erp/app/modules/people/ui/Timecards/TimecardForm.tsx@@ -12,6 +12,7 @@ import {DrawerHeader,DrawerTitle,HStack,+ useCloseRoute,VStack} from "@carbon/react";import type { CalendarDateTime } from "@internationalized/date";@@ -23,7 +24,6 @@ import {} from "@internationalized/date";import { Trans, useLingui } from "@lingui/react/macro";import { useState } from "react";-import { useNavigate } from "react-router";import type { z } from "zod";import { DateTimePicker, Employee, Hidden, Submit } from "~/components/Form";import { usePermissions } from "~/hooks";@@ -37,8 +37,8 @@ type TimecardFormProps = {const TimecardForm = ({ initialValues }: TimecardFormProps) => {const { t } = useLingui();const permissions = usePermissions();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const isEditing = initialValues.id !== undefined;const isDisabled = isEditingdiff --git a/apps/erp/app/modules/production/index.ts b/apps/erp/app/modules/production/index.tsindex 16c9f5d644..b82089d571 100644--- a/apps/erp/app/modules/production/index.ts+++ b/apps/erp/app/modules/production/index.ts@@ -4,5 +4,5 @@export * from "./production.models";export * from "./production.service";-// @ts-ignore+// @ts-expect-errorexport * from "./types";diff --git a/apps/erp/app/modules/production/ui/DemandProjection/DemandProjectionForm.tsx b/apps/erp/app/modules/production/ui/DemandProjection/DemandProjectionForm.tsxindex de9be23b63..629559f1c8 100644--- a/apps/erp/app/modules/production/ui/DemandProjection/DemandProjectionForm.tsx+++ b/apps/erp/app/modules/production/ui/DemandProjection/DemandProjectionForm.tsx@@ -11,6 +11,7 @@ import {DrawerContent,DrawerFooter,DrawerHeader,+ DrawerTitle,HStack,Tabs,TabsContent,@@ -188,9 +189,11 @@ const DemandProjectionsForm = ({className="flex flex-col h-full"><DrawerHeader>- <CardTitle>- {isEditing ? t`Edit Demand Forecast` : t`New Demand Forecast`}- </CardTitle>+ <DrawerTitle asChild>+ <CardTitle>+ {isEditing ? t`Edit Demand Forecast` : t`New Demand Forecast`}+ </CardTitle>+ </DrawerTitle><CardDescription>{t`Set demand forecast values for each week`}</CardDescription>diff --git a/apps/erp/app/modules/production/ui/DemandProjection/DemandProjectionTable.tsx b/apps/erp/app/modules/production/ui/DemandProjection/DemandProjectionTable.tsxindex 2fcf2a5fb0..1e8012c806 100644--- a/apps/erp/app/modules/production/ui/DemandProjection/DemandProjectionTable.tsx+++ b/apps/erp/app/modules/production/ui/DemandProjection/DemandProjectionTable.tsx@@ -119,7 +119,7 @@ const DemandProjectionsTable = memo(<ItemThumbnailsize="sm"thumbnailPath={row.original.thumbnailPath}- // @ts-ignore+ // @ts-expect-errortype={row.original.type}/>diff --git a/apps/erp/app/modules/production/ui/Jobs/JobBillOfMaterial.tsx b/apps/erp/app/modules/production/ui/Jobs/JobBillOfMaterial.tsxindex 9eca68603b..13c394649e 100644--- a/apps/erp/app/modules/production/ui/Jobs/JobBillOfMaterial.tsx+++ b/apps/erp/app/modules/production/ui/Jobs/JobBillOfMaterial.tsx@@ -32,7 +32,7 @@ import {} from "@carbon/react";import { getItemReadableId, INPUT_FORMAT } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";-import { motion } from "framer-motion";+import { motion } from "motion/react";import { nanoid } from "nanoid";import type { Dispatch, SetStateAction } from "react";import { useCallback, useEffect, useRef, useState } from "react";@@ -256,7 +256,7 @@ const initialMethodMaterial: Omit<Material, "jobMakeMethodId" | "order"> & {description: string;} = {itemId: "",- // @ts-ignore+ // @ts-expect-erroritemType: "Item" as const,methodType: "Purchase to Order" as const,description: "",@@ -1022,7 +1022,7 @@ function MaterialForm({transition={{type: "spring",bounce: 0,- duration: 0.55+ duration: 0.25}}><motion.divdiff --git a/apps/erp/app/modules/production/ui/Jobs/JobBillOfProcess.tsx b/apps/erp/app/modules/production/ui/Jobs/JobBillOfProcess.tsxindex f551402b1f..08db44bf93 100644--- a/apps/erp/app/modules/production/ui/Jobs/JobBillOfProcess.tsx+++ b/apps/erp/app/modules/production/ui/Jobs/JobBillOfProcess.tsx@@ -64,8 +64,8 @@ import {import { getLocalTimeZone, parseDate, today } from "@internationalized/date";import { Trans, useLingui } from "@lingui/react/macro";import { useNumberFormatter } from "@react-aria/i18n";-import type { DragControls } from "framer-motion";-import { motion, Reorder, useDragControls } from "framer-motion";+import type { DragControls } from "motion/react";+import { motion, Reorder, useDragControls } from "motion/react";import { nanoid } from "nanoid";import type { Dispatch, ReactNode, SetStateAction } from "react";import { useCallback, useEffect, useMemo, useRef, useState } from "react";@@ -880,9 +880,8 @@ const JobBillOfProcess = ({animate={{ opacity: 1, filter: "blur(0px)" }}transition={{type: "spring",- bounce: 0.2,- duration: 0.75,- delay: 0.15+ bounce: 0,+ duration: 0.3}}><OperationForm@@ -1041,9 +1040,8 @@ const JobBillOfProcess = ({animate={{ opacity: 1, filter: "blur(0px)" }}transition={{type: "spring",- bounce: 0.2,- duration: 0.75,- delay: 0.15+ bounce: 0,+ duration: 0.3}}><InfiniteScroll@@ -3738,7 +3736,7 @@ function OperationForm({transition={{type: "spring",bounce: 0,- duration: 0.55+ duration: 0.25}}><motion.div layout className="ml-auto mr-1 pt-2">diff --git a/apps/erp/app/modules/production/ui/Jobs/JobDocuments.tsx b/apps/erp/app/modules/production/ui/Jobs/JobDocuments.tsxindex 4856a35967..5b9e70ae9e 100644--- a/apps/erp/app/modules/production/ui/Jobs/JobDocuments.tsx+++ b/apps/erp/app/modules/production/ui/Jobs/JobDocuments.tsx@@ -3,7 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { useCarbon } from "@carbon/auth";-import { convertKbToString, downloadBlob, storage } from "@carbon/files";+import { convertKbToString, downloadUrl, storage } from "@carbon/files";import { getLogger } from "@carbon/logger";import {Card,@@ -146,8 +146,7 @@ const useJobDocuments = ({`private/${getPath(file, bucket as "job" | "parts")}`);try {- const response = await fetch(url);- downloadBlob(await response.blob(), file.name);+ await downloadUrl(url, file.name);} catch (error) {toast.error(t`Error downloading file`);logger.error("Failed to process file operation", { error });@@ -490,7 +489,7 @@ const JobDocuments = ({? "parts": "job")}- // @ts-ignore+ // @ts-expect-errortype={type}>{file.name}diff --git a/apps/erp/app/modules/production/ui/Jobs/JobMaterialsTable.tsx b/apps/erp/app/modules/production/ui/Jobs/JobMaterialsTable.tsxindex ea92afc985..bfd2e1f8ac 100644--- a/apps/erp/app/modules/production/ui/Jobs/JobMaterialsTable.tsx+++ b/apps/erp/app/modules/production/ui/Jobs/JobMaterialsTable.tsx@@ -184,7 +184,7 @@ const JobMaterialsTable = memo(<HStack className="py-1"><ItemThumbnailsize="md"- // @ts-ignore+ // @ts-expect-errortype={row.original.itemType}/>diff --git a/apps/erp/app/modules/production/ui/Jobs/JobsTable.tsx b/apps/erp/app/modules/production/ui/Jobs/JobsTable.tsxindex 38bb760e41..39d23dbc7c 100644--- a/apps/erp/app/modules/production/ui/Jobs/JobsTable.tsx+++ b/apps/erp/app/modules/production/ui/Jobs/JobsTable.tsx@@ -209,7 +209,7 @@ const JobsTable = memo((props: JobsTableProps) => {<ItemThumbnailsize="md"thumbnailPath={row.original.thumbnailPath}- // @ts-ignore+ // @ts-expect-errortype={row.original.itemType}/><Hyperlink to={path.to.job(row.original.id!)}>diff --git a/apps/erp/app/modules/production/ui/Jobs/ProductionEventForm.tsx b/apps/erp/app/modules/production/ui/Jobs/ProductionEventForm.tsxindex 146854c5d7..ce51075f10 100644--- a/apps/erp/app/modules/production/ui/Jobs/ProductionEventForm.tsx+++ b/apps/erp/app/modules/production/ui/Jobs/ProductionEventForm.tsx@@ -12,6 +12,7 @@ import {DrawerHeader,DrawerTitle,HStack,+ useCloseRoute,VStack} from "@carbon/react";import type { CalendarDateTime } from "@internationalized/date";@@ -22,7 +23,6 @@ import {} from "@internationalized/date";import { Trans, useLingui } from "@lingui/react/macro";import { useState } from "react";-import { useNavigate } from "react-router";import type { z } from "zod";import {DateTimePicker,@@ -51,14 +51,14 @@ const ProductionEventForm = ({}: ProductionEventFormProps) => {const permissions = usePermissions();const { t } = useLingui();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const eventTypeOptions = [{ label: t`Labor`, value: "Labor" },{ label: t`Machine`, value: "Machine" },{ label: t`Setup`, value: "Setup" }];- const onClose = () => navigate(-1);+ const onClose = () => closeRoute();const [jobOperationId, setJobOperationId] = useState(initialValues.jobOperationId ?? ""diff --git a/apps/erp/app/modules/production/ui/Jobs/ProductionQuantityForm.tsx b/apps/erp/app/modules/production/ui/Jobs/ProductionQuantityForm.tsxindex fff2ecd4d4..2bf005b20c 100644--- a/apps/erp/app/modules/production/ui/Jobs/ProductionQuantityForm.tsx+++ b/apps/erp/app/modules/production/ui/Jobs/ProductionQuantityForm.tsx@@ -12,11 +12,11 @@ import {DrawerHeader,DrawerTitle,HStack,+ useCloseRoute,VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";import { useState } from "react";-import { useNavigate } from "react-router";import type { z } from "zod";import {Employee,@@ -45,8 +45,8 @@ const ProductionQuantityForm = ({}: ProductionQuantityFormProps) => {const permissions = usePermissions();const { t } = useLingui();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const [type, setType] = useState<"Production" | "Scrap" | "Rework">(initialValues.typediff --git a/apps/erp/app/modules/production/ui/Planning/ProductionPlanningOrderDrawer.tsx b/apps/erp/app/modules/production/ui/Planning/ProductionPlanningOrderDrawer.tsxindex 55102dc8b5..9f1ddd66db 100644--- a/apps/erp/app/modules/production/ui/Planning/ProductionPlanningOrderDrawer.tsx+++ b/apps/erp/app/modules/production/ui/Planning/ProductionPlanningOrderDrawer.tsx@@ -272,7 +272,7 @@ export const ProductionPlanningOrderDrawer = memo(<DrawerTitle className="flex items-center gap-2"><span>{row.readableIdWithRevision}</span><Link- // @ts-ignore+ // @ts-expect-errorto={getLinkToItemPlanning(row.type, row.id)}><LuExternalLink />diff --git a/apps/erp/app/modules/production/ui/Planning/ProductionPlanningTable.tsx b/apps/erp/app/modules/production/ui/Planning/ProductionPlanningTable.tsxindex 81881ac062..728cac4f59 100644--- a/apps/erp/app/modules/production/ui/Planning/ProductionPlanningTable.tsx+++ b/apps/erp/app/modules/production/ui/Planning/ProductionPlanningTable.tsx@@ -358,7 +358,7 @@ const ProductionPlanningTable = ({<ItemThumbnailsize="sm"thumbnailPath={row.original.thumbnailPath}- // @ts-ignore+ // @ts-expect-errortype={row.original.type}/>diff --git a/apps/erp/app/modules/production/ui/Procedures/ProcedureExplorer.tsx b/apps/erp/app/modules/production/ui/Procedures/ProcedureExplorer.tsxindex 8f8e97219a..99a19da879 100644--- a/apps/erp/app/modules/production/ui/Procedures/ProcedureExplorer.tsx+++ b/apps/erp/app/modules/production/ui/Procedures/ProcedureExplorer.tsx@@ -48,8 +48,8 @@ import {} from "@carbon/react";import { Editor } from "@carbon/react/Editor";import { Trans, useLingui } from "@lingui/react/macro";-import type { DragControls } from "framer-motion";-import { Reorder, useDragControls } from "framer-motion";+import type { DragControls } from "motion/react";+import { Reorder, useDragControls } from "motion/react";import type { ReactNode } from "react";import { useEffect, useMemo, useRef, useState } from "react";import { flushSync } from "react-dom";@@ -282,7 +282,6 @@ export default function ProcedureExplorer() {values={sortOrder}onReorder={onReorder}className="w-full"- disabled={isDisabled}>{sortOrder.map((sortId) => (<DraggableStepItem@@ -446,7 +445,7 @@ export default function ProcedureExplorer() {</VStack>{procedureStepDisclosure.isOpen && (<ProcedureStepForm- // @ts-ignore+ // @ts-expect-errorinitialValues={procedureAttribtueInitialValues}isDisabled={isDisabled}onClose={procedureStepDisclosure.onClose}diff --git a/apps/erp/app/modules/purchasing/purchasing.service.ts b/apps/erp/app/modules/purchasing/purchasing.service.tsindex e7e422d6eb..7c372ab12a 100644--- a/apps/erp/app/modules/purchasing/purchasing.service.ts+++ b/apps/erp/app/modules/purchasing/purchasing.service.ts@@ -2739,7 +2739,6 @@ export async function getPurchasingRFQSuppliers(client: SupabaseClient<Database>,purchasingRfqId: string): Promise<PostgrestResponse<PurchasingRfqSupplierWithSupplier>> {- // @ts-ignore TS2589 — supabase select-string instantiation depth sits on// tsgo's limit; the cliff shifts as unrelated modules join the program.// ts-ignore, not ts-expect-error, so it satisfies both tsc and tsgo.return client@@ -3006,7 +3005,6 @@ export async function getLinkedSupplierQuotes(client: SupabaseClient<Database>,purchasingRfqId: string): Promise<PostgrestResponse<LinkedSupplierQuote>> {- // @ts-ignore - nested select instantiation exceeds tsgo depth limitreturn client.from("purchasingRfqToSupplierQuote").select(@@ -3085,7 +3083,6 @@ export async function getSiblingQuotesForQuote(const rfqIds = linkedRfqs.map((r) => r.purchasingRfqId);// Get all quotes linked to any of these RFQs (excluding current quote)- // @ts-ignore - nested select instantiation exceeds tsgo depth limitreturn client.from("purchasingRfqToSupplierQuote").select(@@ -3121,7 +3118,6 @@ export async function getSupplierQuotesForComparison(purchasingRfqId: string) {// 1. Get all supplier quote IDs linked to this RFQ with supplier info- // @ts-ignore - nested select instantiation exceeds tsgo depth limitconst linksResult: PostgrestResponse<LinkedSupplierQuote> = await client.from("purchasingRfqToSupplierQuote").select(@@ -3186,7 +3182,6 @@ export async function getPurchasingRFQSuppliersWithLinks(client: SupabaseClient<Database>,purchasingRfqId: string): Promise<PostgrestResponse<PurchasingRfqSupplierWithSupplier>> {- // @ts-ignore - nested select instantiation exceeds tsgo depth limitreturn client.from("purchasingRfqSupplier").select("*, supplier(id, name)")diff --git a/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrderSummary.tsx b/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrderSummary.tsxindex 16e2e175cd..6cd57586f1 100644--- a/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrderSummary.tsx+++ b/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrderSummary.tsx@@ -22,7 +22,7 @@ import {import { getItemReadableId } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";-import { motion } from "framer-motion";+import { motion } from "motion/react";import { useState } from "react";import { LuChevronRight, LuImage } from "react-icons/lu";import { Link, useParams } from "react-router";@@ -115,9 +115,9 @@ const LineItems = ({return (<motion.divkey={line.id}- initial={{ opacity: 0, y: 50 }}+ initial={{ opacity: 0, y: 8 }}animate={{ opacity: 1, y: 0 }}- transition={{ duration: 0.5 }}+ transition={{ duration: 0.2, ease: "easeOut" }}className="border-b border-input py-6 w-full"><HStack spacing={4} className="items-start">@@ -201,7 +201,7 @@ const LineItems = ({>{line.purchaseQuantity}<MethodIcon- // @ts-ignore+ // @ts-expect-errortype={line.methodType ?? "Pull from Inventory"}/></Badge>diff --git a/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrdersTable.tsx b/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrdersTable.tsxindex f48b3fcbcf..87670f0ac0 100644--- a/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrdersTable.tsx+++ b/apps/erp/app/modules/purchasing/ui/PurchaseOrder/PurchaseOrdersTable.tsx@@ -100,7 +100,7 @@ const PurchaseOrdersTable = memo(<ItemThumbnailsize="sm"thumbnailPath={row.original.thumbnailPath}- // @ts-ignore+ // @ts-expect-errortype={row.original.itemType}/><Hyperlink to={path.to.purchaseOrderDetails(row.original.id!)}>diff --git a/apps/erp/app/modules/purchasing/ui/PurchaseOrder/usePurchaseOrderTotals.ts b/apps/erp/app/modules/purchasing/ui/PurchaseOrder/usePurchaseOrderTotals.tsindex 077389b3f6..c037f062d2 100644--- a/apps/erp/app/modules/purchasing/ui/PurchaseOrder/usePurchaseOrderTotals.ts+++ b/apps/erp/app/modules/purchasing/ui/PurchaseOrder/usePurchaseOrderTotals.ts@@ -2,10 +2,11 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { atom } from "nanostores";-import { useNanoStore } from "~/hooks";+import { create } from "zustand";-const $totals = atom<{ total: number }>({- total: 0-});-export const usePurchaseOrderTotals = () => useNanoStore($totals);+type Totals = { total: number };++const useTotals = create<Totals>()(() => ({ total: 0 }));+const setTotals = (totals: Totals) => useTotals.setState(totals, true);++export const usePurchaseOrderTotals = () => [useTotals(), setTotals] as const;diff --git a/apps/erp/app/modules/purchasing/ui/PurchaseReturnOrders/PurchaseReturnOrderSummary.tsx b/apps/erp/app/modules/purchasing/ui/PurchaseReturnOrders/PurchaseReturnOrderSummary.tsxindex 7355a1c688..9a5c529308 100644--- a/apps/erp/app/modules/purchasing/ui/PurchaseReturnOrders/PurchaseReturnOrderSummary.tsx+++ b/apps/erp/app/modules/purchasing/ui/PurchaseReturnOrders/PurchaseReturnOrderSummary.tsx@@ -15,7 +15,7 @@ import {VStack} from "@carbon/react";import { Trans } from "@lingui/react/macro";-import { motion } from "framer-motion";+import { motion } from "motion/react";import { LuImage } from "react-icons/lu";import { Link, useParams } from "react-router";import { DateTime, MotionMoney, SupplierAvatar } from "~/components";@@ -98,9 +98,9 @@ const PurchaseReturnOrderSummary = () => {return (<motion.divkey={line.id}- initial={{ opacity: 0, y: 50 }}+ initial={{ opacity: 0, y: 8 }}animate={{ opacity: 1, y: 0 }}- transition={{ duration: 0.5 }}+ transition={{ duration: 0.2, ease: "easeOut" }}className="border-b border-input py-6 w-full"><HStack spacing={4} className="items-start">diff --git a/apps/erp/app/modules/purchasing/ui/Supplier/SupplierBankAccountForm.tsx b/apps/erp/app/modules/purchasing/ui/Supplier/SupplierBankAccountForm.tsxindex 6a7babb8e1..471df30f91 100644--- a/apps/erp/app/modules/purchasing/ui/Supplier/SupplierBankAccountForm.tsx+++ b/apps/erp/app/modules/purchasing/ui/Supplier/SupplierBankAccountForm.tsx@@ -13,13 +13,14 @@ import {ModalDrawerHeader,ModalDrawerProvider,ModalDrawerTitle,+ useCloseRoute,VStack} from "@carbon/react";import type { AccountLabelKey, BankCodeLabelKey } from "@carbon/utils";import { getBankFieldConfig } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { useState } from "react";-import { useFetcher, useNavigate, useParams } from "react-router";+import { useFetcher, useParams } from "react-router";import type { z } from "zod";import {Currency,@@ -50,7 +51,7 @@ const SupplierBankAccountForm = ({const { t } = useLingui();const permissions = usePermissions();const fetcher = useFetcher<{}>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { supplierId } = useParams();if (!supplierId) throw new Error("supplierId not found");@@ -93,7 +94,7 @@ const SupplierBankAccountForm = ({if (type === "modal") {onClose?.();} else {- navigate(-1);+ closeRoute();}}}}diff --git a/apps/erp/app/modules/purchasing/ui/Supplier/SupplierProcessForm.tsx b/apps/erp/app/modules/purchasing/ui/Supplier/SupplierProcessForm.tsxindex 32f9613482..387f272d42 100644--- a/apps/erp/app/modules/purchasing/ui/Supplier/SupplierProcessForm.tsx+++ b/apps/erp/app/modules/purchasing/ui/Supplier/SupplierProcessForm.tsx@@ -14,13 +14,14 @@ import {ModalDrawerProvider,ModalDrawerTitle,toast,+ useCloseRoute,VStack} from "@carbon/react";import { INPUT_FORMAT } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import type { PostgrestResponse } from "@supabase/supabase-js";import { useEffect, useState } from "react";-import { useFetcher, useNavigate, useParams } from "react-router";+import { useFetcher, useParams } from "react-router";import type { z } from "zod";import {CustomFormFields,@@ -53,7 +54,7 @@ const SupplierProcessForm = ({const fetcher = useFetcher<PostgrestResponse<SupplierProcess>>();const { supplierId } = useParams();const [supplier, setSupplier] = useState<string | undefined>(supplierId);- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { company } = useUser();const baseCurrency = company?.baseCurrencyCode ?? "USD";@@ -64,7 +65,6 @@ const SupplierProcessForm = ({if (fetcher.state === "loading" && fetcher.data?.data) {onClose?.();- // @ts-ignoretoast.success(`Created supplier process`);} else if (fetcher.state === "idle" && fetcher.data?.error) {toast.error(`Failed to create supplier process`);@@ -85,7 +85,7 @@ const SupplierProcessForm = ({if (type === "modal") {onClose?.();} else {- navigate(-1);+ closeRoute();}}}}diff --git a/apps/erp/app/modules/purchasing/ui/SupplierInteraction/SupplierInteractionDocuments.tsx b/apps/erp/app/modules/purchasing/ui/SupplierInteraction/SupplierInteractionDocuments.tsxindex e5ac758387..aab0eec4b4 100644--- a/apps/erp/app/modules/purchasing/ui/SupplierInteraction/SupplierInteractionDocuments.tsx+++ b/apps/erp/app/modules/purchasing/ui/SupplierInteraction/SupplierInteractionDocuments.tsx@@ -3,7 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { useCarbon } from "@carbon/auth";-import { convertKbToString, storage } from "@carbon/files";+import { convertKbToString, downloadUrl, storage } from "@carbon/files";import { getLogger } from "@carbon/logger";import {Card,@@ -122,7 +122,7 @@ const SupplierInteractionDocuments = ({<DocumentPreviewbucket="private"pathToFile={getPath(attachment)}- // @ts-ignore+ // @ts-expect-errortype={getDocumentType(attachment.name)}>{attachment.name}@@ -256,16 +256,7 @@ export const useSupplierInteractionDocuments = ({async (attachment: FileObject) => {const url = path.to.file.previewFile(`private/${getPath(attachment)}`);try {- const response = await fetch(url);- const blob = await response.blob();- const blobUrl = window.URL.createObjectURL(blob);- const a = document.createElement("a");- document.body.appendChild(a);- a.href = blobUrl;- a.download = attachment.name;- a.click();- window.URL.revokeObjectURL(blobUrl);- document.body.removeChild(a);+ await downloadUrl(url, attachment.name);} catch (error) {toast.error(t`Error downloading file`);logger.error("Error", { error: error });diff --git a/apps/erp/app/modules/purchasing/ui/SupplierInteraction/SupplierInteractionLineDocuments.tsx b/apps/erp/app/modules/purchasing/ui/SupplierInteraction/SupplierInteractionLineDocuments.tsxindex d2f2581b93..36b4ae4626 100644--- a/apps/erp/app/modules/purchasing/ui/SupplierInteraction/SupplierInteractionLineDocuments.tsx+++ b/apps/erp/app/modules/purchasing/ui/SupplierInteraction/SupplierInteractionLineDocuments.tsx@@ -3,7 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { useCarbon } from "@carbon/auth";-import { convertKbToString, storage } from "@carbon/files";+import { convertKbToString, downloadUrl, storage } from "@carbon/files";import { getLogger } from "@carbon/logger";import {Card,@@ -105,16 +105,7 @@ const useSupplierInteractionLineDocuments = ({async (file: ItemFile) => {const url = path.to.file.previewFile(`private/${getPath(file)}`);try {- const response = await fetch(url);- const blob = await response.blob();- const blobUrl = window.URL.createObjectURL(blob);- const a = document.createElement("a");- document.body.appendChild(a);- a.href = blobUrl;- a.download = file.name;- a.click();- window.URL.revokeObjectURL(blobUrl);- document.body.removeChild(a);+ await downloadUrl(url, file.name);} catch (error) {toast.error(t`Error downloading file`);logger.error("Error", { error: error });@@ -278,7 +269,7 @@ const SupplierInteractionLineDocuments = ({<DocumentPreviewbucket="private"pathToFile={getPath(file)}- // @ts-ignore+ // @ts-expect-errortype={type}>{file.name}diff --git a/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteSummary.tsx b/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteSummary.tsxindex 70823d6f5a..bcf1400338 100644--- a/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteSummary.tsx+++ b/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuoteSummary.tsx@@ -22,7 +22,7 @@ import {import { getItemReadableId } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";-import { motion } from "framer-motion";+import { motion } from "motion/react";import { useMemo, useState } from "react";import { LuChevronRight, LuImage } from "react-icons/lu";import { Link, useParams } from "react-router";@@ -111,9 +111,9 @@ const LineItems = ({return (<motion.divkey={line.id}- initial={{ opacity: 0, y: 50 }}+ initial={{ opacity: 0, y: 8 }}animate={{ opacity: 1, y: 0 }}- transition={{ duration: 0.5 }}+ transition={{ duration: 0.2, ease: "easeOut" }}className="py-6 w-full"><HStack spacing={4} className="items-start">diff --git a/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuotesTable.tsx b/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuotesTable.tsxindex 71b256f13a..1059e0eeca 100644--- a/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuotesTable.tsx+++ b/apps/erp/app/modules/purchasing/ui/SupplierQuote/SupplierQuotesTable.tsx@@ -80,7 +80,7 @@ const SupplierQuotesTable = memo(<ItemThumbnailsize="sm"thumbnailPath={row.original.thumbnailPath}- // @ts-ignore+ // @ts-expect-errortype={row.original.itemType}/><Hyperlink to={path.to.supplierQuoteDetails(row.original.id!)}>diff --git a/apps/erp/app/modules/quality/quality.service.ts b/apps/erp/app/modules/quality/quality.service.tsindex 1b9f171133..3dedf22bf5 100644--- a/apps/erp/app/modules/quality/quality.service.ts+++ b/apps/erp/app/modules/quality/quality.service.ts@@ -2425,12 +2425,12 @@ export async function getInspections(}if (args?.status) {- // @ts-ignore - status is a valid enum value+ // @ts-expect-error - status is a valid enum valuequery = query.eq("status", args.status);}if (args?.source) {- // @ts-ignore - source is a valid enum value+ // @ts-expect-error - source is a valid enum valuequery = query.eq("sourceDocument", args.source);}diff --git a/apps/erp/app/modules/quality/ui/Actions/ActionsTable.tsx b/apps/erp/app/modules/quality/ui/Actions/ActionsTable.tsxindex bc8aac8ee5..e056e678aa 100644--- a/apps/erp/app/modules/quality/ui/Actions/ActionsTable.tsx+++ b/apps/erp/app/modules/quality/ui/Actions/ActionsTable.tsx@@ -155,7 +155,7 @@ const ActionsTable = memo(header: t`Due Date`,cell: ({ row }) => {const isOverdue =- // @ts-ignore+ // @ts-expect-error!["Completed", "Skipped"].includes(row.original.status) &&row.original.nonConformanceStatus !== "Closed" &&row.original.dueDate &&diff --git a/apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx b/apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsxindex 336c61e3f2..ca5458e34d 100644--- a/apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx+++ b/apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx@@ -31,11 +31,12 @@ import { useLingui } from "@lingui/react/macro";import { nanoid } from "nanoid";import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { Circle, Group, Layer, Line, Rect, Stage, Text } from "react-konva";-import { Document, Page } from "react-pdf";+import { Document, Page, pdfjs } from "react-pdf";import "react-pdf/dist/Page/AnnotationLayer.css";import "react-pdf/dist/Page/TextLayer.css";import type { Database } from "@carbon/database";import { storage } from "@carbon/files";+import { registerReactPdfWorker } from "@carbon/files/pdf/worker";import {BALLOON_CALLOUT_STROKE,BALLOON_H_NORM,@@ -89,6 +90,10 @@ import {import type { SamplingRule } from "./SamplingRuleModal";import SamplingRuleModal, { EMPTY_SAMPLING_RULE } from "./SamplingRuleModal";+// Registered here, not in the client entry: this module is lazy, so the PDF+// engine stays out of every page that shows no PDF.+registerReactPdfWorker(pdfjs);+type DragState = {startX: number;startY: number;diff --git a/apps/erp/app/modules/quality/ui/Inspections/InspectionDrawingPane.tsx b/apps/erp/app/modules/quality/ui/Inspections/InspectionDrawingPane.tsxindex 797a650d69..2afe09ea9e 100644--- a/apps/erp/app/modules/quality/ui/Inspections/InspectionDrawingPane.tsx+++ b/apps/erp/app/modules/quality/ui/Inspections/InspectionDrawingPane.tsx@@ -12,9 +12,14 @@ import {import { useEffect, useMemo, useRef, useState } from "react";import { LuChevronLeft, LuChevronRight } from "react-icons/lu";import { Circle, Group, Layer, Line, Stage, Text } from "react-konva";-import { Document, Page } from "react-pdf";+import { Document, Page, pdfjs } from "react-pdf";import "react-pdf/dist/Page/AnnotationLayer.css";import "react-pdf/dist/Page/TextLayer.css";+import { registerReactPdfWorker } from "@carbon/files/pdf/worker";++// Registered here, not in the client entry: this module is lazy, so the PDF+// engine stays out of every page that shows no PDF.+registerReactPdfWorker(pdfjs);export type DrawingBalloon = {id: string;diff --git a/apps/erp/app/modules/quality/ui/Issue/IssueAssociations.tsx b/apps/erp/app/modules/quality/ui/Issue/IssueAssociations.tsxindex f6a16bcec3..55b1ae3e2a 100644--- a/apps/erp/app/modules/quality/ui/Issue/IssueAssociations.tsx+++ b/apps/erp/app/modules/quality/ui/Issue/IssueAssociations.tsx@@ -359,7 +359,6 @@ function NewItemAssociation() {<Itemname="id"label={itemType}- // @ts-ignoretype={itemType}onTypeChange={onTypeChange}/>diff --git a/apps/erp/app/modules/quality/ui/Issue/IssueTask.tsx b/apps/erp/app/modules/quality/ui/Issue/IssueTask.tsxindex e3f4166443..140f5959cf 100644--- a/apps/erp/app/modules/quality/ui/Issue/IssueTask.tsx+++ b/apps/erp/app/modules/quality/ui/Issue/IssueTask.tsx@@ -21,7 +21,7 @@ import {} from "@carbon/react";import { parseDate } from "@internationalized/date";import { Trans, useLingui } from "@lingui/react/macro";-import type { DragControls } from "framer-motion";+import type { DragControls } from "motion/react";import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { LuCalendar, LuContainer, LuRedoDot } from "react-icons/lu";import { RxCheck } from "react-icons/rx";diff --git a/apps/erp/app/modules/quality/ui/IssueWorkflows/IssueWorkflowForm.tsx b/apps/erp/app/modules/quality/ui/IssueWorkflows/IssueWorkflowForm.tsxindex 35bc461c78..adaaacda27 100644--- a/apps/erp/app/modules/quality/ui/IssueWorkflows/IssueWorkflowForm.tsx+++ b/apps/erp/app/modules/quality/ui/IssueWorkflows/IssueWorkflowForm.tsx@@ -17,7 +17,7 @@ import {} from "@carbon/react";import { Editor } from "@carbon/react/Editor";import { Trans, useLingui } from "@lingui/react/macro";-import { Reorder, useDragControls } from "framer-motion";+import { Reorder, useDragControls } from "motion/react";import { useEffect, useState } from "react";import { LuGripVertical, LuX } from "react-icons/lu";import type { z } from "zod";diff --git a/apps/erp/app/modules/resources/ui/Contractors/ContractorForm.tsx b/apps/erp/app/modules/resources/ui/Contractors/ContractorForm.tsxindex e6f7ecdf2b..ecc9452a5e 100644--- a/apps/erp/app/modules/resources/ui/Contractors/ContractorForm.tsx+++ b/apps/erp/app/modules/resources/ui/Contractors/ContractorForm.tsx@@ -13,11 +13,12 @@ import {DrawerHeader,DrawerTitle,HStack,+ useCloseRoute,VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";import { useState } from "react";-import { useLocation, useNavigate } from "react-router";+import { useLocation } from "react-router";import type { z } from "zod";import {CustomFormFields,@@ -37,9 +38,9 @@ type ContractorFormProps = {const ContractorForm = ({ initialValues }: ContractorFormProps) => {const { t } = useLingui();const permissions = usePermissions();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const location = useLocation();- const onClose = () => navigate(-1);+ const onClose = () => closeRoute();const [supplier, setSupplier] = useState<string | null>(initialValues?.supplierId ?? nulldiff --git a/apps/erp/app/modules/resources/ui/Maintenance/MaintenanceDispatchNotes.tsx b/apps/erp/app/modules/resources/ui/Maintenance/MaintenanceDispatchNotes.tsxindex b18f2ccf44..c3a22d0f76 100644--- a/apps/erp/app/modules/resources/ui/Maintenance/MaintenanceDispatchNotes.tsx+++ b/apps/erp/app/modules/resources/ui/Maintenance/MaintenanceDispatchNotes.tsx@@ -5,7 +5,7 @@import { useCarbon } from "@carbon/auth";import {convertKbToString,- downloadBlob,+ downloadUrl,isPreviewableDocumentType,storage} from "@carbon/files";@@ -217,8 +217,7 @@ function MaintenanceFilesContent({const filePath = getFilePath(file.name);const url = path.to.file.previewFile(`private/${filePath}`);try {- const response = await fetch(url);- downloadBlob(await response.blob(), file.name);+ await downloadUrl(url, file.name);} catch (error) {toast.error(t`Error downloading file`);logger.error("Error", { error: error });diff --git a/apps/erp/app/modules/resources/ui/Suggestions/SuggestionDetails.tsx b/apps/erp/app/modules/resources/ui/Suggestions/SuggestionDetails.tsxindex d481510e7a..65b1872cf8 100644--- a/apps/erp/app/modules/resources/ui/Suggestions/SuggestionDetails.tsx+++ b/apps/erp/app/modules/resources/ui/Suggestions/SuggestionDetails.tsx@@ -14,13 +14,14 @@ import {Popover,PopoverContent,PopoverTrigger,+ useCloseRoute,useMode,VStack} from "@carbon/react";import data from "@emoji-mart/data";import { Trans, useLingui } from "@lingui/react/macro";import { lazy, Suspense, useCallback, useState } from "react";-import { useFetcher, useNavigate } from "react-router";+import { useFetcher } from "react-router";import z from "zod";import { DateTime } from "~/components";import { Tags } from "~/components/Form";@@ -49,8 +50,8 @@ export default function SuggestionDetails({tags}: SuggestionDetailsProps) {const { t } = useLingui();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const fetcher = useFetcher();const [emojiPickerOpen, setEmojiPickerOpen] = useState(false);const mode = useMode();diff --git a/apps/erp/app/modules/resources/ui/Training/TrainingExplorer.tsx b/apps/erp/app/modules/resources/ui/Training/TrainingExplorer.tsxindex cfa33148e2..be2e81c820 100644--- a/apps/erp/app/modules/resources/ui/Training/TrainingExplorer.tsx+++ b/apps/erp/app/modules/resources/ui/Training/TrainingExplorer.tsx@@ -42,8 +42,8 @@ import {VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import type { DragControls } from "framer-motion";-import { Reorder, useDragControls } from "framer-motion";+import type { DragControls } from "motion/react";+import { Reorder, useDragControls } from "motion/react";import type { ReactNode } from "react";import { useEffect, useMemo, useRef, useState } from "react";import { flushSync } from "react-dom";@@ -209,7 +209,6 @@ export default function TrainingExplorer() {values={sortOrder}onReorder={onReorder}className="w-full"- disabled={isDisabled}>{sortOrder.map((sortId) => (<DraggableStepItem@@ -286,7 +285,6 @@ export default function TrainingExplorer() {</VStack>{questionDisclosure.isOpen && (<TrainingQuestionForm- // @ts-ignoreinitialValues={trainingQuestionInitialValues}isDisabled={isDisabled}onClose={questionDisclosure.onClose}diff --git a/apps/erp/app/modules/sales/sales.service.ts b/apps/erp/app/modules/sales/sales.service.tsindex 884ba195e0..80f782b758 100644--- a/apps/erp/app/modules/sales/sales.service.ts+++ b/apps/erp/app/modules/sales/sales.service.ts@@ -1458,7 +1458,7 @@ function getQuoteMethodTreeArrayToTree(const parentId = item.parentMaterialId;if (!Object.prototype.hasOwnProperty.call(lookup, itemId)) {- // @ts-ignore+ // @ts-expect-errorlookup[itemId] = { id: itemId, children: [] };}@@ -1471,7 +1471,7 @@ function getQuoteMethodTreeArrayToTree(rootItems.push(treeItem);} else {if (!Object.prototype.hasOwnProperty.call(lookup, parentId)) {- // @ts-ignore+ // @ts-expect-errorlookup[parentId] = { id: parentId, children: [] };}@@ -3168,7 +3168,6 @@ export async function getCustomerItemPriceOverrideById(id: string,companyId: string): Promise<PostgrestSingleResponse<CustomerItemPriceOverrideWithRelations>> {- // @ts-ignore - nested select instantiation exceeds tsgo depth limitreturn client.from("customerItemPriceOverride").select(diff --git a/apps/erp/app/modules/sales/ui/Customer/CustomerBankAccountForm.tsx b/apps/erp/app/modules/sales/ui/Customer/CustomerBankAccountForm.tsxindex 343607ea8b..71137a118a 100644--- a/apps/erp/app/modules/sales/ui/Customer/CustomerBankAccountForm.tsx+++ b/apps/erp/app/modules/sales/ui/Customer/CustomerBankAccountForm.tsx@@ -13,13 +13,14 @@ import {ModalDrawerHeader,ModalDrawerProvider,ModalDrawerTitle,+ useCloseRoute,VStack} from "@carbon/react";import type { AccountLabelKey, BankCodeLabelKey } from "@carbon/utils";import { getBankFieldConfig } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { useState } from "react";-import { useFetcher, useNavigate, useParams } from "react-router";+import { useFetcher, useParams } from "react-router";import type { z } from "zod";import {Currency,@@ -50,7 +51,7 @@ const CustomerBankAccountForm = ({const { t } = useLingui();const permissions = usePermissions();const fetcher = useFetcher<{}>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { customerId } = useParams();if (!customerId) throw new Error("customerId not found");@@ -93,7 +94,7 @@ const CustomerBankAccountForm = ({if (type === "modal") {onClose?.();} else {- navigate(-1);+ closeRoute();}}}}diff --git a/apps/erp/app/modules/sales/ui/Customer/CustomerLocations.tsx b/apps/erp/app/modules/sales/ui/Customer/CustomerLocations.tsxindex 2c8806b68a..38ce361e02 100644--- a/apps/erp/app/modules/sales/ui/Customer/CustomerLocations.tsx+++ b/apps/erp/app/modules/sales/ui/Customer/CustomerLocations.tsx@@ -104,7 +104,6 @@ const CustomerLocations = ({ locations }: CustomerLocationsProps) => {{deleteLocationModal.isOpen && location?.id && (<ConfirmDeleteaction={path.to.deleteCustomerLocation(customerId, location.id)}- // @ts-ignorename={location?.address?.city ?? ""}text="Are you sure you want to delete this location?"onCancel={deleteLocationModal.onClose}diff --git a/apps/erp/app/modules/sales/ui/Opportunity/OpportunityDocuments.tsx b/apps/erp/app/modules/sales/ui/Opportunity/OpportunityDocuments.tsxindex fd56821d6b..7e45ca59ff 100644--- a/apps/erp/app/modules/sales/ui/Opportunity/OpportunityDocuments.tsx+++ b/apps/erp/app/modules/sales/ui/Opportunity/OpportunityDocuments.tsx@@ -3,7 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { useCarbon } from "@carbon/auth";-import { convertKbToString, storage } from "@carbon/files";+import { convertKbToString, downloadUrl, storage } from "@carbon/files";import { getLogger } from "@carbon/logger";import {Badge,@@ -267,7 +267,7 @@ const DraggableCell = ({<DocumentPreviewbucket="private"pathToFile={getPath(attachment)}- // @ts-ignore+ // @ts-expect-errortype={getDocumentType(attachment.name)}>{attachment.name}@@ -347,16 +347,7 @@ export const useOpportunityDocuments = ({async (attachment: FileObject) => {const url = path.to.file.previewFile(`private/${getPath(attachment)}`);try {- const response = await fetch(url);- const blob = await response.blob();- const blobUrl = window.URL.createObjectURL(blob);- const a = document.createElement("a");- document.body.appendChild(a);- a.href = blobUrl;- a.download = attachment.name;- a.click();- window.URL.revokeObjectURL(blobUrl);- document.body.removeChild(a);+ await downloadUrl(url, attachment.name);} catch (error) {toast.error(t`Error downloading file`);logger.error("Error", { error: error });diff --git a/apps/erp/app/modules/sales/ui/Opportunity/OpportunityLineDocuments.tsx b/apps/erp/app/modules/sales/ui/Opportunity/OpportunityLineDocuments.tsxindex 5d0673b25d..29a744d87b 100644--- a/apps/erp/app/modules/sales/ui/Opportunity/OpportunityLineDocuments.tsx+++ b/apps/erp/app/modules/sales/ui/Opportunity/OpportunityLineDocuments.tsx@@ -3,7 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { useCarbon } from "@carbon/auth";-import { convertKbToString, storage } from "@carbon/files";+import { convertKbToString, downloadUrl, storage } from "@carbon/files";import { getLogger } from "@carbon/logger";import {Card,@@ -194,16 +194,7 @@ const useOpportunityLineDocuments = ({`private/${getPath(file, bucket as "opportunity-line" | "parts")}`);try {- const response = await fetch(url);- const blob = await response.blob();- const blobUrl = window.URL.createObjectURL(blob);- const a = document.createElement("a");- document.body.appendChild(a);- a.href = blobUrl;- a.download = file.name;- a.click();- window.URL.revokeObjectURL(blobUrl);- document.body.removeChild(a);+ await downloadUrl(url, file.name);} catch (error) {toast.error(t`Error downloading file`);logger.error("Failed to process file operation", { error });@@ -568,7 +559,7 @@ const OpportunityLineDocuments = ({? "parts": "opportunity-line")}- // @ts-ignore+ // @ts-expect-errortype={type}>{file.name}diff --git a/apps/erp/app/modules/sales/ui/Quotes/QuoteBillOfMaterial.tsx b/apps/erp/app/modules/sales/ui/Quotes/QuoteBillOfMaterial.tsxindex c7b90f6cb5..bd82b526dc 100644--- a/apps/erp/app/modules/sales/ui/Quotes/QuoteBillOfMaterial.tsx+++ b/apps/erp/app/modules/sales/ui/Quotes/QuoteBillOfMaterial.tsx@@ -33,7 +33,7 @@ import {} from "@carbon/react";import { getItemReadableId, INPUT_FORMAT } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";-import { motion } from "framer-motion";+import { motion } from "motion/react";import { nanoid } from "nanoid";import type { Dispatch, SetStateAction } from "react";import { useCallback, useEffect, useRef, useState } from "react";@@ -242,7 +242,7 @@ const initialMethodMaterial: Omit<Material, "quoteMakeMethodId" | "order"> & {} = {itemId: "",itemReadableId: "",- // @ts-ignore+ // @ts-expect-erroritemType: "Item" as const,methodType: "Purchase to Order" as const,description: "",@@ -1021,7 +1021,7 @@ function MaterialForm({transition={{type: "spring",bounce: 0,- duration: 0.55+ duration: 0.25}}><motion.divdiff --git a/apps/erp/app/modules/sales/ui/Quotes/QuoteBillOfProcess.tsx b/apps/erp/app/modules/sales/ui/Quotes/QuoteBillOfProcess.tsxindex 3af3568c94..c7739a4237 100644--- a/apps/erp/app/modules/sales/ui/Quotes/QuoteBillOfProcess.tsx+++ b/apps/erp/app/modules/sales/ui/Quotes/QuoteBillOfProcess.tsx@@ -43,8 +43,8 @@ import { Editor } from "@carbon/react/Editor";import { INPUT_FORMAT } from "@carbon/utils";import { getLocalTimeZone, today } from "@internationalized/date";import { Trans, useLingui } from "@lingui/react/macro";-import type { DragControls } from "framer-motion";-import { motion, Reorder, useDragControls } from "framer-motion";+import type { DragControls } from "motion/react";+import { motion, Reorder, useDragControls } from "motion/react";import { nanoid } from "nanoid";import type { Dispatch, ReactNode, SetStateAction } from "react";import { useEffect, useMemo, useRef, useState } from "react";@@ -549,9 +549,8 @@ const QuoteBillOfProcess = ({animate={{ opacity: 1, filter: "blur(0px)" }}transition={{type: "spring",- bounce: 0.2,- duration: 0.75,- delay: 0.15+ bounce: 0,+ duration: 0.3}}><OperationForm@@ -2527,7 +2526,7 @@ function OperationForm({transition={{type: "spring",bounce: 0,- duration: 0.55+ duration: 0.25}}><motion.div layout className="ml-auto mr-1 pt-2">diff --git a/apps/erp/app/modules/sales/ui/Quotes/QuoteSummary.tsx b/apps/erp/app/modules/sales/ui/Quotes/QuoteSummary.tsxindex 80dcdba28c..ddc3f61cdb 100644--- a/apps/erp/app/modules/sales/ui/Quotes/QuoteSummary.tsx+++ b/apps/erp/app/modules/sales/ui/Quotes/QuoteSummary.tsx@@ -24,7 +24,7 @@ import {} from "@carbon/react";import { Trans } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";-import { motion } from "framer-motion";+import { motion } from "motion/react";import type { Dispatch, SetStateAction } from "react";import { useEffect, useMemo, useState } from "react";import { LuChevronRight, LuImage } from "react-icons/lu";@@ -169,9 +169,9 @@ const LineItems = ({return (<motion.divkey={line.id}- initial={{ opacity: 0, y: 50 }}+ initial={{ opacity: 0, y: 8 }}animate={{ opacity: 1, y: 0 }}- transition={{ duration: 0.5 }}+ transition={{ duration: 0.2, ease: "easeOut" }}className="border-b border-input py-6 w-full"><HStack spacing={4} className="items-start">diff --git a/apps/erp/app/modules/sales/ui/Quotes/QuotesTable.tsx b/apps/erp/app/modules/sales/ui/Quotes/QuotesTable.tsxindex 7b36a03e7e..5236cc2bfe 100644--- a/apps/erp/app/modules/sales/ui/Quotes/QuotesTable.tsx+++ b/apps/erp/app/modules/sales/ui/Quotes/QuotesTable.tsx@@ -79,7 +79,7 @@ const QuotesTable = memo(({ data, count }: QuotesTableProps) => {<ItemThumbnailsize="md"thumbnailPath={row.original.thumbnailPath}- // @ts-ignore+ // @ts-expect-errortype={row.original.itemType}/><Hyperlink to={path.to.quoteDetails(row.original.id!)}>diff --git a/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderExplorer.tsx b/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderExplorer.tsxindex 1de015e005..4e41795fb5 100644--- a/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderExplorer.tsx+++ b/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderExplorer.tsx@@ -510,7 +510,7 @@ function RelatedItems({<Await resolve={salesOrderData?.relatedItems}>{(relatedItemsData) => {// Process the related items for this specific line- // @ts-ignore+ // @ts-expect-errorconst relatedItems = getRelatedItems(relatedItemsData, lineId);return (diff --git a/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderLineForm.tsx b/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderLineForm.tsxindex c344f795af..74bd8652e7 100644--- a/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderLineForm.tsx+++ b/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderLineForm.tsx@@ -263,7 +263,7 @@ const SalesOrderLineForm = ({}, [pricingRuleId, carbon]);const onTypeChange = (t: SalesOrderLineType) => {- // @ts-ignore+ // @ts-expect-errorsetLineType(t);// Clear itemData only when the new filter excludes the currently selected// item — otherwise a stale itemId of the old type would post with the newdiff --git a/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderSummary.tsx b/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderSummary.tsxindex dc609a9973..5e95426efe 100644--- a/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderSummary.tsx+++ b/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrderSummary.tsx@@ -35,7 +35,7 @@ import {} from "@internationalized/date";import { Trans, useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";-import { motion } from "framer-motion";+import { motion } from "motion/react";import { useMemo, useState } from "react";import {LuChevronRight,@@ -387,9 +387,9 @@ function LineItems({return (<motion.divkey={line.id}- initial={{ opacity: 0, y: 50 }}+ initial={{ opacity: 0, y: 8 }}animate={{ opacity: 1, y: 0 }}- transition={{ duration: 0.5 }}+ transition={{ duration: 0.2, ease: "easeOut" }}className="border-b border-input py-6 w-full"><HStack spacing={4} className="items-start">diff --git a/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrdersTable.tsx b/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrdersTable.tsxindex c237afe433..26c052b246 100644--- a/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrdersTable.tsx+++ b/apps/erp/app/modules/sales/ui/SalesOrder/SalesOrdersTable.tsx@@ -127,7 +127,7 @@ const SalesOrdersTable = memo(({ data, count }: SalesOrdersTableProps) => {<ItemThumbnailsize="md"thumbnailPath={row.original.thumbnailPath}- // @ts-ignore+ // @ts-expect-errortype={row.original.itemType}/><Hyperlink to={path.to.salesOrderDetails(row.original.id!)}>diff --git a/apps/erp/app/modules/sales/ui/SalesOrder/useSalesOrderTotals.ts b/apps/erp/app/modules/sales/ui/SalesOrder/useSalesOrderTotals.tsindex 3ebc0637a7..90fb49fa4e 100644--- a/apps/erp/app/modules/sales/ui/SalesOrder/useSalesOrderTotals.ts+++ b/apps/erp/app/modules/sales/ui/SalesOrder/useSalesOrderTotals.ts@@ -2,10 +2,11 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { atom } from "nanostores";-import { useNanoStore } from "~/hooks";+import { create } from "zustand";-const $totals = atom<{ total: number }>({- total: 0-});-export const useSalesOrderTotals = () => useNanoStore($totals);+type Totals = { total: number };++const useTotals = create<Totals>()(() => ({ total: 0 }));+const setTotals = (totals: Totals) => useTotals.setState(totals, true);++export const useSalesOrderTotals = () => [useTotals(), setTotals] as const;diff --git a/apps/erp/app/modules/sales/ui/SalesReturnOrders/SalesReturnOrderSummary.tsx b/apps/erp/app/modules/sales/ui/SalesReturnOrders/SalesReturnOrderSummary.tsxindex 6aafc8ae66..3e94e954dd 100644--- a/apps/erp/app/modules/sales/ui/SalesReturnOrders/SalesReturnOrderSummary.tsx+++ b/apps/erp/app/modules/sales/ui/SalesReturnOrders/SalesReturnOrderSummary.tsx@@ -15,7 +15,7 @@ import {VStack} from "@carbon/react";import { Trans } from "@lingui/react/macro";-import { motion } from "framer-motion";+import { motion } from "motion/react";import { LuImage } from "react-icons/lu";import { Link, useParams } from "react-router";import { CustomerAvatar, DateTime, MotionMoney } from "~/components";@@ -98,9 +98,9 @@ const SalesReturnOrderSummary = () => {return (<motion.divkey={line.id}- initial={{ opacity: 0, y: 50 }}+ initial={{ opacity: 0, y: 8 }}animate={{ opacity: 1, y: 0 }}- transition={{ duration: 0.5 }}+ transition={{ duration: 0.2, ease: "easeOut" }}className="border-b border-input py-6 w-full"><HStack spacing={4} className="items-start">diff --git a/apps/erp/app/modules/settings/onshape-oauth.server.ts b/apps/erp/app/modules/settings/onshape-oauth.server.tsindex 6b8b033840..5c39f95c0a 100644--- a/apps/erp/app/modules/settings/onshape-oauth.server.ts+++ b/apps/erp/app/modules/settings/onshape-oauth.server.ts@@ -17,7 +17,7 @@ import {} from "@carbon/ee/onshape";import { loadOnshapeOAuthConfig } from "@carbon/ee/onshape.server";import { getLogger } from "@carbon/logger";-import { redirect } from "react-router";+import { redirectExternal } from "@carbon/utils";import { oAuthCallbackSchema } from "~/modules/shared";import { path } from "~/utils/path";import type { IntegrationErrorCode } from "./integration-errors";@@ -77,7 +77,7 @@ export async function completeOnshapeAuthorization({const connectionFailed = (reason: IntegrationErrorCode<OnshapeIntegrationId>) =>- redirect(+ redirectExternal(`${integrationsUrl(request)}${integrationErrorSearch<OnshapeIntegrationId>(integrationId, reason)}`,{ headers: { "Set-Cookie": consumedState.cookie } });@@ -214,7 +214,7 @@ export async function completeOnshapeAuthorization({}}- return redirect(integrationsUrl(request), {+ return redirectExternal(integrationsUrl(request), {headers: { "Set-Cookie": consumedState.cookie }});} catch (error) {diff --git a/apps/erp/app/modules/settings/settings.service.ts b/apps/erp/app/modules/settings/settings.service.tsindex 6e8740721c..2a6f34a955 100644--- a/apps/erp/app/modules/settings/settings.service.ts+++ b/apps/erp/app/modules/settings/settings.service.ts@@ -131,7 +131,7 @@ type CompaniesRow = Database["public"]["Views"]["companies"]["Row"];const logoUrl = (path: string | null) =>path ? `${PUBLIC_STORAGE_URL_PREFIX}${path}` : null;-function withLogoUrls(company: CompaniesRow) {+export function withLogoUrls(company: CompaniesRow) {return {...company,logoLight: logoUrl(company.logoLight),diff --git a/apps/erp/app/modules/settings/ui/CustomFields/CustomFieldsTableDetail.tsx b/apps/erp/app/modules/settings/ui/CustomFields/CustomFieldsTableDetail.tsxindex 80baa5c16c..a074b1fff4 100644--- a/apps/erp/app/modules/settings/ui/CustomFields/CustomFieldsTableDetail.tsx+++ b/apps/erp/app/modules/settings/ui/CustomFields/CustomFieldsTableDetail.tsx@@ -21,7 +21,7 @@ import {useDisclosure} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { Reorder } from "framer-motion";+import { Reorder } from "motion/react";import { useCallback, useEffect, useMemo, useState } from "react";import { AiOutlineNumber } from "react-icons/ai";import { BiText } from "react-icons/bi";@@ -75,7 +75,7 @@ const CustomFieldCategoryDetail = ({Array.isArray(customFieldTable.fields)? customFieldTable.fields.reduce<Record<string, CustomFieldAndDataType>- // @ts-ignore+ // @ts-expect-error>((acc, field) => {if (!field) return acc;const customField = field as CustomFieldAndDataType;diff --git a/apps/erp/app/modules/settings/ui/Integrations/IntegrationForm.tsx b/apps/erp/app/modules/settings/ui/Integrations/IntegrationForm.tsxindex fda39502e6..5d2ea366eb 100644--- a/apps/erp/app/modules/settings/ui/Integrations/IntegrationForm.tsx+++ b/apps/erp/app/modules/settings/ui/Integrations/IntegrationForm.tsx@@ -36,6 +36,7 @@ import {DrawerContent,DrawerFooter,DrawerHeader,+ DrawerTitle,Heading,HStack,ScrollArea,@@ -885,9 +886,11 @@ export function IntegrationForm({</div><div className="flex min-w-0 flex-1 flex-col gap-0.5"><div className="flex items-center gap-2">- <Heading size="h3" className="truncate">- {integration.name}- </Heading>+ <DrawerTitle asChild>+ <Heading size="h3" className="truncate">+ {integration.name}+ </Heading>+ </DrawerTitle>{installed && <Badge variant="green">Installed</Badge>}</div><div className="flex items-center gap-1.5 text-xs text-muted-foreground">diff --git a/apps/erp/app/modules/settings/ui/Sequences/SequenceForm.tsx b/apps/erp/app/modules/settings/ui/Sequences/SequenceForm.tsxindex aa69fbcf34..0e011f24bc 100644--- a/apps/erp/app/modules/settings/ui/Sequences/SequenceForm.tsx+++ b/apps/erp/app/modules/settings/ui/Sequences/SequenceForm.tsx@@ -13,11 +13,11 @@ import {DrawerTitle,Heading,HStack,+ useCloseRoute,VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";import { useState } from "react";-import { useNavigate } from "react-router";import type { z } from "zod";import { Hidden, Input, Number, Submit } from "~/components/Form";import { useCompanyTimeZone, usePermissions } from "~/hooks";@@ -34,8 +34,8 @@ type SequenceFormProps = {const SequenceForm = ({ initialValues }: SequenceFormProps) => {const { t } = useLingui();const permissions = usePermissions();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const [prefix, setPrefix] = useState(initialValues.prefix ?? "");const [suffix, setSuffix] = useState(initialValues.suffix ?? "");diff --git a/apps/erp/app/modules/settings/ui/SerialNumbers/ItemSerialSequenceForm.tsx b/apps/erp/app/modules/settings/ui/SerialNumbers/ItemSerialSequenceForm.tsxindex c488999266..1f3baf2418 100644--- a/apps/erp/app/modules/settings/ui/SerialNumbers/ItemSerialSequenceForm.tsx+++ b/apps/erp/app/modules/settings/ui/SerialNumbers/ItemSerialSequenceForm.tsx@@ -13,11 +13,11 @@ import {DrawerTitle,Heading,HStack,+ useCloseRoute,VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";import { useState } from "react";-import { useNavigate } from "react-router";import type { z } from "zod";import { Hidden, Input, Item, Number, Submit } from "~/components/Form";import { useCompanyTimeZone, usePermissions } from "~/hooks";@@ -38,8 +38,8 @@ const ItemSerialSequenceForm = ({}: ItemSerialSequenceFormProps) => {const { t } = useLingui();const permissions = usePermissions();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const isEditing = initialValues.id !== undefined;diff --git a/apps/erp/app/modules/shared/location.server.ts b/apps/erp/app/modules/shared/location.server.tsindex dd59810c73..b1998a2c0a 100644--- a/apps/erp/app/modules/shared/location.server.ts+++ b/apps/erp/app/modules/shared/location.server.ts@@ -5,8 +5,8 @@import { error } from "@carbon/auth";import { flash } from "@carbon/auth/session.server";import type { Database } from "@carbon/database";+import { redirect } from "@carbon/utils";import type { SupabaseClient } from "@supabase/supabase-js";-import { redirect } from "react-router";import { getLocationsList } from "~/modules/resources";import { getUserDefaults } from "~/modules/users/users.server";diff --git a/apps/erp/app/modules/shared/shared.server.ts b/apps/erp/app/modules/shared/shared.server.tsindex c17d56bddf..3d35529797 100644--- a/apps/erp/app/modules/shared/shared.server.ts+++ b/apps/erp/app/modules/shared/shared.server.ts@@ -47,7 +47,7 @@ export async function assign(return (client- // @ts-ignore+ // @ts-expect-error.from(table).update(unchecked({ assignee: assignee ? assignee : null })).eq(unchecked("id"), id)diff --git a/apps/erp/app/modules/users/ui/Customers/CustomerAccountsTable.tsx b/apps/erp/app/modules/users/ui/Customers/CustomerAccountsTable.tsxindex 1004786d54..8cba18efef 100644--- a/apps/erp/app/modules/users/ui/Customers/CustomerAccountsTable.tsx+++ b/apps/erp/app/modules/users/ui/Customers/CustomerAccountsTable.tsx@@ -107,9 +107,8 @@ const CustomerAccountsTable = memo(<HStack><Avatarsize="sm"- // @ts-ignore+ // @ts-expect-errorname={row.original.user?.fullName}- // @ts-ignorepath={row.original.user?.avatarUrl}/>@@ -168,7 +167,7 @@ const CustomerAccountsTable = memo(accessorKey: "customer.customerTypeId",header: t`Customer Type`,cell: ({ row }) => (- // @ts-ignore+ // @ts-expect-error<Enumerable value={row.original.customer?.customerType?.name} />),meta: {diff --git a/apps/erp/app/modules/users/ui/EmployeeTypes/EmployeeTypeForm.ee.tsx b/apps/erp/app/modules/users/ui/EmployeeTypes/EmployeeTypeForm.ee.tsxindex ab52396405..3ba3f4aad4 100644--- a/apps/erp/app/modules/users/ui/EmployeeTypes/EmployeeTypeForm.ee.tsx+++ b/apps/erp/app/modules/users/ui/EmployeeTypes/EmployeeTypeForm.ee.tsx@@ -12,11 +12,11 @@ import {ModalFooter,ModalHeader,ModalTitle,+ useCloseRoute,VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";import { useMemo } from "react";-import { useNavigate } from "react-router";import type { z } from "zod";import { Hidden, Input, Submit } from "~/components/Form";import PermissionMatrix from "~/components/PermissionMatrix";@@ -45,8 +45,8 @@ type EmployeeTypeFormProps = {const EmployeeTypeForm = ({ initialValues }: EmployeeTypeFormProps) => {const { t } = useLingui();const userPermissions = usePermissions();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const { state: initialState, modules } = useMemo(() => fromEmployeeTypePermissions(initialValues.permissions),diff --git a/apps/erp/app/modules/users/ui/Employees/CreateEmployeeModal.tsx b/apps/erp/app/modules/users/ui/Employees/CreateEmployeeModal.tsxindex a4ce4c0869..47db77cf26 100644--- a/apps/erp/app/modules/users/ui/Employees/CreateEmployeeModal.tsx+++ b/apps/erp/app/modules/users/ui/Employees/CreateEmployeeModal.tsx@@ -12,11 +12,12 @@ import {ModalHeader,ModalOverlay,ModalTitle,+ useCloseRoute,useMount,VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { useFetcher, useNavigate } from "react-router";+import { useFetcher } from "react-router";import {Boolean,Hidden,@@ -44,7 +45,7 @@ const CreateEmployeeModal = ({ invitable }: CreateEmployeeModalProps) => {// plan. When gated (Community / Starter), every invite defaults to the seeded// Admin type — "everyone is an admin".const { isGated: permissionsGated } = usePlanGate({ feature: "PERMISSIONS" });- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const formFetcher = useFetcher<Result>();const employeeTypeFetcher =useFetcher<Awaited<ReturnType<typeof getEmployeeTypes>>>();@@ -70,7 +71,7 @@ const CreateEmployeeModal = ({ invitable }: CreateEmployeeModalProps) => {<ModalopenonOpenChange={(open) => {- if (!open) navigate(-1);+ if (!open) closeRoute();}}><ModalOverlay />diff --git a/apps/erp/app/modules/users/ui/Employees/EmployeePermissionsForm.ee.tsx b/apps/erp/app/modules/users/ui/Employees/EmployeePermissionsForm.ee.tsxindex 1789576dc6..f0799b0bab 100644--- a/apps/erp/app/modules/users/ui/Employees/EmployeePermissionsForm.ee.tsx+++ b/apps/erp/app/modules/users/ui/Employees/EmployeePermissionsForm.ee.tsx@@ -13,11 +13,11 @@ import {ModalHeader,ModalOverlay,ModalTitle,+ useCloseRoute,VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";import { useMemo, useState } from "react";-import { useNavigate } from "react-router";import type { z } from "zod";import { Hidden, Select, Submit } from "~/components/Form";import PermissionMatrix from "~/components/PermissionMatrix";@@ -48,9 +48,9 @@ const EmployeePermissionsForm = ({initialValues}: EmployeePermissionsFormProps) => {const { t } = useLingui();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const permissions = usePermissions();- const onClose = () => navigate(-1);+ const onClose = () => closeRoute();const canEditPermissions = permissions.can("update", "users");diff --git a/apps/erp/app/modules/users/ui/Groups/GroupsForm.tsx b/apps/erp/app/modules/users/ui/Groups/GroupsForm.tsxindex 1d803c57d5..317bb94575 100644--- a/apps/erp/app/modules/users/ui/Groups/GroupsForm.tsx+++ b/apps/erp/app/modules/users/ui/Groups/GroupsForm.tsx@@ -12,10 +12,10 @@ import {DrawerHeader,DrawerTitle,HStack,+ useCloseRoute,VStack} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { useNavigate } from "react-router";import type { z } from "zod";import { Hidden, Input, Submit, Users } from "~/components/Form";import { usePermissions } from "~/hooks";@@ -29,8 +29,8 @@ type GroupFormProps = {const GroupForm = ({ initialValues }: GroupFormProps) => {const { t } = useLingui();const permissions = usePermissions();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const isEditing = !!initialValues.id;diff --git a/apps/erp/app/modules/users/ui/Suppliers/SupplierAccountsTable/SuppliersAccountsTable.tsx b/apps/erp/app/modules/users/ui/Suppliers/SupplierAccountsTable/SuppliersAccountsTable.tsxindex 182d8e8e46..a6fe6bb215 100644--- a/apps/erp/app/modules/users/ui/Suppliers/SupplierAccountsTable/SuppliersAccountsTable.tsx+++ b/apps/erp/app/modules/users/ui/Suppliers/SupplierAccountsTable/SuppliersAccountsTable.tsx@@ -164,7 +164,7 @@ const SupplierAccountsTable = memo(accessorKey: "supplier.supplierTypeId",header: t`Supplier Type`,cell: ({ row }) => (- // @ts-ignore+ // @ts-expect-error<Enumerable value={row.original.supplier?.supplierType?.name} />),meta: {diff --git a/apps/erp/app/modules/users/users.server.ts b/apps/erp/app/modules/users/users.server.tsindex dd72ee389d..f595090500 100644--- a/apps/erp/app/modules/users/users.server.ts+++ b/apps/erp/app/modules/users/users.server.ts@@ -29,8 +29,8 @@ import {uncoveredSsoDomainError} from "@carbon/ee/sso.server";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { SupabaseClient } from "@supabase/supabase-js";-import { redirect } from "react-router";import { getSupplierContact } from "~/modules/purchasing";import { getCustomerContact } from "~/modules/sales";import type { EmployeeInsert, InviteInsert, User } from "~/modules/users";diff --git a/apps/erp/app/root.tsx b/apps/erp/app/root.tsxindex a97e547277..7da1fae6f8 100644--- a/apps/erp/app/root.tsx+++ b/apps/erp/app/root.tsx@@ -60,6 +60,7 @@ import Background from "~/styles/background.css?url";import NProgress from "~/styles/nprogress.css?url";import Tailwind from "~/styles/tailwind.css?url";import "@carbon/lib/shims";+import { MotionConfig } from "motion/react";import type { Route } from "./+types/root";import { getTheme } from "./services/theme.server";@@ -242,10 +243,7 @@ export function Document({><head><meta charSet="utf-8" />- <meta- name="viewport"- content="width=device-width, initial-scale=1, maximum-scale=1"- />+ <meta name="viewport" content="width=device-width, initial-scale=1" /><Meta /><Links /></head>@@ -312,10 +310,17 @@ export default function App() {<OperatingSystemContextProvider platform={prefs.platform}><LocaleProvider locale={appLanguage} catalog={catalog}><I18nProvider locale={prefs.locale}>- <TooltipProvider delayDuration={200}>- <Document mode={mode} theme={theme} lang={appLanguage} env={env}>- <Outlet />- </Document>+ <TooltipProvider>+ <MotionConfig reducedMotion="user">+ <Document+ mode={mode}+ theme={theme}+ lang={appLanguage}+ env={env}+ >+ <Outlet />+ </Document>+ </MotionConfig></TooltipProvider></I18nProvider></LocaleProvider>diff --git a/apps/erp/app/routes/_index.tsx b/apps/erp/app/routes/_index.tsxindex f4329513a8..01aed94692 100644--- a/apps/erp/app/routes/_index.tsx+++ b/apps/erp/app/routes/_index.tsx@@ -3,8 +3,8 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { requireAuthSession } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ request }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/_oauth+/authorize.tsx b/apps/erp/app/routes/_oauth+/authorize.tsxindex d95356e3ae..d5f24c5dd0 100644--- a/apps/erp/app/routes/_oauth+/authorize.tsx+++ b/apps/erp/app/routes/_oauth+/authorize.tsx@@ -6,8 +6,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { validator } from "@carbon/form";import { Button, Heading, VStack } from "@carbon/react";+import { redirectExternal } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, Form, redirect, useLoaderData } from "react-router";+import { data, Form, useLoaderData } from "react-router";import { z } from "zod";export async function loader({ request }: LoaderFunctionArgs) {@@ -171,7 +172,7 @@ export async function action({ request }: ActionFunctionArgs) {redirectUrl.searchParams.append("state", state);}- return redirect(redirectUrl.toString());+ return redirectExternal(redirectUrl.toString());}export default function AuthorizeRoute() {diff --git a/apps/erp/app/routes/_public+/callback.tsx b/apps/erp/app/routes/_public+/callback.tsxindex 1bcfd6bf4d..ba77423dd5 100644--- a/apps/erp/app/routes/_public+/callback.tsx+++ b/apps/erp/app/routes/_public+/callback.tsx@@ -7,8 +7,7 @@ import {callbackValidator,carbonClient,error,- getCarbon,- safeRedirect+ getCarbon} from "@carbon/auth";import { refreshAccessToken } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";@@ -47,17 +46,12 @@ import {CarbonPulse,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import { useEffect, useRef, useState } from "react";import { LuTriangleAlert } from "react-icons/lu";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import {- data,- redirect,- useFetcher,- useLocation,- useSearchParams-} from "react-router";+import { data, useFetcher, useLocation, useSearchParams } from "react-router";import { getCompanies, getEmployeeCompanies } from "~/modules/settings";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";@@ -358,7 +352,7 @@ export async function action({ request }: ActionFunctionArgs) {authSession.mfaVerified = true;const ssoSessionCookie = await setAuthSession(request, { authSession });- return redirect(safeRedirect(redirectTo, path.to.authenticatedRoot), {+ return redirect(redirectTo || path.to.authenticatedRoot, {headers: [["Set-Cookie", ssoSessionCookie],["Set-Cookie", setCompanyId(ssoCompanyId)]@@ -477,7 +471,7 @@ export async function action({ request }: ActionFunctionArgs) {headers.push(["Set-Cookie", setCompanyId(authSession.companyId)]);}- return redirect(safeRedirect(redirectTo, path.to.authenticatedRoot), {+ return redirect(redirectTo || path.to.authenticatedRoot, {headers});} else {diff --git a/apps/erp/app/routes/_public+/invite.$code.tsx b/apps/erp/app/routes/_public+/invite.$code.tsxindex 14b5c71cc5..d5b9daf940 100644--- a/apps/erp/app/routes/_public+/invite.$code.tsx+++ b/apps/erp/app/routes/_public+/invite.$code.tsx@@ -24,17 +24,23 @@ import { sendEmail } from "@carbon/lib/email.server";import { getLogger } from "@carbon/logger";import { Button as _Button, Heading as _Heading, VStack } from "@carbon/react";import { updateSubscriptionQuantityForCompany } from "@carbon/stripe/stripe.server";-import { datetime, Edition, getClientIp } from "@carbon/utils";+import {+ datetime,+ Edition,+ getClientIp,+ redirect,+ redirectExternal+} from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { render } from "@react-email/components";-import { AnimatePresence, motion } from "framer-motion";+import { AnimatePresence, motion } from "motion/react";import { nanoid } from "nanoid";import type {ActionFunctionArgs,LoaderFunctionArgs,MetaFunction} from "react-router";-import { Form, Link, redirect, useLoaderData } from "react-router";+import { Form, Link, useLoaderData } from "react-router";import {acceptInvite,isControlledInviteExpired@@ -157,9 +163,13 @@ export async function action({ request, params }: ActionFunctionArgs) {)}`}});- throw redirect(magicLink.data?.properties?.action_link ?? path.to.root, {+ const actionLink = magicLink.data?.properties?.action_link;+ const init = {headers: [["Set-Cookie", setCompanyId(accept.data.companyId)]]- });+ } satisfies ResponseInit;+ throw actionLink+ ? redirectExternal(actionLink, init)+ : redirect(path.to.root, init);}}diff --git a/apps/erp/app/routes/_public+/login.tsx b/apps/erp/app/routes/_public+/login.tsxindex 06aa68411e..e93e91d4e2 100644--- a/apps/erp/app/routes/_public+/login.tsx+++ b/apps/erp/app/routes/_public+/login.tsx@@ -8,6 +8,7 @@ import {CONTROLLED_ENVIRONMENT,carbonClient,error,+ getRedirectTo,isAuthProviderEnabled,magicLinkValidator,RATE_LIMIT@@ -52,7 +53,7 @@ import {useMount,VStack} from "@carbon/react";-import { Edition, getClientIp } from "@carbon/utils";+import { Edition, getClientIp, redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import {browserSupportsWebAuthn,@@ -65,13 +66,7 @@ import type {LoaderFunctionArgs,MetaFunction} from "react-router";-import {- data,- redirect,- useFetcher,- useLoaderData,- useSearchParams-} from "react-router";+import { data, useFetcher, useLoaderData, useSearchParams } from "react-router";import type { Result } from "~/types";import { path } from "~/utils/path";@@ -88,7 +83,7 @@ export async function loader({ request }: LoaderFunctionArgs) {if (authSession) {if (await verifyAuthSession(authSession)) {- throw redirect(path.to.authenticatedRoot);+ throw redirect(getRedirectTo(request));}const cookieHeaders = await clearAuthCookies(request);return data(@@ -138,7 +133,7 @@ export async function action({ request }: ActionFunctionArgs) {return error(validation.error, "Invalid email address");}- const { email, botToken } = validation.data;+ const { email, botToken, redirectTo } = validation.data;// Per-account lockout (NIST 800-171 3.1.8) — layered ON TOP of the IP limit// above. Keyed by the normalized email so an attacker rotating IPs, or@@ -206,7 +201,7 @@ export async function action({ request }: ActionFunctionArgs) {await lockout.reset(email);logAuthEvent("login_success", { actor: email, ip, method: "bypass" });const sessionCookie = await setAuthSession(request, { authSession });- return redirect(path.to.authenticatedRoot, {+ return redirect(redirectTo || path.to.authenticatedRoot, {headers: [["Set-Cookie", sessionCookie]]});}@@ -231,7 +226,7 @@ export async function action({ request }: ActionFunctionArgs) {}if (user.data && user.data.active) {- const magicLink = await sendMagicLink(email);+ const magicLink = await sendMagicLink(email, undefined, redirectTo);if (magicLink.error) {logAuthEvent("login_failed", {diff --git a/apps/erp/app/routes/_public+/logout.tsx b/apps/erp/app/routes/_public+/logout.tsxindex 5cffcb25ef..283c42f817 100644--- a/apps/erp/app/routes/_public+/logout.tsx+++ b/apps/erp/app/routes/_public+/logout.tsx@@ -4,9 +4,8 @@import { assertIsPost } from "@carbon/auth";import { destroyAuthSession } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";-import { path } from "~/utils/path";export async function action({ request }: ActionFunctionArgs) {diff --git a/apps/erp/app/routes/_public+/mfa.tsx b/apps/erp/app/routes/_public+/mfa.tsxindex 0927171a2d..ac457f37ad 100644--- a/apps/erp/app/routes/_public+/mfa.tsx+++ b/apps/erp/app/routes/_public+/mfa.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { assertIsPost, error, RATE_LIMIT, safeRedirect } from "@carbon/auth";+import { assertIsPost, error, RATE_LIMIT } from "@carbon/auth";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { setCompanyId } from "@carbon/auth/company.server";import { userHasVerifiedTotpFactor } from "@carbon/auth/mfa.server";@@ -29,7 +29,7 @@ import {Heading,VStack} from "@carbon/react";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { useEffect, useRef } from "react";import { LuCircleAlert } from "react-icons/lu";@@ -38,13 +38,7 @@ import type {LoaderFunctionArgs,MetaFunction} from "react-router";-import {- data,- Form,- redirect,- useFetcher,- useSearchParams-} from "react-router";+import { data, Form, useFetcher, useSearchParams } from "react-router";import { z } from "zod";import { getEmployeeCompanies } from "~/modules/settings";@@ -138,7 +132,7 @@ export async function action({ request }: ActionFunctionArgs) {}return redirect(- safeRedirect(result.redirectTo ?? redirectTo, path.to.authenticatedRoot),+ (result.redirectTo ?? redirectTo) || path.to.authenticatedRoot,{ headers });}diff --git a/apps/erp/app/routes/_public+/refresh-session.tsx b/apps/erp/app/routes/_public+/refresh-session.tsxindex 068d5e9ad9..ef6c7af077 100644--- a/apps/erp/app/routes/_public+/refresh-session.tsx+++ b/apps/erp/app/routes/_public+/refresh-session.tsx@@ -8,9 +8,9 @@ import {refreshAuthSession,setAuthSession} from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";-+import { data, useNavigate } from "react-router";import { path } from "~/utils/path";export async function loader() {diff --git a/apps/erp/app/routes/_public+/unlock.tsx b/apps/erp/app/routes/_public+/unlock.tsxindex 742d224405..38b4c90c27 100644--- a/apps/erp/app/routes/_public+/unlock.tsx+++ b/apps/erp/app/routes/_public+/unlock.tsx@@ -6,8 +6,7 @@ import {assertIsPost,error,isAuthProviderEnabled,- RATE_LIMIT,- safeRedirect+ RATE_LIMIT} from "@carbon/auth";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { userHasVerifiedTotpFactor } from "@carbon/auth/mfa.server";@@ -39,7 +38,7 @@ import {toast,VStack} from "@carbon/react";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import type { WebAuthnCredential } from "@simplewebauthn/browser";import {@@ -56,7 +55,6 @@ import type {import {data,Form,- redirect,useFetcher,useLoaderData,useSearchParams@@ -110,7 +108,7 @@ export async function loader({ request }: LoaderFunctionArgs) {}// Not actually locked → nothing to unlock, send them where they were going.if (!isSessionIdleLocked(authSession)) {- throw redirect(safeRedirect(redirectTo, path.to.authenticatedRoot));+ throw redirect(redirectTo || path.to.authenticatedRoot);}// Unlock credentials: a verified TOTP factor and/or a registered passkey.@@ -258,7 +256,7 @@ async function unlockWithPasskey(request: Request) {);}- return redirect(safeRedirect(redirectTo, path.to.authenticatedRoot), {+ return redirect(redirectTo || path.to.authenticatedRoot, {headers: [["Set-Cookie", sessionCookie]]});} catch {@@ -339,7 +337,7 @@ export async function action({ request }: ActionFunctionArgs) {}return redirect(- safeRedirect(result.redirectTo ?? redirectTo, path.to.authenticatedRoot),+ (result.redirectTo ?? redirectTo) || path.to.authenticatedRoot,{ headers: [["Set-Cookie", result.sessionCookie]] });}diff --git a/apps/erp/app/routes/_public+/verify.tsx b/apps/erp/app/routes/_public+/verify.tsxindex 2704b953fb..65e88d2718 100644--- a/apps/erp/app/routes/_public+/verify.tsx+++ b/apps/erp/app/routes/_public+/verify.tsx@@ -30,7 +30,7 @@ import {Heading,VStack} from "@carbon/react";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { LuCircleAlert } from "react-icons/lu";import type {@@ -38,13 +38,7 @@ import type {LoaderFunctionArgs,MetaFunction} from "react-router";-import {- data,- Link,- redirect,- useFetcher,- useSearchParams-} from "react-router";+import { data, Link, useFetcher, useSearchParams } from "react-router";import { z } from "zod";import type { Result } from "~/types";diff --git a/apps/erp/app/routes/api+/integrations.$id.connect.ts b/apps/erp/app/routes/api+/integrations.$id.connect.tsindex 29bf6034a9..616ecf3d5e 100644--- a/apps/erp/app/routes/api+/integrations.$id.connect.ts+++ b/apps/erp/app/routes/api+/integrations.$id.connect.ts@@ -6,8 +6,8 @@ import { getAppUrl } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { issueOAuthState } from "@carbon/auth/oauth-state.server";import { getIntegrationIdsByRole, integrations } from "@carbon/ee";+import { redirectExternal } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { buildIntegrationOAuthUrl } from "~/modules/settings/integration-oauth";import { path } from "~/utils/path";@@ -37,12 +37,14 @@ export async function loader({ request, params }: LoaderFunctionArgs) {const integration = integrations.find((i) => i.id === integrationId);if (!integration || !integrationId) {- return redirect(`${getAppUrl()}${path.to.integrations}?error=not-found`);+ return redirectExternal(+ `${getAppUrl()}${path.to.integrations}?error=not-found`+ );}const oauth = "oauth" in integration ? integration.oauth : undefined;if (!oauth) {- return redirect(+ return redirectExternal(`${getAppUrl()}${path.to.integrations}?error=not-oauth&integration=${integrationId}`);}@@ -65,7 +67,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {(row) => row.id && roleIds.has(row.id) && row.id !== integrationId);if (incumbent?.id) {- return redirect(+ return redirectExternal(`${getAppUrl()}${path.to.integrations}?error=role-conflict&integration=${integrationId}&conflictsWith=${incumbent.id}`);}@@ -88,7 +90,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {if (declaredModes.length > 0) {const chosen = declaredModes.find((m) => m.id === requestedMode);if (!chosen) {- return redirect(+ return redirectExternal(`${getAppUrl()}${path.to.integrations}?error=invalid-mode&integration=${integrationId}`);}@@ -116,10 +118,10 @@ export async function loader({ request, params }: LoaderFunctionArgs) {);if (!authorizeUrl) {- return redirect(+ return redirectExternal(`${getAppUrl()}${path.to.integrations}?error=connect-failed&integration=${integrationId}`);}- return redirect(authorizeUrl, { headers: { "Set-Cookie": cookie } });+ return redirectExternal(authorizeUrl, { headers: { "Set-Cookie": cookie } });}diff --git a/apps/erp/app/routes/api+/integrations.jira.oauth.ts b/apps/erp/app/routes/api+/integrations.jira.oauth.tsindex 613489b580..f1c11c5ece 100644--- a/apps/erp/app/routes/api+/integrations.jira.oauth.ts+++ b/apps/erp/app/routes/api+/integrations.jira.oauth.ts@@ -11,8 +11,9 @@ import {getAccessibleResources} from "@carbon/ee/jira.server";import { getLogger } from "@carbon/logger";+import { redirectExternal } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { upsertCompanyIntegration } from "~/modules/settings/settings.server";import { oAuthCallbackSchema } from "~/modules/shared";import { path } from "~/utils/path";@@ -116,7 +117,7 @@ export async function loader({ request }: LoaderFunctionArgs) {if (createdJiraIntegration?.data?.metadata) {// Redirect on the canonical public origin — `request.url`'s origin is the// internal proxy address in dev, which would drop the session cookies.- return redirect(`${getAppUrl()}${path.to.integrations}`, {+ return redirectExternal(`${getAppUrl()}${path.to.integrations}`, {headers: { "Set-Cookie": consumedState.cookie }});} else {diff --git a/apps/erp/app/routes/api+/integrations.quickbooks.oauth.ts b/apps/erp/app/routes/api+/integrations.quickbooks.oauth.tsindex 6931b7d522..913a04b1bc 100644--- a/apps/erp/app/routes/api+/integrations.quickbooks.oauth.ts+++ b/apps/erp/app/routes/api+/integrations.quickbooks.oauth.ts@@ -18,8 +18,9 @@ import {} from "@carbon/ee/accounting";import { quickbooksOnInstall } from "@carbon/ee/quickbooks/hooks.server";import { getLogger } from "@carbon/logger";+import { redirectExternal } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { upsertCompanyIntegration } from "~/modules/settings/settings.server";import { getIntegration } from "~/modules/settings/settings.service";import { oAuthCallbackSchema } from "~/modules/shared";@@ -116,7 +117,7 @@ export async function loader({ request }: LoaderFunctionArgs) {{id: QuickBooks.id,active: true,- // @ts-ignore+ // @ts-expect-errormetadata: {syncConfig: DEFAULT_SYNC_CONFIG,settings: { syncEnabled },@@ -139,7 +140,7 @@ export async function loader({ request }: LoaderFunctionArgs) {if (createdQuickBooksIntegration?.data?.metadata) {// Canonical public origin — `request.url`'s origin is the internal proxy// address in dev, which would drop the session cookies on redirect.- return redirect(`${getAppUrl()}${path.to.integrations}`, {+ return redirectExternal(`${getAppUrl()}${path.to.integrations}`, {headers: { "Set-Cookie": consumedState.cookie }});} else {diff --git a/apps/erp/app/routes/api+/integrations.ramp.oauth.ts b/apps/erp/app/routes/api+/integrations.ramp.oauth.tsindex 217caf9e0f..161841abf8 100644--- a/apps/erp/app/routes/api+/integrations.ramp.oauth.ts+++ b/apps/erp/app/routes/api+/integrations.ramp.oauth.ts@@ -16,8 +16,8 @@ import {resolveConnectedProviderName} from "@carbon/ee/ramp.server";import { getLogger } from "@carbon/logger";+import { redirectExternal } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import type { IntegrationErrorCode } from "~/modules/settings/integration-errors";import { integrationErrorSearch } from "~/modules/settings/integration-errors";import { oAuthCallbackSchema } from "~/modules/shared";@@ -34,7 +34,7 @@ function connectionFailed(reason: IntegrationErrorCode<"ramp">,stateCookie: string) {- return redirect(+ return redirectExternal(`${getAppUrl()}${path.to.integrations}${integrationErrorSearch("ramp",reason@@ -44,7 +44,7 @@ function connectionFailed(}function connectionSucceeded(stateCookie: string) {- return redirect(`${getAppUrl()}${path.to.integrations}`, {+ return redirectExternal(`${getAppUrl()}${path.to.integrations}`, {headers: { "Set-Cookie": stateCookie }});}diff --git a/apps/erp/app/routes/api+/integrations.slack.oauth.ts b/apps/erp/app/routes/api+/integrations.slack.oauth.tsindex acb18b18b2..5d2774c1b9 100644--- a/apps/erp/app/routes/api+/integrations.slack.oauth.ts+++ b/apps/erp/app/routes/api+/integrations.slack.oauth.ts@@ -15,8 +15,9 @@ import {getSlackInstaller,slackOAuthTokenResponseSchema} from "@carbon/ee/slack.server";+import { redirectExternal } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { z } from "zod";import { upsertCompanyIntegration } from "~/modules/settings/settings.server";import { oAuthCallbackSchema } from "~/modules/shared";@@ -175,7 +176,7 @@ export async function loader({ request }: LoaderFunctionArgs) {const redirectUrl = `${requestUrl.origin}${path.to.integrations}`;- return redirect(redirectUrl);+ return redirectExternal(redirectUrl);} else {return data({ error: "Failed to save Slack integration" },diff --git a/apps/erp/app/routes/api+/integrations.stripe-connect.callback.ts b/apps/erp/app/routes/api+/integrations.stripe-connect.callback.tsindex 541fc4df6d..16519e924f 100644--- a/apps/erp/app/routes/api+/integrations.stripe-connect.callback.ts+++ b/apps/erp/app/routes/api+/integrations.stripe-connect.callback.ts@@ -6,8 +6,8 @@ import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getConnectAccountStatus } from "@carbon/stripe/connect.server";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { upsertCompanyIntegration } from "~/modules/settings/settings.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/api+/integrations.stripe-connect.connect.ts b/apps/erp/app/routes/api+/integrations.stripe-connect.connect.tsindex 29608b6f3c..3fe398e0a0 100644--- a/apps/erp/app/routes/api+/integrations.stripe-connect.connect.ts+++ b/apps/erp/app/routes/api+/integrations.stripe-connect.connect.ts@@ -11,9 +11,8 @@ import {getOrCreateConnectAccount,isStaleConnectAccountError} from "@carbon/stripe/connect.server";-import { getRequestOrigin } from "@carbon/utils";+import { getRequestOrigin, redirect, redirectExternal } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";const logger = getLogger("stripe-connect");@@ -101,7 +100,7 @@ async function handle({ request }: { request: Request }) {return Response.json({ redirectUrl: onboardingUrl });}- return redirect(onboardingUrl);+ return redirectExternal(onboardingUrl);} catch (err: any) {logger.error("Failed to initiate Stripe Connect onboarding", {error: errdiff --git a/apps/erp/app/routes/api+/integrations.stripe-connect.dashboard.ts b/apps/erp/app/routes/api+/integrations.stripe-connect.dashboard.tsindex 05277e4628..79848641b1 100644--- a/apps/erp/app/routes/api+/integrations.stripe-connect.dashboard.ts+++ b/apps/erp/app/routes/api+/integrations.stripe-connect.dashboard.ts@@ -8,8 +8,8 @@ import { rejectCrossSiteNavigation } from "@carbon/auth/middleware/security.servimport { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { createExpressDashboardLoginLink } from "@carbon/stripe/connect.server";+import { redirect, redirectExternal } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";const logger = getLogger("stripe-connect");@@ -57,7 +57,7 @@ async function handle({ request }: { request: Request }) {return Response.json({ redirectUrl: loginLinkUrl });}- return redirect(loginLinkUrl);+ return redirectExternal(loginLinkUrl);} catch (err: any) {logger.error("Failed to open Stripe Express Dashboard", { error: err });diff --git a/apps/erp/app/routes/api+/integrations.xero.oauth.ts b/apps/erp/app/routes/api+/integrations.xero.oauth.tsindex 190904de13..51743616aa 100644--- a/apps/erp/app/routes/api+/integrations.xero.oauth.ts+++ b/apps/erp/app/routes/api+/integrations.xero.oauth.ts@@ -14,8 +14,9 @@ import {} from "@carbon/ee/accounting";import { xeroOnInstall } from "@carbon/ee/xero/hooks.server";import { getLogger } from "@carbon/logger";+import { redirectExternal } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { upsertCompanyIntegration } from "~/modules/settings/settings.server";import { getIntegration } from "~/modules/settings/settings.service";import { oAuthCallbackSchema } from "~/modules/shared";@@ -203,7 +204,7 @@ export async function loader({ request }: LoaderFunctionArgs) {const createdXeroIntegration = await upsertCompanyIntegration(client, {id: Xero.id,active: true,- // @ts-ignore+ // @ts-expect-errormetadata: {syncConfig: DEFAULT_SYNC_CONFIG,settings: { syncEnabled },@@ -226,7 +227,7 @@ export async function loader({ request }: LoaderFunctionArgs) {if (createdXeroIntegration?.data?.metadata) {// Canonical public origin — `request.url`'s origin is the internal proxy// address in dev, which would drop the session cookies on redirect.- return redirect(`${getAppUrl()}${path.to.integrations}`, {+ return redirectExternal(`${getAppUrl()}${path.to.integrations}`, {headers: { "Set-Cookie": consumedState.cookie }});} else {diff --git a/apps/erp/app/routes/api+/kanban.collision.$id.tsx b/apps/erp/app/routes/api+/kanban.collision.$id.tsxindex a309121ec7..ee2309e464 100644--- a/apps/erp/app/routes/api+/kanban.collision.$id.tsx+++ b/apps/erp/app/routes/api+/kanban.collision.$id.tsx@@ -6,10 +6,10 @@ import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { Button, Heading } from "@carbon/react";+import { redirect } from "@carbon/utils";import { LuTriangleAlert } from "react-icons/lu";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, Link, redirect, useFetcher, useLoaderData } from "react-router";-+import { data, Link, useFetcher, useLoaderData } from "react-router";import { getKanban } from "~/modules/inventory";import {getJob,diff --git a/apps/erp/app/routes/api+/kanban.complete.$id.tsx b/apps/erp/app/routes/api+/kanban.complete.$id.tsxindex cfe4d8ecd1..c19fb377f1 100644--- a/apps/erp/app/routes/api+/kanban.complete.$id.tsx+++ b/apps/erp/app/routes/api+/kanban.complete.$id.tsx@@ -5,9 +5,10 @@import { notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import type { Database } from "@carbon/database";+import { redirect, redirectExternal } from "@carbon/utils";import type { SupabaseClient } from "@supabase/supabase-js";import type { LoaderFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { getKanban } from "~/modules/inventory";import { getActiveJobOperationByJobId } from "~/modules/production";import { path } from "~/utils/path";@@ -69,5 +70,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {return data({ error: result.error }, { status: 400 });}- throw redirect(result.data);+ throw result.data.startsWith("/")+ ? redirect(result.data)+ : redirectExternal(result.data);}diff --git a/apps/erp/app/routes/api+/kanban.link.$id.tsx b/apps/erp/app/routes/api+/kanban.link.$id.tsxindex 69bf468311..0affde7b83 100644--- a/apps/erp/app/routes/api+/kanban.link.$id.tsx+++ b/apps/erp/app/routes/api+/kanban.link.$id.tsx@@ -4,8 +4,8 @@import { notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";+import { redirect, redirectExternal } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getKanban } from "~/modules/inventory";import { getActiveJobOperationByJobId } from "~/modules/production";import { path } from "~/utils/path";@@ -37,5 +37,5 @@ export async function loader({ request, params }: LoaderFunctionArgs) {throw redirect(path.to.job(kanban.data.jobId!));}- throw redirect(path.to.external.mesJobOperation(operation.id));+ throw redirectExternal(path.to.external.mesJobOperation(operation.id));}diff --git a/apps/erp/app/routes/api+/link.ts b/apps/erp/app/routes/api+/link.tsindex 0831945fdc..5088e1dc89 100644--- a/apps/erp/app/routes/api+/link.ts+++ b/apps/erp/app/routes/api+/link.ts@@ -7,8 +7,8 @@ import { getCompanyId, setCompanyId } from "@carbon/auth/company.server";import { updateCompanySession } from "@carbon/auth/session.server";import type { Database } from "@carbon/database";import { NotificationEvent } from "@carbon/notifications";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getCompanies } from "~/modules/settings";import { getRecordPath } from "~/utils/entity";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/api+/model.download.$modelUploadId.ts b/apps/erp/app/routes/api+/model.download.$modelUploadId.tsindex a064d9f1eb..f534b5b936 100644--- a/apps/erp/app/routes/api+/model.download.$modelUploadId.ts+++ b/apps/erp/app/routes/api+/model.download.$modelUploadId.ts@@ -6,8 +6,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { getCompanyPrivateBucket, TEMP_STAGING_BUCKET } from "@carbon/files";import { isModelRawDownloadable } from "@carbon/files/cad";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";// Resolves the DOWNLOADABLE bytes for a model — always the customer's originaldiff --git a/apps/erp/app/routes/api+/passkey.authenticate.verify.ts b/apps/erp/app/routes/api+/passkey.authenticate.verify.tsindex 54412bdbe1..aad8d27d44 100644--- a/apps/erp/app/routes/api+/passkey.authenticate.verify.ts+++ b/apps/erp/app/routes/api+/passkey.authenticate.verify.ts@@ -14,9 +14,10 @@ import {} from "@carbon/auth/session.server";import { isSsoRequiredForEmail } from "@carbon/ee/sso.server";import { AccountLockout, redis } from "@carbon/kv";+import { redirect } from "@carbon/utils";import type { WebAuthnCredential } from "@simplewebauthn/browser";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { getEmployeeCompanies } from "~/modules/settings";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/api+/stock-transfer.$id.$lineId.pick.tsx b/apps/erp/app/routes/api+/stock-transfer.$id.$lineId.pick.tsxindex 69139100a9..352a905f89 100644--- a/apps/erp/app/routes/api+/stock-transfer.$id.$lineId.pick.tsx+++ b/apps/erp/app/routes/api+/stock-transfer.$id.$lineId.pick.tsx@@ -6,8 +6,8 @@ import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { rejectCrossSiteNavigation } from "@carbon/auth/middleware/security.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ request, params }: ActionFunctionArgs) {diff --git a/apps/erp/app/routes/api+/stock-transfer.$id.$lineId.unpick.tsx b/apps/erp/app/routes/api+/stock-transfer.$id.$lineId.unpick.tsxindex db396a9c23..79ad7e395a 100644--- a/apps/erp/app/routes/api+/stock-transfer.$id.$lineId.unpick.tsx+++ b/apps/erp/app/routes/api+/stock-transfer.$id.$lineId.unpick.tsx@@ -6,8 +6,8 @@ import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { rejectCrossSiteNavigation } from "@carbon/auth/middleware/security.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ request, params }: ActionFunctionArgs) {diff --git a/apps/erp/app/routes/api+/webhook.stripe.ts b/apps/erp/app/routes/api+/webhook.stripe.tsindex 7a7f8c85cd..ba3044f080 100644--- a/apps/erp/app/routes/api+/webhook.stripe.ts+++ b/apps/erp/app/routes/api+/webhook.stripe.ts@@ -9,8 +9,9 @@ import {processStripeEvent,syncStripeDataToKV} from "@carbon/stripe/stripe.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { path } from "~/utils/path";const logger = getLogger("erp", "webhook-stripe");diff --git a/apps/erp/app/routes/download.$token.tsx b/apps/erp/app/routes/download.$token.tsxindex cfd0af3266..14ced3c2c0 100644--- a/apps/erp/app/routes/download.$token.tsx+++ b/apps/erp/app/routes/download.$token.tsx@@ -8,8 +8,8 @@ import {} from "@carbon/auth/client.server";import { verifyDownloadToken } from "@carbon/auth/download-token.server";import { storage } from "@carbon/files";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";// Pure resource route (loader only, no default export): it always returns adiff --git a/apps/erp/app/routes/file+/entity+/$id.labels[.]pdf.tsx b/apps/erp/app/routes/file+/entity+/$id.labels[.]pdf.tsxindex f5242c4865..9c33d0ea81 100644--- a/apps/erp/app/routes/file+/entity+/$id.labels[.]pdf.tsx+++ b/apps/erp/app/routes/file+/entity+/$id.labels[.]pdf.tsx@@ -5,10 +5,9 @@import { requirePermissions } from "@carbon/auth/auth.server";import { ProductLabelPDF } from "@carbon/documents/pdf";import { getLogger } from "@carbon/logger";-import { labelSizes } from "@carbon/utils";+import { labelSizes, redirect } from "@carbon/utils";import { renderToStream } from "@react-pdf/renderer";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getCompany, getDocumentTemplateConfig } from "~/modules/settings";import {getCompanyLogoForLabel,diff --git a/apps/erp/app/routes/file+/entity+/$id.labels[.]zpl.tsx b/apps/erp/app/routes/file+/entity+/$id.labels[.]zpl.tsxindex b32fc62456..217537391d 100644--- a/apps/erp/app/routes/file+/entity+/$id.labels[.]zpl.tsx+++ b/apps/erp/app/routes/file+/entity+/$id.labels[.]zpl.tsx@@ -4,9 +4,8 @@import { requirePermissions } from "@carbon/auth/auth.server";import { generateProductLabelZPL } from "@carbon/documents/zpl";-import { labelSizes } from "@carbon/utils";+import { labelSizes, redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDocumentTemplateConfig } from "~/modules/settings";import {getCompanyLogoForLabel,diff --git a/apps/erp/app/routes/file+/kanban+/$id.$action[.]png.tsx b/apps/erp/app/routes/file+/kanban+/$id.$action[.]png.tsxindex 49a2f418e7..c341f6c757 100644--- a/apps/erp/app/routes/file+/kanban+/$id.$action[.]png.tsx+++ b/apps/erp/app/routes/file+/kanban+/$id.$action[.]png.tsx@@ -46,7 +46,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {const buffer = await generateQRCodeBuffer(kanbanUrl, 36, qrColor);- // @ts-ignore+ // @ts-expect-errorreturn new Response(buffer, {headers: {"Content-Type": "image/png",diff --git a/apps/erp/app/routes/file+/operation+/$id.labels[.]zpl.tsx b/apps/erp/app/routes/file+/operation+/$id.labels[.]zpl.tsxindex b3f215962a..aa145b4347 100644--- a/apps/erp/app/routes/file+/operation+/$id.labels[.]zpl.tsx+++ b/apps/erp/app/routes/file+/operation+/$id.labels[.]zpl.tsx@@ -4,9 +4,8 @@import { requirePermissions } from "@carbon/auth/auth.server";import { generateProductLabelZPL } from "@carbon/documents/zpl";-import { labelSizes } from "@carbon/utils";+import { labelSizes, redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getTrackedEntitiesByMakeMethodId } from "~/modules/inventory";import {getCompanySettings,diff --git a/apps/erp/app/routes/file+/receipt+/$id.labels[.]zpl.tsx b/apps/erp/app/routes/file+/receipt+/$id.labels[.]zpl.tsxindex 8264c0b1bd..0e26d2ac41 100644--- a/apps/erp/app/routes/file+/receipt+/$id.labels[.]zpl.tsx+++ b/apps/erp/app/routes/file+/receipt+/$id.labels[.]zpl.tsx@@ -5,9 +5,8 @@import { requirePermissions } from "@carbon/auth/auth.server";import { generateProductLabelZPL } from "@carbon/documents/zpl";import type { TrackedEntityAttributes } from "@carbon/utils";-import { labelSizes } from "@carbon/utils";+import { labelSizes, redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getReceiptTracking } from "~/modules/inventory/inventory.service";import { getDocumentTemplateConfig } from "~/modules/settings";import {diff --git a/apps/erp/app/routes/file+/shipment+/$id.labels[.]zpl.tsx b/apps/erp/app/routes/file+/shipment+/$id.labels[.]zpl.tsxindex fc4f2128ed..205745d60f 100644--- a/apps/erp/app/routes/file+/shipment+/$id.labels[.]zpl.tsx+++ b/apps/erp/app/routes/file+/shipment+/$id.labels[.]zpl.tsx@@ -5,9 +5,8 @@import { requirePermissions } from "@carbon/auth/auth.server";import { generateProductLabelZPL } from "@carbon/documents/zpl";import type { TrackedEntityAttributes } from "@carbon/utils";-import { labelSizes } from "@carbon/utils";+import { labelSizes, redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getShipmentTracking } from "~/modules/inventory/inventory.service";import { getDocumentTemplateConfig } from "~/modules/settings";import {diff --git a/apps/erp/app/routes/file+/stock-transfer+/$id.labels[.]zpl.tsx b/apps/erp/app/routes/file+/stock-transfer+/$id.labels[.]zpl.tsxindex 561ab6e9a2..fbf29ab98c 100644--- a/apps/erp/app/routes/file+/stock-transfer+/$id.labels[.]zpl.tsx+++ b/apps/erp/app/routes/file+/stock-transfer+/$id.labels[.]zpl.tsx@@ -4,9 +4,8 @@import { requirePermissions } from "@carbon/auth/auth.server";import { generateProductLabelZPL } from "@carbon/documents/zpl";-import { labelSizes } from "@carbon/utils";+import { labelSizes, redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDocumentTemplateConfig } from "~/modules/settings";import {getCompanyLogoForLabel,diff --git a/apps/erp/app/routes/onboarding+/_index.tsx b/apps/erp/app/routes/onboarding+/_index.tsxindex 94a446271e..430c4dd3e8 100644--- a/apps/erp/app/routes/onboarding+/_index.tsx+++ b/apps/erp/app/routes/onboarding+/_index.tsx@@ -2,8 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";-import { redirect } from "react-router";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import { onboardingSequence } from "~/utils/path";export async function loader() {diff --git a/apps/erp/app/routes/onboarding+/_layout.tsx b/apps/erp/app/routes/onboarding+/_layout.tsxindex 865b617dac..43a360e57c 100644--- a/apps/erp/app/routes/onboarding+/_layout.tsx+++ b/apps/erp/app/routes/onboarding+/_layout.tsx@@ -6,12 +6,12 @@ import { CarbonEdition } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { TooltipProvider } from "@carbon/react";import { getStripeCustomerByCompanyId } from "@carbon/stripe/stripe.server";-import { Edition } from "@carbon/utils";+import { Edition, redirect } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect } from "react-router";+import { Outlet } from "react-router";import { MeshGradientBackground } from "~/components/MeshGradientBackground";import { getLocationsList } from "~/modules/resources";import { getCompany } from "~/modules/settings";diff --git a/apps/erp/app/routes/onboarding+/company.tsx b/apps/erp/app/routes/onboarding+/company.tsxindex e25b02f18c..6285ba21c7 100644--- a/apps/erp/app/routes/onboarding+/company.tsx+++ b/apps/erp/app/routes/onboarding+/company.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { assertIsPost, safeRedirect } from "@carbon/auth";+import { assertIsPost } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { ValidatedForm, validationError, validator } from "@carbon/form";import {@@ -14,8 +14,9 @@ import {PrefetchLink,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { getLocalTimeZone } from "@internationalized/date";-import { type ActionFunctionArgs, redirect, useLoaderData } from "react-router";+import { type ActionFunctionArgs, useLoaderData } from "react-router";import {OnboardingCard,OnboardingCardContent,@@ -74,7 +75,7 @@ export async function action({ request }: ActionFunctionArgs) {company: companyData});- throw redirect(safeRedirect(next, path.to.onboarding.root), {+ throw redirect(next || path.to.onboarding.root, {headers: [["Set-Cookie", draftCookie]]});}diff --git a/apps/erp/app/routes/onboarding+/industry.tsx b/apps/erp/app/routes/onboarding+/industry.tsxindex 8fd7b01c9c..9297a50883 100644--- a/apps/erp/app/routes/onboarding+/industry.tsx+++ b/apps/erp/app/routes/onboarding+/industry.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { assertIsPost, safeRedirect } from "@carbon/auth";+import { assertIsPost } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { setCompanyId } from "@carbon/auth/company.server";@@ -21,7 +21,7 @@ import {HStack,PrefetchLink} from "@carbon/react";-import { isInternalEmail } from "@carbon/utils";+import { isInternalEmail, redirect } from "@carbon/utils";import { type ReactNode, useState } from "react";import {LuBot,@@ -36,7 +36,6 @@ import {import {type ActionFunctionArgs,Form,- redirect,useLoaderData,useNavigation} from "react-router";@@ -212,7 +211,7 @@ export async function action({ request }: ActionFunctionArgs) {const companyIdCookie = setCompanyId(companyId);const clearDraftCookie = await clearOnboardingDraft(request);- throw redirect(safeRedirect(next, path.to.onboarding.root), {+ throw redirect(next || path.to.onboarding.root, {headers: [["Set-Cookie", sessionCookie],["Set-Cookie", companyIdCookie],diff --git a/apps/erp/app/routes/onboarding+/plan.tsx b/apps/erp/app/routes/onboarding+/plan.tsxindex b0b59f2717..88e0df9517 100644--- a/apps/erp/app/routes/onboarding+/plan.tsx+++ b/apps/erp/app/routes/onboarding+/plan.tsx@@ -18,13 +18,13 @@ import {VStack} from "@carbon/react";import { getCheckoutUrl } from "@carbon/stripe/stripe.server";-import { Edition } from "@carbon/utils";+import { Edition, redirect, redirectExternal } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";import { useMemo } from "react";import { LuMoveLeft, LuPhoneCall } from "react-icons/lu";import type { ActionFunctionArgs } from "react-router";-import { Form, redirect, useFetcher, useLoaderData } from "react-router";+import { Form, useFetcher, useLoaderData } from "react-router";import { getCompany, getPlans } from "~/modules/settings";import { path } from "~/utils/path";@@ -137,7 +137,7 @@ export async function action({ request }: ActionFunctionArgs) {email: user.data?.email});- throw redirect(url);+ throw redirectExternal(url);}export default function OnboardingPlan() {diff --git a/apps/erp/app/routes/onboarding+/theme.tsx b/apps/erp/app/routes/onboarding+/theme.tsxindex 1da87ec69e..9fac5e631d 100644--- a/apps/erp/app/routes/onboarding+/theme.tsx+++ b/apps/erp/app/routes/onboarding+/theme.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { assertIsPost, safeRedirect } from "@carbon/auth";+import { assertIsPost } from "@carbon/auth";import { validationError, validator } from "@carbon/form";import {Button,@@ -19,7 +19,7 @@ import {VStack} from "@carbon/react";import type { Theme } from "@carbon/utils";-import { themes } from "@carbon/utils";+import { redirect, themes } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useEffect, useState } from "react";@@ -27,7 +27,6 @@ import { BiMoon, BiSun } from "react-icons/bi";import { RxCheck } from "react-icons/rx";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";import {- redirect,useFetcher,useLoaderData,useNavigation,@@ -69,7 +68,7 @@ export async function action({ request }: ActionFunctionArgs) {const { next, theme } = validation.data;if (!next) throw new Error("Fatal: next is required");- throw redirect(safeRedirect(next, path.to.onboarding.root), {+ throw redirect(next || path.to.onboarding.root, {headers: { "Set-Cookie": setTheme(theme) }});}diff --git a/apps/erp/app/routes/onboarding+/user.tsx b/apps/erp/app/routes/onboarding+/user.tsxindex bf1360ffa7..984aa99f70 100644--- a/apps/erp/app/routes/onboarding+/user.tsx+++ b/apps/erp/app/routes/onboarding+/user.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { assertIsPost, safeRedirect } from "@carbon/auth";+import { assertIsPost } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { destroyAuthSession } from "@carbon/auth/session.server";@@ -17,9 +17,10 @@ import {PrefetchLink,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import type { z } from "zod";import {OnboardingCard,@@ -83,7 +84,7 @@ export async function action({ request }: ActionFunctionArgs) {throw new Error("Fatal: failed to update account");}- throw redirect(safeRedirect(next, path.to.onboarding.root));+ throw redirect(next || path.to.onboarding.root);}export default function OnboardingUser() {diff --git a/apps/erp/app/routes/select-company+/_index.tsx b/apps/erp/app/routes/select-company+/_index.tsxindex ffcac19712..aefeddee86 100644--- a/apps/erp/app/routes/select-company+/_index.tsx+++ b/apps/erp/app/routes/select-company+/_index.tsx@@ -6,11 +6,12 @@ import { CONTROLLED_ENVIRONMENT, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { Avatar, cn, ScrollArea, useMode } from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { useMemo } from "react";import { LuChevronRight, LuLoaderCircle } from "react-icons/lu";import type { LoaderFunctionArgs } from "react-router";-import { Form, redirect, useLoaderData, useNavigation } from "react-router";+import { Form, useLoaderData, useNavigation } from "react-router";import type { Company } from "~/modules/settings";import { getEmployeeCompanies } from "~/modules/settings";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/select-company+/_layout.tsx b/apps/erp/app/routes/select-company+/_layout.tsxindex 781c67a5d1..db043ecf5b 100644--- a/apps/erp/app/routes/select-company+/_layout.tsx+++ b/apps/erp/app/routes/select-company+/_layout.tsx@@ -5,8 +5,9 @@import { getMESUrl } from "@carbon/auth";import { requireAuthSession } from "@carbon/auth/session.server";import { TooltipProvider } from "@carbon/react";+import { redirectExternal } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect } from "react-router";+import { Outlet } from "react-router";export async function loader({ request }: LoaderFunctionArgs) {const authSession = await requireAuthSession(request, { verify: true });@@ -14,7 +15,7 @@ export async function loader({ request }: LoaderFunctionArgs) {// Console terminals are MES-only — never let them reach the ERP picker.// Mirrors the guard in x+/_layout.tsx.if (authSession.console) {- throw redirect(getMESUrl());+ throw redirectExternal(getMESUrl());}return {};diff --git a/apps/erp/app/routes/share+/purchasing-rfq.$id.tsx b/apps/erp/app/routes/share+/purchasing-rfq.$id.tsxindex 76d0330127..4cefb5ab4a 100644--- a/apps/erp/app/routes/share+/purchasing-rfq.$id.tsx+++ b/apps/erp/app/routes/share+/purchasing-rfq.$id.tsx@@ -24,7 +24,7 @@ import {VStack} from "@carbon/react";import { useLocale } from "@react-aria/i18n";-import { motion } from "framer-motion";+import { motion } from "motion/react";import { useState } from "react";import { LuChevronRight, LuImage } from "react-icons/lu";import type { LoaderFunctionArgs } from "react-router";@@ -179,9 +179,9 @@ const LineItems = ({return (<motion.divkey={line.id}- initial={{ opacity: 0, y: 50 }}+ initial={{ opacity: 0, y: 8 }}animate={{ opacity: 1, y: 0 }}- transition={{ duration: 0.5 }}+ transition={{ duration: 0.2, ease: "easeOut" }}className="border-b border-input py-6 w-full"><HStack spacing={4} className="items-start">diff --git a/apps/erp/app/routes/share+/quote.$id.tsx b/apps/erp/app/routes/share+/quote.$id.tsxindex abcbff295d..b6833b3ab8 100644--- a/apps/erp/app/routes/share+/quote.$id.tsx+++ b/apps/erp/app/routes/share+/quote.$id.tsx@@ -45,7 +45,7 @@ import { formatCityStatePostalCode, moneyFormatOptions } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";import type { PostgrestResponse } from "@supabase/supabase-js";-import { motion } from "framer-motion";+import { motion } from "motion/react";import type { Dispatch, SetStateAction } from "react";import { useEffect, useMemo, useRef, useState } from "react";import { useDropzone } from "react-dropzone";@@ -446,9 +446,9 @@ const LineItems = ({return (<motion.divkey={line.id}- initial={{ opacity: 0, y: 50 }}+ initial={{ opacity: 0, y: 8 }}animate={{ opacity: 1, y: 0 }}- transition={{ duration: 0.5 }}+ transition={{ duration: 0.2, ease: "easeOut" }}className="border-b border-input py-6 w-full"><HStack spacing={4} className="items-start">@@ -1647,8 +1647,8 @@ export const ErrorMessage = ({</svg><motion.divclassName="absolute inset-0 flex items-center justify-center"- initial={{ scale: 0 }}- animate={{ scale: 1 }}+ initial={{ scale: 0.9, opacity: 0 }}+ animate={{ scale: 1, opacity: 1 }}transition={{delay: 0.5,type: "spring",diff --git a/apps/erp/app/routes/share+/supplier-quote.$id.tsx b/apps/erp/app/routes/share+/supplier-quote.$id.tsxindex 362f7228f6..0c91c1f593 100644--- a/apps/erp/app/routes/share+/supplier-quote.$id.tsx+++ b/apps/erp/app/routes/share+/supplier-quote.$id.tsx@@ -42,7 +42,7 @@ import {import { Editor } from "@carbon/react/Editor";import { useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";-import { motion } from "framer-motion";+import { motion } from "motion/react";import type { Dispatch, SetStateAction } from "react";import { useEffect, useRef, useState } from "react";import {@@ -385,9 +385,9 @@ const LineItems = ({return (<motion.divkey={line.id}- initial={{ opacity: 0, y: 50 }}+ initial={{ opacity: 0, y: 8 }}animate={{ opacity: 1, y: 0 }}- transition={{ duration: 0.5 }}+ transition={{ duration: 0.2, ease: "easeOut" }}className="border-b border-input py-6 w-full"><HStack spacing={4} className="items-start">diff --git a/apps/erp/app/routes/x+/_index.tsx b/apps/erp/app/routes/x+/_index.tsxindex f10a85da2b..e0f13f8357 100644--- a/apps/erp/app/routes/x+/_index.tsx+++ b/apps/erp/app/routes/x+/_index.tsx@@ -126,7 +126,7 @@ function ImplementationSummary({ data }: { data: ImplementationHubData }) {const done = gatesDone(spine, map, signals);const total = spine.length;// Auto-hide once everything's done, or once the user dismissed it.- if (done === total || dismissed) return null;+ if ((data.ready && done === total) || dismissed) return null;const next = nextAction(spine, map, signals);return (@@ -134,6 +134,7 @@ function ImplementationSummary({ data }: { data: ImplementationHubData }) {label={i18n._(labelForTier(hub.tier))}done={done}total={total}+ pending={!data.ready}nextLabel={next?.title ? i18n._(next.title) : undefined}onDismiss={dismiss}action={diff --git a/apps/erp/app/routes/x+/_layout.tsx b/apps/erp/app/routes/x+/_layout.tsxindex 6f2bbbbc44..7ac0208d8a 100644--- a/apps/erp/app/routes/x+/_layout.tsx+++ b/apps/erp/app/routes/x+/_layout.tsx@@ -24,13 +24,8 @@ import { isApprovalRequired } from "@carbon/ee/approvals.server";import { isAuditLogEnabled } from "@carbon/ee/audit.server";import { getPlan } from "@carbon/ee/plan.server";import { getLogger } from "@carbon/logger";-import {- detectImplementationSignals,- getImplementationCheckStates,- getImplementationHub-} from "@carbon/onboarding/server";+import { getImplementationCheckStates } from "@carbon/onboarding/server";import type { PrintingSettings } from "@carbon/printing";-import { getPrinterRoutes } from "@carbon/printing";import { PrintingProvider } from "@carbon/printing/ui";import {ItarEntityCertification,@@ -44,6 +39,8 @@ import {import { getStripeCustomerByCompanyId } from "@carbon/stripe/stripe.server";import {Edition,+ redirect,+ redirectExternal,requiresItarEntityCertification,SHELL_MAX_AGE_MS} from "@carbon/utils";@@ -54,14 +51,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- Await,- data,- Outlet,- redirect,- useLoaderData,- useNavigate-} from "react-router";+import { Await, data, Outlet, useLoaderData, useNavigate } from "react-router";import { RealtimeDataProvider } from "~/components";import ChangelogPanel from "~/components/ChangelogPanel";import {@@ -80,23 +70,12 @@ import { useTrainingPanel } from "~/hooks/useTrainingPanel";import { getCachedChangelogPanelEntry } from "~/modules/account/account.server";import { AgentRoot } from "~/modules/agent/ui/AgentRoot";import { getOpenClockEntry } from "~/modules/people";-import {- employeeCompaniesOf,- getCompanies,- getCompanyIntegrations,- getCompanySettings,- getEmployeeCompanies-} from "~/modules/settings";+import { employeeCompaniesOf, getEmployeeCompanies } from "~/modules/settings";import { getCustomFieldsSchemas } from "~/modules/shared/shared.server";-import { getSavedViews } from "~/modules/shared/shared.service";import { getItarCertificationStatus } from "~/modules/users";-import {- getModulePreferences,- getUser,- getUserClaims,- getUserDefaults,- getUserGroups-} from "~/modules/users/users.server";+import { getUserClaims } from "~/modules/users/users.server";+import { getAppShell } from "~/services/app-shell.server";+import { getImplementationSignals } from "~/services/implementation-signals.server";import { ERP_URL, MES_URL, path } from "~/utils/path";const log = getLogger("erp", "auth");@@ -141,7 +120,7 @@ export async function loader({ request }: LoaderFunctionArgs) {// Block ERP access when console mode is active on this terminal.// Console terminals should only access the MES app.if (authSession.console) {- throw redirect(getMESUrl());+ throw redirectExternal(getMESUrl());}// const { computeRegion, proxyRegion } = parseVercelId(@@ -155,14 +134,19 @@ export async function loader({ request }: LoaderFunctionArgs) {const client = getCarbon(accessToken);+ // The user's and the company's rows, in one round trip. Started here so the+ // hub's signal probes can chain off it and overlap the fan-out below.+ const shellPromise = getAppShell(client, companyId, userId);+// Only probe product signals when the company is actually enrolled, so the- // home card + nav badge count gates the same way the hub page does. Chained- // off the hub query rather than awaited after the fan-out below, so the- // probes overlap the rest of it instead of forming a second serial wave.- const implementationHubPromise = getImplementationHub(client, companyId);- const implementationSignalsPromise = implementationHubPromise.then((hub) =>- hub.data ? detectImplementationSignals(client, companyId) : null- );+ // home card + nav badge count gates the same way the hub page does.+ const implementationSignalsPromise = shellPromise.then(({ data }) => {+ const hub = data?.implementationHub;+ // A finished hub shows no badge and no card, so it needs no signals.+ return hub && hub.status !== "complete" && hub.status !== "archived"+ ? getImplementationSignals(client, companyId)+ : null;+ });// ITAR gate status — only queried in controlled environments; elsewhere the// gate never renders, so default to "certified" and skip the round-trip.@@ -171,64 +155,59 @@ export async function loader({ request }: LoaderFunctionArgs) {? getItarCertificationStatus(client, companyId, userId): Promise.resolve({ entityCertified: true, userCertified: true });- // Streamed, not awaited. Each catches: the loader can exit early with- // nothing awaiting them.- const implementation = Promise.all([- implementationHubPromise,+ // The hub row (in the shell read, awaited below) decides whether the primary+ // nav has a Get Started item and the home page a card: streamed, both arrived+ // after first paint and pushed the page down. Progress only fills in the+ // badge count and the card's bar, in place, so it stays streamed. It catches:+ // the loader can exit early with nothing awaiting it.+ const implementationProgress = Promise.all([getImplementationCheckStates(client, companyId),implementationSignalsPromise])- .then(([hub, checkStates, signals]) => ({- implementationHub: hub.data ?? null,- implementationCheckStates: checkStates.data ?? [],- implementationSignals: signals+ .then(([checkStates, signals]) => ({+ checkStates: checkStates.data ?? [],+ signals})).catch((error) => {- log.error("Failed to load implementation hub", { companyId, error });- return {- implementationHub: null,- implementationCheckStates: [],- implementationSignals: null- };+ log.error("Failed to load implementation progress", {+ companyId,+ error+ });+ return { checkStates: [], signals: null };});const auditLogEnabled = isAuditLogEnabled(client, companyId).catch(() => false);+ // Streamed, not awaited; each catches for the same early-exit reason.// Whether this user dismissed it is a user flag, read client-side.const changelog = getCachedChangelogPanelEntry().catch(() => null);// Parallelize all requests- const [- companies,- stripeCustomer,- plan,- customFields,- integrations,- companySettings,- savedViews,- user,- claims,- groups,- defaults,- modulePreferences,- printerRoutes,- itarCertification- ] = await Promise.all([- getCompanies(client, userId),- getStripeCustomerByCompanyId(companyId, userId),- getPlan(client, companyId),- getCustomFieldsSchemas(client, { companyId }),- getCompanyIntegrations(client, companyId),- getCompanySettings(client, companyId),- getSavedViews(client, userId, companyId),- getUser(client, userId),- getUserClaims(userId, companyId),- getUserGroups(client, userId),- getUserDefaults(client, userId, companyId),- getModulePreferences(client, userId, companyId),- getPrinterRoutes(client, companyId),- itarCertificationPromise- ]);+ const [shell, stripeCustomer, plan, customFields, claims, itarCertification] =+ await Promise.all([+ shellPromise,+ getStripeCustomerByCompanyId(companyId, userId),+ getPlan(client, companyId),+ getCustomFieldsSchemas(client, { companyId }),+ getUserClaims(userId, companyId),+ itarCertificationPromise+ ]);++ // The same shapes the nine separate reads returned, so what follows reads as+ // it did. A failed shell read fails each of them, as each could before.+ const read = <T,>(value: T | undefined) => ({+ data: value ?? null,+ error: shell.error+ });+ const companies = read(shell.data?.companies);+ const integrations = read(shell.data?.companyIntegrations);+ const companySettings = read(shell.data?.companySettings ?? undefined);+ const savedViews = read(shell.data?.savedViews);+ const user = read(shell.data?.user ?? undefined);+ const groups = { data: shell.data?.groups ?? [], error: shell.error };+ const defaults = read(shell.data?.defaults ?? undefined);+ const modulePreferences = read(shell.data?.modulePreferences);+ const printerRoutes = read(shell.data?.printerRoutes);// Empty groups is a valid pre-onboarding state (a first-run user with no// company yet has zero memberships → groups is []), NOT an auth failure —@@ -347,7 +326,8 @@ export async function loader({ request }: LoaderFunctionArgs) {modulePreferences: modulePreferences.data ?? [],savedViews: savedViews.data ?? [],printerRoutes: printerRoutes.data ?? [],- implementation,+ implementationHub: shell.data?.implementationHub ?? null,+ implementationProgress,changelog,itarCertification: {...itarCertification,diff --git a/apps/erp/app/routes/x+/account+/_index.tsx b/apps/erp/app/routes/x+/account+/_index.tsxindex cf94a15130..8d3e9b13c0 100644--- a/apps/erp/app/routes/x+/account+/_index.tsx+++ b/apps/erp/app/routes/x+/account+/_index.tsx@@ -2,8 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";-import { redirect } from "react-router";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import { path } from "~/utils/path";export async function loader() {diff --git a/apps/erp/app/routes/x+/account+/_layout.tsx b/apps/erp/app/routes/x+/account+/_layout.tsxindex af1353b2ae..229f9c98b2 100644--- a/apps/erp/app/routes/x+/account+/_layout.tsx+++ b/apps/erp/app/routes/x+/account+/_layout.tsx@@ -11,6 +11,8 @@ import useAccountSubmodules from "~/modules/account/ui/useAccountSubmodules";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | My Account" }];};diff --git a/apps/erp/app/routes/x+/account+/profile.tsx b/apps/erp/app/routes/x+/account+/profile.tsxindex f4867d13b3..e38dd868c0 100644--- a/apps/erp/app/routes/x+/account+/profile.tsx+++ b/apps/erp/app/routes/x+/account+/profile.tsx@@ -7,9 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import {accountProfileValidator,getAccount,diff --git a/apps/erp/app/routes/x+/accounting+/_index.tsx b/apps/erp/app/routes/x+/accounting+/_index.tsxindex cf2b643d6e..6e963b36b6 100644--- a/apps/erp/app/routes/x+/accounting+/_index.tsx+++ b/apps/erp/app/routes/x+/accounting+/_index.tsx@@ -3,9 +3,8 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { requirePermissions } from "@carbon/auth/auth.server";-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getCompanySettings } from "~/modules/settings";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/accounting+/_layout.tsx b/apps/erp/app/routes/x+/accounting+/_layout.tsxindex 62a18f651d..926ef09818 100644--- a/apps/erp/app/routes/x+/accounting+/_layout.tsx+++ b/apps/erp/app/routes/x+/accounting+/_layout.tsx@@ -7,14 +7,14 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getIntegrationIdsByRole } from "@carbon/ee";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,MetaFunction,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect } from "react-router";+import { Outlet } from "react-router";import { GroupedContentSidebar } from "~/components/Layout";import {getAccountsList,@@ -26,6 +26,8 @@ import useAccountingSubmodules from "~/modules/accounting/ui/useAccountingSubmodimport type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Accounting" }];};diff --git a/apps/erp/app/routes/x+/accounting+/asset-class.$assetClassId.delete.tsx b/apps/erp/app/routes/x+/accounting+/asset-class.$assetClassId.delete.tsxindex c08a164132..ef1826a665 100644--- a/apps/erp/app/routes/x+/accounting+/asset-class.$assetClassId.delete.tsx+++ b/apps/erp/app/routes/x+/accounting+/asset-class.$assetClassId.delete.tsx@@ -5,8 +5,9 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import {deleteFixedAssetClass,diff --git a/apps/erp/app/routes/x+/accounting+/asset-class.$assetClassId.tsx b/apps/erp/app/routes/x+/accounting+/asset-class.$assetClassId.tsxindex 05ba67ab82..8bf2d62601 100644--- a/apps/erp/app/routes/x+/accounting+/asset-class.$assetClassId.tsx+++ b/apps/erp/app/routes/x+/accounting+/asset-class.$assetClassId.tsx@@ -6,13 +6,14 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { useCloseRoute } from "@carbon/react";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import {fixedAssetClassValidator,getFixedAssetClass,@@ -93,7 +94,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function AssetClassRoute() {const { assetClass, taxDepreciationEnabled } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: assetClass.id,@@ -126,7 +127,7 @@ export default function AssetClassRoute() {return (<AssetClassForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}key={initialValues.id}initialValues={initialValues}taxDepreciationEnabled={taxDepreciationEnabled}diff --git a/apps/erp/app/routes/x+/accounting+/asset-classes.new.tsx b/apps/erp/app/routes/x+/accounting+/asset-classes.new.tsxindex 3b026f32f2..e0f044aab4 100644--- a/apps/erp/app/routes/x+/accounting+/asset-classes.new.tsx+++ b/apps/erp/app/routes/x+/accounting+/asset-classes.new.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import {fixedAssetClassValidator,getDefaultAccounts,@@ -79,7 +81,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewAssetClassRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { defaults, taxDepreciationEnabled } = useLoaderData<typeof loader>();const initialValues = {@@ -101,7 +103,7 @@ export default function NewAssetClassRoute() {return (<AssetClassForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}taxDepreciationEnabled={taxDepreciationEnabled}/>diff --git a/apps/erp/app/routes/x+/accounting+/charts.$accountId.tsx b/apps/erp/app/routes/x+/accounting+/charts.$accountId.tsxindex f4f562fa7b..5b028e9669 100644--- a/apps/erp/app/routes/x+/accounting+/charts.$accountId.tsx+++ b/apps/erp/app/routes/x+/accounting+/charts.$accountId.tsx@@ -6,12 +6,13 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData, useNavigate } from "react-router";import {accountValidator,getAccount,diff --git a/apps/erp/app/routes/x+/accounting+/charts.delete.$accountId.tsx b/apps/erp/app/routes/x+/accounting+/charts.delete.$accountId.tsxindex 682a8d893a..c85d24e2fc 100644--- a/apps/erp/app/routes/x+/accounting+/charts.delete.$accountId.tsx+++ b/apps/erp/app/routes/x+/accounting+/charts.delete.$accountId.tsx@@ -5,13 +5,14 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteAccount, getAccount } from "~/modules/accounting";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/accounting+/charts.ledger.$accountId.tsx b/apps/erp/app/routes/x+/accounting+/charts.ledger.$accountId.tsxindex c9996837fc..bab99c57b3 100644--- a/apps/erp/app/routes/x+/accounting+/charts.ledger.$accountId.tsx+++ b/apps/erp/app/routes/x+/accounting+/charts.ledger.$accountId.tsx@@ -6,8 +6,9 @@ import { error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getAccount,getAccountLedger,diff --git a/apps/erp/app/routes/x+/accounting+/charts.move.$accountId.tsx b/apps/erp/app/routes/x+/accounting+/charts.move.$accountId.tsxindex becc25cc63..779229e0b3 100644--- a/apps/erp/app/routes/x+/accounting+/charts.move.$accountId.tsx+++ b/apps/erp/app/routes/x+/accounting+/charts.move.$accountId.tsx@@ -6,13 +6,13 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { unchecked } from "@carbon/utils";+import { redirect, unchecked } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData, useNavigate } from "react-router";import {getAccount,getGroupAccounts,diff --git a/apps/erp/app/routes/x+/accounting+/charts.new-group.tsx b/apps/erp/app/routes/x+/accounting+/charts.new-group.tsxindex c88c1cc81f..4f0d3ae12f 100644--- a/apps/erp/app/routes/x+/accounting+/charts.new-group.tsx+++ b/apps/erp/app/routes/x+/accounting+/charts.new-group.tsx@@ -6,6 +6,7 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,@@ -13,7 +14,6 @@ import type {} from "react-router";import {data,- redirect,useLoaderData,useNavigate,useSearchParamsdiff --git a/apps/erp/app/routes/x+/accounting+/charts.new.tsx b/apps/erp/app/routes/x+/accounting+/charts.new.tsxindex c02aaf3939..73a1f96ab4 100644--- a/apps/erp/app/routes/x+/accounting+/charts.new.tsx+++ b/apps/erp/app/routes/x+/accounting+/charts.new.tsx@@ -6,6 +6,7 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,@@ -13,12 +14,10 @@ import type {} from "react-router";import {data,- redirect,useLoaderData,useNavigate,useSearchParams} from "react-router";-import type { AccountClass, AccountIncomeBalance } from "~/modules/accounting";import {accountValidator,diff --git a/apps/erp/app/routes/x+/accounting+/charts.tsx b/apps/erp/app/routes/x+/accounting+/charts.tsxindex fe9858213a..bdba9dd23f 100644--- a/apps/erp/app/routes/x+/accounting+/charts.tsx+++ b/apps/erp/app/routes/x+/accounting+/charts.tsx@@ -7,10 +7,11 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { useMemo, useState } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, Outlet, redirect, useLoaderData } from "react-router";+import { data, Outlet, useLoaderData } from "react-router";import { usePermissions, useSettings } from "~/hooks";import type { Chart } from "~/modules/accounting";import {diff --git a/apps/erp/app/routes/x+/accounting+/cost-centers.$costCenterId.tsx b/apps/erp/app/routes/x+/accounting+/cost-centers.$costCenterId.tsxindex e57790b4f8..21e5e25f43 100644--- a/apps/erp/app/routes/x+/accounting+/cost-centers.$costCenterId.tsx+++ b/apps/erp/app/routes/x+/accounting+/cost-centers.$costCenterId.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import {costCenterValidator,getCostCenter,@@ -80,7 +82,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function CostCenterRoute() {const { costCenter } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: costCenter.id,@@ -92,7 +94,7 @@ export default function CostCenterRoute() {return (<CostCenterForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}key={initialValues.id}initialValues={initialValues}/>diff --git a/apps/erp/app/routes/x+/accounting+/cost-centers.delete.$costCenterId.tsx b/apps/erp/app/routes/x+/accounting+/cost-centers.delete.$costCenterId.tsxindex 3de9186be6..f4c1b66f1b 100644--- a/apps/erp/app/routes/x+/accounting+/cost-centers.delete.$costCenterId.tsx+++ b/apps/erp/app/routes/x+/accounting+/cost-centers.delete.$costCenterId.tsx@@ -5,8 +5,9 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteCostCenter, getCostCenter } from "~/modules/accounting";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/accounting+/cost-centers.new.tsx b/apps/erp/app/routes/x+/accounting+/cost-centers.new.tsxindex 7e288bdd4d..3d430b06a0 100644--- a/apps/erp/app/routes/x+/accounting+/cost-centers.new.tsx+++ b/apps/erp/app/routes/x+/accounting+/cost-centers.new.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useNavigate, useSearchParams } from "react-router";+import { data, useSearchParams } from "react-router";import { costCenterValidator, upsertCostCenter } from "~/modules/accounting";import { CostCenterForm } from "~/modules/accounting/ui/CostCenters";import { setCustomFields } from "~/utils/form";@@ -65,7 +67,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewCostCenterRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const [searchParams] = useSearchParams();const parentCostCenterId =searchParams.get("parentCostCenterId") ?? undefined;@@ -78,7 +80,7 @@ export default function NewCostCenterRoute() {return (<CostCenterForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/accounting+/cost-centers.tsx b/apps/erp/app/routes/x+/accounting+/cost-centers.tsxindex 8b43ff7f3f..f89abecf7b 100644--- a/apps/erp/app/routes/x+/accounting+/cost-centers.tsx+++ b/apps/erp/app/routes/x+/accounting+/cost-centers.tsx@@ -14,7 +14,7 @@ import {TabsList,TabsTrigger} from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { useLingui } from "@lingui/react/macro";import { useCallback } from "react";@@ -22,7 +22,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData, useNavigate } from "react-router";+import { Outlet, useLoaderData, useNavigate } from "react-router";import { New } from "~/components";import { getCostCentersTree } from "~/modules/accounting";import {diff --git a/apps/erp/app/routes/x+/accounting+/defaults.tsx b/apps/erp/app/routes/x+/accounting+/defaults.tsxindex 25ca00ae81..fd9d83123e 100644--- a/apps/erp/app/routes/x+/accounting+/defaults.tsx+++ b/apps/erp/app/routes/x+/accounting+/defaults.tsx@@ -7,9 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { ScrollArea, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import { useRouteData } from "~/hooks";import type { AccountListItem } from "~/modules/accounting";import {diff --git a/apps/erp/app/routes/x+/accounting+/depreciation-runs.new.tsx b/apps/erp/app/routes/x+/accounting+/depreciation-runs.new.tsxindex b4a3431ff6..a2a6c30e33 100644--- a/apps/erp/app/routes/x+/accounting+/depreciation-runs.new.tsx+++ b/apps/erp/app/routes/x+/accounting+/depreciation-runs.new.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getBaseCurrencyDecimalPlaces,insertDepreciationRundiff --git a/apps/erp/app/routes/x+/accounting+/dimensions.$dimensionId.tsx b/apps/erp/app/routes/x+/accounting+/dimensions.$dimensionId.tsxindex 5d28a8934e..5ca7a60924 100644--- a/apps/erp/app/routes/x+/accounting+/dimensions.$dimensionId.tsx+++ b/apps/erp/app/routes/x+/accounting+/dimensions.$dimensionId.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {dimensionValidator,getDimension,@@ -76,7 +78,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function EditDimensionRoute() {const { dimension } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: dimension?.id ?? undefined,@@ -92,7 +94,7 @@ export default function EditDimensionRoute() {<DimensionFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/accounting+/dimensions.delete.$dimensionId.tsx b/apps/erp/app/routes/x+/accounting+/dimensions.delete.$dimensionId.tsxindex ddfdc743e5..f2ce5b672b 100644--- a/apps/erp/app/routes/x+/accounting+/dimensions.delete.$dimensionId.tsx+++ b/apps/erp/app/routes/x+/accounting+/dimensions.delete.$dimensionId.tsx@@ -5,8 +5,9 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteDimension, getDimension } from "~/modules/accounting";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/accounting+/dimensions.new.tsx b/apps/erp/app/routes/x+/accounting+/dimensions.new.tsxindex 06b447dd96..df90851838 100644--- a/apps/erp/app/routes/x+/accounting+/dimensions.new.tsx+++ b/apps/erp/app/routes/x+/accounting+/dimensions.new.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import { dimensionValidator, upsertDimension } from "~/modules/accounting";import { DimensionForm } from "~/modules/accounting/ui/Dimensions";import { getParams, path } from "~/utils/path";@@ -63,7 +65,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewDimensionRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",entityType: "Custom" as const,@@ -73,6 +75,6 @@ export default function NewDimensionRoute() {};return (- <DimensionForm initialValues={initialValues} onClose={() => navigate(-1)} />+ <DimensionForm initialValues={initialValues} onClose={() => closeRoute()} />);}diff --git a/apps/erp/app/routes/x+/accounting+/exchange-rates.$currencyId.tsx b/apps/erp/app/routes/x+/accounting+/exchange-rates.$currencyId.tsxindex ab8aebbf70..9f9dd40ca0 100644--- a/apps/erp/app/routes/x+/accounting+/exchange-rates.$currencyId.tsx+++ b/apps/erp/app/routes/x+/accounting+/exchange-rates.$currencyId.tsx@@ -6,12 +6,13 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import {currencyValidator,deleteExchangeRateOverride,diff --git a/apps/erp/app/routes/x+/accounting+/exchange-rates.tsx b/apps/erp/app/routes/x+/accounting+/exchange-rates.tsxindex 3ecbb0e6f8..923738993c 100644--- a/apps/erp/app/routes/x+/accounting+/exchange-rates.tsx+++ b/apps/erp/app/routes/x+/accounting+/exchange-rates.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getCurrencies, getExchangeRates } from "~/modules/accounting";import { ExchangeRatesTable } from "~/modules/accounting/ui/ExchangeRates";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/accounting+/fixed-assets.new.tsx b/apps/erp/app/routes/x+/accounting+/fixed-assets.new.tsxindex 41d1afdb6d..6e0c0d211b 100644--- a/apps/erp/app/routes/x+/accounting+/fixed-assets.new.tsx+++ b/apps/erp/app/routes/x+/accounting+/fixed-assets.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import { fixedAssetValidator, insertFixedAsset } from "~/modules/accounting";import { FixedAssetForm } from "~/modules/accounting/ui/FixedAssets";import { path } from "~/utils/path";@@ -48,7 +49,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewFixedAssetRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {fixedAssetClassId: "",@@ -62,7 +63,7 @@ export default function NewFixedAssetRoute() {return (<FixedAssetForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/accounting+/intercompany.eliminate.tsx b/apps/erp/app/routes/x+/accounting+/intercompany.eliminate.tsxindex d4c0df0db8..1842e08825 100644--- a/apps/erp/app/routes/x+/accounting+/intercompany.eliminate.tsx+++ b/apps/erp/app/routes/x+/accounting+/intercompany.eliminate.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { generateEliminations } from "~/modules/accounting";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/accounting+/intercompany.match.tsx b/apps/erp/app/routes/x+/accounting+/intercompany.match.tsxindex 5231abc108..8068e40a68 100644--- a/apps/erp/app/routes/x+/accounting+/intercompany.match.tsx+++ b/apps/erp/app/routes/x+/accounting+/intercompany.match.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { runIntercompanyMatching } from "~/modules/accounting";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/accounting+/intercompany.new.tsx b/apps/erp/app/routes/x+/accounting+/intercompany.new.tsxindex 5f89cbba13..a8af1dcbea 100644--- a/apps/erp/app/routes/x+/accounting+/intercompany.new.tsx+++ b/apps/erp/app/routes/x+/accounting+/intercompany.new.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import { useCompanyToday } from "~/hooks";import {createIntercompanyTransaction,@@ -68,7 +70,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function NewIntercompanyTransactionRoute() {const { companies } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const companyToday = useCompanyToday();const initialValues = {@@ -86,7 +88,7 @@ export default function NewIntercompanyTransactionRoute() {<IntercompanyTransactionForminitialValues={initialValues}companies={companies}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/accounting+/journals.new.tsx b/apps/erp/app/routes/x+/accounting+/journals.new.tsxindex 21d27777a9..d2d9677360 100644--- a/apps/erp/app/routes/x+/accounting+/journals.new.tsx+++ b/apps/erp/app/routes/x+/accounting+/journals.new.tsx@@ -7,8 +7,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/accounting+/payment-terms.$paymentTermId.tsx b/apps/erp/app/routes/x+/accounting+/payment-terms.$paymentTermId.tsxindex bd899bdbb9..183467539e 100644--- a/apps/erp/app/routes/x+/accounting+/payment-terms.$paymentTermId.tsx+++ b/apps/erp/app/routes/x+/accounting+/payment-terms.$paymentTermId.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import type { PaymentTermCalculationMethod } from "~/modules/accounting";import {getPaymentTerm,@@ -88,7 +90,7 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {export default function EditPaymentTermsRoute() {const { paymentTerm } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: paymentTerm?.id ?? undefined,@@ -105,7 +107,7 @@ export default function EditPaymentTermsRoute() {<PaymentTermFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/accounting+/payment-terms.delete.$paymentTermId.tsx b/apps/erp/app/routes/x+/accounting+/payment-terms.delete.$paymentTermId.tsxindex a9c277f422..d27cd4fbdb 100644--- a/apps/erp/app/routes/x+/accounting+/payment-terms.delete.$paymentTermId.tsx+++ b/apps/erp/app/routes/x+/accounting+/payment-terms.delete.$paymentTermId.tsx@@ -5,13 +5,14 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deletePaymentTerm, getPaymentTerm } from "~/modules/accounting";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/accounting+/payment-terms.new.tsx b/apps/erp/app/routes/x+/accounting+/payment-terms.new.tsxindex eaa7412320..ef3098b976 100644--- a/apps/erp/app/routes/x+/accounting+/payment-terms.new.tsx+++ b/apps/erp/app/routes/x+/accounting+/payment-terms.new.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import type { PaymentTermCalculationMethod } from "~/modules/accounting";import { paymentTermValidator, upsertPaymentTerm } from "~/modules/accounting";import { PaymentTermForm } from "~/modules/accounting/ui/PaymentTerms";@@ -78,7 +80,7 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {}export default function NewPaymentTermsRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",daysDue: 0,@@ -90,7 +92,7 @@ export default function NewPaymentTermsRoute() {return (<PaymentTermForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/accounting+/periods.$periodId.close.tsx b/apps/erp/app/routes/x+/accounting+/periods.$periodId.close.tsxindex 24b5608948..99b6e2a3dd 100644--- a/apps/erp/app/routes/x+/accounting+/periods.$periodId.close.tsx+++ b/apps/erp/app/routes/x+/accounting+/periods.$periodId.close.tsx@@ -30,7 +30,7 @@ import {TooltipTrigger,Tr} from "@carbon/react";-import { formatDate } from "@carbon/utils";+import { formatDate, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useState } from "react";@@ -44,13 +44,7 @@ import {LuX} from "react-icons/lu";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import {- data,- redirect,- useFetcher,- useLoaderData,- useNavigate-} from "react-router";+import { data, useFetcher, useLoaderData, useNavigate } from "react-router";import { EmployeeAvatar } from "~/components";import type {PeriodCloseStatus,diff --git a/apps/erp/app/routes/x+/accounting+/periods.$periodId.delete.tsx b/apps/erp/app/routes/x+/accounting+/periods.$periodId.delete.tsxindex 97ee765c80..1d274a11c3 100644--- a/apps/erp/app/routes/x+/accounting+/periods.$periodId.delete.tsx+++ b/apps/erp/app/routes/x+/accounting+/periods.$periodId.delete.tsx@@ -18,18 +18,12 @@ import {ModalHeader,ModalTitle} from "@carbon/react";-import { formatPeriodLabel } from "@carbon/utils";+import { formatPeriodLabel, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans } from "@lingui/react/macro";import { LuTrash, LuTriangleAlert } from "react-icons/lu";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import {- data,- redirect,- useFetcher,- useLoaderData,- useNavigate-} from "react-router";+import { data, useFetcher, useLoaderData, useNavigate } from "react-router";import {deleteAccountingPeriod,getAccountingPeriodDeletabilitydiff --git a/apps/erp/app/routes/x+/accounting+/periods.generate.tsx b/apps/erp/app/routes/x+/accounting+/periods.generate.tsxindex 19ac8c2324..70e5b41f98 100644--- a/apps/erp/app/routes/x+/accounting+/periods.generate.tsx+++ b/apps/erp/app/routes/x+/accounting+/periods.generate.tsx@@ -22,19 +22,14 @@ import {datetime,fiscalYearAndPeriodFor,formatDate,- MONTH_NUMBER+ MONTH_NUMBER,+ redirect} from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useState } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import {- data,- redirect,- useFetcher,- useLoaderData,- useNavigate-} from "react-router";+import { data, useFetcher, useLoaderData, useNavigate } from "react-router";import {createFiscalYearPeriods,generateFiscalYearPeriodsValidator,diff --git a/apps/erp/app/routes/x+/accounting+/periods.tsx b/apps/erp/app/routes/x+/accounting+/periods.tsxindex 436894f92c..f16d9deff1 100644--- a/apps/erp/app/routes/x+/accounting+/periods.tsx+++ b/apps/erp/app/routes/x+/accounting+/periods.tsx@@ -6,7 +6,7 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { Button, VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans } from "@lingui/react/macro";import { LuCalendarPlus } from "react-icons/lu";@@ -14,7 +14,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData, useNavigate } from "react-router";+import { Outlet, useLoaderData, useNavigate } from "react-router";import { usePermissions } from "~/hooks";import { getAccountingPeriods } from "~/modules/accounting";import { PeriodsTable } from "~/modules/accounting/ui/Periods";diff --git a/apps/erp/app/routes/x+/accounting+/projects.$projectId.tsx b/apps/erp/app/routes/x+/accounting+/projects.$projectId.tsxindex b3d3b0209f..003f7c878f 100644--- a/apps/erp/app/routes/x+/accounting+/projects.$projectId.tsx+++ b/apps/erp/app/routes/x+/accounting+/projects.$projectId.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getProject,projectValidator,@@ -76,7 +78,7 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function EditProjectRoute() {const { project } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: project?.id ?? undefined,@@ -88,7 +90,7 @@ export default function EditProjectRoute() {<ProjectFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/accounting+/projects.delete.$projectId.tsx b/apps/erp/app/routes/x+/accounting+/projects.delete.$projectId.tsxindex 99bd41ae7d..00fd8dbd29 100644--- a/apps/erp/app/routes/x+/accounting+/projects.delete.$projectId.tsx+++ b/apps/erp/app/routes/x+/accounting+/projects.delete.$projectId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteProject, getProject } from "~/modules/accounting";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/accounting+/projects.new.tsx b/apps/erp/app/routes/x+/accounting+/projects.new.tsxindex 755a4c9605..02010317a0 100644--- a/apps/erp/app/routes/x+/accounting+/projects.new.tsx+++ b/apps/erp/app/routes/x+/accounting+/projects.new.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import { projectValidator, upsertProject } from "~/modules/accounting";import { ProjectForm } from "~/modules/accounting/ui/Projects";import { getParams, path } from "~/utils/path";@@ -62,13 +64,13 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewProjectRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",description: ""};return (- <ProjectForm initialValues={initialValues} onClose={() => navigate(-1)} />+ <ProjectForm initialValues={initialValues} onClose={() => closeRoute()} />);}diff --git a/apps/erp/app/routes/x+/accounting+/sync-tieout.$cellId.tsx b/apps/erp/app/routes/x+/accounting+/sync-tieout.$cellId.tsxindex b8bdacb441..bd5c4afb78 100644--- a/apps/erp/app/routes/x+/accounting+/sync-tieout.$cellId.tsx+++ b/apps/erp/app/routes/x+/accounting+/sync-tieout.$cellId.tsx@@ -21,12 +21,12 @@ import {Thead,Tr} from "@carbon/react";-import { formatDate } from "@carbon/utils";+import { formatDate, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData, useNavigate } from "react-router";import { Hyperlink } from "~/components";import { Enumerable } from "~/components/Enumerable";import { useCurrencyFormatter } from "~/hooks/useCurrencyFormatter";diff --git a/apps/erp/app/routes/x+/accounting+/years.tsx b/apps/erp/app/routes/x+/accounting+/years.tsxindex 404a20503a..3a1363670c 100644--- a/apps/erp/app/routes/x+/accounting+/years.tsx+++ b/apps/erp/app/routes/x+/accounting+/years.tsx@@ -7,9 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { ScrollArea, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {fiscalYearSettingsValidator,getFiscalCalendarCommitted,diff --git a/apps/erp/app/routes/x+/acknowledge.tsx b/apps/erp/app/routes/x+/acknowledge.tsxindex ed7a0a6cd9..4adfb4666c 100644--- a/apps/erp/app/routes/x+/acknowledge.tsx+++ b/apps/erp/app/routes/x+/acknowledge.tsx@@ -2,11 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import {- ITAR_RIDER_SHA256,- ITAR_RIDER_VERSION,- safeRedirect-} from "@carbon/auth";+import { ITAR_RIDER_SHA256, ITAR_RIDER_VERSION } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { insertAuditLogEntries } from "@carbon/ee/audit.server";@@ -14,11 +10,11 @@ import { getLogger } from "@carbon/logger";import {datetime,getClientIp,+ redirect,requiresItarEntityCertification} from "@carbon/utils";import { parseAbsolute } from "@internationalized/date";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {itarEntityCertificationValidator,itarUserCertificationValidator,@@ -256,7 +252,7 @@ export async function action({ request }: ActionFunctionArgs) {}if (redirectTo) {- throw redirect(safeRedirect(redirectTo));+ throw redirect(redirectTo);}return { success: true, message: "Flag updated" };diff --git a/apps/erp/app/routes/x+/assembly+/$id.activate.tsx b/apps/erp/app/routes/x+/assembly+/$id.activate.tsxindex 6caa1a4d91..f1019168ac 100644--- a/apps/erp/app/routes/x+/assembly+/$id.activate.tsx+++ b/apps/erp/app/routes/x+/assembly+/$id.activate.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { activateAssemblyInstructionVersion } from "~/modules/production";import { getDatabaseClient } from "~/services/database.server";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/assembly+/$id.status.tsx b/apps/erp/app/routes/x+/assembly+/$id.status.tsxindex b170752ae4..efca51c5c5 100644--- a/apps/erp/app/routes/x+/assembly+/$id.status.tsx+++ b/apps/erp/app/routes/x+/assembly+/$id.status.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {assemblyInstructionStatuses,updateAssemblyInstructionStatusdiff --git a/apps/erp/app/routes/x+/assembly+/$id.tsx b/apps/erp/app/routes/x+/assembly+/$id.tsxindex 7ba5cf95fd..e0098c5cbc 100644--- a/apps/erp/app/routes/x+/assembly+/$id.tsx+++ b/apps/erp/app/routes/x+/assembly+/$id.tsx@@ -14,7 +14,7 @@ import {useInterval,useMode} from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {AssemblyGraph,AssemblyPlayerHandle,@@ -37,7 +37,6 @@ import type {} from "react-router";import {data,- redirect,useFetcher,useLoaderData,useParams,diff --git a/apps/erp/app/routes/x+/assembly+/$id.version.new.tsx b/apps/erp/app/routes/x+/assembly+/$id.version.new.tsxindex 56976035e4..9518d3c1dd 100644--- a/apps/erp/app/routes/x+/assembly+/$id.version.new.tsx+++ b/apps/erp/app/routes/x+/assembly+/$id.version.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {assemblyInstructionVersionValidator,copyAssemblyInstructionAsVersiondiff --git a/apps/erp/app/routes/x+/assembly+/_layout.tsx b/apps/erp/app/routes/x+/assembly+/_layout.tsxindex 835233115a..0764b229c6 100644--- a/apps/erp/app/routes/x+/assembly+/_layout.tsx+++ b/apps/erp/app/routes/x+/assembly+/_layout.tsx@@ -14,6 +14,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Assembly" }];};diff --git a/apps/erp/app/routes/x+/assembly+/delete.$id.tsx b/apps/erp/app/routes/x+/assembly+/delete.$id.tsxindex b3347c323f..526bbf3fcb 100644--- a/apps/erp/app/routes/x+/assembly+/delete.$id.tsx+++ b/apps/erp/app/routes/x+/assembly+/delete.$id.tsx@@ -5,8 +5,9 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteAssemblyInstruction } from "~/modules/production";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/change-notice+/_layout.tsx b/apps/erp/app/routes/x+/change-notice+/_layout.tsxindex d5a107b172..ea411443ee 100644--- a/apps/erp/app/routes/x+/change-notice+/_layout.tsx+++ b/apps/erp/app/routes/x+/change-notice+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Change Notice" }];};diff --git a/apps/erp/app/routes/x+/change-notice+/new.tsx b/apps/erp/app/routes/x+/change-notice+/new.tsxindex 8ce70b9574..e535df4650 100644--- a/apps/erp/app/routes/x+/change-notice+/new.tsx+++ b/apps/erp/app/routes/x+/change-notice+/new.tsx@@ -7,10 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import type { Json } from "@carbon/database";import { validationError, validator } from "@carbon/form";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { useCompanyToday, useUser } from "~/hooks";import {addChangeNoticeAffectedItem,diff --git a/apps/erp/app/routes/x+/change-order+/new.tsx b/apps/erp/app/routes/x+/change-order+/new.tsxindex bc98dcccef..abcc6ee269 100644--- a/apps/erp/app/routes/x+/change-order+/new.tsx+++ b/apps/erp/app/routes/x+/change-order+/new.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirect } from "react-router";+import { redirect } from "@carbon/utils";import { path } from "~/utils/path";// Legacy URL shim: /x/change-order/new → /x/change-notice/newdiff --git a/apps/erp/app/routes/x+/consumable+/$itemId._index.tsx b/apps/erp/app/routes/x+/consumable+/$itemId._index.tsxindex 1c8b6b8b16..c67123a6a6 100644--- a/apps/erp/app/routes/x+/consumable+/$itemId._index.tsx+++ b/apps/erp/app/routes/x+/consumable+/$itemId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/consumable+/$itemId.costing.tsx b/apps/erp/app/routes/x+/consumable+/$itemId.costing.tsxindex f2c49b7026..4cbd11d880 100644--- a/apps/erp/app/routes/x+/consumable+/$itemId.costing.tsx+++ b/apps/erp/app/routes/x+/consumable+/$itemId.costing.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getItemCost,getItemCostHistory,diff --git a/apps/erp/app/routes/x+/consumable+/$itemId.details.tsx b/apps/erp/app/routes/x+/consumable+/$itemId.details.tsxindex f9076c7e7d..d1e74dd1be 100644--- a/apps/erp/app/routes/x+/consumable+/$itemId.details.tsx+++ b/apps/erp/app/routes/x+/consumable+/$itemId.details.tsx@@ -8,8 +8,9 @@ import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect, useParams } from "react-router";+import { useParams } from "react-router";import { DeferredFiles } from "~/components";import { usePermissions, useRouteData } from "~/hooks";import type { ConsumableSummary, ItemFile } from "~/modules/items";@@ -19,7 +20,6 @@ import {ItemNotes,ItemRiskRegister} from "~/modules/items/ui/Item";-import { setCustomFields } from "~/utils/form";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/consumable+/$itemId.inventory.tsx b/apps/erp/app/routes/x+/consumable+/$itemId.inventory.tsxindex 0c54a252fd..20fbc21a37 100644--- a/apps/erp/app/routes/x+/consumable+/$itemId.inventory.tsx+++ b/apps/erp/app/routes/x+/consumable+/$itemId.inventory.tsx@@ -8,9 +8,9 @@ import { flash } from "@carbon/auth/session.server";import { getStorageRulesDataForTarget } from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";-import { pluckUnique } from "@carbon/utils";+import { pluckUnique, redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { useStorageUnits } from "~/components/Form/StorageUnit";import { useRouteData } from "~/hooks";import {diff --git a/apps/erp/app/routes/x+/consumable+/$itemId.planning.tsx b/apps/erp/app/routes/x+/consumable+/$itemId.planning.tsxindex c7a3006449..0c740a6004 100644--- a/apps/erp/app/routes/x+/consumable+/$itemId.planning.tsx+++ b/apps/erp/app/routes/x+/consumable+/$itemId.planning.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { useRouteData } from "~/hooks";import {getItemPlanning,diff --git a/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.$supplierPartId.delete.tsx b/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.$supplierPartId.delete.tsxindex 487443ce30..ba5d5fabf6 100644--- a/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.$supplierPartId.delete.tsx+++ b/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.$supplierPartId.delete.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteSupplierPart } from "~/modules/items";import { path } from "~/utils/path";@@ -20,7 +21,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {const { supplierPartId } = params;if (!supplierPartId) throw notFound("supplierPartId not found");- // @ts-ignore TS2589 — Supabase joined-select type instantiation too deep;// whether it fires flips with Database type size, so tolerate both statesconst result = await client.from("supplierPart")diff --git a/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.$supplierPartId.tsx b/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.$supplierPartId.tsxindex 57b30682c5..5d8d4e355d 100644--- a/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.$supplierPartId.tsx+++ b/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.$supplierPartId.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { useRouteData } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import type { ConsumableSummary } from "~/modules/items";import { supplierPartValidator, upsertSupplierPart } from "~/modules/items";import { SupplierPartForm } from "~/modules/items/ui/Item";diff --git a/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.tsx b/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.tsxindex 52b5bb55c5..2861966e7c 100644--- a/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.tsx+++ b/apps/erp/app/routes/x+/consumable+/$itemId.purchasing.tsx@@ -7,14 +7,14 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { Suspense } from "react";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import { useRouteData } from "~/hooks";import { getBatchProperties } from "~/modules/inventory";import BatchPropertiesConfig from "~/modules/inventory/ui/Batches/BatchPropertiesConfig";diff --git a/apps/erp/app/routes/x+/consumable+/$itemId.quality.tsx b/apps/erp/app/routes/x+/consumable+/$itemId.quality.tsxindex 794412acd5..88614cbe62 100644--- a/apps/erp/app/routes/x+/consumable+/$itemId.quality.tsx+++ b/apps/erp/app/routes/x+/consumable+/$itemId.quality.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useParams } from "react-router";+import { data, useLoaderData, useParams } from "react-router";import invariant from "tiny-invariant";import {getInspectionDocumentsForItem,diff --git a/apps/erp/app/routes/x+/consumable+/$itemId.sales.tsx b/apps/erp/app/routes/x+/consumable+/$itemId.sales.tsxindex c47270d6ae..c2bd9a224f 100644--- a/apps/erp/app/routes/x+/consumable+/$itemId.sales.tsx+++ b/apps/erp/app/routes/x+/consumable+/$itemId.sales.tsx@@ -11,8 +11,9 @@ import {} from "@carbon/ee/rules";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getItemUnitSalePrice,itemUnitSalePriceValidator,diff --git a/apps/erp/app/routes/x+/consumable+/$itemId.tsx b/apps/erp/app/routes/x+/consumable+/$itemId.tsxindex 57bdd2f8e9..824d5ccf9b 100644--- a/apps/erp/app/routes/x+/consumable+/$itemId.tsx+++ b/apps/erp/app/routes/x+/consumable+/$itemId.tsx@@ -6,20 +6,14 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { useRouteData } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Suspense } from "react";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- Await,- Outlet,- redirect,- useLoaderData,- useParams-} from "react-router";+import { Await, Outlet, useLoaderData, useParams } from "react-router";import { ResizablePanels } from "~/components/Layout";import type { ConsumableSummary, ItemFile } from "~/modules/items";import {diff --git a/apps/erp/app/routes/x+/consumable+/_layout.tsx b/apps/erp/app/routes/x+/consumable+/_layout.tsxindex fb75c36549..efe593a931 100644--- a/apps/erp/app/routes/x+/consumable+/_layout.tsx+++ b/apps/erp/app/routes/x+/consumable+/_layout.tsx@@ -16,6 +16,8 @@ import { getLocationsList } from "~/modules/resources";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Consumables" }];};diff --git a/apps/erp/app/routes/x+/consumable+/new.tsx b/apps/erp/app/routes/x+/consumable+/new.tsxindex 0d45bb6bf9..fd1b76fca8 100644--- a/apps/erp/app/routes/x+/consumable+/new.tsx+++ b/apps/erp/app/routes/x+/consumable+/new.tsx@@ -6,9 +6,10 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { consumableValidator, upsertConsumable } from "~/modules/items";import { ConsumableForm } from "~/modules/items/ui/Consumables";import { setCustomFields } from "~/utils/form";diff --git a/apps/erp/app/routes/x+/credits+/$memoId.delete.tsx b/apps/erp/app/routes/x+/credits+/$memoId.delete.tsxindex a47463d492..24bc86110f 100644--- a/apps/erp/app/routes/x+/credits+/$memoId.delete.tsx+++ b/apps/erp/app/routes/x+/credits+/$memoId.delete.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteMemo, getMemo } from "~/modules/invoicing";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/credits+/$memoId.post.tsx b/apps/erp/app/routes/x+/credits+/$memoId.post.tsxindex 8653f00040..42fbfaaf2d 100644--- a/apps/erp/app/routes/x+/credits+/$memoId.post.tsx+++ b/apps/erp/app/routes/x+/credits+/$memoId.post.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/credits+/$memoId.tsx b/apps/erp/app/routes/x+/credits+/$memoId.tsxindex 11af98ab06..db956738d8 100644--- a/apps/erp/app/routes/x+/credits+/$memoId.tsx+++ b/apps/erp/app/routes/x+/credits+/$memoId.tsx@@ -7,14 +7,14 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import {getMemo,getMemoApplications,diff --git a/apps/erp/app/routes/x+/credits+/$memoId.void.tsx b/apps/erp/app/routes/x+/credits+/$memoId.void.tsxindex 2c649bdca2..7036bc50d1 100644--- a/apps/erp/app/routes/x+/credits+/$memoId.void.tsx+++ b/apps/erp/app/routes/x+/credits+/$memoId.void.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/credits+/_layout.tsx b/apps/erp/app/routes/x+/credits+/_layout.tsxindex 3b32162333..04ea5106be 100644--- a/apps/erp/app/routes/x+/credits+/_layout.tsx+++ b/apps/erp/app/routes/x+/credits+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Credit / Debit Memos" }];};diff --git a/apps/erp/app/routes/x+/credits+/new.tsx b/apps/erp/app/routes/x+/credits+/new.tsxindex 39ba02712e..2d80a6017f 100644--- a/apps/erp/app/routes/x+/credits+/new.tsx+++ b/apps/erp/app/routes/x+/credits+/new.tsx@@ -6,10 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { MemoForm, memoValidator, upsertMemo } from "~/modules/invoicing";import { getCompany, getNextSequence } from "~/modules/settings";import { getCompanyTimeZone } from "~/modules/shared/timezone.server";diff --git a/apps/erp/app/routes/x+/customer+/$customerId._index.tsx b/apps/erp/app/routes/x+/customer+/$customerId._index.tsxindex 9ee4e389fd..b191d3fe53 100644--- a/apps/erp/app/routes/x+/customer+/$customerId._index.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/customer+/$customerId.accounting.tsx b/apps/erp/app/routes/x+/customer+/$customerId.accounting.tsxindex 0a8cf38333..6bac7a104f 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.accounting.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.accounting.tsx@@ -2,8 +2,9 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useParams } from "react-router";+import { useParams } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.$id.tsx b/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.$id.tsxindex 901888bab6..2b6f7a1256 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.$id.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.$id.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect, useNavigate, useParams } from "react-router";+import { useNavigate, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { CustomerBankAccount } from "~/modules/sales";import {diff --git a/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.delete.$id.tsx b/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.delete.$id.tsxindex bc25e9f4b4..8d35f67cd6 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.delete.$id.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.delete.$id.tsx@@ -5,9 +5,11 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect, useNavigate, useParams } from "react-router";+import { useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { useRouteData } from "~/hooks";import type { CustomerBankAccount } from "~/modules/sales";@@ -40,7 +42,7 @@ export async function action({ request, params }: ActionFunctionArgs) {}export default function DeleteCustomerBankAccountRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();const { customerId, id } = useParams();if (!customerId) throw new Error("Could not find customerId");@@ -61,7 +63,7 @@ export default function DeleteCustomerBankAccountRoute() {isOpenname={bankAccount.name}text={t`Are you sure you want to permanently delete this bank account?`}- onCancel={() => navigate(-1)}+ onCancel={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.new.tsx b/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.new.tsxindex 39b0a969dc..05132649a5 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.new.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useNavigate, useParams } from "react-router";+import { data, useNavigate, useParams } from "react-router";import { useUser } from "~/hooks";import {customerBankAccountValidator,diff --git a/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.tsx b/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.tsxindex 21ab37436e..b620b86750 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.bank-accounts.tsx@@ -5,12 +5,12 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getCustomerBankAccounts } from "~/modules/sales";import CustomerBankAccounts from "~/modules/sales/ui/Customer/CustomerBankAccounts";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/customer+/$customerId.contacts.$customerContactId.tsx b/apps/erp/app/routes/x+/customer+/$customerId.contacts.$customerContactId.tsxindex d13fb1ea80..2764eb9814 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.contacts.$customerContactId.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.contacts.$customerContactId.tsx@@ -12,12 +12,13 @@ import {import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import {customerContactValidator,getCustomerContact,diff --git a/apps/erp/app/routes/x+/customer+/$customerId.contacts.delete.$customerContactId.tsx b/apps/erp/app/routes/x+/customer+/$customerId.contacts.delete.$customerContactId.tsxindex 21ae55215c..b7d82e3ba7 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.contacts.delete.$customerContactId.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.contacts.delete.$customerContactId.tsx@@ -5,11 +5,11 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect } from "react-router";import { deleteCustomerContact } from "~/modules/sales";import { path } from "~/utils/path";import { customerContactsQuery } from "~/utils/react-query";diff --git a/apps/erp/app/routes/x+/customer+/$customerId.contacts.new.tsx b/apps/erp/app/routes/x+/customer+/$customerId.contacts.new.tsxindex e5db215ad7..2ada274128 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.contacts.new.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.contacts.new.tsx@@ -7,11 +7,12 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { data, redirect, useNavigate, useParams } from "react-router";+import { data, useNavigate, useParams } from "react-router";import {customerContactValidator,insertCustomerContactdiff --git a/apps/erp/app/routes/x+/customer+/$customerId.contacts.tsx b/apps/erp/app/routes/x+/customer+/$customerId.contacts.tsxindex 69e1b9dd1f..ec2477c757 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.contacts.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.contacts.tsx@@ -5,12 +5,12 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getCustomerContacts } from "~/modules/sales";import { CustomerContacts } from "~/modules/sales/ui/Customer";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/customer+/$customerId.delete.tsx b/apps/erp/app/routes/x+/customer+/$customerId.delete.tsxindex f75ce9eebf..41f45847bf 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.delete.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.delete.tsx@@ -5,8 +5,9 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteCustomer } from "~/modules/sales";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/customer+/$customerId.details.tsx b/apps/erp/app/routes/x+/customer+/$customerId.details.tsxindex 94bc91575e..3a2f042b0d 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.details.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.details.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useParams } from "react-router";+import { data, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { CustomerDetail } from "~/modules/sales";import { customerValidator, upsertCustomer } from "~/modules/sales";diff --git a/apps/erp/app/routes/x+/customer+/$customerId.locations.$customerLocationId.tsx b/apps/erp/app/routes/x+/customer+/$customerId.locations.$customerLocationId.tsxindex cfc5fa5137..43d0df2408 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.locations.$customerLocationId.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.locations.$customerLocationId.tsx@@ -12,12 +12,13 @@ import {import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import {customerLocationValidator,getCustomerLocation,diff --git a/apps/erp/app/routes/x+/customer+/$customerId.locations.delete.$customerLocationId.tsx b/apps/erp/app/routes/x+/customer+/$customerId.locations.delete.$customerLocationId.tsxindex 3b8b255da6..ab0a7503bf 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.locations.delete.$customerLocationId.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.locations.delete.$customerLocationId.tsx@@ -5,11 +5,11 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect } from "react-router";import { deleteCustomerLocation } from "~/modules/sales";import { path } from "~/utils/path";import { customerLocationsQuery } from "~/utils/react-query";diff --git a/apps/erp/app/routes/x+/customer+/$customerId.locations.new.tsx b/apps/erp/app/routes/x+/customer+/$customerId.locations.new.tsxindex 06fc27d42a..3767473313 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.locations.new.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.locations.new.tsx@@ -6,11 +6,12 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { data, redirect, useNavigate, useParams } from "react-router";+import { data, useNavigate, useParams } from "react-router";import { useUser } from "~/hooks";import {customerLocationValidator,diff --git a/apps/erp/app/routes/x+/customer+/$customerId.locations.tsx b/apps/erp/app/routes/x+/customer+/$customerId.locations.tsxindex e395e4afb0..d59ebec1b1 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.locations.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.locations.tsx@@ -5,12 +5,12 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getCustomerLocations } from "~/modules/sales";import { CustomerLocations } from "~/modules/sales/ui/Customer";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/customer+/$customerId.payments.tsx b/apps/erp/app/routes/x+/customer+/$customerId.payments.tsxindex b1a997879d..9424d33e03 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.payments.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.payments.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {customerPaymentValidator,getCustomerPayment,diff --git a/apps/erp/app/routes/x+/customer+/$customerId.shipping.tsx b/apps/erp/app/routes/x+/customer+/$customerId.shipping.tsxindex b3cdd2f7c2..516e5535b6 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.shipping.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.shipping.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {customerShippingValidator,getCustomerShipping,diff --git a/apps/erp/app/routes/x+/customer+/$customerId.tax.tsx b/apps/erp/app/routes/x+/customer+/$customerId.tax.tsxindex 5419bfc745..c44425ee7a 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.tax.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.tax.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {customerTaxValidator,getCustomerTax,diff --git a/apps/erp/app/routes/x+/customer+/$customerId.tsx b/apps/erp/app/routes/x+/customer+/$customerId.tsxindex 37fbff9565..1b5b7fe28d 100644--- a/apps/erp/app/routes/x+/customer+/$customerId.tsx+++ b/apps/erp/app/routes/x+/customer+/$customerId.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { cn } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect } from "react-router";+import { Outlet } from "react-router";import { usePermissions } from "~/hooks";import {getCustomer,diff --git a/apps/erp/app/routes/x+/customer+/_layout.tsx b/apps/erp/app/routes/x+/customer+/_layout.tsxindex 09b091bc84..8e44061d0a 100644--- a/apps/erp/app/routes/x+/customer+/_layout.tsx+++ b/apps/erp/app/routes/x+/customer+/_layout.tsx@@ -16,6 +16,8 @@ import { getCustomerStatuses, getCustomerTypes } from "~/modules/sales";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Customer" }];};diff --git a/apps/erp/app/routes/x+/customer+/new.tsx b/apps/erp/app/routes/x+/customer+/new.tsxindex 306c47ca53..7adc3c5f04 100644--- a/apps/erp/app/routes/x+/customer+/new.tsx+++ b/apps/erp/app/routes/x+/customer+/new.tsx@@ -6,9 +6,10 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { useUser } from "~/hooks";import { customerValidator, upsertCustomer } from "~/modules/sales";import { CustomerForm } from "~/modules/sales/ui/Customer";diff --git a/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.delete.tsx b/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.delete.tsxindex 54216f2606..e5711205ca 100644--- a/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.delete.tsx+++ b/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.delete.tsx@@ -5,8 +5,9 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import {deleteDepreciationRun,diff --git a/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.post.tsx b/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.post.tsxindex fbbfa87ea0..0415ce701f 100644--- a/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.post.tsx+++ b/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.post.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getOrCreateAccountingPeriod } from "~/modules/accounting";import { postDepreciationRun } from "~/modules/accounting/accounting.server";import { getDatabaseClient } from "~/services/database.server";diff --git a/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.repeat.tsx b/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.repeat.tsxindex e6bb937a5c..dc49e540ed 100644--- a/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.repeat.tsx+++ b/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.repeat.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getBaseCurrencyDecimalPlaces,insertDepreciationRundiff --git a/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.tsx b/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.tsxindex 30ad653763..d1da9b0cae 100644--- a/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.tsx+++ b/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.tsx@@ -22,7 +22,7 @@ import {MENU_ITEM_SHORTCUTS,useDisclosure} from "@carbon/react";-import { formatDate, isUnaffectedByNavigation } from "@carbon/utils";+import { formatDate, isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { LuEllipsisVertical, LuRepeat, LuTrash } from "react-icons/lu";import type {@@ -32,7 +32,6 @@ import type {import {Link,Outlet,- redirect,useFetcher,useLoaderData,useNavigate,diff --git a/apps/erp/app/routes/x+/depreciation-run+/_layout.tsx b/apps/erp/app/routes/x+/depreciation-run+/_layout.tsxindex bee2525a53..c0f57afe73 100644--- a/apps/erp/app/routes/x+/depreciation-run+/_layout.tsx+++ b/apps/erp/app/routes/x+/depreciation-run+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Depreciation Run" }];};diff --git a/apps/erp/app/routes/x+/documents+/$documentId.delete.tsx b/apps/erp/app/routes/x+/documents+/$documentId.delete.tsxindex bbe156667d..61e4f3e73c 100644--- a/apps/erp/app/routes/x+/documents+/$documentId.delete.tsx+++ b/apps/erp/app/routes/x+/documents+/$documentId.delete.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteDocument } from "~/modules/documents";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/documents+/$documentId.labels.tsx b/apps/erp/app/routes/x+/documents+/$documentId.labels.tsxindex fe8c276622..e004cbf734 100644--- a/apps/erp/app/routes/x+/documents+/$documentId.labels.tsx+++ b/apps/erp/app/routes/x+/documents+/$documentId.labels.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {documentLabelsValidator,updateDocumentLabelsdiff --git a/apps/erp/app/routes/x+/documents+/$documentId.restore.tsx b/apps/erp/app/routes/x+/documents+/$documentId.restore.tsxindex 9dacee4e3e..3f3fbdaa41 100644--- a/apps/erp/app/routes/x+/documents+/$documentId.restore.tsx+++ b/apps/erp/app/routes/x+/documents+/$documentId.restore.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { restoreDocument } from "~/modules/documents";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/documents+/$documentId.trash.tsx b/apps/erp/app/routes/x+/documents+/$documentId.trash.tsxindex 2c60688703..06484b961f 100644--- a/apps/erp/app/routes/x+/documents+/$documentId.trash.tsx+++ b/apps/erp/app/routes/x+/documents+/$documentId.trash.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { moveDocumentToTrash } from "~/modules/documents";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/documents+/_index.tsx b/apps/erp/app/routes/x+/documents+/_index.tsxindex 0640d3d5a9..313b27d4e8 100644--- a/apps/erp/app/routes/x+/documents+/_index.tsx+++ b/apps/erp/app/routes/x+/documents+/_index.tsx@@ -2,8 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";-import { redirect } from "react-router";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import { path } from "~/utils/path";export async function loader() {diff --git a/apps/erp/app/routes/x+/documents+/_layout.tsx b/apps/erp/app/routes/x+/documents+/_layout.tsxindex 8f0cd480e2..f405c82d3b 100644--- a/apps/erp/app/routes/x+/documents+/_layout.tsx+++ b/apps/erp/app/routes/x+/documents+/_layout.tsx@@ -11,6 +11,8 @@ import { useDocumentsSubmodules } from "~/modules/documents";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Documents" }];};diff --git a/apps/erp/app/routes/x+/documents+/new.tsx b/apps/erp/app/routes/x+/documents+/new.tsxindex 79f6337256..35ec48dda2 100644--- a/apps/erp/app/routes/x+/documents+/new.tsx+++ b/apps/erp/app/routes/x+/documents+/new.tsx@@ -5,8 +5,8 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { upsertDocument } from "~/modules/documents";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/documents+/search.$documentId.tsx b/apps/erp/app/routes/x+/documents+/search.$documentId.tsxindex 1d0ed32692..381b8194b9 100644--- a/apps/erp/app/routes/x+/documents+/search.$documentId.tsx+++ b/apps/erp/app/routes/x+/documents+/search.$documentId.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {DocumentForm,documentValidator,diff --git a/apps/erp/app/routes/x+/documents+/search.tsx b/apps/erp/app/routes/x+/documents+/search.tsxindex beeee08811..6339f58ff8 100644--- a/apps/erp/app/routes/x+/documents+/search.tsx+++ b/apps/erp/app/routes/x+/documents+/search.tsx@@ -7,12 +7,12 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { generateDownloadToken } from "@carbon/auth/download-token.server";import { flash } from "@carbon/auth/session.server";import { ResizablePanel, ResizablePanelGroup, VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { useResolved } from "~/hooks/useResolved";import type { Document } from "~/modules/documents";import {diff --git a/apps/erp/app/routes/x+/documents+/search.view.$documentId.tsx b/apps/erp/app/routes/x+/documents+/search.view.$documentId.tsxindex 74e06b80df..acf9e76d13 100644--- a/apps/erp/app/routes/x+/documents+/search.view.$documentId.tsx+++ b/apps/erp/app/routes/x+/documents+/search.view.$documentId.tsx@@ -5,8 +5,9 @@import { error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getDocument } from "~/modules/documents";import DocumentView from "~/modules/documents/ui/Documents/DocumentView";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.delete.tsx b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.delete.tsxindex 668af0665b..33b1af18e1 100644--- a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.delete.tsx+++ b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.delete.tsx@@ -5,8 +5,9 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteFixedAsset, getFixedAsset } from "~/modules/accounting";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.details.tsx b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.details.tsxindex 27650e553b..073891d2f7 100644--- a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.details.tsx+++ b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.details.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import {fixedAssetValidator,getFixedAsset,@@ -90,7 +92,7 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function FixedAssetDetailsRoute() {const { asset } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: asset.id,@@ -121,7 +123,7 @@ export default function FixedAssetDetailsRoute() {return (<FixedAssetForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}key={initialValues.id}initialValues={initialValues}/>diff --git a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.dispose.tsx b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.dispose.tsxindex 963353ea26..ce7058b9f3 100644--- a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.dispose.tsx+++ b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.dispose.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import {fixedAssetDisposalValidator,getFixedAsset,@@ -160,12 +162,12 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function DisposeFixedAssetRoute() {const { currentNBV } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();return (<FixedAssetDisposalFormcurrentNBV={currentNBV}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.purchase.tsx b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.purchase.tsxindex fd1ccd650c..3645b59efb 100644--- a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.purchase.tsx+++ b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.purchase.tsx@@ -15,10 +15,11 @@ import {ModalFooter,ModalHeader,ModalTitle,+ useCloseRoute,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import { z } from "zod";import { Submit, Supplier } from "~/components/Form";import { usePermissions } from "~/hooks";@@ -141,14 +142,14 @@ export async function action({ request, params }: ActionFunctionArgs) {}export default function PurchaseFixedAssetRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const permissions = usePermissions();return (<ModalopenonOpenChange={(open) => {- if (!open) navigate(-1);+ if (!open) closeRoute();}}><ModalContent>@@ -166,7 +167,7 @@ export default function PurchaseFixedAssetRoute() {<Submit isDisabled={!permissions.can("create", "purchasing")}>Create Purchase Order</Submit>- <Button size="md" variant="solid" onClick={() => navigate(-1)}>+ <Button size="md" variant="solid" onClick={() => closeRoute()}>Cancel</Button></HStack>diff --git a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.register.tsx b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.register.tsxindex e94a00f734..4b09ba4e59 100644--- a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.register.tsx+++ b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.register.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import {fixedAssetRegisterValidator,getDefaultAccounts,@@ -242,7 +243,7 @@ export async function action({ request, params }: ActionFunctionArgs) {}export default function RegisterFixedAssetRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();- return <FixedAssetRegisterForm onClose={() => navigate(-1)} />;+ return <FixedAssetRegisterForm onClose={() => closeRoute()} />;}diff --git a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.sell.tsx b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.sell.tsxindex 7c2459dbb2..1ccc80512e 100644--- a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.sell.tsx+++ b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.sell.tsx@@ -15,10 +15,11 @@ import {ModalFooter,ModalHeader,ModalTitle,+ useCloseRoute,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import { z } from "zod";import { Customer, Submit } from "~/components/Form";import { usePermissions } from "~/hooks";@@ -133,14 +134,14 @@ export async function action({ request, params }: ActionFunctionArgs) {}export default function SellFixedAssetRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const permissions = usePermissions();return (<ModalopenonOpenChange={(open) => {- if (!open) navigate(-1);+ if (!open) closeRoute();}}><ModalContent>@@ -158,7 +159,7 @@ export default function SellFixedAssetRoute() {<Submit isDisabled={!permissions.can("create", "sales")}>Create Sales Order</Submit>- <Button size="md" variant="solid" onClick={() => navigate(-1)}>+ <Button size="md" variant="solid" onClick={() => closeRoute()}>Cancel</Button></HStack>diff --git a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.tsx b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.tsxindex ce505e15ee..89489efa98 100644--- a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.tsx+++ b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.tsx@@ -23,7 +23,7 @@ import {MENU_ITEM_SHORTCUTS,useDisclosure} from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import {LuChevronDown,@@ -42,7 +42,6 @@ import type {import {Link,Outlet,- redirect,useLoaderData,useNavigate,useParamsdiff --git a/apps/erp/app/routes/x+/fixed-asset+/_layout.tsx b/apps/erp/app/routes/x+/fixed-asset+/_layout.tsxindex 0098222512..d4587ba0c4 100644--- a/apps/erp/app/routes/x+/fixed-asset+/_layout.tsx+++ b/apps/erp/app/routes/x+/fixed-asset+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Fixed Asset" }];};diff --git a/apps/erp/app/routes/x+/get-started+/_layout.tsx b/apps/erp/app/routes/x+/get-started+/_layout.tsxindex 54731670f6..1f66a72732 100644--- a/apps/erp/app/routes/x+/get-started+/_layout.tsx+++ b/apps/erp/app/routes/x+/get-started+/_layout.tsx@@ -14,7 +14,6 @@ import {stateMap} from "@carbon/onboarding";import {- detectImplementationSignals,getImplementationCheckStates,getImplementationFieldValues,getImplementationHub,@@ -27,7 +26,7 @@ import {HubProvider,toFormFields} from "@carbon/onboarding/ui";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { useCallback, useEffect, useMemo, useRef } from "react";import type {@@ -37,7 +36,6 @@ import type {} from "react-router";import {Outlet,- redirect,useFetcher,useLoaderData,useLocation,@@ -46,16 +44,20 @@ import {import { GroupedContentSidebar } from "~/components/Layout";import { useSettings, useUser } from "~/hooks";import {+ isCustomerPreview,setCustomerPreview,useCustomerPreview} from "~/hooks/useCustomerPreview";import { useFlags } from "~/hooks/useFlags";import { useImplementationRealtime } from "~/hooks/useImplementationRealtime";import { useImplementationSubmodules } from "~/hooks/useImplementationSubmodules";+import { getImplementationSignals } from "~/services/implementation-signals.server";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";import { trainingConfig } from "~/utils/training";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Get Started" }];};@@ -160,11 +162,12 @@ export async function loader({ request }: LoaderFunctionArgs) {getImplementationCheckStates(client, companyId),getImplementationFieldValues(client, companyId),getImplementationRows(client, companyId),- detectImplementationSignals(client, companyId)+ getImplementationSignals(client, companyId)]);return {hub: hub.data,+ previewAsCustomer: isCustomerPreview(request.headers.get("cookie")),checkStates: checkStates.data ?? [],fieldValues: fieldValues.data ?? [],rows: rows.data ?? [],@@ -281,8 +284,8 @@ export default function GetStartedLayout() {);}-// Internal-only bar: enter or exit the customer preview. State lives in-// sessionStorage (useCustomerPreview), so toggling is a button, not navigation —+// Internal-only bar: enter or exit the customer preview. State lives in a+// session cookie (useCustomerPreview), so toggling is a button, not navigation —// it persists across pages + reloads without a URL param.function PreviewBar({ previewing }: { previewing: boolean }) {if (previewing) {diff --git a/apps/erp/app/routes/x+/get-started+/board.tsx b/apps/erp/app/routes/x+/get-started+/board.tsxindex 09e529f065..9eddc8a09c 100644--- a/apps/erp/app/routes/x+/get-started+/board.tsx+++ b/apps/erp/app/routes/x+/get-started+/board.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirect } from "react-router";+import { redirect } from "@carbon/utils";import { path } from "~/utils/path";// Board was retired — it's plan-only now. Keep this path working (old links,diff --git a/apps/erp/app/routes/x+/get-started+/controls.tsx b/apps/erp/app/routes/x+/get-started+/controls.tsxindex e4c77e31ea..f8f515d0c5 100644--- a/apps/erp/app/routes/x+/get-started+/controls.tsx+++ b/apps/erp/app/routes/x+/get-started+/controls.tsx@@ -4,8 +4,8 @@import { requirePermissions } from "@carbon/auth/auth.server";import { SetupControls } from "@carbon/onboarding/ui";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";const INTERNAL_DOMAINS = ["@carbon.us.org", "@carbon.ms"];diff --git a/apps/erp/app/routes/x+/get-started+/enroll.tsx b/apps/erp/app/routes/x+/get-started+/enroll.tsxindex c48377a8c0..db9c71013f 100644--- a/apps/erp/app/routes/x+/get-started+/enroll.tsx+++ b/apps/erp/app/routes/x+/get-started+/enroll.tsx@@ -14,9 +14,10 @@ import {enrollImplementation,getImplementationHub} from "@carbon/onboarding/server";+import { redirect } from "@carbon/utils";import { render } from "@react-email/components";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { path } from "~/utils/path";const logger = getLogger("erp", "get-started");diff --git a/apps/erp/app/routes/x+/inspection+/$id.accept.tsx b/apps/erp/app/routes/x+/inspection+/$id.accept.tsxindex c9c881a6e3..d8e5266520 100644--- a/apps/erp/app/routes/x+/inspection+/$id.accept.tsx+++ b/apps/erp/app/routes/x+/inspection+/$id.accept.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import invariant from "tiny-invariant";import { dispositionInspection } from "~/modules/quality/quality.server";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/inspection+/$id.document.tsx b/apps/erp/app/routes/x+/inspection+/$id.document.tsxindex d6902d0f5b..cb5c74cb97 100644--- a/apps/erp/app/routes/x+/inspection+/$id.document.tsx+++ b/apps/erp/app/routes/x+/inspection+/$id.document.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import invariant from "tiny-invariant";import { changeInspectionDocument } from "~/modules/quality/quality.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/inspection+/$id.partial.tsx b/apps/erp/app/routes/x+/inspection+/$id.partial.tsxindex 0349f1ad89..b74dd283d5 100644--- a/apps/erp/app/routes/x+/inspection+/$id.partial.tsx+++ b/apps/erp/app/routes/x+/inspection+/$id.partial.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import invariant from "tiny-invariant";import { dispositionInspection } from "~/modules/quality/quality.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/inspection+/$id.reject.tsx b/apps/erp/app/routes/x+/inspection+/$id.reject.tsxindex d036075819..18acc1e32d 100644--- a/apps/erp/app/routes/x+/inspection+/$id.reject.tsx+++ b/apps/erp/app/routes/x+/inspection+/$id.reject.tsx@@ -10,9 +10,8 @@ import { lockIssueDispositions } from "@carbon/database/quality";import { notifyIssueCreated } from "@carbon/ee/notifications";import { getLogger } from "@carbon/logger";import { serverFns } from "@carbon/server-functions";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import invariant from "tiny-invariant";import {deleteIssue,diff --git a/apps/erp/app/routes/x+/inspection+/$id.tsx b/apps/erp/app/routes/x+/inspection+/$id.tsxindex 0ebcfa274d..9a2b8c7830 100644--- a/apps/erp/app/routes/x+/inspection+/$id.tsx+++ b/apps/erp/app/routes/x+/inspection+/$id.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import invariant from "tiny-invariant";import {getBalloons,diff --git a/apps/erp/app/routes/x+/inspection+/_layout.tsx b/apps/erp/app/routes/x+/inspection+/_layout.tsxindex 299922e950..5f65f60723 100644--- a/apps/erp/app/routes/x+/inspection+/_layout.tsx+++ b/apps/erp/app/routes/x+/inspection+/_layout.tsx@@ -14,6 +14,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Inspection" }];};diff --git a/apps/erp/app/routes/x+/inspection-document+/$id.delete.tsx b/apps/erp/app/routes/x+/inspection-document+/$id.delete.tsxindex 3c2da1164e..7b7cec4a33 100644--- a/apps/erp/app/routes/x+/inspection-document+/$id.delete.tsx+++ b/apps/erp/app/routes/x+/inspection-document+/$id.delete.tsx@@ -7,11 +7,11 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { storage } from "@carbon/files";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect } from "react-router";import { deleteInspectionDocument } from "~/modules/quality";import { path } from "~/utils/path";import { invalidateInspectionDocuments } from "~/utils/react-query";diff --git a/apps/erp/app/routes/x+/inspection-document+/$id.tsx b/apps/erp/app/routes/x+/inspection-document+/$id.tsxindex 721fbd8507..59a3878925 100644--- a/apps/erp/app/routes/x+/inspection-document+/$id.tsx+++ b/apps/erp/app/routes/x+/inspection-document+/$id.tsx@@ -7,13 +7,14 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { ClientOnly, Spinner } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { lazy, Suspense } from "react";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getUnitOfMeasuresList } from "~/modules/items/items.service";import {getBalloons,diff --git a/apps/erp/app/routes/x+/inventory+/_index.tsx b/apps/erp/app/routes/x+/inventory+/_index.tsxindex 54218b0092..dd9fd5608e 100644--- a/apps/erp/app/routes/x+/inventory+/_index.tsx+++ b/apps/erp/app/routes/x+/inventory+/_index.tsx@@ -2,8 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";-import { redirect } from "react-router";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import { path } from "~/utils/path";export async function loader() {diff --git a/apps/erp/app/routes/x+/inventory+/_layout.tsx b/apps/erp/app/routes/x+/inventory+/_layout.tsxindex f77d08a133..fc8ae0ac88 100644--- a/apps/erp/app/routes/x+/inventory+/_layout.tsx+++ b/apps/erp/app/routes/x+/inventory+/_layout.tsx@@ -19,6 +19,8 @@ import { getLocationsList } from "~/modules/resources";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Inventory" }];};diff --git a/apps/erp/app/routes/x+/inventory+/inventory-count.new.tsx b/apps/erp/app/routes/x+/inventory+/inventory-count.new.tsxindex e056456e03..44bdd83f0f 100644--- a/apps/erp/app/routes/x+/inventory+/inventory-count.new.tsx+++ b/apps/erp/app/routes/x+/inventory+/inventory-count.new.tsx@@ -7,8 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import type { Json } from "@carbon/database";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import {deleteInventoryCount,generateInventoryCountLines,@@ -110,12 +112,12 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewInventoryCountRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();return (<InventoryCountForminitialValues={{ locationId: "", isBlind: false }}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/inventory+/inventory-count.tsx b/apps/erp/app/routes/x+/inventory+/inventory-count.tsxindex 0c584d4ce4..226ae01cbd 100644--- a/apps/erp/app/routes/x+/inventory+/inventory-count.tsx+++ b/apps/erp/app/routes/x+/inventory+/inventory-count.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getInventoryCounts, InventoryCountsTable } from "~/modules/inventory";import { getLocationsList } from "~/modules/resources";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/inventory+/kanbans.$id.tsx b/apps/erp/app/routes/x+/inventory+/kanbans.$id.tsxindex 135294acd1..39f24738cb 100644--- a/apps/erp/app/routes/x+/inventory+/kanbans.$id.tsx+++ b/apps/erp/app/routes/x+/inventory+/kanbans.$id.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getKanban,KanbanForm,@@ -69,7 +71,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function EditKanbanRoute() {const { kanban } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: kanban?.id ?? undefined,@@ -92,7 +94,7 @@ export default function EditKanbanRoute() {key={initialValues.id}initialValues={initialValues}locationId={initialValues.locationId}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/inventory+/kanbans.delete.$id.tsx b/apps/erp/app/routes/x+/inventory+/kanbans.delete.$id.tsxindex 6f999d1bfb..217d6b2cf5 100644--- a/apps/erp/app/routes/x+/inventory+/kanbans.delete.$id.tsx+++ b/apps/erp/app/routes/x+/inventory+/kanbans.delete.$id.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteKanban, getKanban } from "~/modules/inventory";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/inventory+/kanbans.new.tsx b/apps/erp/app/routes/x+/inventory+/kanbans.new.tsxindex 724fb123b4..cffb79df06 100644--- a/apps/erp/app/routes/x+/inventory+/kanbans.new.tsx+++ b/apps/erp/app/routes/x+/inventory+/kanbans.new.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate, useSearchParams } from "react-router";+import { data, useSearchParams } from "react-router";import { useUser } from "~/hooks";import { KanbanForm, kanbanValidator, upsertKanban } from "~/modules/inventory";import { getParams, path } from "~/utils/path";@@ -57,7 +59,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewKanbanRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const [searchParams] = useSearchParams();const { defaults } = useUser();const locationId =@@ -78,7 +80,7 @@ export default function NewKanbanRoute() {<KanbanForminitialValues={initialValues}locationId={locationId}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/inventory+/kanbans.tsx b/apps/erp/app/routes/x+/inventory+/kanbans.tsxindex 0a1d7d9e15..058172dbf9 100644--- a/apps/erp/app/routes/x+/inventory+/kanbans.tsx+++ b/apps/erp/app/routes/x+/inventory+/kanbans.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getKanbans } from "~/modules/inventory";import KanbansTable from "~/modules/inventory/ui/Kanbans/KanbansTable";import { getLocationsList } from "~/modules/resources";diff --git a/apps/erp/app/routes/x+/inventory+/picking-lists.tsx b/apps/erp/app/routes/x+/inventory+/picking-lists.tsxindex 923883f10b..1aef47a1ef 100644--- a/apps/erp/app/routes/x+/inventory+/picking-lists.tsx+++ b/apps/erp/app/routes/x+/inventory+/picking-lists.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getPickingLists } from "~/modules/inventory";import type { PickingList } from "~/modules/inventory/ui/PickingLists";import { PickingListsTable } from "~/modules/inventory/ui/PickingLists";diff --git a/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.activity.tsx b/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.activity.tsxindex a981420cf3..28e13a108e 100644--- a/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.activity.tsx+++ b/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.activity.tsx@@ -6,11 +6,12 @@ import { error, notFound, useCarbon } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { Button, Heading } from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import { useCallback, useMemo, useRef, useState } from "react";import { LuChevronUp } from "react-icons/lu";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import InfiniteScroll from "~/components/InfiniteScroll";import type {BalanceAnchor,diff --git a/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.adjustment.tsx b/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.adjustment.tsxindex a1afc465c7..38c322b307 100644--- a/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.adjustment.tsx+++ b/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.adjustment.tsx@@ -11,8 +11,8 @@ import {isBlocked} from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {insertManualInventoryAdjustment,inventoryAdjustmentValidatordiff --git a/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.details.tsx b/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.details.tsxindex 9ecb31a7c7..e1421ec2b9 100644--- a/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.details.tsx+++ b/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.details.tsx@@ -7,9 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import type { JSONContent } from "@carbon/react";import { VStack } from "@carbon/react";-import { pluckUnique } from "@carbon/utils";+import { pluckUnique, redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { useStorageUnits } from "~/components/Form/StorageUnit";import {getTrackedEntityExpirations,diff --git a/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.tsx b/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.tsxindex 343c329a3a..13950d3dda 100644--- a/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.tsx+++ b/apps/erp/app/routes/x+/inventory+/quantities+/$itemId.tsx@@ -11,12 +11,12 @@ import {ScrollArea,VStack} from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import InventoryItemHeader from "~/modules/inventory/ui/Inventory/InventoryItemHeader";import { getItem, getPickMethod, upsertPickMethod } from "~/modules/items";import { resolveLocationId } from "~/modules/shared/location.server";@@ -105,7 +105,7 @@ export default function ItemInventoryRoute() {<ScrollArea className="h-[calc(100dvh-var(--topbar-height)-var(--content-inset))]"><InventoryItemHeaderitemReadableId={item.readableIdWithRevision ?? item.readableId}- // @ts-ignore+ // @ts-expect-erroritemType={item.type}/><VStack className="p-2">diff --git a/apps/erp/app/routes/x+/inventory+/quantities.tsx b/apps/erp/app/routes/x+/inventory+/quantities.tsxindex ac0634efee..be4dd3c29c 100644--- a/apps/erp/app/routes/x+/inventory+/quantities.tsx+++ b/apps/erp/app/routes/x+/inventory+/quantities.tsx@@ -6,12 +6,12 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { ResizablePanel, ResizablePanelGroup, VStack } from "@carbon/react";-import { isUnaffectedByNavigation, pluckUnique } from "@carbon/utils";+import { isUnaffectedByNavigation, pluckUnique, redirect } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import type { InventoryItem } from "~/modules/inventory";import {expandStorageUnitIdsWithDescendants,diff --git a/apps/erp/app/routes/x+/inventory+/receipts.tsx b/apps/erp/app/routes/x+/inventory+/receipts.tsxindex 532358a314..0aaf7a00f6 100644--- a/apps/erp/app/routes/x+/inventory+/receipts.tsx+++ b/apps/erp/app/routes/x+/inventory+/receipts.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getReceipts, ReceiptsTable } from "~/modules/inventory";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/inventory+/shipments.tsx b/apps/erp/app/routes/x+/inventory+/shipments.tsxindex b938a01297..dcd9859875 100644--- a/apps/erp/app/routes/x+/inventory+/shipments.tsx+++ b/apps/erp/app/routes/x+/inventory+/shipments.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getShipments } from "~/modules/inventory";import ShipmentsTable from "~/modules/inventory/ui/Shipments/ShipmentsTable";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/inventory+/shipping-methods.$shippingMethodId.tsx b/apps/erp/app/routes/x+/inventory+/shipping-methods.$shippingMethodId.tsxindex ec3525a2e6..5a376f6bdb 100644--- a/apps/erp/app/routes/x+/inventory+/shipping-methods.$shippingMethodId.tsx+++ b/apps/erp/app/routes/x+/inventory+/shipping-methods.$shippingMethodId.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import type { ShippingCarrier } from "~/modules/inventory";import {getShippingMethod,@@ -90,7 +92,7 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {export default function EditShippingMethodsRoute() {const { shippingMethod } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: shippingMethod?.id ?? undefined,@@ -105,7 +107,7 @@ export default function EditShippingMethodsRoute() {<ShippingMethodFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/inventory+/shipping-methods.delete.$shippingMethodId.tsx b/apps/erp/app/routes/x+/inventory+/shipping-methods.delete.$shippingMethodId.tsxindex 0a91ae098e..f61d240526 100644--- a/apps/erp/app/routes/x+/inventory+/shipping-methods.delete.$shippingMethodId.tsx+++ b/apps/erp/app/routes/x+/inventory+/shipping-methods.delete.$shippingMethodId.tsx@@ -5,13 +5,14 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteShippingMethod, getShippingMethod } from "~/modules/inventory";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/inventory+/shipping-methods.new.tsx b/apps/erp/app/routes/x+/inventory+/shipping-methods.new.tsxindex bfc0767d3f..9677ef906d 100644--- a/apps/erp/app/routes/x+/inventory+/shipping-methods.new.tsx+++ b/apps/erp/app/routes/x+/inventory+/shipping-methods.new.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import type { ShippingCarrier } from "~/modules/inventory";import {ShippingMethodForm,@@ -83,7 +85,7 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {}export default function NewShippingMethodsRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",@@ -93,7 +95,7 @@ export default function NewShippingMethodsRoute() {return (<ShippingMethodForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/inventory+/shipping-methods.tsx b/apps/erp/app/routes/x+/inventory+/shipping-methods.tsxindex a043ef913a..e469501382 100644--- a/apps/erp/app/routes/x+/inventory+/shipping-methods.tsx+++ b/apps/erp/app/routes/x+/inventory+/shipping-methods.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getAccountsList } from "~/modules/accounting";import { getShippingMethods, ShippingMethodsTable } from "~/modules/inventory";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/inventory+/stock-movements.tsx b/apps/erp/app/routes/x+/inventory+/stock-movements.tsxindex b4c7a9cf95..94d5b8ca3b 100644--- a/apps/erp/app/routes/x+/inventory+/stock-movements.tsx+++ b/apps/erp/app/routes/x+/inventory+/stock-movements.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getStockMovements } from "~/modules/inventory";import StockMovementsTable from "~/modules/inventory/ui/StockMovements/StockMovementsTable";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/inventory+/stock-transfers.tsx b/apps/erp/app/routes/x+/inventory+/stock-transfers.tsxindex 2407b5376d..d0b9a541f5 100644--- a/apps/erp/app/routes/x+/inventory+/stock-transfers.tsx+++ b/apps/erp/app/routes/x+/inventory+/stock-transfers.tsx@@ -7,9 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getStockTransfers } from "~/modules/inventory";import StockTransfersTable from "~/modules/inventory/ui/StockTransfers/StockTransfersTable";import { getLocationsList } from "~/modules/resources";diff --git a/apps/erp/app/routes/x+/inventory+/storage-rules.$id.delete.tsx b/apps/erp/app/routes/x+/inventory+/storage-rules.$id.delete.tsxindex 700beb8929..de51c18c00 100644--- a/apps/erp/app/routes/x+/inventory+/storage-rules.$id.delete.tsx+++ b/apps/erp/app/routes/x+/inventory+/storage-rules.$id.delete.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";import { deleteEnforcementRule } from "@carbon/ee/rules.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData, useNavigate } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { getEnforcementRule } from "~/modules/shared";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/inventory+/storage-rules.$id.tsx b/apps/erp/app/routes/x+/inventory+/storage-rules.$id.tsxindex 5558460644..197405d4fa 100644--- a/apps/erp/app/routes/x+/inventory+/storage-rules.$id.tsx+++ b/apps/erp/app/routes/x+/inventory+/storage-rules.$id.tsx@@ -9,13 +9,13 @@ import { requireFeature } from "@carbon/ee/plan.server";import { upsertEnforcementRule } from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";import type { ConditionAst } from "@carbon/utils";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData, useNavigate } from "react-router";import { storageRuleValidator } from "~/modules/inventory";import StorageRuleForm from "~/modules/inventory/ui/StorageRules/StorageRuleForm";import { getEnforcementRule } from "~/modules/shared";diff --git a/apps/erp/app/routes/x+/inventory+/storage-rules.new.tsx b/apps/erp/app/routes/x+/inventory+/storage-rules.new.tsxindex 1af764820b..23617b15f2 100644--- a/apps/erp/app/routes/x+/inventory+/storage-rules.new.tsx+++ b/apps/erp/app/routes/x+/inventory+/storage-rules.new.tsx@@ -9,8 +9,9 @@ import { requireFeature } from "@carbon/ee/plan.server";import { upsertEnforcementRule } from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";import type { TargetType } from "@carbon/utils";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData, useNavigate } from "react-router";import { storageRuleValidator } from "~/modules/inventory";import StorageRuleForm from "~/modules/inventory/ui/StorageRules/StorageRuleForm";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/inventory+/storage-rules.tsx b/apps/erp/app/routes/x+/inventory+/storage-rules.tsxindex b6285dbf59..eb18be1e5f 100644--- a/apps/erp/app/routes/x+/inventory+/storage-rules.tsx+++ b/apps/erp/app/routes/x+/inventory+/storage-rules.tsx@@ -5,13 +5,13 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { usePlanGate } from "~/hooks/usePlanGate";import StorageRulesGroups from "~/modules/inventory/ui/StorageRules/StorageRulesGroups";import StorageRulesUpgradeOverlay from "~/modules/inventory/ui/StorageRules/StorageRulesUpgradeOverlay";diff --git a/apps/erp/app/routes/x+/inventory+/storage-types.$id.tsx b/apps/erp/app/routes/x+/inventory+/storage-types.$id.tsxindex 89d44a7324..f38102fe9b 100644--- a/apps/erp/app/routes/x+/inventory+/storage-types.$id.tsx+++ b/apps/erp/app/routes/x+/inventory+/storage-types.$id.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getStorageType,storageTypeValidator,@@ -74,7 +76,7 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function EditStorageTypeRoute() {const { storageType } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: storageType?.id ?? undefined,@@ -86,7 +88,7 @@ export default function EditStorageTypeRoute() {<StorageTypeFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/inventory+/storage-types.delete.$id.tsx b/apps/erp/app/routes/x+/inventory+/storage-types.delete.$id.tsxindex 632bbd3e11..1d8b8460dd 100644--- a/apps/erp/app/routes/x+/inventory+/storage-types.delete.$id.tsx+++ b/apps/erp/app/routes/x+/inventory+/storage-types.delete.$id.tsx@@ -14,18 +14,14 @@ import {ModalFooter,ModalHeader,ModalOverlay,- ModalTitle+ ModalTitle,+ useCloseRoute} from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { useState } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import {- redirect,- useFetcher,- useLoaderData,- useNavigate,- useParams-} from "react-router";+import { useFetcher, useLoaderData, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import {deleteStorageTypeWithCascade,@@ -120,12 +116,12 @@ export default function DeleteStorageTypeRoute() {const { storageType, usageCount, sampleUnits } =useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();if (!storageType) return null;- const onCancel = () => navigate(-1);+ const onCancel = () => closeRoute();if (usageCount === 0) {return (diff --git a/apps/erp/app/routes/x+/inventory+/storage-types.new.tsx b/apps/erp/app/routes/x+/inventory+/storage-types.new.tsxindex f225dacde1..893cf8c7aa 100644--- a/apps/erp/app/routes/x+/inventory+/storage-types.new.tsx+++ b/apps/erp/app/routes/x+/inventory+/storage-types.new.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import { storageTypeValidator, upsertStorageType } from "~/modules/inventory";import StorageTypeForm from "~/modules/inventory/ui/StorageTypes/StorageTypeForm";import { setCustomFields } from "~/utils/form";@@ -61,12 +63,12 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewStorageTypeRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = { name: "" };return (<StorageTypeForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/inventory+/storage-types.tsx b/apps/erp/app/routes/x+/inventory+/storage-types.tsxindex 111b5f6fe2..63bc5626a8 100644--- a/apps/erp/app/routes/x+/inventory+/storage-types.tsx+++ b/apps/erp/app/routes/x+/inventory+/storage-types.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getStorageTypes } from "~/modules/inventory";import StorageTypesTable from "~/modules/inventory/ui/StorageTypes/StorageTypesTable";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/inventory+/storage-units.$storageUnitId.tsx b/apps/erp/app/routes/x+/inventory+/storage-units.$storageUnitId.tsxindex 437caafdb8..0d509b1f15 100644--- a/apps/erp/app/routes/x+/inventory+/storage-units.$storageUnitId.tsx+++ b/apps/erp/app/routes/x+/inventory+/storage-units.$storageUnitId.tsx@@ -6,18 +6,14 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import {- data,- Outlet,- redirect,- useLoaderData,- useNavigate-} from "react-router";+import { data, Outlet, useLoaderData } from "react-router";import {getEffectiveWorkCenterId,getStorageUnit,@@ -130,7 +126,7 @@ export async function clientAction({export default function EditStorageUnitRoute() {const { storageUnit, inheritedWorkCenter } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: storageUnit?.id ?? undefined,@@ -150,7 +146,7 @@ export default function EditStorageUnitRoute() {initialValues={initialValues}locationId={initialValues.locationId}inheritedWorkCenter={inheritedWorkCenter}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/><Outlet /></>diff --git a/apps/erp/app/routes/x+/inventory+/storage-units.delete.$storageUnitId.tsx b/apps/erp/app/routes/x+/inventory+/storage-units.delete.$storageUnitId.tsxindex ff95148270..9776adb928 100644--- a/apps/erp/app/routes/x+/inventory+/storage-units.delete.$storageUnitId.tsx+++ b/apps/erp/app/routes/x+/inventory+/storage-units.delete.$storageUnitId.tsx@@ -16,6 +16,7 @@ import {ModalOverlay,ModalTitle} from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { useEffect, useRef, useState } from "react";import type {@@ -24,7 +25,6 @@ import type {LoaderFunctionArgs} from "react-router";import {- redirect,useFetcher,useLoaderData,useNavigate,diff --git a/apps/erp/app/routes/x+/inventory+/storage-units.new.tsx b/apps/erp/app/routes/x+/inventory+/storage-units.new.tsxindex 8b11ffa956..cd6fa71fef 100644--- a/apps/erp/app/routes/x+/inventory+/storage-units.new.tsx+++ b/apps/erp/app/routes/x+/inventory+/storage-units.new.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useNavigate, useSearchParams } from "react-router";+import { data, useSearchParams } from "react-router";import { useUser } from "~/hooks";import {StorageUnitForm,@@ -95,7 +97,7 @@ export async function clientAction({}export default function NewStorageUnitRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const [searchParams] = useSearchParams();const { defaults } = useUser();const locationId =@@ -113,7 +115,7 @@ export default function NewStorageUnitRoute() {<StorageUnitForminitialValues={initialValues}locationId={locationId}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/inventory+/storage-units.tsx b/apps/erp/app/routes/x+/inventory+/storage-units.tsxindex 7cfe4cee9a..b1525bc1b8 100644--- a/apps/erp/app/routes/x+/inventory+/storage-units.tsx+++ b/apps/erp/app/routes/x+/inventory+/storage-units.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import {getStorageTypesList,getStorageUnitParentIdsWithChildren,diff --git a/apps/erp/app/routes/x+/inventory+/tracked-entities.tsx b/apps/erp/app/routes/x+/inventory+/tracked-entities.tsxindex 0eb5230f99..d77bd87d32 100644--- a/apps/erp/app/routes/x+/inventory+/tracked-entities.tsx+++ b/apps/erp/app/routes/x+/inventory+/tracked-entities.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getTrackedEntities } from "~/modules/inventory";import TrackedEntitiesTable from "~/modules/inventory/ui/Traceability/TrackedEntitiesTable";import { getCompanySettings } from "~/modules/settings";diff --git a/apps/erp/app/routes/x+/inventory+/tracked-entity.expiry.tsx b/apps/erp/app/routes/x+/inventory+/tracked-entity.expiry.tsxindex 0ec118ef80..1f381af7fa 100644--- a/apps/erp/app/routes/x+/inventory+/tracked-entity.expiry.tsx+++ b/apps/erp/app/routes/x+/inventory+/tracked-entity.expiry.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {trackedEntityExpiryValidator,updateTrackedEntityExpirydiff --git a/apps/erp/app/routes/x+/inventory+/warehouse-transfers.tsx b/apps/erp/app/routes/x+/inventory+/warehouse-transfers.tsxindex 4c6414c5b6..9f380995fb 100644--- a/apps/erp/app/routes/x+/inventory+/warehouse-transfers.tsx+++ b/apps/erp/app/routes/x+/inventory+/warehouse-transfers.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getWarehouseTransfers } from "~/modules/inventory";import WarehouseTransfersTable from "~/modules/inventory/ui/WarehouseTransfers/WarehouseTransfersTable";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/inventory-count+/$id.confirm.tsx b/apps/erp/app/routes/x+/inventory-count+/$id.confirm.tsxindex 9c969b7c4e..443bc7f17c 100644--- a/apps/erp/app/routes/x+/inventory-count+/$id.confirm.tsx+++ b/apps/erp/app/routes/x+/inventory-count+/$id.confirm.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getInventoryCount,updateInventoryCountStatusdiff --git a/apps/erp/app/routes/x+/inventory-count+/$id.delete.tsx b/apps/erp/app/routes/x+/inventory-count+/$id.delete.tsxindex 8f2670347a..c902d0bfd2 100644--- a/apps/erp/app/routes/x+/inventory-count+/$id.delete.tsx+++ b/apps/erp/app/routes/x+/inventory-count+/$id.delete.tsx@@ -5,8 +5,8 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteInventoryCount, getInventoryCount } from "~/modules/inventory";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/inventory-count+/$id.post.tsx b/apps/erp/app/routes/x+/inventory-count+/$id.post.tsxindex cc4f89b772..83ca399a35 100644--- a/apps/erp/app/routes/x+/inventory-count+/$id.post.tsx+++ b/apps/erp/app/routes/x+/inventory-count+/$id.post.tsx@@ -6,8 +6,9 @@ import { assertIsPost, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { getInventoryCount } from "~/modules/inventory";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/inventory-count+/$id.reopen.tsx b/apps/erp/app/routes/x+/inventory-count+/$id.reopen.tsxindex 06aa7eb622..bcafce37ec 100644--- a/apps/erp/app/routes/x+/inventory-count+/$id.reopen.tsx+++ b/apps/erp/app/routes/x+/inventory-count+/$id.reopen.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getInventoryCount,updateInventoryCountStatusdiff --git a/apps/erp/app/routes/x+/inventory-count+/$id.tsx b/apps/erp/app/routes/x+/inventory-count+/$id.tsxindex 460a34ac94..a231d6fcce 100644--- a/apps/erp/app/routes/x+/inventory-count+/$id.tsx+++ b/apps/erp/app/routes/x+/inventory-count+/$id.tsx@@ -5,13 +5,13 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation, pluckUnique } from "@carbon/utils";+import { isUnaffectedByNavigation, pluckUnique, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import {getInventoryCount,getInventoryCountLineSummary,diff --git a/apps/erp/app/routes/x+/inventory-count+/_layout.tsx b/apps/erp/app/routes/x+/inventory-count+/_layout.tsxindex f6ca299e9e..4b16df427b 100644--- a/apps/erp/app/routes/x+/inventory-count+/_layout.tsx+++ b/apps/erp/app/routes/x+/inventory-count+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Inventory Count" }];};diff --git a/apps/erp/app/routes/x+/invoicing+/_layout.tsx b/apps/erp/app/routes/x+/invoicing+/_layout.tsxindex bcc83a381f..4db1631ece 100644--- a/apps/erp/app/routes/x+/invoicing+/_layout.tsx+++ b/apps/erp/app/routes/x+/invoicing+/_layout.tsx@@ -17,6 +17,8 @@ import useInvoicingSubmodules from "~/modules/invoicing/ui/useInvoicingSubmoduleimport type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Invoicing" }];};diff --git a/apps/erp/app/routes/x+/invoicing+/charges.$id.tsx b/apps/erp/app/routes/x+/invoicing+/charges.$id.tsxindex 0e58dea760..38d316b31c 100644--- a/apps/erp/app/routes/x+/invoicing+/charges.$id.tsx+++ b/apps/erp/app/routes/x+/invoicing+/charges.$id.tsx@@ -23,14 +23,14 @@ import {useDisclosure,VStack} from "@carbon/react";-import { formatDate, isUnaffectedByNavigation } from "@carbon/utils";+import { formatDate, isUnaffectedByNavigation, redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData, useNavigate } from "react-router";import { Hyperlink } from "~/components";import { Enumerable } from "~/components/Enumerable";import { Confirm } from "~/components/Modals";diff --git a/apps/erp/app/routes/x+/invoicing+/charges.$id.void.tsx b/apps/erp/app/routes/x+/invoicing+/charges.$id.void.tsxindex eb9d8001a9..6d445f320c 100644--- a/apps/erp/app/routes/x+/invoicing+/charges.$id.void.tsx+++ b/apps/erp/app/routes/x+/invoicing+/charges.$id.void.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/invoicing+/charges.tsx b/apps/erp/app/routes/x+/invoicing+/charges.tsxindex 0841821580..8d7e9248f0 100644--- a/apps/erp/app/routes/x+/invoicing+/charges.tsx+++ b/apps/erp/app/routes/x+/invoicing+/charges.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { ChargesTable, getCharges } from "~/modules/invoicing";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/invoicing+/credit-memos.tsx b/apps/erp/app/routes/x+/invoicing+/credit-memos.tsxindex 5641853e96..038562c83a 100644--- a/apps/erp/app/routes/x+/invoicing+/credit-memos.tsx+++ b/apps/erp/app/routes/x+/invoicing+/credit-memos.tsx@@ -5,9 +5,10 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getMemos, MemosTable } from "~/modules/invoicing";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/invoicing+/payables.adjust.tsx b/apps/erp/app/routes/x+/invoicing+/payables.adjust.tsxindex 3c09c0a75b..0c2f69c253 100644--- a/apps/erp/app/routes/x+/invoicing+/payables.adjust.tsx+++ b/apps/erp/app/routes/x+/invoicing+/payables.adjust.tsx@@ -6,9 +6,8 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { serverFns } from "@carbon/server-functions";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getDefaultAccounts,saveJournalEntryWithLinesdiff --git a/apps/erp/app/routes/x+/invoicing+/payments.tsx b/apps/erp/app/routes/x+/invoicing+/payments.tsxindex e72d0e3acf..1c059782c2 100644--- a/apps/erp/app/routes/x+/invoicing+/payments.tsx+++ b/apps/erp/app/routes/x+/invoicing+/payments.tsx@@ -5,9 +5,10 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getPayments, PaymentsTable } from "~/modules/invoicing";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/invoicing+/purchasing.tsx b/apps/erp/app/routes/x+/invoicing+/purchasing.tsxindex 3bedff7e05..66745fb2fa 100644--- a/apps/erp/app/routes/x+/invoicing+/purchasing.tsx+++ b/apps/erp/app/routes/x+/invoicing+/purchasing.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import {getPurchaseInvoices,PurchaseInvoicesTablediff --git a/apps/erp/app/routes/x+/invoicing+/receivables.adjust.tsx b/apps/erp/app/routes/x+/invoicing+/receivables.adjust.tsxindex 8bcd01ed43..794e74068c 100644--- a/apps/erp/app/routes/x+/invoicing+/receivables.adjust.tsx+++ b/apps/erp/app/routes/x+/invoicing+/receivables.adjust.tsx@@ -6,9 +6,8 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { serverFns } from "@carbon/server-functions";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getDefaultAccounts,saveJournalEntryWithLinesdiff --git a/apps/erp/app/routes/x+/invoicing+/reimbursements.tsx b/apps/erp/app/routes/x+/invoicing+/reimbursements.tsxindex 69b31329d0..26e72b8eee 100644--- a/apps/erp/app/routes/x+/invoicing+/reimbursements.tsx+++ b/apps/erp/app/routes/x+/invoicing+/reimbursements.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getReimbursements, ReimbursementsTable } from "~/modules/invoicing";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/invoicing+/sales.tsx b/apps/erp/app/routes/x+/invoicing+/sales.tsxindex 68ed099679..a8b6648774 100644--- a/apps/erp/app/routes/x+/invoicing+/sales.tsx+++ b/apps/erp/app/routes/x+/invoicing+/sales.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getSalesInvoices } from "~/modules/invoicing";import SalesInvoicesTable from "~/modules/invoicing/ui/SalesInvoice/SalesInvoicesTable";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/invoicing+/supplier-credits.tsx b/apps/erp/app/routes/x+/invoicing+/supplier-credits.tsxindex 00acde1260..285c189dd4 100644--- a/apps/erp/app/routes/x+/invoicing+/supplier-credits.tsx+++ b/apps/erp/app/routes/x+/invoicing+/supplier-credits.tsx@@ -5,9 +5,10 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getMemos, MemosTable } from "~/modules/invoicing";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/invoicing+/vendor-credits.tsx b/apps/erp/app/routes/x+/invoicing+/vendor-credits.tsxindex ccf1131b19..a023ffa0b7 100644--- a/apps/erp/app/routes/x+/invoicing+/vendor-credits.tsx+++ b/apps/erp/app/routes/x+/invoicing+/vendor-credits.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirect } from "react-router";+import { redirect } from "@carbon/utils";import { path } from "~/utils/path";// Renamed to Supplier Credits — Carbon says "supplier"; only third-partydiff --git a/apps/erp/app/routes/x+/issue+/$id._index.tsx b/apps/erp/app/routes/x+/issue+/$id._index.tsxindex 3990b4a5ad..5a0ea404cb 100644--- a/apps/erp/app/routes/x+/issue+/$id._index.tsx+++ b/apps/erp/app/routes/x+/issue+/$id._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/issue+/$id.association.delete.$type.$associationId.tsx b/apps/erp/app/routes/x+/issue+/$id.association.delete.$type.$associationId.tsxindex 3c6bbcddd9..47f7a9dbb3 100644--- a/apps/erp/app/routes/x+/issue+/$id.association.delete.$type.$associationId.tsx+++ b/apps/erp/app/routes/x+/issue+/$id.association.delete.$type.$associationId.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {deleteIssueAssociation,getIssue,diff --git a/apps/erp/app/routes/x+/issue+/$id.close.tsx b/apps/erp/app/routes/x+/issue+/$id.close.tsxindex 4b329f5058..6ed74ffba6 100644--- a/apps/erp/app/routes/x+/issue+/$id.close.tsx+++ b/apps/erp/app/routes/x+/issue+/$id.close.tsx@@ -8,8 +8,8 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { notifyIssueStatusChanged } from "@carbon/ee/notifications";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { closeIssue } from "~/modules/quality/quality-disposition.server";import { getCompanyIntegrations } from "~/modules/settings/settings.server";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/issue+/$id.details.tsx b/apps/erp/app/routes/x+/issue+/$id.details.tsxindex 49c037fe02..a183fe06eb 100644--- a/apps/erp/app/routes/x+/issue+/$id.details.tsx+++ b/apps/erp/app/routes/x+/issue+/$id.details.tsx@@ -8,10 +8,11 @@ import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";import { Spinner, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import { Suspense } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import { DeferredFiles, Documents } from "~/components";import { useRouteData } from "~/hooks";import type { IssueAssociationNode } from "~/modules/quality";diff --git a/apps/erp/app/routes/x+/issue+/$id.status.tsx b/apps/erp/app/routes/x+/issue+/$id.status.tsxindex e70a14bcf8..4b7ac97ec5 100644--- a/apps/erp/app/routes/x+/issue+/$id.status.tsx+++ b/apps/erp/app/routes/x+/issue+/$id.status.tsx@@ -8,8 +8,8 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { notifyIssueStatusChanged } from "@carbon/ee/notifications";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { nonConformanceStatus, updateIssueStatus } from "~/modules/quality";import { getCompanyIntegrations } from "~/modules/settings/settings.server";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/issue+/$id.supplier-return.tsx b/apps/erp/app/routes/x+/issue+/$id.supplier-return.tsxindex 3f0176d902..6fc9b581d6 100644--- a/apps/erp/app/routes/x+/issue+/$id.supplier-return.tsx+++ b/apps/erp/app/routes/x+/issue+/$id.supplier-return.tsx@@ -7,9 +7,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { getCompanyTimeZone } from "@carbon/database";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {deletePurchaseReturnOrder,insertPurchaseReturnOrder,diff --git a/apps/erp/app/routes/x+/issue+/$id.tsx b/apps/erp/app/routes/x+/issue+/$id.tsxindex 9093ecd75f..3e14d8e300 100644--- a/apps/erp/app/routes/x+/issue+/$id.tsx+++ b/apps/erp/app/routes/x+/issue+/$id.tsx@@ -7,7 +7,7 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { useLingui } from "@lingui/react/macro";import { Suspense } from "react";@@ -15,13 +15,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- Await,- Outlet,- redirect,- useLoaderData,- useParams-} from "react-router";+import { Await, Outlet, useLoaderData, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import {getChangeNoticesForNonConformance,diff --git a/apps/erp/app/routes/x+/issue+/_layout.tsx b/apps/erp/app/routes/x+/issue+/_layout.tsxindex 95011ec591..d73eb6d933 100644--- a/apps/erp/app/routes/x+/issue+/_layout.tsx+++ b/apps/erp/app/routes/x+/issue+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Issue" }];};diff --git a/apps/erp/app/routes/x+/issue+/delete.$id.tsx b/apps/erp/app/routes/x+/issue+/delete.$id.tsxindex 4e76249df6..bf504bfcef 100644--- a/apps/erp/app/routes/x+/issue+/delete.$id.tsx+++ b/apps/erp/app/routes/x+/issue+/delete.$id.tsx@@ -5,8 +5,9 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteIssue } from "~/modules/quality";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/issue+/new.tsx b/apps/erp/app/routes/x+/issue+/new.tsxindex c21b3e94ac..96c3f96a36 100644--- a/apps/erp/app/routes/x+/issue+/new.tsx+++ b/apps/erp/app/routes/x+/issue+/new.tsx@@ -11,10 +11,11 @@ import { notifyIssueCreated } from "@carbon/ee/notifications";import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import { getLocalTimeZone, today } from "@internationalized/date";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { useUrlParams, useUser } from "~/hooks";import { updateChangeNotice } from "~/modules/items";import {diff --git a/apps/erp/app/routes/x+/issue-workflow+/$id.tsx b/apps/erp/app/routes/x+/issue-workflow+/$id.tsxindex e71ab86f77..f04f09e174 100644--- a/apps/erp/app/routes/x+/issue-workflow+/$id.tsx+++ b/apps/erp/app/routes/x+/issue-workflow+/$id.tsx@@ -8,15 +8,10 @@ import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";import { ScrollArea } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import {- data,- redirect,- useLoaderData,- useNavigate,- useParams-} from "react-router";+import { data, useLoaderData, useNavigate, useParams } from "react-router";import {getIssueWorkflow,getRequiredActionsList,diff --git a/apps/erp/app/routes/x+/issue-workflow+/_layout.tsx b/apps/erp/app/routes/x+/issue-workflow+/_layout.tsxindex b8a8be6f2d..13abb3fb45 100644--- a/apps/erp/app/routes/x+/issue-workflow+/_layout.tsx+++ b/apps/erp/app/routes/x+/issue-workflow+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Issue Workflows" }];};diff --git a/apps/erp/app/routes/x+/issue-workflow+/delete.$id.tsx b/apps/erp/app/routes/x+/issue-workflow+/delete.$id.tsxindex dfb4a16086..0f0842c0e7 100644--- a/apps/erp/app/routes/x+/issue-workflow+/delete.$id.tsx+++ b/apps/erp/app/routes/x+/issue-workflow+/delete.$id.tsx@@ -5,8 +5,9 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteIssueWorkflow } from "~/modules/quality";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/issue-workflow+/new.tsx b/apps/erp/app/routes/x+/issue-workflow+/new.tsxindex b16fd9b988..8cc247de30 100644--- a/apps/erp/app/routes/x+/issue-workflow+/new.tsx+++ b/apps/erp/app/routes/x+/issue-workflow+/new.tsx@@ -6,9 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { ScrollArea } from "@carbon/react";+import { ScrollArea, useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import { issueWorkflowValidator } from "~/modules/quality/quality.models";import {getRequiredActionsList,@@ -68,7 +69,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function NewIssueWorkflowRoute() {const { requiredActions } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",content: "{}",@@ -83,7 +84,7 @@ export default function NewIssueWorkflowRoute() {<IssueWorkflowForminitialValues={initialValues}requiredActions={requiredActions}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/></ScrollArea>);diff --git a/apps/erp/app/routes/x+/items+/_index.tsx b/apps/erp/app/routes/x+/items+/_index.tsxindex 71927bd099..aa9597defd 100644--- a/apps/erp/app/routes/x+/items+/_index.tsx+++ b/apps/erp/app/routes/x+/items+/_index.tsx@@ -2,8 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";-import { redirect } from "react-router";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import { path } from "~/utils/path";export async function loader() {diff --git a/apps/erp/app/routes/x+/items+/_layout.tsx b/apps/erp/app/routes/x+/items+/_layout.tsxindex 1ca64eb745..28bcb58d78 100644--- a/apps/erp/app/routes/x+/items+/_layout.tsx+++ b/apps/erp/app/routes/x+/items+/_layout.tsx@@ -11,6 +11,8 @@ import useItemsSubmodules from "~/modules/items/ui/useItemsSubmodules";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Items" }];};diff --git a/apps/erp/app/routes/x+/items+/change-notice+/$id.$affectedId.details.$supplierPartId.delete.tsx b/apps/erp/app/routes/x+/items+/change-notice+/$id.$affectedId.details.$supplierPartId.delete.tsxindex e441d003bc..ca8bbcf1d0 100644--- a/apps/erp/app/routes/x+/items+/change-notice+/$id.$affectedId.details.$supplierPartId.delete.tsx+++ b/apps/erp/app/routes/x+/items+/change-notice+/$id.$affectedId.details.$supplierPartId.delete.tsx@@ -5,8 +5,8 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteSupplierPart } from "~/modules/items";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/items+/change-notice+/$id._index.tsx b/apps/erp/app/routes/x+/items+/change-notice+/$id._index.tsxindex 848dd670a6..d5b4c9acd0 100644--- a/apps/erp/app/routes/x+/items+/change-notice+/$id._index.tsx+++ b/apps/erp/app/routes/x+/items+/change-notice+/$id._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/items+/change-notice+/$id.status.tsx b/apps/erp/app/routes/x+/items+/change-notice+/$id.status.tsxindex c7550347a5..c2c1657381 100644--- a/apps/erp/app/routes/x+/items+/change-notice+/$id.status.tsx+++ b/apps/erp/app/routes/x+/items+/change-notice+/$id.status.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {changeNoticeNotifyStages,changeNoticeStatusValidator,diff --git a/apps/erp/app/routes/x+/items+/change-notice+/$id.tsx b/apps/erp/app/routes/x+/items+/change-notice+/$id.tsxindex 5fb5ce6615..2a487ce424 100644--- a/apps/erp/app/routes/x+/items+/change-notice+/$id.tsx+++ b/apps/erp/app/routes/x+/items+/change-notice+/$id.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData, useParams } from "react-router";+import { Outlet, useLoaderData, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import {getChangeNotice,diff --git a/apps/erp/app/routes/x+/items+/change-notice+/delete.$id.tsx b/apps/erp/app/routes/x+/items+/change-notice+/delete.$id.tsxindex fdda4784da..438cd311fb 100644--- a/apps/erp/app/routes/x+/items+/change-notice+/delete.$id.tsx+++ b/apps/erp/app/routes/x+/items+/change-notice+/delete.$id.tsx@@ -5,8 +5,9 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteChangeNotice } from "~/modules/items";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/items+/change-notice+/new-from-item.$itemId.tsx b/apps/erp/app/routes/x+/items+/change-notice+/new-from-item.$itemId.tsxindex 208bc379cb..fa8d12ee58 100644--- a/apps/erp/app/routes/x+/items+/change-notice+/new-from-item.$itemId.tsx+++ b/apps/erp/app/routes/x+/items+/change-notice+/new-from-item.$itemId.tsx@@ -5,9 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {addChangeNoticeAffectedItem,type ChangeNoticeChangeType,diff --git a/apps/erp/app/routes/x+/items+/change-notice-actions.$id.tsx b/apps/erp/app/routes/x+/items+/change-notice-actions.$id.tsxindex fa55bd3f04..c13b60e266 100644--- a/apps/erp/app/routes/x+/items+/change-notice-actions.$id.tsx+++ b/apps/erp/app/routes/x+/items+/change-notice-actions.$id.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {changeNoticeRequiredActionValidator,getChangeNoticeRequiredAction,@@ -90,7 +92,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function EditChangeNoticeRequiredActionRoute() {const { requiredAction } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: requiredAction.id ?? undefined,@@ -102,7 +104,7 @@ export default function EditChangeNoticeRequiredActionRoute() {<ChangeNoticeRequiredActionFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/items+/change-notice-actions.delete.$id.tsx b/apps/erp/app/routes/x+/items+/change-notice-actions.delete.$id.tsxindex f7db512e04..5b898d7c22 100644--- a/apps/erp/app/routes/x+/items+/change-notice-actions.delete.$id.tsx+++ b/apps/erp/app/routes/x+/items+/change-notice-actions.delete.$id.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import {deleteChangeNoticeRequiredAction,diff --git a/apps/erp/app/routes/x+/items+/change-notice-actions.new.tsx b/apps/erp/app/routes/x+/items+/change-notice-actions.new.tsxindex ab118d80a9..96b4c846fd 100644--- a/apps/erp/app/routes/x+/items+/change-notice-actions.new.tsx+++ b/apps/erp/app/routes/x+/items+/change-notice-actions.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import {changeNoticeRequiredActionValidator,upsertChangeNoticeRequiredAction@@ -68,7 +69,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewChangeNoticeRequiredActionRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",active: true@@ -77,7 +78,7 @@ export default function NewChangeNoticeRequiredActionRoute() {return (<ChangeNoticeRequiredActionForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/items+/change-notice-types.$id.tsx b/apps/erp/app/routes/x+/items+/change-notice-types.$id.tsxindex b929287869..f588d6a2d9 100644--- a/apps/erp/app/routes/x+/items+/change-notice-types.$id.tsx+++ b/apps/erp/app/routes/x+/items+/change-notice-types.$id.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {changeNoticeTypeValidator,getChangeNoticeType,@@ -85,7 +87,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function EditChangeNoticeTypeRoute() {const { changeNoticeType } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: changeNoticeType.id ?? undefined,@@ -96,7 +98,7 @@ export default function EditChangeNoticeTypeRoute() {<ChangeNoticeTypeFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/items+/change-notice-types.delete.$id.tsx b/apps/erp/app/routes/x+/items+/change-notice-types.delete.$id.tsxindex 3040de6902..409e777721 100644--- a/apps/erp/app/routes/x+/items+/change-notice-types.delete.$id.tsx+++ b/apps/erp/app/routes/x+/items+/change-notice-types.delete.$id.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteChangeNoticeType, getChangeNoticeType } from "~/modules/items";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/items+/change-notice-types.new.tsx b/apps/erp/app/routes/x+/items+/change-notice-types.new.tsxindex ea92e910a6..44ad400d39 100644--- a/apps/erp/app/routes/x+/items+/change-notice-types.new.tsx+++ b/apps/erp/app/routes/x+/items+/change-notice-types.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import {changeNoticeTypeValidator,upsertChangeNoticeType@@ -67,7 +68,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewChangeNoticeTypeRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: ""};@@ -75,7 +76,7 @@ export default function NewChangeNoticeTypeRoute() {return (<ChangeNoticeTypeForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/items+/change-notices+/_index.tsx b/apps/erp/app/routes/x+/items+/change-notices+/_index.tsxindex 8f21eba2c8..e257343dcc 100644--- a/apps/erp/app/routes/x+/items+/change-notices+/_index.tsx+++ b/apps/erp/app/routes/x+/items+/change-notices+/_index.tsx@@ -6,8 +6,9 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getChangeNotices, getChangeNoticeTypesList } from "~/modules/items";import { ChangeNoticesTable } from "~/modules/items/ui/ChangeNotice";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/items+/change-order+/$.tsx b/apps/erp/app/routes/x+/items+/change-order+/$.tsxindex 540e06c2de..02f53ed43e 100644--- a/apps/erp/app/routes/x+/items+/change-order+/$.tsx+++ b/apps/erp/app/routes/x+/items+/change-order+/$.tsx@@ -2,8 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";// Legacy URL shim: /x/items/change-order/* → /x/items/change-notice/*export async function loader({ request }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/items+/change-order-actions.$.tsx b/apps/erp/app/routes/x+/items+/change-order-actions.$.tsxindex 6a6c325f5c..4b50800577 100644--- a/apps/erp/app/routes/x+/items+/change-order-actions.$.tsx+++ b/apps/erp/app/routes/x+/items+/change-order-actions.$.tsx@@ -2,8 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";// Legacy URL shim: /x/items/change-order-actions/* → /x/items/change-notice-actions/*export async function loader({ request }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/items+/change-order-types.$.tsx b/apps/erp/app/routes/x+/items+/change-order-types.$.tsxindex 289dadeed1..0e07d9287c 100644--- a/apps/erp/app/routes/x+/items+/change-order-types.$.tsx+++ b/apps/erp/app/routes/x+/items+/change-order-types.$.tsx@@ -2,8 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";// Legacy URL shim: /x/items/change-order-types/* → /x/items/change-notice-types/*export async function loader({ request }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/items+/change-orders+/_index.tsx b/apps/erp/app/routes/x+/items+/change-orders+/_index.tsxindex 38a2944a0f..ba36a99fa7 100644--- a/apps/erp/app/routes/x+/items+/change-orders+/_index.tsx+++ b/apps/erp/app/routes/x+/items+/change-orders+/_index.tsx@@ -2,8 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";-import { redirect } from "react-router";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import { path } from "~/utils/path";// Legacy URL shim: /x/items/change-orders → /x/items/change-noticesdiff --git a/apps/erp/app/routes/x+/items+/consumables.tsx b/apps/erp/app/routes/x+/items+/consumables.tsxindex 9d31d2281a..197859ce1d 100644--- a/apps/erp/app/routes/x+/items+/consumables.tsx+++ b/apps/erp/app/routes/x+/items+/consumables.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getConsumables } from "~/modules/items";import { ConsumablesTable } from "~/modules/items/ui/Consumables";import { getTagsList } from "~/modules/shared";diff --git a/apps/erp/app/routes/x+/items+/delete.$itemId.tsx b/apps/erp/app/routes/x+/items+/delete.$itemId.tsxindex f9d9e930ce..c0e2c778b3 100644--- a/apps/erp/app/routes/x+/items+/delete.$itemId.tsx+++ b/apps/erp/app/routes/x+/items+/delete.$itemId.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteItem } from "~/modules/items";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/items+/dimensions.$id.tsx b/apps/erp/app/routes/x+/items+/dimensions.$id.tsxindex d9c8a7c22f..52683451d4 100644--- a/apps/erp/app/routes/x+/items+/dimensions.$id.tsx+++ b/apps/erp/app/routes/x+/items+/dimensions.$id.tsx@@ -6,15 +6,16 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getMaterialDimension,materialDimensionValidator,upsertMaterialDimension} from "~/modules/items";import MaterialDimensionForm from "~/modules/items/ui/MaterialDimensions/MaterialDimensionForm";-import { getParams, path } from "~/utils/path";export async function loader({ request, params }: LoaderFunctionArgs) {@@ -85,7 +86,7 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function EditMaterialDimensionsRoute() {const { materialDimension } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: materialDimension?.id ?? undefined,@@ -97,7 +98,7 @@ export default function EditMaterialDimensionsRoute() {<MaterialDimensionFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/items+/dimensions.delete.$id.tsx b/apps/erp/app/routes/x+/items+/dimensions.delete.$id.tsxindex 76606d91c8..54610a8cf1 100644--- a/apps/erp/app/routes/x+/items+/dimensions.delete.$id.tsx+++ b/apps/erp/app/routes/x+/items+/dimensions.delete.$id.tsx@@ -5,9 +5,11 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteMaterialDimension, getMaterialDimension } from "~/modules/items";import { getParams, path } from "~/utils/path";@@ -71,12 +73,12 @@ export default function DeleteMaterialDimensionRoute() {if (!id) throw new Error("id not found");const { materialDimension } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();if (!materialDimension) return null;- const onCancel = () => navigate(-1);+ const onCancel = () => closeRoute();return (<ConfirmDeletediff --git a/apps/erp/app/routes/x+/items+/dimensions.new.tsx b/apps/erp/app/routes/x+/items+/dimensions.new.tsxindex 430d3c3940..14dfa31f8c 100644--- a/apps/erp/app/routes/x+/items+/dimensions.new.tsx+++ b/apps/erp/app/routes/x+/items+/dimensions.new.tsx@@ -6,15 +6,16 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import {materialDimensionValidator,upsertMaterialDimension} from "~/modules/items";import MaterialDimensionForm from "~/modules/items/ui/MaterialDimensions/MaterialDimensionForm";import { getCompanySettings } from "~/modules/settings";-import { getParams, path } from "~/utils/path";export async function loader({ request }: LoaderFunctionArgs) {@@ -86,7 +87,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewMaterialDimensionsRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",materialFormId: ""@@ -94,7 +95,7 @@ export default function NewMaterialDimensionsRoute() {return (<MaterialDimensionForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/items+/dimensions.tsx b/apps/erp/app/routes/x+/items+/dimensions.tsxindex eb41430b19..eb556fd67b 100644--- a/apps/erp/app/routes/x+/items+/dimensions.tsx+++ b/apps/erp/app/routes/x+/items+/dimensions.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getMaterialDimensions } from "~/modules/items";import MaterialDimensionsTable from "~/modules/items/ui/MaterialDimensions/MaterialDimensionsTable";import { getCompanySettings } from "~/modules/settings/settings.service";diff --git a/apps/erp/app/routes/x+/items+/finishes.$id.tsx b/apps/erp/app/routes/x+/items+/finishes.$id.tsxindex 3a42a0b076..4ababd9355 100644--- a/apps/erp/app/routes/x+/items+/finishes.$id.tsx+++ b/apps/erp/app/routes/x+/items+/finishes.$id.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getMaterialFinish,materialFinishValidator,@@ -84,7 +86,7 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function EditMaterialFinishsRoute() {const { materialFinish } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: materialFinish?.id ?? undefined,@@ -96,7 +98,7 @@ export default function EditMaterialFinishsRoute() {<MaterialFinishFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/items+/finishes.delete.$id.tsx b/apps/erp/app/routes/x+/items+/finishes.delete.$id.tsxindex 98f06512c1..f946d9d441 100644--- a/apps/erp/app/routes/x+/items+/finishes.delete.$id.tsx+++ b/apps/erp/app/routes/x+/items+/finishes.delete.$id.tsx@@ -5,9 +5,11 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteMaterialFinish, getMaterialFinish } from "~/modules/items";import { getParams, path } from "~/utils/path";@@ -68,12 +70,12 @@ export default function DeleteMaterialFinishRoute() {if (!id) throw new Error("id not found");const { materialFinish } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();if (!materialFinish) return null;- const onCancel = () => navigate(-1);+ const onCancel = () => closeRoute();return (<ConfirmDeletediff --git a/apps/erp/app/routes/x+/items+/finishes.new.tsx b/apps/erp/app/routes/x+/items+/finishes.new.tsxindex b9022d4328..5730f2dd6a 100644--- a/apps/erp/app/routes/x+/items+/finishes.new.tsx+++ b/apps/erp/app/routes/x+/items+/finishes.new.tsx@@ -6,11 +6,12 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import { materialFinishValidator, upsertMaterialFinish } from "~/modules/items";import MaterialFinishForm from "~/modules/items/ui/MaterialFinishes/MaterialFinishForm";-import { getParams, path } from "~/utils/path";export async function loader({ request }: LoaderFunctionArgs) {@@ -75,7 +76,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewMaterialFinishsRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",materialSubstanceId: ""@@ -83,7 +84,7 @@ export default function NewMaterialFinishsRoute() {return (<MaterialFinishForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/items+/finishes.tsx b/apps/erp/app/routes/x+/items+/finishes.tsxindex 2f06ec47cd..9a470e3f42 100644--- a/apps/erp/app/routes/x+/items+/finishes.tsx+++ b/apps/erp/app/routes/x+/items+/finishes.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getMaterialFinishes } from "~/modules/items";import MaterialFinishesTable from "~/modules/items/ui/MaterialFinishes/MaterialFinishesTable";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/items+/forms.$formId.tsx b/apps/erp/app/routes/x+/items+/forms.$formId.tsxindex ef766b2330..62444a5dcd 100644--- a/apps/erp/app/routes/x+/items+/forms.$formId.tsx+++ b/apps/erp/app/routes/x+/items+/forms.$formId.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getMaterialForm,materialFormValidator,@@ -84,7 +86,7 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function EditMaterialFormsRoute() {const { materialForm } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: materialForm?.id ?? undefined,@@ -97,7 +99,7 @@ export default function EditMaterialFormsRoute() {<MaterialShapeFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/items+/forms.delete.$formId.tsx b/apps/erp/app/routes/x+/items+/forms.delete.$formId.tsxindex 95a50a3c55..5a3ec5f547 100644--- a/apps/erp/app/routes/x+/items+/forms.delete.$formId.tsx+++ b/apps/erp/app/routes/x+/items+/forms.delete.$formId.tsx@@ -5,9 +5,11 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteMaterialForm, getMaterialForm } from "~/modules/items";import { getParams, path } from "~/utils/path";@@ -68,12 +70,12 @@ export default function DeleteMaterialFormRoute() {if (!formId) throw new Error("formId not found");const { materialForm } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();if (!materialForm) return null;- const onCancel = () => navigate(-1);+ const onCancel = () => closeRoute();return (<ConfirmDeletediff --git a/apps/erp/app/routes/x+/items+/forms.new.tsx b/apps/erp/app/routes/x+/items+/forms.new.tsxindex d5c0c30778..d238343d15 100644--- a/apps/erp/app/routes/x+/items+/forms.new.tsx+++ b/apps/erp/app/routes/x+/items+/forms.new.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import { materialFormValidator, upsertMaterialForm } from "~/modules/items";import { MaterialShapeForm } from "~/modules/items/ui/MaterialShapes";import { setCustomFields } from "~/utils/form";@@ -75,7 +77,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewMaterialFormsRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",code: "",@@ -84,7 +86,7 @@ export default function NewMaterialFormsRoute() {return (<MaterialShapeForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/items+/forms.tsx b/apps/erp/app/routes/x+/items+/forms.tsxindex 137c67f81e..10d5aca7bf 100644--- a/apps/erp/app/routes/x+/items+/forms.tsx+++ b/apps/erp/app/routes/x+/items+/forms.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getMaterialForms } from "~/modules/items";import { MaterialFormsTable } from "~/modules/items/ui/MaterialShapes";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/items+/grades.$id.tsx b/apps/erp/app/routes/x+/items+/grades.$id.tsxindex 3bdd78d4df..ae9c8644a8 100644--- a/apps/erp/app/routes/x+/items+/grades.$id.tsx+++ b/apps/erp/app/routes/x+/items+/grades.$id.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getMaterialGrade,materialGradeValidator,@@ -82,7 +84,7 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function EditMaterialGradesRoute() {const { materialGrade } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: materialGrade?.id ?? undefined,@@ -94,7 +96,7 @@ export default function EditMaterialGradesRoute() {<MaterialGradeFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/items+/grades.delete.$id.tsx b/apps/erp/app/routes/x+/items+/grades.delete.$id.tsxindex e735a1ed7f..2dbed1884b 100644--- a/apps/erp/app/routes/x+/items+/grades.delete.$id.tsx+++ b/apps/erp/app/routes/x+/items+/grades.delete.$id.tsx@@ -5,9 +5,11 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteMaterialGrade, getMaterialGrade } from "~/modules/items";import { getParams, path } from "~/utils/path";@@ -68,12 +70,12 @@ export default function DeleteMaterialGradeRoute() {if (!id) throw new Error("id not found");const { materialGrade } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();if (!materialGrade) return null;- const onCancel = () => navigate(-1);+ const onCancel = () => closeRoute();return (<ConfirmDeletediff --git a/apps/erp/app/routes/x+/items+/grades.new.tsx b/apps/erp/app/routes/x+/items+/grades.new.tsxindex f574bc4c88..283ccff5a4 100644--- a/apps/erp/app/routes/x+/items+/grades.new.tsx+++ b/apps/erp/app/routes/x+/items+/grades.new.tsx@@ -6,11 +6,12 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import { materialGradeValidator, upsertMaterialGrade } from "~/modules/items";import MaterialGradeForm from "~/modules/items/ui/MaterialGrades/MaterialGradeForm";-import { getParams, path } from "~/utils/path";export async function loader({ request }: LoaderFunctionArgs) {@@ -73,7 +74,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewMaterialGradesRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",materialSubstanceId: ""@@ -81,7 +82,7 @@ export default function NewMaterialGradesRoute() {return (<MaterialGradeForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/items+/grades.tsx b/apps/erp/app/routes/x+/items+/grades.tsxindex 7672fa7d98..753c085f58 100644--- a/apps/erp/app/routes/x+/items+/grades.tsx+++ b/apps/erp/app/routes/x+/items+/grades.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getMaterialGrades } from "~/modules/items";import MaterialGradesTable from "~/modules/items/ui/MaterialGrades/MaterialGradesTable";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/items+/groups.$groupId.tsx b/apps/erp/app/routes/x+/items+/groups.$groupId.tsxindex 543a0d1558..a88258a51a 100644--- a/apps/erp/app/routes/x+/items+/groups.$groupId.tsx+++ b/apps/erp/app/routes/x+/items+/groups.$groupId.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getItemPostingGroup,itemPostingGroupValidator,@@ -97,7 +99,7 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {export default function EditItemPostingGroupsRoute() {const { itemPostingGroup } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: itemPostingGroup?.id ?? undefined,@@ -110,7 +112,7 @@ export default function EditItemPostingGroupsRoute() {<ItemPostingGroupFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/items+/groups.delete.$groupId.tsx b/apps/erp/app/routes/x+/items+/groups.delete.$groupId.tsxindex 2b9b2f8b74..6d9ca45815 100644--- a/apps/erp/app/routes/x+/items+/groups.delete.$groupId.tsx+++ b/apps/erp/app/routes/x+/items+/groups.delete.$groupId.tsx@@ -5,13 +5,15 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteItemPostingGroup, getItemPostingGroup } from "~/modules/items";import { getParams, path } from "~/utils/path";@@ -84,12 +86,12 @@ export default function DeleteItemPostingGroupRoute() {if (!groupId) throw new Error("groupId not found");const { itemPostingGroup } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();if (!itemPostingGroup) return null;- const onCancel = () => navigate(-1);+ const onCancel = () => closeRoute();return (<ConfirmDeletediff --git a/apps/erp/app/routes/x+/items+/groups.new.tsx b/apps/erp/app/routes/x+/items+/groups.new.tsxindex 49d4b2cf76..98addcd10d 100644--- a/apps/erp/app/routes/x+/items+/groups.new.tsx+++ b/apps/erp/app/routes/x+/items+/groups.new.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import {itemPostingGroupValidator,upsertItemPostingGroup@@ -93,7 +95,7 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {}export default function NewItemPostingGroupsRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",description: ""@@ -101,7 +103,7 @@ export default function NewItemPostingGroupsRoute() {return (<ItemPostingGroupForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/items+/groups.tsx b/apps/erp/app/routes/x+/items+/groups.tsxindex 5456a45270..c7801dac5c 100644--- a/apps/erp/app/routes/x+/items+/groups.tsx+++ b/apps/erp/app/routes/x+/items+/groups.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getAccountsList } from "~/modules/accounting";import { getItemPostingGroups } from "~/modules/items";import { ItemPostingGroupsTable } from "~/modules/items/ui/ItemPostingGroups";diff --git a/apps/erp/app/routes/x+/items+/materials.tsx b/apps/erp/app/routes/x+/items+/materials.tsxindex d740143875..2fc6e1f059 100644--- a/apps/erp/app/routes/x+/items+/materials.tsx+++ b/apps/erp/app/routes/x+/items+/materials.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getMaterials } from "~/modules/items";import { MaterialsTable } from "~/modules/items/ui/Materials";import { getTagsList } from "~/modules/shared";diff --git a/apps/erp/app/routes/x+/items+/methods+/get.tsx b/apps/erp/app/routes/x+/items+/methods+/get.tsxindex 45651038a6..361275b0f6 100644--- a/apps/erp/app/routes/x+/items+/methods+/get.tsx+++ b/apps/erp/app/routes/x+/items+/methods+/get.tsx@@ -7,8 +7,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { copyItem, copyMakeMethod, getMethodValidator } from "~/modules/items";import { checkRevisionLock } from "~/modules/items/items.server";import { getDatabaseClient } from "~/services/database.server";diff --git a/apps/erp/app/routes/x+/items+/methods+/materials.tsx b/apps/erp/app/routes/x+/items+/methods+/materials.tsxindex 1b217a1e0c..f1a439a661 100644--- a/apps/erp/app/routes/x+/items+/methods+/materials.tsx+++ b/apps/erp/app/routes/x+/items+/methods+/materials.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getMethodMaterials } from "~/modules/items";import { MethodMaterialsTable } from "~/modules/items/ui/Methods";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/items+/methods+/operations.tsx b/apps/erp/app/routes/x+/items+/methods+/operations.tsxindex 042331690a..7ee5be6ba1 100644--- a/apps/erp/app/routes/x+/items+/methods+/operations.tsx+++ b/apps/erp/app/routes/x+/items+/methods+/operations.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getMethodOperations } from "~/modules/items";import { MethodOperationsTable } from "~/modules/items/ui/Methods";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/items+/methods+/save.tsx b/apps/erp/app/routes/x+/items+/methods+/save.tsxindex f0d60e0949..3f0ad341d3 100644--- a/apps/erp/app/routes/x+/items+/methods+/save.tsx+++ b/apps/erp/app/routes/x+/items+/methods+/save.tsx@@ -7,8 +7,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { copyItem, copyMakeMethod, getMethodValidator } from "~/modules/items";import { checkRevisionLock } from "~/modules/items/items.server";import { getDatabaseClient } from "~/services/database.server";diff --git a/apps/erp/app/routes/x+/items+/methods+/version.new.tsx b/apps/erp/app/routes/x+/items+/methods+/version.new.tsxindex 9464937066..d5d30b17ba 100644--- a/apps/erp/app/routes/x+/items+/methods+/version.new.tsx+++ b/apps/erp/app/routes/x+/items+/methods+/version.new.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {copyMakeMethod,makeMethodVersionValidator,diff --git a/apps/erp/app/routes/x+/items+/methods+/versions.activate.$id.tsx b/apps/erp/app/routes/x+/items+/methods+/versions.activate.$id.tsxindex e550ebbc56..ea58be777a 100644--- a/apps/erp/app/routes/x+/items+/methods+/versions.activate.$id.tsx+++ b/apps/erp/app/routes/x+/items+/methods+/versions.activate.$id.tsx@@ -7,9 +7,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";-import { getRequestOrigin } from "@carbon/utils";+import { getRequestOrigin, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { checkRevisionLock } from "~/modules/items/items.server";import { activateMethodVersion } from "~/modules/items/items.service";import { getDatabaseClient } from "~/services/database.server";diff --git a/apps/erp/app/routes/x+/items+/parts.tsx b/apps/erp/app/routes/x+/items+/parts.tsxindex 8bfee07396..d53419e12f 100644--- a/apps/erp/app/routes/x+/items+/parts.tsx+++ b/apps/erp/app/routes/x+/items+/parts.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getParts } from "~/modules/items";import { PartsTable } from "~/modules/items/ui/Parts";import { getTagsList } from "~/modules/shared";diff --git a/apps/erp/app/routes/x+/items+/rules.assign.$itemId.tsx b/apps/erp/app/routes/x+/items+/rules.assign.$itemId.tsxindex fe6c1e5a2e..0cf1fcd9ec 100644--- a/apps/erp/app/routes/x+/items+/rules.assign.$itemId.tsx+++ b/apps/erp/app/routes/x+/items+/rules.assign.$itemId.tsx@@ -7,9 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";import { assignStorageRule } from "@carbon/ee/rules.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";-import { path } from "~/utils/path";+import { path, requestReferrer } from "~/utils/path";export async function action({ request, params }: ActionFunctionArgs) {assertIsPost(request);@@ -32,7 +32,7 @@ export async function action({ request, params }: ActionFunctionArgs) {const ruleId = String(formData.get("ruleId") ?? "");if (!ruleId) {throw redirect(- request.headers.get("Referer") ?? path.to.storageRules,+ requestReferrer(request) ?? path.to.storageRules,await flash(request, error(null, "Rule id required")));}@@ -47,13 +47,13 @@ export async function action({ request, params }: ActionFunctionArgs) {if (result.error) {throw redirect(- request.headers.get("Referer") ?? path.to.storageRules,+ requestReferrer(request) ?? path.to.storageRules,await flash(request, error(result.error, "Failed to assign rule")));}throw redirect(- request.headers.get("Referer") ?? path.to.storageRules,+ requestReferrer(request) ?? path.to.storageRules,await flash(request, success("Rule assigned")));}diff --git a/apps/erp/app/routes/x+/items+/rules.unassign.$itemId.$ruleId.tsx b/apps/erp/app/routes/x+/items+/rules.unassign.$itemId.$ruleId.tsxindex 8c307fc925..c56e0921c3 100644--- a/apps/erp/app/routes/x+/items+/rules.unassign.$itemId.$ruleId.tsx+++ b/apps/erp/app/routes/x+/items+/rules.unassign.$itemId.$ruleId.tsx@@ -7,9 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";import { unassignStorageRule } from "@carbon/ee/rules.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";-import { path } from "~/utils/path";+import { path, requestReferrer } from "~/utils/path";export async function action({ request, params }: ActionFunctionArgs) {assertIsPost(request);@@ -36,13 +36,13 @@ export async function action({ request, params }: ActionFunctionArgs) {});if (result.error) {throw redirect(- request.headers.get("Referer") ?? path.to.storageRules,+ requestReferrer(request) ?? path.to.storageRules,await flash(request, error(result.error, "Failed to unassign rule")));}throw redirect(- request.headers.get("Referer") ?? path.to.storageRules,+ requestReferrer(request) ?? path.to.storageRules,await flash(request, success("Rule unassigned")));}diff --git a/apps/erp/app/routes/x+/items+/services.tsx b/apps/erp/app/routes/x+/items+/services.tsxindex d343c249f7..3ca17fc165 100644--- a/apps/erp/app/routes/x+/items+/services.tsx+++ b/apps/erp/app/routes/x+/items+/services.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getServices } from "~/modules/items";import { ServicesTable } from "~/modules/items/ui/Services";import { getTagsList } from "~/modules/shared";diff --git a/apps/erp/app/routes/x+/items+/substances.$substanceId.tsx b/apps/erp/app/routes/x+/items+/substances.$substanceId.tsxindex 9f58ce02ee..8cb5618284 100644--- a/apps/erp/app/routes/x+/items+/substances.$substanceId.tsx+++ b/apps/erp/app/routes/x+/items+/substances.$substanceId.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getMaterialSubstance,materialSubstanceValidator,@@ -92,7 +94,7 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function EditMaterialSubstancesRoute() {const { materialSubstance } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: materialSubstance?.id ?? undefined,@@ -105,7 +107,7 @@ export default function EditMaterialSubstancesRoute() {<MaterialSubstanceFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/items+/substances.delete.$substanceId.tsx b/apps/erp/app/routes/x+/items+/substances.delete.$substanceId.tsxindex a80f2d8984..5ae8bde5de 100644--- a/apps/erp/app/routes/x+/items+/substances.delete.$substanceId.tsx+++ b/apps/erp/app/routes/x+/items+/substances.delete.$substanceId.tsx@@ -5,9 +5,11 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteMaterialSubstance, getMaterialSubstance } from "~/modules/items";import { getParams, path } from "~/utils/path";@@ -74,12 +76,12 @@ export default function DeleteMaterialSubstanceRoute() {if (!substanceId) throw new Error("substanceId not found");const { materialSubstance } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();if (!materialSubstance) return null;- const onCancel = () => navigate(-1);+ const onCancel = () => closeRoute();return (<ConfirmDeletediff --git a/apps/erp/app/routes/x+/items+/substances.new.tsx b/apps/erp/app/routes/x+/items+/substances.new.tsxindex a00715497c..573c95d33c 100644--- a/apps/erp/app/routes/x+/items+/substances.new.tsx+++ b/apps/erp/app/routes/x+/items+/substances.new.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import {materialSubstanceValidator,upsertMaterialSubstance@@ -83,7 +85,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewMaterialSubstancesRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",code: "",@@ -92,7 +94,7 @@ export default function NewMaterialSubstancesRoute() {return (<MaterialSubstanceForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/items+/substances.tsx b/apps/erp/app/routes/x+/items+/substances.tsxindex d061a0492f..e0aaf788be 100644--- a/apps/erp/app/routes/x+/items+/substances.tsx+++ b/apps/erp/app/routes/x+/items+/substances.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getMaterialSubstances } from "~/modules/items";import { MaterialSubstancesTable } from "~/modules/items/ui/MaterialSubstances";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/items+/tools.tsx b/apps/erp/app/routes/x+/items+/tools.tsxindex 64379ccabb..f60e60bc44 100644--- a/apps/erp/app/routes/x+/items+/tools.tsx+++ b/apps/erp/app/routes/x+/items+/tools.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getTools } from "~/modules/items";import { ToolsTable } from "~/modules/items/ui/Tools";import { getTagsList } from "~/modules/shared";diff --git a/apps/erp/app/routes/x+/items+/types.$id.tsx b/apps/erp/app/routes/x+/items+/types.$id.tsxindex 5cd8710dc7..a60574b169 100644--- a/apps/erp/app/routes/x+/items+/types.$id.tsx+++ b/apps/erp/app/routes/x+/items+/types.$id.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getMaterialType,materialTypeValidator,@@ -19,7 +21,6 @@ import {} from "~/modules/items";import MaterialTypeForm from "~/modules/items/ui/MaterialTypes/MaterialTypeForm";import { getParams, path } from "~/utils/path";-import { getCompanyId, materialTypesQuery } from "~/utils/react-query";export async function loader({ request, params }: LoaderFunctionArgs) {@@ -112,7 +113,7 @@ export async function clientAction({export default function EditMaterialTypesRoute() {const { materialType } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: materialType?.id ?? undefined,@@ -126,7 +127,7 @@ export default function EditMaterialTypesRoute() {<MaterialTypeFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/items+/types.delete.$id.tsx b/apps/erp/app/routes/x+/items+/types.delete.$id.tsxindex b0f75a1b04..8b6b3e0415 100644--- a/apps/erp/app/routes/x+/items+/types.delete.$id.tsx+++ b/apps/erp/app/routes/x+/items+/types.delete.$id.tsx@@ -5,9 +5,11 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteMaterialType, getMaterialType } from "~/modules/items";import { getParams, path } from "~/utils/path";@@ -68,12 +70,12 @@ export default function DeleteMaterialTypeRoute() {if (!id) throw new Error("id not found");const { materialType } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();if (!materialType) return null;- const onCancel = () => navigate(-1);+ const onCancel = () => closeRoute();return (<ConfirmDeletediff --git a/apps/erp/app/routes/x+/items+/types.new.tsx b/apps/erp/app/routes/x+/items+/types.new.tsxindex 427a073470..a4bf714cd7 100644--- a/apps/erp/app/routes/x+/items+/types.new.tsx+++ b/apps/erp/app/routes/x+/items+/types.new.tsx@@ -6,15 +6,16 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import { materialTypeValidator, upsertMaterialType } from "~/modules/items";import MaterialTypeForm from "~/modules/items/ui/MaterialTypes/MaterialTypeForm";-import { getParams, path } from "~/utils/path";import { getCompanyId, materialTypesQuery } from "~/utils/react-query";@@ -102,7 +103,7 @@ export async function clientAction({}export default function NewMaterialTypesRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",code: "",@@ -112,7 +113,7 @@ export default function NewMaterialTypesRoute() {return (<MaterialTypeForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/items+/types.tsx b/apps/erp/app/routes/x+/items+/types.tsxindex 9b3e67f2ce..e640053d10 100644--- a/apps/erp/app/routes/x+/items+/types.tsx+++ b/apps/erp/app/routes/x+/items+/types.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getMaterialTypes } from "~/modules/items";import MaterialTypesTable from "~/modules/items/ui/MaterialTypes/MaterialTypesTable";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/items+/uom.$uomId.tsx b/apps/erp/app/routes/x+/items+/uom.$uomId.tsxindex e9d928dd9b..37a107f75b 100644--- a/apps/erp/app/routes/x+/items+/uom.$uomId.tsx+++ b/apps/erp/app/routes/x+/items+/uom.$uomId.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getUnitOfMeasure,unitOfMeasureValidator,@@ -84,7 +86,7 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {export default function EditUnitOfMeasuresRoute() {const { unitOfMeasure } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: unitOfMeasure?.id ?? undefined,@@ -97,7 +99,7 @@ export default function EditUnitOfMeasuresRoute() {<UnitOfMeasureFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/items+/uom.delete.$uomId.tsx b/apps/erp/app/routes/x+/items+/uom.delete.$uomId.tsxindex 6fef7c297c..2736b8ea4b 100644--- a/apps/erp/app/routes/x+/items+/uom.delete.$uomId.tsx+++ b/apps/erp/app/routes/x+/items+/uom.delete.$uomId.tsx@@ -5,13 +5,14 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import {deleteUnitOfMeasure,diff --git a/apps/erp/app/routes/x+/items+/uom.new.tsx b/apps/erp/app/routes/x+/items+/uom.new.tsxindex e4825c01f7..89d21ff878 100644--- a/apps/erp/app/routes/x+/items+/uom.new.tsx+++ b/apps/erp/app/routes/x+/items+/uom.new.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import { unitOfMeasureValidator, upsertUnitOfMeasure } from "~/modules/items";import { UnitOfMeasureForm } from "~/modules/items/ui/UnitOfMeasure";import { setCustomFields } from "~/utils/form";@@ -75,7 +77,7 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {}export default function NewUnitOfMeasuresRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",code: ""@@ -83,7 +85,7 @@ export default function NewUnitOfMeasuresRoute() {return (<UnitOfMeasureForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/job+/$jobId._index.tsx b/apps/erp/app/routes/x+/job+/$jobId._index.tsxindex 43130d2542..754ec25d2b 100644--- a/apps/erp/app/routes/x+/job+/$jobId._index.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/job+/$jobId.complete.tsx b/apps/erp/app/routes/x+/job+/$jobId.complete.tsxindex d70165344c..94ec82239f 100644--- a/apps/erp/app/routes/x+/job+/$jobId.complete.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.complete.tsx@@ -8,9 +8,9 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { trackWorkEvent } from "@carbon/lib/telemetry";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {jobCompleteValidator,returnPickedRemaindersForJobdiff --git a/apps/erp/app/routes/x+/job+/$jobId.configure.tsx b/apps/erp/app/routes/x+/job+/$jobId.configure.tsxindex 56b1546c79..499322d333 100644--- a/apps/erp/app/routes/x+/job+/$jobId.configure.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.configure.tsx@@ -7,8 +7,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { trigger } from "@carbon/jobs";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { upsertJobMethod } from "~/modules/production";import { getDatabaseClient } from "~/services/database.server";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/job+/$jobId.dag.tsx b/apps/erp/app/routes/x+/job+/$jobId.dag.tsxindex aa5f762f04..50bba2a793 100644--- a/apps/erp/app/routes/x+/job+/$jobId.dag.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.dag.tsx@@ -6,8 +6,9 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { useMount, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { usePanels } from "~/components/Layout";import {getJob,diff --git a/apps/erp/app/routes/x+/job+/$jobId.delete.tsx b/apps/erp/app/routes/x+/job+/$jobId.delete.tsxindex d127bb6b56..ddb5f4f8b6 100644--- a/apps/erp/app/routes/x+/job+/$jobId.delete.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.delete.tsx@@ -5,8 +5,8 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteJob } from "~/modules/production";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/job+/$jobId.details.tsx b/apps/erp/app/routes/x+/job+/$jobId.details.tsxindex 9ec9ec4609..f34809e34c 100644--- a/apps/erp/app/routes/x+/job+/$jobId.details.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.details.tsx@@ -20,10 +20,11 @@ import {useMount,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { Suspense } from "react";import { LuShoppingCart } from "react-icons/lu";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import {CadModel,DeferredFiles,@@ -78,7 +79,13 @@ export async function loader({ request, params }: LoaderFunctionArgs) {// `client` is the service role (bypassRls) and every read keys on the URL id.await requireCompanyRecord(client, "job", companyId, { id: jobId });- const job = await getJob(client, jobId);+ // After the guard, these three need only the job id: read together, not one+ // after another.+ const [job, rootMethod, tags] = await Promise.all([+ getJob(client, jobId),+ getRootMakeMethod(client, jobId, companyId),+ getTagsList(client, companyId, "operation")+ ]);if (job.error) {throw redirect(path.to.jobs,@@ -86,7 +93,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {);}- const rootMethod = await getRootMakeMethod(client, jobId, companyId);if (rootMethod.error) {return {notes: (job.data?.notes ?? {}) as JSONContent,@@ -106,10 +112,9 @@ export async function loader({ request, params }: LoaderFunctionArgs) {const methodId = rootMethod.data.id;- const [materials, operations, tags, makeMethod] = await Promise.all([+ const [materials, operations, makeMethod] = await Promise.all([getJobMaterialsByMethodId(client, methodId),getJobOperationsByMethodId(client, methodId),- getTagsList(client, companyId, "operation"),getJobMakeMethodById(client, methodId, companyId)]);@@ -271,9 +276,8 @@ export default function JobDetailsRoute() {<JobBillOfProcesskey={`bop:${methodId}`}jobMakeMethodId={methodId}- // @ts-ignorematerials={materials}- // @ts-ignore+ // @ts-expect-erroroperations={operations}locationId={jobData?.job?.locationId ?? ""}tags={tags}@@ -284,9 +288,9 @@ export default function JobDetailsRoute() {<JobBillOfMaterialkey={`bom:${methodId}`}jobMakeMethodId={methodId}- // @ts-ignore+ // @ts-expect-errormaterials={materials}- // @ts-ignore+ // @ts-expect-erroroperations={operations}/></>@@ -311,9 +315,8 @@ export default function JobDetailsRoute() {<Await resolve={productionData}>{(resolvedProductionData) => (<JobEstimatesVsActuals- // @ts-ignorematerials={materials ?? []}- // @ts-ignore+ // @ts-expect-erroroperations={operations}productionEvents={resolvedProductionData.events}productionQuantities={resolvedProductionData.quantities}diff --git a/apps/erp/app/routes/x+/job+/$jobId.events.$id.tsx b/apps/erp/app/routes/x+/job+/$jobId.events.$id.tsxindex 024d4c9978..758dcf2d0e 100644--- a/apps/erp/app/routes/x+/job+/$jobId.events.$id.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.events.$id.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import {getJobOperations,getProductionEvent,diff --git a/apps/erp/app/routes/x+/job+/$jobId.events.new.tsx b/apps/erp/app/routes/x+/job+/$jobId.events.new.tsxindex ffa69eb78b..aeac7531c1 100644--- a/apps/erp/app/routes/x+/job+/$jobId.events.new.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.events.new.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import {getJob,getJobOperations,diff --git a/apps/erp/app/routes/x+/job+/$jobId.events.tsx b/apps/erp/app/routes/x+/job+/$jobId.events.tsxindex 539875329b..05b1ec287b 100644--- a/apps/erp/app/routes/x+/job+/$jobId.events.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.events.tsx@@ -6,12 +6,12 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { useMount, VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { usePanels } from "~/components/Layout";import {getJobOperationsList,diff --git a/apps/erp/app/routes/x+/job+/$jobId.make.$methodId.tsx b/apps/erp/app/routes/x+/job+/$jobId.make.$methodId.tsxindex 80083a6f57..b0740468a8 100644--- a/apps/erp/app/routes/x+/job+/$jobId.make.$methodId.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.make.$methodId.tsx@@ -7,9 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import type { JSONContent } from "@carbon/react";import { Spinner, useMount, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { Suspense } from "react";import type { LoaderFunctionArgs } from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import { CadModel, DeferredFiles } from "~/components";import { usePanels } from "~/components/Layout";import { usePermissions, useRouteData } from "~/hooks";diff --git a/apps/erp/app/routes/x+/job+/$jobId.materials.tsx b/apps/erp/app/routes/x+/job+/$jobId.materials.tsxindex 5ea46ee44e..c1d613287d 100644--- a/apps/erp/app/routes/x+/job+/$jobId.materials.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.materials.tsx@@ -6,9 +6,9 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { useMount, VStack } from "@carbon/react";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { usePanels } from "~/components/Layout";import { useRealtime } from "~/hooks";import { getPicksByJobMaterial } from "~/modules/inventory";diff --git a/apps/erp/app/routes/x+/job+/$jobId.method.$methodId.tsx b/apps/erp/app/routes/x+/job+/$jobId.method.$methodId.tsxindex 944b5c5927..3c2e2ae88c 100644--- a/apps/erp/app/routes/x+/job+/$jobId.method.$methodId.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.method.$methodId.tsx@@ -2,8 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/job+/$jobId.operations.tsx b/apps/erp/app/routes/x+/job+/$jobId.operations.tsxindex f3c636b9f1..e2ad61bdb0 100644--- a/apps/erp/app/routes/x+/job+/$jobId.operations.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.operations.tsx@@ -6,12 +6,12 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { useMount, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { usePanels } from "~/components/Layout";import { getJob, getJobOperations } from "~/modules/production";import { JobOperationsTable } from "~/modules/production/ui/Jobs";-import { path } from "~/utils/path";import { getGenericQueryFilters } from "~/utils/query";diff --git a/apps/erp/app/routes/x+/job+/$jobId.quantities.$id.tsx b/apps/erp/app/routes/x+/job+/$jobId.quantities.$id.tsxindex 5d4cb02537..d71dc09dab 100644--- a/apps/erp/app/routes/x+/job+/$jobId.quantities.$id.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.quantities.$id.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import {getJobOperations,getProductionQuantity,diff --git a/apps/erp/app/routes/x+/job+/$jobId.quantities.new.tsx b/apps/erp/app/routes/x+/job+/$jobId.quantities.new.tsxindex bf74b44a85..21a5b47dda 100644--- a/apps/erp/app/routes/x+/job+/$jobId.quantities.new.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.quantities.new.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { trackWorkEvent } from "@carbon/lib/telemetry";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import {getJob,getJobOperations,diff --git a/apps/erp/app/routes/x+/job+/$jobId.quantities.tsx b/apps/erp/app/routes/x+/job+/$jobId.quantities.tsxindex 0be26b54e0..eb995d0ca1 100644--- a/apps/erp/app/routes/x+/job+/$jobId.quantities.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.quantities.tsx@@ -6,12 +6,12 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { useMount, VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { usePanels } from "~/components/Layout";import {getJobOperationsList,diff --git a/apps/erp/app/routes/x+/job+/$jobId.recalculate.tsx b/apps/erp/app/routes/x+/job+/$jobId.recalculate.tsxindex a95af2df63..c023940268 100644--- a/apps/erp/app/routes/x+/job+/$jobId.recalculate.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.recalculate.tsx@@ -6,8 +6,8 @@ import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { recalculateJobRequirements } from "~/modules/production";import { getDatabaseClient } from "~/services/database.server";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/job+/$jobId.status.tsx b/apps/erp/app/routes/x+/job+/$jobId.status.tsxindex 0d1aac21dc..db577af9aa 100644--- a/apps/erp/app/routes/x+/job+/$jobId.status.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.status.tsx@@ -9,8 +9,8 @@ import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { runLocationSchedule } from "@carbon/planning";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { cancelOpenPickingListsForJob } from "~/modules/inventory";import {getJobReleaseReadiness,diff --git a/apps/erp/app/routes/x+/job+/$jobId.steps.tsx b/apps/erp/app/routes/x+/job+/$jobId.steps.tsxindex e2a0975425..1c47dca8df 100644--- a/apps/erp/app/routes/x+/job+/$jobId.steps.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.steps.tsx@@ -6,12 +6,12 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { useMount, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { usePanels } from "~/components/Layout";import { getJobOperationStepRecords } from "~/modules/production";import { JobOperationStepRecordsTable } from "~/modules/production/ui/Jobs";-import { path } from "~/utils/path";import { getGenericQueryFilters } from "~/utils/query";diff --git a/apps/erp/app/routes/x+/job+/$jobId.tsx b/apps/erp/app/routes/x+/job+/$jobId.tsxindex 422a97b1d6..ff6c490741 100644--- a/apps/erp/app/routes/x+/job+/$jobId.tsx+++ b/apps/erp/app/routes/x+/job+/$jobId.tsx@@ -6,7 +6,7 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { activeJobStatuses } from "@carbon/database";-import { datetime, isUnaffectedByNavigation } from "@carbon/utils";+import { datetime, isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans } from "@lingui/react/macro";import { Suspense, useMemo } from "react";@@ -14,13 +14,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- Await,- Outlet,- redirect,- useLoaderData,- useParams-} from "react-router";+import { Await, Outlet, useLoaderData, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import { ExplorerSkeleton } from "~/components/Skeletons";import { flattenTree } from "~/components/TreeView";diff --git a/apps/erp/app/routes/x+/job+/_layout.tsx b/apps/erp/app/routes/x+/job+/_layout.tsxindex c7c8f3358d..d4940f3670 100644--- a/apps/erp/app/routes/x+/job+/_layout.tsx+++ b/apps/erp/app/routes/x+/job+/_layout.tsx@@ -14,6 +14,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Jobs" }];};diff --git a/apps/erp/app/routes/x+/job+/bulk.new.tsx b/apps/erp/app/routes/x+/job+/bulk.new.tsxindex 5f4de31b95..363826a77d 100644--- a/apps/erp/app/routes/x+/job+/bulk.new.tsx+++ b/apps/erp/app/routes/x+/job+/bulk.new.tsx@@ -8,9 +8,9 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validator } from "@carbon/form";import { batchTrigger } from "@carbon/jobs";+import { redirect } from "@carbon/utils";import { parseDateTime, toCalendarDateTime } from "@internationalized/date";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDefaultStorageUnitForJob } from "~/modules/inventory";import { bulkJobValidator, insertJob } from "~/modules/production";import { requireCompanyRecord } from "~/modules/shared/shared.server";diff --git a/apps/erp/app/routes/x+/job+/methods+/event.delete.$id.tsx b/apps/erp/app/routes/x+/job+/methods+/event.delete.$id.tsxindex a8aba9ac32..73102342f1 100644--- a/apps/erp/app/routes/x+/job+/methods+/event.delete.$id.tsx+++ b/apps/erp/app/routes/x+/job+/methods+/event.delete.$id.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteProductionEvent } from "~/modules/production";import { getDatabaseClient } from "~/services/database.server";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/job+/methods+/get.tsx b/apps/erp/app/routes/x+/job+/methods+/get.tsxindex 351fe6e847..86d5be9b95 100644--- a/apps/erp/app/routes/x+/job+/methods+/get.tsx+++ b/apps/erp/app/routes/x+/job+/methods+/get.tsx@@ -5,8 +5,9 @@import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {getJobMethodValidator,recalculateJobOperationDependencies,diff --git a/apps/erp/app/routes/x+/job+/methods+/quantity.delete.$id.tsx b/apps/erp/app/routes/x+/job+/methods+/quantity.delete.$id.tsxindex 156c4a4053..738d6de20e 100644--- a/apps/erp/app/routes/x+/job+/methods+/quantity.delete.$id.tsx+++ b/apps/erp/app/routes/x+/job+/methods+/quantity.delete.$id.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteProductionQuantity } from "~/modules/production";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/job+/methods+/save.tsx b/apps/erp/app/routes/x+/job+/methods+/save.tsxindex a2214ceea2..dc86201b60 100644--- a/apps/erp/app/routes/x+/job+/methods+/save.tsx+++ b/apps/erp/app/routes/x+/job+/methods+/save.tsx@@ -5,8 +5,9 @@import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {getJobMethodValidator,upsertMakeMethodFromJob,diff --git a/apps/erp/app/routes/x+/job+/new.tsx b/apps/erp/app/routes/x+/job+/new.tsxindex 50b6ce75aa..53d3f0b6ff 100644--- a/apps/erp/app/routes/x+/job+/new.tsx+++ b/apps/erp/app/routes/x+/job+/new.tsx@@ -7,9 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { useUrlParams, useUser } from "~/hooks";import { getUnreleasedChangeOrderIssue } from "~/modules/items/items.server";import { insertJob, jobValidator } from "~/modules/production";diff --git a/apps/erp/app/routes/x+/journal-entry+/$journalEntryId._index.tsx b/apps/erp/app/routes/x+/journal-entry+/$journalEntryId._index.tsxindex e1b323df49..539829a207 100644--- a/apps/erp/app/routes/x+/journal-entry+/$journalEntryId._index.tsx+++ b/apps/erp/app/routes/x+/journal-entry+/$journalEntryId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.delete.tsx b/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.delete.tsxindex d218370d87..3beda8af1f 100644--- a/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.delete.tsx+++ b/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.delete.tsx@@ -5,8 +5,8 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteJournalEntry } from "~/modules/accounting";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.details.tsx b/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.details.tsxindex 8b66509c46..6f7f778c87 100644--- a/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.details.tsx+++ b/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.details.tsx@@ -5,9 +5,9 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { toDisplayCredit, toDisplayDebit } from "@carbon/utils";+import { redirect, toDisplayCredit, toDisplayDebit } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useParams } from "react-router";+import { data, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { JournalEntry } from "~/modules/accounting";import {diff --git a/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.post.tsx b/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.post.tsxindex 3983258485..bcada5df5d 100644--- a/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.post.tsx+++ b/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.post.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { postJournalEntry } from "~/modules/accounting";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.reverse.tsx b/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.reverse.tsxindex e84d652488..66b70a4884 100644--- a/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.reverse.tsx+++ b/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.reverse.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { reverseJournalEntry } from "~/modules/accounting";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.tsx b/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.tsxindex a368abdf46..ecb66059bb 100644--- a/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.tsx+++ b/apps/erp/app/routes/x+/journal-entry+/$journalEntryId.tsx@@ -5,13 +5,13 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams } from "react-router";+import { Outlet, useParams } from "react-router";import {getActiveDimensionsWithValues,getCompaniesInGroup,diff --git a/apps/erp/app/routes/x+/journal-entry+/_layout.tsx b/apps/erp/app/routes/x+/journal-entry+/_layout.tsxindex 5223b14609..880ee868dc 100644--- a/apps/erp/app/routes/x+/journal-entry+/_layout.tsx+++ b/apps/erp/app/routes/x+/journal-entry+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Journal Entry" }];};diff --git a/apps/erp/app/routes/x+/maintenance+/$dispatchId.event.$eventId.delete.tsx b/apps/erp/app/routes/x+/maintenance+/$dispatchId.event.$eventId.delete.tsxindex be7dafde62..25e7791108 100644--- a/apps/erp/app/routes/x+/maintenance+/$dispatchId.event.$eventId.delete.tsx+++ b/apps/erp/app/routes/x+/maintenance+/$dispatchId.event.$eventId.delete.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {deleteMaintenanceDispatchEvent,getMaintenanceDispatch,diff --git a/apps/erp/app/routes/x+/maintenance+/$dispatchId.item.$itemId.delete.tsx b/apps/erp/app/routes/x+/maintenance+/$dispatchId.item.$itemId.delete.tsxindex 1368bf00dc..d89646e61b 100644--- a/apps/erp/app/routes/x+/maintenance+/$dispatchId.item.$itemId.delete.tsx+++ b/apps/erp/app/routes/x+/maintenance+/$dispatchId.item.$itemId.delete.tsx@@ -7,8 +7,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getMaintenanceDispatch,isMaintenanceDispatchLockeddiff --git a/apps/erp/app/routes/x+/maintenance+/$dispatchId.status.tsx b/apps/erp/app/routes/x+/maintenance+/$dispatchId.status.tsxindex c7af3aecb4..49b1471b6c 100644--- a/apps/erp/app/routes/x+/maintenance+/$dispatchId.status.tsx+++ b/apps/erp/app/routes/x+/maintenance+/$dispatchId.status.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { maintenanceDispatchStatus } from "~/modules/resources";import { postMaintenanceLabor } from "~/modules/resources/resources.server";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/maintenance+/$dispatchId.tsx b/apps/erp/app/routes/x+/maintenance+/$dispatchId.tsxindex 029699c46d..20fd6f7681 100644--- a/apps/erp/app/routes/x+/maintenance+/$dispatchId.tsx+++ b/apps/erp/app/routes/x+/maintenance+/$dispatchId.tsx@@ -8,13 +8,13 @@ import { flash } from "@carbon/auth/session.server";import { storage } from "@carbon/files";import type { JSONContent } from "@carbon/react";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData, useParams } from "react-router";+import { Outlet, useLoaderData, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import RiskRegisterCard from "~/modules/quality/ui/RiskRegister/RiskRegisterCard";import {diff --git a/apps/erp/app/routes/x+/maintenance+/_layout.tsx b/apps/erp/app/routes/x+/maintenance+/_layout.tsxindex 20c8645789..d9ac835b06 100644--- a/apps/erp/app/routes/x+/maintenance+/_layout.tsx+++ b/apps/erp/app/routes/x+/maintenance+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Maintenance" }];};diff --git a/apps/erp/app/routes/x+/maintenance+/new.tsx b/apps/erp/app/routes/x+/maintenance+/new.tsxindex d5aa39165d..073654b46c 100644--- a/apps/erp/app/routes/x+/maintenance+/new.tsx+++ b/apps/erp/app/routes/x+/maintenance+/new.tsx@@ -6,9 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { notifyScheduleInputsChanged } from "~/modules/production";import {getFailureModesList,diff --git a/apps/erp/app/routes/x+/material+/$itemId._index.tsx b/apps/erp/app/routes/x+/material+/$itemId._index.tsxindex 9621d97e06..1307ee09b7 100644--- a/apps/erp/app/routes/x+/material+/$itemId._index.tsx+++ b/apps/erp/app/routes/x+/material+/$itemId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/material+/$itemId.costing.tsx b/apps/erp/app/routes/x+/material+/$itemId.costing.tsxindex 26fc4a19a4..aaeff68e0d 100644--- a/apps/erp/app/routes/x+/material+/$itemId.costing.tsx+++ b/apps/erp/app/routes/x+/material+/$itemId.costing.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getItemCost,getItemCostHistory,diff --git a/apps/erp/app/routes/x+/material+/$itemId.details.tsx b/apps/erp/app/routes/x+/material+/$itemId.details.tsxindex fc44b18414..aaf5c93697 100644--- a/apps/erp/app/routes/x+/material+/$itemId.details.tsx+++ b/apps/erp/app/routes/x+/material+/$itemId.details.tsx@@ -8,8 +8,9 @@ import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect, useParams } from "react-router";+import { useParams } from "react-router";import { DeferredFiles } from "~/components";import { usePermissions, useRouteData } from "~/hooks";import type { ItemFile, MaterialSummary } from "~/modules/items";diff --git a/apps/erp/app/routes/x+/material+/$itemId.inventory.tsx b/apps/erp/app/routes/x+/material+/$itemId.inventory.tsxindex 3f84581041..537bf418f1 100644--- a/apps/erp/app/routes/x+/material+/$itemId.inventory.tsx+++ b/apps/erp/app/routes/x+/material+/$itemId.inventory.tsx@@ -8,9 +8,9 @@ import { flash } from "@carbon/auth/session.server";import { getStorageRulesDataForTarget } from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";-import { pluckUnique } from "@carbon/utils";+import { pluckUnique, redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { useStorageUnits } from "~/components/Form/StorageUnit";import { useRouteData } from "~/hooks";import {diff --git a/apps/erp/app/routes/x+/material+/$itemId.planning.tsx b/apps/erp/app/routes/x+/material+/$itemId.planning.tsxindex fa74980757..4e4ef48a37 100644--- a/apps/erp/app/routes/x+/material+/$itemId.planning.tsx+++ b/apps/erp/app/routes/x+/material+/$itemId.planning.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { useRouteData } from "~/hooks";import {getItemPlanning,diff --git a/apps/erp/app/routes/x+/material+/$itemId.purchasing.$supplierPartId.delete.tsx b/apps/erp/app/routes/x+/material+/$itemId.purchasing.$supplierPartId.delete.tsxindex 4911e67564..19aad7d678 100644--- a/apps/erp/app/routes/x+/material+/$itemId.purchasing.$supplierPartId.delete.tsx+++ b/apps/erp/app/routes/x+/material+/$itemId.purchasing.$supplierPartId.delete.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteSupplierPart } from "~/modules/items";import { path } from "~/utils/path";@@ -20,7 +21,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {const { supplierPartId } = params;if (!supplierPartId) throw notFound("supplierPartId not found");- // @ts-ignore TS2589 — Supabase joined-select type instantiation too deep; it// fires only under some checker states, so ignore (not expect-error) stays// green whether or not it triggers.const result = await clientdiff --git a/apps/erp/app/routes/x+/material+/$itemId.purchasing.$supplierPartId.tsx b/apps/erp/app/routes/x+/material+/$itemId.purchasing.$supplierPartId.tsxindex ae00e4be04..4563952c01 100644--- a/apps/erp/app/routes/x+/material+/$itemId.purchasing.$supplierPartId.tsx+++ b/apps/erp/app/routes/x+/material+/$itemId.purchasing.$supplierPartId.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { useRouteData } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import type { MaterialSummary } from "~/modules/items";import { supplierPartValidator, upsertSupplierPart } from "~/modules/items";import { SupplierPartForm } from "~/modules/items/ui/Item";diff --git a/apps/erp/app/routes/x+/material+/$itemId.purchasing.tsx b/apps/erp/app/routes/x+/material+/$itemId.purchasing.tsxindex dbb107d567..339a70d326 100644--- a/apps/erp/app/routes/x+/material+/$itemId.purchasing.tsx+++ b/apps/erp/app/routes/x+/material+/$itemId.purchasing.tsx@@ -7,14 +7,14 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { Suspense } from "react";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import { useRouteData } from "~/hooks";import { getBatchProperties } from "~/modules/inventory";import BatchPropertiesConfig from "~/modules/inventory/ui/Batches/BatchPropertiesConfig";diff --git a/apps/erp/app/routes/x+/material+/$itemId.quality.tsx b/apps/erp/app/routes/x+/material+/$itemId.quality.tsxindex c54ab6b040..1a5bb98ff7 100644--- a/apps/erp/app/routes/x+/material+/$itemId.quality.tsx+++ b/apps/erp/app/routes/x+/material+/$itemId.quality.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useParams } from "react-router";+import { data, useLoaderData, useParams } from "react-router";import invariant from "tiny-invariant";import {getInspectionDocumentsForItem,diff --git a/apps/erp/app/routes/x+/material+/$itemId.sales.tsx b/apps/erp/app/routes/x+/material+/$itemId.sales.tsxindex 8d02ba5865..05523d3594 100644--- a/apps/erp/app/routes/x+/material+/$itemId.sales.tsx+++ b/apps/erp/app/routes/x+/material+/$itemId.sales.tsx@@ -11,8 +11,9 @@ import {} from "@carbon/ee/rules";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getItemUnitSalePrice,itemUnitSalePriceValidator,diff --git a/apps/erp/app/routes/x+/material+/$itemId.tsx b/apps/erp/app/routes/x+/material+/$itemId.tsxindex 19a40d603a..b33291a7b1 100644--- a/apps/erp/app/routes/x+/material+/$itemId.tsx+++ b/apps/erp/app/routes/x+/material+/$itemId.tsx@@ -6,20 +6,14 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { useRouteData } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Suspense } from "react";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- Await,- Outlet,- redirect,- useLoaderData,- useParams-} from "react-router";+import { Await, Outlet, useLoaderData, useParams } from "react-router";import { ResizablePanels } from "~/components/Layout";import type { ItemFile, MaterialSummary } from "~/modules/items";import {diff --git a/apps/erp/app/routes/x+/material+/_layout.tsx b/apps/erp/app/routes/x+/material+/_layout.tsxindex 2140ae7f11..1aa97235bc 100644--- a/apps/erp/app/routes/x+/material+/_layout.tsx+++ b/apps/erp/app/routes/x+/material+/_layout.tsx@@ -20,6 +20,8 @@ import { getLocationsList } from "~/modules/resources";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Materials" }];};diff --git a/apps/erp/app/routes/x+/material+/new.tsx b/apps/erp/app/routes/x+/material+/new.tsxindex 3cb55ba7b4..edbb7c9dec 100644--- a/apps/erp/app/routes/x+/material+/new.tsx+++ b/apps/erp/app/routes/x+/material+/new.tsx@@ -6,9 +6,10 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { materialValidator, upsertMaterial } from "~/modules/items";import { MaterialForm } from "~/modules/items/ui/Materials";import { getDatabaseClient } from "~/services/database.server";diff --git a/apps/erp/app/routes/x+/part+/$itemId._index.tsx b/apps/erp/app/routes/x+/part+/$itemId._index.tsxindex afcc24c7bc..9a7c0275c5 100644--- a/apps/erp/app/routes/x+/part+/$itemId._index.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/part+/$itemId.costing.tsx b/apps/erp/app/routes/x+/part+/$itemId.costing.tsxindex 67822940b4..0f50127080 100644--- a/apps/erp/app/routes/x+/part+/$itemId.costing.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId.costing.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getItemCost,getItemCostHistory,diff --git a/apps/erp/app/routes/x+/part+/$itemId.details.tsx b/apps/erp/app/routes/x+/part+/$itemId.details.tsxindex 4e3a0243e4..ba3b1a52c6 100644--- a/apps/erp/app/routes/x+/part+/$itemId.details.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId.details.tsx@@ -9,6 +9,7 @@ import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";import { Menubar, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { PostgrestResponse } from "@supabase/supabase-js";import { Suspense } from "react";@@ -17,7 +18,7 @@ import type {ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import { CadModel, DeferredFiles } from "~/components";import { usePermissions, useRouteData } from "~/hooks";import type { ItemFile, MakeMethod, PartSummary } from "~/modules/items";@@ -75,12 +76,19 @@ export async function loader({ request, params }: LoaderFunctionArgs) {const url = new URL(request.url);const requestedMethodId = url.searchParams.get("methodId");- const [makeMethods, revisionLock, changeNoticeData] = await Promise.all([- getMakeMethodsOnce(client, itemId, companyId),- getRevisionLock(client, { itemId, companyId }),- // Part → CO traceability (4b): CO history for this part + type labels.- getItemChangeNoticeDataOnce(client, itemId, companyId)- ]);+ // Two waves, not four: everything that needs only the item id goes here, and+ // everything that needs only the chosen method's id goes in the next. Read+ // one after another, this loader took the sum of its queries (about half a+ // second) instead of the slowest of them.+ const [makeMethods, revisionLock, changeNoticeData, tags, partManufacturing] =+ await Promise.all([+ getMakeMethodsOnce(client, itemId, companyId),+ getRevisionLock(client, { itemId, companyId }),+ // Part → CO traceability (4b): CO history for this part + type labels.+ getItemChangeNoticeDataOnce(client, itemId, companyId),+ getTagsList(client, companyId, "operation"),+ getItemManufacturing(client, itemId, companyId)+ ]);const revisionStatus = revisionLock.revisionStatus;const releaseControl = revisionLock.releaseControl;@@ -105,11 +113,24 @@ export async function loader({ request, params }: LoaderFunctionArgs) {};}- const fullMethod = await getMakeMethodByIdOnce(- client,- makeMethod.id,- companyId- );+ const [fullMethod, methodMaterials, methodOperations, configData] =+ await Promise.all([+ getMakeMethodByIdOnce(client, makeMethod.id, companyId),+ getMethodMaterialsByMakeMethod(client, makeMethod.id),+ getMethodOperationsByMakeMethodId(client, makeMethod.id),+ partManufacturing.data?.requiresConfiguration+ ? Promise.all([+ getConfigurationParameters(client, itemId, companyId),+ getConfigurationRules(client, itemId, companyId)+ ]).then(([configurationParametersAndGroups, configurationRules]) => ({+ configurationParametersAndGroups,+ configurationRules+ }))+ : {+ configurationParametersAndGroups: { groups: [], parameters: [] },+ configurationRules: []+ }+ ]);if (fullMethod.error || !fullMethod.data) {return {methodData: null,@@ -120,27 +141,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {};}- const [methodMaterials, methodOperations, tags, partManufacturing] =- await Promise.all([- getMethodMaterialsByMakeMethod(client, fullMethod.data.id),- getMethodOperationsByMakeMethodId(client, fullMethod.data.id),- getTagsList(client, companyId, "operation"),- getItemManufacturing(client, itemId, companyId)- ]);-- const configData = partManufacturing.data?.requiresConfiguration- ? await Promise.all([- getConfigurationParameters(client, itemId, companyId),- getConfigurationRules(client, itemId, companyId)- ]).then(([configurationParametersAndGroups, configurationRules]) => ({- configurationParametersAndGroups,- configurationRules- }))- : {- configurationParametersAndGroups: { groups: [], parameters: [] },- configurationRules: []- };-return {methodData: {makeMethod: fullMethod.data,@@ -323,7 +323,6 @@ export default function PartDetailsRoute() {{manufacturingInitialValues && (<ItemManufacturingFormkey={itemId}- // @ts-ignoreinitialValues={manufacturingInitialValues}/>)}@@ -351,12 +350,11 @@ export default function PartDetailsRoute() {<BillOfProcesskey={`bop:${itemId}`}makeMethod={methodData.makeMethod}- // @ts-ignore+ // @ts-expect-erroroperations={methodData.methodOperations ?? []}configurable={methodData.partManufacturing?.requiresConfiguration}- // @ts-ignorematerials={methodData.methodMaterials ?? []}configurationRules={methodData.configurationRules}parameters={@@ -371,9 +369,9 @@ export default function PartDetailsRoute() {<BillOfMaterialkey={`bom:${itemId}`}makeMethod={methodData.makeMethod}- // @ts-ignore+ // @ts-expect-errormaterials={methodData.methodMaterials ?? []}- // @ts-ignore+ // @ts-expect-erroroperations={methodData.methodOperations}configurable={methodData.partManufacturing?.requiresConfigurationdiff --git a/apps/erp/app/routes/x+/part+/$itemId.inventory.tsx b/apps/erp/app/routes/x+/part+/$itemId.inventory.tsxindex 8e3518608d..f353838ff6 100644--- a/apps/erp/app/routes/x+/part+/$itemId.inventory.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId.inventory.tsx@@ -8,9 +8,9 @@ import { flash } from "@carbon/auth/session.server";import { getStorageRulesDataForTarget } from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";-import { pluckUnique } from "@carbon/utils";+import { pluckUnique, redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { useStorageUnits } from "~/components/Form/StorageUnit";import { useRouteData } from "~/hooks";import {diff --git a/apps/erp/app/routes/x+/part+/$itemId.make.$makeMethodId.tsx b/apps/erp/app/routes/x+/part+/$itemId.make.$makeMethodId.tsxindex 93042c8bb5..6f9bea808c 100644--- a/apps/erp/app/routes/x+/part+/$itemId.make.$makeMethodId.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId.make.$makeMethodId.tsx@@ -7,10 +7,11 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import type { JSONContent } from "@carbon/react";import { Menubar, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import { Suspense } from "react";import type { LoaderFunctionArgs } from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import { CadModel } from "~/components";import { useRouteData } from "~/hooks";import { usePermissions } from "~/hooks/usePermissions";diff --git a/apps/erp/app/routes/x+/part+/$itemId.planning.tsx b/apps/erp/app/routes/x+/part+/$itemId.planning.tsxindex 3130f07a25..4a6da98b3a 100644--- a/apps/erp/app/routes/x+/part+/$itemId.planning.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId.planning.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { useRouteData } from "~/hooks";import {getItemPlanning,diff --git a/apps/erp/app/routes/x+/part+/$itemId.purchasing.$supplierPartId.delete.tsx b/apps/erp/app/routes/x+/part+/$itemId.purchasing.$supplierPartId.delete.tsxindex 28c24513f2..3195c36d7d 100644--- a/apps/erp/app/routes/x+/part+/$itemId.purchasing.$supplierPartId.delete.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId.purchasing.$supplierPartId.delete.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteSupplierPart } from "~/modules/items";import { path } from "~/utils/path";@@ -20,7 +21,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {const { supplierPartId } = params;if (!supplierPartId) throw notFound("supplierPartId not found");- // @ts-ignore TS2589 — Supabase joined-select type instantiation too deep;// whether it fires flips with Database type size, so tolerate both statesconst result = await client.from("supplierPart")diff --git a/apps/erp/app/routes/x+/part+/$itemId.purchasing.tsx b/apps/erp/app/routes/x+/part+/$itemId.purchasing.tsxindex 6cd88f51b6..1d2737ea36 100644--- a/apps/erp/app/routes/x+/part+/$itemId.purchasing.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId.purchasing.tsx@@ -7,14 +7,14 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { Suspense } from "react";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import { useRouteData } from "~/hooks";import { getBatchProperties } from "~/modules/inventory";import BatchPropertiesConfig from "~/modules/inventory/ui/Batches/BatchPropertiesConfig";diff --git a/apps/erp/app/routes/x+/part+/$itemId.quality.tsx b/apps/erp/app/routes/x+/part+/$itemId.quality.tsxindex 3f37343366..1d9864c35a 100644--- a/apps/erp/app/routes/x+/part+/$itemId.quality.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId.quality.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useParams } from "react-router";+import { data, useLoaderData, useParams } from "react-router";import invariant from "tiny-invariant";import {getInspectionDocumentsForItem,diff --git a/apps/erp/app/routes/x+/part+/$itemId.sales.customer-parts.$customerPartToItemId.tsx b/apps/erp/app/routes/x+/part+/$itemId.sales.customer-parts.$customerPartToItemId.tsxindex 8f2ee7fcd1..924f661c79 100644--- a/apps/erp/app/routes/x+/part+/$itemId.sales.customer-parts.$customerPartToItemId.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId.sales.customer-parts.$customerPartToItemId.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {customerPartValidator,getItem,diff --git a/apps/erp/app/routes/x+/part+/$itemId.sales.customer-parts.delete.$customerPartToItemId.tsx b/apps/erp/app/routes/x+/part+/$itemId.sales.customer-parts.delete.$customerPartToItemId.tsxindex 5bdc97d486..bc01f8c222 100644--- a/apps/erp/app/routes/x+/part+/$itemId.sales.customer-parts.delete.$customerPartToItemId.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId.sales.customer-parts.delete.$customerPartToItemId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteItemCustomerPart, getItemCustomerPart } from "~/modules/items";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/part+/$itemId.sales.customer-parts.new.tsx b/apps/erp/app/routes/x+/part+/$itemId.sales.customer-parts.new.tsxindex 9428669c95..bf72d93ac5 100644--- a/apps/erp/app/routes/x+/part+/$itemId.sales.customer-parts.new.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId.sales.customer-parts.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import {customerPartValidator,getItem,diff --git a/apps/erp/app/routes/x+/part+/$itemId.sales.tsx b/apps/erp/app/routes/x+/part+/$itemId.sales.tsxindex 4178a105be..41c334b673 100644--- a/apps/erp/app/routes/x+/part+/$itemId.sales.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId.sales.tsx@@ -11,13 +11,13 @@ import {} from "@carbon/ee/rules";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getItemCustomerParts,getItemUnitSalePrice,diff --git a/apps/erp/app/routes/x+/part+/$itemId.tsx b/apps/erp/app/routes/x+/part+/$itemId.tsxindex b93de7ea29..ea3a9d1f6e 100644--- a/apps/erp/app/routes/x+/part+/$itemId.tsx+++ b/apps/erp/app/routes/x+/part+/$itemId.tsx@@ -17,7 +17,7 @@ import {TabsTrigger,useRouteData} from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { Suspense, useState } from "react";@@ -26,13 +26,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- Await,- Outlet,- redirect,- useLoaderData,- useParams-} from "react-router";+import { Await, Outlet, useLoaderData, useParams } from "react-router";import { ResizablePanels } from "~/components/Layout";import { flattenTree } from "~/components/TreeView";import type { ItemFile, PartSummary } from "~/modules/items";diff --git a/apps/erp/app/routes/x+/part+/_layout.tsx b/apps/erp/app/routes/x+/part+/_layout.tsxindex 6b79044abe..1177d76ffe 100644--- a/apps/erp/app/routes/x+/part+/_layout.tsx+++ b/apps/erp/app/routes/x+/part+/_layout.tsx@@ -16,6 +16,8 @@ import { getLocationsList } from "~/modules/resources";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Part" }];};diff --git a/apps/erp/app/routes/x+/part+/new.tsx b/apps/erp/app/routes/x+/part+/new.tsxindex 6553cccfce..eee28c2266 100644--- a/apps/erp/app/routes/x+/part+/new.tsx+++ b/apps/erp/app/routes/x+/part+/new.tsx@@ -7,9 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { trigger } from "@carbon/jobs";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { partValidator, upsertPart } from "~/modules/items";import { PartForm } from "~/modules/items/ui/Parts";import { setCustomFields } from "~/utils/form";diff --git a/apps/erp/app/routes/x+/payments+/$paymentId.applications.set.tsx b/apps/erp/app/routes/x+/payments+/$paymentId.applications.set.tsxindex ff52f86ee2..7c306c3ed7 100644--- a/apps/erp/app/routes/x+/payments+/$paymentId.applications.set.tsx+++ b/apps/erp/app/routes/x+/payments+/$paymentId.applications.set.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { z } from "zod";import {invoiceSettlementBase,diff --git a/apps/erp/app/routes/x+/payments+/$paymentId.credits.set.tsx b/apps/erp/app/routes/x+/payments+/$paymentId.credits.set.tsxindex d8cfe8b491..9069fab24c 100644--- a/apps/erp/app/routes/x+/payments+/$paymentId.credits.set.tsx+++ b/apps/erp/app/routes/x+/payments+/$paymentId.credits.set.tsx@@ -5,9 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { z } from "zod";import { applyCreditsToInvoices, getPayment } from "~/modules/invoicing";import { getCompanyTimeZone } from "~/modules/shared/timezone.server";diff --git a/apps/erp/app/routes/x+/payments+/$paymentId.delete.tsx b/apps/erp/app/routes/x+/payments+/$paymentId.delete.tsxindex 5353aca6a7..18117c477d 100644--- a/apps/erp/app/routes/x+/payments+/$paymentId.delete.tsx+++ b/apps/erp/app/routes/x+/payments+/$paymentId.delete.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deletePayment } from "~/modules/invoicing";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/payments+/$paymentId.post.tsx b/apps/erp/app/routes/x+/payments+/$paymentId.post.tsxindex cae8f3427c..d0fc91bb3f 100644--- a/apps/erp/app/routes/x+/payments+/$paymentId.post.tsx+++ b/apps/erp/app/routes/x+/payments+/$paymentId.post.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/payments+/$paymentId.tsx b/apps/erp/app/routes/x+/payments+/$paymentId.tsxindex c9a4b94a87..71c705d375 100644--- a/apps/erp/app/routes/x+/payments+/$paymentId.tsx+++ b/apps/erp/app/routes/x+/payments+/$paymentId.tsx@@ -8,14 +8,14 @@ import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";import type { FundingSource } from "@carbon/utils";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import {AvailableCreditsTable,getAvailableCreditsForParty,diff --git a/apps/erp/app/routes/x+/payments+/$paymentId.void.tsx b/apps/erp/app/routes/x+/payments+/$paymentId.void.tsxindex b91ce48daf..f7d4ad1694 100644--- a/apps/erp/app/routes/x+/payments+/$paymentId.void.tsx+++ b/apps/erp/app/routes/x+/payments+/$paymentId.void.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/payments+/_layout.tsx b/apps/erp/app/routes/x+/payments+/_layout.tsxindex 2e8139f405..b77a15252d 100644--- a/apps/erp/app/routes/x+/payments+/_layout.tsx+++ b/apps/erp/app/routes/x+/payments+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Payments" }];};diff --git a/apps/erp/app/routes/x+/payments+/new.tsx b/apps/erp/app/routes/x+/payments+/new.tsxindex 3fc6b6176c..5231643cf2 100644--- a/apps/erp/app/routes/x+/payments+/new.tsx+++ b/apps/erp/app/routes/x+/payments+/new.tsx@@ -7,10 +7,16 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import type { Database } from "@carbon/database";import { validationError, validator } from "@carbon/form";-import { datetime, round, toBaseAmount, toDocumentAmount } from "@carbon/utils";+import {+ datetime,+ redirect,+ round,+ toBaseAmount,+ toDocumentAmount+} from "@carbon/utils";import type { SupabaseClient } from "@supabase/supabase-js";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getCurrencyByCode, getDefaultAccounts } from "~/modules/accounting";import {computeEarlyPaymentDiscounts,diff --git a/apps/erp/app/routes/x+/people+/_index.tsx b/apps/erp/app/routes/x+/people+/_index.tsxindex 3f15de0d3a..8fc505d40f 100644--- a/apps/erp/app/routes/x+/people+/_index.tsx+++ b/apps/erp/app/routes/x+/people+/_index.tsx@@ -2,8 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";-import { redirect } from "react-router";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import { path } from "~/utils/path";export async function loader() {diff --git a/apps/erp/app/routes/x+/people+/_layout.tsx b/apps/erp/app/routes/x+/people+/_layout.tsxindex dd196a7a48..aa6ac47be0 100644--- a/apps/erp/app/routes/x+/people+/_layout.tsx+++ b/apps/erp/app/routes/x+/people+/_layout.tsx@@ -11,6 +11,8 @@ import usePeopleSubmodules from "~/modules/people/ui/usePeopleSubmodules";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | People" }];};diff --git a/apps/erp/app/routes/x+/people+/attribute.$attributeId.tsx b/apps/erp/app/routes/x+/people+/attribute.$attributeId.tsxindex 1db258867b..5e0f452001 100644--- a/apps/erp/app/routes/x+/people+/attribute.$attributeId.tsx+++ b/apps/erp/app/routes/x+/people+/attribute.$attributeId.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { attributeValidator, updateAttribute } from "~/modules/people";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/people+/attribute.delete.$attributeId.tsx b/apps/erp/app/routes/x+/people+/attribute.delete.$attributeId.tsxindex 9c788cb0e6..b66bb6a323 100644--- a/apps/erp/app/routes/x+/people+/attribute.delete.$attributeId.tsx+++ b/apps/erp/app/routes/x+/people+/attribute.delete.$attributeId.tsx@@ -5,8 +5,8 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteAttribute } from "~/modules/people";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/people+/attribute.new.tsx b/apps/erp/app/routes/x+/people+/attribute.new.tsxindex ef324fe8a9..e3e3abf268 100644--- a/apps/erp/app/routes/x+/people+/attribute.new.tsx+++ b/apps/erp/app/routes/x+/people+/attribute.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { attributeValidator, insertAttribute } from "~/modules/people";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/people+/attributes.$categoryId.tsx b/apps/erp/app/routes/x+/people+/attributes.$categoryId.tsxindex a6d834ca5e..8b036e56bd 100644--- a/apps/erp/app/routes/x+/people+/attributes.$categoryId.tsx+++ b/apps/erp/app/routes/x+/people+/attributes.$categoryId.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData, useNavigate } from "react-router";import {attributeCategoryValidator,getAttributeCategory,diff --git a/apps/erp/app/routes/x+/people+/attributes.delete.$categoryId.tsx b/apps/erp/app/routes/x+/people+/attributes.delete.$categoryId.tsxindex b0f62a876a..5f29d58958 100644--- a/apps/erp/app/routes/x+/people+/attributes.delete.$categoryId.tsx+++ b/apps/erp/app/routes/x+/people+/attributes.delete.$categoryId.tsx@@ -5,8 +5,8 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteAttributeCategory } from "~/modules/people";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/people+/attributes.list.$categoryId.$attributeId.tsx b/apps/erp/app/routes/x+/people+/attributes.list.$categoryId.$attributeId.tsxindex 94304017d7..7016bdc2ed 100644--- a/apps/erp/app/routes/x+/people+/attributes.list.$categoryId.$attributeId.tsx+++ b/apps/erp/app/routes/x+/people+/attributes.list.$categoryId.$attributeId.tsx@@ -5,8 +5,10 @@import { error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { AttributeDataType } from "~/modules/people";import { getAttribute } from "~/modules/people";@@ -42,8 +44,8 @@ export default function EditAttributeRoute() {if (!categoryId) throw new Error("categoryId is not found");if (Number.isNaN(categoryId)) throw new Error("categoryId is not a number");- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const attributesRouteData = useRouteData<{dataTypes: AttributeDataType[];}>(path.to.attributes);diff --git a/apps/erp/app/routes/x+/people+/attributes.list.$categoryId.new.tsx b/apps/erp/app/routes/x+/people+/attributes.list.$categoryId.new.tsxindex 0a312dc2de..b41b60e33f 100644--- a/apps/erp/app/routes/x+/people+/attributes.list.$categoryId.new.tsx+++ b/apps/erp/app/routes/x+/people+/attributes.list.$categoryId.new.tsx@@ -2,11 +2,11 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { useNavigate, useParams } from "react-router";+import { useCloseRoute } from "@carbon/react";+import { useParams } from "react-router";import { useRouteData } from "~/hooks";import type { AttributeDataType } from "~/modules/people";import { AttributeForm } from "~/modules/people/ui/Attributes";-import { DataType } from "~/modules/shared";import { path } from "~/utils/path";@@ -14,8 +14,8 @@ export default function NewAttributeRoute() {const { categoryId } = useParams();if (!categoryId) throw new Error("categoryId is not found");- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const attributesRouteData = useRouteData<{dataTypes: AttributeDataType[];}>(path.to.attributes);diff --git a/apps/erp/app/routes/x+/people+/attributes.list.$categoryId.tsx b/apps/erp/app/routes/x+/people+/attributes.list.$categoryId.tsxindex ebc98bb7b4..d44cf663a9 100644--- a/apps/erp/app/routes/x+/people+/attributes.list.$categoryId.tsx+++ b/apps/erp/app/routes/x+/people+/attributes.list.$categoryId.tsx@@ -5,19 +5,13 @@import { assertIsPost, error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- data,- Outlet,- redirect,- useLoaderData,- useNavigate-} from "react-router";+import { data, Outlet, useLoaderData, useNavigate } from "react-router";import { useUrlParams } from "~/hooks";import {getAttributeCategory,diff --git a/apps/erp/app/routes/x+/people+/attributes.new.tsx b/apps/erp/app/routes/x+/people+/attributes.new.tsxindex c05d6e7d9a..808c439307 100644--- a/apps/erp/app/routes/x+/people+/attributes.new.tsx+++ b/apps/erp/app/routes/x+/people+/attributes.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";+import { useNavigate } from "react-router";import {attributeCategoryValidator,insertAttributeCategorydiff --git a/apps/erp/app/routes/x+/people+/attributes.tsx b/apps/erp/app/routes/x+/people+/attributes.tsxindex 88db8ab36c..26313ee067 100644--- a/apps/erp/app/routes/x+/people+/attributes.tsx+++ b/apps/erp/app/routes/x+/people+/attributes.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import {getAttributeCategories,getAttributeDataTypesdiff --git a/apps/erp/app/routes/x+/people+/departments.$departmentId.tsx b/apps/erp/app/routes/x+/people+/departments.$departmentId.tsxindex 4c8e207907..bed3a1b498 100644--- a/apps/erp/app/routes/x+/people+/departments.$departmentId.tsx+++ b/apps/erp/app/routes/x+/people+/departments.$departmentId.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import {departmentValidator,getDepartment,@@ -80,7 +82,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function DepartmentRoute() {const { department } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: department.id,@@ -91,7 +93,7 @@ export default function DepartmentRoute() {return (<DepartmentForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}key={initialValues.id}initialValues={initialValues}/>diff --git a/apps/erp/app/routes/x+/people+/departments.delete.$departmentId.tsx b/apps/erp/app/routes/x+/people+/departments.delete.$departmentId.tsxindex ebe66d5497..1a0e84c386 100644--- a/apps/erp/app/routes/x+/people+/departments.delete.$departmentId.tsx+++ b/apps/erp/app/routes/x+/people+/departments.delete.$departmentId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteDepartment, getDepartment } from "~/modules/people";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/people+/departments.new.tsx b/apps/erp/app/routes/x+/people+/departments.new.tsxindex 4c1edeffd5..12b3b08291 100644--- a/apps/erp/app/routes/x+/people+/departments.new.tsx+++ b/apps/erp/app/routes/x+/people+/departments.new.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useNavigate, useSearchParams } from "react-router";+import { data, useSearchParams } from "react-router";import { departmentValidator, upsertDepartment } from "~/modules/people";import { DepartmentForm } from "~/modules/people/ui/Departments";import { setCustomFields } from "~/utils/form";@@ -65,7 +67,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewDepartmentRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const [searchParams] = useSearchParams();const parentDepartmentId =searchParams.get("parentDepartmentId") ?? undefined;@@ -77,7 +79,7 @@ export default function NewDepartmentRoute() {return (<DepartmentForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/people+/departments.tsx b/apps/erp/app/routes/x+/people+/departments.tsxindex e95f98611c..f156de53fc 100644--- a/apps/erp/app/routes/x+/people+/departments.tsx+++ b/apps/erp/app/routes/x+/people+/departments.tsx@@ -21,7 +21,7 @@ import {TabsList,TabsTrigger} from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useCallback, useState } from "react";@@ -31,7 +31,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData, useNavigate } from "react-router";+import { Outlet, useLoaderData, useNavigate } from "react-router";import { New } from "~/components";import { ImportCSVModal } from "~/components/ImportCSVModal";import { getDepartmentsTree } from "~/modules/people";diff --git a/apps/erp/app/routes/x+/people+/employee.tsx b/apps/erp/app/routes/x+/people+/employee.tsxindex 3c110c82a8..40a19aab8c 100644--- a/apps/erp/app/routes/x+/people+/employee.tsx+++ b/apps/erp/app/routes/x+/people+/employee.tsx@@ -6,8 +6,9 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import {getAttributeCategories,getPeople,diff --git a/apps/erp/app/routes/x+/people+/holidays.$holidayId.tsx b/apps/erp/app/routes/x+/people+/holidays.$holidayId.tsxindex 85c10339e8..f6713f190b 100644--- a/apps/erp/app/routes/x+/people+/holidays.$holidayId.tsx+++ b/apps/erp/app/routes/x+/people+/holidays.$holidayId.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getHoliday, holidayValidator, upsertHoliday } from "~/modules/people";import { HolidayForm } from "~/modules/people/ui/Holidays";import { getCustomFields } from "~/utils/form";diff --git a/apps/erp/app/routes/x+/people+/holidays.delete.$holidayId.tsx b/apps/erp/app/routes/x+/people+/holidays.delete.$holidayId.tsxindex 78f2fbf1ab..9792f8b11c 100644--- a/apps/erp/app/routes/x+/people+/holidays.delete.$holidayId.tsx+++ b/apps/erp/app/routes/x+/people+/holidays.delete.$holidayId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteHoliday, getHoliday } from "~/modules/people";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/people+/holidays.new.tsx b/apps/erp/app/routes/x+/people+/holidays.new.tsxindex 893ce7d447..ff09272444 100644--- a/apps/erp/app/routes/x+/people+/holidays.new.tsx+++ b/apps/erp/app/routes/x+/people+/holidays.new.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { holidayValidator, upsertHoliday } from "~/modules/people";import { HolidayForm } from "~/modules/people/ui/Holidays";import { setCustomFields } from "~/utils/form";diff --git a/apps/erp/app/routes/x+/people+/holidays.tsx b/apps/erp/app/routes/x+/people+/holidays.tsxindex 3facede3f0..7030bc8c31 100644--- a/apps/erp/app/routes/x+/people+/holidays.tsx+++ b/apps/erp/app/routes/x+/people+/holidays.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getHolidays, getHolidayYears } from "~/modules/people";import { HolidaysTable } from "~/modules/people/ui/Holidays";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/people+/shifts.$shiftId.tsx b/apps/erp/app/routes/x+/people+/shifts.$shiftId.tsxindex 652cd6ea9b..0502f2c88d 100644--- a/apps/erp/app/routes/x+/people+/shifts.$shiftId.tsx+++ b/apps/erp/app/routes/x+/people+/shifts.$shiftId.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getShift, shiftValidator, upsertShift } from "~/modules/people";import { ShiftForm } from "~/modules/people/ui/Shifts";import { notifyScheduleInputsChanged } from "~/modules/production";diff --git a/apps/erp/app/routes/x+/people+/shifts.delete.$shiftId.tsx b/apps/erp/app/routes/x+/people+/shifts.delete.$shiftId.tsxindex ee58fa5eb9..836e95ef2a 100644--- a/apps/erp/app/routes/x+/people+/shifts.delete.$shiftId.tsx+++ b/apps/erp/app/routes/x+/people+/shifts.delete.$shiftId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteShift, getShift } from "~/modules/people";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/people+/shifts.new.tsx b/apps/erp/app/routes/x+/people+/shifts.new.tsxindex 86f2faf7af..8d6b48e3f8 100644--- a/apps/erp/app/routes/x+/people+/shifts.new.tsx+++ b/apps/erp/app/routes/x+/people+/shifts.new.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { shiftValidator, upsertShift } from "~/modules/people";import { ShiftForm } from "~/modules/people/ui/Shifts";import { setCustomFields } from "~/utils/form";diff --git a/apps/erp/app/routes/x+/people+/shifts.tsx b/apps/erp/app/routes/x+/people+/shifts.tsxindex ecb30e4775..bf9eb0efce 100644--- a/apps/erp/app/routes/x+/people+/shifts.tsx+++ b/apps/erp/app/routes/x+/people+/shifts.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getShifts } from "~/modules/people";import { ShiftsTable } from "~/modules/people/ui/Shifts";import { getLocations } from "~/modules/resources/resources.service";diff --git a/apps/erp/app/routes/x+/people+/timecard.$entryId.tsx b/apps/erp/app/routes/x+/people+/timecard.$entryId.tsxindex 4699ef66c7..b19d9fe5cc 100644--- a/apps/erp/app/routes/x+/people+/timecard.$entryId.tsx+++ b/apps/erp/app/routes/x+/people+/timecard.$entryId.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getTimeCardEntry,timecardValidator,diff --git a/apps/erp/app/routes/x+/people+/timecard.delete.$entryId.tsx b/apps/erp/app/routes/x+/people+/timecard.delete.$entryId.tsxindex d75e0d9768..8cce481dd2 100644--- a/apps/erp/app/routes/x+/people+/timecard.delete.$entryId.tsx+++ b/apps/erp/app/routes/x+/people+/timecard.delete.$entryId.tsx@@ -5,10 +5,11 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteTimeCardEntry, getTimeCardEntry } from "~/modules/people";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/people+/timecard.new.tsx b/apps/erp/app/routes/x+/people+/timecard.new.tsxindex 549c9fd053..ab8c771e60 100644--- a/apps/erp/app/routes/x+/people+/timecard.new.tsx+++ b/apps/erp/app/routes/x+/people+/timecard.new.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { createTimeCardEntry, timecardValidator } from "~/modules/people";import { TimecardForm } from "~/modules/people/ui/Timecards";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/people+/timecard.tsx b/apps/erp/app/routes/x+/people+/timecard.tsxindex 6d5dbfb361..8d9a293421 100644--- a/apps/erp/app/routes/x+/people+/timecard.tsx+++ b/apps/erp/app/routes/x+/people+/timecard.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getTimecardEntries } from "~/modules/people";import { TimecardsTable } from "~/modules/people/ui/Timecards";import { getCompanySettings } from "~/modules/settings";diff --git a/apps/erp/app/routes/x+/person+/$personId._index.tsx b/apps/erp/app/routes/x+/person+/$personId._index.tsxindex 0c6dccb2ba..d37d906275 100644--- a/apps/erp/app/routes/x+/person+/$personId._index.tsx+++ b/apps/erp/app/routes/x+/person+/$personId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/person+/$personId.abilities.tsx b/apps/erp/app/routes/x+/person+/$personId.abilities.tsxindex caddf4e674..342ca3fe7f 100644--- a/apps/erp/app/routes/x+/person+/$personId.abilities.tsx+++ b/apps/erp/app/routes/x+/person+/$personId.abilities.tsx@@ -6,8 +6,9 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { PersonAbilities, PersonTrainings } from "~/modules/people/ui/Person";import {getEmployeeAbilities,diff --git a/apps/erp/app/routes/x+/person+/$personId.attributes.$categoryId.tsx b/apps/erp/app/routes/x+/person+/$personId.attributes.$categoryId.tsxindex a8ecc36d9a..2eea49118f 100644--- a/apps/erp/app/routes/x+/person+/$personId.attributes.$categoryId.tsx+++ b/apps/erp/app/routes/x+/person+/$personId.attributes.$categoryId.tsx@@ -13,9 +13,10 @@ import {CardHeader,CardTitle} from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getAttributeCategoryWithValues } from "~/modules/account";import { UserAttributesForm } from "~/modules/account/ui/UserAttributes";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/person+/$personId.details.tsx b/apps/erp/app/routes/x+/person+/$personId.details.tsxindex e1e58eb535..d00ecb9e9c 100644--- a/apps/erp/app/routes/x+/person+/$personId.details.tsx+++ b/apps/erp/app/routes/x+/person+/$personId.details.tsx@@ -5,8 +5,9 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getAccount } from "~/modules/account";import { ProfileForm } from "~/modules/account/ui/Profile";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/person+/$personId.job.tsx b/apps/erp/app/routes/x+/person+/$personId.job.tsxindex eea21da9e8..c79220746d 100644--- a/apps/erp/app/routes/x+/person+/$personId.job.tsx+++ b/apps/erp/app/routes/x+/person+/$personId.job.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import {employeeJobValidator,getEmployeeJob,diff --git a/apps/erp/app/routes/x+/person+/$personId.notes.tsx b/apps/erp/app/routes/x+/person+/$personId.notes.tsxindex c7011eb647..847cf94150 100644--- a/apps/erp/app/routes/x+/person+/$personId.notes.tsx+++ b/apps/erp/app/routes/x+/person+/$personId.notes.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { Card, CardContent, CardHeader, CardTitle } from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import RichText from "~/components/RichText";import { getNotes } from "~/modules/shared";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/person+/$personId.timecard.tsx b/apps/erp/app/routes/x+/person+/$personId.timecard.tsxindex ddc6fa39de..4ac4475939 100644--- a/apps/erp/app/routes/x+/person+/$personId.timecard.tsx+++ b/apps/erp/app/routes/x+/person+/$personId.timecard.tsx@@ -34,7 +34,7 @@ import {Thead,Tr} from "@carbon/react";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import { parseDate } from "@internationalized/date";import { Trans, useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";@@ -49,14 +49,7 @@ import {LuTrash} from "react-icons/lu";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import {- data,- Link,- redirect,- useFetcher,- useLoaderData,- useParams-} from "react-router";+import { data, Link, useFetcher, useLoaderData, useParams } from "react-router";import { DateTime } from "~/components";import { ConfirmDelete } from "~/components/Modals";import { useDateFormatter } from "~/hooks";diff --git a/apps/erp/app/routes/x+/person+/$personId.tsx b/apps/erp/app/routes/x+/person+/$personId.tsxindex 403fec6d2c..521594d301 100644--- a/apps/erp/app/routes/x+/person+/$personId.tsx+++ b/apps/erp/app/routes/x+/person+/$personId.tsx@@ -6,14 +6,14 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { data, Outlet, redirect, useLoaderData } from "react-router";+import { data, Outlet, useLoaderData } from "react-router";import {accountProfileValidator,getAllAttributeCategories,diff --git a/apps/erp/app/routes/x+/person+/_layout.tsx b/apps/erp/app/routes/x+/person+/_layout.tsxindex 8392787803..cad6c1188d 100644--- a/apps/erp/app/routes/x+/person+/_layout.tsx+++ b/apps/erp/app/routes/x+/person+/_layout.tsx@@ -12,6 +12,8 @@ import type {} from "react-router";import { Outlet } from "react-router";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | People" }];};diff --git a/apps/erp/app/routes/x+/picking-list+/$pickingListId._index.tsx b/apps/erp/app/routes/x+/picking-list+/$pickingListId._index.tsxindex 92ba4a0cb6..178e37a2de 100644--- a/apps/erp/app/routes/x+/picking-list+/$pickingListId._index.tsx+++ b/apps/erp/app/routes/x+/picking-list+/$pickingListId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/picking-list+/$pickingListId.delete.tsx b/apps/erp/app/routes/x+/picking-list+/$pickingListId.delete.tsxindex c4c0151864..fbf576bc16 100644--- a/apps/erp/app/routes/x+/picking-list+/$pickingListId.delete.tsx+++ b/apps/erp/app/routes/x+/picking-list+/$pickingListId.delete.tsx@@ -5,8 +5,8 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deletePickingList } from "~/modules/inventory";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/picking-list+/$pickingListId.details.$lineId.tsx b/apps/erp/app/routes/x+/picking-list+/$pickingListId.details.$lineId.tsxindex 8d0b70b8f2..aefd729f10 100644--- a/apps/erp/app/routes/x+/picking-list+/$pickingListId.details.$lineId.tsx+++ b/apps/erp/app/routes/x+/picking-list+/$pickingListId.details.$lineId.tsx@@ -5,8 +5,9 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { getPickingListLine } from "~/modules/inventory";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/picking-list+/$pickingListId.status.tsx b/apps/erp/app/routes/x+/picking-list+/$pickingListId.status.tsxindex 975f09a606..1dc8a9ff5d 100644--- a/apps/erp/app/routes/x+/picking-list+/$pickingListId.status.tsx+++ b/apps/erp/app/routes/x+/picking-list+/$pickingListId.status.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { trackWorkEvent } from "@carbon/lib/telemetry";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getUnresolvedPickingListLines,isPickingListLocked,diff --git a/apps/erp/app/routes/x+/picking-list+/$pickingListId.tsx b/apps/erp/app/routes/x+/picking-list+/$pickingListId.tsxindex 6a58bba1ce..7049ac6180 100644--- a/apps/erp/app/routes/x+/picking-list+/$pickingListId.tsx+++ b/apps/erp/app/routes/x+/picking-list+/$pickingListId.tsx@@ -5,13 +5,13 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams } from "react-router";+import { Outlet, useParams } from "react-router";import {getPickingList,getPickingListAvailability,diff --git a/apps/erp/app/routes/x+/picking-list+/$pickingListId.update.tsx b/apps/erp/app/routes/x+/picking-list+/$pickingListId.update.tsxindex 78df507f7f..a6db92fac2 100644--- a/apps/erp/app/routes/x+/picking-list+/$pickingListId.update.tsx+++ b/apps/erp/app/routes/x+/picking-list+/$pickingListId.update.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getPickingList,pickingListValidator,diff --git a/apps/erp/app/routes/x+/picking-list+/(list).tsx b/apps/erp/app/routes/x+/picking-list+/(list).tsxindex a9f52ccac5..3ce88e5438 100644--- a/apps/erp/app/routes/x+/picking-list+/(list).tsx+++ b/apps/erp/app/routes/x+/picking-list+/(list).tsx@@ -2,8 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ request }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/picking-list+/_layout.tsx b/apps/erp/app/routes/x+/picking-list+/_layout.tsxindex 019870b811..af6d976430 100644--- a/apps/erp/app/routes/x+/picking-list+/_layout.tsx+++ b/apps/erp/app/routes/x+/picking-list+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Picking Lists" }];};diff --git a/apps/erp/app/routes/x+/picking-list+/new.tsx b/apps/erp/app/routes/x+/picking-list+/new.tsxindex c10d70d832..8e93ced954 100644--- a/apps/erp/app/routes/x+/picking-list+/new.tsx+++ b/apps/erp/app/routes/x+/picking-list+/new.tsx@@ -5,8 +5,8 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {generatePickingList,generatePickingListValidatordiff --git a/apps/erp/app/routes/x+/picking-list+/schedule.tsx b/apps/erp/app/routes/x+/picking-list+/schedule.tsxindex 6b14b0567f..9718d79853 100644--- a/apps/erp/app/routes/x+/picking-list+/schedule.tsx+++ b/apps/erp/app/routes/x+/picking-list+/schedule.tsx@@ -6,10 +6,11 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { useLocalStorage, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { useCallback, useMemo, useState } from "react";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getPickingSchedule } from "~/modules/inventory";import type {PickingDisplaySettings,diff --git a/apps/erp/app/routes/x+/priority+/_layout.tsx b/apps/erp/app/routes/x+/priority+/_layout.tsxindex 41f0d5b6c8..99e4762e55 100644--- a/apps/erp/app/routes/x+/priority+/_layout.tsx+++ b/apps/erp/app/routes/x+/priority+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Priority" }];};diff --git a/apps/erp/app/routes/x+/priority+/dates.tsx b/apps/erp/app/routes/x+/priority+/dates.tsxindex 7b6c287be3..afa2ca0539 100644--- a/apps/erp/app/routes/x+/priority+/dates.tsx+++ b/apps/erp/app/routes/x+/priority+/dates.tsx@@ -26,7 +26,7 @@ import {useLocalStorage,VStack} from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import {endOfMonth,endOfWeek,@@ -45,12 +45,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- redirect,- useLoaderData,- useNavigate,- useSearchParams-} from "react-router";+import { useLoaderData, useNavigate, useSearchParams } from "react-router";import { SearchFilter } from "~/components";import { useLocations } from "~/components/Form/Location";import { ActiveFilters, Filter } from "~/components/Table/components/Filter";diff --git a/apps/erp/app/routes/x+/priority+/people.tsx b/apps/erp/app/routes/x+/priority+/people.tsxindex c45d6aa596..48d09873de 100644--- a/apps/erp/app/routes/x+/priority+/people.tsx+++ b/apps/erp/app/routes/x+/priority+/people.tsx@@ -5,7 +5,7 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { formatDate } from "@carbon/utils";+import { formatDate, redirect } from "@carbon/utils";import {getLocalTimeZone,now,@@ -18,7 +18,7 @@ import { msg } from "@lingui/core/macro";import { useLocale } from "@react-aria/i18n";import { useCallback, useMemo, useState } from "react";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getEmployeeDepartments,getEmployeeShifts,diff --git a/apps/erp/app/routes/x+/procedure+/$id.tsx b/apps/erp/app/routes/x+/procedure+/$id.tsxindex 0c88561148..37c38c69f2 100644--- a/apps/erp/app/routes/x+/procedure+/$id.tsx+++ b/apps/erp/app/routes/x+/procedure+/$id.tsx@@ -9,7 +9,7 @@ import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";import { generateHTML, useDebounce } from "@carbon/react";import { Editor } from "@carbon/react/Editor";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { getLocalTimeZone, today } from "@internationalized/date";import { msg } from "@lingui/core/macro";import { useLingui } from "@lingui/react/macro";@@ -18,13 +18,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- Outlet,- redirect,- useFetcher,- useLoaderData,- useParams-} from "react-router";+import { Outlet, useFetcher, useLoaderData, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import { useImageUpload, usePermissions, useUser } from "~/hooks";import { getProcedure, getProcedureVersions } from "~/modules/production";diff --git a/apps/erp/app/routes/x+/procedure+/_layout.tsx b/apps/erp/app/routes/x+/procedure+/_layout.tsxindex 93728cbc14..96a7e9e3ff 100644--- a/apps/erp/app/routes/x+/procedure+/_layout.tsx+++ b/apps/erp/app/routes/x+/procedure+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Procedure" }];};diff --git a/apps/erp/app/routes/x+/procedure+/delete.$id.tsx b/apps/erp/app/routes/x+/procedure+/delete.$id.tsxindex 5bdfa8c188..ba66ba331a 100644--- a/apps/erp/app/routes/x+/procedure+/delete.$id.tsx+++ b/apps/erp/app/routes/x+/procedure+/delete.$id.tsx@@ -5,11 +5,12 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteProcedure } from "~/modules/production/production.service";import { path } from "~/utils/path";import { getCompanyId, proceduresQuery } from "~/utils/react-query";diff --git a/apps/erp/app/routes/x+/production+/_layout.tsx b/apps/erp/app/routes/x+/production+/_layout.tsxindex 735fac7d50..72238cafc2 100644--- a/apps/erp/app/routes/x+/production+/_layout.tsx+++ b/apps/erp/app/routes/x+/production+/_layout.tsx@@ -11,6 +11,8 @@ import useProductionSubmodules from "~/modules/production/ui/useProductionSubmodimport type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Production" }];};diff --git a/apps/erp/app/routes/x+/production+/assemblies.new.tsx b/apps/erp/app/routes/x+/production+/assemblies.new.tsxindex c11bfa90cf..6e11a4b288 100644--- a/apps/erp/app/routes/x+/production+/assemblies.new.tsx+++ b/apps/erp/app/routes/x+/production+/assemblies.new.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { trigger } from "@carbon/jobs";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData, useNavigate } from "react-router";import {assemblyInstructionFromItemValidator,createAssemblyPlanJob,diff --git a/apps/erp/app/routes/x+/production+/batches.$batchId.tsx b/apps/erp/app/routes/x+/production+/batches.$batchId.tsxindex 91d25d60a2..1c4fd27fdb 100644--- a/apps/erp/app/routes/x+/production+/batches.$batchId.tsx+++ b/apps/erp/app/routes/x+/production+/batches.$batchId.tsx@@ -5,8 +5,10 @@import { error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import {getBatchOutputLots,getJobOperationBatchEvents,@@ -45,14 +47,14 @@ export async function loader({ request, params }: LoaderFunctionArgs) {export default function BatchRoute() {const { batch, events, outputLots } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();return (<BatchDetailDrawerbatch={batch}events={events}outputLots={outputLots}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/production+/batches.delete.$batchId.tsx b/apps/erp/app/routes/x+/production+/batches.delete.$batchId.tsxindex 931d154fc5..25cb97b5f1 100644--- a/apps/erp/app/routes/x+/production+/batches.delete.$batchId.tsx+++ b/apps/erp/app/routes/x+/production+/batches.delete.$batchId.tsx@@ -5,10 +5,11 @@import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { getErrorMessage } from "@carbon/utils";+import { useCloseRoute } from "@carbon/react";+import { getErrorMessage, redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { updateJobOperationBatch } from "~/modules/production";import { getDatabaseClient } from "~/services/database.server";@@ -84,6 +85,7 @@ export default function DeleteBatchRoute() {const { batchId } = useParams();const { t } = useLingui();const navigate = useNavigate();+ const closeRoute = useCloseRoute();if (!batchId) return null;return (@@ -92,7 +94,7 @@ export default function DeleteBatchRoute() {name={batch.readableId}deleteText={t`Dissolve`}text={t`Dissolving ${batch.readableId} returns its ${memberCount} operations to the schedule un-run and deletes the batch. A batch with recorded production must be completed instead.`}- onCancel={() => navigate(-1)}+ onCancel={() => closeRoute()}onSubmit={() => navigate(path.to.operationBatches)}/>);diff --git a/apps/erp/app/routes/x+/production+/batches.new.tsx b/apps/erp/app/routes/x+/production+/batches.new.tsxindex 25df87eb78..749a381adb 100644--- a/apps/erp/app/routes/x+/production+/batches.new.tsx+++ b/apps/erp/app/routes/x+/production+/batches.new.tsx@@ -5,9 +5,11 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";import type { BatchRules } from "@carbon/utils";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import {getBatchableProcesses,getJobOperationBatchWithMembers@@ -144,11 +146,11 @@ export default function NewBatchRoute() {initialProcessId,batch} = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();return (<BatchBuilder- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}defaultLocationId={defaultLocationId}initialLocationId={initialLocationId}initialProcessId={initialProcessId}diff --git a/apps/erp/app/routes/x+/production+/demand-forecasts.$itemId.$locationId.tsx b/apps/erp/app/routes/x+/production+/demand-forecasts.$itemId.$locationId.tsxindex 9680729e38..6e8051e91b 100644--- a/apps/erp/app/routes/x+/production+/demand-forecasts.$itemId.$locationId.tsx+++ b/apps/erp/app/routes/x+/production+/demand-forecasts.$itemId.$locationId.tsx@@ -8,9 +8,10 @@ import { flash } from "@carbon/auth/session.server";import { upsertDemandProjections } from "@carbon/ee/forecast.server";import { requireFeature } from "@carbon/ee/plan.server";import { validationError, validator } from "@carbon/form";-import { datetime } from "@carbon/utils";+import { useCloseRoute } from "@carbon/react";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import { demandProjectionValidator } from "~/modules/production/production.models";import { getDemandProjections } from "~/modules/production/production.service";import DemandProjectionsForm from "~/modules/production/ui/DemandProjection/DemandProjectionForm";@@ -140,13 +141,13 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function EditProjectionRoute() {const { initialValues } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();return (<DemandProjectionsForminitialValues={initialValues}isEditing- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/production+/demand-forecasts.delete.$itemId.$locationId.tsx b/apps/erp/app/routes/x+/production+/demand-forecasts.delete.$itemId.$locationId.tsxindex 0048e80635..97f609dbde 100644--- a/apps/erp/app/routes/x+/production+/demand-forecasts.delete.$itemId.$locationId.tsx+++ b/apps/erp/app/routes/x+/production+/demand-forecasts.delete.$itemId.$locationId.tsx@@ -7,9 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { deleteDemandProjections } from "@carbon/ee/forecast.server";import { requireFeature } from "@carbon/ee/plan.server";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { getOrCreatePeriods } from "~/modules/shared/shared.server";import { getLocationTimeZone } from "~/modules/shared/timezone.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/production+/demand-forecasts.new.tsx b/apps/erp/app/routes/x+/production+/demand-forecasts.new.tsxindex 8ef5fa7dc2..dc68b0d50b 100644--- a/apps/erp/app/routes/x+/production+/demand-forecasts.new.tsx+++ b/apps/erp/app/routes/x+/production+/demand-forecasts.new.tsx@@ -8,10 +8,10 @@ import { flash } from "@carbon/auth/session.server";import { upsertDemandProjections } from "@carbon/ee/forecast.server";import { requireFeature } from "@carbon/ee/plan.server";import { validationError, validator } from "@carbon/form";-import { useRouteData } from "@carbon/react";-import { datetime } from "@carbon/utils";+import { useCloseRoute, useRouteData } from "@carbon/react";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import { demandProjectionValidator } from "~/modules/production/production.models";import DemandProjectionForm from "~/modules/production/ui/DemandProjection/DemandProjectionForm";import { getOrCreatePeriods } from "~/modules/shared/shared.server";@@ -110,7 +110,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewProjectionRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const routeData = useRouteData<{locationId: string;}>(path.to.demandProjections);@@ -123,7 +123,7 @@ export default function NewProjectionRoute() {return (<DemandProjectionForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/production+/demand-forecasts.tsx b/apps/erp/app/routes/x+/production+/demand-forecasts.tsxindex d5aa3792ca..9a5cdc0bee 100644--- a/apps/erp/app/routes/x+/production+/demand-forecasts.tsx+++ b/apps/erp/app/routes/x+/production+/demand-forecasts.tsx@@ -6,14 +6,14 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { datetime, isUnaffectedByNavigation } from "@carbon/utils";+import { datetime, isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans } from "@lingui/react/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { usePlanGate } from "~/hooks/usePlanGate";import { getProductionProjections } from "~/modules/production";import DemandProjectionsTable from "~/modules/production/ui/DemandProjection/DemandProjectionTable";diff --git a/apps/erp/app/routes/x+/production+/inspection.new.tsx b/apps/erp/app/routes/x+/production+/inspection.new.tsxindex 97985f8895..69b714fbf5 100644--- a/apps/erp/app/routes/x+/production+/inspection.new.tsx+++ b/apps/erp/app/routes/x+/production+/inspection.new.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirect } from "react-router";+import { redirect } from "@carbon/utils";import { path } from "~/utils/path";// Inspection plans moved from Production to Quality; keep old links working.diff --git a/apps/erp/app/routes/x+/production+/inspection.tsx b/apps/erp/app/routes/x+/production+/inspection.tsxindex ea56dd8e56..4aba7bc2fa 100644--- a/apps/erp/app/routes/x+/production+/inspection.tsx+++ b/apps/erp/app/routes/x+/production+/inspection.tsx@@ -2,8 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";// Inspection plans moved from Production to Quality; keep old links working.diff --git a/apps/erp/app/routes/x+/production+/jobs.tsx b/apps/erp/app/routes/x+/production+/jobs.tsxindex a206150fda..1dd04d032a 100644--- a/apps/erp/app/routes/x+/production+/jobs.tsx+++ b/apps/erp/app/routes/x+/production+/jobs.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getJobs } from "~/modules/production";import { JobsTable } from "~/modules/production/ui/Jobs";import { getLocationsList } from "~/modules/resources";diff --git a/apps/erp/app/routes/x+/production+/planning.tsx b/apps/erp/app/routes/x+/production+/planning.tsxindex 1580d9700b..03699a238f 100644--- a/apps/erp/app/routes/x+/production+/planning.tsx+++ b/apps/erp/app/routes/x+/production+/planning.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { ResizablePanel, ResizablePanelGroup, VStack } from "@carbon/react";-import { datetime, isUnaffectedByNavigation } from "@carbon/utils";+import { datetime, isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import type { ProductionPlanningItem } from "~/modules/production";import { getProductionPlanning } from "~/modules/production";import ProductionPlanningTable from "~/modules/production/ui/Planning/ProductionPlanningTable";diff --git a/apps/erp/app/routes/x+/production+/procedures.new.tsx b/apps/erp/app/routes/x+/production+/procedures.new.tsxindex 31b4e9d126..77e688c7b7 100644--- a/apps/erp/app/routes/x+/production+/procedures.new.tsx+++ b/apps/erp/app/routes/x+/production+/procedures.new.tsx@@ -6,12 +6,13 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data, useNavigate } from "react-router";import { procedureValidator } from "~/modules/production/production.models";import { upsertProcedure } from "~/modules/production/production.service";import ProcedureForm from "~/modules/production/ui/Procedures/ProcedureForm";diff --git a/apps/erp/app/routes/x+/production+/scrap-reasons.$scrapReasonId.tsx b/apps/erp/app/routes/x+/production+/scrap-reasons.$scrapReasonId.tsxindex 0a62cdf8c7..f6f75b437d 100644--- a/apps/erp/app/routes/x+/production+/scrap-reasons.$scrapReasonId.tsx+++ b/apps/erp/app/routes/x+/production+/scrap-reasons.$scrapReasonId.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getScrapReason,scrapReasonValidator,@@ -84,7 +86,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function EditScrapReasonRoute() {const { scrapReason } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: scrapReason.id ?? undefined,@@ -96,7 +98,7 @@ export default function EditScrapReasonRoute() {<ScrapReasonFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/production+/scrap-reasons.delete.$scrapReasonId.tsx b/apps/erp/app/routes/x+/production+/scrap-reasons.delete.$scrapReasonId.tsxindex f1b6b73e87..886a15568b 100644--- a/apps/erp/app/routes/x+/production+/scrap-reasons.delete.$scrapReasonId.tsx+++ b/apps/erp/app/routes/x+/production+/scrap-reasons.delete.$scrapReasonId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteScrapReason, getScrapReason } from "~/modules/production";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/production+/scrap-reasons.new.tsx b/apps/erp/app/routes/x+/production+/scrap-reasons.new.tsxindex b7b8f4d02e..e926254431 100644--- a/apps/erp/app/routes/x+/production+/scrap-reasons.new.tsx+++ b/apps/erp/app/routes/x+/production+/scrap-reasons.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import { scrapReasonValidator, upsertScrapReason } from "~/modules/production";import ScrapReasonForm from "~/modules/production/ui/ScrapReasons/ScrapReasonForm";import { setCustomFields } from "~/utils/form";@@ -67,7 +68,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewCustomerStatusesRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: ""};@@ -75,7 +76,7 @@ export default function NewCustomerStatusesRoute() {return (<ScrapReasonForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.$lineId.delete.tsx b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.$lineId.delete.tsxindex d461b18308..ec3496f04b 100644--- a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.$lineId.delete.tsx+++ b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.$lineId.delete.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import {deletePurchaseInvoiceLine,diff --git a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.$lineId.details.tsx b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.$lineId.details.tsxindex b4e16d5cc4..da1e773c62 100644--- a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.$lineId.details.tsx+++ b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.$lineId.details.tsx@@ -7,11 +7,11 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";-import { getItemReadableId } from "@carbon/utils";+import { getItemReadableId, redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import { Fragment } from "react/jsx-runtime";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData, useParams } from "react-router";+import { Outlet, useLoaderData, useParams } from "react-router";import { DeferredFiles } from "~/components";import {getPurchaseInvoice,diff --git a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId._index.tsx b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId._index.tsxindex 6bd5ff60a4..1c6d6d4e6b 100644--- a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId._index.tsx+++ b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId._index.tsx@@ -3,9 +3,8 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { notFound } from "@carbon/auth";-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.delete.tsx b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.delete.tsxindex bd113727e1..347f8ae4c6 100644--- a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.delete.tsx+++ b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.delete.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deletePurchaseInvoice } from "~/modules/invoicing";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.delivery.tsx b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.delivery.tsxindex b50a455d95..38e4fe4499 100644--- a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.delivery.tsx+++ b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.delivery.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getPurchaseInvoice,isPurchaseInvoiceLocked,diff --git a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.details.tsx b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.details.tsxindex 4c2089dfd7..2968f7165e 100644--- a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.details.tsx+++ b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.details.tsx@@ -7,12 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { FileObject } from "@supabase/storage-js";import { useRef } from "react";import { Fragment } from "react/jsx-runtime";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { DeferredFiles } from "~/components";import { useRouteData, useUser } from "~/hooks";import type {diff --git a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.exchange-rate.tsx b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.exchange-rate.tsxindex 0ac64f8ecd..9feb0de0a2 100644--- a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.exchange-rate.tsx+++ b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.exchange-rate.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getExchangeRate } from "~/modules/accounting";import {getPurchaseInvoice,diff --git a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.new.tsx b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.new.tsxindex 603c489c32..a3462b48e3 100644--- a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.new.tsx+++ b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.new.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { useRouteData } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect, useParams } from "react-router";+import { useParams } from "react-router";import { useUser } from "~/hooks";import type { PurchaseInvoice } from "~/modules/invoicing";import {diff --git a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.status.tsx b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.status.tsxindex 2711236dd2..4167acdeca 100644--- a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.status.tsx+++ b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.status.tsx@@ -5,9 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { updatePurchaseInvoiceStatus } from "~/modules/invoicing";import { purchaseInvoiceStatusType } from "~/modules/invoicing/invoicing.models";import { getCompanySettings } from "~/modules/settings";diff --git a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.tsx b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.tsxindex bed0cb27b1..a744617921 100644--- a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.tsx+++ b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.tsx@@ -6,14 +6,14 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams } from "react-router";+import { Outlet, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout";import { getCurrencyByCode } from "~/modules/accounting";import {@@ -31,7 +31,7 @@ import {getSupplierInteractionDocuments} from "~/modules/purchasing/purchasing.service";import { detailBreadcrumb, type Handle } from "~/utils/handle";-import { path } from "~/utils/path";+import { path, requestReferrer } from "~/utils/path";export const handle: Handle = {breadcrumb: detailBreadcrumb(@@ -121,9 +121,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {}export async function action({ request }: ActionFunctionArgs) {- throw redirect(- request.headers.get("Referer") ?? new URL(request.url).pathname- );+ throw redirect(requestReferrer(request) ?? new URL(request.url).pathname);}export default function PurchaseInvoiceRoute() {diff --git a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.void.tsx b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.void.tsxindex f4e3b11a07..924f486336 100644--- a/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.void.tsx+++ b/apps/erp/app/routes/x+/purchase-invoice+/$invoiceId.void.tsx@@ -6,8 +6,8 @@ import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/purchase-invoice+/_layout.tsx b/apps/erp/app/routes/x+/purchase-invoice+/_layout.tsxindex a1c8e98298..dd39ac68f0 100644--- a/apps/erp/app/routes/x+/purchase-invoice+/_layout.tsx+++ b/apps/erp/app/routes/x+/purchase-invoice+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Invoicing" }];};diff --git a/apps/erp/app/routes/x+/purchase-invoice+/new.tsx b/apps/erp/app/routes/x+/purchase-invoice+/new.tsxindex d27be407a5..12866a9f74 100644--- a/apps/erp/app/routes/x+/purchase-invoice+/new.tsx+++ b/apps/erp/app/routes/x+/purchase-invoice+/new.tsx@@ -9,10 +9,14 @@ import { rejectCrossSiteNavigation } from "@carbon/auth/middleware/security.servimport { flash } from "@carbon/auth/session.server";import { storage } from "@carbon/files";import { validationError, validator } from "@carbon/form";-import { deriveRate, getErrorMessage, taxableBase } from "@carbon/utils";+import {+ deriveRate,+ getErrorMessage,+ redirect,+ taxableBase+} from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { useCompanyToday, useUrlParams, useUser } from "~/hooks";import { upsertDocument } from "~/modules/documents";import {@@ -27,7 +31,7 @@ import { resolveItemIdFromExtractedText } from "~/modules/items";import { getDatabaseClient } from "~/services/database.server";import { setCustomFields } from "~/utils/form";import type { Handle } from "~/utils/handle";-import { path } from "~/utils/path";+import { path, requestReferrer } from "~/utils/path";import { stripSpecialCharacters } from "~/utils/string";export const handle: Handle = {@@ -65,7 +69,7 @@ export async function loader({ request }: LoaderFunctionArgs) {if (result.error || !result?.data) {throw redirect(- request.headers.get("Referer") ?? path.to.purchaseOrders,+ requestReferrer(request) ?? path.to.purchaseOrders,await flash(request,error(diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId.$lineId.delete.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId.$lineId.delete.tsxindex e5b4f67424..91de74d049 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId.$lineId.delete.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId.$lineId.delete.tsx@@ -5,8 +5,8 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import {deletePurchaseOrderLine,getPurchaseOrder,diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId.$lineId.details.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId.$lineId.details.tsxindex 1c286a518c..49d22b3622 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId.$lineId.details.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId.$lineId.details.tsx@@ -8,9 +8,10 @@ import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";+import { redirect } from "@carbon/utils";import { Fragment } from "react/jsx-runtime";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData, useParams } from "react-router";+import { Outlet, useLoaderData, useParams } from "react-router";import { CadModel, DeferredFiles } from "~/components";import { usePermissions, useRouteData } from "~/hooks";import {diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId.$lineId.receiving.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId.$lineId.receiving.tsxindex 8a5b34275f..c28c99ba94 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId.$lineId.receiving.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId.$lineId.receiving.tsx@@ -5,8 +5,9 @@import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {getPurchaseOrder,getPurchaseOrderLine,diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId._index.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId._index.tsxindex a47e720207..2387aaab61 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId._index.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId.delete.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId.delete.tsxindex f7a1b5c140..bfe05bf622 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId.delete.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId.delete.tsx@@ -12,8 +12,8 @@ import {getLatestApprovalRequestForDocument} from "@carbon/ee/approvals.server";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deletePurchaseOrder, getPurchaseOrder } from "~/modules/purchasing";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId.delivery.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId.delivery.tsxindex df0033760b..a468487dab 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId.delivery.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId.delivery.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getPurchaseOrder,isPurchaseOrderLocked,diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId.details.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId.details.tsxindex ad5cf55328..8b9ef6d1c8 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId.details.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId.details.tsx@@ -7,10 +7,11 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { FileObject } from "@supabase/storage-js";import { useRef } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { DeferredFiles } from "~/components";import { useRouteData, useUser } from "~/hooks";import type {diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId.duplicate.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId.duplicate.tsxindex 36327a1fb4..26d763d220 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId.duplicate.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId.duplicate.tsx@@ -5,8 +5,8 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { duplicatePurchaseOrder } from "~/modules/purchasing/purchasing.service";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId.exchange-rate.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId.exchange-rate.tsxindex 10a721ff9a..85daa9049d 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId.exchange-rate.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId.exchange-rate.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getExchangeRate } from "~/modules/accounting";import {getPurchaseOrder,diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId.finalize.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId.finalize.tsxindex baa2ba400d..2477be12af 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId.finalize.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId.finalize.tsx@@ -22,11 +22,10 @@ import { trackWorkEvent } from "@carbon/lib/telemetry";import { getLogger } from "@carbon/logger";import { NotificationEvent } from "@carbon/notifications";import { serverFns } from "@carbon/server-functions";-import { PO_EMAIL_ATTACHMENT_LIMIT_MB } from "@carbon/utils";+import { PO_EMAIL_ATTACHMENT_LIMIT_MB, redirect } from "@carbon/utils";import { renderAsync } from "@react-email/components";import { parseAcceptLanguage } from "intl-parse-accept-language";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getCurrencyByCode, getPaymentTermsList } from "~/modules/accounting";import { upsertDocument } from "~/modules/documents";import {diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId.new.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId.new.tsxindex 8977c6527d..f10f09c963 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId.new.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId.new.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect, useParams } from "react-router";+import { useParams } from "react-router";import { getUnreleasedChangeOrderIssue } from "~/modules/items/items.server";import {getPurchaseOrder,diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId.payment.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId.payment.tsxindex 6c5eaa6cae..6dae5d6ee4 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId.payment.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId.payment.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getPurchaseOrder,isPurchaseOrderLocked,diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId.status.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId.status.tsxindex 008f98c19c..5bebb101bf 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId.status.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId.status.tsx@@ -8,8 +8,8 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { canApproveRequest } from "@carbon/ee/approvals.server";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { runMRP } from "~/modules/production";import {canCreatePurchaseOrderRevision,diff --git a/apps/erp/app/routes/x+/purchase-order+/$orderId.tsx b/apps/erp/app/routes/x+/purchase-order+/$orderId.tsxindex 890b6bed32..44d8df23c9 100644--- a/apps/erp/app/routes/x+/purchase-order+/$orderId.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/$orderId.tsx@@ -23,7 +23,7 @@ import { getLogger } from "@carbon/logger";import { NotificationEvent } from "@carbon/notifications";import { VStack } from "@carbon/react";import { serverFns } from "@carbon/server-functions";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { renderAsync } from "@react-email/components";import type { FileObject } from "@supabase/storage-js";@@ -33,7 +33,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams } from "react-router";+import { Outlet, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import { getCurrencyByCode, getPaymentTermsList } from "~/modules/accounting";import { upsertDocument } from "~/modules/documents";diff --git a/apps/erp/app/routes/x+/purchase-order+/_layout.tsx b/apps/erp/app/routes/x+/purchase-order+/_layout.tsxindex f3a4fc290d..f6003bf9f6 100644--- a/apps/erp/app/routes/x+/purchase-order+/_layout.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Purchase Order" }];};diff --git a/apps/erp/app/routes/x+/purchase-order+/new.tsx b/apps/erp/app/routes/x+/purchase-order+/new.tsxindex 39e4daf727..0df778928b 100644--- a/apps/erp/app/routes/x+/purchase-order+/new.tsx+++ b/apps/erp/app/routes/x+/purchase-order+/new.tsx@@ -6,9 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { z } from "zod";import { useCompanyToday, useUrlParams, useUser } from "~/hooks";import type { PurchaseOrderStatus } from "~/modules/purchasing";diff --git a/apps/erp/app/routes/x+/purchase-return-order+/$id.$lineId.delete.tsx b/apps/erp/app/routes/x+/purchase-return-order+/$id.$lineId.delete.tsxindex e3f1d4f720..b535defb6a 100644--- a/apps/erp/app/routes/x+/purchase-return-order+/$id.$lineId.delete.tsx+++ b/apps/erp/app/routes/x+/purchase-return-order+/$id.$lineId.delete.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {deletePurchaseReturnOrderLine,getPurchaseReturnOrder,diff --git a/apps/erp/app/routes/x+/purchase-return-order+/$id.$lineId.details.tsx b/apps/erp/app/routes/x+/purchase-return-order+/$id.$lineId.details.tsxindex 28f88f2260..c4bdbaf2d6 100644--- a/apps/erp/app/routes/x+/purchase-return-order+/$id.$lineId.details.tsx+++ b/apps/erp/app/routes/x+/purchase-return-order+/$id.$lineId.details.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { useRouteData } from "~/hooks";import {getPurchaseReturnOrder,diff --git a/apps/erp/app/routes/x+/purchase-return-order+/$id.$lineId.receiving.tsx b/apps/erp/app/routes/x+/purchase-return-order+/$id.$lineId.receiving.tsxindex dcbb088409..84c0fdb4b4 100644--- a/apps/erp/app/routes/x+/purchase-return-order+/$id.$lineId.receiving.tsx+++ b/apps/erp/app/routes/x+/purchase-return-order+/$id.$lineId.receiving.tsx@@ -5,8 +5,9 @@import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {getPurchaseReturnOrder,getPurchaseReturnOrderLine,diff --git a/apps/erp/app/routes/x+/purchase-return-order+/$id._index.tsx b/apps/erp/app/routes/x+/purchase-return-order+/$id._index.tsxindex 1fdd9a38c0..7c1e37d31f 100644--- a/apps/erp/app/routes/x+/purchase-return-order+/$id._index.tsx+++ b/apps/erp/app/routes/x+/purchase-return-order+/$id._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/purchase-return-order+/$id.credit.tsx b/apps/erp/app/routes/x+/purchase-return-order+/$id.credit.tsxindex 53866182f4..176ef9e060 100644--- a/apps/erp/app/routes/x+/purchase-return-order+/$id.credit.tsx+++ b/apps/erp/app/routes/x+/purchase-return-order+/$id.credit.tsx@@ -6,9 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import {createPurchaseReturnOrderCredit,getCreditableQuantitiesForPurchaseReturn,diff --git a/apps/erp/app/routes/x+/purchase-return-order+/$id.delete.tsx b/apps/erp/app/routes/x+/purchase-return-order+/$id.delete.tsxindex 395f6f3d4e..65249e9c12 100644--- a/apps/erp/app/routes/x+/purchase-return-order+/$id.delete.tsx+++ b/apps/erp/app/routes/x+/purchase-return-order+/$id.delete.tsx@@ -5,8 +5,9 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {deletePurchaseReturnOrder,getPurchaseReturnOrder,diff --git a/apps/erp/app/routes/x+/purchase-return-order+/$id.new.tsx b/apps/erp/app/routes/x+/purchase-return-order+/$id.new.tsxindex 06f54d0a57..bc97e9b1c6 100644--- a/apps/erp/app/routes/x+/purchase-return-order+/$id.new.tsx+++ b/apps/erp/app/routes/x+/purchase-return-order+/$id.new.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getPurchaseReturnOrder,getReturnableEntitiesForReceiptLine,diff --git a/apps/erp/app/routes/x+/purchase-return-order+/$id.replacement.tsx b/apps/erp/app/routes/x+/purchase-return-order+/$id.replacement.tsxindex e2e37d6dcf..40e22706c0 100644--- a/apps/erp/app/routes/x+/purchase-return-order+/$id.replacement.tsx+++ b/apps/erp/app/routes/x+/purchase-return-order+/$id.replacement.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { createReplacementPurchaseOrder } from "~/modules/purchasing";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/purchase-return-order+/$id.status.tsx b/apps/erp/app/routes/x+/purchase-return-order+/$id.status.tsxindex a68c1175da..27dbfd9165 100644--- a/apps/erp/app/routes/x+/purchase-return-order+/$id.status.tsx+++ b/apps/erp/app/routes/x+/purchase-return-order+/$id.status.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {cancelPurchaseReturnOrder,reopenPurchaseReturnOrderdiff --git a/apps/erp/app/routes/x+/purchase-return-order+/$id.tsx b/apps/erp/app/routes/x+/purchase-return-order+/$id.tsxindex 43fbc1b1b3..cdec535d3a 100644--- a/apps/erp/app/routes/x+/purchase-return-order+/$id.tsx+++ b/apps/erp/app/routes/x+/purchase-return-order+/$id.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams } from "react-router";+import { Outlet, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import {getPurchaseReturnOrder,diff --git a/apps/erp/app/routes/x+/purchase-return-order+/_layout.tsx b/apps/erp/app/routes/x+/purchase-return-order+/_layout.tsxindex ff45ca4c70..030c95e9c0 100644--- a/apps/erp/app/routes/x+/purchase-return-order+/_layout.tsx+++ b/apps/erp/app/routes/x+/purchase-return-order+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Purchase Return Order" }];};diff --git a/apps/erp/app/routes/x+/purchase-return-order+/new.tsx b/apps/erp/app/routes/x+/purchase-return-order+/new.tsxindex e3b3394688..0c30e2f073 100644--- a/apps/erp/app/routes/x+/purchase-return-order+/new.tsx+++ b/apps/erp/app/routes/x+/purchase-return-order+/new.tsx@@ -6,9 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { useCompanyToday, useUrlParams, useUser } from "~/hooks";import {insertPurchaseReturnOrder,diff --git a/apps/erp/app/routes/x+/purchasing+/_layout.tsx b/apps/erp/app/routes/x+/purchasing+/_layout.tsxindex a759f449cf..fc688873eb 100644--- a/apps/erp/app/routes/x+/purchasing+/_layout.tsx+++ b/apps/erp/app/routes/x+/purchasing+/_layout.tsx@@ -11,6 +11,8 @@ import usePurchasingSubmodules from "~/modules/purchasing/ui/usePurchasingSubmodimport type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Purchasing" }];};diff --git a/apps/erp/app/routes/x+/purchasing+/invoices.tsx b/apps/erp/app/routes/x+/purchasing+/invoices.tsxindex 1daa8cd4c1..da1385a321 100644--- a/apps/erp/app/routes/x+/purchasing+/invoices.tsx+++ b/apps/erp/app/routes/x+/purchasing+/invoices.tsx@@ -2,8 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";// Purchase invoices now live solely in the invoicing module. This legacydiff --git a/apps/erp/app/routes/x+/purchasing+/orders.tsx b/apps/erp/app/routes/x+/purchasing+/orders.tsxindex 56ebaaea83..818aec3b85 100644--- a/apps/erp/app/routes/x+/purchasing+/orders.tsx+++ b/apps/erp/app/routes/x+/purchasing+/orders.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getPurchaseOrders } from "~/modules/purchasing";import { PurchaseOrdersTable } from "~/modules/purchasing/ui/PurchaseOrder";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/purchasing+/planning.tsx b/apps/erp/app/routes/x+/purchasing+/planning.tsxindex a67081e842..430abbae2b 100644--- a/apps/erp/app/routes/x+/purchasing+/planning.tsx+++ b/apps/erp/app/routes/x+/purchasing+/planning.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { ResizablePanel, ResizablePanelGroup, VStack } from "@carbon/react";-import { datetime, isUnaffectedByNavigation } from "@carbon/utils";+import { datetime, isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import type { PurchasingPlanningItem } from "~/modules/purchasing";import { getPurchasingPlanning } from "~/modules/purchasing";import PurchasingPlanningTable from "~/modules/purchasing/ui/Planning/PurchasingPlanningTable";diff --git a/apps/erp/app/routes/x+/purchasing+/quotes.tsx b/apps/erp/app/routes/x+/purchasing+/quotes.tsxindex 950c2456e3..6b4eed0c89 100644--- a/apps/erp/app/routes/x+/purchasing+/quotes.tsx+++ b/apps/erp/app/routes/x+/purchasing+/quotes.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getSupplierQuotes } from "~/modules/purchasing/purchasing.service";import { SupplierQuotesTable } from "~/modules/purchasing/ui/SupplierQuote";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/purchasing+/rfqs.tsx b/apps/erp/app/routes/x+/purchasing+/rfqs.tsxindex f3f58d2e2c..c6808b8cec 100644--- a/apps/erp/app/routes/x+/purchasing+/rfqs.tsx+++ b/apps/erp/app/routes/x+/purchasing+/rfqs.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getPurchasingRFQs } from "~/modules/purchasing";import { PurchasingRFQsTable } from "~/modules/purchasing/ui/PurchasingRfq";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/purchasing+/supplier-returns.tsx b/apps/erp/app/routes/x+/purchasing+/supplier-returns.tsxindex 60c92d9032..092152eaa5 100644--- a/apps/erp/app/routes/x+/purchasing+/supplier-returns.tsx+++ b/apps/erp/app/routes/x+/purchasing+/supplier-returns.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getPurchaseReturnOrders } from "~/modules/purchasing";import { PurchaseReturnOrdersTable } from "~/modules/purchasing/ui/PurchaseReturnOrders";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/purchasing+/supplier-types.$supplierTypeId.tsx b/apps/erp/app/routes/x+/purchasing+/supplier-types.$supplierTypeId.tsxindex 6ff114cf20..86752012f1 100644--- a/apps/erp/app/routes/x+/purchasing+/supplier-types.$supplierTypeId.tsx+++ b/apps/erp/app/routes/x+/purchasing+/supplier-types.$supplierTypeId.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getSupplierType,supplierTypeValidator,@@ -103,7 +105,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function EditSupplierTypesRoute() {const { supplierType } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: supplierType.id ?? undefined,@@ -115,7 +117,7 @@ export default function EditSupplierTypesRoute() {<SupplierTypeFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/purchasing+/supplier-types.delete.$supplierTypeId.tsx b/apps/erp/app/routes/x+/purchasing+/supplier-types.delete.$supplierTypeId.tsxindex 382376633c..2f4a4556da 100644--- a/apps/erp/app/routes/x+/purchasing+/supplier-types.delete.$supplierTypeId.tsx+++ b/apps/erp/app/routes/x+/purchasing+/supplier-types.delete.$supplierTypeId.tsx@@ -5,13 +5,14 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteSupplierType, getSupplierType } from "~/modules/purchasing";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/purchasing+/supplier-types.new.tsx b/apps/erp/app/routes/x+/purchasing+/supplier-types.new.tsxindex 614a46dd46..8835ac90cc 100644--- a/apps/erp/app/routes/x+/purchasing+/supplier-types.new.tsx+++ b/apps/erp/app/routes/x+/purchasing+/supplier-types.new.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import {supplierTypeValidator,upsertSupplierType@@ -82,7 +84,7 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {}export default function NewSupplierTypesRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: ""};@@ -90,7 +92,7 @@ export default function NewSupplierTypesRoute() {return (<SupplierTypeForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/purchasing+/suppliers.tsx b/apps/erp/app/routes/x+/purchasing+/suppliers.tsxindex 70667a5d11..4cc7fb09e2 100644--- a/apps/erp/app/routes/x+/purchasing+/suppliers.tsx+++ b/apps/erp/app/routes/x+/purchasing+/suppliers.tsx@@ -6,10 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { indexBy, indexByMapped, pluckUnique } from "@carbon/utils";+import { indexBy, indexByMapped, pluckUnique, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import type { SupplierReportContactsBySupplierId } from "~/modules/purchasing";import { getSupplierReportContacts, getSuppliers } from "~/modules/purchasing";import { SuppliersTable } from "~/modules/purchasing/ui/Supplier";diff --git a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.$lineId.delete.tsx b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.$lineId.delete.tsxindex 1b4218b354..2c52428344 100644--- a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.$lineId.delete.tsx+++ b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.$lineId.delete.tsx@@ -5,7 +5,8 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { type ActionFunctionArgs, redirect } from "react-router";+import { redirect } from "@carbon/utils";+import type { ActionFunctionArgs } from "react-router";import {deletePurchasingRFQLine,getPurchasingRFQ,diff --git a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.$lineId.details.tsx b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.$lineId.details.tsxindex 8403e43025..fe4bd937ff 100644--- a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.$lineId.details.tsx+++ b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.$lineId.details.tsx@@ -9,9 +9,10 @@ import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";+import { redirect } from "@carbon/utils";import { Fragment } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData, useParams } from "react-router";+import { Outlet, useLoaderData, useParams } from "react-router";import { CadModel, DeferredFiles } from "~/components";import { usePermissions, useRouteData } from "~/hooks";import type { PurchasingRFQ } from "~/modules/purchasing";diff --git a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.cancel.tsx b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.cancel.tsxindex 62ec51c5ae..fe822637fe 100644--- a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.cancel.tsx+++ b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.cancel.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getLinkedSupplierQuotes,updatePurchasingRFQStatus,diff --git a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.convert.tsx b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.convert.tsxindex 5f327d9c4a..e4b96c96a7 100644--- a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.convert.tsx+++ b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.convert.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getPurchasingRFQ,getPurchasingRFQLines,diff --git a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.delete.tsx b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.delete.tsxindex e435fd87bf..c5ca96bace 100644--- a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.delete.tsx+++ b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.delete.tsx@@ -5,8 +5,9 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deletePurchasingRFQ } from "~/modules/purchasing";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.details.tsx b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.details.tsxindex bdd4cf3d87..b7b2a8ba56 100644--- a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.details.tsx+++ b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.details.tsx@@ -8,9 +8,10 @@ import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { FileObject } from "@supabase/storage-js";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { DeferredFiles } from "~/components";import { useRouteData } from "~/hooks";import type { PurchasingRFQ, PurchasingRFQLine } from "~/modules/purchasing";diff --git a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.finalize.tsx b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.finalize.tsxindex 00620c552a..9935d63da5 100644--- a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.finalize.tsx+++ b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.finalize.tsx@@ -9,10 +9,9 @@ import { storage } from "@carbon/files";import { validationError, validator } from "@carbon/form";import { trigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";-import { tiptapToHTML } from "@carbon/utils";+import { redirect, tiptapToHTML } from "@carbon/utils";import type { JSONContent } from "@tiptap/react";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getPurchasingRFQ,getPurchasingRFQLines,diff --git a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.new.tsx b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.new.tsxindex d62c65f346..309f6e0c8d 100644--- a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.new.tsx+++ b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.new.tsx@@ -6,7 +6,8 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { type ActionFunctionArgs, redirect } from "react-router";+import { redirect } from "@carbon/utils";+import type { ActionFunctionArgs } from "react-router";import {getPurchasingRFQ,isRfqLocked,diff --git a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.status.tsx b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.status.tsxindex b4c6045ca8..acbdc51581 100644--- a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.status.tsx+++ b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.status.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {purchasingRfqStatusType,updatePurchasingRFQStatusdiff --git a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.tsx b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.tsxindex 441fbd9d49..64dbf5d1d0 100644--- a/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.tsx+++ b/apps/erp/app/routes/x+/purchasing-rfq+/$rfqId.tsx@@ -8,13 +8,13 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { type JSONContent, VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams } from "react-router";+import { Outlet, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import type { PurchasingRFQLine } from "~/modules/purchasing";import {diff --git a/apps/erp/app/routes/x+/purchasing-rfq+/_layout.tsx b/apps/erp/app/routes/x+/purchasing-rfq+/_layout.tsxindex f2d5bd0f34..db317fd7f6 100644--- a/apps/erp/app/routes/x+/purchasing-rfq+/_layout.tsx+++ b/apps/erp/app/routes/x+/purchasing-rfq+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Purchasing RFQ" }];};diff --git a/apps/erp/app/routes/x+/purchasing-rfq+/new.tsx b/apps/erp/app/routes/x+/purchasing-rfq+/new.tsxindex d21bad9a4f..b5c57cb8c9 100644--- a/apps/erp/app/routes/x+/purchasing-rfq+/new.tsx+++ b/apps/erp/app/routes/x+/purchasing-rfq+/new.tsx@@ -6,9 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { useCompanyToday, useUser } from "~/hooks";import type { PurchasingRFQStatusType } from "~/modules/purchasing";import {diff --git a/apps/erp/app/routes/x+/quality+/_layout.tsx b/apps/erp/app/routes/x+/quality+/_layout.tsxindex 013ae1f80b..9fb652b399 100644--- a/apps/erp/app/routes/x+/quality+/_layout.tsx+++ b/apps/erp/app/routes/x+/quality+/_layout.tsx@@ -11,6 +11,8 @@ import useQualitySubmodules from "~/modules/quality/ui/useQualitySubmodules";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Quality" }];};diff --git a/apps/erp/app/routes/x+/quality+/calibrations.$id.tsx b/apps/erp/app/routes/x+/quality+/calibrations.$id.tsxindex 225378d8f8..5a51ba1b41 100644--- a/apps/erp/app/routes/x+/quality+/calibrations.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/calibrations.$id.tsx@@ -7,9 +7,11 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import type z from "zod";import type { calibrationAttempt } from "~/modules/quality";import {@@ -143,14 +145,14 @@ export default function GaugeCalibrationRecordRoute() {...getCustomFields(record.customFields)};- const navigate = useNavigate();+ const closeRoute = useCloseRoute();return (<GaugeCalibrationRecordFormkey={id}initialValues={initialValues}files={files}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/quality+/calibrations.delete.$id.tsx b/apps/erp/app/routes/x+/quality+/calibrations.delete.$id.tsxindex e87e465a98..d1c9ffe77e 100644--- a/apps/erp/app/routes/x+/quality+/calibrations.delete.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/calibrations.delete.$id.tsx@@ -5,8 +5,9 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteGaugeCalibrationRecord } from "~/modules/quality";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/quality+/calibrations.new.tsx b/apps/erp/app/routes/x+/quality+/calibrations.new.tsxindex 869961a22f..fb0e01229e 100644--- a/apps/erp/app/routes/x+/quality+/calibrations.new.tsx+++ b/apps/erp/app/routes/x+/quality+/calibrations.new.tsx@@ -7,19 +7,19 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { useUrlParams } from "@carbon/react";+import { redirect } from "@carbon/utils";import { getLocalTimeZone, today } from "@internationalized/date";import type { FileObject } from "@supabase/storage-js";import { nanoid } from "nanoid";import { useEffect } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData, useNavigate } from "react-router";import {gaugeCalibrationRecordValidator,getQualityFiles,upsertGaugeCalibrationRecord} from "~/modules/quality";import GaugeCalibrationRecordForm from "~/modules/quality/ui/Calibrations/GaugeCalibrationRecordForm";-import { setCustomFields } from "~/utils/form";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/quality+/documents.new.tsx b/apps/erp/app/routes/x+/quality+/documents.new.tsxindex ab89d5708d..664a5b6c7c 100644--- a/apps/erp/app/routes/x+/quality+/documents.new.tsx+++ b/apps/erp/app/routes/x+/quality+/documents.new.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import { qualityDocumentValidator } from "~/modules/quality/quality.models";import { upsertQualityDocument } from "~/modules/quality/quality.service";import QualityDocumentForm from "~/modules/quality/ui/Documents/QualityDocumentForm";@@ -79,7 +81,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewQualityDocumentRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",version: 0,@@ -90,7 +92,7 @@ export default function NewQualityDocumentRoute() {<QualityDocumentForminitialValues={initialValues}type="new"- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/quality+/gauge-types.$id.tsx b/apps/erp/app/routes/x+/quality+/gauge-types.$id.tsxindex 75b183c903..c10c7f5831 100644--- a/apps/erp/app/routes/x+/quality+/gauge-types.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/gauge-types.$id.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {gaugeTypeValidator,getGaugeType,@@ -81,7 +83,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function EditGaugeTypeRoute() {const { gaugeType } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: gaugeType.id ?? undefined,@@ -93,7 +95,7 @@ export default function EditGaugeTypeRoute() {<GaugeTypeFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/quality+/gauge-types.delete.$id.tsx b/apps/erp/app/routes/x+/quality+/gauge-types.delete.$id.tsxindex 48bc369bde..ed577084f1 100644--- a/apps/erp/app/routes/x+/quality+/gauge-types.delete.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/gauge-types.delete.$id.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteGaugeType, getGaugeType } from "~/modules/quality";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/quality+/gauge-types.new.tsx b/apps/erp/app/routes/x+/quality+/gauge-types.new.tsxindex be3171b5dc..27a5ce8539 100644--- a/apps/erp/app/routes/x+/quality+/gauge-types.new.tsx+++ b/apps/erp/app/routes/x+/quality+/gauge-types.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import { gaugeTypeValidator, upsertGaugeType } from "~/modules/quality";import GaugeTypeForm from "~/modules/quality/ui/GaugeTypes/GaugeTypeForm";import { setCustomFields } from "~/utils/form";@@ -67,12 +68,12 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewCustomerStatusesRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: ""};return (- <GaugeTypeForm initialValues={initialValues} onClose={() => navigate(-1)} />+ <GaugeTypeForm initialValues={initialValues} onClose={() => closeRoute()} />);}diff --git a/apps/erp/app/routes/x+/quality+/gauges.$id.tsx b/apps/erp/app/routes/x+/quality+/gauges.$id.tsxindex 09f3aef3a1..85002afe29 100644--- a/apps/erp/app/routes/x+/quality+/gauges.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/gauges.$id.tsx@@ -7,11 +7,12 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { datetime } from "@carbon/utils";+import { useCloseRoute } from "@carbon/react";+import { datetime, redirect } from "@carbon/utils";import { parseDate } from "@internationalized/date";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { GaugeType } from "~/modules/quality";import {@@ -151,16 +152,16 @@ export default function GaugeRoute() {...getCustomFields(gauge.customFields)};- const navigate = useNavigate();+ const closeRoute = useCloseRoute();return (<GaugeFormkey={id}- // @ts-ignore+ // @ts-expect-errorinitialValues={initialValues}records={records}gaugeTypes={routeData?.gaugeTypes ?? []}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/quality+/gauges.activate.$id.tsx b/apps/erp/app/routes/x+/quality+/gauges.activate.$id.tsxindex 39bef477a2..4760c517af 100644--- a/apps/erp/app/routes/x+/quality+/gauges.activate.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/gauges.activate.$id.tsx@@ -5,8 +5,9 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { activateGauge } from "~/modules/quality";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/quality+/gauges.deactivate.$id.tsx b/apps/erp/app/routes/x+/quality+/gauges.deactivate.$id.tsxindex 4de69fb4a9..2bb136ff41 100644--- a/apps/erp/app/routes/x+/quality+/gauges.deactivate.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/gauges.deactivate.$id.tsx@@ -5,8 +5,9 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deactivateGauge } from "~/modules/quality";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/quality+/gauges.delete.$id.tsx b/apps/erp/app/routes/x+/quality+/gauges.delete.$id.tsxindex d451cbc295..680eea28bf 100644--- a/apps/erp/app/routes/x+/quality+/gauges.delete.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/gauges.delete.$id.tsx@@ -5,8 +5,9 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteGauge } from "~/modules/quality";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/quality+/gauges.new.tsx b/apps/erp/app/routes/x+/quality+/gauges.new.tsxindex 66ffd7019d..96d8900858 100644--- a/apps/erp/app/routes/x+/quality+/gauges.new.tsx+++ b/apps/erp/app/routes/x+/quality+/gauges.new.tsx@@ -6,10 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { datetime } from "@carbon/utils";+import { useCloseRoute } from "@carbon/react";+import { datetime, redirect } from "@carbon/utils";import { parseDate } from "@internationalized/date";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import { useCompanyToday, useRouteData, useUser } from "~/hooks";import type { GaugeType } from "~/modules/quality";import { gaugeValidator, insertGauge } from "~/modules/quality";@@ -76,7 +76,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function GaugeNewRoute() {const { defaults } = useUser();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const routeData = useRouteData<{gaugeTypes: GaugeType[];@@ -106,7 +106,7 @@ export default function GaugeNewRoute() {<GaugeForminitialValues={initialValues}gaugeTypes={routeData?.gaugeTypes ?? []}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/quality+/inbound-inspections.$id.tsx b/apps/erp/app/routes/x+/quality+/inbound-inspections.$id.tsxindex 73f073f5b9..b28b85af0f 100644--- a/apps/erp/app/routes/x+/quality+/inbound-inspections.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/inbound-inspections.$id.tsx@@ -2,8 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import invariant from "tiny-invariant";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/quality+/inbound-inspections.tsx b/apps/erp/app/routes/x+/quality+/inbound-inspections.tsxindex 635d79f44b..f6d184db8e 100644--- a/apps/erp/app/routes/x+/quality+/inbound-inspections.tsx+++ b/apps/erp/app/routes/x+/quality+/inbound-inspections.tsx@@ -2,8 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";// The Inbound Inspections submodule was renamed to Inspections.diff --git a/apps/erp/app/routes/x+/quality+/inspection-plans.new.tsx b/apps/erp/app/routes/x+/quality+/inspection-plans.new.tsxindex 97a7016d14..9119126101 100644--- a/apps/erp/app/routes/x+/quality+/inspection-plans.new.tsx+++ b/apps/erp/app/routes/x+/quality+/inspection-plans.new.tsx@@ -6,12 +6,13 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useNavigate } from "react-router";import { upsertInspectionDocument } from "~/modules/quality";import { inspectionDocumentValidator } from "~/modules/quality/quality.models";import { InspectionDocumentForm } from "~/modules/quality/ui/InspectionDocument";@@ -66,12 +67,12 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {}export default function BalloonNewRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();return (<InspectionDocumentForminitialValues={{ name: "", partId: "", drawingNumber: "" }}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/quality+/inspections.tsx b/apps/erp/app/routes/x+/quality+/inspections.tsxindex d10f5c483b..990aabaf0d 100644--- a/apps/erp/app/routes/x+/quality+/inspections.tsx+++ b/apps/erp/app/routes/x+/quality+/inspections.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getInspections } from "~/modules/quality";import InspectionsTable from "~/modules/quality/ui/Inspections/InspectionsTable";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/quality+/issue-types.$id.tsx b/apps/erp/app/routes/x+/quality+/issue-types.$id.tsxindex 8e8a036e63..d3fc105e38 100644--- a/apps/erp/app/routes/x+/quality+/issue-types.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/issue-types.$id.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getIssueType,getIssueTypeByName,@@ -115,7 +117,7 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {export default function EditIssueTypeRoute() {const { nonConformanceType } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: nonConformanceType.id ?? undefined,@@ -127,7 +129,7 @@ export default function EditIssueTypeRoute() {<IssueTypeFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/quality+/issue-types.delete.$id.tsx b/apps/erp/app/routes/x+/quality+/issue-types.delete.$id.tsxindex ad6e637274..300fcd338c 100644--- a/apps/erp/app/routes/x+/quality+/issue-types.delete.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/issue-types.delete.$id.tsx@@ -5,13 +5,14 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteIssueType, getIssueType } from "~/modules/quality";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/quality+/issue-types.new.tsx b/apps/erp/app/routes/x+/quality+/issue-types.new.tsxindex d943c2b8f1..35209baed4 100644--- a/apps/erp/app/routes/x+/quality+/issue-types.new.tsx+++ b/apps/erp/app/routes/x+/quality+/issue-types.new.tsx@@ -6,12 +6,13 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useNavigate } from "react-router";import {getIssueTypeByName,issueTypeValidator,@@ -100,12 +101,12 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {}export default function NewCustomerStatusesRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: ""};return (- <IssueTypeForm initialValues={initialValues} onClose={() => navigate(-1)} />+ <IssueTypeForm initialValues={initialValues} onClose={() => closeRoute()} />);}diff --git a/apps/erp/app/routes/x+/quality+/issues.tsx b/apps/erp/app/routes/x+/quality+/issues.tsxindex 479977dedf..1d744ec23c 100644--- a/apps/erp/app/routes/x+/quality+/issues.tsx+++ b/apps/erp/app/routes/x+/quality+/issues.tsx@@ -7,9 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getIssues, getIssueTypesList } from "~/modules/quality";import IssuesTable from "~/modules/quality/ui/Issue/IssuesTable";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/quality+/required-actions.$id.tsx b/apps/erp/app/routes/x+/quality+/required-actions.$id.tsxindex dffd0e3e80..46e4a9fb11 100644--- a/apps/erp/app/routes/x+/quality+/required-actions.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/required-actions.$id.tsx@@ -6,15 +6,15 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData, useNavigate } from "react-router";import {getRequiredAction,requiredActionValidator,upsertRequiredAction} from "~/modules/quality";import { RequiredActionForm } from "~/modules/quality/ui/RequiredActions";-import { path } from "~/utils/path";export async function loader({ request, params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/quality+/required-actions.delete.$id.tsx b/apps/erp/app/routes/x+/quality+/required-actions.delete.$id.tsxindex 290cb03f1a..ded5897936 100644--- a/apps/erp/app/routes/x+/quality+/required-actions.delete.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/required-actions.delete.$id.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteRequiredAction } from "~/modules/quality";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/quality+/required-actions.new.tsx b/apps/erp/app/routes/x+/quality+/required-actions.new.tsxindex 152473d5b4..513c79e50e 100644--- a/apps/erp/app/routes/x+/quality+/required-actions.new.tsx+++ b/apps/erp/app/routes/x+/quality+/required-actions.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";+import { useNavigate } from "react-router";import {requiredActionValidator,upsertRequiredActiondiff --git a/apps/erp/app/routes/x+/quality+/risks.$id.tsx b/apps/erp/app/routes/x+/quality+/risks.$id.tsxindex 53c2f2a3b8..7d0a67fe92 100644--- a/apps/erp/app/routes/x+/quality+/risks.$id.tsx+++ b/apps/erp/app/routes/x+/quality+/risks.$id.tsx@@ -9,8 +9,10 @@ import { validationError, validator } from "@carbon/form";import { trigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";import { NotificationEvent } from "@carbon/notifications";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import invariant from "tiny-invariant";import { riskRegisterValidator } from "~/modules/quality/quality.models";import { getRisk, upsertRisk } from "~/modules/quality/quality.service";@@ -101,9 +103,9 @@ export const action = async ({ request }: ActionFunctionArgs) => {export default function EditRiskRoute() {const { risk } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const onClose = () => {- navigate(-1);+ closeRoute();};return (diff --git a/apps/erp/app/routes/x+/quality+/risks.new.tsx b/apps/erp/app/routes/x+/quality+/risks.new.tsxindex 35cbb40d16..7377bed3e5 100644--- a/apps/erp/app/routes/x+/quality+/risks.new.tsx+++ b/apps/erp/app/routes/x+/quality+/risks.new.tsx@@ -10,8 +10,8 @@ import { trigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";import { NotificationEvent } from "@carbon/notifications";import { useDisclosure } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { riskRegisterValidator } from "~/modules/quality/quality.models";import { upsertRisk } from "~/modules/quality/quality.service";import RiskRegisterForm from "~/modules/quality/ui/RiskRegister/RiskRegisterForm";diff --git a/apps/erp/app/routes/x+/quality+/risks.tsx b/apps/erp/app/routes/x+/quality+/risks.tsxindex 769dd87e00..61f26fc8fe 100644--- a/apps/erp/app/routes/x+/quality+/risks.tsx+++ b/apps/erp/app/routes/x+/quality+/risks.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { data, Outlet, redirect, useLoaderData } from "react-router";+import { data, Outlet, useLoaderData } from "react-router";import { getRisks } from "~/modules/quality/quality.service";import type { Risk } from "~/modules/quality/types";import RiskRegistersTable from "~/modules/quality/ui/RiskRegister/RiskRegistersTable";diff --git a/apps/erp/app/routes/x+/quality-document+/$id.tsx b/apps/erp/app/routes/x+/quality-document+/$id.tsxindex 644f288ab3..8d3de44b44 100644--- a/apps/erp/app/routes/x+/quality-document+/$id.tsx+++ b/apps/erp/app/routes/x+/quality-document+/$id.tsx@@ -19,10 +19,11 @@ import { validationError, validator } from "@carbon/form";import { trigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";import { NotificationEvent } from "@carbon/notifications";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { SupabaseClient } from "@supabase/supabase-js";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData, useParams } from "react-router";+import { Outlet, useLoaderData, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import {getQualityDocument,diff --git a/apps/erp/app/routes/x+/quality-document+/_layout.tsx b/apps/erp/app/routes/x+/quality-document+/_layout.tsxindex cc5bcbebe4..f462111c42 100644--- a/apps/erp/app/routes/x+/quality-document+/_layout.tsx+++ b/apps/erp/app/routes/x+/quality-document+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Quality Document" }];};diff --git a/apps/erp/app/routes/x+/quality-document+/delete.$id.tsx b/apps/erp/app/routes/x+/quality-document+/delete.$id.tsxindex a085066a9d..fdb2767618 100644--- a/apps/erp/app/routes/x+/quality-document+/delete.$id.tsx+++ b/apps/erp/app/routes/x+/quality-document+/delete.$id.tsx@@ -5,8 +5,9 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteQualityDocument } from "~/modules/quality/quality.service";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.configure.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.configure.tsxindex ac0295e1ef..4cb9ec7034 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.configure.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.configure.tsx@@ -6,8 +6,8 @@ import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getSupplierPriceBreaksForItems } from "~/modules/items";import { upsertQuoteLineMethod } from "~/modules/sales/sales.service";import { resolveBuyUnitCost } from "~/modules/shared";diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.delete.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.delete.tsxindex a13e8aad27..7dea2f7fe9 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.delete.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.delete.tsx@@ -5,8 +5,9 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteQuoteLine, getQuote, isQuoteLocked } from "~/modules/sales";import { requireUnlocked } from "~/utils/lockedGuard.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.details.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.details.tsxindex e264a3edeb..382d1c1a9b 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.details.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.details.tsx@@ -14,17 +14,11 @@ import {import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";import { VStack } from "@carbon/react";-import { breakQuantities } from "@carbon/utils";+import { breakQuantities, redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import { Fragment, Suspense, useMemo } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import {- Await,- Outlet,- redirect,- useLoaderData,- useParams-} from "react-router";+import { Await, Outlet, useLoaderData, useParams } from "react-router";import { CadModel, DeferredFiles } from "~/components";import type { Tree } from "~/components/TreeView";import { usePermissions, useRealtime, useRouteData, useUser } from "~/hooks";@@ -470,7 +464,7 @@ export default function QuoteLine() {<QuoteBillOfMaterialkey={`bom:${methodData.rootMethodId}`}quoteMakeMethodId={methodData.rootMethodId}- // @ts-ignore+ // @ts-expect-errormaterials={methodData.methodMaterials}// @ts-expect-erroroperations={methodData.methodOperations}diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.make.$methodId.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.make.$methodId.tsxindex de7de220de..83de44fe8b 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.make.$methodId.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.make.$methodId.tsx@@ -7,10 +7,11 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import type { JSONContent } from "@carbon/react";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import { Suspense } from "react";import type { LoaderFunctionArgs } from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import { CadModel } from "~/components";import { usePermissions } from "~/hooks";import {diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.method.$methodId.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.method.$methodId.tsxindex 145d5b8fb5..5bf64f1997 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.method.$methodId.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.$lineId.method.$methodId.tsx@@ -2,8 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/quote+/$quoteId._index.tsx b/apps/erp/app/routes/x+/quote+/$quoteId._index.tsxindex 48de5f89d2..59adcef10d 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId._index.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.convert.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.convert.tsxindex 65bf6b5123..aab2506e73 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.convert.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.convert.tsx@@ -14,10 +14,9 @@ import {import { validator } from "@carbon/form";import { getLogger } from "@carbon/logger";import type { Violation } from "@carbon/utils";-import { getErrorMessage } from "@carbon/utils";+import { getErrorMessage, redirect } from "@carbon/utils";import { parseAcceptLanguage } from "intl-parse-accept-language";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {convertQuoteToOrder,getSalesOrder,diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.delete.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.delete.tsxindex 6d989a6e6d..85759efabf 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.delete.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.delete.tsx@@ -5,8 +5,9 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteQuote } from "~/modules/sales";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.details.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.details.tsxindex 220f4c330f..ac48895918 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.details.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.details.tsx@@ -7,11 +7,12 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { FileObject } from "@supabase/storage-js";import { useRef } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { DeferredFiles } from "~/components";import { useRouteData } from "~/hooks";import type {diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.drag.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.drag.tsxindex 204ca6b257..56b2151eb2 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.drag.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.drag.tsx@@ -11,10 +11,11 @@ import { storage, TEMP_STAGING_BUCKET } from "@carbon/files";import { supportedModelTypes } from "@carbon/files/cad";import { trigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import { generateText, Output } from "ai";import { nanoid } from "nanoid";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { z } from "zod";import { upsertPart } from "~/modules/items";import {@@ -83,7 +84,6 @@ export async function action({ request, params }: ActionFunctionArgs) {let revision = "0";try {const { output: parsedFilename } = await generateText({- // @ts-ignoremodel: openai("gpt-4o-mini"),output: Output.object({schema: z.object({@@ -264,7 +264,7 @@ export async function action({ request, params }: ActionFunctionArgs) {if (partId && modelId) {updates.push(- // @ts-ignore+ // @ts-expect-errorclient.from("item").update({ modelUploadId: modelId })diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.exchange-rate.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.exchange-rate.tsxindex 9e9e756ac8..d2929b45f2 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.exchange-rate.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.exchange-rate.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getExchangeRate } from "~/modules/accounting";import {getQuote,diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.finalize.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.finalize.tsxindex ccabc48eb4..b9602694ff 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.finalize.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.finalize.tsx@@ -18,10 +18,9 @@ import { validationError, validator } from "@carbon/form";import { trigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";import type { Violation } from "@carbon/utils";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import { renderAsync } from "@react-email/components";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { upsertDocument } from "~/modules/documents";import {finalizeQuote,diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.new.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.new.tsxindex 8576cafab8..18b10f1a33 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.new.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.new.tsx@@ -13,9 +13,8 @@ import {} from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";-import { breakQuantities } from "@carbon/utils";+import { breakQuantities, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getQuote,isQuoteLocked,diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.payment.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.payment.tsxindex 9b9e5bdc6c..a40a74baec 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.payment.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.payment.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getQuote,isQuoteLocked,diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.shipment.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.shipment.tsxindex 26889a8992..19ef60b977 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.shipment.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.shipment.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getQuote,isQuoteLocked,diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.status.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.status.tsxindex 9039f511bc..a0def2e16a 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.status.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.status.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { quoteStatusType, updateQuoteStatus } from "~/modules/sales";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/quote+/$quoteId.tsx b/apps/erp/app/routes/x+/quote+/$quoteId.tsxindex 286f93b0ee..65999e85b8 100644--- a/apps/erp/app/routes/x+/quote+/$quoteId.tsx+++ b/apps/erp/app/routes/x+/quote+/$quoteId.tsx@@ -6,7 +6,7 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type { DragEndEvent } from "@dnd-kit/core";import { DndContext } from "@dnd-kit/core";import { msg } from "@lingui/core/macro";@@ -16,13 +16,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- Outlet,- redirect,- useLoaderData,- useParams,- useSubmit-} from "react-router";+import { Outlet, useLoaderData, useParams, useSubmit } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import { getExchangeRate } from "~/modules/accounting";import { getSupplierPriceBreaksForItems } from "~/modules/items";diff --git a/apps/erp/app/routes/x+/quote+/_layout.tsx b/apps/erp/app/routes/x+/quote+/_layout.tsxindex bc1c886628..43df63e44e 100644--- a/apps/erp/app/routes/x+/quote+/_layout.tsx+++ b/apps/erp/app/routes/x+/quote+/_layout.tsx@@ -14,6 +14,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Quote" }];};diff --git a/apps/erp/app/routes/x+/quote+/methods+/get.tsx b/apps/erp/app/routes/x+/quote+/methods+/get.tsxindex 7f96986ca4..5512e91d60 100644--- a/apps/erp/app/routes/x+/quote+/methods+/get.tsx+++ b/apps/erp/app/routes/x+/quote+/methods+/get.tsx@@ -5,8 +5,9 @@import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {copyQuoteLine,getMethodValidator,diff --git a/apps/erp/app/routes/x+/quote+/methods+/save.tsx b/apps/erp/app/routes/x+/quote+/methods+/save.tsxindex a819af3a25..81d78f3283 100644--- a/apps/erp/app/routes/x+/quote+/methods+/save.tsx+++ b/apps/erp/app/routes/x+/quote+/methods+/save.tsx@@ -5,8 +5,9 @@import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {getMethodValidator,upsertMakeMethodFromQuoteLine,diff --git a/apps/erp/app/routes/x+/quote+/new.tsx b/apps/erp/app/routes/x+/quote+/new.tsxindex 2c6c5875f5..d196920231 100644--- a/apps/erp/app/routes/x+/quote+/new.tsx+++ b/apps/erp/app/routes/x+/quote+/new.tsx@@ -6,10 +6,10 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { getLocalTimeZone, now, toCalendarDate } from "@internationalized/date";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { useUrlParams, useUser } from "~/hooks";import type { QuotationStatusType } from "~/modules/sales";import { insertQuote, quoteValidator } from "~/modules/sales";diff --git a/apps/erp/app/routes/x+/receipt+/$receiptId._index.tsx b/apps/erp/app/routes/x+/receipt+/$receiptId._index.tsxindex 6e22b9734c..3cd992c17e 100644--- a/apps/erp/app/routes/x+/receipt+/$receiptId._index.tsx+++ b/apps/erp/app/routes/x+/receipt+/$receiptId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/receipt+/$receiptId.delete.tsx b/apps/erp/app/routes/x+/receipt+/$receiptId.delete.tsxindex ed53b4f7ba..87e81c8e8e 100644--- a/apps/erp/app/routes/x+/receipt+/$receiptId.delete.tsx+++ b/apps/erp/app/routes/x+/receipt+/$receiptId.delete.tsx@@ -5,8 +5,8 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteReceipt, getReceipt } from "~/modules/inventory";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/receipt+/$receiptId.details.tsx b/apps/erp/app/routes/x+/receipt+/$receiptId.details.tsxindex 8af1eb251d..18a34be9ba 100644--- a/apps/erp/app/routes/x+/receipt+/$receiptId.details.tsx+++ b/apps/erp/app/routes/x+/receipt+/$receiptId.details.tsx@@ -8,8 +8,9 @@ import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useParams } from "react-router";+import { data, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { Receipt, ReceiptLine } from "~/modules/inventory";import {@@ -189,7 +190,7 @@ export default function ReceiptDetailsRoute() {<><ReceiptFormkey={initialValues.sourceDocumentId}- // @ts-ignore+ // @ts-expect-errorinitialValues={initialValues}status={routeData.receipt.status}receiptLines={routeData.receiptLines}diff --git a/apps/erp/app/routes/x+/receipt+/$receiptId.post.tsx b/apps/erp/app/routes/x+/receipt+/$receiptId.post.tsxindex 26a9d91b67..55cecac1f4 100644--- a/apps/erp/app/routes/x+/receipt+/$receiptId.post.tsx+++ b/apps/erp/app/routes/x+/receipt+/$receiptId.post.tsx@@ -17,9 +17,8 @@ import { raiseMoment } from "@carbon/lib/workflows";import { getLogger } from "@carbon/logger";import { getCachedPrinterConfig } from "@carbon/printing/printing.server";import { serverFns } from "@carbon/server-functions";-import { getOverReceiptViolations } from "@carbon/utils";+import { getOverReceiptViolations, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { reconcileReceiptSerialEntities } from "~/modules/inventory";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/receipt+/$receiptId.tsx b/apps/erp/app/routes/x+/receipt+/$receiptId.tsxindex 46e58688a0..a2d56e297b 100644--- a/apps/erp/app/routes/x+/receipt+/$receiptId.tsx+++ b/apps/erp/app/routes/x+/receipt+/$receiptId.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams } from "react-router";+import { Outlet, useParams } from "react-router";import {getBatchProperties,getReceipt,diff --git a/apps/erp/app/routes/x+/receipt+/$receiptId.void.tsx b/apps/erp/app/routes/x+/receipt+/$receiptId.void.tsxindex dc660587fe..045743fb69 100644--- a/apps/erp/app/routes/x+/receipt+/$receiptId.void.tsx+++ b/apps/erp/app/routes/x+/receipt+/$receiptId.void.tsx@@ -6,8 +6,8 @@ import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/receipt+/_layout.tsx b/apps/erp/app/routes/x+/receipt+/_layout.tsxindex e1586ae384..e3eab8cffb 100644--- a/apps/erp/app/routes/x+/receipt+/_layout.tsx+++ b/apps/erp/app/routes/x+/receipt+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Receipt" }];};diff --git a/apps/erp/app/routes/x+/receipt+/new.tsx b/apps/erp/app/routes/x+/receipt+/new.tsxindex 48a4fa8acc..65ed66908d 100644--- a/apps/erp/app/routes/x+/receipt+/new.tsx+++ b/apps/erp/app/routes/x+/receipt+/new.tsx@@ -6,10 +6,9 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { serverFns } from "@carbon/server-functions";-import { getErrorMessage } from "@carbon/utils";+import { getErrorMessage, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import type { ReceiptSourceDocument } from "~/modules/inventory";import { getUserDefaults } from "~/modules/users/users.server";import { getDatabaseClient } from "~/services/database.server";diff --git a/apps/erp/app/routes/x+/reimbursements+/$reimbursementId._index.tsx b/apps/erp/app/routes/x+/reimbursements+/$reimbursementId._index.tsxindex ae84998aa1..e10c860bb8 100644--- a/apps/erp/app/routes/x+/reimbursements+/$reimbursementId._index.tsx+++ b/apps/erp/app/routes/x+/reimbursements+/$reimbursementId._index.tsx@@ -6,15 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { Button, HStack, useDisclosure, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import type { LoaderFunctionArgs } from "react-router";-import {- Form,- Link,- redirect,- useLoaderData,- useNavigation-} from "react-router";+import { Form, Link, useLoaderData, useNavigation } from "react-router";import { Confirm } from "~/components/Modals";import { usePermissions } from "~/hooks";import {diff --git a/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.edit.tsx b/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.edit.tsxindex 0f8f0dec5b..2cfb93359e 100644--- a/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.edit.tsx+++ b/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.edit.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import type { ClientDocumentLine } from "~/components/DocumentLineEditor";import { getActiveDimensionsWithValues } from "~/modules/accounting";import type { DimensionWithValues } from "~/modules/accounting/ui/JournalEntries/types";diff --git a/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.pay.tsx b/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.pay.tsxindex 34bcadb159..b6837f6d51 100644--- a/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.pay.tsx+++ b/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.pay.tsx@@ -7,9 +7,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { serverFns } from "@carbon/server-functions";-import { getErrorMessage, toBaseAmount } from "@carbon/utils";+import { getErrorMessage, redirect, toBaseAmount } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getOpenReimbursementsForEmployee,getPaymentCurrencyConfiguration,diff --git a/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.post.tsx b/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.post.tsxindex b686294d5e..25f2c6623f 100644--- a/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.post.tsx+++ b/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.post.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getReimbursement } from "~/modules/invoicing";import {linesBalanceHeader,diff --git a/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.void.tsx b/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.void.tsxindex 104eb90938..44ce8ded05 100644--- a/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.void.tsx+++ b/apps/erp/app/routes/x+/reimbursements+/$reimbursementId.void.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { voidReimbursement } from "~/modules/invoicing/reimbursement.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/reimbursements+/_layout.tsx b/apps/erp/app/routes/x+/reimbursements+/_layout.tsxindex 4cf69ee49c..6330c4fe7a 100644--- a/apps/erp/app/routes/x+/reimbursements+/_layout.tsx+++ b/apps/erp/app/routes/x+/reimbursements+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Reimbursements" }];};diff --git a/apps/erp/app/routes/x+/reports+/_index.tsx b/apps/erp/app/routes/x+/reports+/_index.tsxindex 28d6dcfd67..e744a083e0 100644--- a/apps/erp/app/routes/x+/reports+/_index.tsx+++ b/apps/erp/app/routes/x+/reports+/_index.tsx@@ -3,9 +3,8 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { requirePermissions } from "@carbon/auth/auth.server";-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";// The reports hub lives inside the accounting module (with its sidebar);diff --git a/apps/erp/app/routes/x+/reports+/_layout.tsx b/apps/erp/app/routes/x+/reports+/_layout.tsxindex 3a9656eb02..e483c9730c 100644--- a/apps/erp/app/routes/x+/reports+/_layout.tsx+++ b/apps/erp/app/routes/x+/reports+/_layout.tsx@@ -7,6 +7,8 @@ import { Outlet } from "react-router";import type { BreadcrumbSegment, Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const handle: Handle = {// Report pages live in their own full-screen namespace, not under the// accounting module layout, so surface the full Accounting > Reports traildiff --git a/apps/erp/app/routes/x+/reports+/analytics.$reportKey.tsx b/apps/erp/app/routes/x+/reports+/analytics.$reportKey.tsxindex 62cdd68a9a..c5441e5d20 100644--- a/apps/erp/app/routes/x+/reports+/analytics.$reportKey.tsx+++ b/apps/erp/app/routes/x+/reports+/analytics.$reportKey.tsx@@ -13,7 +13,8 @@ import { VStack } from "@carbon/react";import {computeReportPeriodBuckets,datetime,- defaultReportRange+ defaultReportRange,+ redirect} from "@carbon/utils";import type { MessageDescriptor } from "@lingui/core";import { msg } from "@lingui/core/macro";@@ -21,7 +22,7 @@ import { useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";import { useMemo, useState } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useFetcher, useLoaderData } from "react-router";+import { data, useFetcher, useLoaderData } from "react-router";import { useUrlParams } from "~/hooks";import type {AnalyticsReportKey,diff --git a/apps/erp/app/routes/x+/reports+/balance-sheet.$accountId.tsx b/apps/erp/app/routes/x+/reports+/balance-sheet.$accountId.tsxindex d64f882abb..3ef4191dce 100644--- a/apps/erp/app/routes/x+/reports+/balance-sheet.$accountId.tsx+++ b/apps/erp/app/routes/x+/reports+/balance-sheet.$accountId.tsx@@ -5,8 +5,9 @@import { error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getAccount,getAccountLedger,diff --git a/apps/erp/app/routes/x+/reports+/balance-sheet.tsx b/apps/erp/app/routes/x+/reports+/balance-sheet.tsxindex 2258f74b22..4834eef53f 100644--- a/apps/erp/app/routes/x+/reports+/balance-sheet.tsx+++ b/apps/erp/app/routes/x+/reports+/balance-sheet.tsx@@ -9,13 +9,14 @@ import { VStack } from "@carbon/react";import {computeReportPeriodBuckets,datetime,- defaultReportRange+ defaultReportRange,+ redirect} from "@carbon/utils";import { msg } from "@lingui/core/macro";import { useLocale } from "@react-aria/i18n";import { useState } from "react";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import {financialReportParamsValidator,getCompaniesInGroup,diff --git a/apps/erp/app/routes/x+/reports+/executive-pnl.tsx b/apps/erp/app/routes/x+/reports+/executive-pnl.tsxindex 6dc41cda1e..7c37161fd3 100644--- a/apps/erp/app/routes/x+/reports+/executive-pnl.tsx+++ b/apps/erp/app/routes/x+/reports+/executive-pnl.tsx@@ -9,13 +9,14 @@ import { VStack } from "@carbon/react";import {computeReportPeriodBuckets,datetime,- defaultReportRange+ defaultReportRange,+ redirect} from "@carbon/utils";import { msg } from "@lingui/core/macro";import { useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {financialReportParamsValidator,getCompaniesInGroup,diff --git a/apps/erp/app/routes/x+/reports+/income-statement.$accountId.tsx b/apps/erp/app/routes/x+/reports+/income-statement.$accountId.tsxindex f26c9663af..923f34d152 100644--- a/apps/erp/app/routes/x+/reports+/income-statement.$accountId.tsx+++ b/apps/erp/app/routes/x+/reports+/income-statement.$accountId.tsx@@ -5,8 +5,9 @@import { error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getAccount,getAccountLedger,diff --git a/apps/erp/app/routes/x+/reports+/income-statement.tsx b/apps/erp/app/routes/x+/reports+/income-statement.tsxindex 297df23ffe..d7ddd4c80d 100644--- a/apps/erp/app/routes/x+/reports+/income-statement.tsx+++ b/apps/erp/app/routes/x+/reports+/income-statement.tsx@@ -9,13 +9,14 @@ import { VStack } from "@carbon/react";import {computeReportPeriodBuckets,datetime,- defaultReportRange+ defaultReportRange,+ redirect} from "@carbon/utils";import { msg } from "@lingui/core/macro";import { useLocale } from "@react-aria/i18n";import { useState } from "react";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import {financialReportParamsValidator,getCompaniesInGroup,diff --git a/apps/erp/app/routes/x+/reports+/inventory-valuation.reconcile.tsx b/apps/erp/app/routes/x+/reports+/inventory-valuation.reconcile.tsxindex a557379661..1fd7203565 100644--- a/apps/erp/app/routes/x+/reports+/inventory-valuation.reconcile.tsx+++ b/apps/erp/app/routes/x+/reports+/inventory-valuation.reconcile.tsx@@ -5,9 +5,9 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { createInventoryReconciliationJournal } from "~/modules/inventory";import { getCompanyTimeZone } from "~/modules/shared/timezone.server";import { getDatabaseClient } from "~/services/database.server";diff --git a/apps/erp/app/routes/x+/reports+/purchases.tsx b/apps/erp/app/routes/x+/reports+/purchases.tsxindex c65feb2f56..88d249b7c0 100644--- a/apps/erp/app/routes/x+/reports+/purchases.tsx+++ b/apps/erp/app/routes/x+/reports+/purchases.tsx@@ -11,14 +11,15 @@ import { VStack } from "@carbon/react";import {computeReportPeriodBuckets,datetime,- defaultReportRange+ defaultReportRange,+ redirect} from "@carbon/utils";import { msg } from "@lingui/core/macro";import { useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";import { useMemo, useState } from "react";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData } from "react-router";+import { useFetcher, useLoaderData } from "react-router";import { useUrlParams } from "~/hooks";import type { PivotState, PurchaseLinePivotLine } from "~/modules/accounting";import {diff --git a/apps/erp/app/routes/x+/reports+/trial-balance.$accountId.tsx b/apps/erp/app/routes/x+/reports+/trial-balance.$accountId.tsxindex 245a97f8df..70c08bdafb 100644--- a/apps/erp/app/routes/x+/reports+/trial-balance.$accountId.tsx+++ b/apps/erp/app/routes/x+/reports+/trial-balance.$accountId.tsx@@ -5,8 +5,9 @@import { error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getAccount,getAccountLedger,diff --git a/apps/erp/app/routes/x+/reports+/trial-balance.tsx b/apps/erp/app/routes/x+/reports+/trial-balance.tsxindex 8aa81f8123..7e4646c0a3 100644--- a/apps/erp/app/routes/x+/reports+/trial-balance.tsx+++ b/apps/erp/app/routes/x+/reports+/trial-balance.tsx@@ -6,11 +6,11 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { datetime, defaultReportRange } from "@carbon/utils";+import { datetime, defaultReportRange, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { useState } from "react";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import type { Chart } from "~/modules/accounting";import {financialReportParamsValidator,diff --git a/apps/erp/app/routes/x+/reports+/views.$viewId.delete.tsx b/apps/erp/app/routes/x+/reports+/views.$viewId.delete.tsxindex 3a66745735..45e820cb9d 100644--- a/apps/erp/app/routes/x+/reports+/views.$viewId.delete.tsx+++ b/apps/erp/app/routes/x+/reports+/views.$viewId.delete.tsx@@ -5,8 +5,9 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteReportView } from "~/modules/accounting";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/_index.tsx b/apps/erp/app/routes/x+/resources+/_index.tsxindex 44331fcf65..116dd082ff 100644--- a/apps/erp/app/routes/x+/resources+/_index.tsx+++ b/apps/erp/app/routes/x+/resources+/_index.tsx@@ -331,7 +331,7 @@ export default function MaintenanceDashboard() {? item.date: "month" in item? item.month- : // @ts-ignore+ : // @ts-expect-erroritem.monthKey,item.value])diff --git a/apps/erp/app/routes/x+/resources+/_layout.tsx b/apps/erp/app/routes/x+/resources+/_layout.tsxindex 3f7006bd3d..f82bbf71dc 100644--- a/apps/erp/app/routes/x+/resources+/_layout.tsx+++ b/apps/erp/app/routes/x+/resources+/_layout.tsx@@ -11,6 +11,8 @@ import { useResourcesSubmodules } from "~/modules/resources";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Resources" }];};diff --git a/apps/erp/app/routes/x+/resources+/abilities.delete.$id.tsx b/apps/erp/app/routes/x+/resources+/abilities.delete.$id.tsxindex 9e19c0eb9f..58ba62b57c 100644--- a/apps/erp/app/routes/x+/resources+/abilities.delete.$id.tsx+++ b/apps/erp/app/routes/x+/resources+/abilities.delete.$id.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { notifyScheduleInputsChanged } from "~/modules/production";import { deleteAbility, getAbility } from "~/modules/resources";diff --git a/apps/erp/app/routes/x+/resources+/abilities.new.tsx b/apps/erp/app/routes/x+/resources+/abilities.new.tsxindex 14bda8efcf..0208d34934 100644--- a/apps/erp/app/routes/x+/resources+/abilities.new.tsx+++ b/apps/erp/app/routes/x+/resources+/abilities.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData, useNavigate } from "react-router";import { notifyScheduleInputsChanged } from "~/modules/production";import {AbilityForm,diff --git a/apps/erp/app/routes/x+/resources+/abilities.tsx b/apps/erp/app/routes/x+/resources+/abilities.tsxindex 4029554594..ecee0711dd 100644--- a/apps/erp/app/routes/x+/resources+/abilities.tsx+++ b/apps/erp/app/routes/x+/resources+/abilities.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { AbilitiesTable, getAbilities } from "~/modules/resources";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/ability.$id.details.tsx b/apps/erp/app/routes/x+/resources+/ability.$id.details.tsxindex 6832db5186..ee465d28d9 100644--- a/apps/erp/app/routes/x+/resources+/ability.$id.details.tsx+++ b/apps/erp/app/routes/x+/resources+/ability.$id.details.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect, useNavigate, useParams } from "react-router";+import { useNavigate, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { Ability } from "~/modules/resources";import {diff --git a/apps/erp/app/routes/x+/resources+/ability.$id.employee.$employeeAbilityId.tsx b/apps/erp/app/routes/x+/resources+/ability.$id.employee.$employeeAbilityId.tsxindex c488382a36..18523eaf53 100644--- a/apps/erp/app/routes/x+/resources+/ability.$id.employee.$employeeAbilityId.tsx+++ b/apps/erp/app/routes/x+/resources+/ability.$id.employee.$employeeAbilityId.tsx@@ -6,15 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import {- data,- redirect,- useLoaderData,- useNavigate,- useParams-} from "react-router";+import { data, useLoaderData, useNavigate, useParams } from "react-router";import { useRouteData } from "~/hooks";import { notifyScheduleInputsChanged } from "~/modules/production";import type { Ability } from "~/modules/resources";diff --git a/apps/erp/app/routes/x+/resources+/ability.$id.employee.delete.$employeeAbilityId.tsx b/apps/erp/app/routes/x+/resources+/ability.$id.employee.delete.$employeeAbilityId.tsxindex afce01bfb5..e415c2b5b5 100644--- a/apps/erp/app/routes/x+/resources+/ability.$id.employee.delete.$employeeAbilityId.tsx+++ b/apps/erp/app/routes/x+/resources+/ability.$id.employee.delete.$employeeAbilityId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect, useNavigate, useParams } from "react-router";+import { useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { useRouteData } from "~/hooks";import { notifyScheduleInputsChanged } from "~/modules/production";diff --git a/apps/erp/app/routes/x+/resources+/ability.$id.employee.new.tsx b/apps/erp/app/routes/x+/resources+/ability.$id.employee.new.tsxindex 93186f1325..ae3305b4a7 100644--- a/apps/erp/app/routes/x+/resources+/ability.$id.employee.new.tsx+++ b/apps/erp/app/routes/x+/resources+/ability.$id.employee.new.tsx@@ -6,9 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useNavigate, useParams } from "react-router";+import { data, useNavigate, useParams } from "react-router";import { useRouteData } from "~/hooks";import { notifyScheduleInputsChanged } from "~/modules/production";import type { Ability } from "~/modules/resources";diff --git a/apps/erp/app/routes/x+/resources+/ability.$id.tsx b/apps/erp/app/routes/x+/resources+/ability.$id.tsxindex 095728e042..a543192233 100644--- a/apps/erp/app/routes/x+/resources+/ability.$id.tsx+++ b/apps/erp/app/routes/x+/resources+/ability.$id.tsx@@ -6,13 +6,13 @@ import { error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { AbilityEmployeesTable, getAbility } from "~/modules/resources";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/assignments.$trainingId.tsx b/apps/erp/app/routes/x+/resources+/assignments.$trainingId.tsxindex e22d62bf0c..c683e1d32c 100644--- a/apps/erp/app/routes/x+/resources+/assignments.$trainingId.tsx+++ b/apps/erp/app/routes/x+/resources+/assignments.$trainingId.tsx@@ -21,6 +21,7 @@ import {ToggleGroupItem,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useMemo, useState } from "react";@@ -32,7 +33,7 @@ import {LuTriangleAlert} from "react-icons/lu";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData, useNavigate } from "react-router";+import { useFetcher, useLoaderData, useNavigate } from "react-router";import { DateTime, EmployeeAvatar, Empty } from "~/components";import { usePermissions } from "~/hooks";import { getTraining, getTrainingAssignmentStatus } from "~/modules/resources";diff --git a/apps/erp/app/routes/x+/resources+/assignments.assignment.$assignmentId.delete.tsx b/apps/erp/app/routes/x+/resources+/assignments.assignment.$assignmentId.delete.tsxindex af15f0a169..c8a96eee86 100644--- a/apps/erp/app/routes/x+/resources+/assignments.assignment.$assignmentId.delete.tsx+++ b/apps/erp/app/routes/x+/resources+/assignments.assignment.$assignmentId.delete.tsx@@ -5,8 +5,8 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteTrainingAssignment } from "~/modules/resources";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/assignments.assignment.$assignmentId.tsx b/apps/erp/app/routes/x+/resources+/assignments.assignment.$assignmentId.tsxindex 7212eab43c..a8c9961392 100644--- a/apps/erp/app/routes/x+/resources+/assignments.assignment.$assignmentId.tsx+++ b/apps/erp/app/routes/x+/resources+/assignments.assignment.$assignmentId.tsx@@ -9,20 +9,14 @@ import { validationError, validator } from "@carbon/form";import { trigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";import { NotificationEvent } from "@carbon/notifications";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- data,- redirect,- useLoaderData,- useNavigate,- useParams-} from "react-router";+import { data, useLoaderData, useNavigate, useParams } from "react-router";import {getTrainingAssignment,getTrainingAssignmentStatus,diff --git a/apps/erp/app/routes/x+/resources+/assignments.complete.tsx b/apps/erp/app/routes/x+/resources+/assignments.complete.tsxindex 340f992b53..300608a9fe 100644--- a/apps/erp/app/routes/x+/resources+/assignments.complete.tsx+++ b/apps/erp/app/routes/x+/resources+/assignments.complete.tsx@@ -5,8 +5,9 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { notifyScheduleInputsChanged } from "~/modules/production";import {getTrainingGrantedAbilityId,diff --git a/apps/erp/app/routes/x+/resources+/assignments.new.tsx b/apps/erp/app/routes/x+/resources+/assignments.new.tsxindex 9934864811..16a57dabd4 100644--- a/apps/erp/app/routes/x+/resources+/assignments.new.tsx+++ b/apps/erp/app/routes/x+/resources+/assignments.new.tsx@@ -9,9 +9,10 @@ import { validationError, validator } from "@carbon/form";import { trigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";import { NotificationEvent } from "@carbon/notifications";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData, useNavigate } from "react-router";import {getTrainingAssignments,getTrainingsList,diff --git a/apps/erp/app/routes/x+/resources+/assignments.tsx b/apps/erp/app/routes/x+/resources+/assignments.tsxindex cfe168cecb..e093f4e2d6 100644--- a/apps/erp/app/routes/x+/resources+/assignments.tsx+++ b/apps/erp/app/routes/x+/resources+/assignments.tsx@@ -14,7 +14,7 @@ import {MenuItem,VStack} from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import type { ColumnDef } from "@tanstack/react-table";@@ -35,13 +35,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- Link,- Outlet,- redirect,- useFetcher,- useLoaderData-} from "react-router";+import { Link, Outlet, useFetcher, useLoaderData } from "react-router";import { Hyperlink, New, Table } from "~/components";import { usePermissions } from "~/hooks";import {diff --git a/apps/erp/app/routes/x+/resources+/contractors.$supplierContactId.tsx b/apps/erp/app/routes/x+/resources+/contractors.$supplierContactId.tsxindex c614ace220..01cd6f61d4 100644--- a/apps/erp/app/routes/x+/resources+/contractors.$supplierContactId.tsx+++ b/apps/erp/app/routes/x+/resources+/contractors.$supplierContactId.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {ContractorForm,contractorValidator,diff --git a/apps/erp/app/routes/x+/resources+/contractors.delete.$supplierId.tsx b/apps/erp/app/routes/x+/resources+/contractors.delete.$supplierId.tsxindex 66b8e3c43a..d782fd1f1d 100644--- a/apps/erp/app/routes/x+/resources+/contractors.delete.$supplierId.tsx+++ b/apps/erp/app/routes/x+/resources+/contractors.delete.$supplierId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData, useNavigate } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteContractor, getContractor } from "~/modules/resources";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/contractors.new.tsx b/apps/erp/app/routes/x+/resources+/contractors.new.tsxindex 6f46c573f6..0ccee79c42 100644--- a/apps/erp/app/routes/x+/resources+/contractors.new.tsx+++ b/apps/erp/app/routes/x+/resources+/contractors.new.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { useUrlParams } from "~/hooks";import {ContractorForm,diff --git a/apps/erp/app/routes/x+/resources+/contractors.tsx b/apps/erp/app/routes/x+/resources+/contractors.tsxindex 59cfd79b0f..cc5d027f3c 100644--- a/apps/erp/app/routes/x+/resources+/contractors.tsx+++ b/apps/erp/app/routes/x+/resources+/contractors.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import {ContractorsTable,getAbilitiesList,diff --git a/apps/erp/app/routes/x+/resources+/failure-modes.$failureModeId.tsx b/apps/erp/app/routes/x+/resources+/failure-modes.$failureModeId.tsxindex f7baca91f9..62dc2c5609 100644--- a/apps/erp/app/routes/x+/resources+/failure-modes.$failureModeId.tsx+++ b/apps/erp/app/routes/x+/resources+/failure-modes.$failureModeId.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {failureModeValidator,getFailureMode,@@ -82,7 +84,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function EditFailureModeRoute() {const { failureMode } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: failureMode.id ?? undefined,@@ -94,7 +96,7 @@ export default function EditFailureModeRoute() {<FailureModeFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/resources+/failure-modes.delete.$failureModeId.tsx b/apps/erp/app/routes/x+/resources+/failure-modes.delete.$failureModeId.tsxindex 7ad4551357..cb3c62c011 100644--- a/apps/erp/app/routes/x+/resources+/failure-modes.delete.$failureModeId.tsx+++ b/apps/erp/app/routes/x+/resources+/failure-modes.delete.$failureModeId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteFailureMode, getFailureMode } from "~/modules/resources";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/failure-modes.new.tsx b/apps/erp/app/routes/x+/resources+/failure-modes.new.tsxindex df06cbc559..7e53158d49 100644--- a/apps/erp/app/routes/x+/resources+/failure-modes.new.tsx+++ b/apps/erp/app/routes/x+/resources+/failure-modes.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import { failureModeValidator, upsertFailureMode } from "~/modules/resources";import FailureModeForm from "~/modules/resources/ui/FailureModes/FailureModeForm";import { getParams, path, requestReferrer } from "~/utils/path";@@ -65,7 +66,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewFailureModeRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",type: "Maintenance" as const@@ -74,7 +75,7 @@ export default function NewFailureModeRoute() {return (<FailureModeForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/resources+/locations.$locationId.tsx b/apps/erp/app/routes/x+/resources+/locations.$locationId.tsxindex 665e88c772..ddbf33cc49 100644--- a/apps/erp/app/routes/x+/resources+/locations.$locationId.tsx+++ b/apps/erp/app/routes/x+/resources+/locations.$locationId.tsx@@ -6,13 +6,15 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { getLocalTimeZone } from "@internationalized/date";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import {getLocation,LocationForm,@@ -98,8 +100,8 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {export default function LocationRoute() {const { location } = useLoaderData<typeof loader>();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const initialValues = {id: location.id,diff --git a/apps/erp/app/routes/x+/resources+/locations.delete.$locationId.tsx b/apps/erp/app/routes/x+/resources+/locations.delete.$locationId.tsxindex a896ca9da9..236c4674f2 100644--- a/apps/erp/app/routes/x+/resources+/locations.delete.$locationId.tsx+++ b/apps/erp/app/routes/x+/resources+/locations.delete.$locationId.tsx@@ -5,13 +5,14 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteLocation, getLocation } from "~/modules/resources";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/locations.new.tsx b/apps/erp/app/routes/x+/resources+/locations.new.tsxindex 94cadebf74..982783cddc 100644--- a/apps/erp/app/routes/x+/resources+/locations.new.tsx+++ b/apps/erp/app/routes/x+/resources+/locations.new.tsx@@ -6,12 +6,13 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { getLocalTimeZone } from "@internationalized/date";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect, useNavigate } from "react-router";+import { useNavigate } from "react-router";import { useUser } from "~/hooks";import {LocationForm,diff --git a/apps/erp/app/routes/x+/resources+/locations.tsx b/apps/erp/app/routes/x+/resources+/locations.tsxindex 3d0cdd9138..22586c678b 100644--- a/apps/erp/app/routes/x+/resources+/locations.tsx+++ b/apps/erp/app/routes/x+/resources+/locations.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getLocations, LocationsTable } from "~/modules/resources";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/maintenance.delete.$dispatchId.tsx b/apps/erp/app/routes/x+/resources+/maintenance.delete.$dispatchId.tsxindex dac4f54e81..c914cc5033 100644--- a/apps/erp/app/routes/x+/resources+/maintenance.delete.$dispatchId.tsx+++ b/apps/erp/app/routes/x+/resources+/maintenance.delete.$dispatchId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import {deleteMaintenanceDispatch,diff --git a/apps/erp/app/routes/x+/resources+/partners.$supplierLocationId.$abilityId.tsx b/apps/erp/app/routes/x+/resources+/partners.$supplierLocationId.$abilityId.tsxindex 5cc91e3a0d..b15675b0dc 100644--- a/apps/erp/app/routes/x+/resources+/partners.$supplierLocationId.$abilityId.tsx+++ b/apps/erp/app/routes/x+/resources+/partners.$supplierLocationId.$abilityId.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getPartner,PartnerForm,diff --git a/apps/erp/app/routes/x+/resources+/partners.delete.$supplierId.tsx b/apps/erp/app/routes/x+/resources+/partners.delete.$supplierId.tsxindex e5b557a663..9dfa6868f5 100644--- a/apps/erp/app/routes/x+/resources+/partners.delete.$supplierId.tsx+++ b/apps/erp/app/routes/x+/resources+/partners.delete.$supplierId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData, useNavigate } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deletePartner, getPartnerBySupplierId } from "~/modules/resources";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/partners.new.tsx b/apps/erp/app/routes/x+/resources+/partners.new.tsxindex ca36d16423..2f22e06207 100644--- a/apps/erp/app/routes/x+/resources+/partners.new.tsx+++ b/apps/erp/app/routes/x+/resources+/partners.new.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { useUrlParams } from "~/hooks";import {PartnerForm,diff --git a/apps/erp/app/routes/x+/resources+/partners.tsx b/apps/erp/app/routes/x+/resources+/partners.tsxindex 0563c272e5..f318aad83b 100644--- a/apps/erp/app/routes/x+/resources+/partners.tsx+++ b/apps/erp/app/routes/x+/resources+/partners.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import {getAbilitiesList,getPartners,diff --git a/apps/erp/app/routes/x+/resources+/person.$personId.ability.new.tsx b/apps/erp/app/routes/x+/resources+/person.$personId.ability.new.tsxindex 65fc08196c..1e6e1f2d18 100644--- a/apps/erp/app/routes/x+/resources+/person.$personId.ability.new.tsx+++ b/apps/erp/app/routes/x+/resources+/person.$personId.ability.new.tsx@@ -6,9 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate, useParams } from "react-router";+import { data, useNavigate, useParams } from "react-router";import { notifyScheduleInputsChanged } from "~/modules/production";import {EmployeeAbilityForm,diff --git a/apps/erp/app/routes/x+/resources+/processes.$processId.tsx b/apps/erp/app/routes/x+/resources+/processes.$processId.tsxindex 08a680ed48..5ef8404275 100644--- a/apps/erp/app/routes/x+/resources+/processes.$processId.tsx+++ b/apps/erp/app/routes/x+/resources+/processes.$processId.tsx@@ -6,13 +6,15 @@ import { assertIsPost, error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";import type { BatchRules } from "@carbon/utils";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import { notifyScheduleInputsChanged } from "~/modules/production";import {batchRuleInitialValues,@@ -159,8 +161,8 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {export default function ProcessRoute() {const { process } = useLoaderData<typeof loader>();- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const initialValues = {id: process.id!,@@ -168,7 +170,7 @@ export default function ProcessRoute() {processType: process.processType ?? "Process",defaultStandardFactor: process.defaultStandardFactor ?? "Minutes/Piece",workCenters: process.workCenters ?? [],- // @ts-ignore+ // @ts-expect-errorsuppliers: (process.suppliers ?? []).map((s) => s.id) ?? [],...getCustomFields(process.customFields),completeAllOnScan: process.completeAllOnScan ?? false,diff --git a/apps/erp/app/routes/x+/resources+/processes.activate.$processId.tsx b/apps/erp/app/routes/x+/resources+/processes.activate.$processId.tsxindex a556ac3a43..ba591e3e25 100644--- a/apps/erp/app/routes/x+/resources+/processes.activate.$processId.tsx+++ b/apps/erp/app/routes/x+/resources+/processes.activate.$processId.tsx@@ -5,13 +5,14 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { Confirm } from "~/components/Modals";import { activateProcess, getProcess } from "~/modules/resources";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/processes.deactivate.$processId.tsx b/apps/erp/app/routes/x+/resources+/processes.deactivate.$processId.tsxindex 73626042d9..6e6d06db55 100644--- a/apps/erp/app/routes/x+/resources+/processes.deactivate.$processId.tsx+++ b/apps/erp/app/routes/x+/resources+/processes.deactivate.$processId.tsx@@ -5,13 +5,14 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { Confirm } from "~/components/Modals";import { getProcess, processDeactivate } from "~/modules/resources";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/processes.delete.$processId.tsx b/apps/erp/app/routes/x+/resources+/processes.delete.$processId.tsxindex 2f5ee501d3..209c664215 100644--- a/apps/erp/app/routes/x+/resources+/processes.delete.$processId.tsx+++ b/apps/erp/app/routes/x+/resources+/processes.delete.$processId.tsx@@ -5,13 +5,14 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { Confirm } from "~/components/Modals";import { deleteProcess, getProcess } from "~/modules/resources";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/processes.new.tsx b/apps/erp/app/routes/x+/resources+/processes.new.tsxindex 7a594e60f9..1f81b5fef0 100644--- a/apps/erp/app/routes/x+/resources+/processes.new.tsx+++ b/apps/erp/app/routes/x+/resources+/processes.new.tsx@@ -6,11 +6,12 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect, useNavigate } from "react-router";+import { useNavigate } from "react-router";import {batchRuleInitialValues,ensureProcessAbility,diff --git a/apps/erp/app/routes/x+/resources+/processes.tsx b/apps/erp/app/routes/x+/resources+/processes.tsxindex fbe2e0790b..d835b13c3a 100644--- a/apps/erp/app/routes/x+/resources+/processes.tsx+++ b/apps/erp/app/routes/x+/resources+/processes.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getProcesses, ProcessesTable } from "~/modules/resources";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/scheduled-maintenance.$scheduleId.tsx b/apps/erp/app/routes/x+/resources+/scheduled-maintenance.$scheduleId.tsxindex 1041c53d7b..31a07993a2 100644--- a/apps/erp/app/routes/x+/resources+/scheduled-maintenance.$scheduleId.tsx+++ b/apps/erp/app/routes/x+/resources+/scheduled-maintenance.$scheduleId.tsx@@ -7,8 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { trigger } from "@carbon/jobs";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getMaintenanceSchedule,maintenanceScheduleValidator,@@ -89,7 +91,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function EditMaintenanceScheduleRoute() {const { schedule } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: schedule.id ?? undefined,@@ -118,7 +120,7 @@ export default function EditMaintenanceScheduleRoute() {<MaintenanceScheduleFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/resources+/scheduled-maintenance.delete.$scheduleId.tsx b/apps/erp/app/routes/x+/resources+/scheduled-maintenance.delete.$scheduleId.tsxindex 9d1a2de98b..7d2cd821eb 100644--- a/apps/erp/app/routes/x+/resources+/scheduled-maintenance.delete.$scheduleId.tsx+++ b/apps/erp/app/routes/x+/resources+/scheduled-maintenance.delete.$scheduleId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import {deleteMaintenanceSchedule,diff --git a/apps/erp/app/routes/x+/resources+/scheduled-maintenance.new.tsx b/apps/erp/app/routes/x+/resources+/scheduled-maintenance.new.tsxindex 9aa164b218..2ab458ae8a 100644--- a/apps/erp/app/routes/x+/resources+/scheduled-maintenance.new.tsx+++ b/apps/erp/app/routes/x+/resources+/scheduled-maintenance.new.tsx@@ -7,8 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { trigger } from "@carbon/jobs";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import {maintenanceScheduleValidator,upsertMaintenanceSchedule@@ -87,7 +89,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function NewMaintenanceScheduleRoute() {const { defaultLocationId } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",workCenterId: "",@@ -113,7 +115,7 @@ export default function NewMaintenanceScheduleRoute() {return (<MaintenanceScheduleForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/resources+/suggestions.$suggestionId.tsx b/apps/erp/app/routes/x+/resources+/suggestions.$suggestionId.tsxindex 869a82488d..a6b4198d79 100644--- a/apps/erp/app/routes/x+/resources+/suggestions.$suggestionId.tsx+++ b/apps/erp/app/routes/x+/resources+/suggestions.$suggestionId.tsx@@ -5,8 +5,9 @@import { error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getSuggestion,SuggestionDetails,diff --git a/apps/erp/app/routes/x+/resources+/suggestions.delete.$suggestionId.tsx b/apps/erp/app/routes/x+/resources+/suggestions.delete.$suggestionId.tsxindex 6783ecf97e..673a86a32a 100644--- a/apps/erp/app/routes/x+/resources+/suggestions.delete.$suggestionId.tsx+++ b/apps/erp/app/routes/x+/resources+/suggestions.delete.$suggestionId.tsx@@ -5,9 +5,10 @@import { assertIsPost, error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteSuggestion, getSuggestion } from "~/modules/resources";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/suggestions.tsx b/apps/erp/app/routes/x+/resources+/suggestions.tsxindex cb141689bc..2fc0406557 100644--- a/apps/erp/app/routes/x+/resources+/suggestions.tsx+++ b/apps/erp/app/routes/x+/resources+/suggestions.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getSuggestions, SuggestionsTable } from "~/modules/resources";import { getTagsList } from "~/modules/shared";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/resources+/training.new.tsx b/apps/erp/app/routes/x+/resources+/training.new.tsxindex d7432a4019..4b380b41f5 100644--- a/apps/erp/app/routes/x+/resources+/training.new.tsx+++ b/apps/erp/app/routes/x+/resources+/training.new.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import {TrainingForm,trainingValidator,@@ -79,13 +81,13 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewTrainingRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",grantsAbilityId: ""};return (- <TrainingForm initialValues={initialValues} onClose={() => navigate(-1)} />+ <TrainingForm initialValues={initialValues} onClose={() => closeRoute()} />);}diff --git a/apps/erp/app/routes/x+/resources+/training.tsx b/apps/erp/app/routes/x+/resources+/training.tsxindex fc236891f4..81ca640bae 100644--- a/apps/erp/app/routes/x+/resources+/training.tsx+++ b/apps/erp/app/routes/x+/resources+/training.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getTrainings, TrainingsTable } from "~/modules/resources";import { getTagsList } from "~/modules/shared";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/resources+/work-centers.$id.tsx b/apps/erp/app/routes/x+/resources+/work-centers.$id.tsxindex 4475287fab..e69bcd9a3e 100644--- a/apps/erp/app/routes/x+/resources+/work-centers.$id.tsx+++ b/apps/erp/app/routes/x+/resources+/work-centers.$id.tsx@@ -6,12 +6,13 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData, useNavigate } from "react-router";import { notifyScheduleInputsChanged } from "~/modules/production";import {getWorkCenter,diff --git a/apps/erp/app/routes/x+/resources+/work-centers.activate.$id.tsx b/apps/erp/app/routes/x+/resources+/work-centers.activate.$id.tsxindex c2ee21e2d5..17ab3da405 100644--- a/apps/erp/app/routes/x+/resources+/work-centers.activate.$id.tsx+++ b/apps/erp/app/routes/x+/resources+/work-centers.activate.$id.tsx@@ -5,11 +5,11 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type {ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect } from "react-router";import { notifyScheduleInputsChanged } from "~/modules/production";import { activateWorkCenter } from "~/modules/resources";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/work-centers.delete.$id.tsx b/apps/erp/app/routes/x+/resources+/work-centers.delete.$id.tsxindex b79e4273c2..1aa6f882d7 100644--- a/apps/erp/app/routes/x+/resources+/work-centers.delete.$id.tsx+++ b/apps/erp/app/routes/x+/resources+/work-centers.delete.$id.tsx@@ -5,11 +5,11 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type {ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect } from "react-router";import { notifyScheduleInputsChanged } from "~/modules/production";import { deleteWorkCenter } from "~/modules/resources";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/resources+/work-centers.new.tsx b/apps/erp/app/routes/x+/resources+/work-centers.new.tsxindex 80913de83f..939084cc67 100644--- a/apps/erp/app/routes/x+/resources+/work-centers.new.tsx+++ b/apps/erp/app/routes/x+/resources+/work-centers.new.tsx@@ -6,11 +6,12 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect, useNavigate } from "react-router";+import { useNavigate } from "react-router";import { useUser } from "~/hooks";import { notifyScheduleInputsChanged } from "~/modules/production";import {diff --git a/apps/erp/app/routes/x+/resources+/work-centers.rules.assign.$workCenterId.tsx b/apps/erp/app/routes/x+/resources+/work-centers.rules.assign.$workCenterId.tsxindex 347ad8c5b4..dab03217df 100644--- a/apps/erp/app/routes/x+/resources+/work-centers.rules.assign.$workCenterId.tsx+++ b/apps/erp/app/routes/x+/resources+/work-centers.rules.assign.$workCenterId.tsx@@ -7,9 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";import { assignStorageRule } from "@carbon/ee/rules.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";-import { path } from "~/utils/path";+import { path, requestReferrer } from "~/utils/path";export async function action({ request, params }: ActionFunctionArgs) {assertIsPost(request);@@ -32,7 +32,7 @@ export async function action({ request, params }: ActionFunctionArgs) {const ruleId = String(formData.get("ruleId") ?? "");if (!ruleId) {throw redirect(- request.headers.get("Referer") ?? path.to.storageRules,+ requestReferrer(request) ?? path.to.storageRules,await flash(request, error(null, "Rule id required")));}@@ -47,13 +47,13 @@ export async function action({ request, params }: ActionFunctionArgs) {if (result.error) {throw redirect(- request.headers.get("Referer") ?? path.to.storageRules,+ requestReferrer(request) ?? path.to.storageRules,await flash(request, error(result.error, "Failed to assign rule")));}throw redirect(- request.headers.get("Referer") ?? path.to.storageRules,+ requestReferrer(request) ?? path.to.storageRules,await flash(request, success("Rule assigned")));}diff --git a/apps/erp/app/routes/x+/resources+/work-centers.rules.unassign.$workCenterId.$ruleId.tsx b/apps/erp/app/routes/x+/resources+/work-centers.rules.unassign.$workCenterId.$ruleId.tsxindex f9de0c04a4..92922a89f7 100644--- a/apps/erp/app/routes/x+/resources+/work-centers.rules.unassign.$workCenterId.$ruleId.tsx+++ b/apps/erp/app/routes/x+/resources+/work-centers.rules.unassign.$workCenterId.$ruleId.tsx@@ -7,9 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";import { unassignStorageRule } from "@carbon/ee/rules.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";-import { path } from "~/utils/path";+import { path, requestReferrer } from "~/utils/path";export async function action({ request, params }: ActionFunctionArgs) {assertIsPost(request);@@ -37,13 +37,13 @@ export async function action({ request, params }: ActionFunctionArgs) {});if (result.error) {throw redirect(- request.headers.get("Referer") ?? path.to.storageRules,+ requestReferrer(request) ?? path.to.storageRules,await flash(request, error(result.error, "Failed to unassign rule")));}throw redirect(- request.headers.get("Referer") ?? path.to.storageRules,+ requestReferrer(request) ?? path.to.storageRules,await flash(request, success("Rule unassigned")));}diff --git a/apps/erp/app/routes/x+/resources+/work-centers.tsx b/apps/erp/app/routes/x+/resources+/work-centers.tsxindex dcfb705abb..8d70c11797 100644--- a/apps/erp/app/routes/x+/resources+/work-centers.tsx+++ b/apps/erp/app/routes/x+/resources+/work-centers.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getDepartmentsList } from "~/modules/people";import {getLocationsList,diff --git a/apps/erp/app/routes/x+/sales+/_index.tsx b/apps/erp/app/routes/x+/sales+/_index.tsxindex ecd51b51f6..7ca628c62a 100644--- a/apps/erp/app/routes/x+/sales+/_index.tsx+++ b/apps/erp/app/routes/x+/sales+/_index.tsx@@ -359,7 +359,7 @@ export default function SalesDashboard() {? item.date: "month" in item? item.month- : // @ts-ignore+ : // @ts-expect-erroritem.monthKey,item.value])diff --git a/apps/erp/app/routes/x+/sales+/_layout.tsx b/apps/erp/app/routes/x+/sales+/_layout.tsxindex 2b68f9170a..0127495851 100644--- a/apps/erp/app/routes/x+/sales+/_layout.tsx+++ b/apps/erp/app/routes/x+/sales+/_layout.tsx@@ -11,6 +11,8 @@ import useSalesSubmodules from "~/modules/sales/ui/useSalesSubmodules";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Sales" }];};diff --git a/apps/erp/app/routes/x+/sales+/customer-portals.$id.tsx b/apps/erp/app/routes/x+/sales+/customer-portals.$id.tsxindex ccfa0c549e..24f5fbef88 100644--- a/apps/erp/app/routes/x+/sales+/customer-portals.$id.tsx+++ b/apps/erp/app/routes/x+/sales+/customer-portals.$id.tsx@@ -8,12 +8,13 @@ import { flash } from "@carbon/auth/session.server";import { upsertCustomerPortal } from "@carbon/ee/customer-portals.server";import { requireFeature } from "@carbon/ee/plan.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import { customerPortalValidator } from "~/modules/sales";import CustomerPortalForm from "~/modules/sales/ui/CustomerPortals/CustomerPortalForm.ee";import { getCustomerPortal } from "~/modules/shared";-import { path } from "~/utils/path";export async function loader({ request, params }: LoaderFunctionArgs) {@@ -93,7 +94,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function EditCustomerPortalRoute() {const { customerPortal } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: customerPortal.id ?? undefined,@@ -104,7 +105,7 @@ export default function EditCustomerPortalRoute() {<CustomerPortalFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/customer-portals.delete.$id.tsx b/apps/erp/app/routes/x+/sales+/customer-portals.delete.$id.tsxindex 24f2512acc..501a8cd6f8 100644--- a/apps/erp/app/routes/x+/sales+/customer-portals.delete.$id.tsx+++ b/apps/erp/app/routes/x+/sales+/customer-portals.delete.$id.tsx@@ -7,9 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { deleteCustomerPortal } from "@carbon/ee/customer-portals.server";import { requireFeature } from "@carbon/ee/plan.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { getCustomerPortal } from "~/modules/shared";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales+/customer-portals.new.tsx b/apps/erp/app/routes/x+/sales+/customer-portals.new.tsxindex 2d565f08ee..09878b334a 100644--- a/apps/erp/app/routes/x+/sales+/customer-portals.new.tsx+++ b/apps/erp/app/routes/x+/sales+/customer-portals.new.tsx@@ -8,11 +8,11 @@ import { flash } from "@carbon/auth/session.server";import { upsertCustomerPortal } from "@carbon/ee/customer-portals.server";import { requireFeature } from "@carbon/ee/plan.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import { customerPortalValidator } from "~/modules/sales";import CustomerPortalForm from "~/modules/sales/ui/CustomerPortals/CustomerPortalForm.ee";-import { getParams, path, requestReferrer } from "~/utils/path";export async function loader({ request }: LoaderFunctionArgs) {@@ -81,7 +81,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewCustomerPortalRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {customerId: ""};@@ -89,7 +89,7 @@ export default function NewCustomerPortalRoute() {return (<CustomerPortalForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/customer-statuses.$customerStatusId.tsx b/apps/erp/app/routes/x+/sales+/customer-statuses.$customerStatusId.tsxindex 33737edb72..c6a185fce7 100644--- a/apps/erp/app/routes/x+/sales+/customer-statuses.$customerStatusId.tsx+++ b/apps/erp/app/routes/x+/sales+/customer-statuses.$customerStatusId.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {customerStatusValidator,getCustomerStatus,@@ -86,7 +88,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function EditCustomerStatusesRoute() {const { customerStatus } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: customerStatus.id ?? undefined,@@ -98,7 +100,7 @@ export default function EditCustomerStatusesRoute() {<CustomerStatusFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/customer-statuses.delete.$customerStatusId.tsx b/apps/erp/app/routes/x+/sales+/customer-statuses.delete.$customerStatusId.tsxindex b5150aafd7..0286577763 100644--- a/apps/erp/app/routes/x+/sales+/customer-statuses.delete.$customerStatusId.tsx+++ b/apps/erp/app/routes/x+/sales+/customer-statuses.delete.$customerStatusId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteCustomerStatus, getCustomerStatus } from "~/modules/sales";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales+/customer-statuses.new.tsx b/apps/erp/app/routes/x+/sales+/customer-statuses.new.tsxindex 9bf17524eb..af71115a03 100644--- a/apps/erp/app/routes/x+/sales+/customer-statuses.new.tsx+++ b/apps/erp/app/routes/x+/sales+/customer-statuses.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import { customerStatusValidator, upsertCustomerStatus } from "~/modules/sales";import CustomerStatusForm from "~/modules/sales/ui/CustomerStatuses/CustomerStatusForm";import { setCustomFields } from "~/utils/form";@@ -72,7 +73,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewCustomerStatusesRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: ""};@@ -80,7 +81,7 @@ export default function NewCustomerStatusesRoute() {return (<CustomerStatusForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/customer-types.$customerTypeId.tsx b/apps/erp/app/routes/x+/sales+/customer-types.$customerTypeId.tsxindex 65f745e0d4..dfc4b2b0cd 100644--- a/apps/erp/app/routes/x+/sales+/customer-types.$customerTypeId.tsx+++ b/apps/erp/app/routes/x+/sales+/customer-types.$customerTypeId.tsx@@ -6,12 +6,14 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {customerTypeValidator,getCustomerType,@@ -94,7 +96,7 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {export default function EditCustomerTypesRoute() {const { customerType } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: customerType?.id ?? undefined,@@ -106,7 +108,7 @@ export default function EditCustomerTypesRoute() {<CustomerTypeFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/customer-types.delete.$customerTypeId.tsx b/apps/erp/app/routes/x+/sales+/customer-types.delete.$customerTypeId.tsxindex 602c51dc32..62a26fac0d 100644--- a/apps/erp/app/routes/x+/sales+/customer-types.delete.$customerTypeId.tsx+++ b/apps/erp/app/routes/x+/sales+/customer-types.delete.$customerTypeId.tsx@@ -5,13 +5,14 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteCustomerType, getCustomerType } from "~/modules/sales";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales+/customer-types.new.tsx b/apps/erp/app/routes/x+/sales+/customer-types.new.tsxindex e56d7233a6..45fc3d398b 100644--- a/apps/erp/app/routes/x+/sales+/customer-types.new.tsx+++ b/apps/erp/app/routes/x+/sales+/customer-types.new.tsx@@ -6,12 +6,13 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useNavigate } from "react-router";import { customerTypeValidator, upsertCustomerType } from "~/modules/sales";import { CustomerTypeForm } from "~/modules/sales/ui/CustomerTypes";import { setCustomFields } from "~/utils/form";@@ -79,7 +80,7 @@ export async function clientAction({ serverAction }: ClientActionFunctionArgs) {}export default function NewCustomerTypesRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: ""};@@ -87,7 +88,7 @@ export default function NewCustomerTypesRoute() {return (<CustomerTypeForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/customers.tsx b/apps/erp/app/routes/x+/sales+/customers.tsxindex 4fefeeeae4..5d312175fc 100644--- a/apps/erp/app/routes/x+/sales+/customers.tsx+++ b/apps/erp/app/routes/x+/sales+/customers.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getCustomerStatuses, getCustomers } from "~/modules/sales";import { CustomersTable } from "~/modules/sales/ui/Customers";import { getTagsList } from "~/modules/shared";diff --git a/apps/erp/app/routes/x+/sales+/invoices.tsx b/apps/erp/app/routes/x+/sales+/invoices.tsxindex 14bcee9ab0..78bef47ded 100644--- a/apps/erp/app/routes/x+/sales+/invoices.tsx+++ b/apps/erp/app/routes/x+/sales+/invoices.tsx@@ -2,8 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";// Sales invoices now live solely in the invoicing module. This legacy Sales-modulediff --git a/apps/erp/app/routes/x+/sales+/no-quote-reasons.$id.tsx b/apps/erp/app/routes/x+/sales+/no-quote-reasons.$id.tsxindex af8fc44893..2ef527a89a 100644--- a/apps/erp/app/routes/x+/sales+/no-quote-reasons.$id.tsx+++ b/apps/erp/app/routes/x+/sales+/no-quote-reasons.$id.tsx@@ -6,15 +6,16 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getNoQuoteReason,noQuoteReasonValidator,upsertNoQuoteReason} from "~/modules/sales";import NoQuoteReasonForm from "~/modules/sales/ui/NoQuoteReasons/NoQuoteReasonForm";-import { getCustomFields, setCustomFields } from "~/utils/form";import { path } from "~/utils/path";@@ -85,7 +86,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function EditNoQuoteReasonRoute() {const { noQuoteReason } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: noQuoteReason.id ?? undefined,@@ -97,7 +98,7 @@ export default function EditNoQuoteReasonRoute() {<NoQuoteReasonFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/no-quote-reasons.delete.$id.tsx b/apps/erp/app/routes/x+/sales+/no-quote-reasons.delete.$id.tsxindex 560a2ec732..9f3b205263 100644--- a/apps/erp/app/routes/x+/sales+/no-quote-reasons.delete.$id.tsx+++ b/apps/erp/app/routes/x+/sales+/no-quote-reasons.delete.$id.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteNoQuoteReason, getNoQuoteReason } from "~/modules/sales";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales+/no-quote-reasons.new.tsx b/apps/erp/app/routes/x+/sales+/no-quote-reasons.new.tsxindex 42c104c235..aeeeb3bc47 100644--- a/apps/erp/app/routes/x+/sales+/no-quote-reasons.new.tsx+++ b/apps/erp/app/routes/x+/sales+/no-quote-reasons.new.tsx@@ -6,11 +6,11 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import { noQuoteReasonValidator, upsertNoQuoteReason } from "~/modules/sales";import NoQuoteReasonForm from "~/modules/sales/ui/NoQuoteReasons/NoQuoteReasonForm";-import { setCustomFields } from "~/utils/form";import { getParams, path, requestReferrer } from "~/utils/path";@@ -68,7 +68,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewCustomerStatusesRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: ""};@@ -76,7 +76,7 @@ export default function NewCustomerStatusesRoute() {return (<NoQuoteReasonForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/orders.tsx b/apps/erp/app/routes/x+/sales+/orders.tsxindex 51cdc1576b..fe795d972f 100644--- a/apps/erp/app/routes/x+/sales+/orders.tsx+++ b/apps/erp/app/routes/x+/sales+/orders.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getSalesOrders } from "~/modules/sales";import { SalesOrdersTable } from "~/modules/sales/ui/SalesOrder";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/sales+/price-list.$overrideId.tsx b/apps/erp/app/routes/x+/sales+/price-list.$overrideId.tsxindex 6db29eedc3..07f3c12a35 100644--- a/apps/erp/app/routes/x+/sales+/price-list.$overrideId.tsx+++ b/apps/erp/app/routes/x+/sales+/price-list.$overrideId.tsx@@ -7,8 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import {getCustomerItemPriceOverrideById,priceOverrideBreaksValidator,@@ -138,7 +140,7 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function EditPriceOverrideRoute() {const { override } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();if (!override) return null;@@ -166,7 +168,7 @@ export default function EditPriceOverrideRoute() {}[]): []}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/price-list.delete.$overrideId.tsx b/apps/erp/app/routes/x+/sales+/price-list.delete.$overrideId.tsxindex 3d1940d756..258d5f50f9 100644--- a/apps/erp/app/routes/x+/sales+/price-list.delete.$overrideId.tsx+++ b/apps/erp/app/routes/x+/sales+/price-list.delete.$overrideId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import {deleteCustomerItemPriceOverride,diff --git a/apps/erp/app/routes/x+/sales+/price-list.duplicate.tsx b/apps/erp/app/routes/x+/sales+/price-list.duplicate.tsxindex 6c4b2aa4ae..d12897a377 100644--- a/apps/erp/app/routes/x+/sales+/price-list.duplicate.tsx+++ b/apps/erp/app/routes/x+/sales+/price-list.duplicate.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { z } from "zod";import { duplicatePriceListValidator } from "~/modules/sales";import { duplicatePriceOverrides } from "~/modules/sales/sales.server";diff --git a/apps/erp/app/routes/x+/sales+/price-list.new.tsx b/apps/erp/app/routes/x+/sales+/price-list.new.tsxindex eedf7a8659..a3f120ad2c 100644--- a/apps/erp/app/routes/x+/sales+/price-list.new.tsx+++ b/apps/erp/app/routes/x+/sales+/price-list.new.tsx@@ -7,9 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { datetime } from "@carbon/utils";+import { useCloseRoute } from "@carbon/react";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import {priceOverrideBreaksValidator,priceOverrideValidator,@@ -142,7 +143,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function NewPriceOverrideRoute() {const { initial, initialScope } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();return (<PriceOverrideForm@@ -156,7 +157,7 @@ export default function NewPriceOverrideRoute() {}}initialBreaks={[{ quantity: 1, overridePrice: 0, active: true }]}initialScope={initialScope}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/pricing-rules.$ruleId.tsx b/apps/erp/app/routes/x+/sales+/pricing-rules.$ruleId.tsxindex 8bc2fa13f6..8dc88d17e1 100644--- a/apps/erp/app/routes/x+/sales+/pricing-rules.$ruleId.tsx+++ b/apps/erp/app/routes/x+/sales+/pricing-rules.$ruleId.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData } from "react-router";import {duplicatePricingRule,getPricingRule,@@ -103,7 +105,7 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function EditPricingRuleRoute() {const { pricingRule } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();if (!pricingRule) return null;@@ -134,7 +136,7 @@ export default function EditPricingRuleRoute() {<PricingRuleFormkey={pricingRule.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/pricing-rules.delete.$ruleId.tsx b/apps/erp/app/routes/x+/sales+/pricing-rules.delete.$ruleId.tsxindex 4bd50be488..a98c6e8095 100644--- a/apps/erp/app/routes/x+/sales+/pricing-rules.delete.$ruleId.tsx+++ b/apps/erp/app/routes/x+/sales+/pricing-rules.delete.$ruleId.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deletePricingRule, getPricingRule } from "~/modules/sales";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales+/pricing-rules.new.tsx b/apps/erp/app/routes/x+/sales+/pricing-rules.new.tsxindex 1c1e1da44d..7066c0cbb7 100644--- a/apps/erp/app/routes/x+/sales+/pricing-rules.new.tsx+++ b/apps/erp/app/routes/x+/sales+/pricing-rules.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import { createPricingRule, pricingRuleValidator } from "~/modules/sales";import PricingRuleForm from "~/modules/sales/ui/Pricing/PricingRuleForm";import { getParams, path } from "~/utils/path";@@ -51,7 +52,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewPricingRuleRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();return (<PricingRuleForm@@ -66,7 +67,7 @@ export default function NewPricingRuleRoute() {customerTypeIds: [],itemIds: []}}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/quotes.tsx b/apps/erp/app/routes/x+/sales+/quotes.tsxindex 08fc268cfb..0cf02e261e 100644--- a/apps/erp/app/routes/x+/sales+/quotes.tsx+++ b/apps/erp/app/routes/x+/sales+/quotes.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getQuotes } from "~/modules/sales";import { QuotesTable } from "~/modules/sales/ui/Quotes";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/sales+/return-reasons.$id.tsx b/apps/erp/app/routes/x+/sales+/return-reasons.$id.tsxindex 4ad0927dc3..1e22270a8d 100644--- a/apps/erp/app/routes/x+/sales+/return-reasons.$id.tsx+++ b/apps/erp/app/routes/x+/sales+/return-reasons.$id.tsx@@ -6,15 +6,16 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import {getReturnReason,returnReasonValidator,upsertReturnReason} from "~/modules/sales";import ReturnReasonForm from "~/modules/sales/ui/ReturnReasons/ReturnReasonForm";-import { getCustomFields, setCustomFields } from "~/utils/form";import { path } from "~/utils/path";@@ -85,7 +86,7 @@ export async function action({ request }: ActionFunctionArgs) {export default function EditReturnReasonRoute() {const { returnReason } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: returnReason.id ?? undefined,@@ -98,7 +99,7 @@ export default function EditReturnReasonRoute() {<ReturnReasonFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/return-reasons.delete.$id.tsx b/apps/erp/app/routes/x+/sales+/return-reasons.delete.$id.tsxindex a6fbcac6c7..022eff8a05 100644--- a/apps/erp/app/routes/x+/sales+/return-reasons.delete.$id.tsx+++ b/apps/erp/app/routes/x+/sales+/return-reasons.delete.$id.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteReturnReason, getReturnReason } from "~/modules/sales";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales+/return-reasons.new.tsx b/apps/erp/app/routes/x+/sales+/return-reasons.new.tsxindex 8a1836a982..cd399df2fb 100644--- a/apps/erp/app/routes/x+/sales+/return-reasons.new.tsx+++ b/apps/erp/app/routes/x+/sales+/return-reasons.new.tsx@@ -6,11 +6,11 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";import { returnReasonValidator, upsertReturnReason } from "~/modules/sales";import ReturnReasonForm from "~/modules/sales/ui/ReturnReasons/ReturnReasonForm";-import { setCustomFields } from "~/utils/form";import { getParams, path, requestReferrer } from "~/utils/path";@@ -68,7 +68,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewReturnReasonRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",inventoryValueZero: false@@ -77,7 +77,7 @@ export default function NewReturnReasonRoute() {return (<ReturnReasonForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/sales+/rfqs.tsx b/apps/erp/app/routes/x+/sales+/rfqs.tsxindex 305c5a0ee7..bf67ec5240 100644--- a/apps/erp/app/routes/x+/sales+/rfqs.tsx+++ b/apps/erp/app/routes/x+/sales+/rfqs.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getSalesRFQs } from "~/modules/sales";import { SalesRFQsTable } from "~/modules/sales/ui/SalesRFQ";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/sales+/rmas.tsx b/apps/erp/app/routes/x+/sales+/rmas.tsxindex 6826328c5f..b1c02d8871 100644--- a/apps/erp/app/routes/x+/sales+/rmas.tsx+++ b/apps/erp/app/routes/x+/sales+/rmas.tsx@@ -6,9 +6,10 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getSalesReturnOrders } from "~/modules/sales";import { SalesReturnOrdersTable } from "~/modules/sales/ui/SalesReturnOrders";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/sales+/sales-rules.$id.delete.tsx b/apps/erp/app/routes/x+/sales+/sales-rules.$id.delete.tsxindex 563110abc6..fc7698c583 100644--- a/apps/erp/app/routes/x+/sales+/sales-rules.$id.delete.tsx+++ b/apps/erp/app/routes/x+/sales+/sales-rules.$id.delete.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";import { deleteEnforcementRule } from "@carbon/ee/rules.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData, useNavigate } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { getEnforcementRule } from "~/modules/shared";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales+/sales-rules.$id.tsx b/apps/erp/app/routes/x+/sales+/sales-rules.$id.tsxindex 8f52e9a439..b51a76530a 100644--- a/apps/erp/app/routes/x+/sales+/sales-rules.$id.tsx+++ b/apps/erp/app/routes/x+/sales+/sales-rules.$id.tsx@@ -9,13 +9,13 @@ import { requireFeature } from "@carbon/ee/plan.server";import { upsertEnforcementRule } from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";import type { SalesRuleSurface } from "@carbon/utils";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData, useNavigate } from "react-router";import type { z } from "zod";import { type salesRuleSeverities, salesRuleValidator } from "~/modules/sales";import { SalesRuleForm } from "~/modules/sales/ui/SalesRules";diff --git a/apps/erp/app/routes/x+/sales+/sales-rules.assign.$itemId.tsx b/apps/erp/app/routes/x+/sales+/sales-rules.assign.$itemId.tsxindex bef993ef75..c09b86b3ef 100644--- a/apps/erp/app/routes/x+/sales+/sales-rules.assign.$itemId.tsx+++ b/apps/erp/app/routes/x+/sales+/sales-rules.assign.$itemId.tsx@@ -7,9 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";import { assignSalesRule } from "@carbon/ee/rules.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";-import { path } from "~/utils/path";+import { path, requestReferrer } from "~/utils/path";export async function action({ request, params }: ActionFunctionArgs) {assertIsPost(request);@@ -32,7 +32,7 @@ export async function action({ request, params }: ActionFunctionArgs) {const ruleId = String(formData.get("ruleId") ?? "");if (!ruleId) {throw redirect(- request.headers.get("Referer") ?? path.to.salesRules,+ requestReferrer(request) ?? path.to.salesRules,await flash(request, error(null, "Rule id required")));}@@ -46,13 +46,13 @@ export async function action({ request, params }: ActionFunctionArgs) {if (result.error) {throw redirect(- request.headers.get("Referer") ?? path.to.salesRules,+ requestReferrer(request) ?? path.to.salesRules,await flash(request, error(result.error, "Failed to assign rule")));}throw redirect(- request.headers.get("Referer") ?? path.to.salesRules,+ requestReferrer(request) ?? path.to.salesRules,await flash(request, success("Rule assigned")));}diff --git a/apps/erp/app/routes/x+/sales+/sales-rules.new.tsx b/apps/erp/app/routes/x+/sales+/sales-rules.new.tsxindex 53558bd0e0..4e146c9763 100644--- a/apps/erp/app/routes/x+/sales+/sales-rules.new.tsx+++ b/apps/erp/app/routes/x+/sales+/sales-rules.new.tsx@@ -8,8 +8,9 @@ import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";import { upsertEnforcementRule } from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data, useNavigate } from "react-router";import { salesRuleValidator } from "~/modules/sales";import { SalesRuleForm } from "~/modules/sales/ui/SalesRules";import { getParams, path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales+/sales-rules.tsx b/apps/erp/app/routes/x+/sales+/sales-rules.tsxindex a44424f864..b7429ccca6 100644--- a/apps/erp/app/routes/x+/sales+/sales-rules.tsx+++ b/apps/erp/app/routes/x+/sales+/sales-rules.tsx@@ -5,13 +5,13 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { usePlanGate } from "~/hooks/usePlanGate";import {SalesRulesGroups,diff --git a/apps/erp/app/routes/x+/sales+/sales-rules.unassign.$itemId.$ruleId.tsx b/apps/erp/app/routes/x+/sales+/sales-rules.unassign.$itemId.$ruleId.tsxindex 98ebc6b4d4..7d0173f05e 100644--- a/apps/erp/app/routes/x+/sales+/sales-rules.unassign.$itemId.$ruleId.tsx+++ b/apps/erp/app/routes/x+/sales+/sales-rules.unassign.$itemId.$ruleId.tsx@@ -7,9 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";import { unassignSalesRule } from "@carbon/ee/rules.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";-import { path } from "~/utils/path";+import { path, requestReferrer } from "~/utils/path";export async function action({ request, params }: ActionFunctionArgs) {assertIsPost(request);@@ -35,13 +35,13 @@ export async function action({ request, params }: ActionFunctionArgs) {});if (result.error) {throw redirect(- request.headers.get("Referer") ?? path.to.salesRules,+ requestReferrer(request) ?? path.to.salesRules,await flash(request, error(result.error, "Failed to unassign rule")));}throw redirect(- request.headers.get("Referer") ?? path.to.salesRules,+ requestReferrer(request) ?? path.to.salesRules,await flash(request, success("Rule unassigned")));}diff --git a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.$lineId.delete.tsx b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.$lineId.delete.tsxindex 6a252171ff..053f92ad0d 100644--- a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.$lineId.delete.tsx+++ b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.$lineId.delete.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import {deleteSalesInvoiceLine,diff --git a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.$lineId.details.tsx b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.$lineId.details.tsxindex 52d00aa2d7..b724a16bdc 100644--- a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.$lineId.details.tsx+++ b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.$lineId.details.tsx@@ -14,11 +14,11 @@ import {} from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";-import { getItemReadableId } from "@carbon/utils";+import { getItemReadableId, redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import { Fragment } from "react/jsx-runtime";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData, useParams } from "react-router";+import { Outlet, useLoaderData, useParams } from "react-router";import { DeferredFiles } from "~/components";import {getSalesInvoice,diff --git a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId._index.tsx b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId._index.tsxindex 8fb8339e03..a7a96d3506 100644--- a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId._index.tsx+++ b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId._index.tsx@@ -3,9 +3,8 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { notFound } from "@carbon/auth";-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.delete.tsx b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.delete.tsxindex 03039444e5..818060e60f 100644--- a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.delete.tsx+++ b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.delete.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteSalesInvoice } from "~/modules/invoicing";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.details.tsx b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.details.tsxindex 93177fb4b9..c018063a52 100644--- a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.details.tsx+++ b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.details.tsx@@ -7,12 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { FileObject } from "@supabase/storage-js";import { useRef } from "react";import { Fragment } from "react/jsx-runtime";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { DeferredFiles } from "~/components";import { useRouteData, useUser } from "~/hooks";import type {diff --git a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.exchange-rate.tsx b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.exchange-rate.tsxindex c7cdb11c42..ef00be7385 100644--- a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.exchange-rate.tsx+++ b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.exchange-rate.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getExchangeRate } from "~/modules/accounting";import {getSalesInvoice,diff --git a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.new.tsx b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.new.tsxindex 5d322d0dcc..0fb71d53c7 100644--- a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.new.tsx+++ b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.new.tsx@@ -13,8 +13,9 @@ import {} from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";import { useRouteData } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect, useParams } from "react-router";+import { useParams } from "react-router";import { useUser } from "~/hooks";import type { SalesInvoice } from "~/modules/invoicing";import {diff --git a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.shipment.tsx b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.shipment.tsxindex e824fe42c6..bae7d719d4 100644--- a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.shipment.tsx+++ b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.shipment.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getSalesInvoice,isSalesInvoiceLocked,diff --git a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.status.tsx b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.status.tsxindex 0c30059236..7cbdd48658 100644--- a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.status.tsx+++ b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.status.tsx@@ -5,9 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { updateSalesInvoiceStatus } from "~/modules/invoicing";import { salesInvoiceStatusType } from "~/modules/invoicing/invoicing.models";import { getCompanySettings } from "~/modules/settings";diff --git a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.tsx b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.tsxindex 5739a9a347..cc9b1d9c86 100644--- a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.tsx+++ b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.tsx@@ -8,14 +8,14 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { createMappingService } from "@carbon/ee/accounting";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams } from "react-router";+import { Outlet, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout";import { getCurrencyByCode } from "~/modules/accounting";import {@@ -36,7 +36,7 @@ import {import { getCompanySettings } from "~/modules/settings";import { getDatabaseClient } from "~/services/database.server";import { detailBreadcrumb, type Handle } from "~/utils/handle";-import { path } from "~/utils/path";+import { path, requestReferrer } from "~/utils/path";export const handle: Handle = {breadcrumb: detailBreadcrumb(@@ -138,9 +138,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {}export async function action({ request }: ActionFunctionArgs) {- throw redirect(- request.headers.get("Referer") ?? new URL(request.url).pathname- );+ throw redirect(requestReferrer(request) ?? new URL(request.url).pathname);}export default function SalesInvoiceRoute() {diff --git a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.void.tsx b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.void.tsxindex 7225ad3ec2..8f872f6935 100644--- a/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.void.tsx+++ b/apps/erp/app/routes/x+/sales-invoice+/$invoiceId.void.tsx@@ -6,8 +6,8 @@ import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales-invoice+/_layout.tsx b/apps/erp/app/routes/x+/sales-invoice+/_layout.tsxindex 129206a5f5..84c0a90daf 100644--- a/apps/erp/app/routes/x+/sales-invoice+/_layout.tsx+++ b/apps/erp/app/routes/x+/sales-invoice+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Invoicing" }];};diff --git a/apps/erp/app/routes/x+/sales-invoice+/new.tsx b/apps/erp/app/routes/x+/sales-invoice+/new.tsxindex e15eef2f72..156f6d2010 100644--- a/apps/erp/app/routes/x+/sales-invoice+/new.tsx+++ b/apps/erp/app/routes/x+/sales-invoice+/new.tsx@@ -8,10 +8,9 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { rejectCrossSiteNavigation } from "@carbon/auth/middleware/security.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { getErrorMessage } from "@carbon/utils";+import { getErrorMessage, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { useCompanyToday, useUrlParams, useUser } from "~/hooks";import {createSalesInvoiceFromSalesOrder,@@ -23,7 +22,7 @@ import SalesInvoiceForm from "~/modules/invoicing/ui/SalesInvoice/SalesInvoiceFoimport { getDatabaseClient } from "~/services/database.server";import { setCustomFields } from "~/utils/form";import type { Handle } from "~/utils/handle";-import { path } from "~/utils/path";+import { path, requestReferrer } from "~/utils/path";export const handle: Handle = {breadcrumb: msg`Sales`,@@ -59,7 +58,7 @@ export async function loader({ request }: LoaderFunctionArgs) {if (result.error || !result?.data) {throw redirect(- request.headers.get("Referer") ?? path.to.salesOrders,+ requestReferrer(request) ?? path.to.salesOrders,await flash(request,error(@@ -84,7 +83,7 @@ export async function loader({ request }: LoaderFunctionArgs) {if (result.error || !result?.data) {throw redirect(- request.headers.get("Referer") ?? path.to.shipment(sourceDocumentId),+ requestReferrer(request) ?? path.to.shipment(sourceDocumentId),await flash(request,error(diff --git a/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.delete.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.delete.tsxindex 244684b65a..4122480108 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.delete.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.delete.tsx@@ -5,9 +5,11 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import {deleteSalesOrderLine,@@ -82,13 +84,13 @@ export default function DeleteSalesOrderLineRoute() {const { t } = useLingui();const { lineId, orderId } = useParams();const { salesOrderLine } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();if (!salesOrderLine) return null;if (!lineId) throw notFound("Could not find lineId");if (!orderId) throw notFound("Could not find orderId");- const onCancel = () => navigate(-1);+ const onCancel = () => closeRoute();return (<ConfirmDeletediff --git a/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.details.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.details.tsxindex a4ad80587a..5deadf37da 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.details.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.details.tsx@@ -16,16 +16,11 @@ import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";import { Card, CardHeader, CardTitle } from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { Fragment, Suspense } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import {- Await,- Outlet,- redirect,- useLoaderData,- useParams-} from "react-router";+import { Await, Outlet, useLoaderData, useParams } from "react-router";import { CadModel, DeferredFiles } from "~/components";import { usePermissions, useRouteData } from "~/hooks";import { getItemReplenishment } from "~/modules/items";@@ -293,7 +288,7 @@ export default function EditSalesOrderLineRoute() {<Fragment key={lineId}><SalesOrderLineFormkey={initialValues.id}- // @ts-ignore+ // @ts-expect-errorinitialValues={initialValues}/>diff --git a/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.job.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.job.tsxindex 1f5566ec11..979956b104 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.job.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.job.tsx@@ -8,8 +8,8 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { insertJob, salesOrderToJobValidator } from "~/modules/production";import { resolveJobConfiguration } from "~/modules/sales/sales.utils";import { requireCompanyRecord } from "~/modules/shared/shared.server";diff --git a/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.shipment.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.shipment.tsxindex 0931e6e482..9508f1c6b1 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.shipment.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId.$lineId.shipment.tsx@@ -8,8 +8,8 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getSalesOrderLine } from "~/modules/sales";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales-order+/$orderId._index.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId._index.tsxindex 3fb36053f9..f7f78e60e9 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId._index.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/sales-order+/$orderId.delete.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId.delete.tsxindex 9f87dcef0e..896228eb9e 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId.delete.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId.delete.tsx@@ -5,8 +5,9 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteSalesOrder } from "~/modules/sales";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales-order+/$orderId.details.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId.details.tsxindex 26d60d0af6..a3f25bf950 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId.details.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId.details.tsx@@ -6,12 +6,13 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { FileObject } from "@supabase/storage-js";import type { JSONContent } from "@tiptap/react";import { useRef } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { DeferredFiles } from "~/components";import { useRouteData } from "~/hooks";import type { Opportunity, SalesOrder, SalesOrderLine } from "~/modules/sales";diff --git a/apps/erp/app/routes/x+/sales-order+/$orderId.exchange-rate.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId.exchange-rate.tsxindex 55744bee45..10196c0737 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId.exchange-rate.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId.exchange-rate.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getExchangeRate } from "~/modules/accounting";import {getSalesOrder,diff --git a/apps/erp/app/routes/x+/sales-order+/$orderId.lines.jobs.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId.lines.jobs.tsxindex 5671b899fd..83c1246fcc 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId.lines.jobs.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId.lines.jobs.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { convertSalesOrderLinesToJobs } from "~/modules/production/production.service";import { getSalesOrder } from "~/modules/sales";import { getDatabaseClient } from "~/services/database.server";diff --git a/apps/erp/app/routes/x+/sales-order+/$orderId.new.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId.new.tsxindex ccbc548fec..ea09d2361b 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId.new.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId.new.tsx@@ -13,8 +13,9 @@ import {resolveSalesOrderShipTo} from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect, useParams } from "react-router";+import { useParams } from "react-router";import { useRouteData, useUser } from "~/hooks";import { getUnreleasedChangeOrderIssue } from "~/modules/items/items.server";import type { Customer, SalesOrder, SalesOrderLineType } from "~/modules/sales";@@ -209,7 +210,7 @@ export default function NewSalesOrderLineRoute() {return (<SalesOrderLineForm- // @ts-ignore+ // @ts-expect-errorinitialValues={initialValues}/>);diff --git a/apps/erp/app/routes/x+/sales-order+/$orderId.payment.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId.payment.tsxindex 1166e6ac79..80a2aaba94 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId.payment.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId.payment.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getSalesOrder,isSalesOrderLocked,diff --git a/apps/erp/app/routes/x+/sales-order+/$orderId.shipment.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId.shipment.tsxindex e5803c1448..cb159f29eb 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId.shipment.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId.shipment.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getSalesOrder,isSalesOrderLocked,diff --git a/apps/erp/app/routes/x+/sales-order+/$orderId.status.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId.status.tsxindex 98141da98d..28fe920eb7 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId.status.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId.status.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {cancelSalesOrder,salesOrderStatusType,diff --git a/apps/erp/app/routes/x+/sales-order+/$orderId.tsx b/apps/erp/app/routes/x+/sales-order+/$orderId.tsxindex a052fb36be..48d796471f 100644--- a/apps/erp/app/routes/x+/sales-order+/$orderId.tsx+++ b/apps/erp/app/routes/x+/sales-order+/$orderId.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams } from "react-router";+import { Outlet, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import {getCustomer,diff --git a/apps/erp/app/routes/x+/sales-order+/_layout.tsx b/apps/erp/app/routes/x+/sales-order+/_layout.tsxindex 9e79966a93..167e501491 100644--- a/apps/erp/app/routes/x+/sales-order+/_layout.tsx+++ b/apps/erp/app/routes/x+/sales-order+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Sales Order" }];};diff --git a/apps/erp/app/routes/x+/sales-order+/new.tsx b/apps/erp/app/routes/x+/sales-order+/new.tsxindex de88f7d0d8..c2ad013548 100644--- a/apps/erp/app/routes/x+/sales-order+/new.tsx+++ b/apps/erp/app/routes/x+/sales-order+/new.tsx@@ -6,9 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { useUrlParams, useUser } from "~/hooks";import { insertSalesOrder, salesOrderValidator } from "~/modules/sales";import { SalesOrderForm } from "~/modules/sales/ui/SalesOrder";diff --git a/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.delete.tsx b/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.delete.tsxindex 74500b06a5..e684d84f5e 100644--- a/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.delete.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.delete.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {deleteSalesReturnOrderLine,getSalesReturnOrder,diff --git a/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.details.tsx b/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.details.tsxindex 5b687547f9..3510f89777 100644--- a/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.details.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.details.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { useRouteData } from "~/hooks";import {getReturnReasonsList,diff --git a/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.disposition.tsx b/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.disposition.tsxindex 3aca5829cc..dbc3967c22 100644--- a/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.disposition.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.disposition.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {salesReturnOrderDispositionValidator,setSalesReturnOrderLineDispositiondiff --git a/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.issue.tsx b/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.issue.tsxindex da5f4f639b..ec5abe48ff 100644--- a/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.issue.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.issue.tsx@@ -8,9 +8,8 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { lockIssueDispositions } from "@carbon/database/quality";import { serverFns } from "@carbon/server-functions";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteIssue, getIssueTypesList, insertIssue } from "~/modules/quality";import {getSalesReturnOrder,diff --git a/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.receiving.tsx b/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.receiving.tsxindex 0275a01538..8165183ada 100644--- a/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.receiving.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/$id.$lineId.receiving.tsx@@ -5,8 +5,9 @@import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {getSalesReturnOrder,getSalesReturnOrderLine,diff --git a/apps/erp/app/routes/x+/sales-return-order+/$id._index.tsx b/apps/erp/app/routes/x+/sales-return-order+/$id._index.tsxindex 4f049d15c2..ca5fa117ff 100644--- a/apps/erp/app/routes/x+/sales-return-order+/$id._index.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/$id._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/sales-return-order+/$id.credit.tsx b/apps/erp/app/routes/x+/sales-return-order+/$id.credit.tsxindex 4a70b00fe8..afb7706024 100644--- a/apps/erp/app/routes/x+/sales-return-order+/$id.credit.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/$id.credit.tsx@@ -6,9 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {createSalesReturnOrderCredit,getCreditableQuantities,diff --git a/apps/erp/app/routes/x+/sales-return-order+/$id.delete.tsx b/apps/erp/app/routes/x+/sales-return-order+/$id.delete.tsxindex 5aa995493d..09eee94bee 100644--- a/apps/erp/app/routes/x+/sales-return-order+/$id.delete.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/$id.delete.tsx@@ -5,8 +5,9 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {deleteSalesReturnOrder,getSalesReturnOrder,diff --git a/apps/erp/app/routes/x+/sales-return-order+/$id.new.tsx b/apps/erp/app/routes/x+/sales-return-order+/$id.new.tsxindex 2a095857b2..035e58d49d 100644--- a/apps/erp/app/routes/x+/sales-return-order+/$id.new.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/$id.new.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getSalesReturnOrder,isSalesReturnOrderLocked,diff --git a/apps/erp/app/routes/x+/sales-return-order+/$id.replacement.tsx b/apps/erp/app/routes/x+/sales-return-order+/$id.replacement.tsxindex 89e40344a6..a60f69291f 100644--- a/apps/erp/app/routes/x+/sales-return-order+/$id.replacement.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/$id.replacement.tsx@@ -5,8 +5,9 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { createReplacementSalesOrder } from "~/modules/sales";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales-return-order+/$id.status.tsx b/apps/erp/app/routes/x+/sales-return-order+/$id.status.tsxindex 45f2760b12..23fc4ac29c 100644--- a/apps/erp/app/routes/x+/sales-return-order+/$id.status.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/$id.status.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {cancelSalesReturnOrder,reopenSalesReturnOrderdiff --git a/apps/erp/app/routes/x+/sales-return-order+/$id.tsx b/apps/erp/app/routes/x+/sales-return-order+/$id.tsxindex 9730804cb9..34f6529cae 100644--- a/apps/erp/app/routes/x+/sales-return-order+/$id.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/$id.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams } from "react-router";+import { Outlet, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import { getSalesReturnOrder, getSalesReturnOrderLines } from "~/modules/sales";import {diff --git a/apps/erp/app/routes/x+/sales-return-order+/_layout.tsx b/apps/erp/app/routes/x+/sales-return-order+/_layout.tsxindex 3e7147e672..d1cfad0da4 100644--- a/apps/erp/app/routes/x+/sales-return-order+/_layout.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Sales Return Order" }];};diff --git a/apps/erp/app/routes/x+/sales-return-order+/new.tsx b/apps/erp/app/routes/x+/sales-return-order+/new.tsxindex c25039679e..77338af3a1 100644--- a/apps/erp/app/routes/x+/sales-return-order+/new.tsx+++ b/apps/erp/app/routes/x+/sales-return-order+/new.tsx@@ -6,9 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { useCompanyToday, useUrlParams, useUser } from "~/hooks";import {insertSalesReturnOrder,diff --git a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.$lineId.delete.tsx b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.$lineId.delete.tsxindex cc1a9906ff..384b0e41b3 100644--- a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.$lineId.delete.tsx+++ b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.$lineId.delete.tsx@@ -5,8 +5,8 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {deleteSalesRFQLine,getSalesRFQ,diff --git a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.$lineId.details.tsx b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.$lineId.details.tsxindex a73a3b0610..2d674e6b53 100644--- a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.$lineId.details.tsx+++ b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.$lineId.details.tsx@@ -9,10 +9,11 @@ import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import { Fragment } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData, useParams } from "react-router";+import { Outlet, useLoaderData, useParams } from "react-router";import { CadModel, DeferredFiles } from "~/components";import { usePermissions, useRouteData } from "~/hooks";import type { SalesRFQ } from "~/modules/sales";diff --git a/apps/erp/app/routes/x+/sales-rfq+/$rfqId._index.tsx b/apps/erp/app/routes/x+/sales-rfq+/$rfqId._index.tsxindex 36e397bc3c..d01a78f441 100644--- a/apps/erp/app/routes/x+/sales-rfq+/$rfqId._index.tsx+++ b/apps/erp/app/routes/x+/sales-rfq+/$rfqId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.convert.tsx b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.convert.tsxindex e2a16a2dee..b82c680cec 100644--- a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.convert.tsx+++ b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.convert.tsx@@ -12,8 +12,8 @@ import {isBlocked} from "@carbon/ee/rules.server";import type { Violation } from "@carbon/utils";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {calculatePricesForQuantities,convertSalesRfqToQuote,diff --git a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.delete.tsx b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.delete.tsxindex 90ff7f3a9b..c3233e815b 100644--- a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.delete.tsx+++ b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.delete.tsx@@ -5,8 +5,9 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteSalesRFQ } from "~/modules/sales";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.details.tsx b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.details.tsxindex 1911dcde6a..52f197743d 100644--- a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.details.tsx+++ b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.details.tsx@@ -8,10 +8,11 @@ import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { FileObject } from "@supabase/storage-js";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { DeferredFiles } from "~/components";import { useRouteData } from "~/hooks";import type { Opportunity, SalesRFQ, SalesRFQLine } from "~/modules/sales";diff --git a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.drag.tsx b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.drag.tsxindex d7b6297280..0addfc5a7c 100644--- a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.drag.tsx+++ b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.drag.tsx@@ -7,9 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { storage, TEMP_STAGING_BUCKET } from "@carbon/files";import { trigger } from "@carbon/jobs";+import { redirect } from "@carbon/utils";import { nanoid } from "nanoid";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { salesRfqDragValidator, upsertSalesRFQLine } from "~/modules/sales";import { setCustomFields } from "~/utils/form";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.new.tsx b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.new.tsxindex 1706c83163..69dbc1e26e 100644--- a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.new.tsx+++ b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.new.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getSalesRFQ,isSalesRfqLocked,diff --git a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.status.tsx b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.status.tsxindex 452dc932e5..de4f64de05 100644--- a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.status.tsx+++ b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.status.tsx@@ -8,8 +8,8 @@ import { flash } from "@carbon/auth/session.server";import { trigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";import { NotificationEvent } from "@carbon/notifications";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { salesRFQStatusType, updateSalesRFQStatus } from "~/modules/sales";import { getCompanySettings } from "~/modules/settings/settings.service";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.tsx b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.tsxindex 166328915d..9468961bc7 100644--- a/apps/erp/app/routes/x+/sales-rfq+/$rfqId.tsx+++ b/apps/erp/app/routes/x+/sales-rfq+/$rfqId.tsx@@ -10,7 +10,7 @@ import { supportedModelTypes } from "@carbon/files/cad";import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type { DragEndEvent } from "@dnd-kit/core";import { DndContext } from "@dnd-kit/core";import { msg } from "@lingui/core/macro";@@ -19,7 +19,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams, useSubmit } from "react-router";+import { Outlet, useParams, useSubmit } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import type { SalesRFQLine } from "~/modules/sales";import {diff --git a/apps/erp/app/routes/x+/sales-rfq+/_layout.tsx b/apps/erp/app/routes/x+/sales-rfq+/_layout.tsxindex 50503264f7..a981e8451a 100644--- a/apps/erp/app/routes/x+/sales-rfq+/_layout.tsx+++ b/apps/erp/app/routes/x+/sales-rfq+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Sales RFQ" }];};diff --git a/apps/erp/app/routes/x+/sales-rfq+/new.tsx b/apps/erp/app/routes/x+/sales-rfq+/new.tsxindex dd66ab5bad..87e4dc86c8 100644--- a/apps/erp/app/routes/x+/sales-rfq+/new.tsx+++ b/apps/erp/app/routes/x+/sales-rfq+/new.tsx@@ -8,9 +8,9 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { storage } from "@carbon/files";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { useCompanyToday, useUrlParams, useUser } from "~/hooks";import { upsertDocument } from "~/modules/documents";import { resolveItemIdFromExtractedText } from "~/modules/items";diff --git a/apps/erp/app/routes/x+/scheduling+/_layout.tsx b/apps/erp/app/routes/x+/scheduling+/_layout.tsxindex 7f067ca8c5..fa0d734431 100644--- a/apps/erp/app/routes/x+/scheduling+/_layout.tsx+++ b/apps/erp/app/routes/x+/scheduling+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Schedule" }];};diff --git a/apps/erp/app/routes/x+/scheduling+/outbound.tsx b/apps/erp/app/routes/x+/scheduling+/outbound.tsxindex 1d5a974ef1..4cc8000e99 100644--- a/apps/erp/app/routes/x+/scheduling+/outbound.tsx+++ b/apps/erp/app/routes/x+/scheduling+/outbound.tsx@@ -7,10 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { VStack } from "@carbon/react";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getCompletionJobs } from "~/modules/production";import type { OutboundRow } from "~/modules/production/ui/Schedule/OutboundTable";import {diff --git a/apps/erp/app/routes/x+/service+/$itemId._index.tsx b/apps/erp/app/routes/x+/service+/$itemId._index.tsxindex f4220e4eec..cb28393a02 100644--- a/apps/erp/app/routes/x+/service+/$itemId._index.tsx+++ b/apps/erp/app/routes/x+/service+/$itemId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/service+/$itemId.costing.tsx b/apps/erp/app/routes/x+/service+/$itemId.costing.tsxindex 78660b5a32..413ee1e208 100644--- a/apps/erp/app/routes/x+/service+/$itemId.costing.tsx+++ b/apps/erp/app/routes/x+/service+/$itemId.costing.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getItemCost,getItemCostHistory,diff --git a/apps/erp/app/routes/x+/service+/$itemId.details.tsx b/apps/erp/app/routes/x+/service+/$itemId.details.tsxindex de2363d6f8..16d78dbddd 100644--- a/apps/erp/app/routes/x+/service+/$itemId.details.tsx+++ b/apps/erp/app/routes/x+/service+/$itemId.details.tsx@@ -8,10 +8,11 @@ import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";import { Menubar, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { PostgrestResponse } from "@supabase/supabase-js";import { Suspense } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import { DeferredFiles } from "~/components";import { usePermissions, useRouteData } from "~/hooks";import type { ItemFile, MakeMethod, ServiceSummary } from "~/modules/items";@@ -183,18 +184,17 @@ export default function ServiceDetailsRoute() {<BillOfProcesskey={`bop:${itemId}`}makeMethod={methodData.makeMethod}- // @ts-ignore+ // @ts-expect-erroroperations={methodData.methodOperations ?? []}- // @ts-ignorematerials={methodData.methodMaterials ?? []}tags={tags}/><BillOfMaterialkey={`bom:${itemId}`}makeMethod={methodData.makeMethod}- // @ts-ignore+ // @ts-expect-errormaterials={methodData.methodMaterials ?? []}- // @ts-ignore+ // @ts-expect-erroroperations={methodData.methodOperations}replenishmentSystem={serviceData.serviceSummary?.replenishmentSystemdiff --git a/apps/erp/app/routes/x+/service+/$itemId.make.$makeMethodId.tsx b/apps/erp/app/routes/x+/service+/$itemId.make.$makeMethodId.tsxindex 168500cccf..f3910b2f8b 100644--- a/apps/erp/app/routes/x+/service+/$itemId.make.$makeMethodId.tsx+++ b/apps/erp/app/routes/x+/service+/$itemId.make.$makeMethodId.tsx@@ -7,9 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import type { JSONContent } from "@carbon/react";import { Menubar, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { Suspense } from "react";import type { LoaderFunctionArgs } from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { ServiceSummary } from "~/modules/items";import {diff --git a/apps/erp/app/routes/x+/service+/$itemId.purchasing.$supplierPartId.tsx b/apps/erp/app/routes/x+/service+/$itemId.purchasing.$supplierPartId.tsxindex d5ea1cf511..cf7ac5a470 100644--- a/apps/erp/app/routes/x+/service+/$itemId.purchasing.$supplierPartId.tsx+++ b/apps/erp/app/routes/x+/service+/$itemId.purchasing.$supplierPartId.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validator } from "@carbon/form";import { useRouteData } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import type { ServiceSummary } from "~/modules/items";import { supplierPartValidator, upsertSupplierPart } from "~/modules/items";import { SupplierPartForm } from "~/modules/items/ui/Item";diff --git a/apps/erp/app/routes/x+/service+/$itemId.purchasing.tsx b/apps/erp/app/routes/x+/service+/$itemId.purchasing.tsxindex 9a152cf1e1..995a7768e8 100644--- a/apps/erp/app/routes/x+/service+/$itemId.purchasing.tsx+++ b/apps/erp/app/routes/x+/service+/$itemId.purchasing.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { SupplierPart } from "~/modules/items";import {diff --git a/apps/erp/app/routes/x+/service+/$itemId.quality.tsx b/apps/erp/app/routes/x+/service+/$itemId.quality.tsxindex 2a8ab36c29..f677401328 100644--- a/apps/erp/app/routes/x+/service+/$itemId.quality.tsx+++ b/apps/erp/app/routes/x+/service+/$itemId.quality.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useParams } from "react-router";+import { data, useLoaderData, useParams } from "react-router";import invariant from "tiny-invariant";import {getInspectionDocumentsForItem,diff --git a/apps/erp/app/routes/x+/service+/$itemId.sales.tsx b/apps/erp/app/routes/x+/service+/$itemId.sales.tsxindex f35e8cd254..b216f1688b 100644--- a/apps/erp/app/routes/x+/service+/$itemId.sales.tsx+++ b/apps/erp/app/routes/x+/service+/$itemId.sales.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getItemUnitSalePrice,itemUnitSalePriceValidator,diff --git a/apps/erp/app/routes/x+/service+/$itemId.tsx b/apps/erp/app/routes/x+/service+/$itemId.tsxindex d09e33bfb7..0e501e0a11 100644--- a/apps/erp/app/routes/x+/service+/$itemId.tsx+++ b/apps/erp/app/routes/x+/service+/$itemId.tsx@@ -17,7 +17,7 @@ import {TabsTrigger,useRouteData} from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { Suspense, useState } from "react";@@ -26,13 +26,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- Await,- Outlet,- redirect,- useLoaderData,- useParams-} from "react-router";+import { Await, Outlet, useLoaderData, useParams } from "react-router";import { ResizablePanels } from "~/components/Layout";import { flattenTree } from "~/components/TreeView";import type { ItemFile, ServiceSummary } from "~/modules/items";@@ -295,7 +289,6 @@ export default function ServiceRoute() {<BoMExploreritemType="Service"makeMethod={resolved.makeMethod}- // @ts-ignoremethods={resolved.methods}methodId={resolved.makeMethod.id}filterText={filterText}diff --git a/apps/erp/app/routes/x+/service+/_layout.tsx b/apps/erp/app/routes/x+/service+/_layout.tsxindex b833d2d257..f0f33d51ef 100644--- a/apps/erp/app/routes/x+/service+/_layout.tsx+++ b/apps/erp/app/routes/x+/service+/_layout.tsx@@ -15,6 +15,8 @@ import { getUnitOfMeasuresList } from "~/modules/items";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Services" }];};diff --git a/apps/erp/app/routes/x+/service+/new.tsx b/apps/erp/app/routes/x+/service+/new.tsxindex bae1285519..82d46f73b8 100644--- a/apps/erp/app/routes/x+/service+/new.tsx+++ b/apps/erp/app/routes/x+/service+/new.tsx@@ -6,9 +6,10 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { serviceValidator, upsertService } from "~/modules/items";import { ServiceForm } from "~/modules/items/ui/Services";import { setCustomFields } from "~/utils/form";diff --git a/apps/erp/app/routes/x+/settings+/_index.tsx b/apps/erp/app/routes/x+/settings+/_index.tsxindex 8e5ffe27ca..e99fe63ae8 100644--- a/apps/erp/app/routes/x+/settings+/_index.tsx+++ b/apps/erp/app/routes/x+/settings+/_index.tsx@@ -2,8 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";-import { redirect } from "react-router";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import { path } from "~/utils/path";export async function loader() {diff --git a/apps/erp/app/routes/x+/settings+/_layout.tsx b/apps/erp/app/routes/x+/settings+/_layout.tsxindex 77c74359b4..eb473a7947 100644--- a/apps/erp/app/routes/x+/settings+/_layout.tsx+++ b/apps/erp/app/routes/x+/settings+/_layout.tsx@@ -11,6 +11,8 @@ import { useSettingsSubmodules } from "~/modules/settings";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Settings" }];};diff --git a/apps/erp/app/routes/x+/settings+/accounting.tsx b/apps/erp/app/routes/x+/settings+/accounting.tsxindex 34f834cd19..f2a42b3832 100644--- a/apps/erp/app/routes/x+/settings+/accounting.tsx+++ b/apps/erp/app/routes/x+/settings+/accounting.tsx@@ -21,11 +21,12 @@ import {toast,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans } from "@lingui/react/macro";import { useCallback, useEffect } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData } from "react-router";+import { useFetcher, useLoaderData } from "react-router";import { z } from "zod";import { zfd } from "zod-form-data";import {diff --git a/apps/erp/app/routes/x+/settings+/api-keys.$id.tsx b/apps/erp/app/routes/x+/settings+/api-keys.$id.tsxindex 9fbc4473f8..c7711a54ab 100644--- a/apps/erp/app/routes/x+/settings+/api-keys.$id.tsx+++ b/apps/erp/app/routes/x+/settings+/api-keys.$id.tsx@@ -8,8 +8,10 @@ import { flash } from "@carbon/auth/session.server";import { upsertApiKey } from "@carbon/ee/api-keys.server";import { requireFeature } from "@carbon/ee/plan.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useNavigate, useParams } from "react-router";+import { data, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { ApiKey } from "~/modules/settings";import { ApiKeyForm, apiKeyValidator } from "~/modules/settings";@@ -72,7 +74,7 @@ export async function action({ request, params }: ActionFunctionArgs) {}export default function EditApiKeyRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const params = useParams();const routeData = useRouteData<{ apiKeys: ApiKey[]; companyId: string }>(path.to.apiKeys@@ -93,7 +95,7 @@ export default function EditApiKeyRoute() {initialValues={initialValues}companyId={routeData?.companyId}existingScopes={(apiKey as any)?.scopes ?? null}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/settings+/api-keys.delete.$id.tsx b/apps/erp/app/routes/x+/settings+/api-keys.delete.$id.tsxindex 3fe0d492c4..e776198f8f 100644--- a/apps/erp/app/routes/x+/settings+/api-keys.delete.$id.tsx+++ b/apps/erp/app/routes/x+/settings+/api-keys.delete.$id.tsx@@ -7,9 +7,11 @@ import { bustApiKeyCache, requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { deleteApiKey } from "@carbon/ee/api-keys.server";import { requireFeature } from "@carbon/ee/plan.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect, useNavigate, useParams } from "react-router";+import { useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { useRouteData } from "~/hooks";import type { ApiKey } from "~/modules/settings";@@ -62,13 +64,13 @@ export default function DeleteApiKeyRoute() {const { id } = useParams();if (!id) throw new Error("Could not find id");const routeData = useRouteData<{ apiKeys: ApiKey[] }>(path.to.apiKeys);- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();const apiKey = routeData?.apiKeys.find((apiKey) => apiKey.id === id);if (!apiKey) return null;- const onCancel = () => navigate(-1);+ const onCancel = () => closeRoute();return (<ConfirmDeletediff --git a/apps/erp/app/routes/x+/settings+/api-keys.new.tsx b/apps/erp/app/routes/x+/settings+/api-keys.new.tsxindex 9f3a52b344..b0921d7d01 100644--- a/apps/erp/app/routes/x+/settings+/api-keys.new.tsx+++ b/apps/erp/app/routes/x+/settings+/api-keys.new.tsx@@ -8,9 +8,10 @@ import { flash } from "@carbon/auth/session.server";import { upsertApiKey } from "@carbon/ee/api-keys.server";import { requireFeature } from "@carbon/ee/plan.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";import { nanoid } from "nanoid";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, useNavigate } from "react-router";+import { data } from "react-router";import { useRouteData } from "~/hooks";import { ApiKeyForm, apiKeyValidator } from "~/modules/settings";import { path } from "~/utils/path";@@ -87,7 +88,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewApiKeyRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const routeData = useRouteData<{ companyId: string }>(path.to.apiKeys);const initialValues = {@@ -96,7 +97,7 @@ export default function NewApiKeyRoute() {return (<ApiKeyForm- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}initialValues={initialValues}companyId={routeData?.companyId}/>diff --git a/apps/erp/app/routes/x+/settings+/api-keys.tsx b/apps/erp/app/routes/x+/settings+/api-keys.tsxindex e03e7496dc..668ab50087 100644--- a/apps/erp/app/routes/x+/settings+/api-keys.tsx+++ b/apps/erp/app/routes/x+/settings+/api-keys.tsx@@ -5,13 +5,13 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { usePlanGate } from "~/hooks/usePlanGate";import {ApiKeysTable,diff --git a/apps/erp/app/routes/x+/settings+/approval-rules.$id.delete.tsx b/apps/erp/app/routes/x+/settings+/approval-rules.$id.delete.tsxindex aac38cf4cc..8e21639beb 100644--- a/apps/erp/app/routes/x+/settings+/approval-rules.$id.delete.tsx+++ b/apps/erp/app/routes/x+/settings+/approval-rules.$id.delete.tsx@@ -7,8 +7,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { deleteApprovalRule } from "@carbon/ee/approvals.server";import { requireFeature } from "@carbon/ee/plan.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getParams, path } from "~/utils/path";export async function action({ request, params }: ActionFunctionArgs) {diff --git a/apps/erp/app/routes/x+/settings+/approval-rules.$id.tsx b/apps/erp/app/routes/x+/settings+/approval-rules.$id.tsxindex 199c00c1ff..082fccc6d8 100644--- a/apps/erp/app/routes/x+/settings+/approval-rules.$id.tsx+++ b/apps/erp/app/routes/x+/settings+/approval-rules.$id.tsx@@ -14,13 +14,13 @@ import {} from "@carbon/ee/approvals.server";import { requireFeature } from "@carbon/ee/plan.server";import { validationError, validator } from "@carbon/form";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData, useNavigate } from "react-router";import { useUrlParams } from "~/hooks";import { ApprovalRuleForm } from "~/modules/settings";diff --git a/apps/erp/app/routes/x+/settings+/approval-rules.new.tsx b/apps/erp/app/routes/x+/settings+/approval-rules.new.tsxindex f77f288be5..3301a7e21d 100644--- a/apps/erp/app/routes/x+/settings+/approval-rules.new.tsx+++ b/apps/erp/app/routes/x+/settings+/approval-rules.new.tsx@@ -13,8 +13,9 @@ import {import { upsertApprovalRule } from "@carbon/ee/approvals.server";import { requireFeature } from "@carbon/ee/plan.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate } from "react-router";+import { useLoaderData, useNavigate } from "react-router";import { ApprovalRuleForm } from "~/modules/settings";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/settings+/approval-rules.tsx b/apps/erp/app/routes/x+/settings+/approval-rules.tsxindex 1f4e525616..57e8266b70 100644--- a/apps/erp/app/routes/x+/settings+/approval-rules.tsx+++ b/apps/erp/app/routes/x+/settings+/approval-rules.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { getApprovalRules } from "@carbon/ee/approvals.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { usePlanGate } from "~/hooks/usePlanGate";import { ApprovalRules, ApprovalRulesUpgradeOverlay } from "~/modules/settings";import type { Handle } from "~/utils/handle";diff --git a/apps/erp/app/routes/x+/settings+/audit-logs.tsx b/apps/erp/app/routes/x+/settings+/audit-logs.tsxindex b3870b0f65..465840708c 100644--- a/apps/erp/app/routes/x+/settings+/audit-logs.tsx+++ b/apps/erp/app/routes/x+/settings+/audit-logs.tsx@@ -17,7 +17,11 @@ import {import { requireFeature } from "@carbon/ee/plan.server";import { getLogger } from "@carbon/logger";import { Button, Heading, ScrollArea, VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import {+ isUnaffectedByNavigation,+ redirect,+ redirectExternal+} from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans } from "@lingui/react/macro";import { LuHistory } from "react-icons/lu";@@ -26,7 +30,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Link, Outlet, redirect, useLoaderData } from "react-router";+import { Link, Outlet, useLoaderData } from "react-router";import { usePlanGate } from "~/hooks/usePlanGate";import { AuditLogSettings, AuditLogUpgradeOverlay } from "~/modules/settings";import type { Handle } from "~/utils/handle";@@ -177,7 +181,7 @@ export async function action({ request }: ActionFunctionArgs) {companyId);// Redirect to the signed URL for download- return redirect(downloadUrl);+ return redirectExternal(downloadUrl);} catch (err) {logger.error("Failed to generate audit archive download URL", {companyId,diff --git a/apps/erp/app/routes/x+/settings+/backups.tsx b/apps/erp/app/routes/x+/settings+/backups.tsxindex 53ffddfdcd..30b104a090 100644--- a/apps/erp/app/routes/x+/settings+/backups.tsx+++ b/apps/erp/app/routes/x+/settings+/backups.tsx@@ -34,7 +34,7 @@ import {useDisclosure,VStack} from "@carbon/react";-import { getErrorMessage } from "@carbon/utils";+import { getErrorMessage, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Plural, Trans, useLingui } from "@lingui/react/macro";import { useCallback, useEffect, useRef, useState } from "react";@@ -42,7 +42,6 @@ import { LuLoaderCircle } from "react-icons/lu";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";import {data,- redirect,useFetcher,useFetchers,useLoaderData,diff --git a/apps/erp/app/routes/x+/settings+/billing.tsx b/apps/erp/app/routes/x+/settings+/billing.tsxindex eb77ac2b85..bbbd4011f6 100644--- a/apps/erp/app/routes/x+/settings+/billing.tsx+++ b/apps/erp/app/routes/x+/settings+/billing.tsx@@ -28,18 +28,12 @@ import {VStack} from "@carbon/react";import { getBillingPortalRedirectUrl } from "@carbon/stripe/stripe.server";-import { Edition } from "@carbon/utils";+import { Edition, redirectExternal } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useState } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import {- data,- Form,- redirect,- useLoaderData,- useNavigation-} from "react-router";+import { data, Form, useLoaderData, useNavigation } from "react-router";import { z } from "zod";import { usePermissions, useUser } from "~/hooks";import type { Handle } from "~/utils/handle";@@ -137,7 +131,7 @@ export async function action({ request }: ActionFunctionArgs) {companyId,priceIds});- return redirect(billingPortalUrl, 301);+ return redirectExternal(billingPortalUrl, 301);} catch (err) {logger.error("Failed to get billing portal URL", { error: err });return data(diff --git a/apps/erp/app/routes/x+/settings+/companies.$id.tsx b/apps/erp/app/routes/x+/settings+/companies.$id.tsxindex 9af7180095..375933f1ce 100644--- a/apps/erp/app/routes/x+/settings+/companies.$id.tsx+++ b/apps/erp/app/routes/x+/settings+/companies.$id.tsx@@ -6,9 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { isInternalEmail } from "@carbon/utils";+import { isInternalEmail, redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {CompanyForm,getSubsidiary,diff --git a/apps/erp/app/routes/x+/settings+/companies.delete.$id.tsx b/apps/erp/app/routes/x+/settings+/companies.delete.$id.tsxindex ba6f9f3bf0..57936d5382 100644--- a/apps/erp/app/routes/x+/settings+/companies.delete.$id.tsx+++ b/apps/erp/app/routes/x+/settings+/companies.delete.$id.tsx@@ -7,9 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";-import { isInternalEmail } from "@carbon/utils";+import { isInternalEmail, redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteSubsidiary, getSubsidiary } from "~/modules/settings";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/settings+/companies.new.tsx b/apps/erp/app/routes/x+/settings+/companies.new.tsxindex 43e071d0e0..8d08b8f233 100644--- a/apps/erp/app/routes/x+/settings+/companies.new.tsx+++ b/apps/erp/app/routes/x+/settings+/companies.new.tsx@@ -21,10 +21,10 @@ import {ModalHeader,ModalTitle} from "@carbon/react";-import { isInternalEmail } from "@carbon/utils";+import { isInternalEmail, redirect } from "@carbon/utils";import { getLocalTimeZone } from "@internationalized/date";import type { ActionFunctionArgs } from "react-router";-import { redirect, useNavigate } from "react-router";+import { useNavigate } from "react-router";import { useUser } from "~/hooks";import { insertEmployeeJob } from "~/modules/people";import { upsertLocation } from "~/modules/resources";diff --git a/apps/erp/app/routes/x+/settings+/companies.tsx b/apps/erp/app/routes/x+/settings+/companies.tsxindex 108ee423cc..1102a6553a 100644--- a/apps/erp/app/routes/x+/settings+/companies.tsx+++ b/apps/erp/app/routes/x+/settings+/companies.tsx@@ -14,7 +14,11 @@ import {TabsList,TabsTrigger} from "@carbon/react";-import { isInternalEmail, isUnaffectedByNavigation } from "@carbon/utils";+import {+ isInternalEmail,+ isUnaffectedByNavigation,+ redirect+} from "@carbon/utils";import { msg } from "@lingui/core/macro";import { useLingui } from "@lingui/react/macro";import { useCallback } from "react";@@ -22,7 +26,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData, useNavigate } from "react-router";+import { Outlet, useLoaderData, useNavigate } from "react-router";import { New } from "~/components";import { getSubsidiaries } from "~/modules/settings";import {@@ -105,7 +109,7 @@ export default function SubsidiariesRoute() {<TabsContent value="tree"><CompaniesTreeView- // @ts-ignore+ // @ts-expect-errorcompanies={companies}onDelete={handleDelete}onAddChild={handleAddChild}@@ -114,7 +118,7 @@ export default function SubsidiariesRoute() {<TabsContent value="list"><CompaniesListView- // @ts-ignore+ // @ts-expect-errorcompanies={companies}onDelete={handleDelete}onAddChild={handleAddChild}diff --git a/apps/erp/app/routes/x+/settings+/company.new.tsx b/apps/erp/app/routes/x+/settings+/company.new.tsxindex 43bb101e61..a17b2e4016 100644--- a/apps/erp/app/routes/x+/settings+/company.new.tsx+++ b/apps/erp/app/routes/x+/settings+/company.new.tsx@@ -11,8 +11,8 @@ import { enableAuditLog } from "@carbon/ee/audit.server";import { validationError, validator } from "@carbon/form";import { redis } from "@carbon/kv";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { insertEmployeeJob } from "~/modules/people";import { upsertLocation } from "~/modules/resources";import {diff --git a/apps/erp/app/routes/x+/settings+/company.switch.$companyId.tsx b/apps/erp/app/routes/x+/settings+/company.switch.$companyId.tsxindex cb449b0965..f1c309b72f 100644--- a/apps/erp/app/routes/x+/settings+/company.switch.$companyId.tsx+++ b/apps/erp/app/routes/x+/settings+/company.switch.$companyId.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { error, safeRedirect } from "@carbon/auth";+import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { setCompanyId } from "@carbon/auth/company.server";import {@@ -10,8 +10,8 @@ import {flash,updateCompanySession} from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getCompanies } from "~/modules/settings";import { path, requestReferrer } from "~/utils/path";@@ -60,16 +60,10 @@ export async function action({ request, params }: ActionFunctionArgs) {);const companyIdCookie = setCompanyId(companyId!);- throw redirect(- safeRedirect(- typeof redirectTo === "string" ? redirectTo : null,- path.to.authenticatedRoot- ),- {- headers: [- ["Set-Cookie", sessionCookie],- ["Set-Cookie", companyIdCookie]- ]- }- );+ throw redirect(redirectTo || path.to.authenticatedRoot, {+ headers: [+ ["Set-Cookie", sessionCookie],+ ["Set-Cookie", companyIdCookie]+ ]+ });}diff --git a/apps/erp/app/routes/x+/settings+/company.tsx b/apps/erp/app/routes/x+/settings+/company.tsxindex 5223369cec..f697dbdef0 100644--- a/apps/erp/app/routes/x+/settings+/company.tsx+++ b/apps/erp/app/routes/x+/settings+/company.tsx@@ -185,7 +185,7 @@ export default function Company() {</div></CardHeader><CardContent>- {/* @ts-ignore */}+ {/* @ts-expect-error */}<CompanyForm company={initialValues} /></CardContent></Card>diff --git a/apps/erp/app/routes/x+/settings+/custom-fields.$table.$id.tsx b/apps/erp/app/routes/x+/settings+/custom-fields.$table.$id.tsxindex 3ce59b647f..5f12ae4f64 100644--- a/apps/erp/app/routes/x+/settings+/custom-fields.$table.$id.tsx+++ b/apps/erp/app/routes/x+/settings+/custom-fields.$table.$id.tsx@@ -6,14 +6,10 @@ import { assertIsPost, error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import {- data,- redirect,- useLoaderData,- useNavigate,- useParams-} from "react-router";+import { data, useLoaderData, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { AttributeDataType } from "~/modules/people";import {@@ -89,8 +85,8 @@ export default function UpdateCustomFieldRoute() {const { table } = useParams();if (!table) throw new Error("table is not found");- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const routeData = useRouteData<{dataTypes: AttributeDataType[];}>(path.to.customFields);diff --git a/apps/erp/app/routes/x+/settings+/custom-fields.$table.delete.$id.tsx b/apps/erp/app/routes/x+/settings+/custom-fields.$table.delete.$id.tsxindex a924a74bec..7f234b45a5 100644--- a/apps/erp/app/routes/x+/settings+/custom-fields.$table.delete.$id.tsx+++ b/apps/erp/app/routes/x+/settings+/custom-fields.$table.delete.$id.tsx@@ -5,8 +5,8 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteCustomField } from "~/modules/settings/settings.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/settings+/custom-fields.$table.new.tsx b/apps/erp/app/routes/x+/settings+/custom-fields.$table.new.tsxindex a7d0b6835f..5994fb28ab 100644--- a/apps/erp/app/routes/x+/settings+/custom-fields.$table.new.tsx+++ b/apps/erp/app/routes/x+/settings+/custom-fields.$table.new.tsx@@ -6,8 +6,10 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useNavigate, useParams } from "react-router";+import { data, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { AttributeDataType } from "~/modules/people";import { CustomFieldForm, customFieldValidator } from "~/modules/settings";@@ -54,8 +56,8 @@ export default function NewCustomFieldRoute() {const { table } = useParams();if (!table) throw new Error("table is not found");- const navigate = useNavigate();- const onClose = () => navigate(-1);+ const closeRoute = useCloseRoute();+ const onClose = () => closeRoute();const routeData = useRouteData<{dataTypes: AttributeDataType[];}>(path.to.customFields);@@ -64,7 +66,7 @@ export default function NewCustomFieldRoute() {<CustomFieldForminitialValues={{name: "",- // @ts-ignore+ // @ts-expect-errordataTypeId: DataType.Text.toString(),table: table,tags: []diff --git a/apps/erp/app/routes/x+/settings+/custom-fields.$table.tsx b/apps/erp/app/routes/x+/settings+/custom-fields.$table.tsxindex 132e01745d..b0540baed0 100644--- a/apps/erp/app/routes/x+/settings+/custom-fields.$table.tsx+++ b/apps/erp/app/routes/x+/settings+/custom-fields.$table.tsx@@ -5,19 +5,13 @@import { assertIsPost, error, notFound } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- data,- Outlet,- redirect,- useLoaderData,- useNavigate-} from "react-router";+import { data, Outlet, useLoaderData, useNavigate } from "react-router";import { useRouteData, useUrlParams } from "~/hooks";import type { AttributeDataType } from "~/modules/people";import { CustomFieldsTableDetail, getCustomFields } from "~/modules/settings";diff --git a/apps/erp/app/routes/x+/settings+/custom-fields.tsx b/apps/erp/app/routes/x+/settings+/custom-fields.tsxindex 5c272f8d2f..87f156350b 100644--- a/apps/erp/app/routes/x+/settings+/custom-fields.tsx+++ b/apps/erp/app/routes/x+/settings+/custom-fields.tsx@@ -6,14 +6,14 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation, unchecked } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect, unchecked } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getAttributeDataTypes } from "~/modules/people";import { CustomFieldsTable, getCustomFieldsTables } from "~/modules/settings";import type { Handle } from "~/utils/handle";@@ -80,7 +80,7 @@ export async function action({ request }: ActionFunctionArgs) {}const result = await client- // @ts-ignore+ // @ts-expect-error.from(table).update(unchecked({diff --git a/apps/erp/app/routes/x+/settings+/integrations.$id.tsx b/apps/erp/app/routes/x+/settings+/integrations.$id.tsxindex 313bc24706..187519c195 100644--- a/apps/erp/app/routes/x+/settings+/integrations.$id.tsx+++ b/apps/erp/app/routes/x+/settings+/integrations.$id.tsx@@ -87,12 +87,12 @@ import {getConnectAccountStatus,isConnectAccountStillLinked} from "@carbon/stripe/connect.server";+import { redirect, redirectExternal } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import type { SupabaseClient } from "@supabase/supabase-js";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";import {data,- redirect,useLoaderData,useNavigate,useParams,@@ -2082,7 +2082,9 @@ export async function action({ request, params }: ActionFunctionArgs) {}// Off to the tenant's consent screen; its callback finishes the install// (and registers the release webhook if asset sync is on).- throw redirect(started.url, { headers: { "Set-Cookie": started.cookie } });+ throw redirectExternal(started.url, {+ headers: { "Set-Cookie": started.cookie }+ });}if (isOnshapeIntegrationId(integrationId)) {diff --git a/apps/erp/app/routes/x+/settings+/integrations.deactivate.$id.tsx b/apps/erp/app/routes/x+/settings+/integrations.deactivate.$id.tsxindex ff40495f7d..35c2cc9b7f 100644--- a/apps/erp/app/routes/x+/settings+/integrations.deactivate.$id.tsx+++ b/apps/erp/app/routes/x+/settings+/integrations.deactivate.$id.tsx@@ -9,8 +9,8 @@ import { integrations as availableIntegrations } from "@carbon/ee";import { getIntegrationServerHooks } from "@carbon/ee/hooks.server";import { isIntegrationWhitelisted } from "@carbon/ee/plan";import { requireFeature } from "@carbon/ee/plan.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {deactivateIntegration,invalidateIntegrationHealthCachediff --git a/apps/erp/app/routes/x+/settings+/integrations.tsx b/apps/erp/app/routes/x+/settings+/integrations.tsxindex d91ab91b6b..19434ee365 100644--- a/apps/erp/app/routes/x+/settings+/integrations.tsx+++ b/apps/erp/app/routes/x+/settings+/integrations.tsx@@ -11,20 +11,14 @@ import {quickInstallConnectors} from "@carbon/ee";import { toast } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import { useEffect } from "react";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- data,- Outlet,- redirect,- useLoaderData,- useSearchParams-} from "react-router";+import { data, Outlet, useLoaderData, useSearchParams } from "react-router";import { IntegrationsList } from "~/modules/settings";import { getIntegrationError } from "~/modules/settings/integration-errors";import { getIntegrationsWithHealth } from "~/modules/settings/settings.server";diff --git a/apps/erp/app/routes/x+/settings+/inventory.tsx b/apps/erp/app/routes/x+/settings+/inventory.tsxindex d8bd50c4b5..096dea3a0c 100644--- a/apps/erp/app/routes/x+/settings+/inventory.tsx+++ b/apps/erp/app/routes/x+/settings+/inventory.tsx@@ -27,6 +27,7 @@ import {toast,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useEffect } from "react";@@ -40,7 +41,7 @@ import {LuUndo2} from "react-icons/lu";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData } from "react-router";+import { useFetcher, useLoaderData } from "react-router";import SettingsSectionHeader from "~/components/SettingsSectionHeader";import {getCompanySettings,@@ -54,7 +55,6 @@ import {updateReturnPickedMaterialTimingSetting,updateShelfLifeSettings} from "~/modules/settings";-import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/settings+/itar-certifications.tsx b/apps/erp/app/routes/x+/settings+/itar-certifications.tsxindex 87cb39da88..d8193fbd16 100644--- a/apps/erp/app/routes/x+/settings+/itar-certifications.tsx+++ b/apps/erp/app/routes/x+/settings+/itar-certifications.tsx@@ -7,9 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {ItarCertificationsTable,ItarEntityCertificationStatusdiff --git a/apps/erp/app/routes/x+/settings+/items.tsx b/apps/erp/app/routes/x+/settings+/items.tsxindex 399336a40a..704b4309ca 100644--- a/apps/erp/app/routes/x+/settings+/items.tsx+++ b/apps/erp/app/routes/x+/settings+/items.tsx@@ -20,11 +20,12 @@ import {toast,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useCallback, useEffect } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData } from "react-router";+import { useFetcher, useLoaderData } from "react-router";import SettingsSectionHeader from "~/components/SettingsSectionHeader";import { plmReleaseControl } from "~/modules/items";import {@@ -36,7 +37,6 @@ import {updateMetricSettings,updatePlmReleaseControlSetting} from "~/modules/settings";-import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/settings+/people.tsx b/apps/erp/app/routes/x+/settings+/people.tsxindex 5c86b43086..42b64978af 100644--- a/apps/erp/app/routes/x+/settings+/people.tsx+++ b/apps/erp/app/routes/x+/settings+/people.tsx@@ -30,11 +30,12 @@ import {toast,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans } from "@lingui/react/macro";import { useCallback, useEffect, useState } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData } from "react-router";+import { useFetcher, useLoaderData } from "react-router";import { UpgradeOverlayUpgradeButton } from "~/components/UpgradeOverlay";import { usePlanGate } from "~/hooks/usePlanGate";import { getCompanySettings, updateTimeCardSetting } from "~/modules/settings";diff --git a/apps/erp/app/routes/x+/settings+/printing.$id.delete.tsx b/apps/erp/app/routes/x+/settings+/printing.$id.delete.tsxindex eb12f84285..79fd49abba 100644--- a/apps/erp/app/routes/x+/settings+/printing.$id.delete.tsx+++ b/apps/erp/app/routes/x+/settings+/printing.$id.delete.tsx@@ -8,8 +8,8 @@ import { flash } from "@carbon/auth/session.server";import type { PrintingSettings } from "@carbon/printing";import { deletePrinterRoute } from "@carbon/printing";import { invalidatePrinterCache } from "@carbon/printing/printing.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function action({ request, params }: ActionFunctionArgs) {diff --git a/apps/erp/app/routes/x+/settings+/printing.tsx b/apps/erp/app/routes/x+/settings+/printing.tsxindex 7c6e55d93b..4f0b107787 100644--- a/apps/erp/app/routes/x+/settings+/printing.tsx+++ b/apps/erp/app/routes/x+/settings+/printing.tsx@@ -17,7 +17,7 @@ import {} from "@carbon/printing";import { invalidatePrinterCache } from "@carbon/printing/printing.server";import { Button, Heading, ScrollArea, VStack } from "@carbon/react";-import { isUnaffectedByNavigation, labelSizes } from "@carbon/utils";+import { isUnaffectedByNavigation, labelSizes, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans } from "@lingui/react/macro";import { LuPrinter } from "react-icons/lu";@@ -26,7 +26,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Link, Outlet, redirect, useLoaderData } from "react-router";+import { Link, Outlet, useLoaderData } from "react-router";import { getLocationsList, getWorkCentersList } from "~/modules/resources";import { getCompanySettings, printerRouteValidator } from "~/modules/settings";import { AssignmentsCard, PrintersCard } from "~/modules/settings/ui/Printing";diff --git a/apps/erp/app/routes/x+/settings+/production.tsx b/apps/erp/app/routes/x+/settings+/production.tsxindex 5aa3d4bf50..b512c47e88 100644--- a/apps/erp/app/routes/x+/settings+/production.tsx+++ b/apps/erp/app/routes/x+/settings+/production.tsx@@ -23,12 +23,13 @@ import {toast,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useCallback, useEffect } from "react";import { LuMapPin } from "react-icons/lu";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData } from "react-router";+import { useFetcher, useLoaderData } from "react-router";import { Users } from "~/components/Form";import {getCompanySettings,diff --git a/apps/erp/app/routes/x+/settings+/purchasing.tsx b/apps/erp/app/routes/x+/settings+/purchasing.tsxindex 4760c90cd3..73142d292f 100644--- a/apps/erp/app/routes/x+/settings+/purchasing.tsx+++ b/apps/erp/app/routes/x+/settings+/purchasing.tsx@@ -30,11 +30,12 @@ import {toast,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useCallback, useEffect, useState } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData } from "react-router";+import { useFetcher, useLoaderData } from "react-router";import CompanyDefaultAttachmentsCard from "~/components/CompanyDefaultAttachmentsCard";import { EmailRecipients, Users } from "~/components/Form";import Country from "~/components/Form/Country";diff --git a/apps/erp/app/routes/x+/settings+/quality.tsx b/apps/erp/app/routes/x+/settings+/quality.tsxindex d6f5be7061..1fafd1b98d 100644--- a/apps/erp/app/routes/x+/settings+/quality.tsx+++ b/apps/erp/app/routes/x+/settings+/quality.tsx@@ -28,11 +28,12 @@ import {toast,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useCallback, useEffect, useState } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData } from "react-router";+import { useFetcher, useLoaderData } from "react-router";import { z } from "zod";import { Users } from "~/components/Form";import SettingsSectionHeader from "~/components/SettingsSectionHeader";@@ -110,7 +111,6 @@ export async function action({ request }: ActionFunctionArgs) {}const update = await client.from("companySettings")- // @ts-ignore - samplingStandard column added in migration 20260419100000.update({ samplingStandard: validation.data.samplingStandard }).eq("id", companyId);if (update.error) return { success: false, message: update.error.message };diff --git a/apps/erp/app/routes/x+/settings+/resources.tsx b/apps/erp/app/routes/x+/settings+/resources.tsxindex 12eeadf3da..25abe75d27 100644--- a/apps/erp/app/routes/x+/settings+/resources.tsx+++ b/apps/erp/app/routes/x+/settings+/resources.tsx@@ -19,11 +19,12 @@ import {toast,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useEffect } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData } from "react-router";+import { useFetcher, useLoaderData } from "react-router";import { Users } from "~/components/Form";import SettingsSectionHeader from "~/components/SettingsSectionHeader";import {diff --git a/apps/erp/app/routes/x+/settings+/sales.tsx b/apps/erp/app/routes/x+/settings+/sales.tsxindex ab65d5aedd..d65eaceb00 100644--- a/apps/erp/app/routes/x+/settings+/sales.tsx+++ b/apps/erp/app/routes/x+/settings+/sales.tsx@@ -30,12 +30,12 @@ import {toast,VStack} from "@carbon/react";-import { INPUT_FORMAT } from "@carbon/utils";+import { INPUT_FORMAT, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useCallback, useEffect, useState } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData } from "react-router";+import { useFetcher, useLoaderData } from "react-router";import { EmailRecipients, Users } from "~/components/Form";import Country from "~/components/Form/Country";import SettingsSectionHeader from "~/components/SettingsSectionHeader";diff --git a/apps/erp/app/routes/x+/settings+/security.tsx b/apps/erp/app/routes/x+/settings+/security.tsxindex 635b23ed1a..7c05b27cfc 100644--- a/apps/erp/app/routes/x+/settings+/security.tsx+++ b/apps/erp/app/routes/x+/settings+/security.tsx@@ -44,12 +44,13 @@ import {Switch,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { type ReactNode, useEffect, useState } from "react";import { LuShieldCheck } from "react-icons/lu";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, Link, redirect, useFetcher, useLoaderData } from "react-router";+import { data, Link, useFetcher, useLoaderData } from "react-router";import { Hidden, Input, Submit, TextArea } from "~/components/Form";import { UpgradeOverlaySection } from "~/components/UpgradeOverlay";import { usePermissions } from "~/hooks";diff --git a/apps/erp/app/routes/x+/settings+/sequences.$tableId.tsx b/apps/erp/app/routes/x+/settings+/sequences.$tableId.tsxindex 29feed6602..be04be2983 100644--- a/apps/erp/app/routes/x+/settings+/sequences.$tableId.tsx+++ b/apps/erp/app/routes/x+/settings+/sequences.$tableId.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import {getSequence,SequenceForm,diff --git a/apps/erp/app/routes/x+/settings+/serial-numbers.$id.tsx b/apps/erp/app/routes/x+/settings+/serial-numbers.$id.tsxindex d056598a43..e1dea38d60 100644--- a/apps/erp/app/routes/x+/settings+/serial-numbers.$id.tsx+++ b/apps/erp/app/routes/x+/settings+/serial-numbers.$id.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import {getItemSerialSequence,ItemSerialSequenceForm,diff --git a/apps/erp/app/routes/x+/settings+/serial-numbers.delete.$id.tsx b/apps/erp/app/routes/x+/settings+/serial-numbers.delete.$id.tsxindex 6057008aeb..e47f3bbaf0 100644--- a/apps/erp/app/routes/x+/settings+/serial-numbers.delete.$id.tsx+++ b/apps/erp/app/routes/x+/settings+/serial-numbers.delete.$id.tsx@@ -5,9 +5,11 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import {deleteItemSerialSequence,@@ -70,9 +72,9 @@ export default function DeleteSerialNumberRoute() {const { id } = useParams();if (!id) throw new Error("Could not find id");- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();- const onCancel = () => navigate(-1);+ const onCancel = () => closeRoute();const itemLabel = itemSerialSequence.itemReadableId ?? t`this item`;diff --git a/apps/erp/app/routes/x+/settings+/serial-numbers.new.tsx b/apps/erp/app/routes/x+/settings+/serial-numbers.new.tsxindex 315972ec46..21142359df 100644--- a/apps/erp/app/routes/x+/settings+/serial-numbers.new.tsx+++ b/apps/erp/app/routes/x+/settings+/serial-numbers.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import {getItemSerialSequences,ItemSerialSequenceForm,diff --git a/apps/erp/app/routes/x+/settings+/sso.tsx b/apps/erp/app/routes/x+/settings+/sso.tsxindex 347f6da774..a493a315c5 100644--- a/apps/erp/app/routes/x+/settings+/sso.tsx+++ b/apps/erp/app/routes/x+/settings+/sso.tsx@@ -16,8 +16,9 @@ import {verifySsoDomain} from "@carbon/ee/sso.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { ssoConnectionValidator, ssoDomainValidator } from "~/modules/settings";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/settings+/webhooks.$id.tsx b/apps/erp/app/routes/x+/settings+/webhooks.$id.tsxindex 62a8ad71c2..871692229d 100644--- a/apps/erp/app/routes/x+/settings+/webhooks.$id.tsx+++ b/apps/erp/app/routes/x+/settings+/webhooks.$id.tsx@@ -8,8 +8,10 @@ import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";import { upsertWebhook } from "@carbon/ee/webhooks.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import { getWebhook, webhookValidator } from "~/modules/settings";import { WebhookForm } from "~/modules/settings/ui/Webhooks";import { getParams, path } from "~/utils/path";@@ -81,7 +83,7 @@ export async function action({ request, params }: ActionFunctionArgs) {}export default function EditWebhookRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { webhook } = useLoaderData<typeof loader>();const initialValues = {@@ -99,7 +101,7 @@ export default function EditWebhookRoute() {<WebhookFormkey={initialValues.id}initialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/settings+/webhooks.delete.$id.tsx b/apps/erp/app/routes/x+/settings+/webhooks.delete.$id.tsxindex 922bf068cf..8bf65c3fe2 100644--- a/apps/erp/app/routes/x+/settings+/webhooks.delete.$id.tsx+++ b/apps/erp/app/routes/x+/settings+/webhooks.delete.$id.tsx@@ -7,9 +7,11 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";import { deleteWebhook } from "@carbon/ee/webhooks.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { getWebhook } from "~/modules/settings";import { getParams, path } from "~/utils/path";@@ -79,9 +81,9 @@ export default function DeleteWebhookRoute() {const { id } = useParams();if (!id) throw new Error("Could not find id");- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();- const onCancel = () => navigate(-1);+ const onCancel = () => closeRoute();return (<ConfirmDeletediff --git a/apps/erp/app/routes/x+/settings+/webhooks.new.tsx b/apps/erp/app/routes/x+/settings+/webhooks.new.tsxindex f8aa6c475f..405658f143 100644--- a/apps/erp/app/routes/x+/settings+/webhooks.new.tsx+++ b/apps/erp/app/routes/x+/settings+/webhooks.new.tsx@@ -8,8 +8,10 @@ import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";import { upsertWebhook } from "@carbon/ee/webhooks.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";+import { data } from "react-router";import { webhookValidator } from "~/modules/settings";import { WebhookForm } from "~/modules/settings/ui/Webhooks";import { getParams, path } from "~/utils/path";@@ -65,7 +67,7 @@ export async function action({ request }: ActionFunctionArgs) {}export default function NewWebhookRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {name: "",url: "",@@ -77,6 +79,6 @@ export default function NewWebhookRoute() {};return (- <WebhookForm initialValues={initialValues} onClose={() => navigate(-1)} />+ <WebhookForm initialValues={initialValues} onClose={() => closeRoute()} />);}diff --git a/apps/erp/app/routes/x+/settings+/webhooks.tsx b/apps/erp/app/routes/x+/settings+/webhooks.tsxindex d4f8edf23c..5ef3f6d410 100644--- a/apps/erp/app/routes/x+/settings+/webhooks.tsx+++ b/apps/erp/app/routes/x+/settings+/webhooks.tsx@@ -5,13 +5,13 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { usePlanGate } from "~/hooks/usePlanGate";import { getConfig, getWebhooks } from "~/modules/settings";import {diff --git a/apps/erp/app/routes/x+/shared+/notes.$noteId.delete.tsx b/apps/erp/app/routes/x+/shared+/notes.$noteId.delete.tsxindex 639f5a0623..d1d589283d 100644--- a/apps/erp/app/routes/x+/shared+/notes.$noteId.delete.tsx+++ b/apps/erp/app/routes/x+/shared+/notes.$noteId.delete.tsx@@ -5,9 +5,10 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteNote } from "~/modules/shared";+import { requestReferrer } from "~/utils/path";export async function action({ request, params }: ActionFunctionArgs) {const { client } = await requirePermissions(request, {});@@ -18,12 +19,10 @@ export async function action({ request, params }: ActionFunctionArgs) {const result = await deleteNote(client, noteId);if (result.error) {throw redirect(- request.headers.get("Referer") ?? new URL(request.url).pathname,+ requestReferrer(request) ?? new URL(request.url).pathname,await flash(request, error(result.error, "Error deleting note")));}- throw redirect(- request.headers.get("Referer") ?? new URL(request.url).pathname- );+ throw redirect(requestReferrer(request) ?? new URL(request.url).pathname);}diff --git a/apps/erp/app/routes/x+/shared+/notes.new.tsx b/apps/erp/app/routes/x+/shared+/notes.new.tsxindex c42b6c3dab..a41e1acc31 100644--- a/apps/erp/app/routes/x+/shared+/notes.new.tsx+++ b/apps/erp/app/routes/x+/shared+/notes.new.tsx@@ -6,9 +6,10 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { insertNote, noteValidator } from "~/modules/shared";+import { requestReferrer } from "~/utils/path";export async function action({ request }: ActionFunctionArgs) {assertIsPost(request);@@ -31,12 +32,10 @@ export async function action({ request }: ActionFunctionArgs) {});if (createNote.error) {throw redirect(- request.headers.get("Referer") ?? new URL(request.url).pathname,+ requestReferrer(request) ?? new URL(request.url).pathname,await flash(request, error(createNote.error, "Error creating note")));}- throw redirect(- request.headers.get("Referer") ?? new URL(request.url).pathname- );+ throw redirect(requestReferrer(request) ?? new URL(request.url).pathname);}diff --git a/apps/erp/app/routes/x+/shared+/views.delete.$id.tsx b/apps/erp/app/routes/x+/shared+/views.delete.$id.tsxindex bf59bbbb71..e3bbd01b64 100644--- a/apps/erp/app/routes/x+/shared+/views.delete.$id.tsx+++ b/apps/erp/app/routes/x+/shared+/views.delete.$id.tsx@@ -5,10 +5,11 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteSavedView } from "~/modules/shared";-import { path } from "~/utils/path";+import { path, requestReferrer } from "~/utils/path";export async function action({ request, params }: ActionFunctionArgs) {assertIsPost(request);@@ -29,8 +30,7 @@ export async function action({ request, params }: ActionFunctionArgs) {);}- const referrer = request.headers.get("referer");- const referrerPath = referrer ? new URL(referrer).pathname : null;+ const referrerPath = requestReferrer(request)?.split(/[?#]/)[0] ?? null;throw redirect(referrerPath ?? path.to.authenticatedRoot);}diff --git a/apps/erp/app/routes/x+/shipment+/$shipmentId._index.tsx b/apps/erp/app/routes/x+/shipment+/$shipmentId._index.tsxindex 0e8d00497a..64824d57d4 100644--- a/apps/erp/app/routes/x+/shipment+/$shipmentId._index.tsx+++ b/apps/erp/app/routes/x+/shipment+/$shipmentId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/shipment+/$shipmentId.delete.tsx b/apps/erp/app/routes/x+/shipment+/$shipmentId.delete.tsxindex fa4a32253a..08d6675cd4 100644--- a/apps/erp/app/routes/x+/shipment+/$shipmentId.delete.tsx+++ b/apps/erp/app/routes/x+/shipment+/$shipmentId.delete.tsx@@ -5,8 +5,8 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteShipment, getShipment } from "~/modules/inventory";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/shipment+/$shipmentId.details.tsx b/apps/erp/app/routes/x+/shipment+/$shipmentId.details.tsxindex 6c41578879..708b06d785 100644--- a/apps/erp/app/routes/x+/shipment+/$shipmentId.details.tsx+++ b/apps/erp/app/routes/x+/shipment+/$shipmentId.details.tsx@@ -9,9 +9,9 @@ import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";import { serverFns } from "@carbon/server-functions";-import { getErrorMessage } from "@carbon/utils";+import { getErrorMessage, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useParams } from "react-router";+import { data, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { Shipment, ShipmentLine } from "~/modules/inventory";import {@@ -290,7 +290,7 @@ export default function ShipmentDetailsRoute() {<><ShipmentFormkey={initialValues.sourceDocumentId}- // @ts-ignore+ // @ts-expect-errorinitialValues={initialValues}status={routeData.shipment.status}shipmentLines={routeData.shipmentLines}diff --git a/apps/erp/app/routes/x+/shipment+/$shipmentId.post.tsx b/apps/erp/app/routes/x+/shipment+/$shipmentId.post.tsxindex 20e9fab177..d45740c85d 100644--- a/apps/erp/app/routes/x+/shipment+/$shipmentId.post.tsx+++ b/apps/erp/app/routes/x+/shipment+/$shipmentId.post.tsx@@ -20,10 +20,9 @@ import { raiseMoment } from "@carbon/lib/workflows";import { getLogger } from "@carbon/logger";import { getCachedPrinterConfig } from "@carbon/printing/printing.server";import { serverFns } from "@carbon/server-functions";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import { parseDate } from "@internationalized/date";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { upsertDocument } from "~/modules/documents";import { recordSalesRuleOutcome } from "~/modules/sales/sales.server";import {diff --git a/apps/erp/app/routes/x+/shipment+/$shipmentId.tsx b/apps/erp/app/routes/x+/shipment+/$shipmentId.tsxindex 3171654bc8..d2aa81832e 100644--- a/apps/erp/app/routes/x+/shipment+/$shipmentId.tsx+++ b/apps/erp/app/routes/x+/shipment+/$shipmentId.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams } from "react-router";+import { Outlet, useParams } from "react-router";import {getShipment,getShipmentLines,diff --git a/apps/erp/app/routes/x+/shipment+/$shipmentId.void.tsx b/apps/erp/app/routes/x+/shipment+/$shipmentId.void.tsxindex d549418b66..75644102fc 100644--- a/apps/erp/app/routes/x+/shipment+/$shipmentId.void.tsx+++ b/apps/erp/app/routes/x+/shipment+/$shipmentId.void.tsx@@ -6,8 +6,8 @@ import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/shipment+/_layout.tsx b/apps/erp/app/routes/x+/shipment+/_layout.tsxindex 8a67686c9f..0b3df539d9 100644--- a/apps/erp/app/routes/x+/shipment+/_layout.tsx+++ b/apps/erp/app/routes/x+/shipment+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Shipment" }];};diff --git a/apps/erp/app/routes/x+/shipment+/new.tsx b/apps/erp/app/routes/x+/shipment+/new.tsxindex f0163e493b..969b05214a 100644--- a/apps/erp/app/routes/x+/shipment+/new.tsx+++ b/apps/erp/app/routes/x+/shipment+/new.tsx@@ -7,10 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { serverFns } from "@carbon/server-functions";-import { getErrorMessage } from "@carbon/utils";+import { getErrorMessage, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import type { ShipmentSourceDocument } from "~/modules/inventory";import { getUserDefaults } from "~/modules/users/users.server";import { getDatabaseClient } from "~/services/database.server";diff --git a/apps/erp/app/routes/x+/stock-transfer+/$id.line.$lineId.delete.tsx b/apps/erp/app/routes/x+/stock-transfer+/$id.line.$lineId.delete.tsxindex 944ba8a888..38d8195f28 100644--- a/apps/erp/app/routes/x+/stock-transfer+/$id.line.$lineId.delete.tsx+++ b/apps/erp/app/routes/x+/stock-transfer+/$id.line.$lineId.delete.tsx@@ -5,8 +5,9 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {deleteStockTransferLine,getStockTransfer,diff --git a/apps/erp/app/routes/x+/stock-transfer+/$id.line.$lineId.tsx b/apps/erp/app/routes/x+/stock-transfer+/$id.line.$lineId.tsxindex a5fd5621d9..367d4632e1 100644--- a/apps/erp/app/routes/x+/stock-transfer+/$id.line.$lineId.tsx+++ b/apps/erp/app/routes/x+/stock-transfer+/$id.line.$lineId.tsx@@ -6,9 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { useRouteData } from "@carbon/react";+import { useCloseRoute, useRouteData } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useNavigate, useParams } from "react-router";+import { data, useParams } from "react-router";import {getStockTransfer,isStockTransferLocked,@@ -21,7 +22,6 @@ import type {} from "~/modules/inventory/types";import StockTransferLineForm from "~/modules/inventory/ui/StockTransfers/StockTransferLineForm";import { requireUnlocked } from "~/utils/lockedGuard.server";-import { path } from "~/utils/path";export async function action({ request, params }: ActionFunctionArgs) {@@ -82,7 +82,7 @@ export default function NewStockTransferLinesRoute() {const { id, lineId } = useParams();if (!id) throw new Error("Could not find id");if (!lineId) throw new Error("Could not find lineId");- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const routeData = useRouteData<{stockTransfer: StockTransfer;stockTransferLines: StockTransferLine[];@@ -107,7 +107,7 @@ export default function NewStockTransferLinesRoute() {return (<StockTransferLineFormlocationId={routeData?.stockTransfer.locationId}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}// @ts-expect-error TS2739 - TODO: fix typeinitialValues={initialValues}/>diff --git a/apps/erp/app/routes/x+/stock-transfer+/$id.line.new.tsx b/apps/erp/app/routes/x+/stock-transfer+/$id.line.new.tsxindex 05cb21a4c6..b6ab9fd5ff 100644--- a/apps/erp/app/routes/x+/stock-transfer+/$id.line.new.tsx+++ b/apps/erp/app/routes/x+/stock-transfer+/$id.line.new.tsx@@ -6,9 +6,10 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";-import { useRouteData } from "@carbon/react";+import { useCloseRoute, useRouteData } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useNavigate, useParams } from "react-router";+import { data, useParams } from "react-router";import {getStockTransfer,isStockTransferLocked,@@ -18,7 +19,6 @@ import {import type { StockTransfer } from "~/modules/inventory/types";import StockTransferLineForm from "~/modules/inventory/ui/StockTransfers/StockTransferLineForm";import { requireUnlocked } from "~/utils/lockedGuard.server";-import { path } from "~/utils/path";export async function loader({ request }: LoaderFunctionArgs) {@@ -86,7 +86,7 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function NewStockTransferLinesRoute() {const { id } = useParams();if (!id) throw new Error("Could not find id");- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const routeData = useRouteData<{stockTransfer: StockTransfer;}>(path.to.stockTransfer(id));@@ -105,7 +105,7 @@ export default function NewStockTransferLinesRoute() {return (<StockTransferLineFormlocationId={routeData?.stockTransfer.locationId}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}// @ts-expect-error TS2739 - TODO: fix typeinitialValues={initialValues}/>diff --git a/apps/erp/app/routes/x+/stock-transfer+/$id.scan.$lineId.tsx b/apps/erp/app/routes/x+/stock-transfer+/$id.scan.$lineId.tsxindex 7f77a69019..a6c25585f1 100644--- a/apps/erp/app/routes/x+/stock-transfer+/$id.scan.$lineId.tsx+++ b/apps/erp/app/routes/x+/stock-transfer+/$id.scan.$lineId.tsx@@ -14,13 +14,12 @@ import {toast} from "@carbon/react";import { serverFns } from "@carbon/server-functions";-import { getErrorMessage } from "@carbon/utils";+import { getErrorMessage, redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import { useEffect, useMemo } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";import {data,- redirect,useFetcher,useLoaderData,useNavigate,diff --git a/apps/erp/app/routes/x+/stock-transfer+/$id.status.tsx b/apps/erp/app/routes/x+/stock-transfer+/$id.status.tsxindex fa7d482da2..ce9a43a5ef 100644--- a/apps/erp/app/routes/x+/stock-transfer+/$id.status.tsx+++ b/apps/erp/app/routes/x+/stock-transfer+/$id.status.tsx@@ -7,8 +7,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { evaluateLinesForSurface, isBlocked } from "@carbon/ee/rules.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {stockTransferStatusType,updateStockTransferStatusdiff --git a/apps/erp/app/routes/x+/stock-transfer+/$id.tsx b/apps/erp/app/routes/x+/stock-transfer+/$id.tsxindex 5b6625efac..93a1c7f69c 100644--- a/apps/erp/app/routes/x+/stock-transfer+/$id.tsx+++ b/apps/erp/app/routes/x+/stock-transfer+/$id.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import type { JSONContent } from "@carbon/react";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData, useParams } from "react-router";+import { Outlet, useLoaderData, useParams } from "react-router";import { PanelProvider } from "~/components/Layout";import { getStockTransfer, getStockTransferLines } from "~/modules/inventory";import StockTransferHeader from "~/modules/inventory/ui/StockTransfers/StockTransferHeader";diff --git a/apps/erp/app/routes/x+/stock-transfer+/_layout.tsx b/apps/erp/app/routes/x+/stock-transfer+/_layout.tsxindex a58829a5dd..4c44e9426c 100644--- a/apps/erp/app/routes/x+/stock-transfer+/_layout.tsx+++ b/apps/erp/app/routes/x+/stock-transfer+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Stock Transfer" }];};diff --git a/apps/erp/app/routes/x+/stock-transfer+/delete.$id.tsx b/apps/erp/app/routes/x+/stock-transfer+/delete.$id.tsxindex 541205aa9d..9d05233ee0 100644--- a/apps/erp/app/routes/x+/stock-transfer+/delete.$id.tsx+++ b/apps/erp/app/routes/x+/stock-transfer+/delete.$id.tsx@@ -5,8 +5,9 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {deleteStockTransfer,getStockTransfer,diff --git a/apps/erp/app/routes/x+/stock-transfer+/new.tsx b/apps/erp/app/routes/x+/stock-transfer+/new.tsxindex 74ab702c44..103bf93468 100644--- a/apps/erp/app/routes/x+/stock-transfer+/new.tsx+++ b/apps/erp/app/routes/x+/stock-transfer+/new.tsx@@ -8,9 +8,9 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { evaluateLinesForSurface, isBlocked } from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {insertStockTransfer,stockTransferValidatordiff --git a/apps/erp/app/routes/x+/supplier+/$supplierId._index.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId._index.tsxindex 4b99dcadee..82111da64d 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId._index.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.accounting.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.accounting.tsxindex fa633e0031..449b9f66a5 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.accounting.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.accounting.tsx@@ -2,8 +2,9 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useParams } from "react-router";+import { useParams } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.approval.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.approval.tsxindex 7411d07291..468575be72 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.approval.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.approval.tsx@@ -20,9 +20,8 @@ import { validationError, validator } from "@carbon/form";import { trigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";import { NotificationEvent } from "@carbon/notifications";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { supplierApprovalDecisionValidator } from "~/modules/purchasing";import { requireCompanyRecord } from "~/modules/shared/shared.server";import { getDatabaseClient } from "~/services/database.server";diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.$id.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.$id.tsxindex 20e8f9b2a2..051a9b9d25 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.$id.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.$id.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect, useNavigate, useParams } from "react-router";+import { useNavigate, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { SupplierBankAccount } from "~/modules/purchasing";import {diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.delete.$id.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.delete.$id.tsxindex 4cfa00a3d2..3e3468be0f 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.delete.$id.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.delete.$id.tsx@@ -5,9 +5,11 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect, useNavigate, useParams } from "react-router";+import { useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { useRouteData } from "~/hooks";import type { SupplierBankAccount } from "~/modules/purchasing";@@ -40,7 +42,7 @@ export async function action({ request, params }: ActionFunctionArgs) {}export default function DeleteSupplierBankAccountRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { t } = useLingui();const { supplierId, id } = useParams();if (!supplierId) throw new Error("Could not find supplierId");@@ -61,7 +63,7 @@ export default function DeleteSupplierBankAccountRoute() {isOpenname={bankAccount.name}text={t`Are you sure you want to permanently delete this bank account?`}- onCancel={() => navigate(-1)}+ onCancel={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.new.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.new.tsxindex 34e57202bd..4717727125 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.new.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.new.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useNavigate, useParams } from "react-router";+import { data, useNavigate, useParams } from "react-router";import { useUser } from "~/hooks";import {supplierBankAccountValidator,diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.tsxindex 64f3b2edcd..6f2c689590 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.bank-accounts.tsx@@ -5,12 +5,12 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getSupplierBankAccounts } from "~/modules/purchasing";import SupplierBankAccounts from "~/modules/purchasing/ui/Supplier/SupplierBankAccounts";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.$supplierContactId.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.$supplierContactId.tsxindex 1798b189c9..3d129559d8 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.$supplierContactId.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.$supplierContactId.tsx@@ -12,12 +12,13 @@ import {import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import {getSupplierContact,supplierContactValidator,diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.delete.$supplierContactId.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.delete.$supplierContactId.tsxindex b3fcd9381b..812a267670 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.delete.$supplierContactId.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.delete.$supplierContactId.tsx@@ -5,11 +5,11 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect } from "react-router";import { deleteSupplierContact } from "~/modules/purchasing";import { path } from "~/utils/path";import { supplierContactsQuery } from "~/utils/react-query";diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.new.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.new.tsxindex 1e8b96f5ee..e0b98c3044 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.new.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.new.tsx@@ -7,11 +7,12 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { data, redirect, useNavigate, useParams } from "react-router";+import { data, useNavigate, useParams } from "react-router";import {insertSupplierContact,supplierContactValidatordiff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.tsxindex 423f6fa34a..318acda5c9 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.contacts.tsx@@ -5,12 +5,12 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getSupplierContacts } from "~/modules/purchasing";import SupplierContacts from "~/modules/purchasing/ui/Supplier/SupplierContacts";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.delete.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.delete.tsxindex f6ae4a383f..03a858e583 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.delete.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.delete.tsx@@ -5,8 +5,9 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteSupplier } from "~/modules/purchasing";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.details.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.details.tsxindex f389392ad4..584d6e3772 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.details.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.details.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useParams } from "react-router";+import { data, useParams } from "react-router";import { useRouteData } from "~/hooks";import type { SupplierDetail } from "~/modules/purchasing";import { supplierValidator, upsertSupplier } from "~/modules/purchasing";diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.locations.$supplierLocationId.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.locations.$supplierLocationId.tsxindex f97e97e4ce..03764b438e 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.locations.$supplierLocationId.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.locations.$supplierLocationId.tsx@@ -12,12 +12,13 @@ import {import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import {getSupplierLocation,supplierLocationValidator,diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.locations.delete.$supplierLocationId.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.locations.delete.$supplierLocationId.tsxindex b6fc614789..ea1d0b1131 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.locations.delete.$supplierLocationId.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.locations.delete.$supplierLocationId.tsx@@ -5,11 +5,11 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect } from "react-router";import { deleteSupplierLocation } from "~/modules/purchasing";import { path } from "~/utils/path";import { supplierLocationsQuery } from "~/utils/react-query";diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.locations.new.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.locations.new.tsxindex 5732b163dd..2806cf6a38 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.locations.new.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.locations.new.tsx@@ -6,11 +6,12 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { data, redirect, useNavigate, useParams } from "react-router";+import { data, useNavigate, useParams } from "react-router";import { useUser } from "~/hooks";import {insertSupplierLocation,diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.locations.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.locations.tsxindex 94adf75a96..de537fd3de 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.locations.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.locations.tsx@@ -5,12 +5,12 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { getSupplierLocations } from "~/modules/purchasing";import SupplierLocations from "~/modules/purchasing/ui/Supplier/SupplierLocations";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.payments.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.payments.tsxindex 04eebda7cb..3b6978e634 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.payments.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.payments.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getSupplierPayment,supplierPaymentValidator,diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.processes.$id.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.processes.$id.tsxindex 62a7590822..2e29e8e5dd 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.processes.$id.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.processes.$id.tsx@@ -6,11 +6,13 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect, useNavigate, useParams } from "react-router";+import { useParams } from "react-router";import { useRouteData } from "~/hooks";import type { SupplierProcess } from "~/modules/purchasing";import {@@ -98,7 +100,7 @@ export default function SupplierProcessRoute() {const process = routeData?.processes.find((process) => process.id === id);if (!process) throw new Error("Could not find process");- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const initialValues = {id: process.id ?? undefined,@@ -111,7 +113,7 @@ export default function SupplierProcessRoute() {return (<SupplierProcessForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.processes.delete.$id.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.processes.delete.$id.tsxindex 98151844ae..ff0327eea8 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.processes.delete.$id.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.processes.delete.$id.tsx@@ -5,12 +5,14 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect, useNavigate, useParams } from "react-router";+import { useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { useRouteData } from "~/hooks";import type { SupplierProcess } from "~/modules/purchasing";@@ -58,7 +60,7 @@ export async function clientAction({}export default function DeleteSupplierProcessRoute() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const { supplierId, id } = useParams();if (!supplierId) throw new Error("Could not find supplier id");if (!id) throw new Error("Could not find id");@@ -80,7 +82,7 @@ export default function DeleteSupplierProcessRoute() {name={process.processName!}text={t`Are you sure you want to permanently delete the supplier process?`}onCancel={() => {- navigate(-1);+ closeRoute();}}/>);diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.processes.new.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.processes.new.tsxindex 049af5ab9e..02db957baf 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.processes.new.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.processes.new.tsx@@ -6,11 +6,13 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect, useNavigate, useParams } from "react-router";+import { useParams } from "react-router";import {supplierProcessValidator,upsertSupplierProcess@@ -90,7 +92,7 @@ export async function clientAction({export default function NewSupplierProcessRoute() {const { supplierId } = useParams();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();if (!supplierId) throw new Error("Could not find supplier id");@@ -104,7 +106,7 @@ export default function NewSupplierProcessRoute() {return (<SupplierProcessForminitialValues={initialValues}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/>);}diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.processes.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.processes.tsxindex 75ed8a3604..b1f48a97f3 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.processes.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.processes.tsx@@ -5,12 +5,12 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getSupplierProcessesBySupplier } from "~/modules/purchasing";import SupplierProcesses from "~/modules/purchasing/ui/Supplier/SupplierProcesses";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.shipping.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.shipping.tsxindex cce2aa2ec7..031dd615f0 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.shipping.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.shipping.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getSupplierShipping,supplierShippingValidator,diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.tax.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.tax.tsxindex f1d72d8952..fea7a298ad 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.tax.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.tax.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getSupplierTax,supplierTaxValidator,diff --git a/apps/erp/app/routes/x+/supplier+/$supplierId.tsx b/apps/erp/app/routes/x+/supplier+/$supplierId.tsxindex c8b8dbe4cd..0158c60b2f 100644--- a/apps/erp/app/routes/x+/supplier+/$supplierId.tsx+++ b/apps/erp/app/routes/x+/supplier+/$supplierId.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect } from "react-router";+import { Outlet } from "react-router";import {getSupplier,getSupplierContacts,diff --git a/apps/erp/app/routes/x+/supplier+/_layout.tsx b/apps/erp/app/routes/x+/supplier+/_layout.tsxindex 4b01df4640..2fadbc9a6a 100644--- a/apps/erp/app/routes/x+/supplier+/_layout.tsx+++ b/apps/erp/app/routes/x+/supplier+/_layout.tsx@@ -17,6 +17,8 @@ import { getSupplierTypes } from "~/modules/purchasing";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Supplier" }];};diff --git a/apps/erp/app/routes/x+/supplier+/new.tsx b/apps/erp/app/routes/x+/supplier+/new.tsxindex 9e6223562c..f6e9bbebdb 100644--- a/apps/erp/app/routes/x+/supplier+/new.tsx+++ b/apps/erp/app/routes/x+/supplier+/new.tsx@@ -6,9 +6,10 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { useSupplierApprovalRequired, useUser } from "~/hooks";import { supplierValidator, upsertSupplier } from "~/modules/purchasing";import SupplierForm from "~/modules/purchasing/ui/Supplier/SupplierForm";diff --git a/apps/erp/app/routes/x+/supplier-quote+/$id.$lineId.delete.tsx b/apps/erp/app/routes/x+/supplier-quote+/$id.$lineId.delete.tsxindex fa966c9643..5f29cad6e1 100644--- a/apps/erp/app/routes/x+/supplier-quote+/$id.$lineId.delete.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/$id.$lineId.delete.tsx@@ -5,8 +5,9 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {deleteSupplierQuoteLine,getSupplierQuote,diff --git a/apps/erp/app/routes/x+/supplier-quote+/$id.$lineId.details.tsx b/apps/erp/app/routes/x+/supplier-quote+/$id.$lineId.details.tsxindex b92ea18d66..1c3312ff21 100644--- a/apps/erp/app/routes/x+/supplier-quote+/$id.$lineId.details.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/$id.$lineId.details.tsx@@ -10,9 +10,10 @@ import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";import { useRouteData } from "@carbon/react";+import { redirect } from "@carbon/utils";import { Fragment } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { Outlet, redirect, useLoaderData, useParams } from "react-router";+import { Outlet, useLoaderData, useParams } from "react-router";import { DeferredFiles } from "~/components";import type {SupplierQuote,diff --git a/apps/erp/app/routes/x+/supplier-quote+/$id._index.tsx b/apps/erp/app/routes/x+/supplier-quote+/$id._index.tsxindex b4b1a978e9..6bd41a63b0 100644--- a/apps/erp/app/routes/x+/supplier-quote+/$id._index.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/$id._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/supplier-quote+/$id.convert.tsx b/apps/erp/app/routes/x+/supplier-quote+/$id.convert.tsxindex 9d9cfa1735..72bb3b5ea8 100644--- a/apps/erp/app/routes/x+/supplier-quote+/$id.convert.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/$id.convert.tsx@@ -8,9 +8,8 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { isApprovalRequired } from "@carbon/ee/approvals.server";import { getLogger } from "@carbon/logger";-import { getErrorMessage } from "@carbon/utils";+import { getErrorMessage, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {convertSupplierQuoteToOrder,getSupplier,diff --git a/apps/erp/app/routes/x+/supplier-quote+/$id.delete.tsx b/apps/erp/app/routes/x+/supplier-quote+/$id.delete.tsxindex c251d9deb1..8a58895fe6 100644--- a/apps/erp/app/routes/x+/supplier-quote+/$id.delete.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/$id.delete.tsx@@ -5,8 +5,9 @@import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteSupplierQuote } from "~/modules/purchasing";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/supplier-quote+/$id.details.tsx b/apps/erp/app/routes/x+/supplier-quote+/$id.details.tsxindex dfb4315389..ff61f0ef91 100644--- a/apps/erp/app/routes/x+/supplier-quote+/$id.details.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/$id.details.tsx@@ -7,9 +7,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import type { JSONContent } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { FileObject } from "@supabase/storage-js";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { DeferredFiles } from "~/components";import { useRouteData } from "~/hooks";import {diff --git a/apps/erp/app/routes/x+/supplier-quote+/$id.exchange-rate.tsx b/apps/erp/app/routes/x+/supplier-quote+/$id.exchange-rate.tsxindex a5eca6d022..2970f0c710 100644--- a/apps/erp/app/routes/x+/supplier-quote+/$id.exchange-rate.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/$id.exchange-rate.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getExchangeRate } from "~/modules/accounting";import {getSupplierQuote,diff --git a/apps/erp/app/routes/x+/supplier-quote+/$id.finalize.tsx b/apps/erp/app/routes/x+/supplier-quote+/$id.finalize.tsxindex 7bb3d4c5b8..78d11a0f4a 100644--- a/apps/erp/app/routes/x+/supplier-quote+/$id.finalize.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/$id.finalize.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {finalizeSupplierQuote,getSupplierQuote,diff --git a/apps/erp/app/routes/x+/supplier-quote+/$id.new.tsx b/apps/erp/app/routes/x+/supplier-quote+/$id.new.tsxindex 5461936ba7..cba7f9fca8 100644--- a/apps/erp/app/routes/x+/supplier-quote+/$id.new.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/$id.new.tsx@@ -7,8 +7,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getSupplierQuote,isSupplierQuoteLocked,diff --git a/apps/erp/app/routes/x+/supplier-quote+/$id.send.tsx b/apps/erp/app/routes/x+/supplier-quote+/$id.send.tsxindex f906d6cc6e..fa38079ef9 100644--- a/apps/erp/app/routes/x+/supplier-quote+/$id.send.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/$id.send.tsx@@ -9,8 +9,8 @@ import { storage } from "@carbon/files";import { validationError, validator } from "@carbon/form";import { trigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getSupplierContact,getSupplierInteractionDocuments,diff --git a/apps/erp/app/routes/x+/supplier-quote+/$id.status.tsx b/apps/erp/app/routes/x+/supplier-quote+/$id.status.tsxindex d474f2187e..c08cfba67e 100644--- a/apps/erp/app/routes/x+/supplier-quote+/$id.status.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/$id.status.tsx@@ -5,8 +5,8 @@import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {supplierQuoteStatusType,updateSupplierQuoteStatusdiff --git a/apps/erp/app/routes/x+/supplier-quote+/$id.tsx b/apps/erp/app/routes/x+/supplier-quote+/$id.tsxindex 203a6fc53e..180ca59622 100644--- a/apps/erp/app/routes/x+/supplier-quote+/$id.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/$id.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams } from "react-router";+import { Outlet, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import { getCurrencyByCode, getExchangeRate } from "~/modules/accounting";import {diff --git a/apps/erp/app/routes/x+/supplier-quote+/_layout.tsx b/apps/erp/app/routes/x+/supplier-quote+/_layout.tsxindex c0563a8f14..b26ea2b469 100644--- a/apps/erp/app/routes/x+/supplier-quote+/_layout.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/_layout.tsx@@ -14,6 +14,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Supplier Quote" }];};diff --git a/apps/erp/app/routes/x+/supplier-quote+/new.tsx b/apps/erp/app/routes/x+/supplier-quote+/new.tsxindex 7d91ab7de0..21702864c5 100644--- a/apps/erp/app/routes/x+/supplier-quote+/new.tsx+++ b/apps/erp/app/routes/x+/supplier-quote+/new.tsx@@ -6,9 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { useCompanyToday, useUrlParams, useUser } from "~/hooks";import {insertSupplierQuote,diff --git a/apps/erp/app/routes/x+/templates+/_layout.tsx b/apps/erp/app/routes/x+/templates+/_layout.tsxindex 0cc10b5eab..a1d100ef20 100644--- a/apps/erp/app/routes/x+/templates+/_layout.tsx+++ b/apps/erp/app/routes/x+/templates+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Document Templates" }];};diff --git a/apps/erp/app/routes/x+/tool+/$itemId._index.tsx b/apps/erp/app/routes/x+/tool+/$itemId._index.tsxindex 87c3b3bf8a..87ebcaa675 100644--- a/apps/erp/app/routes/x+/tool+/$itemId._index.tsx+++ b/apps/erp/app/routes/x+/tool+/$itemId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/tool+/$itemId.costing.tsx b/apps/erp/app/routes/x+/tool+/$itemId.costing.tsxindex f2efb438d8..295eb5b021 100644--- a/apps/erp/app/routes/x+/tool+/$itemId.costing.tsx+++ b/apps/erp/app/routes/x+/tool+/$itemId.costing.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getItemCost,getItemCostHistory,diff --git a/apps/erp/app/routes/x+/tool+/$itemId.details.tsx b/apps/erp/app/routes/x+/tool+/$itemId.details.tsxindex f36dd313af..6ea5507f1b 100644--- a/apps/erp/app/routes/x+/tool+/$itemId.details.tsx+++ b/apps/erp/app/routes/x+/tool+/$itemId.details.tsx@@ -9,11 +9,12 @@ import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";import { Menubar, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { PostgrestResponse } from "@supabase/supabase-js";import { Suspense } from "react";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import { CadModel, DeferredFiles } from "~/components";import { usePermissions, useRouteData } from "~/hooks";import type { ItemFile, MakeMethod, ToolSummary } from "~/modules/items";@@ -291,7 +292,6 @@ export default function ToolDetailsRoute() {{manufacturingInitialValues && (<ItemManufacturingFormkey={itemId}- // @ts-ignoreinitialValues={manufacturingInitialValues}withConfiguration={false}/>@@ -311,9 +311,8 @@ export default function ToolDetailsRoute() {<BillOfProcesskey={`bop:${itemId}`}makeMethod={methodData.makeMethod}- // @ts-ignore+ // @ts-expect-erroroperations={methodData.methodOperations ?? []}- // @ts-ignorematerials={methodData.methodMaterials ?? []}tags={tags}revisionStatus={revisionStatus}@@ -324,9 +323,9 @@ export default function ToolDetailsRoute() {<BillOfMaterialkey={`bom:${itemId}`}makeMethod={methodData.makeMethod}- // @ts-ignore+ // @ts-expect-errormaterials={methodData.methodMaterials ?? []}- // @ts-ignore+ // @ts-expect-erroroperations={methodData.methodOperations}replenishmentSystem={toolData.toolSummary?.replenishmentSystem}revisionStatus={revisionStatus}diff --git a/apps/erp/app/routes/x+/tool+/$itemId.inventory.tsx b/apps/erp/app/routes/x+/tool+/$itemId.inventory.tsxindex d0e206e579..72b17af119 100644--- a/apps/erp/app/routes/x+/tool+/$itemId.inventory.tsx+++ b/apps/erp/app/routes/x+/tool+/$itemId.inventory.tsx@@ -8,9 +8,9 @@ import { flash } from "@carbon/auth/session.server";import { getStorageRulesDataForTarget } from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";-import { pluckUnique } from "@carbon/utils";+import { pluckUnique, redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { useStorageUnits } from "~/components/Form/StorageUnit";import { useRouteData } from "~/hooks";import {diff --git a/apps/erp/app/routes/x+/tool+/$itemId.make.$makeMethodId.tsx b/apps/erp/app/routes/x+/tool+/$itemId.make.$makeMethodId.tsxindex 07f68695c3..961e9036cc 100644--- a/apps/erp/app/routes/x+/tool+/$itemId.make.$makeMethodId.tsx+++ b/apps/erp/app/routes/x+/tool+/$itemId.make.$makeMethodId.tsx@@ -7,10 +7,11 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import type { JSONContent } from "@carbon/react";import { Menubar, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import { Suspense } from "react";import type { LoaderFunctionArgs } from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import { CadModel } from "~/components";import { useRouteData } from "~/hooks";import { usePermissions } from "~/hooks/usePermissions";diff --git a/apps/erp/app/routes/x+/tool+/$itemId.planning.tsx b/apps/erp/app/routes/x+/tool+/$itemId.planning.tsxindex ef85d54415..55cb9cfd3d 100644--- a/apps/erp/app/routes/x+/tool+/$itemId.planning.tsx+++ b/apps/erp/app/routes/x+/tool+/$itemId.planning.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { useRouteData } from "~/hooks";import {getItemPlanning,diff --git a/apps/erp/app/routes/x+/tool+/$itemId.purchasing.$supplierPartId.delete.tsx b/apps/erp/app/routes/x+/tool+/$itemId.purchasing.$supplierPartId.delete.tsxindex 1fb80b2f01..eb5b630ea0 100644--- a/apps/erp/app/routes/x+/tool+/$itemId.purchasing.$supplierPartId.delete.tsx+++ b/apps/erp/app/routes/x+/tool+/$itemId.purchasing.$supplierPartId.delete.tsx@@ -5,9 +5,10 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteSupplierPart } from "~/modules/items";import { path } from "~/utils/path";@@ -20,7 +21,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {const { supplierPartId } = params;if (!supplierPartId) throw notFound("supplierPartId not found");- // @ts-ignore TS2589 — Supabase joined-select type instantiation too deep; it// fires only under some checker states, so ignore (not expect-error) stays// green whether or not it triggers.const result = await clientdiff --git a/apps/erp/app/routes/x+/tool+/$itemId.purchasing.$supplierPartId.tsx b/apps/erp/app/routes/x+/tool+/$itemId.purchasing.$supplierPartId.tsxindex e202b7858a..3482ba58de 100644--- a/apps/erp/app/routes/x+/tool+/$itemId.purchasing.$supplierPartId.tsx+++ b/apps/erp/app/routes/x+/tool+/$itemId.purchasing.$supplierPartId.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validator } from "@carbon/form";import { useRouteData } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import type { ToolSummary } from "~/modules/items";import { supplierPartValidator, upsertSupplierPart } from "~/modules/items";import { SupplierPartForm } from "~/modules/items/ui/Item";diff --git a/apps/erp/app/routes/x+/tool+/$itemId.purchasing.tsx b/apps/erp/app/routes/x+/tool+/$itemId.purchasing.tsxindex 7f7bad08f3..d409110d1e 100644--- a/apps/erp/app/routes/x+/tool+/$itemId.purchasing.tsx+++ b/apps/erp/app/routes/x+/tool+/$itemId.purchasing.tsx@@ -7,14 +7,14 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { Suspense } from "react";import type {ActionFunctionArgs,LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Await, redirect, useLoaderData, useParams } from "react-router";+import { Await, useLoaderData, useParams } from "react-router";import { useRouteData } from "~/hooks";import { getBatchProperties } from "~/modules/inventory";import BatchPropertiesConfig from "~/modules/inventory/ui/Batches/BatchPropertiesConfig";diff --git a/apps/erp/app/routes/x+/tool+/$itemId.quality.tsx b/apps/erp/app/routes/x+/tool+/$itemId.quality.tsxindex 878a5d54f5..5335c106fa 100644--- a/apps/erp/app/routes/x+/tool+/$itemId.quality.tsx+++ b/apps/erp/app/routes/x+/tool+/$itemId.quality.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { data, redirect, useLoaderData, useParams } from "react-router";+import { data, useLoaderData, useParams } from "react-router";import invariant from "tiny-invariant";import {getInspectionDocumentsForItem,diff --git a/apps/erp/app/routes/x+/tool+/$itemId.sales.tsx b/apps/erp/app/routes/x+/tool+/$itemId.sales.tsxindex 0fef44b135..3678c28117 100644--- a/apps/erp/app/routes/x+/tool+/$itemId.sales.tsx+++ b/apps/erp/app/routes/x+/tool+/$itemId.sales.tsx@@ -11,8 +11,9 @@ import {} from "@carbon/ee/rules";import { validationError, validator } from "@carbon/form";import { VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {getItemUnitSalePrice,itemUnitSalePriceValidator,diff --git a/apps/erp/app/routes/x+/tool+/$itemId.tsx b/apps/erp/app/routes/x+/tool+/$itemId.tsxindex 9c5058f71b..4edcab6530 100644--- a/apps/erp/app/routes/x+/tool+/$itemId.tsx+++ b/apps/erp/app/routes/x+/tool+/$itemId.tsx@@ -17,7 +17,7 @@ import {TabsTrigger,useRouteData} from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { Suspense, useState } from "react";@@ -26,13 +26,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- Await,- Outlet,- redirect,- useLoaderData,- useParams-} from "react-router";+import { Await, Outlet, useLoaderData, useParams } from "react-router";import { ResizablePanels } from "~/components/Layout";import { flattenTree } from "~/components/TreeView";import type { ItemFile, ToolSummary } from "~/modules/items";@@ -258,7 +252,6 @@ export default function ToolRoute() {<BoMExploreritemType="Tool"makeMethod={resolved.makeMethod}- // @ts-ignoremethods={resolved.methods}methodId={resolved.makeMethod.id}filterText={filterText}diff --git a/apps/erp/app/routes/x+/tool+/_layout.tsx b/apps/erp/app/routes/x+/tool+/_layout.tsxindex 05d5e3fde6..7ad6f8e51b 100644--- a/apps/erp/app/routes/x+/tool+/_layout.tsx+++ b/apps/erp/app/routes/x+/tool+/_layout.tsx@@ -16,6 +16,8 @@ import { getLocationsList } from "~/modules/resources";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Tools" }];};diff --git a/apps/erp/app/routes/x+/tool+/new.tsx b/apps/erp/app/routes/x+/tool+/new.tsxindex 070df4757d..593e494369 100644--- a/apps/erp/app/routes/x+/tool+/new.tsx+++ b/apps/erp/app/routes/x+/tool+/new.tsx@@ -6,9 +6,10 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { toolValidator, upsertTool } from "~/modules/items";import { ToolForm } from "~/modules/items/ui/Tools";import { setCustomFields } from "~/utils/form";diff --git a/apps/erp/app/routes/x+/traceability+/_layout.tsx b/apps/erp/app/routes/x+/traceability+/_layout.tsxindex e4e57046f0..8427ed0497 100644--- a/apps/erp/app/routes/x+/traceability+/_layout.tsx+++ b/apps/erp/app/routes/x+/traceability+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Traceability" }];};diff --git a/apps/erp/app/routes/x+/traceability+/graph.tsx b/apps/erp/app/routes/x+/traceability+/graph.tsxindex b0007027c6..aa4b56a84c 100644--- a/apps/erp/app/routes/x+/traceability+/graph.tsx+++ b/apps/erp/app/routes/x+/traceability+/graph.tsx@@ -5,6 +5,7 @@import { requirePermissions } from "@carbon/auth/auth.server";import type { Database } from "@carbon/database";import { Button, Loading, useHydrated, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans } from "@lingui/react/macro";import type { SupabaseClient } from "@supabase/supabase-js";@@ -13,7 +14,7 @@ import { ReactFlowProvider, useReactFlow, useStore } from "@xyflow/react";import XYFlowStyle from "@xyflow/react/dist/style.css?url";import { useCallback, useMemo, useState } from "react";import type { LinksFunction, LoaderFunctionArgs } from "react-router";-import { Link, redirect, useLoaderData, useNavigation } from "react-router";+import { Link, useLoaderData, useNavigation } from "react-router";import { Empty } from "~/components";import type { Activity, TrackedEntity } from "~/modules/inventory";import {diff --git a/apps/erp/app/routes/x+/training+/$id.tsx b/apps/erp/app/routes/x+/training+/$id.tsxindex 14ed4db280..7d50903a98 100644--- a/apps/erp/app/routes/x+/training+/$id.tsx+++ b/apps/erp/app/routes/x+/training+/$id.tsx@@ -9,7 +9,7 @@ import { getLogger } from "@carbon/logger";import type { JSONContent } from "@carbon/react";import { generateHTML, useDebounce } from "@carbon/react";import { Editor } from "@carbon/react/Editor";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { getLocalTimeZone, today } from "@internationalized/date";import { msg } from "@lingui/core/macro";import { useLingui } from "@lingui/react/macro";@@ -18,13 +18,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import {- Outlet,- redirect,- useFetcher,- useLoaderData,- useParams-} from "react-router";+import { Outlet, useFetcher, useLoaderData, useParams } from "react-router";import { PanelProvider, ResizablePanels } from "~/components/Layout/Panels";import { useImageUpload, usePermissions, useUser } from "~/hooks";import {diff --git a/apps/erp/app/routes/x+/training+/_layout.tsx b/apps/erp/app/routes/x+/training+/_layout.tsxindex e8bd244443..e8c96710cf 100644--- a/apps/erp/app/routes/x+/training+/_layout.tsx+++ b/apps/erp/app/routes/x+/training+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Training" }];};diff --git a/apps/erp/app/routes/x+/training+/delete.$id.tsx b/apps/erp/app/routes/x+/training+/delete.$id.tsxindex ac06f90d6c..0b353a7d6e 100644--- a/apps/erp/app/routes/x+/training+/delete.$id.tsx+++ b/apps/erp/app/routes/x+/training+/delete.$id.tsx@@ -5,8 +5,9 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteTraining } from "~/modules/resources";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/users+/_index.tsx b/apps/erp/app/routes/x+/users+/_index.tsxindex 307bde44f3..9108d665c7 100644--- a/apps/erp/app/routes/x+/users+/_index.tsx+++ b/apps/erp/app/routes/x+/users+/_index.tsx@@ -2,8 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";-import { redirect } from "react-router";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import { path } from "~/utils/path";export async function loader() {diff --git a/apps/erp/app/routes/x+/users+/_layout.tsx b/apps/erp/app/routes/x+/users+/_layout.tsxindex 7e58482c01..b56c94ed3e 100644--- a/apps/erp/app/routes/x+/users+/_layout.tsx+++ b/apps/erp/app/routes/x+/users+/_layout.tsx@@ -11,6 +11,8 @@ import { useUsersSubmodules } from "~/modules/users";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Users" }];};diff --git a/apps/erp/app/routes/x+/users+/bulk-edit-permissions.tsx b/apps/erp/app/routes/x+/users+/bulk-edit-permissions.tsxindex c3637c7ee5..c9ab3d516a 100644--- a/apps/erp/app/routes/x+/users+/bulk-edit-permissions.tsx+++ b/apps/erp/app/routes/x+/users+/bulk-edit-permissions.tsx@@ -10,9 +10,8 @@ import { requireFeature } from "@carbon/ee/plan.server";import { validationError, validator } from "@carbon/form";import { batchTrigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {bulkPermissionsValidator,userPermissionsValidatordiff --git a/apps/erp/app/routes/x+/users+/customers.new.tsx b/apps/erp/app/routes/x+/users+/customers.new.tsxindex 39a8ec28a4..67f57b2933 100644--- a/apps/erp/app/routes/x+/users+/customers.new.tsx+++ b/apps/erp/app/routes/x+/users+/customers.new.tsx@@ -16,14 +16,13 @@ import { getSsoAwareInviteLink } from "@carbon/ee/sso.server";import { validationError, validator } from "@carbon/form";import { sendEmail } from "@carbon/lib/email.server";import { getLogger } from "@carbon/logger";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import { render } from "@react-email/components";import { nanoid } from "nanoid";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect } from "react-router";import {CreateCustomerModal,createCustomerAccountValidatordiff --git a/apps/erp/app/routes/x+/users+/customers.tsx b/apps/erp/app/routes/x+/users+/customers.tsxindex 524351ac19..8ba09b9631 100644--- a/apps/erp/app/routes/x+/users+/customers.tsx+++ b/apps/erp/app/routes/x+/users+/customers.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getCustomerTypes } from "~/modules/sales";import {CustomerAccountsTable,diff --git a/apps/erp/app/routes/x+/users+/deactivate.tsx b/apps/erp/app/routes/x+/users+/deactivate.tsxindex 2e9accda74..ea091fc9e2 100644--- a/apps/erp/app/routes/x+/users+/deactivate.tsx+++ b/apps/erp/app/routes/x+/users+/deactivate.tsx@@ -2,18 +2,17 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { error, safeRedirect, success } from "@carbon/auth";+import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { deactivateUser } from "@carbon/auth/users.server";import { validationError, validator } from "@carbon/form";import { batchTrigger } from "@carbon/jobs";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect } from "react-router";import { deactivateUsersValidator } from "~/modules/users";import { getCompanyId, invalidateUserSelectQueries } from "~/utils/react-query";@@ -36,7 +35,7 @@ export async function action({ request }: ActionFunctionArgs) {if (users.includes(userId)) {throw redirect(- safeRedirect(redirectTo),+ redirectTo,await flash(request, error(null, "You cannot deactivate yourself")));}@@ -52,7 +51,7 @@ export async function action({ request }: ActionFunctionArgs) {ip);- throw redirect(safeRedirect(redirectTo), await flash(request, result));+ throw redirect(redirectTo, await flash(request, result));} else {const batchPayload = users.map((id) => ({payload: {@@ -67,7 +66,7 @@ export async function action({ request }: ActionFunctionArgs) {try {await batchTrigger("user-admin", batchPayload);throw redirect(- safeRedirect(redirectTo),+ redirectTo,await flash(request,success("Success. Please check back in a few moments.")@@ -75,7 +74,7 @@ export async function action({ request }: ActionFunctionArgs) {);} catch (e) {throw redirect(- safeRedirect(redirectTo),+ redirectTo,await flash(request, error(e, "Failed to deactivate users")));}diff --git a/apps/erp/app/routes/x+/users+/employee-types.$employeeTypeId.tsx b/apps/erp/app/routes/x+/users+/employee-types.$employeeTypeId.tsxindex c05df87e4b..24c564b40b 100644--- a/apps/erp/app/routes/x+/users+/employee-types.$employeeTypeId.tsx+++ b/apps/erp/app/routes/x+/users+/employee-types.$employeeTypeId.tsx@@ -12,12 +12,13 @@ import {} from "@carbon/ee/permissions.server";import { requireFeature } from "@carbon/ee/plan.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import {EmployeeTypeForm,employeeTypePermissionsValidator,diff --git a/apps/erp/app/routes/x+/users+/employee-types.delete.$employeeTypeId.tsx b/apps/erp/app/routes/x+/users+/employee-types.delete.$employeeTypeId.tsxindex 0cca967260..10375d767c 100644--- a/apps/erp/app/routes/x+/users+/employee-types.delete.$employeeTypeId.tsx+++ b/apps/erp/app/routes/x+/users+/employee-types.delete.$employeeTypeId.tsx@@ -7,13 +7,14 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { deleteEmployeeType } from "@carbon/ee/permissions.server";import { requireFeature } from "@carbon/ee/plan.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { getEmployeeType } from "~/modules/users";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/users+/employee-types.new.tsx b/apps/erp/app/routes/x+/users+/employee-types.new.tsxindex 801af402d7..5b823bd73c 100644--- a/apps/erp/app/routes/x+/users+/employee-types.new.tsx+++ b/apps/erp/app/routes/x+/users+/employee-types.new.tsx@@ -12,12 +12,13 @@ import {} from "@carbon/ee/permissions.server";import { requireFeature } from "@carbon/ee/plan.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData } from "react-router";+import { data, useLoaderData } from "react-router";import type { CompanyPermission } from "~/modules/users";import {EmployeeTypeForm,diff --git a/apps/erp/app/routes/x+/users+/employees.$employeeId.tsx b/apps/erp/app/routes/x+/users+/employees.$employeeId.tsxindex 971a16e085..6a77e017d1 100644--- a/apps/erp/app/routes/x+/users+/employees.$employeeId.tsx+++ b/apps/erp/app/routes/x+/users+/employees.$employeeId.tsx@@ -21,9 +21,10 @@ import {ModalHeader,ModalOverlay,ModalTitle,+ useCloseRoute,VStack} from "@carbon/react";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import { LuShield } from "react-icons/lu";import type {@@ -31,7 +32,7 @@ import type {ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { data, redirect, useLoaderData, useNavigate } from "react-router";+import { data, useLoaderData } from "react-router";import { UpgradeOverlayUpgradeButton } from "~/components/UpgradeOverlay";import { usePlanGate } from "~/hooks/usePlanGate";import type { CompanyPermission } from "~/modules/users";@@ -52,12 +53,12 @@ import { getCompanyId, invalidateUserSelectQueries } from "~/utils/react-query";// full-page overlay), so closing it returns to the accounts list — which stays// fully usable (inviting people is a Community feature).function PermissionsUpgradeModal() {- const navigate = useNavigate();+ const closeRoute = useCloseRoute();return (<ModalopenonOpenChange={(open) => {- if (!open) navigate(-1);+ if (!open) closeRoute();}}><ModalOverlay />diff --git a/apps/erp/app/routes/x+/users+/employees.new.tsx b/apps/erp/app/routes/x+/users+/employees.new.tsxindex 0bb18b7347..e5c28d9ed3 100644--- a/apps/erp/app/routes/x+/users+/employees.new.tsx+++ b/apps/erp/app/routes/x+/users+/employees.new.tsx@@ -17,7 +17,7 @@ import { getSsoAwareInviteLink } from "@carbon/ee/sso.server";import { validationError, validator } from "@carbon/form";import { sendEmail } from "@carbon/lib/email.server";import { getLogger } from "@carbon/logger";-import { datetime, getClientIp } from "@carbon/utils";+import { datetime, getClientIp, redirect } from "@carbon/utils";import { render } from "@react-email/components";import { nanoid } from "nanoid";import type {@@ -25,7 +25,7 @@ import type {ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {CreateEmployeeModal,createEmployeeValidator,diff --git a/apps/erp/app/routes/x+/users+/employees.reset-mfa.$employeeId.tsx b/apps/erp/app/routes/x+/users+/employees.reset-mfa.$employeeId.tsxindex c243bd1aaf..c080085003 100644--- a/apps/erp/app/routes/x+/users+/employees.reset-mfa.$employeeId.tsx+++ b/apps/erp/app/routes/x+/users+/employees.reset-mfa.$employeeId.tsx@@ -19,11 +19,13 @@ import {ModalHeader,ModalOverlay,ModalTitle,+ useCloseRoute,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData, useNavigate } from "react-router";+import { useFetcher, useLoaderData } from "react-router";import type { Result } from "~/types";import { path } from "~/utils/path";@@ -105,14 +107,14 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function ResetMfaRoute() {const { user, hasFactors } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const formFetcher = useFetcher<Result>();return (<ModalopenonOpenChange={(open) => {- if (!open) navigate(-1);+ if (!open) closeRoute();}}><ModalOverlay />@@ -152,7 +154,7 @@ export default function ResetMfaRoute() {<Buttontype="button"variant="secondary"- onClick={() => navigate(-1)}+ onClick={() => closeRoute()}><Trans>Cancel</Trans></Button>diff --git a/apps/erp/app/routes/x+/users+/employees.tsx b/apps/erp/app/routes/x+/users+/employees.tsxindex 2f8f483662..3e803d2dd8 100644--- a/apps/erp/app/routes/x+/users+/employees.tsx+++ b/apps/erp/app/routes/x+/users+/employees.tsx@@ -7,13 +7,13 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import {EmployeesTable,getEmployees,diff --git a/apps/erp/app/routes/x+/users+/groups.$groupId.tsx b/apps/erp/app/routes/x+/users+/groups.$groupId.tsxindex 0c0fc32258..1cd45986cd 100644--- a/apps/erp/app/routes/x+/users+/groups.$groupId.tsx+++ b/apps/erp/app/routes/x+/users+/groups.$groupId.tsx@@ -6,12 +6,13 @@ import { assertIsPost, error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import {GroupForm,getGroupMembers,diff --git a/apps/erp/app/routes/x+/users+/groups.delete.$groupId.tsx b/apps/erp/app/routes/x+/users+/groups.delete.$groupId.tsxindex a39670e216..90c2a382af 100644--- a/apps/erp/app/routes/x+/users+/groups.delete.$groupId.tsx+++ b/apps/erp/app/routes/x+/users+/groups.delete.$groupId.tsx@@ -5,13 +5,14 @@import { error, notFound, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type {ActionFunctionArgs,ClientActionFunctionArgs,LoaderFunctionArgs} from "react-router";-import { redirect, useLoaderData, useNavigate, useParams } from "react-router";+import { useLoaderData, useNavigate, useParams } from "react-router";import { ConfirmDelete } from "~/components/Modals";import { deleteGroup, getGroup } from "~/modules/users";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/users+/groups.new.tsx b/apps/erp/app/routes/x+/users+/groups.new.tsxindex 7ac13837e0..26435f4014 100644--- a/apps/erp/app/routes/x+/users+/groups.new.tsx+++ b/apps/erp/app/routes/x+/users+/groups.new.tsx@@ -6,11 +6,12 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {deleteGroup,GroupForm,diff --git a/apps/erp/app/routes/x+/users+/groups.tsx b/apps/erp/app/routes/x+/users+/groups.tsxindex 76c16cb84c..afdfd2e159 100644--- a/apps/erp/app/routes/x+/users+/groups.tsx+++ b/apps/erp/app/routes/x+/users+/groups.tsx@@ -71,7 +71,6 @@ export default function GroupsRoute() {return (<VStack spacing={0} className="h-full">- {/* @ts-ignore */}<GroupsTable data={groups} count={count} /><Outlet /></VStack>diff --git a/apps/erp/app/routes/x+/users+/operators.$operatorId.tsx b/apps/erp/app/routes/x+/users+/operators.$operatorId.tsxindex b367257115..1391c20462 100644--- a/apps/erp/app/routes/x+/users+/operators.$operatorId.tsx+++ b/apps/erp/app/routes/x+/users+/operators.$operatorId.tsx@@ -15,12 +15,14 @@ import {ModalHeader,ModalOverlay,ModalTitle,+ useCloseRoute,useMount,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData, useNavigate } from "react-router";+import { useFetcher, useLoaderData } from "react-router";import { Input, Select, Submit } from "~/components/Form";import { convertOperatorValidator } from "~/modules/users/users.models";import { convertConsoleOperatorToUser } from "~/modules/users/users.server";@@ -96,7 +98,7 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function ConvertOperatorRoute() {const { t } = useLingui();const { operator } = useLoaderData<typeof loader>();- const navigate = useNavigate();+ const closeRoute = useCloseRoute();const formFetcher = useFetcher<Result>();const employeeTypeFetcher =useFetcher<Awaited<ReturnType<typeof getEmployeeTypes>>>();@@ -117,7 +119,7 @@ export default function ConvertOperatorRoute() {<ModalopenonOpenChange={(open) => {- if (!open) navigate(-1);+ if (!open) closeRoute();}}><ModalOverlay />diff --git a/apps/erp/app/routes/x+/users+/operators.new.tsx b/apps/erp/app/routes/x+/users+/operators.new.tsxindex 21d02e5ba2..b60908b5c5 100644--- a/apps/erp/app/routes/x+/users+/operators.new.tsx+++ b/apps/erp/app/routes/x+/users+/operators.new.tsx@@ -20,12 +20,14 @@ import {ModalHeader,ModalOverlay,ModalTitle,+ useCloseRoute,VStack} from "@carbon/react";import { updateSubscriptionQuantityForCompany } from "@carbon/stripe/stripe.server";+import { redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useNavigate } from "react-router";+import { useFetcher, useNavigate } from "react-router";import { Input, Location, Submit } from "~/components/Form";import { useUser } from "~/hooks";import { createOperatorValidator } from "~/modules/users/users.models";@@ -135,6 +137,7 @@ export default function NewOperatorRoute() {const { t } = useLingui();const { defaults } = useUser();const navigate = useNavigate();+ const closeRoute = useCloseRoute();const formFetcher = useFetcher<typeof action>();const created =formFetcher.data && "pin" in formFetcher.data ? formFetcher.data : null;@@ -145,7 +148,7 @@ export default function NewOperatorRoute() {onOpenChange={(open) => {if (open) return;if (created) navigate(path.to.operators);- else navigate(-1);+ else closeRoute();}}><ModalOverlay />diff --git a/apps/erp/app/routes/x+/users+/operators.reset-pin.$operatorId.tsx b/apps/erp/app/routes/x+/users+/operators.reset-pin.$operatorId.tsxindex b2e86f9171..1549ea4a70 100644--- a/apps/erp/app/routes/x+/users+/operators.reset-pin.$operatorId.tsx+++ b/apps/erp/app/routes/x+/users+/operators.reset-pin.$operatorId.tsx@@ -18,11 +18,13 @@ import {ModalHeader,ModalOverlay,ModalTitle,+ useCloseRoute,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect, useFetcher, useLoaderData, useNavigate } from "react-router";+import { useFetcher, useLoaderData, useNavigate } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { path } from "~/utils/path";@@ -109,6 +111,7 @@ export async function action({ request, params }: ActionFunctionArgs) {export default function ResetPinRoute() {const { operator } = useLoaderData<typeof loader>();const navigate = useNavigate();+ const closeRoute = useCloseRoute();const formFetcher = useFetcher<typeof action>();const newPin =formFetcher.data?.success === true ? formFetcher.data.pin : null;@@ -121,7 +124,7 @@ export default function ResetPinRoute() {onOpenChange={(open) => {if (open) return;if (newPin) navigate(path.to.operators);- else navigate(-1);+ else closeRoute();}}><ModalOverlay />diff --git a/apps/erp/app/routes/x+/users+/operators.tsx b/apps/erp/app/routes/x+/users+/operators.tsxindex 05ce3d3901..e7123fb183 100644--- a/apps/erp/app/routes/x+/users+/operators.tsx+++ b/apps/erp/app/routes/x+/users+/operators.tsx@@ -6,7 +6,7 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { Checkbox, MenuIcon, MenuItem } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { useLingui } from "@lingui/react/macro";import type { ColumnDef } from "@tanstack/react-table";@@ -22,7 +22,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData, useNavigate } from "react-router";+import { Outlet, useLoaderData, useNavigate } from "react-router";import { EmployeeAvatar, New, Table } from "~/components";import { Enumerable } from "~/components/Enumerable";import { usePermissions, useUrlParams } from "~/hooks";diff --git a/apps/erp/app/routes/x+/users+/suppliers.new.tsx b/apps/erp/app/routes/x+/users+/suppliers.new.tsxindex bdad78e59d..dba90c2e9f 100644--- a/apps/erp/app/routes/x+/users+/suppliers.new.tsx+++ b/apps/erp/app/routes/x+/users+/suppliers.new.tsx@@ -16,14 +16,13 @@ import { getSsoAwareInviteLink } from "@carbon/ee/sso.server";import { validationError, validator } from "@carbon/form";import { sendEmail } from "@carbon/lib/email.server";import { getLogger } from "@carbon/logger";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import { render } from "@react-email/components";import { nanoid } from "nanoid";import type {ActionFunctionArgs,ClientActionFunctionArgs} from "react-router";-import { redirect } from "react-router";import {CreateSupplierModal,createSupplierAccountValidatordiff --git a/apps/erp/app/routes/x+/users+/suppliers.tsx b/apps/erp/app/routes/x+/users+/suppliers.tsxindex cc69f00ceb..d55491cd9b 100644--- a/apps/erp/app/routes/x+/users+/suppliers.tsx+++ b/apps/erp/app/routes/x+/users+/suppliers.tsx@@ -6,13 +6,13 @@ import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { VStack } from "@carbon/react";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { getSupplierTypes } from "~/modules/purchasing";import {getSuppliers,diff --git a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId._index.tsx b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId._index.tsxindex ee55565161..865702d6c9 100644--- a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId._index.tsx+++ b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId._index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.delete.tsx b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.delete.tsxindex d6b9534996..5438abb28e 100644--- a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.delete.tsx+++ b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.delete.tsx@@ -5,8 +5,8 @@import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { deleteWarehouseTransfer } from "~/modules/inventory";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.details.$id.tsx b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.details.$id.tsxindex b7717f179c..0b6db5720b 100644--- a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.details.$id.tsx+++ b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.details.$id.tsx@@ -6,14 +6,10 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { useCloseRoute } from "@carbon/react";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import {- data,- redirect,- useLoaderData,- useNavigate,- useParams-} from "react-router";+import { data, useLoaderData, useParams } from "react-router";import { z } from "zod";import { zfd } from "zod-form-data";import {@@ -190,7 +186,7 @@ export default function WarehouseTransferLineDetailsRoute() {notes: warehouseTransferLine.notes ?? ""};- const navigate = useNavigate();+ const closeRoute = useCloseRoute();return (<div className="flex flex-col gap-4 pb-16 w-full">@@ -198,7 +194,7 @@ export default function WarehouseTransferLineDetailsRoute() {key={initialValues.id}initialValues={initialValues}warehouseTransfer={warehouseTransferLine.warehouseTransfer!}- onClose={() => navigate(-1)}+ onClose={() => closeRoute()}/></div>);diff --git a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.details.new.tsx b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.details.new.tsxindex 68a9b27de5..7f15aa1a6f 100644--- a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.details.new.tsx+++ b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.details.new.tsx@@ -3,8 +3,9 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { requirePermissions } from "@carbon/auth/auth.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect, useNavigate, useParams } from "react-router";+import { useNavigate, useParams } from "react-router";import { useRouteData } from "~/hooks";import type {WarehouseTransfer,diff --git a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.details.tsx b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.details.tsxindex 52bc320997..d1e46dca29 100644--- a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.details.tsx+++ b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.details.tsx@@ -6,8 +6,9 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useParams } from "react-router";+import { data, useParams } from "react-router";import { useRouteData } from "~/hooks";import type {WarehouseTransfer,diff --git a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.receive.tsx b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.receive.tsxindex b991deb2a2..9ce65f5bfe 100644--- a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.receive.tsx+++ b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.receive.tsx@@ -2,8 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.ship.tsx b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.ship.tsxindex aa9dade415..0f4dfa06dd 100644--- a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.ship.tsx+++ b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.ship.tsx@@ -2,8 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ params }: LoaderFunctionArgs) {diff --git a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.status.tsx b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.status.tsxindex 590e675377..4fc96b2a38 100644--- a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.status.tsx+++ b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.status.tsx@@ -7,8 +7,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { evaluateLinesForSurface, isBlocked } from "@carbon/ee/rules.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {updateWarehouseTransferStatus,warehouseTransferStatusTypediff --git a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.tsx b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.tsxindex 4dca5d7eca..32c4a2dd28 100644--- a/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.tsx+++ b/apps/erp/app/routes/x+/warehouse-transfer+/$transferId.tsx@@ -5,13 +5,13 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";-import { isUnaffectedByNavigation } from "@carbon/utils";+import { isUnaffectedByNavigation, redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useParams } from "react-router";+import { Outlet, useParams } from "react-router";import {getWarehouseTransfer,getWarehouseTransferLinesdiff --git a/apps/erp/app/routes/x+/warehouse-transfer+/_layout.tsx b/apps/erp/app/routes/x+/warehouse-transfer+/_layout.tsxindex 4535404485..c463cb3c8d 100644--- a/apps/erp/app/routes/x+/warehouse-transfer+/_layout.tsx+++ b/apps/erp/app/routes/x+/warehouse-transfer+/_layout.tsx@@ -8,6 +8,8 @@ import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Warehouse Transfer" }];};diff --git a/apps/erp/app/routes/x+/warehouse-transfer+/new.tsx b/apps/erp/app/routes/x+/warehouse-transfer+/new.tsxindex b98405c798..07285f66c4 100644--- a/apps/erp/app/routes/x+/warehouse-transfer+/new.tsx+++ b/apps/erp/app/routes/x+/warehouse-transfer+/new.tsx@@ -6,9 +6,9 @@ import { assertIsPost, error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { useUser } from "~/hooks";import {insertWarehouseTransfer,diff --git a/apps/erp/app/routes/x+/workflow+/$id.tsx b/apps/erp/app/routes/x+/workflow+/$id.tsxindex 462cfc4419..e22b8de24a 100644--- a/apps/erp/app/routes/x+/workflow+/$id.tsx+++ b/apps/erp/app/routes/x+/workflow+/$id.tsx@@ -12,6 +12,7 @@ import {useDisclosure,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans } from "@lingui/react/macro";import { ReactFlowProvider } from "@xyflow/react";@@ -22,7 +23,7 @@ import type {LoaderFunctionArgs,ShouldRevalidateFunctionArgs} from "react-router";-import { redirect, useLoaderData } from "react-router";+import { useLoaderData } from "react-router";import { usePermissions } from "~/hooks";import {getWorkflow,diff --git a/apps/erp/app/routes/x+/workflow+/$id.version.new.tsx b/apps/erp/app/routes/x+/workflow+/$id.version.new.tsxindex 0e8210cc43..2f68fbb7f9 100644--- a/apps/erp/app/routes/x+/workflow+/$id.version.new.tsx+++ b/apps/erp/app/routes/x+/workflow+/$id.version.new.tsx@@ -9,8 +9,9 @@ import type { Json } from "@carbon/database";import { requireFeature } from "@carbon/ee/plan.server";import { CURRENT_DEFINITION_FORMAT_VERSION } from "@carbon/ee/workflows";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import {getWorkflowVersion,getWorkflowVersions,diff --git a/apps/erp/app/routes/x+/workflow+/_layout.tsx b/apps/erp/app/routes/x+/workflow+/_layout.tsxindex 2df27bf1e3..99fe1aa1f4 100644--- a/apps/erp/app/routes/x+/workflow+/_layout.tsx+++ b/apps/erp/app/routes/x+/workflow+/_layout.tsx@@ -6,6 +6,8 @@ import type { MetaFunction } from "react-router";import { Outlet } from "react-router";import type { Handle } from "~/utils/handle";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Workflow" }];};diff --git a/apps/erp/app/routes/x+/workflows+/$id.rename.tsx b/apps/erp/app/routes/x+/workflows+/$id.rename.tsxindex 3fef2f633b..b6a49aed3b 100644--- a/apps/erp/app/routes/x+/workflows+/$id.rename.tsx+++ b/apps/erp/app/routes/x+/workflows+/$id.rename.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { updateWorkflow, workflowValidator } from "~/modules/workflows";import { path } from "~/utils/path";diff --git a/apps/erp/app/routes/x+/workflows+/_layout.tsx b/apps/erp/app/routes/x+/workflows+/_layout.tsxindex 7a5c071d26..572506720c 100644--- a/apps/erp/app/routes/x+/workflows+/_layout.tsx+++ b/apps/erp/app/routes/x+/workflows+/_layout.tsx@@ -11,6 +11,8 @@ import useWorkflowsSubmodules from "~/modules/workflows/ui/useWorkflowsSubmoduleimport type { Handle } from "~/utils/handle";import { path } from "~/utils/path";+export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react/ErrorBoundary";+export const meta: MetaFunction = () => {return [{ title: "Carbon | Workflows" }];};diff --git a/apps/erp/app/routes/x+/workflows+/delete.$id.tsx b/apps/erp/app/routes/x+/workflows+/delete.$id.tsxindex 2f1c102633..c03146b4c6 100644--- a/apps/erp/app/routes/x+/workflows+/delete.$id.tsx+++ b/apps/erp/app/routes/x+/workflows+/delete.$id.tsx@@ -6,8 +6,9 @@ import { error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";import { requireFeature } from "@carbon/ee/plan.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { deleteWorkflow } from "~/modules/workflows";import { syncAfterWorkflowDelete } from "~/modules/workflows/workflows.server";import { path } from "~/utils/path";diff --git a/apps/erp/app/services/app-shell.server.test.ts b/apps/erp/app/services/app-shell.server.test.tsnew file mode 100644index 0000000000..4d4ca7b38c--- /dev/null+++ b/apps/erp/app/services/app-shell.server.test.ts@@ -0,0 +1,52 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import { describe, expect, it, vi } from "vitest";++vi.mock("~/modules/settings", () => ({+ withLogoUrls: (company: { logoLight: string | null }) => ({+ ...company,+ logoLight: company.logoLight ? `cdn/${company.logoLight}` : null+ })+}));++const { getAppShell } = await import("./app-shell.server");++type Client = Parameters<typeof getAppShell>[0];+const clientReturning = (result: unknown) => {+ const rpc = vi.fn(async () => result);+ return { client: { rpc } as unknown as Client, rpc };+};++describe("getAppShell", () => {+ it("asks for the caller's company and user, and resolves company logos", async () => {+ const { client, rpc } = clientReturning({+ data: {+ companies: [{ id: "c1", logoLight: "logo.png" }],+ groups: ["g1"],+ user: { id: "u1" }+ },+ error: null+ });+ const shell = await getAppShell(client, "c1", "u1");+ expect(rpc).toHaveBeenCalledWith("get_app_shell", {+ company_id: "c1",+ user_id: "u1"+ });+ expect(shell.error).toBeNull();+ expect(shell.data?.companies).toEqual([+ { id: "c1", logoLight: "cdn/logo.png" }+ ]);+ expect(shell.data?.groups).toEqual(["g1"]);+ });++ it("returns the error and no data when the read fails", async () => {+ const error = { message: "boom" };+ const { client } = clientReturning({ data: null, error });+ expect(await getAppShell(client, "c1", "u1")).toEqual({+ data: null,+ error+ });+ });+});diff --git a/apps/erp/app/services/app-shell.server.ts b/apps/erp/app/services/app-shell.server.tsnew file mode 100644index 0000000000..1ef5a768d2--- /dev/null+++ b/apps/erp/app/services/app-shell.server.ts@@ -0,0 +1,53 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import type { Database } from "@carbon/database";+import type { PrinterRoute } from "@carbon/printing";+import type { SupabaseClient } from "@supabase/supabase-js";+import { withLogoUrls } from "~/modules/settings";++type Tables = Database["public"]["Tables"];+type Views = Database["public"]["Views"];++// What `get_app_shell` returns: the rows the shell used to read with nine+// requests. Each key holds what `select("*")` on that table returned.+type AppShellRows = {+ companies: Views["companies"]["Row"][];+ companyIntegrations: Tables["companyIntegration"]["Row"][];+ companySettings: Tables["companySettings"]["Row"] | null;+ savedViews: Tables["tableView"]["Row"][];+ user: Tables["user"]["Row"] | null;+ groups: string[];+ defaults: Views["userDefaults"]["Row"] | null;+ modulePreferences: Pick<+ Tables["userModulePreference"]["Row"],+ "module" | "position" | "hidden"+ >[];+ printerRoutes: PrinterRoute[];+ implementationHub: Tables["implementationHub"]["Row"] | null;+};++/**+ * Everything the app shell reads about the user and the company, in one round+ * trip. `client` is the user's own client: the function runs as them, so each+ * table's RLS applies as it did when these were separate requests.+ */+export async function getAppShell(+ client: SupabaseClient<Database>,+ companyId: string,+ userId: string+) {+ const result = await client.rpc("get_app_shell", {+ company_id: companyId,+ user_id: userId+ });+ if (result.error || !result.data) {+ return { data: null, error: result.error ?? new Error("Empty app shell") };+ }+ const rows = result.data as unknown as AppShellRows;+ return {+ data: { ...rows, companies: rows.companies.map(withLogoUrls) },+ error: null+ };+}diff --git a/apps/erp/app/services/implementation-signals.server.test.ts b/apps/erp/app/services/implementation-signals.server.test.tsnew file mode 100644index 0000000000..4f64bd5bbc--- /dev/null+++ b/apps/erp/app/services/implementation-signals.server.test.ts@@ -0,0 +1,74 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import { beforeEach, describe, expect, it, vi } from "vitest";++const store = new Map<string, string>();+const redis = {+ get: vi.fn(async (key: string) => store.get(key) ?? null),+ set: vi.fn(async (key: string, value: string) => {+ store.set(key, value);+ })+};+vi.mock("@carbon/kv", () => ({ redis }));++const detect = vi.fn();+vi.mock("@carbon/onboarding/server", () => ({+ detectImplementationSignals: detect+}));++const { getImplementationSignals } = await import(+ "./implementation-signals.server"+);++const client = {} as Parameters<typeof getImplementationSignals>[0];+const signals = (overrides: Record<string, boolean>) => ({+ hasItems: false,+ hasMakeMethod: false,+ hasJob: false,+ hasSalesOrder: false,+ hasTrackedEntity: false,+ ...overrides+});++beforeEach(() => {+ store.clear();+ vi.clearAllMocks();+});++describe("getImplementationSignals", () => {+ it("remembers the signals seen true and passes them as known next time", async () => {+ detect.mockResolvedValueOnce(signals({ hasItems: true, hasJob: true }));+ await getImplementationSignals(client, "c1");+ expect(detect).toHaveBeenLastCalledWith(client, "c1", {});++ detect.mockResolvedValueOnce(signals({ hasItems: true, hasJob: true }));+ await getImplementationSignals(client, "c1");+ expect(detect).toHaveBeenLastCalledWith(client, "c1", {+ hasItems: true,+ hasJob: true+ });+ // Nothing new was seen the second time, so nothing is rewritten.+ expect(redis.set).toHaveBeenCalledTimes(1);+ });++ it("keeps one company's signals away from another's", async () => {+ detect.mockResolvedValueOnce(signals({ hasItems: true }));+ await getImplementationSignals(client, "c1");++ detect.mockResolvedValueOnce(signals({}));+ await getImplementationSignals(client, "c2");+ expect(detect).toHaveBeenLastCalledWith(client, "c2", {});+ });++ it("probes everything when Redis is unavailable", async () => {+ redis.get.mockRejectedValueOnce(new Error("down"));+ redis.set.mockRejectedValueOnce(new Error("down"));+ detect.mockResolvedValueOnce(signals({ hasItems: true }));+ await expect(getImplementationSignals(client, "c1")).resolves.toEqual(+ signals({ hasItems: true })+ );+ expect(detect).toHaveBeenLastCalledWith(client, "c1", {});+ });+});diff --git a/apps/erp/app/services/implementation-signals.server.ts b/apps/erp/app/services/implementation-signals.server.tsnew file mode 100644index 0000000000..fa482506ac--- /dev/null+++ b/apps/erp/app/services/implementation-signals.server.ts@@ -0,0 +1,58 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import type { Database } from "@carbon/database";+import { redis } from "@carbon/kv";+import { getLogger } from "@carbon/logger";+import type { Signals } from "@carbon/onboarding";+import { detectImplementationSignals } from "@carbon/onboarding/server";+import type { SupabaseClient } from "@supabase/supabase-js";++const log = getLogger("erp", "implementation-signals");++// A day, not forever: wiping a company's data (a demo template revert, a+// restore) can make a signal false again, and this bounds how long the hub+// would keep showing that step as done.+const TTL_SECONDS = 60 * 60 * 24;++const key = (companyId: string) => `implementation:signals:${companyId}`;++/**+ * The hub's product signals, probing only the ones not already seen true.+ *+ * The app shell loads these on every page for an enrolled company — five+ * existence queries each time. A signal that is true stays true, so it is+ * remembered per company and its probe is skipped; a company that has done+ * all five steps costs one Redis read instead.+ */+export async function getImplementationSignals(+ client: SupabaseClient<Database>,+ companyId: string+): Promise<Signals> {+ let known: Partial<Signals> = {};+ try {+ const cached = await redis.get(key(companyId));+ if (cached) known = JSON.parse(cached) as Partial<Signals>;+ } catch (error) {+ // Redis is an optimisation here; without it, probe everything.+ log.warn("Could not read cached implementation signals", {+ companyId,+ error+ });+ }++ const signals = await detectImplementationSignals(client, companyId, known);++ const seen = Object.fromEntries(+ Object.entries(signals).filter(([, value]) => value)+ ) as Partial<Signals>;+ if (Object.keys(seen).length > Object.keys(known).length) {+ try {+ await redis.set(key(companyId), JSON.stringify(seen), "EX", TTL_SECONDS);+ } catch (error) {+ log.warn("Could not cache implementation signals", { companyId, error });+ }+ }+ return signals;+}diff --git a/apps/erp/app/stores/stock-transfer.ts b/apps/erp/app/stores/stock-transfer.tsindex b4556d2034..f28ed19747 100644--- a/apps/erp/app/stores/stock-transfer.ts+++ b/apps/erp/app/stores/stock-transfer.ts@@ -2,9 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { useStore as useValue } from "@nanostores/react";-import { atom, computed } from "nanostores";-import { useNanoStore } from "~/hooks";+import { create } from "zustand";// Stock Transfer Wizard Storeexport type StockTransferWizardLine = {@@ -36,26 +34,27 @@ export type StockTransferWizardState = {lines: StockTransferWizardLine[];};-const $wizardStore = atom<StockTransferWizardState>({+const useWizardStore = create<StockTransferWizardState>()(() => ({activeDestination: null,lines: []-});+}));-const $wizardLinesCount = computed(- $wizardStore,- (wizard) => wizard.lines.filter((line) => (line.quantity ?? 0) > 0).length-);--const $wizardTotalQuantity = computed($wizardStore, (wizard) =>- wizard.lines.reduce((sum, line) => sum + (line.quantity ?? 0), 0)-);+const $wizardStore = {+ get: useWizardStore.getState,+ set: (wizard: StockTransferWizardState) =>+ useWizardStore.setState(wizard, true)+};export const useStockTransferWizard = () =>- useNanoStore<StockTransferWizardState>($wizardStore, "wizard");+ [useWizardStore(), $wizardStore.set] as const;export const useStockTransferWizardLinesCount = () =>- useValue($wizardLinesCount);+ useWizardStore(+ (wizard) => wizard.lines.filter((line) => (line.quantity ?? 0) > 0).length+ );export const useStockTransferWizardTotalQuantity = () =>- useValue($wizardTotalQuantity);+ useWizardStore((wizard) =>+ wizard.lines.reduce((sum, line) => sum + (line.quantity ?? 0), 0)+ );// Stock Transfer Wizard actionsdiff --git a/apps/erp/app/styles/prosemirror.css b/apps/erp/app/styles/prosemirror.cssindex 7e5abf6cb6..8a32448119 100644--- a/apps/erp/app/styles/prosemirror.css+++ b/apps/erp/app/styles/prosemirror.css@@ -126,7 +126,7 @@ ul[data-type="taskList"] li[data-checked="true"] > div > p {.drag-handle {position: fixed;opacity: 1;- transition: opacity ease-in 0.2s;+ transition: opacity ease-out 0.2s;border-radius: 0.25rem;background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 10 10' style='fill: rgba(0, 0, 0, 0.5)'%3E%3Cpath d='M3,2 C2.44771525,2 2,1.55228475 2,1 C2,0.44771525 2.44771525,0 3,0 C3.55228475,0 4,0.44771525 4,1 C4,1.55228475 3.55228475,2 3,2 Z M3,6 C2.44771525,6 2,5.55228475 2,5 C2,4.44771525 2.44771525,4 3,4 C3.55228475,4 4,4.44771525 4,5 C4,5.55228475 3.55228475,6 3,6 Z M3,10 C2.44771525,10 2,9.55228475 2,9 C2,8.44771525 2.44771525,8 3,8 C3.55228475,8 4,8.44771525 4,9 C4,9.55228475 3.55228475,10 3,10 Z M7,2 C6.44771525,2 6,1.55228475 6,1 C6,0.44771525 6.44771525,0 7,0 C7.55228475,0 8,0.44771525 8,1 C8,1.55228475 7.55228475,2 7,2 Z M7,6 C6.44771525,6 6,5.55228475 6,5 C6,4.44771525 6.44771525,4 7,4 C7.55228475,4 8,4.44771525 8,5 C8,5.55228475 7.55228475,6 7,6 Z M7,10 C6.44771525,10 6,9.55228475 6,9 C6,8.44771525 6.44771525,8 7,8 C7.55228475,8 8,8.44771525 8,9 C8,9.55228475 7.55228475,10 7,10 Z'%3E%3C/path%3E%3C/svg%3E");background-size: calc(0.5em + 0.375rem) calc(0.5em + 0.375rem);diff --git a/apps/erp/app/utils/lockedGuard.server.ts b/apps/erp/app/utils/lockedGuard.server.tsindex c9e9905cfd..81ac17a1c5 100644--- a/apps/erp/app/utils/lockedGuard.server.ts+++ b/apps/erp/app/utils/lockedGuard.server.ts@@ -4,7 +4,7 @@import { error } from "@carbon/auth";import { flash } from "@carbon/auth/session.server";-import { redirect } from "react-router";+import { redirect } from "@carbon/utils";const DEFAULT_MESSAGE ="Cannot modify a locked document. Reopen it first." as const;diff --git a/apps/erp/app/utils/redirect-before-loaders.test.ts b/apps/erp/app/utils/redirect-before-loaders.test.tsindex f1c04c1a17..d56bd77c71 100644--- a/apps/erp/app/utils/redirect-before-loaders.test.ts+++ b/apps/erp/app/utils/redirect-before-loaders.test.ts@@ -2,12 +2,11 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import {createStaticHandler,type LoaderFunctionArgs,- RouterContextProvider,- redirect+ RouterContextProvider} from "react-router";import { describe, expect, it, vi } from "vitest";diff --git a/apps/erp/package.json b/apps/erp/package.jsonindex 2473d26e5d..9504ef1ba6 100644--- a/apps/erp/package.json+++ b/apps/erp/package.json@@ -78,7 +78,6 @@"d3-force": "3.0.0","dompurify": "catalog:","emoji-mart": "5.6.0",- "framer-motion": "catalog:","inngest": "^3.52.7","intl-parse-accept-language": "catalog:","isbot": "catalog:",@@ -90,7 +89,7 @@"lodash.template": "4.18.1","lodash.words": "4.2.0","monaco-editor": "0.44.0",- "motion": "12.38.0",+ "motion": "catalog:","motion-number": "0.1.7","nanoid": "catalog:","nanostores": "catalog:",diff --git a/apps/mes/app/components/AssemblyView.tsx b/apps/mes/app/components/AssemblyView.tsxindex 5cb1973ca7..b53c245dcb 100644--- a/apps/mes/app/components/AssemblyView.tsx+++ b/apps/mes/app/components/AssemblyView.tsx@@ -1660,7 +1660,7 @@ export function AssemblyView({mode === "dark" ? user.company.logoDarkIcon : user.company.logoLightIcon;return (- <div className="relative flex h-screen w-full flex-col overflow-hidden bg-background text-foreground">+ <div className="relative flex h-dvh w-full flex-col overflow-hidden bg-background text-foreground">{/* ── HEADER ── */}<header className="flex h-[52px] shrink-0 items-center bg-card border-b border-border">{/* Full-height segment matching the Flag issue / Complete / timer buttons. */}diff --git a/apps/mes/app/components/ConsolePill.tsx b/apps/mes/app/components/ConsolePill.tsxindex 89817c7dfe..ab8614452a 100644--- a/apps/mes/app/components/ConsolePill.tsx+++ b/apps/mes/app/components/ConsolePill.tsx@@ -36,7 +36,7 @@ export function ConsolePill({<buttontype="button"onClick={() => setOpen(true)}- className="fixed top-3 left-1/2 -translate-x-1/2 z-40 flex items-center gap-2 rounded-full border bg-card/90 backdrop-blur-md px-3 py-1.5 shadow-lg transition-all duration-200 hover:shadow-xl active:scale-[0.98] select-none"+ className="fixed top-3 left-1/2 -translate-x-1/2 z-40 flex items-center gap-2 rounded-full border bg-card/90 backdrop-blur-md px-3 py-1.5 shadow-lg transition-[box-shadow,transform] duration-200 hover:shadow-xl active:scale-[0.98] select-none"><Avatar size="xs" name={user.name} src={user.avatarUrl ?? undefined} /><span className="text-xs font-medium max-w-[130px] truncate">diff --git a/apps/mes/app/components/Enumerable.tsx b/apps/mes/app/components/Enumerable.tsxindex daf2a1ae6e..b573b4d4b6 100644--- a/apps/mes/app/components/Enumerable.tsx+++ b/apps/mes/app/components/Enumerable.tsx@@ -2,27 +2,4 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import type { BadgeProps } from "@carbon/react";-import { Badge, useMode } from "@carbon/react";-import type { Color } from "@carbon/utils";-import { getColor, getColorByValue } from "@carbon/utils";--type EnumerableProps = BadgeProps & {- value: string | null;- color?: Color;-};--const Enumerable = ({ value, color, ...props }: EnumerableProps) => {- const mode = useMode();- if (!value) return null;-- const style = color ? getColor(color, mode) : getColorByValue(value, mode);- return (- <Badge style={{ ...style, borderColor: `${style.color}33` }} {...props}>- {value}- </Badge>- );-};--export { Enumerable };-export default Enumerable;+export { Enumerable } from "@carbon/react";diff --git a/apps/mes/app/components/Inspection/InspectionDrawingPane.tsx b/apps/mes/app/components/Inspection/InspectionDrawingPane.tsxindex 797a650d69..2afe09ea9e 100644--- a/apps/mes/app/components/Inspection/InspectionDrawingPane.tsx+++ b/apps/mes/app/components/Inspection/InspectionDrawingPane.tsx@@ -12,9 +12,14 @@ import {import { useEffect, useMemo, useRef, useState } from "react";import { LuChevronLeft, LuChevronRight } from "react-icons/lu";import { Circle, Group, Layer, Line, Stage, Text } from "react-konva";-import { Document, Page } from "react-pdf";+import { Document, Page, pdfjs } from "react-pdf";import "react-pdf/dist/Page/AnnotationLayer.css";import "react-pdf/dist/Page/TextLayer.css";+import { registerReactPdfWorker } from "@carbon/files/pdf/worker";++// Registered here, not in the client entry: this module is lazy, so the PDF+// engine stays out of every page that shows no PDF.+registerReactPdfWorker(pdfjs);export type DrawingBalloon = {id: string;diff --git a/apps/mes/app/components/Inspection/InspectionView.tsx b/apps/mes/app/components/Inspection/InspectionView.tsxindex 0ddf24f835..0238658d5e 100644--- a/apps/mes/app/components/Inspection/InspectionView.tsx+++ b/apps/mes/app/components/Inspection/InspectionView.tsx@@ -611,7 +611,7 @@ export function InspectionView({mode === "dark" ? user.company.logoDarkIcon : user.company.logoLightIcon;return (- <div className="relative flex h-screen w-full flex-col overflow-hidden bg-background text-foreground">+ <div className="relative flex h-dvh w-full flex-col overflow-hidden bg-background text-foreground">{/* ── HEADER ── */}<header className="flex h-[52px] shrink-0 items-center bg-card border-b border-border"><SidebarTrigger className="h-full w-auto shrink-0 rounded-none border-r border-border px-2 hover:bg-accent md:px-4" />diff --git a/apps/mes/app/components/ItemThumbnail.tsx b/apps/mes/app/components/ItemThumbnail.tsxindex 09f220ef55..2f5cdf4392 100644--- a/apps/mes/app/components/ItemThumbnail.tsx+++ b/apps/mes/app/components/ItemThumbnail.tsx@@ -86,6 +86,8 @@ const ItemThumbnail = ({return thumbnailPath && failedPath !== thumbnailPath ? (<img+ loading="lazy"+ decoding="async"alt="thumbnail"className={cn(itemVariants({ size, withPadding: false }),diff --git a/apps/mes/app/components/JobOperation/JobOperation.tsx b/apps/mes/app/components/JobOperation/JobOperation.tsxindex 65e7058999..007123749d 100644--- a/apps/mes/app/components/JobOperation/JobOperation.tsx+++ b/apps/mes/app/components/JobOperation/JobOperation.tsx@@ -2326,7 +2326,7 @@ export const JobOperation = ({pathToFile={getFilePath(file)}- // @ts-ignore+ // @ts-expect-errortype={getFileType(file.name)}@@ -3294,7 +3294,6 @@ export const JobOperation = ({</Await></Suspense>)}- {/* @ts-ignore */}{finishModal.isOpen && (<Suspense key={`finish-modal-${operationId}`}><Await resolve={procedure}>diff --git a/apps/mes/app/components/JobOperation/components/BatchOverview.tsx b/apps/mes/app/components/JobOperation/components/BatchOverview.tsxindex bb3a3ce84c..a6764d9257 100644--- a/apps/mes/app/components/JobOperation/components/BatchOverview.tsx+++ b/apps/mes/app/components/JobOperation/components/BatchOverview.tsx@@ -809,7 +809,7 @@ export function BatchOverview({<FilePreviewbucket="private"pathToFile={file.storagePath}- // @ts-ignore FilePreview narrows type+ // @ts-expect-error FilePreview narrows typetype={type}>{name}diff --git a/apps/mes/app/components/JobOperation/components/Controls.tsx b/apps/mes/app/components/JobOperation/components/Controls.tsxindex cfc72200c6..5ba3e72db5 100644--- a/apps/mes/app/components/JobOperation/components/Controls.tsx+++ b/apps/mes/app/components/JobOperation/components/Controls.tsx@@ -15,7 +15,7 @@ import {useShortcutKeys} from "@carbon/react";import { Trans, useLingui } from "@lingui/react/macro";-import { AnimatePresence, motion } from "framer-motion";+import { AnimatePresence, motion } from "motion/react";import type { ComponentProps, ReactNode } from "react";import { forwardRef, useCallback, useMemo, useRef, useState } from "react";import { FaPause, FaPlay } from "react-icons/fa6";diff --git a/apps/mes/app/components/JobOperation/components/QuantityModal.tsx b/apps/mes/app/components/JobOperation/components/QuantityModal.tsxindex 21fac091ba..c1f9df39a0 100644--- a/apps/mes/app/components/JobOperation/components/QuantityModal.tsx+++ b/apps/mes/app/components/JobOperation/components/QuantityModal.tsx@@ -170,11 +170,10 @@ export function QuantityModal({method="post"validator={validatorMap[type]}defaultValues={{- // @ts-ignore+ // @ts-expect-errortrackedEntityId:parentIsSerial || parentIsBatch ? trackedEntityId : undefined,jobOperationId: operation.id,- // @ts-ignorequantity: type === "finish" ? undefined : 0,setupProductionEventId: setupProductionEvent?.id,laborProductionEventId: laborProductionEvent?.id,diff --git a/apps/mes/app/components/JobOperation/hooks/useFiles.tsx b/apps/mes/app/components/JobOperation/hooks/useFiles.tsxindex e922506e23..7e638a4c74 100644--- a/apps/mes/app/components/JobOperation/hooks/useFiles.tsx+++ b/apps/mes/app/components/JobOperation/hooks/useFiles.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { downloadBlob } from "@carbon/files";+import { downloadBlob, downloadUrl } from "@carbon/files";import { getLogger } from "@carbon/logger";import { toast } from "@carbon/react";import { useCallback } from "react";@@ -43,8 +43,7 @@ export function useFiles(job: Job) {async (file: StorageItem) => {const url = path.to.file.previewFile(`private/${getFilePath(file)}`);try {- const response = await fetch(url);- downloadBlob(await response.blob(), file.name);+ await downloadUrl(url, file.name);} catch (error) {toast.error("Error downloading file");log.error("Error downloading file", { error });diff --git a/apps/mes/app/components/RealtimeDataProvider.tsx b/apps/mes/app/components/RealtimeDataProvider.tsxindex 0988b94284..432e0c8da2 100644--- a/apps/mes/app/components/RealtimeDataProvider.tsx+++ b/apps/mes/app/components/RealtimeDataProvider.tsx@@ -58,7 +58,7 @@ const RealtimeDataProvider = ({ children }: { children: React.ReactNode }) => {if (data && fresh()) setItems(data as Item[], true);});idb.getItem(`people:${requestedCompanyId}`).then((data) => {- // @ts-ignore+ // @ts-expect-errorif (data && fresh()) setPeople(data, true);});}@@ -114,7 +114,7 @@ const RealtimeDataProvider = ({ children }: { children: React.ReactNode }) => {})));setPeople(- // @ts-ignore+ // @ts-expect-errorpeople.data ?? []);};diff --git a/apps/mes/app/components/TimeCardWarning.tsx b/apps/mes/app/components/TimeCardWarning.tsxindex bb0a97debe..d540a2b12b 100644--- a/apps/mes/app/components/TimeCardWarning.tsx+++ b/apps/mes/app/components/TimeCardWarning.tsx@@ -101,10 +101,8 @@ export function TimeCardWarning({ openClockEntry }: TimeCardWarningProps) {return (<Modal+ // No onOpenChange: the prompt must be answered, so it has no close button.open- onOpenChange={() => {- /* intentionally non-dismissable */- }}><ModalContent><ModalHeader>diff --git a/apps/mes/app/entry.client.tsx b/apps/mes/app/entry.client.tsxindex 19cc17a4c5..bb8846bdff 100644--- a/apps/mes/app/entry.client.tsx+++ b/apps/mes/app/entry.client.tsx@@ -2,11 +2,6 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { registerReactPdfWorker } from "@carbon/files/pdf/worker";-import { pdfjs } from "react-pdf";--registerReactPdfWorker(pdfjs);-import {CONTROLLED_ENVIRONMENT,POSTHOG_API_HOST,@@ -41,7 +36,10 @@ ensureLoggingConfigured();// node React can't match, so the ENTIRE document fails hydration.if (POSTHOG_PROJECT_PUBLIC_KEY?.startsWith("phc_") && !CONTROLLED_ENVIRONMENT) {posthog.init(POSTHOG_PROJECT_PUBLIC_KEY, {- api_host: POSTHOG_API_HOST+ api_host: POSTHOG_API_HOST,+ // LCP, INP and CLS from real sessions: the only way to know which pages are+ // slow for the people using them.+ capture_performance: { web_vitals: true }});}diff --git a/apps/mes/app/hooks/index.ts b/apps/mes/app/hooks/index.tsindex 39f74d3541..2c32e2dc67 100644--- a/apps/mes/app/hooks/index.ts+++ b/apps/mes/app/hooks/index.ts@@ -4,6 +4,7 @@import { usePrinting } from "@carbon/printing/ui";import {+ useIdle,useNanoStore,useOptimisticLocation,useRouteData,@@ -11,7 +12,6 @@ import {} from "@carbon/react";import { useCompanyTimeZone, useLocationTimeZone } from "./useCompanyTimeZone";import { useDateFormatter } from "./useDateFormatter";-import { useIdle } from "./useIdle";import { useImageUpload } from "./useImageUpload";import { useRealtime, useRealtimeRevalidator } from "./useRealtime";import { useUser } from "./useUser";diff --git a/apps/mes/app/hooks/useIdle.tsx b/apps/mes/app/hooks/useIdle.tsxdeleted file mode 100644index 824fbc4be8..0000000000--- a/apps/mes/app/hooks/useIdle.tsx+++ /dev/null@@ -1,150 +0,0 @@-// SPDX-License-Identifier: AGPL-3.0-only-// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,-// including ports, remain AGPLv3; serving them over a network requires releasing their source.--import { useCallback, useEffect, useRef, useState } from "react";--// UX-only idle detection for the NIST 3.1.10 session lock. The SERVER is the-// authority (requireAuthSession enforces the idle/absolute cap); this hook drives-// the immediate lock overlay + a throttled activity heartbeat. Background traffic-// (the 60s refresh poll, realtime revalidations) is NOT activity — only real-// user input moves lastActivity, so an unattended tab still locks.--const ACTIVITY_EVENTS = [- "mousemove",- "mousedown",- "keydown",- "touchstart",- "scroll",- "wheel"-] as const;--const CHANNEL_NAME = "carbon-session-activity";-const ACTIVITY_BROADCAST_THROTTLE_MS = 5000;-const CHECK_INTERVAL_MS = 1000;--type ChannelMessage = { type: "activity" } | { type: "lock" };--type UseIdleOptions = {- /** Off (inert) unless true — non-controlled deployments pass false. */- enabled: boolean;- /** Idle window before locking (SESSION_IDLE_LOCK_MS). */- idleMs: number;- /** Heartbeat throttle while active (SESSION_HEARTBEAT_MS). */- heartbeatMs: number;- /** POST target that re-stamps lastActiveAt server-side. */- heartbeatUrl: string;-};--export function useIdle({- enabled,- idleMs,- heartbeatMs,- heartbeatUrl-}: UseIdleOptions) {- const [isIdle, setIsIdle] = useState(false);-- const lastActivityRef = useRef(Date.now());- const lastHeartbeatRef = useRef(0);- const lastBroadcastRef = useRef(0);- const isIdleRef = useRef(false);- const channelRef = useRef<BroadcastChannel | null>(null);-- useEffect(() => {- isIdleRef.current = isIdle;- }, [isIdle]);-- const resume = useCallback(() => {- lastActivityRef.current = Date.now();- isIdleRef.current = false;- setIsIdle(false);- // Tell peers the session is active again (an unlock in one tab clears all).- channelRef.current?.postMessage({- type: "activity"- } satisfies ChannelMessage);- }, []);-- useEffect(() => {- if (!enabled || typeof window === "undefined") return;-- const channel =- typeof BroadcastChannel !== "undefined"- ? new BroadcastChannel(CHANNEL_NAME)- : null;- channelRef.current = channel;-- // Throttled activity heartbeat. It fires ONLY in response to real user input- // (here), never on the idle countdown itself — otherwise the countdown would- // keep re-stamping the server's `lastActiveAt` every heartbeatMs and the- // session would never idle-lock server-side, so /unlock's loader would find- // the session "not locked" and bounce straight back with no re-auth.- const sendHeartbeat = (now: number) => {- lastHeartbeatRef.current = now;- void fetch(heartbeatUrl, {- method: "POST",- credentials: "same-origin"- }).catch(() => {- // Best-effort; a missed heartbeat just brings the lock closer.- });- };-- // Local real activity. Once locked, local activity does NOT clear the lock —- // 3.1.10 requires re-authentication; only a successful unlock (resume) does.- const onActivity = () => {- if (isIdleRef.current) return;- const now = Date.now();- lastActivityRef.current = now;- // Keep the server's lastActiveAt fresh while genuinely active, throttled.- if (now - lastHeartbeatRef.current >= heartbeatMs) {- sendHeartbeat(now);- }- if (- channel &&- now - lastBroadcastRef.current > ACTIVITY_BROADCAST_THROTTLE_MS- ) {- lastBroadcastRef.current = now;- channel.postMessage({ type: "activity" } satisfies ChannelMessage);- }- };-- for (const evt of ACTIVITY_EVENTS) {- window.addEventListener(evt, onActivity, { passive: true });- }-- if (channel) {- channel.onmessage = (e: MessageEvent<ChannelMessage>) => {- if (e.data?.type === "activity") {- // A peer is active → the session isn't idle. Keep this tab from locking.- if (!isIdleRef.current) lastActivityRef.current = Date.now();- } else if (e.data?.type === "lock") {- // A peer locked → lock all tabs together.- isIdleRef.current = true;- setIsIdle(true);- }- };- }-- const interval = window.setInterval(() => {- const now = Date.now();- if (isIdleRef.current) return;-- const idleFor = now - lastActivityRef.current;- if (idleFor > idleMs) {- isIdleRef.current = true;- setIsIdle(true);- channel?.postMessage({ type: "lock" } satisfies ChannelMessage);- }- }, CHECK_INTERVAL_MS);-- return () => {- for (const evt of ACTIVITY_EVENTS) {- window.removeEventListener(evt, onActivity);- }- window.clearInterval(interval);- channel?.close();- channelRef.current = null;- };- }, [enabled, idleMs, heartbeatMs, heartbeatUrl]);-- return { isIdle: enabled && isIdle, resume };-}diff --git a/apps/mes/app/middleware/user.ts b/apps/mes/app/middleware/user.tsindex 19f3ba6356..cba7e004d0 100644--- a/apps/mes/app/middleware/user.ts+++ b/apps/mes/app/middleware/user.ts@@ -10,8 +10,8 @@ import {import { updateSessionConsole } from "@carbon/auth/session.server";import { isConsoleModeEnabledForCompany } from "@carbon/ee/console.server";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { MiddlewareFunction } from "react-router";-import { redirect } from "react-router";import { userContext } from "~/context";import { getLocation, setLocation } from "~/services/location.server";import { path } from "~/utils/path";diff --git a/apps/mes/app/root.tsx b/apps/mes/app/root.tsxindex ac65fb1fe3..0c65d49ad4 100644--- a/apps/mes/app/root.tsx+++ b/apps/mes/app/root.tsx@@ -59,6 +59,7 @@ import Background from "~/styles/background.css?url";import NProgress from "~/styles/nprogress.css?url";import Tailwind from "~/styles/tailwind.css?url";import "@carbon/lib/shims";+import { MotionConfig } from "motion/react";import type { Route } from "./+types/root";import { getTheme } from "./services/theme.server";@@ -225,10 +226,7 @@ function Document({><head><meta charSet="utf-8" />- <meta- name="viewport"- content="width=device-width, initial-scale=1, maximum-scale=1"- />+ <meta name="viewport" content="width=device-width, initial-scale=1" /><Meta /><title>{title}</title><Links />@@ -285,10 +283,17 @@ export default function App() {<OperatingSystemContextProvider platform={prefs.platform}><LocaleProvider locale={appLanguage} catalog={catalog}><I18nProvider locale={prefs.locale}>- <TooltipProvider delayDuration={200}>- <Document mode={mode} theme={theme} lang={appLanguage} env={env}>- <Outlet />- </Document>+ <TooltipProvider>+ <MotionConfig reducedMotion="user">+ <Document+ mode={mode}+ theme={theme}+ lang={appLanguage}+ env={env}+ >+ <Outlet />+ </Document>+ </MotionConfig></TooltipProvider></I18nProvider></LocaleProvider>diff --git a/apps/mes/app/routes/_index.tsx b/apps/mes/app/routes/_index.tsxindex a309f6608f..568c67936b 100644--- a/apps/mes/app/routes/_index.tsx+++ b/apps/mes/app/routes/_index.tsx@@ -3,9 +3,9 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { requireAuthSession } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ request }: LoaderFunctionArgs) {diff --git a/apps/mes/app/routes/_public+/callback.tsx b/apps/mes/app/routes/_public+/callback.tsxindex dc368141c4..2500048eef 100644--- a/apps/mes/app/routes/_public+/callback.tsx+++ b/apps/mes/app/routes/_public+/callback.tsx@@ -6,8 +6,7 @@ import {assertIsPost,callbackValidator,carbonClient,- error,- safeRedirect+ error} from "@carbon/auth";import { refreshAccessToken } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";@@ -42,6 +41,7 @@ import {CarbonPulse,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import { useEffect, useRef, useState } from "react";import { LuTriangleAlert } from "react-icons/lu";@@ -49,7 +49,6 @@ import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";import {data,Link,- redirect,useFetcher,useLocation,useSearchParams@@ -198,7 +197,7 @@ export async function action({ request }: ActionFunctionArgs) {authSession.mfaVerified = true;const ssoSessionCookie = await setAuthSession(request, { authSession });- return redirect(safeRedirect(redirectTo, path.to.authenticatedRoot), {+ return redirect(redirectTo || path.to.authenticatedRoot, {headers: [["Set-Cookie", ssoSessionCookie],["Set-Cookie", setCompanyId(ssoCompanyId)]@@ -280,7 +279,7 @@ export async function action({ request }: ActionFunctionArgs) {authSession});const companyIdCookie = setCompanyId(authSession.companyId);- return redirect(safeRedirect(redirectTo, path.to.authenticatedRoot), {+ return redirect(redirectTo || path.to.authenticatedRoot, {headers: [["Set-Cookie", sessionCookie],["Set-Cookie", companyIdCookie]diff --git a/apps/mes/app/routes/_public+/login.tsx b/apps/mes/app/routes/_public+/login.tsxindex d6cf34893e..25ef90ebd8 100644--- a/apps/mes/app/routes/_public+/login.tsx+++ b/apps/mes/app/routes/_public+/login.tsx@@ -9,6 +9,7 @@ import {carbonClient,error,getMESUrl,+ getRedirectTo,isAuthProviderEnabled,magicLinkValidator,RATE_LIMIT@@ -46,7 +47,7 @@ import {useMount,VStack} from "@carbon/react";-import { Edition, getClientIp } from "@carbon/utils";+import { Edition, getClientIp, redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import {browserSupportsWebAuthn,@@ -59,13 +60,7 @@ import type {LoaderFunctionArgs,MetaFunction} from "react-router";-import {- data,- redirect,- useFetcher,- useLoaderData,- useSearchParams-} from "react-router";+import { data, useFetcher, useLoaderData, useSearchParams } from "react-router";import { path } from "~/utils/path";@@ -82,7 +77,7 @@ export async function loader({ request }: LoaderFunctionArgs) {const authSession = await getAuthSession(request);if (authSession) {if (await verifyAuthSession(authSession)) {- throw redirect(path.to.authenticatedRoot);+ throw redirect(getRedirectTo(request));}const cookieHeaders = await clearAuthCookies(request);return data(@@ -131,7 +126,7 @@ export async function action({ request }: ActionFunctionArgs) {return error(validation.error, "Invalid email address");}- const { email, botToken } = validation.data;+ const { email, botToken, redirectTo } = validation.data;const botError = await verifyBotProtection({token: botToken,@@ -180,7 +175,7 @@ export async function action({ request }: ActionFunctionArgs) {await lockout.reset(email);logAuthEvent("login_success", { actor: email, ip, method: "bypass" });const sessionCookie = await setAuthSession(request, { authSession });- return redirect(path.to.authenticatedRoot, {+ return redirect(redirectTo || path.to.authenticatedRoot, {headers: [["Set-Cookie", sessionCookie]]});}@@ -217,7 +212,7 @@ export async function action({ request }: ActionFunctionArgs) {}if (user.data && user.data.active) {- const magicLink = await sendMagicLink(email, getMESUrl());+ const magicLink = await sendMagicLink(email, getMESUrl(), redirectTo);if (magicLink.error) {logAuthEvent("login_failed", {diff --git a/apps/mes/app/routes/_public+/logout.tsx b/apps/mes/app/routes/_public+/logout.tsxindex 5cffcb25ef..283c42f817 100644--- a/apps/mes/app/routes/_public+/logout.tsx+++ b/apps/mes/app/routes/_public+/logout.tsx@@ -4,9 +4,8 @@import { assertIsPost } from "@carbon/auth";import { destroyAuthSession } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";-import { path } from "~/utils/path";export async function action({ request }: ActionFunctionArgs) {diff --git a/apps/mes/app/routes/_public+/mfa.tsx b/apps/mes/app/routes/_public+/mfa.tsxindex 9b82f81cef..0f51050495 100644--- a/apps/mes/app/routes/_public+/mfa.tsx+++ b/apps/mes/app/routes/_public+/mfa.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { assertIsPost, error, RATE_LIMIT, safeRedirect } from "@carbon/auth";+import { assertIsPost, error, RATE_LIMIT } from "@carbon/auth";import { setCompanyId } from "@carbon/auth/company.server";import { userHasVerifiedTotpFactor } from "@carbon/auth/mfa.server";import {@@ -28,7 +28,7 @@ import {Heading,VStack} from "@carbon/react";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { useEffect, useRef } from "react";import { LuCircleAlert } from "react-icons/lu";@@ -37,13 +37,7 @@ import type {LoaderFunctionArgs,MetaFunction} from "react-router";-import {- data,- Form,- redirect,- useFetcher,- useSearchParams-} from "react-router";+import { data, Form, useFetcher, useSearchParams } from "react-router";import { z } from "zod";import { path } from "~/utils/path";@@ -119,7 +113,7 @@ export async function action({ request }: ActionFunctionArgs) {// Mirror the MES callback: the active company is always finalized here.return redirect(- safeRedirect(result.redirectTo ?? redirectTo, path.to.authenticatedRoot),+ (result.redirectTo ?? redirectTo) || path.to.authenticatedRoot,{headers: [["Set-Cookie", result.sessionCookie],diff --git a/apps/mes/app/routes/_public+/refresh-session.tsx b/apps/mes/app/routes/_public+/refresh-session.tsxindex 068d5e9ad9..ef6c7af077 100644--- a/apps/mes/app/routes/_public+/refresh-session.tsx+++ b/apps/mes/app/routes/_public+/refresh-session.tsx@@ -8,9 +8,9 @@ import {refreshAuthSession,setAuthSession} from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";-+import { data, useNavigate } from "react-router";import { path } from "~/utils/path";export async function loader() {diff --git a/apps/mes/app/routes/_public+/setup-required.tsx b/apps/mes/app/routes/_public+/setup-required.tsxindex 7d58acff07..fc80211927 100644--- a/apps/mes/app/routes/_public+/setup-required.tsx+++ b/apps/mes/app/routes/_public+/setup-required.tsx@@ -5,9 +5,9 @@import { CONTROLLED_ENVIRONMENT } from "@carbon/auth";import { getAuthSession } from "@carbon/auth/session.server";import { Button, Heading, VStack } from "@carbon/react";+import { redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import type { LoaderFunctionArgs, MetaFunction } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export const meta: MetaFunction = () => {diff --git a/apps/mes/app/routes/_public+/unlock.tsx b/apps/mes/app/routes/_public+/unlock.tsxindex 99a64c2d8a..daf4266821 100644--- a/apps/mes/app/routes/_public+/unlock.tsx+++ b/apps/mes/app/routes/_public+/unlock.tsx@@ -6,8 +6,7 @@ import {assertIsPost,error,isAuthProviderEnabled,- RATE_LIMIT,- safeRedirect+ RATE_LIMIT} from "@carbon/auth";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { setCompanyId } from "@carbon/auth/company.server";@@ -40,7 +39,7 @@ import {toast,VStack} from "@carbon/react";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import {browserSupportsWebAuthn,@@ -56,7 +55,6 @@ import type {import {data,Form,- redirect,useFetcher,useLoaderData,useSearchParams@@ -109,7 +107,7 @@ export async function loader({ request }: LoaderFunctionArgs) {throw await destroyAuthSession(request);}if (!isSessionIdleLocked(authSession)) {- throw redirect(safeRedirect(redirectTo, path.to.authenticatedRoot));+ throw redirect(redirectTo || path.to.authenticatedRoot);}// Unlock credentials: a verified TOTP factor and/or a registered passkey.@@ -257,7 +255,7 @@ async function unlockWithPasskey(request: Request) {);}- return redirect(safeRedirect(redirectTo, path.to.authenticatedRoot), {+ return redirect(redirectTo || path.to.authenticatedRoot, {headers: [["Set-Cookie", sessionCookie],["Set-Cookie", setCompanyId(resumed.companyId)]@@ -345,7 +343,7 @@ export async function action({ request }: ActionFunctionArgs) {}return redirect(- safeRedirect(result.redirectTo ?? redirectTo, path.to.authenticatedRoot),+ (result.redirectTo ?? redirectTo) || path.to.authenticatedRoot,{headers: [["Set-Cookie", result.sessionCookie],diff --git a/apps/mes/app/routes/api+/model.download.$modelUploadId.ts b/apps/mes/app/routes/api+/model.download.$modelUploadId.tsindex a064d9f1eb..f534b5b936 100644--- a/apps/mes/app/routes/api+/model.download.$modelUploadId.ts+++ b/apps/mes/app/routes/api+/model.download.$modelUploadId.ts@@ -6,8 +6,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { getCompanyPrivateBucket, TEMP_STAGING_BUCKET } from "@carbon/files";import { isModelRawDownloadable } from "@carbon/files/cad";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";// Resolves the DOWNLOADABLE bytes for a model — always the customer's originaldiff --git a/apps/mes/app/routes/api+/passkey.authenticate.verify.ts b/apps/mes/app/routes/api+/passkey.authenticate.verify.tsindex 4918be7996..b56444716c 100644--- a/apps/mes/app/routes/api+/passkey.authenticate.verify.ts+++ b/apps/mes/app/routes/api+/passkey.authenticate.verify.ts@@ -14,9 +14,10 @@ import {} from "@carbon/auth/session.server";import { isSsoRequiredForEmail } from "@carbon/ee/sso.server";import { AccountLockout, redis } from "@carbon/kv";+import { redirect } from "@carbon/utils";import type { WebAuthnCredential } from "@simplewebauthn/browser";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { path } from "~/utils/path";export async function action({ request }: ActionFunctionArgs) {diff --git a/apps/mes/app/routes/file+/entity+/$id.labels[.]pdf.tsx b/apps/mes/app/routes/file+/entity+/$id.labels[.]pdf.tsxindex 6752e29351..eb64b02376 100644--- a/apps/mes/app/routes/file+/entity+/$id.labels[.]pdf.tsx+++ b/apps/mes/app/routes/file+/entity+/$id.labels[.]pdf.tsx@@ -4,10 +4,9 @@import { requirePermissions } from "@carbon/auth/auth.server";import { ProductLabelPDF } from "@carbon/documents/pdf";-import { labelSizes } from "@carbon/utils";+import { labelSizes, redirect } from "@carbon/utils";import { renderToStream } from "@react-pdf/renderer";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getCompany,getCompanySettings,diff --git a/apps/mes/app/routes/file+/entity+/$id.labels[.]zpl.tsx b/apps/mes/app/routes/file+/entity+/$id.labels[.]zpl.tsxindex 3019771106..69268bc168 100644--- a/apps/mes/app/routes/file+/entity+/$id.labels[.]zpl.tsx+++ b/apps/mes/app/routes/file+/entity+/$id.labels[.]zpl.tsx@@ -4,9 +4,8 @@import { requirePermissions } from "@carbon/auth/auth.server";import { generateProductLabelZPL } from "@carbon/documents/zpl";-import { labelSizes } from "@carbon/utils";+import { labelSizes, redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getCompanySettings,getDocumentTemplateConfigdiff --git a/apps/mes/app/routes/file+/operation+/$id.labels[.]pdf.tsx b/apps/mes/app/routes/file+/operation+/$id.labels[.]pdf.tsxindex 60ef940eb6..38c4a5e1b9 100644--- a/apps/mes/app/routes/file+/operation+/$id.labels[.]pdf.tsx+++ b/apps/mes/app/routes/file+/operation+/$id.labels[.]pdf.tsx@@ -4,10 +4,9 @@import { requirePermissions } from "@carbon/auth/auth.server";import { ProductLabelPDF } from "@carbon/documents/pdf";-import { labelSizes } from "@carbon/utils";+import { labelSizes, redirect } from "@carbon/utils";import { renderToStream } from "@react-pdf/renderer";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getCompany,getCompanySettings,diff --git a/apps/mes/app/routes/file+/operation+/$id.labels[.]zpl.tsx b/apps/mes/app/routes/file+/operation+/$id.labels[.]zpl.tsxindex cab8d07454..93ed708d41 100644--- a/apps/mes/app/routes/file+/operation+/$id.labels[.]zpl.tsx+++ b/apps/mes/app/routes/file+/operation+/$id.labels[.]zpl.tsx@@ -4,9 +4,8 @@import { requirePermissions } from "@carbon/auth/auth.server";import { generateProductLabelZPL } from "@carbon/documents/zpl";-import { labelSizes } from "@carbon/utils";+import { labelSizes, redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getCompanySettings,getDocumentTemplateConfigdiff --git a/apps/mes/app/routes/x+/_index.tsx b/apps/mes/app/routes/x+/_index.tsxindex 24e836fb6e..d9d05f9c0f 100644--- a/apps/mes/app/routes/x+/_index.tsx+++ b/apps/mes/app/routes/x+/_index.tsx@@ -2,9 +2,8 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { redirectBeforeLoaders } from "@carbon/utils";+import { redirect, redirectBeforeLoaders } from "@carbon/utils";import type { LoaderFunction } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export const loader: LoaderFunction = async ({ request }) => {diff --git a/apps/mes/app/routes/x+/_layout.tsx b/apps/mes/app/routes/x+/_layout.tsxindex f7cfa0e6ea..6f6755a968 100644--- a/apps/mes/app/routes/x+/_layout.tsx+++ b/apps/mes/app/routes/x+/_layout.tsx@@ -42,6 +42,7 @@ import {import { getStripeCustomerByCompanyId } from "@carbon/stripe/stripe.server";import {Edition,+ redirect,requiresItarEntityCertification,SHELL_MAX_AGE_MS} from "@carbon/utils";@@ -59,7 +60,6 @@ import {data,Form,Outlet,- redirect,useLoaderData,useNavigate} from "react-router";@@ -480,7 +480,7 @@ export default function AuthenticatedRoute() {}return (- <div className="h-screen w-full overflow-y-auto lg:overflow-hidden">+ <div className="h-dvh w-full overflow-y-auto lg:overflow-hidden">{/* Idle lock conceals the app (3.1.10). Not over the ITAR/MFA gates. */}{isIdle && !itarScreen && !mfaScreen && (<SessionLockOverlaydiff --git a/apps/mes/app/routes/x+/acknowledge.tsx b/apps/mes/app/routes/x+/acknowledge.tsxindex ceb9e5eb80..132a8b8104 100644--- a/apps/mes/app/routes/x+/acknowledge.tsx+++ b/apps/mes/app/routes/x+/acknowledge.tsx@@ -2,12 +2,10 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { safeRedirect } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { getLogger } from "@carbon/logger";-import { requiresItarEntityCertification } from "@carbon/utils";+import { redirect, requiresItarEntityCertification } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import {getRequestMeta,itarEntityCertificationValidator,@@ -46,7 +44,7 @@ export async function action({ request }: ActionFunctionArgs) {if (redirectTo) {// Form-supplied, so only same-origin paths are honoured.- throw redirect(safeRedirect(redirectTo, path.to.authenticatedRoot));+ throw redirect(redirectTo || path.to.authenticatedRoot);}return { success: true, message: "University acknowledged" };diff --git a/apps/mes/app/routes/x+/assembly.$operationId.tsx b/apps/mes/app/routes/x+/assembly.$operationId.tsxindex cf5cb04062..3032ca4736 100644--- a/apps/mes/app/routes/x+/assembly.$operationId.tsx+++ b/apps/mes/app/routes/x+/assembly.$operationId.tsx@@ -8,9 +8,10 @@ import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { getUserClaims } from "@carbon/auth/users.server";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { ComponentProps } from "react";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { AssemblyView } from "~/components/AssemblyView";import { getCompanySettings } from "~/services/inventory.service";import {diff --git a/apps/mes/app/routes/x+/batch.$batchId.tsx b/apps/mes/app/routes/x+/batch.$batchId.tsxindex dc75fde180..c8283c64d7 100644--- a/apps/mes/app/routes/x+/batch.$batchId.tsx+++ b/apps/mes/app/routes/x+/batch.$batchId.tsx@@ -5,8 +5,8 @@import { error } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getJobOperationBatch } from "~/services/operations.service";import { path } from "~/utils/path";diff --git a/apps/mes/app/routes/x+/company.switch.$companyId.tsx b/apps/mes/app/routes/x+/company.switch.$companyId.tsxindex 3c29953271..7ec0fcc74d 100644--- a/apps/mes/app/routes/x+/company.switch.$companyId.tsx+++ b/apps/mes/app/routes/x+/company.switch.$companyId.tsx@@ -10,8 +10,8 @@ import {flash,updateCompanySession} from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getLocation, setLocation } from "~/services/location.server";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/mes/app/routes/x+/complete.tsx b/apps/mes/app/routes/x+/complete.tsxindex c6d338bd88..2532abd56d 100644--- a/apps/mes/app/routes/x+/complete.tsx+++ b/apps/mes/app/routes/x+/complete.tsx@@ -11,8 +11,9 @@ import { trigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";import { getCachedPrinterConfig } from "@carbon/printing/printing.server";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { nonScrapQuantityValidator } from "~/services/models";import {diff --git a/apps/mes/app/routes/x+/dispatch.new.tsx b/apps/mes/app/routes/x+/dispatch.new.tsxindex 87b8e4c825..ef77a2898c 100644--- a/apps/mes/app/routes/x+/dispatch.new.tsx+++ b/apps/mes/app/routes/x+/dispatch.new.tsx@@ -10,9 +10,9 @@ import { validationError, validator } from "@carbon/form";import { trigger } from "@carbon/jobs";import { getLogger } from "@carbon/logger";import { NotificationEvent } from "@carbon/notifications";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { maintenanceDispatchValidator } from "~/services/models";import { endProductionEventsByWorkCenter } from "~/services/operations.service";import { path } from "~/utils/path";diff --git a/apps/mes/app/routes/x+/end.$operationId.tsx b/apps/mes/app/routes/x+/end.$operationId.tsxindex d56b0af6bd..597dbe7b22 100644--- a/apps/mes/app/routes/x+/end.$operationId.tsx+++ b/apps/mes/app/routes/x+/end.$operationId.tsx@@ -10,8 +10,8 @@ import { flash } from "@carbon/auth/session.server";import { evaluateLinesForSurface, isBlocked } from "@carbon/ee/rules.server";import { getLogger } from "@carbon/logger";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import {finishJobOperation,diff --git a/apps/mes/app/routes/x+/finish.tsx b/apps/mes/app/routes/x+/finish.tsxindex 5c20b8ec7b..8676212719 100644--- a/apps/mes/app/routes/x+/finish.tsx+++ b/apps/mes/app/routes/x+/finish.tsx@@ -7,8 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { finishValidator } from "~/services/models";import { finishJobOperation } from "~/services/operations.service";diff --git a/apps/mes/app/routes/x+/inspection-lot.$id.complete-passed.tsx b/apps/mes/app/routes/x+/inspection-lot.$id.complete-passed.tsxindex c1a6e9a575..74e692c653 100644--- a/apps/mes/app/routes/x+/inspection-lot.$id.complete-passed.tsx+++ b/apps/mes/app/routes/x+/inspection-lot.$id.complete-passed.tsx@@ -7,8 +7,8 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { validationError, validator } from "@carbon/form";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { inspectionCompletePassedValidator } from "~/services/models";import { returnPickedRemainders } from "~/services/operations.service";diff --git a/apps/mes/app/routes/x+/inspection-lot.$id.disposition.tsx b/apps/mes/app/routes/x+/inspection-lot.$id.disposition.tsxindex dc47076eb2..b47a72e827 100644--- a/apps/mes/app/routes/x+/inspection-lot.$id.disposition.tsx+++ b/apps/mes/app/routes/x+/inspection-lot.$id.disposition.tsx@@ -9,8 +9,8 @@ import { flash } from "@carbon/auth/session.server";import { dispositionInspection } from "@carbon/database/quality";import { validationError, validator } from "@carbon/form";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { inspectionDispositionValidator } from "~/services/models";import {diff --git a/apps/mes/app/routes/x+/inspection.$operationId.tsx b/apps/mes/app/routes/x+/inspection.$operationId.tsxindex 4f9e6b3343..cb788fac03 100644--- a/apps/mes/app/routes/x+/inspection.$operationId.tsx+++ b/apps/mes/app/routes/x+/inspection.$operationId.tsx@@ -12,8 +12,9 @@ import {reconcileInspectionSamplingPlans} from "@carbon/database/quality";import { getLogger } from "@carbon/logger";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { InspectionView } from "~/components/Inspection/InspectionView";import { getDatabaseClient } from "~/services/database.server";import {diff --git a/apps/mes/app/routes/x+/issue.tsx b/apps/mes/app/routes/x+/issue.tsxindex 01444d8a10..fc5e6739dc 100644--- a/apps/mes/app/routes/x+/issue.tsx+++ b/apps/mes/app/routes/x+/issue.tsx@@ -10,8 +10,8 @@ import { evaluateLinesForSurface, isBlocked } from "@carbon/ee/rules.server";import { validationError, validator } from "@carbon/form";import { getLogger } from "@carbon/logger";import { serverFns } from "@carbon/server-functions";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getDatabaseClient } from "~/services/database.server";import { issueValidator } from "~/services/models";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/mes/app/routes/x+/job.$jobId.tsx b/apps/mes/app/routes/x+/job.$jobId.tsxindex 78bf4e5b9f..7f55b6b866 100644--- a/apps/mes/app/routes/x+/job.$jobId.tsx+++ b/apps/mes/app/routes/x+/job.$jobId.tsx@@ -6,9 +6,10 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { getLogger } from "@carbon/logger";import { Heading, SidebarTrigger } from "@carbon/react";+import { redirect } from "@carbon/utils";import { LuArrowLeft } from "react-icons/lu";import type { LoaderFunctionArgs } from "react-router";-import { Link, redirect, useLoaderData } from "react-router";+import { Link, useLoaderData } from "react-router";import { JobDag } from "~/components/JobDag";import {getJobOperationDependencies,diff --git a/apps/mes/app/routes/x+/location.tsx b/apps/mes/app/routes/x+/location.tsxindex e338dedbc0..92f6c9494e 100644--- a/apps/mes/app/routes/x+/location.tsx+++ b/apps/mes/app/routes/x+/location.tsx@@ -4,8 +4,8 @@import { assertIsPost } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { setLocation } from "~/services/location.server";import { path } from "~/utils/path";diff --git a/apps/mes/app/routes/x+/maintenance-event.tsx b/apps/mes/app/routes/x+/maintenance-event.tsxindex 041d7146b1..66781ccdff 100644--- a/apps/mes/app/routes/x+/maintenance-event.tsx+++ b/apps/mes/app/routes/x+/maintenance-event.tsx@@ -7,9 +7,9 @@ import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";import { getLogger } from "@carbon/logger";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect } from "react-router";+import { data } from "react-router";import { getDatabaseClient } from "~/services/database.server";import {endMaintenanceEvent,diff --git a/apps/mes/app/routes/x+/operation.$operationId.tsx b/apps/mes/app/routes/x+/operation.$operationId.tsxindex 6c8489f9f8..09cae0cacf 100644--- a/apps/mes/app/routes/x+/operation.$operationId.tsx+++ b/apps/mes/app/routes/x+/operation.$operationId.tsx@@ -9,7 +9,7 @@ import { flash } from "@carbon/auth/session.server";import { activeJobStatuses } from "@carbon/database";import { getLogger } from "@carbon/logger";import type { LoaderFunctionArgs } from "react-router";-import { redirect, useLoaderData, useParams } from "react-router";+import { useLoaderData, useParams } from "react-router";import { JobOperation } from "~/components/JobOperation";import { getCompanySettings } from "~/services/inventory.service";import {@@ -39,6 +39,7 @@ import type { OperationWithDetails } from "~/services/types";type ExpiredEntityPolicy = "Warn" | "Block" | "BlockWithOverride";+import { redirect } from "@carbon/utils";import { makeDurations } from "~/utils/durations";import { resolveOperationView } from "~/utils/operationView";import { path } from "~/utils/path";diff --git a/apps/mes/app/routes/x+/operations.tsx b/apps/mes/app/routes/x+/operations.tsxindex d1dbe1e1a2..629de74c4c 100644--- a/apps/mes/app/routes/x+/operations.tsx+++ b/apps/mes/app/routes/x+/operations.tsx@@ -27,7 +27,7 @@ import {useRealtimeChannel,VStack} from "@carbon/react";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import {getLocalTimeZone,now,@@ -38,7 +38,7 @@ import { Trans, useLingui } from "@lingui/react/macro";import { useCallback, useEffect, useMemo, useState } from "react";import { LuFactory, LuSettings2, LuTriangleAlert, LuX } from "react-icons/lu";import type { LoaderFunctionArgs } from "react-router";-import { data, redirect, useFetcher, useLoaderData } from "react-router";+import { data, useFetcher, useLoaderData } from "react-router";import type { ColumnFilter } from "~/components/Filter";import { ActiveFilters, Filter, useFilters } from "~/components/Filter";@@ -427,7 +427,7 @@ export default function ScheduleRoute() {return (<ClientOnlyfallback={- <div className="flex h-screen w-[calc(100dvw-var(--sidebar-width-icon))] items-center justify-center">+ <div className="flex h-dvh w-[calc(100dvw-var(--sidebar-width-icon))] items-center justify-center"><CarbonPulse /></div>}diff --git a/apps/mes/app/routes/x+/quality-issue.new.tsx b/apps/mes/app/routes/x+/quality-issue.new.tsxindex 4ebbdddcfb..9afe86480e 100644--- a/apps/mes/app/routes/x+/quality-issue.new.tsx+++ b/apps/mes/app/routes/x+/quality-issue.new.tsx@@ -6,8 +6,8 @@ import { assertIsPost, error, success } from "@carbon/auth";import { requirePermissions } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";import { flash } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";import { createQualityIssue } from "~/services/quality.server";import { path, requestReferrer } from "~/utils/path";diff --git a/apps/mes/app/routes/x+/start.$operationId.tsx b/apps/mes/app/routes/x+/start.$operationId.tsxindex f4c5b03023..608a58163c 100644--- a/apps/mes/app/routes/x+/start.$operationId.tsx+++ b/apps/mes/app/routes/x+/start.$operationId.tsx@@ -10,9 +10,8 @@ import { flash } from "@carbon/auth/session.server";import { activeJobStatuses } from "@carbon/database";import { evaluateLinesForSurface, isBlocked } from "@carbon/ee/rules.server";import { getLogger } from "@carbon/logger";-import { datetime } from "@carbon/utils";+import { datetime, redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { getWorkCenterWithBlockingStatus } from "~/services/maintenance.service";import {getNextIncompleteSerialEntity,diff --git a/apps/mes/app/utils/durations.ts b/apps/mes/app/utils/durations.tsindex eb666aa7d6..42f41fc924 100644--- a/apps/mes/app/utils/durations.ts+++ b/apps/mes/app/utils/durations.ts@@ -204,7 +204,6 @@ export function makeDurations<const totalDuration = setupDuration + laborDuration + machineDuration;- // @ts-ignorereturn {...operation,duration: totalDuration,diff --git a/apps/mes/package.json b/apps/mes/package.jsonindex 7cc780a399..a14dda6600 100644--- a/apps/mes/package.json+++ b/apps/mes/package.json@@ -63,7 +63,7 @@"class-variance-authority": "catalog:","cookie": "catalog:","dompurify": "catalog:",- "framer-motion": "catalog:",+ "motion": "catalog:","isbot": "catalog:","konva": "^9.3.22","kysely": "catalog:",diff --git a/apps/starter/app/routes/_index.tsx b/apps/starter/app/routes/_index.tsxindex f4329513a8..01aed94692 100644--- a/apps/starter/app/routes/_index.tsx+++ b/apps/starter/app/routes/_index.tsx@@ -3,8 +3,8 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { requireAuthSession } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { LoaderFunctionArgs } from "react-router";-import { redirect } from "react-router";import { path } from "~/utils/path";export async function loader({ request }: LoaderFunctionArgs) {diff --git a/apps/starter/app/routes/_public+/callback.tsx b/apps/starter/app/routes/_public+/callback.tsxindex 1d26708428..cf8a3ff300 100644--- a/apps/starter/app/routes/_public+/callback.tsx+++ b/apps/starter/app/routes/_public+/callback.tsx@@ -6,8 +6,7 @@ import {assertIsPost,callbackValidator,carbonClient,- error,- safeRedirect+ error} from "@carbon/auth";import { refreshAccessToken } from "@carbon/auth/auth.server";import { getCarbonServiceRole } from "@carbon/auth/client.server";@@ -28,13 +27,13 @@ import {CarbonPulse,VStack} from "@carbon/react";+import { redirect } from "@carbon/utils";import { useEffect, useRef, useState } from "react";import { LuTriangleAlert } from "react-icons/lu";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";import {data,Link,- redirect,useFetcher,useLocation,useSearchParams@@ -95,7 +94,7 @@ export async function action({ request }: ActionFunctionArgs) {authSession});const companyIdCookie = setCompanyId(authSession.companyId);- return redirect(safeRedirect(redirectTo, path.to.authenticatedRoot), {+ return redirect(redirectTo || path.to.authenticatedRoot, {headers: [["Set-Cookie", sessionCookie],["Set-Cookie", companyIdCookie]diff --git a/apps/starter/app/routes/_public+/login.tsx b/apps/starter/app/routes/_public+/login.tsxindex b9eff2e3b4..10c6c1ada2 100644--- a/apps/starter/app/routes/_public+/login.tsx+++ b/apps/starter/app/routes/_public+/login.tsx@@ -33,20 +33,14 @@ import {useBotProtection,VStack} from "@carbon/react";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import { LuCircleAlert } from "react-icons/lu";import type {ActionFunctionArgs,LoaderFunctionArgs,MetaFunction} from "react-router";-import {- data,- redirect,- useFetcher,- useLoaderData,- useSearchParams-} from "react-router";+import { data, useFetcher, useLoaderData, useSearchParams } from "react-router";import { path } from "~/utils/path";diff --git a/apps/starter/app/routes/_public+/logout.tsx b/apps/starter/app/routes/_public+/logout.tsxindex 5cffcb25ef..283c42f817 100644--- a/apps/starter/app/routes/_public+/logout.tsx+++ b/apps/starter/app/routes/_public+/logout.tsx@@ -4,9 +4,8 @@import { assertIsPost } from "@carbon/auth";import { destroyAuthSession } from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";-import { path } from "~/utils/path";export async function action({ request }: ActionFunctionArgs) {diff --git a/apps/starter/app/routes/_public+/mfa.tsx b/apps/starter/app/routes/_public+/mfa.tsxindex cff2db14c2..4c9f718104 100644--- a/apps/starter/app/routes/_public+/mfa.tsx+++ b/apps/starter/app/routes/_public+/mfa.tsx@@ -2,7 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { assertIsPost, error, RATE_LIMIT, safeRedirect } from "@carbon/auth";+import { assertIsPost, error, RATE_LIMIT } from "@carbon/auth";import { userHasVerifiedTotpFactor } from "@carbon/auth/mfa.server";import {completeMfaChallenge,@@ -27,7 +27,7 @@ import {Heading,VStack} from "@carbon/react";-import { getClientIp } from "@carbon/utils";+import { getClientIp, redirect } from "@carbon/utils";import { useEffect, useRef } from "react";import { LuCircleAlert } from "react-icons/lu";import type {@@ -35,13 +35,7 @@ import type {LoaderFunctionArgs,MetaFunction} from "react-router";-import {- data,- Form,- redirect,- useFetcher,- useSearchParams-} from "react-router";+import { data, Form, useFetcher, useSearchParams } from "react-router";import { z } from "zod";import { path } from "~/utils/path";@@ -116,7 +110,7 @@ export async function action({ request }: ActionFunctionArgs) {}return redirect(- safeRedirect(result.redirectTo ?? redirectTo, path.to.authenticatedRoot),+ (result.redirectTo ?? redirectTo) || path.to.authenticatedRoot,{headers: [["Set-Cookie", result.sessionCookie]]}diff --git a/apps/starter/app/routes/_public+/refresh-session.tsx b/apps/starter/app/routes/_public+/refresh-session.tsxindex 068d5e9ad9..ef6c7af077 100644--- a/apps/starter/app/routes/_public+/refresh-session.tsx+++ b/apps/starter/app/routes/_public+/refresh-session.tsx@@ -8,9 +8,9 @@ import {refreshAuthSession,setAuthSession} from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { data, redirect, useNavigate } from "react-router";-+import { data, useNavigate } from "react-router";import { path } from "~/utils/path";export async function loader() {diff --git a/apps/starter/app/routes/x+/_layout.tsx b/apps/starter/app/routes/x+/_layout.tsxindex 26cea11163..b4f3b85fad 100644--- a/apps/starter/app/routes/x+/_layout.tsx+++ b/apps/starter/app/routes/x+/_layout.tsx@@ -14,11 +14,12 @@ import {requireAuthSession} from "@carbon/auth/session.server";import { Toaster, useNProgress } from "@carbon/react";+import { redirectExternal } from "@carbon/utils";import type {LoaderFunctionArgs,ShouldRevalidateFunction} from "react-router";-import { Outlet, redirect, useLoaderData } from "react-router";+import { Outlet, useLoaderData } from "react-router";import { path } from "~/utils/path";// The refreshed session reaches the client through this loader, and the@@ -47,7 +48,7 @@ export async function loader({ request }: LoaderFunctionArgs) {const company = companies.data?.find((c) => c.companyId === companyId);if (!company) {- throw redirect(getAppUrl());+ throw redirectExternal(getAppUrl());}return {diff --git a/apps/starter/app/routes/x+/company.switch.$companyId.tsx b/apps/starter/app/routes/x+/company.switch.$companyId.tsxindex 4af977e159..71b17bc474 100644--- a/apps/starter/app/routes/x+/company.switch.$companyId.tsx+++ b/apps/starter/app/routes/x+/company.switch.$companyId.tsx@@ -10,9 +10,8 @@ import {flash,updateCompanySession} from "@carbon/auth/session.server";+import { redirect } from "@carbon/utils";import type { ActionFunctionArgs } from "react-router";-import { redirect } from "react-router";-import { path, requestReferrer } from "~/utils/path";export async function action({ request, params }: ActionFunctionArgs) {diff --git a/apps/starter/package.json b/apps/starter/package.jsonindex 9798b9fec1..74cc2b909f 100644--- a/apps/starter/package.json+++ b/apps/starter/package.json@@ -21,7 +21,6 @@"@vercel/analytics": "catalog:","@vercel/react-router": "catalog:","cookie": "catalog:",- "framer-motion": "catalog:","isbot": "catalog:","non.geist": "catalog:","posthog-js": "catalog:",diff --git a/packages/auth/src/services/auth.server.ts b/packages/auth/src/services/auth.server.tsindex c5b053068f..742ebaf221 100644--- a/packages/auth/src/services/auth.server.ts+++ b/packages/auth/src/services/auth.server.ts@@ -11,13 +11,12 @@ import { redis } from "@carbon/kv";import { getLogger } from "@carbon/logger";import { oncePerRequest } from "@carbon/logger/middleware.server";import { annotateRequestSpan } from "@carbon/logger/tracing.server";-import { Edition, getClientIp, Plan } from "@carbon/utils";+import { Edition, getClientIp, Plan, redirect, safePath } from "@carbon/utils";import type {AuthSession as SupabaseAuthSession,SupabaseClient} from "@supabase/supabase-js";import { createHash } from "crypto";-import { redirect } from "react-router";import {CarbonEdition,IS_LOCAL_DEV,@@ -473,12 +472,17 @@ export async function sendMagicLink(// for — in local dev crbn writes the ERP url (or a localhost fallback) into// .env.local, so an MES started outside `crbn up` would send its first-login// magic link back to the wrong origin. MES passes getMESUrl().- origin?: string+ origin?: string,+ // Where the user was headed before they were sent to log in.+ redirectTo?: string) {+ const destination = safePath(redirectTo, "");return getCarbonServiceRole().auth.signInWithOtp({email,options: {- emailRedirectTo: `${origin ?? VERCEL_URL}/callback`+ emailRedirectTo: `${origin ?? VERCEL_URL}/callback${+ destination ? `?redirectTo=${encodeURIComponent(destination)}` : ""+ }`}});}diff --git a/packages/auth/src/services/session.server.ts b/packages/auth/src/services/session.server.tsindex 9a72f2c379..dc40b6c905 100644--- a/packages/auth/src/services/session.server.ts+++ b/packages/auth/src/services/session.server.ts@@ -3,9 +3,9 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { redis } from "@carbon/kv";-import { Edition } from "@carbon/utils";+import { Edition, redirect } from "@carbon/utils";import type { AuthSession as SupabaseAuthSession } from "@supabase/supabase-js";-import { createCookieSessionStorage, redirect } from "react-router";+import { createCookieSessionStorage } from "react-router";import {CarbonEdition,diff --git a/packages/auth/src/utils/http.test.ts b/packages/auth/src/utils/http.test.tsindex 1a271931e5..46bcbde35c 100644--- a/packages/auth/src/utils/http.test.ts+++ b/packages/auth/src/utils/http.test.ts@@ -2,8 +2,9 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { safePath } from "@carbon/utils";import { describe, expect, it } from "vitest";-import { getCurrentPath, makeRedirectToFromHere, safeRedirect } from "./http";+import { getCurrentPath, makeRedirectToFromHere } from "./http";// The link a notification email carries (see buildNotificationLink).const emailLink =@@ -46,27 +47,8 @@ describe("makeRedirectToFromHere", () => {);const login = new URL(`https://app.carbon.ms/login?${params}`);- expect(safeRedirect(login.searchParams.get("redirectTo"), "/x")).toBe(+ expect(safePath(login.searchParams.get("redirectTo"), "/x")).toBe(emailLink);});});--describe("safeRedirect", () => {- it("keeps a same-origin path", () => {- expect(safeRedirect("/x/sales/orders?tab=open", "/x")).toBe(- "/x/sales/orders?tab=open"- );- });-- it.each([- ["an absolute URL", "https://evil.com"],- ["a protocol-relative URL", "//evil.com"],- ["a backslash host", "/\\evil.com"],- ["a relative path", "x/sales"],- ["an empty value", ""],- ["no value", null]- ])("falls back for %s", (_label, to) => {- expect(safeRedirect(to, "/x")).toBe("/x");- });-});diff --git a/packages/auth/src/utils/http.ts b/packages/auth/src/utils/http.tsindex 1f51002feb..5258ef2bee 100644--- a/packages/auth/src/utils/http.ts+++ b/packages/auth/src/utils/http.ts@@ -3,6 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { getLogger } from "@carbon/logger";+import { safePath } from "@carbon/utils";import { path } from "./path";const log = getLogger("auth");@@ -28,7 +29,7 @@ export function getRedirectTo(defaultRedirectTo = path.to.authenticatedRoot) {const url = new URL(request.url);- return safeRedirect(url.searchParams.get("redirectTo"), defaultRedirectTo);+ return safePath(url.searchParams.get("redirectTo"), defaultRedirectTo);}export function isGet(request: Request) {@@ -87,33 +88,6 @@ export function assertIsDelete(}}-/**- * This should be used any time the redirect path is user-provided- * (Like the query string on our login/signup pages). This avoids- * open-redirect vulnerabilities.- * @param {string} to The redirect destination- * @param {string} defaultRedirect The redirect to use if the to is unsafe.- */-export function safeRedirect(- to: FormDataEntryValue | string | null | undefined,- defaultRedirect = path.to.authenticatedRoot-) {- // Only a same-origin path. Browsers read `/\host` like `//host` (a- // protocol-relative URL to another origin), so a backslash in second place is- // refused along with `//`.- if (- !to ||- typeof to !== "string" ||- !to.startsWith("/") ||- to.startsWith("//") ||- to.startsWith("/\\")- ) {- return defaultRedirect;- }-- return to;-}-export function parseNumberFromUrlParam(params: URLSearchParams,key: string,diff --git a/packages/checks/src/conformance/baseline.json b/packages/checks/src/conformance/baseline.jsonindex b1040ae21e..e2338fe335 100644--- a/packages/checks/src/conformance/baseline.json+++ b/packages/checks/src/conformance/baseline.json@@ -19,6 +19,26 @@"no-derived-percent-column::20250204164256_numeric-increase-2.sql::ALTER TABLE \"purchaseOrderLine\" ADD COLUMN \"taxPercent\" NUMERIC GENERATED ALWAYS AS (","no-derived-percent-column::20250204164256_numeric-increase-2.sql::ALTER TABLE \"purchaseOrderLine\" ADD COLUMN IF NOT EXISTS \"taxPercent\" NUMERIC GENERATED ALWAYS AS (","no-derived-percent-column::20250204164256_numeric-increase-2.sql::ALTER TABLE \"supplierQuoteLinePrice\" ADD COLUMN \"taxPercent\" NUMERIC GENERATED ALWAYS AS (",+ "no-duplicated-app-file::ActiveFilters.tsx::apps/erp/app/components/Table/components/Filter/ActiveFilters.tsx + apps/mes/app/components/Filter/ActiveFilters.tsx",+ "no-duplicated-app-file::Avatar.tsx::apps/erp/app/components/Avatar.tsx + apps/mes/app/components/Avatar.tsx",+ "no-duplicated-app-file::DateTime.tsx::apps/erp/app/components/DateTime.tsx + apps/mes/app/components/DateTime.tsx",+ "no-duplicated-app-file::EmployeeAvatar.tsx::apps/erp/app/components/EmployeeAvatar.tsx + apps/mes/app/components/EmployeeAvatar.tsx",+ "no-duplicated-app-file::FileDropzone.tsx::apps/erp/app/components/FileDropzone.tsx + apps/mes/app/components/FileDropzone.tsx",+ "no-duplicated-app-file::Filter.tsx::apps/erp/app/components/Table/components/Filter/Filter.tsx + apps/mes/app/components/Filter/Filter.tsx",+ "no-duplicated-app-file::Hyperlink.tsx::apps/erp/app/components/Hyperlink.tsx + apps/mes/app/components/Hyperlink.tsx",+ "no-duplicated-app-file::Icons.tsx::apps/erp/app/components/Configurator/Icons.tsx + apps/erp/app/components/Icons.tsx + apps/mes/app/components/Icons.tsx",+ "no-duplicated-app-file::ItemThumbnail.tsx::apps/erp/app/components/ItemThumbnail.tsx + apps/mes/app/components/ItemThumbnail.tsx",+ "no-duplicated-app-file::RealtimeDataProvider.tsx::apps/erp/app/components/RealtimeDataProvider.tsx + apps/mes/app/components/RealtimeDataProvider.tsx",+ "no-duplicated-app-file::ScrapReason.tsx::apps/erp/app/components/Form/ScrapReason.tsx + apps/mes/app/components/JobOperation/components/ScrapReason.tsx",+ "no-duplicated-app-file::SearchFilter.tsx::apps/erp/app/components/SearchFilter.tsx + apps/mes/app/components/SearchFilter.tsx",+ "no-duplicated-app-file::SessionLockOverlay.tsx::apps/erp/app/components/SessionLockOverlay.tsx + apps/mes/app/components/SessionLockOverlay.tsx",+ "no-duplicated-app-file::ShortcutHelp.tsx::apps/erp/app/components/ShortcutHelp.tsx + apps/mes/app/components/ShortcutHelp.tsx",+ "no-duplicated-app-file::Suggestion.tsx::apps/erp/app/components/Layout/Topbar/Suggestion.tsx + apps/mes/app/components/Suggestion.tsx",+ "no-duplicated-app-file::TimeCardWarning.tsx::apps/erp/app/components/TimeCardWarning.tsx + apps/mes/app/components/TimeCardWarning.tsx",+ "no-duplicated-app-file::useFilters.tsx::apps/erp/app/components/Table/components/Filter/useFilters.tsx + apps/mes/app/components/Filter/useFilters.tsx",+ "no-duplicated-app-file::useImageUpload.ts::apps/erp/app/hooks/useImageUpload.ts + apps/mes/app/hooks/useImageUpload.ts",+ "no-duplicated-app-file::useRealtime.tsx::apps/erp/app/hooks/useRealtime.tsx + apps/mes/app/hooks/useRealtime.tsx",+ "no-duplicated-app-file::useUser.tsx::apps/erp/app/hooks/useUser.tsx + apps/mes/app/hooks/useUser.tsx","no-inline-fraction-digits::apps/erp/app/modules/accounting/ui/ChartOfAccounts/ChartOfAccountsTree.tsx::maximumFractionDigits: 2","no-inline-fraction-digits::apps/erp/app/modules/accounting/ui/ChartOfAccounts/ChartOfAccountsTree.tsx::minimumFractionDigits: 2,","no-inline-fraction-digits::apps/erp/app/modules/accounting/ui/Reports/AccountLedgerDrawer.tsx::maximumFractionDigits: 2",@@ -91,6 +111,7 @@"no-integration-id-branching::packages/ee/src/workflows/catalog/actions.ts::\"email\", \"slack\"","no-integration-id-branching::packages/ee/src/workflows/definition/catalog.ts::\"email\", \"slack\"","no-integration-id-branching::packages/jobs/src/inngest/functions/integrations/accounting-outbound-sweep.ts::=== \"rillet\"",+ "no-interpolated-error-log::packages/auth/src/utils/result.ts::log.error(`${","no-legacy-rls::20230123004206_claims.sql::has_company_permission(","no-legacy-rls::20230123004317_companies-rls.sql::has_company_permission(","no-legacy-rls::20230123004339_employee-types.sql::has_company_permission(",@@ -293,7 +314,6 @@"no-numeric-precision::20260604120000_invoice-totals-computed-in-views.sql::NUMERIC(10,2)","no-numeric-precision::20260604120000_invoice-totals-computed-in-views.sql::numeric(10,2)","no-numeric-precision::20260618171234_material-supersession.sql::NUMERIC(10,2)",- "no-interpolated-error-log::packages/auth/src/utils/result.ts::log.error(`${","no-raw-rounding::apps/erp/app/components/CadModel.tsx::Math.round(artifacts.optimizedSize / 1024)","no-raw-rounding::apps/erp/app/components/CadModel.tsx::{convertKbToString(Math.ceil(file.size / 1024))}","no-raw-rounding::apps/erp/app/components/CadModel.tsx::{convertKbToString(Math.round(artifacts.size / 1024))}",@@ -302,18 +322,17 @@"no-raw-rounding::apps/erp/app/components/Documents.tsx::Math.floor((file.metadata?.size ?? 0) / 1024)","no-raw-rounding::apps/erp/app/components/Documents.tsx::Math.floor((modelUpload.modelSize ?? 0) / 1024)","no-raw-rounding::apps/erp/app/components/Documents.tsx::formData.append(\"size\", Math.round(file.size / 1024).toString());",- "no-raw-rounding::apps/erp/app/components/UploadProgress.tsx::if (n >= 1024 ** 2) return `${(n / 1024 ** 2).toFixed(1)} MB`;",- "no-raw-rounding::apps/erp/app/components/UploadProgress.tsx::if (n >= 1024 ** 3) return `${(n / 1024 ** 3).toFixed(2)} GB`;",- "no-raw-rounding::apps/erp/app/components/UploadProgress.tsx::if (n >= 1024) return `${Math.round(n / 1024)} KB`;",- "no-raw-rounding::apps/erp/app/components/UploadProgress.tsx::value={`${Math.round(percent)}%`}","no-raw-rounding::apps/erp/app/components/PeriodSelector.tsx::const month = Math.floor((date.month - 1) / 3) * 3 + 1;","no-raw-rounding::apps/erp/app/components/RecordDocuments.tsx::Math.floor((file.metadata?.size ?? 0) / 1024)","no-raw-rounding::apps/erp/app/components/RecordDocuments.tsx::formData.append(\"size\", Math.round(size / 1024).toString());","no-raw-rounding::apps/erp/app/components/Table/Table.tsx::const mid = Math.floor(sorted.length / 2);",- "no-raw-rounding::apps/erp/app/components/Table/components/Pagination/usePagination.tsx::const canNextPage = pageIndex < Math.ceil(count / pageSize);","no-raw-rounding::apps/erp/app/components/Table/components/Pagination/usePagination.tsx::const pageCount = Math.ceil(count / pageSize);","no-raw-rounding::apps/erp/app/components/Table/components/Pagination/usePagination.tsx::const pageIndex = Math.floor(offset / pageSize) + 1;","no-raw-rounding::apps/erp/app/components/TimeCardWarning.tsx::const hoursElapsed = Math.floor(",+ "no-raw-rounding::apps/erp/app/components/UploadProgress.tsx::if (n >= 1024 ** 2) return `${(n / 1024 ** 2).toFixed(1)} MB`;",+ "no-raw-rounding::apps/erp/app/components/UploadProgress.tsx::if (n >= 1024 ** 3) return `${(n / 1024 ** 3).toFixed(2)} GB`;",+ "no-raw-rounding::apps/erp/app/components/UploadProgress.tsx::if (n >= 1024) return `${Math.round(n / 1024)} KB`;",+ "no-raw-rounding::apps/erp/app/components/UploadProgress.tsx::value={`${Math.round(percent)}%`}","no-raw-rounding::apps/erp/app/hooks/useScrollPosition.tsx::Math.ceil(el.scrollLeft + el.clientWidth) < el.scrollWidth","no-raw-rounding::apps/erp/app/hooks/useScrollPosition.tsx::setCanScrollRight(Math.ceil(scrollLeft + clientWidth) < scrollWidth);","no-raw-rounding::apps/erp/app/modules/accounting/accounting.service.ts::const year = firstYear + Math.floor((startMonth - 1 + (p - 1)) / 12);",@@ -362,22 +381,6 @@"no-raw-rounding::apps/erp/app/modules/production/ui/Assemblies/ModelConvertProgress.tsx::if (n >= 1024 * 1024) return `${(n / (1024 * 1024)).toFixed(1)} MB`;","no-raw-rounding::apps/erp/app/modules/production/ui/Assemblies/ModelConvertProgress.tsx::if (n >= 1024) return `${Math.round(n / 1024)} KB`;","no-raw-rounding::apps/erp/app/modules/production/ui/Assemblies/ModelConvertProgress.tsx::return `${Math.floor(seconds / 60)}m ${seconds % 60}s`;",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx::Math.min(26, Math.round(radius * 1.15))",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx::Math.min(3, Number((zoomScale * Math.min(fitX, fitY)).toFixed(2)))",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx::aria-valuenow={Math.round(pdfPaneHeightPx)}",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx::setZoomScale((z) => Math.max(0.5, Number((z - 0.1).toFixed(2))))",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx::setZoomScale((z) => Math.min(3, Number((z + 0.1).toFixed(2))))",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx::{Math.round(zoomScale * 100)}%",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::Math.max(1, Math.floor(renderedPageWidthPx * VISION_RENDER_SCALE)),",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const ch = Math.max(1, Math.floor(viewport.height));",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const cw = Math.max(1, Math.floor(viewport.width));",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const sh = Math.max(1, Math.floor((rh / 100) * ch));",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const sw = Math.max(1, Math.floor((rw / 100) * cw));",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const sx = Math.floor((rx / 100) * cw);",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const sy = Math.floor((ry / 100) * ch);",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::Math.min(26, Math.round(radius * 1.15))",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const ch = Math.floor(viewport.height);",- "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const cw = Math.floor(viewport.width);","no-raw-rounding::apps/erp/app/modules/production/ui/Jobs/JobDocuments.tsx::Math.floor((file.metadata?.size ?? 0) / 1024)","no-raw-rounding::apps/erp/app/modules/production/ui/Jobs/JobDocuments.tsx::Math.floor((modelUpload.modelSize ?? 0) / 1024)","no-raw-rounding::apps/erp/app/modules/production/ui/Jobs/JobDocuments.tsx::formData.append(\"size\", Math.round(size / 1024).toString());",@@ -401,6 +404,22 @@"no-raw-rounding::apps/erp/app/modules/purchasing/ui/SupplierInteraction/SupplierInteractionLineDocuments.tsx::formData.append(\"size\", Math.round(size / 1024).toString());","no-raw-rounding::apps/erp/app/modules/quality/samplingStandards.ts::const n = Math.max(1, Math.min(safeLot, Math.ceil((safeLot * pct) / 100)));","no-raw-rounding::apps/erp/app/modules/quality/samplingStandards.ts::const safeLot = Math.max(1, Math.floor(lotSize));",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx::Math.min(26, Math.round(radius * 1.15))",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx::Math.min(3, Number((zoomScale * Math.min(fitX, fitY)).toFixed(2)))",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx::aria-valuenow={Math.round(pdfPaneHeightPx)}",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx::setZoomScale((z) => Math.max(0.5, Number((z - 0.1).toFixed(2))))",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx::setZoomScale((z) => Math.min(3, Number((z + 0.1).toFixed(2))))",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/InspectionDocumentEditor.tsx::{Math.round(zoomScale * 100)}%",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::Math.max(1, Math.floor(renderedPageWidthPx * VISION_RENDER_SCALE)),",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::Math.min(26, Math.round(radius * 1.15))",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const ch = Math.floor(viewport.height);",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const ch = Math.max(1, Math.floor(viewport.height));",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const cw = Math.floor(viewport.width);",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const cw = Math.max(1, Math.floor(viewport.width));",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const sh = Math.max(1, Math.floor((rh / 100) * ch));",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const sw = Math.max(1, Math.floor((rw / 100) * cw));",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const sx = Math.floor((rx / 100) * cw);",+ "no-raw-rounding::apps/erp/app/modules/quality/ui/InspectionDocument/drawingRaster.ts::const sy = Math.floor((ry / 100) * ch);","no-raw-rounding::apps/erp/app/modules/quality/ui/Inspections/InspectionView.tsx::aria-valuenow={Math.round(pdfPaneHeightPx)}","no-raw-rounding::apps/erp/app/modules/resources/ui/Abilities/EmployeeAbilityStatus.tsx::? Math.ceil((Date.parse(row.expiresAt) - asOf.getTime()) / DAY_MS)","no-raw-rounding::apps/erp/app/modules/resources/ui/Maintenance/MaintenanceDispatchNotes.tsx::Math.floor((file.metadata?.size ?? 0) / 1024)",@@ -496,22 +515,14 @@"no-raw-rounding::apps/mes/app/utils/display.ts::return `${Math.floor(days / 7)}w`;","no-raw-rounding::apps/mes/app/utils/units.ts::* existing `Math.max(1, Math.round(operationQuantity))` behavior).","no-raw-rounding::apps/mes/app/utils/units.ts::const total = Math.max(1, Math.round(Number.isFinite(count) ? count : 1));",- "no-raw-rounding::packages/server-functions/src/assign-serial-numbers/index.ts::trackingType === \"Batch\" ? 1 : Math.round(Number(job.quantity));",- "no-raw-rounding::packages/database/src/mrp-engine.ts::const childLeadTimeWeeks = Math.ceil(childLeadTimeDays / 7);",- "no-raw-rounding::packages/database/src/sequence.ts::Math.floor(thursday.compare(new CalendarDate(thursday.year, 1, 1)) / 7) + 1","no-raw-rounding::packages/database/src/check-datasets.ts::const seconds = (result.durationMs / 1000).toFixed(1);","no-raw-rounding::packages/database/src/datasets/tiers/06-production.ts::Math.round(","no-raw-rounding::packages/database/src/datasets/tiers/07-quality.ts::lotSize: Math.max(1, Math.floor(Number(operation.operationQuantity ?? 1))),",+ "no-raw-rounding::packages/database/src/mrp-engine.ts::const childLeadTimeWeeks = Math.ceil(childLeadTimeDays / 7);","no-raw-rounding::packages/database/src/quality.ts::Math.floor(Number(operation.operationQuantity ?? job.quantity ?? 1))",- "no-raw-rounding::packages/server-functions/src/reschedule/index.ts::return Math.max(Math.ceil(days), 1);",- "no-raw-rounding::packages/utils/src/batch-time-split.ts::.map((r, i) => ({ i, frac: r - Math.floor(r) }))",- "no-raw-rounding::packages/utils/src/batch-time-split.ts::const floors = raw.map((r) => Math.floor(r));",- "no-raw-rounding::packages/utils/src/batch-time-split.ts::const total = Math.floor(totalSeconds);",- "no-raw-rounding::packages/utils/src/batch-time-split.ts::const totalSeconds = Math.max(0, Math.round((endMs - startMs) / 1000));",- "no-raw-rounding::packages/utils/src/batch-time-split.ts::durationSeconds: Math.round((windowEndMs - windowStartMs) / 1000)","no-raw-rounding::packages/database/src/sampling.ts::const n = Math.max(1, Math.min(safeLot, Math.ceil((safeLot * pct) / 100)));","no-raw-rounding::packages/database/src/sampling.ts::const safeLot = Math.max(1, Math.floor(lotSize));",- "no-raw-rounding::packages/server-functions/src/update-purchased-prices/index.ts::itemReplenishmentUpdate.leadTime = Math.round(",+ "no-raw-rounding::packages/database/src/sequence.ts::Math.floor(thursday.compare(new CalendarDate(thursday.year, 1, 1)) / 7) + 1","no-raw-rounding::packages/documents/src/pdf/KanbanLabelPDF.tsx::const pageCount = Math.ceil(labels.length / labelsPerPage);","no-raw-rounding::packages/documents/src/pdf/ProductLabelPDF.tsx::const pageCount = Math.ceil(items.length / labelsPerPage);","no-raw-rounding::packages/documents/src/pdf/components/labelGeometry.ts::const qrModuleSize = Math.max(2, Math.min(8, Math.round(4 * scale)));",@@ -545,7 +556,15 @@"no-raw-rounding::packages/react/src/BarProgress.tsx::const r = Math.round(a[0] + (b[0] - a[0]) * t);","no-raw-rounding::packages/react/src/BarProgress.tsx::const segBars = Math.round((seg.value / max) * barCount);","no-raw-rounding::packages/react/src/Sidebar.tsx::return `${Math.floor(Math.random() * 40) + 50}%`;",+ "no-raw-rounding::packages/server-functions/src/assign-serial-numbers/index.ts::trackingType === \"Batch\" ? 1 : Math.round(Number(job.quantity));",+ "no-raw-rounding::packages/server-functions/src/reschedule/index.ts::return Math.max(Math.ceil(days), 1);",+ "no-raw-rounding::packages/server-functions/src/update-purchased-prices/index.ts::itemReplenishmentUpdate.leadTime = Math.round(","no-raw-rounding::packages/utils/src/accounting.ts::const quarter = Math.ceil(periodNumber / 3);",+ "no-raw-rounding::packages/utils/src/batch-time-split.ts::.map((r, i) => ({ i, frac: r - Math.floor(r) }))",+ "no-raw-rounding::packages/utils/src/batch-time-split.ts::const floors = raw.map((r) => Math.floor(r));",+ "no-raw-rounding::packages/utils/src/batch-time-split.ts::const total = Math.floor(totalSeconds);",+ "no-raw-rounding::packages/utils/src/batch-time-split.ts::const totalSeconds = Math.max(0, Math.round((endMs - startMs) / 1000));",+ "no-raw-rounding::packages/utils/src/batch-time-split.ts::durationSeconds: Math.round((windowEndMs - windowStartMs) / 1000)","no-raw-rounding::packages/utils/src/date.ts::const count = Math.floor(remaining / seconds);","no-raw-rounding::packages/utils/src/date.ts::const days = Math.round(","no-raw-rounding::packages/utils/src/date.ts::let remaining = Math.floor(Math.abs(diffMs) / 1000);",diff --git a/packages/checks/src/conformance/no-duplicated-app-file.test.ts b/packages/checks/src/conformance/no-duplicated-app-file.test.tsnew file mode 100644index 0000000000..b007647597--- /dev/null+++ b/packages/checks/src/conformance/no-duplicated-app-file.test.ts@@ -0,0 +1,34 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import { describe, expect, it } from "vitest";+import { findDuplicatedAppFiles } from "./no-duplicated-app-file";++const body = "export function useThing() {\n return 1;\n}\n";+const reExport = '// header\n\nexport { useThing } from "@carbon/react";\n';++describe("findDuplicatedAppFiles", () => {+ it("flags a file with code in both apps", () => {+ expect(+ findDuplicatedAppFiles([+ { file: "apps/erp/app/hooks/useThing.ts", contents: body },+ { file: "apps/mes/app/hooks/useThing.ts", contents: body }+ ]).map((v) => v.file)+ ).toEqual(["useThing.ts"]);+ });++ it("accepts a file in one app, a re-export, and generic names", () => {+ expect(+ findDuplicatedAppFiles([+ { file: "apps/erp/app/hooks/useOnlyErp.ts", contents: body },+ { file: "apps/erp/app/hooks/useThing.ts", contents: reExport },+ { file: "apps/mes/app/hooks/useThing.ts", contents: reExport },+ { file: "apps/erp/app/hooks/index.ts", contents: body },+ { file: "apps/mes/app/hooks/index.ts", contents: body },+ { file: "apps/erp/app/components/A/Thing.tsx", contents: body },+ { file: "apps/erp/app/components/B/Thing.tsx", contents: body }+ ])+ ).toEqual([]);+ });+});diff --git a/packages/checks/src/conformance/no-duplicated-app-file.ts b/packages/checks/src/conformance/no-duplicated-app-file.tsnew file mode 100644index 0000000000..be8646b357--- /dev/null+++ b/packages/checks/src/conformance/no-duplicated-app-file.ts@@ -0,0 +1,50 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import type { SourceFile, Violation } from "../check";++// ERP and MES grew the same components and hooks by copying them, so a fix+// landed in one app and not the other — the login route's lost redirect was+// copied along with the route. A file needed by both lives in a package+// (@carbon/react, @carbon/auth, @carbon/utils); each app may keep a file of+// that name that only re-exports it.+export const NO_DUPLICATED_APP_FILE = "no-duplicated-app-file";++export const SHARED_APP_DIRS = [+ "apps/erp/app/components",+ "apps/erp/app/hooks",+ "apps/mes/app/components",+ "apps/mes/app/hooks"+];++// Names every folder has; they hold different things in each app.+const GENERIC = new Set(["index.ts", "index.tsx", "types.ts", "utils.ts"]);++const RE_EXPORT_ONLY =+ /^(?:\s*\/\/[^\n]*\n|\s*\n|\s*export\s+(?:type\s+)?(?:\{[^}]*\}|\*)\s+from\s+["'][^"']+["'];?\s*\n?)*$/;++const appOf = (file: string) => file.split("/")[1];+const nameOf = (file: string) => file.slice(file.lastIndexOf("/") + 1);++export function findDuplicatedAppFiles(files: SourceFile[]): Violation[] {+ const byName = new Map<string, SourceFile[]>();+ for (const source of files) {+ const name = nameOf(source.file);+ if (GENERIC.has(name) || /\.test\.tsx?$/.test(name)) continue;+ if (RE_EXPORT_ONLY.test(source.contents)) continue;+ byName.set(name, [...(byName.get(name) ?? []), source]);+ }++ const violations: Violation[] = [];+ for (const [name, sources] of byName) {+ if (new Set(sources.map((s) => appOf(s.file))).size < 2) continue;+ violations.push({+ file: name,+ line: 0,+ snippet: sources.map((s) => s.file).join(" + "),+ message: `${name} exists in both apps; move it to a shared package and re-export it`+ });+ }+ return violations;+}diff --git a/packages/checks/src/conformance/no-noop-open-change.test.ts b/packages/checks/src/conformance/no-noop-open-change.test.tsnew file mode 100644index 0000000000..1d1c1a6632--- /dev/null+++ b/packages/checks/src/conformance/no-noop-open-change.test.ts@@ -0,0 +1,32 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import { describe, expect, it } from "vitest";+import { noNoopOpenChange } from "./no-noop-open-change";++const scan = (contents: string) =>+ noNoopOpenChange.scan("apps/erp/app/components/X.tsx", contents);++describe("noNoopOpenChange", () => {+ it("flags a handler that does nothing", () => {+ expect(+ scan(`<Modal open onOpenChange={() => {}}>+<Drawer+ open+ onOpenChange={() => {+ /* intentionally non-dismissable */+ }}+>+<Modal open onOpenChange={() => undefined}>`).map((v) => v.line)+ ).toEqual([1, 4, 8]);+ });++ it("accepts a real handler and no handler", () => {+ expect(+ scan(`<Modal open>+<Modal open onOpenChange={(open) => { if (!open) onClose(); }}>+<Drawer open onOpenChange={setOpen}>`)+ ).toEqual([]);+ });+});diff --git a/packages/checks/src/conformance/no-noop-open-change.ts b/packages/checks/src/conformance/no-noop-open-change.tsnew file mode 100644index 0000000000..e333634e58--- /dev/null+++ b/packages/checks/src/conformance/no-noop-open-change.ts@@ -0,0 +1,36 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import type { ConformanceCheck, Violation } from "../check";++// Modal and Drawer hide their close button when they are held open with no+// `onOpenChange`. A handler that does nothing defeats that: the dialog still+// cannot be closed, and the X is back, clickable and dead.+const NOOP_HANDLER =+ /onOpenChange=\{\s*(?:\(\w*\)\s*=>\s*(?:\{\s*(?:\/\*[\s\S]*?\*\/|\/\/[^\n]*)?\s*\}|undefined|null|void 0)|noop)\s*\}/g;++export const noNoopOpenChange: ConformanceCheck = {+ id: "no-noop-open-change",+ description:+ "A dialog that cannot be dismissed omits onOpenChange instead of passing a handler that does nothing",+ provenance: {+ deprecates: "onOpenChange={() => {}} on a Modal or Drawer",+ replacedBy:+ "leaving onOpenChange off, which also removes the close button (@carbon/react)",+ since: "2026-10-04"+ },+ scan(file: string, contents: string): Violation[] {+ const violations: Violation[] = [];+ for (const match of contents.matchAll(NOOP_HANDLER)) {+ violations.push({+ file,+ line: contents.slice(0, match.index).split("\n").length,+ snippet: match[0].replace(/\s+/g, " "),+ message:+ "Remove onOpenChange: a dialog with no handler cannot be dismissed and shows no close button"+ });+ }+ return violations;+ }+};diff --git a/packages/checks/src/conformance/no-raw-redirect.test.ts b/packages/checks/src/conformance/no-raw-redirect.test.tsnew file mode 100644index 0000000000..e09f3d9e7f--- /dev/null+++ b/packages/checks/src/conformance/no-raw-redirect.test.ts@@ -0,0 +1,29 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import { describe, expect, it } from "vitest";+import { noRawRedirect } from "./no-raw-redirect";++const scan = (contents: string) =>+ noRawRedirect.scan("apps/erp/app/routes/x.tsx", contents);++describe("noRawRedirect", () => {+ it("flags redirect imported from react-router, on one line or several", () => {+ expect(+ scan(`import { data, redirect } from "react-router";+import {+ type LoaderFunctionArgs,+ redirectDocument+} from "react-router";`).map((v) => v.line)+ ).toEqual([1, 2]);+ });++ it("accepts the @carbon/utils redirect and other react-router imports", () => {+ expect(+ scan(`import { redirect, redirectExternal } from "@carbon/utils";+import { data, useNavigate } from "react-router";+import type { LoaderFunctionArgs } from "react-router";`)+ ).toEqual([]);+ });+});diff --git a/packages/checks/src/conformance/no-raw-redirect.ts b/packages/checks/src/conformance/no-raw-redirect.tsnew file mode 100644index 0000000000..2b61c4a2f3--- /dev/null+++ b/packages/checks/src/conformance/no-raw-redirect.ts@@ -0,0 +1,40 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import type { ConformanceCheck, Violation } from "../check";++// React Router's redirect goes wherever it is told. A destination read from a+// query string or a form then sends the browser off-site unless the call site+// remembered to validate it — one signup route did not. `redirect` from+// @carbon/utils only goes to a path on this origin; `redirectExternal` is the+// named way to leave it.+const RAW_IMPORT =+ /import\s*\{[^}]*?\b(redirect|redirectDocument|replace)\b[^}]*\}\s*from\s*["']react-router["']/g;++export const noRawRedirect: ConformanceCheck = {+ id: "no-raw-redirect",+ description: "Redirect with redirect / redirectExternal from @carbon/utils",+ provenance: {+ deprecates:+ "redirect from react-router, and validating the target at the call site",+ replacedBy: "redirect, redirectExternal (@carbon/utils)",+ since: "2026-10-04"+ },+ scan(file: string, contents: string): Violation[] {+ const violations: Violation[] = [];+ for (const match of contents.matchAll(RAW_IMPORT)) {+ const line = contents.slice(0, match.index).split("\n").length;+ violations.push({+ file,+ line,+ snippet: `import { ${match[1]} } from "react-router"`,+ message:+ match[1] === "redirect"+ ? "Import redirect from @carbon/utils; use redirectExternal to leave this origin"+ : `${match[1]} from react-router goes wherever it is told; use redirect from @carbon/utils`+ });+ }+ return violations;+ }+};diff --git a/packages/checks/src/index.ts b/packages/checks/src/index.tsindex c6509c2c20..e88910b51a 100644--- a/packages/checks/src/index.ts+++ b/packages/checks/src/index.ts@@ -24,6 +24,7 @@ export { noLocalTimezone } from "./conformance/no-local-timezone";export { noMissingAuditColumn } from "./conformance/no-missing-audit-column";export { noNumericPrecision } from "./conformance/no-numeric-precision";export { noRawForwardedHeaders } from "./conformance/no-raw-forwarded-headers";+export { noRawRedirect } from "./conformance/no-raw-redirect";export { noRawRounding } from "./conformance/no-raw-rounding";export { noRequiredColumnWithoutDefault } from "./conformance/no-required-column-without-default";export { noUnguardedSubmit } from "./conformance/no-unguarded-submit";diff --git a/packages/checks/src/run.ts b/packages/checks/src/run.tsindex f0fa884784..51751d15b0 100644--- a/packages/checks/src/run.ts+++ b/packages/checks/src/run.ts@@ -23,14 +23,21 @@ import {import { noDbClientInService } from "./conformance/no-db-client-in-service";import { noDefaultOnEffects } from "./conformance/no-default-on-effects";import { noDerivedPercentColumn } from "./conformance/no-derived-percent-column";+import {+ findDuplicatedAppFiles,+ NO_DUPLICATED_APP_FILE,+ SHARED_APP_DIRS+} from "./conformance/no-duplicated-app-file";import { noInlineFractionDigits } from "./conformance/no-inline-fraction-digits";import { noIntegrationIdBranching } from "./conformance/no-integration-id-branching";import { noInterpolatedErrorLog } from "./conformance/no-interpolated-error-log";import { noLegacyRls } from "./conformance/no-legacy-rls";import { noLocalTimezone } from "./conformance/no-local-timezone";import { noMissingAuditColumn } from "./conformance/no-missing-audit-column";+import { noNoopOpenChange } from "./conformance/no-noop-open-change";import { noNumericPrecision } from "./conformance/no-numeric-precision";import { noRawForwardedHeaders } from "./conformance/no-raw-forwarded-headers";+import { noRawRedirect } from "./conformance/no-raw-redirect";import { noRawRounding } from "./conformance/no-raw-rounding";import { noRequiredColumnWithoutDefault } from "./conformance/no-required-column-without-default";import { noUnguardedSubmit } from "./conformance/no-unguarded-submit";@@ -78,7 +85,8 @@ export const TS_CHECKS: ConformanceCheck[] = [noUnroundedTrackedQuantity,noIntegrationIdBranching,noUnscopedKyselyWrite,- noUnguardedSubmit+ noUnguardedSubmit,+ noNoopOpenChange];/** Checks that run once per edge function, over all of its .ts files. */@@ -158,14 +166,18 @@ export function collectFindings(root: string = repoRoot()): Finding[] {]),...scanAll(loadTypescriptFiles(root, REQUEST_HANDLING_ROOTS), [noRawForwardedHeaders,- noInterpolatedErrorLog+ noInterpolatedErrorLog,+ noRawRedirect]),...scanAll(loadTypescriptFiles(root, ROUTE_ROOTS), [indexRedirectBeforeLoaders]),...scanAll(loadEdgeFunctions(root), EDGE_FUNCTION_CHECKS),...scanAll(loadServerFunctions(root), SERVER_FN_CHECKS),- ...scanAll(loadLicenseFiles(root), [spdxLicenseHeader])+ ...scanAll(loadLicenseFiles(root), [spdxLicenseHeader]),+ ...findDuplicatedAppFiles(loadTypescriptFiles(root, SHARED_APP_DIRS)).map(+ (violation) => ({ checkId: NO_DUPLICATED_APP_FILE, violation })+ )];}diff --git a/packages/config/tailwind/theme.css b/packages/config/tailwind/theme.cssindex d67050bae4..9ae641f22f 100644--- a/packages/config/tailwind/theme.css+++ b/packages/config/tailwind/theme.css@@ -146,6 +146,26 @@* - ring: v4 default is 1px, restore 3px default*/@layer base {+ html,+ body {+ overscroll-behavior-y: none;+ }++ /* Reduced motion keeps the fades and drops the movement: the enter/exit+ utilities read these variables, so zoom and slide collapse to nothing. */+ @media (prefers-reduced-motion: reduce) {+ *,+ ::before,+ ::after {+ --tw-enter-scale: 1 !important;+ --tw-exit-scale: 1 !important;+ --tw-enter-translate-x: 0 !important;+ --tw-enter-translate-y: 0 !important;+ --tw-exit-translate-x: 0 !important;+ --tw-exit-translate-y: 0 !important;+ }+ }+button:not(:disabled),[role="button"]:not(:disabled) {cursor: pointer;diff --git a/packages/database/src/authz/cli.ts b/packages/database/src/authz/cli.tsindex eeae69bbc9..e99f2a7f9c 100644--- a/packages/database/src/authz/cli.ts+++ b/packages/database/src/authz/cli.ts@@ -18,6 +18,7 @@ import { syncAuthz } from "./sync";// sync make the database match manifest.ts and helpers/// migration <name> write a migration shipping every rule and helper production does// not have yet (see migration.ts; migration.test.ts fails until it does)+// --tables=a,b also re-ship these tables' rules, shipped or notasync function main() {const command = process.argv[2];if (command === "migration") {@@ -33,6 +34,18 @@ async function main() {throw new Error(`authz migration: fix these first:\n${todo.problems.join("\n")}`);+ // A baselined table keeps the policy text production had at takeover: the+ // meaning matches its rule, the wording may not (an unwrapped auth.uid()+ // that Postgres then re-evaluates per row). --tables re-lands the named+ // rules as the manifest renders them.+ const again = process.argv+ .find((arg) => arg.startsWith("--tables="))+ ?.slice("--tables=".length)+ .split(",")+ .filter(Boolean);+ for (const table of again ?? []) {+ if (!todo.tables.includes(table)) todo.tables.push(table);+ }if (!todo.tables.length && !todo.helpers.length) {console.log("authz: production already has every rule and helper");return;diff --git a/packages/database/src/authz/manifest.ts b/packages/database/src/authz/manifest.tsindex 22d8651c28..dc20fb5557 100644--- a/packages/database/src/authz/manifest.ts+++ b/packages/database/src/authz/manifest.ts@@ -139,15 +139,15 @@ export const manifest = {CREATE POLICY "INSERT" ON ${t} AS PERMISSIVE FOR INSERT TO public WITH CHECK ((("companyId" = ANY (( SELECT get_companies_with_employee_role() AS get_companies_with_employee_role)::text[])) AND (EXISTS ( SELECT 1FROM ("agentMessage" mJOIN "agentThread" t ON (((t.id = m."threadId") AND (t."companyId" = m."companyId"))))- WHERE ((m.id = "agentMessagePart"."messageId") AND (m."companyId" = "agentMessagePart"."companyId") AND (t."userId" = (auth.uid())::text))))));+ WHERE ((m.id = "agentMessagePart"."messageId") AND (m."companyId" = "agentMessagePart"."companyId") AND (t."userId" = (( SELECT auth.uid() AS uid))::text))))));CREATE POLICY "SELECT" ON ${t} AS PERMISSIVE FOR SELECT TO public USING ((("companyId" = ANY (( SELECT get_companies_with_employee_role() AS get_companies_with_employee_role)::text[])) AND (EXISTS ( SELECT 1FROM ("agentMessage" mJOIN "agentThread" t ON (((t.id = m."threadId") AND (t."companyId" = m."companyId"))))- WHERE ((m.id = "agentMessagePart"."messageId") AND (m."companyId" = "agentMessagePart"."companyId") AND (t."userId" = (auth.uid())::text))))));+ WHERE ((m.id = "agentMessagePart"."messageId") AND (m."companyId" = "agentMessagePart"."companyId") AND (t."userId" = (( SELECT auth.uid() AS uid))::text))))));CREATE POLICY "UPDATE" ON ${t} AS PERMISSIVE FOR UPDATE TO public USING ((("companyId" = ANY (( SELECT get_companies_with_employee_role() AS get_companies_with_employee_role)::text[])) AND (EXISTS ( SELECT 1FROM ("agentMessage" mJOIN "agentThread" t ON (((t.id = m."threadId") AND (t."companyId" = m."companyId"))))- WHERE ((m.id = "agentMessagePart"."messageId") AND (m."companyId" = "agentMessagePart"."companyId") AND (t."userId" = (auth.uid())::text))))));+ WHERE ((m.id = "agentMessagePart"."messageId") AND (m."companyId" = "agentMessagePart"."companyId") AND (t."userId" = (( SELECT auth.uid() AS uid))::text))))));`),agentThread: policies({diff --git a/packages/database/src/methods.ts b/packages/database/src/methods.tsindex bafdeaac92..d911a6edba 100644--- a/packages/database/src/methods.ts+++ b/packages/database/src/methods.ts@@ -67,7 +67,7 @@ export function getJobMethodTreeArray(});}-function getJobMethodTreeArrayToTree(+export function getJobMethodTreeArrayToTree(items: JobMethod[],parentMaterialId: string | null = null): JobMethodTreeItem[] {diff --git a/packages/database/src/types.ts b/packages/database/src/types.tsindex 64a5222692..f70f24aa8a 100644--- a/packages/database/src/types.ts+++ b/packages/database/src/types.ts@@ -83070,6 +83070,10 @@ export type Database = {}[]}get_api_key_scopes: { Args: never; Returns: Json }+ get_app_shell: {+ Args: { company_id: string; user_id: string }+ Returns: Json+ }get_ar_aging: {Args: {_aging_method?: stringdiff --git a/packages/database/supabase/migrations/20261003222137_app-shell-read.sql b/packages/database/supabase/migrations/20261003222137_app-shell-read.sqlnew file mode 100644index 0000000000..deb263ca0d--- /dev/null+++ b/packages/database/supabase/migrations/20261003222137_app-shell-read.sql@@ -0,0 +1,74 @@+-- The app shell read nine tables with nine requests on every load. They ran in+-- parallel, so the page waited for the slowest of nine trips through the API+-- gateway. This returns the same rows in one.+--+-- SECURITY INVOKER: it runs as the caller, so each table's RLS decides what+-- comes back, exactly as it did when the app read them one request each. It+-- can return nothing the caller could not already read through REST.+CREATE OR REPLACE FUNCTION "get_app_shell"(company_id TEXT, user_id TEXT)+RETURNS JSONB+LANGUAGE sql+STABLE+SECURITY INVOKER+SET search_path = public+AS $$+ SELECT jsonb_build_object(+ 'companies', (+ SELECT COALESCE(jsonb_agg(to_jsonb(c) ORDER BY c."name"), '[]'::jsonb)+ FROM "companies" c+ WHERE c."userId" = user_id+ ),+ 'companyIntegrations', (+ SELECT COALESCE(jsonb_agg(to_jsonb(ci)), '[]'::jsonb)+ FROM "companyIntegration" ci+ WHERE ci."companyId" = company_id+ ),+ 'companySettings', (+ SELECT to_jsonb(cs)+ FROM "companySettings" cs+ WHERE cs."id" = company_id+ ),+ 'savedViews', (+ SELECT COALESCE(jsonb_agg(to_jsonb(tv) ORDER BY tv."name"), '[]'::jsonb)+ FROM "tableView" tv+ WHERE tv."createdBy" = user_id AND tv."companyId" = company_id+ ),+ 'user', (+ SELECT to_jsonb(u)+ FROM "user" u+ WHERE u."id" = user_id AND u."active" = true+ ),+ 'groups', to_jsonb(groups_for_user(user_id)),+ 'defaults', (+ SELECT to_jsonb(ud)+ FROM "userDefaults" ud+ WHERE ud."userId" = user_id AND ud."companyId" = company_id+ LIMIT 1+ ),+ 'modulePreferences', (+ SELECT COALESCE(+ jsonb_agg(+ jsonb_build_object(+ 'module', mp."module",+ 'position', mp."position",+ 'hidden', mp."hidden"+ )+ ORDER BY mp."position"+ ),+ '[]'::jsonb+ )+ FROM "userModulePreference" mp+ WHERE mp."userId" = user_id AND mp."companyId" = company_id+ ),+ 'printerRoutes', (+ SELECT COALESCE(jsonb_agg(to_jsonb(pr) ORDER BY pr."name"), '[]'::jsonb)+ FROM "printerRoute" pr+ WHERE pr."companyId" = company_id+ ),+ 'implementationHub', (+ SELECT to_jsonb(h)+ FROM "implementationHub" h+ WHERE h."id" = company_id+ )+ );+$$;diff --git a/packages/database/supabase/migrations/20261003223948_rls-caller-lookup-once.sql b/packages/database/supabase/migrations/20261003223948_rls-caller-lookup-once.sqlnew file mode 100644index 0000000000..f0349c112d--- /dev/null+++ b/packages/database/supabase/migrations/20261003223948_rls-caller-lookup-once.sql@@ -0,0 +1,120 @@+-- Generated by `pnpm --filter @carbon/database authz migration` from packages/database/src/authz. Do not edit.++-- Ships these rules to databases where `authz sync` does not run after migrations yet.++-- agentMessagePart+DO $authz$+DECLARE p record;+BEGIN+ FOR p IN SELECT policyname FROM pg_policies WHERE schemaname = 'public' AND tablename = 'agentMessagePart' LOOP+ EXECUTE format('DROP POLICY %I ON public.%I', p.policyname, 'agentMessagePart');+ END LOOP;+END+$authz$;+ALTER TABLE public."agentMessagePart" ENABLE ROW LEVEL SECURITY;++ CREATE POLICY "INSERT" ON "public"."agentMessagePart" AS PERMISSIVE FOR INSERT TO public WITH CHECK ((("companyId" = ANY (( SELECT get_companies_with_employee_role() AS get_companies_with_employee_role)::text[])) AND (EXISTS ( SELECT 1+ FROM ("agentMessage" m+ JOIN "agentThread" t ON (((t.id = m."threadId") AND (t."companyId" = m."companyId"))))+ WHERE ((m.id = "agentMessagePart"."messageId") AND (m."companyId" = "agentMessagePart"."companyId") AND (t."userId" = (( SELECT auth.uid() AS uid))::text))))));+ CREATE POLICY "SELECT" ON "public"."agentMessagePart" AS PERMISSIVE FOR SELECT TO public USING ((("companyId" = ANY (( SELECT get_companies_with_employee_role() AS get_companies_with_employee_role)::text[])) AND (EXISTS ( SELECT 1+ FROM ("agentMessage" m+ JOIN "agentThread" t ON (((t.id = m."threadId") AND (t."companyId" = m."companyId"))))+ WHERE ((m.id = "agentMessagePart"."messageId") AND (m."companyId" = "agentMessagePart"."companyId") AND (t."userId" = (( SELECT auth.uid() AS uid))::text))))));+ CREATE POLICY "UPDATE" ON "public"."agentMessagePart" AS PERMISSIVE FOR UPDATE TO public USING ((("companyId" = ANY (( SELECT get_companies_with_employee_role() AS get_companies_with_employee_role)::text[])) AND (EXISTS ( SELECT 1+ FROM ("agentMessage" m+ JOIN "agentThread" t ON (((t.id = m."threadId") AND (t."companyId" = m."companyId"))))+ WHERE ((m.id = "agentMessagePart"."messageId") AND (m."companyId" = "agentMessagePart"."companyId") AND (t."userId" = (( SELECT auth.uid() AS uid))::text))))));+++-- companyGroup+DO $authz$+DECLARE p record;+BEGIN+ FOR p IN SELECT policyname FROM pg_policies WHERE schemaname = 'public' AND tablename = 'companyGroup' LOOP+ EXECUTE format('DROP POLICY %I ON public.%I', p.policyname, 'companyGroup');+ END LOOP;+END+$authz$;+ALTER TABLE public."companyGroup" ENABLE ROW LEVEL SECURITY;+CREATE POLICY "SELECT" ON "public"."companyGroup" FOR SELECT USING ("id" IN (SELECT "company"."companyGroupId" FROM "public"."company" WHERE "id" IN (SELECT "userToCompany"."companyId" FROM "public"."userToCompany" WHERE "userId" = ((SELECT auth.uid()))::text)));++-- notificationDelivery+DO $authz$+DECLARE p record;+BEGIN+ FOR p IN SELECT policyname FROM pg_policies WHERE schemaname = 'public' AND tablename = 'notificationDelivery' LOOP+ EXECUTE format('DROP POLICY %I ON public.%I', p.policyname, 'notificationDelivery');+ END LOOP;+END+$authz$;+ALTER TABLE public."notificationDelivery" ENABLE ROW LEVEL SECURITY;+CREATE POLICY "SELECT" ON "public"."notificationDelivery" FOR SELECT USING ("userId" = ((SELECT auth.uid()))::text);++-- notificationPreference+DO $authz$+DECLARE p record;+BEGIN+ FOR p IN SELECT policyname FROM pg_policies WHERE schemaname = 'public' AND tablename = 'notificationPreference' LOOP+ EXECUTE format('DROP POLICY %I ON public.%I', p.policyname, 'notificationPreference');+ END LOOP;+END+$authz$;+ALTER TABLE public."notificationPreference" ENABLE ROW LEVEL SECURITY;+CREATE POLICY "SELECT" ON "public"."notificationPreference" FOR SELECT USING (("userId" = ((SELECT auth.uid()))::text AND "companyId" IN (SELECT "userToCompany"."companyId" FROM "public"."userToCompany" WHERE "userId" = ((SELECT auth.uid()))::text)));+CREATE POLICY "INSERT" ON "public"."notificationPreference" FOR INSERT WITH CHECK (("userId" = ((SELECT auth.uid()))::text AND "companyId" IN (SELECT "userToCompany"."companyId" FROM "public"."userToCompany" WHERE "userId" = ((SELECT auth.uid()))::text)));+CREATE POLICY "UPDATE" ON "public"."notificationPreference" FOR UPDATE USING ("userId" = ((SELECT auth.uid()))::text) WITH CHECK (("userId" = ((SELECT auth.uid()))::text AND "companyId" IN (SELECT "userToCompany"."companyId" FROM "public"."userToCompany" WHERE "userId" = ((SELECT auth.uid()))::text)));+CREATE POLICY "DELETE" ON "public"."notificationPreference" FOR DELETE USING (("userId" = ((SELECT auth.uid()))::text AND "companyId" IN (SELECT "userToCompany"."companyId" FROM "public"."userToCompany" WHERE "userId" = ((SELECT auth.uid()))::text)));++-- agentThread+DO $authz$+DECLARE p record;+BEGIN+ FOR p IN SELECT policyname FROM pg_policies WHERE schemaname = 'public' AND tablename = 'agentThread' LOOP+ EXECUTE format('DROP POLICY %I ON public.%I', p.policyname, 'agentThread');+ END LOOP;+END+$authz$;+ALTER TABLE public."agentThread" ENABLE ROW LEVEL SECURITY;+CREATE POLICY "SELECT" ON "public"."agentThread" FOR SELECT USING (("userId" = ((SELECT auth.uid()))::text AND "companyId" = ANY ((SELECT get_companies_with_employee_role())::text[])));+CREATE POLICY "INSERT" ON "public"."agentThread" FOR INSERT WITH CHECK (("userId" = ((SELECT auth.uid()))::text AND "companyId" = ANY ((SELECT get_companies_with_employee_role())::text[])));+CREATE POLICY "UPDATE" ON "public"."agentThread" FOR UPDATE USING (("userId" = ((SELECT auth.uid()))::text AND "companyId" = ANY ((SELECT get_companies_with_employee_role())::text[])));+CREATE POLICY "DELETE" ON "public"."agentThread" FOR DELETE USING (("userId" = ((SELECT auth.uid()))::text AND "companyId" = ANY ((SELECT get_companies_with_employee_role())::text[])));++-- agentMessage+DO $authz$+DECLARE p record;+BEGIN+ FOR p IN SELECT policyname FROM pg_policies WHERE schemaname = 'public' AND tablename = 'agentMessage' LOOP+ EXECUTE format('DROP POLICY %I ON public.%I', p.policyname, 'agentMessage');+ END LOOP;+END+$authz$;+ALTER TABLE public."agentMessage" ENABLE ROW LEVEL SECURITY;+CREATE POLICY "SELECT" ON "public"."agentMessage" FOR SELECT USING (("companyId" = ANY ((SELECT get_companies_with_employee_role())::text[]) AND EXISTS (SELECT 1 FROM "public"."agentThread" p WHERE "p"."id" = "agentMessage"."threadId" AND "p"."companyId" = "agentMessage"."companyId" AND "userId" = ((SELECT auth.uid()))::text)));+CREATE POLICY "INSERT" ON "public"."agentMessage" FOR INSERT WITH CHECK (("companyId" = ANY ((SELECT get_companies_with_employee_role())::text[]) AND EXISTS (SELECT 1 FROM "public"."agentThread" p WHERE "p"."id" = "agentMessage"."threadId" AND "p"."companyId" = "agentMessage"."companyId" AND "userId" = ((SELECT auth.uid()))::text)));+CREATE POLICY "UPDATE" ON "public"."agentMessage" FOR UPDATE USING (("companyId" = ANY ((SELECT get_companies_with_employee_role())::text[]) AND EXISTS (SELECT 1 FROM "public"."agentThread" p WHERE "p"."id" = "agentMessage"."threadId" AND "p"."companyId" = "agentMessage"."companyId" AND "userId" = ((SELECT auth.uid()))::text)));++-- ssoReservedDomain+DO $authz$+DECLARE p record;+BEGIN+ FOR p IN SELECT policyname FROM pg_policies WHERE schemaname = 'public' AND tablename = 'ssoReservedDomain' LOOP+ EXECUTE format('DROP POLICY %I ON public.%I', p.policyname, 'ssoReservedDomain');+ END LOOP;+END+$authz$;+ALTER TABLE public."ssoReservedDomain" ENABLE ROW LEVEL SECURITY;+CREATE POLICY "SELECT" ON "public"."ssoReservedDomain" FOR SELECT USING ((SELECT auth.role()) = 'authenticated');++-- scriptRun+DO $authz$+DECLARE p record;+BEGIN+ FOR p IN SELECT policyname FROM pg_policies WHERE schemaname = 'public' AND tablename = 'scriptRun' LOOP+ EXECUTE format('DROP POLICY %I ON public.%I', p.policyname, 'scriptRun');+ END LOOP;+END+$authz$;+ALTER TABLE public."scriptRun" ENABLE ROW LEVEL SECURITY;+CREATE POLICY "SELECT" ON "public"."scriptRun" FOR SELECT USING ((SELECT auth.role()) = 'authenticated');diff --git a/packages/database/supabase/migrations/20261003224019_advisor-views-and-function-search-path.sql b/packages/database/supabase/migrations/20261003224019_advisor-views-and-function-search-path.sqlnew file mode 100644index 0000000000..dfa7be3ee5--- /dev/null+++ b/packages/database/supabase/migrations/20261003224019_advisor-views-and-function-search-path.sql@@ -0,0 +1,92 @@+-- Supabase's security advisor, as of 2026-10-04.++-- 1. Two views ran with their owner's rights. `modules` lists an enum and+-- `eventSystemTrigger` reads the trigger catalog; neither needs more than the+-- caller has, so they run as the caller like every other view.+ALTER VIEW "modules" SET (security_invoker = true);+ALTER VIEW "eventSystemTrigger" SET (security_invoker = true);++-- 2. `v_readable_id` exists only in production (no migration creates it): a+-- two-column table in the API schema with RLS off, so any caller could read+-- and write it. RLS on with no policy leaves it to the service role. A no-op+-- wherever the table does not exist.+ALTER TABLE IF EXISTS public."v_readable_id" ENABLE ROW LEVEL SECURITY;++-- 3. A function with no search_path of its own resolves unqualified names+-- through its caller's. For a SECURITY DEFINER function that is how a caller+-- substitutes its own objects for the ones the function meant.+--+-- Pinned to `public, extensions`: what the API roles and direct connections+-- already resolve through ("$user" names no schema for any of them), so+-- nothing looks anything up differently than it does today.+--+-- plpgsql only. A `LANGUAGE sql` function with a SET clause can no longer be+-- inlined into the query that calls it, which would slow the planning views+-- and report functions that rely on it.+--+-- Not the functions fired by triggers on `auth.users` and `storage.objects`:+-- those run with the auth and storage roles' own search paths, and pinning+-- them here would change what they resolve.+--+-- Not the event-system functions either. Each is owned by its file under+-- packages/database/src/event-system/functions, and `authz sync` recreates+-- them from there: a setting made here would be gone after the next sync and+-- leave production different from every other database. Pin those in their+-- own files.+DO $$+DECLARE+ fn regprocedure;+BEGIN+ FOR fn IN+ SELECT p.oid::regprocedure+ FROM pg_proc p+ JOIN pg_namespace n ON n.oid = p.pronamespace+ JOIN pg_language l ON l.oid = p.prolang+ WHERE n.nspname = 'public'+ AND p.prokind = 'f'+ AND l.lanname = 'plpgsql'+ AND NOT EXISTS (+ SELECT 1 FROM unnest(coalesce(p.proconfig, '{}')) AS setting+ WHERE setting LIKE 'search_path=%'+ )+ -- Owned by an extension, not by us.+ AND NOT EXISTS (+ SELECT 1 FROM pg_depend d WHERE d.objid = p.oid AND d.deptype = 'e'+ )+ AND p.proname <> ALL (ARRAY[+ 'attach_audit_log_append_only',+ 'attach_event_trigger',+ 'attach_statement_handler',+ 'create_audit_log_table',+ 'create_company_search_index',+ 'create_embedding_subscriptions_for_company',+ 'create_search_subscriptions_for_company',+ 'delete_from_search_index',+ 'delete_old_audit_logs',+ 'drop_audit_log_table',+ 'drop_company_search_index',+ 'get_audit_log',+ 'get_audit_log_count',+ 'get_audit_logs_for_archive',+ 'get_entity_audit_log',+ 'get_primary_key_column',+ 'get_primary_key_columns',+ 'insert_audit_log_batch',+ 'on_company_created_search_index',+ 'populate_company_search_index',+ 'prevent_audit_log_mutation',+ 'search_company_index',+ 'upsert_to_search_index'+ ])+ AND NOT EXISTS (+ SELECT 1+ FROM pg_trigger t+ JOIN pg_class c ON c.oid = t.tgrelid+ JOIN pg_namespace tn ON tn.oid = c.relnamespace+ WHERE t.tgfoid = p.oid AND tn.nspname <> 'public'+ )+ LOOP+ EXECUTE format('ALTER FUNCTION %s SET search_path = public, extensions', fn);+ END LOOP;+END+$$;diff --git a/packages/ee/src/plan.server.ts b/packages/ee/src/plan.server.tsindex 9ab2d1464c..79e11357ab 100644--- a/packages/ee/src/plan.server.ts+++ b/packages/ee/src/plan.server.ts@@ -9,9 +9,8 @@ import {} from "@carbon/auth/company.server";import { flash } from "@carbon/auth/session.server";import type { Database } from "@carbon/database";-import { Edition, normalizePlanId, Plan } from "@carbon/utils";+import { Edition, normalizePlanId, Plan, redirect } from "@carbon/utils";import type { SupabaseClient } from "@supabase/supabase-js";-import { redirect } from "react-router";import {defaultUpgradeMessage,type GateSpec,diff --git a/packages/files/AGENTS.md b/packages/files/AGENTS.mdindex c74f87b646..d504256d21 100644--- a/packages/files/AGENTS.md+++ b/packages/files/AGENTS.md@@ -6,7 +6,7 @@ in the codebase, shared by the browser and Node.| Subpath | Provides ||---------|----------|-| `.` (root) | Cross-type helpers: `MEDIA_CONTENT_TYPES` + `getContentType` (the one extension→MIME map every file-serving route uses), `getFileExtension` / `effectiveExtension` (`.zst` unwrap), `getDocumentType` / `documentTypes` / `isPreviewableDocumentType` (file classification for the Documents UI), `convertKbToString`, and `downloadBlob` / `downloadText` — THE browser "save this as a file" sequence (object URL → anchor click → revoke); never hand-roll it. **`storage(client)`** — the Carbon storage client, supabase-shaped: `.from(bucket)` is plain supabase for `public` / `temp-staging`; `.company(companyId)` is that company's private bucket (bucket id = companyId, THROWS on an empty id). Writes go to the company bucket only; reads (`download`, `info`, `exists`, `createSignedUrl`) fall back to the legacy shared `private` bucket, `move` retries as a move OUT of it, `list` unions both and `remove` deletes from both. The fallback stays until nothing writes to `private` any more: the one-off copy (`scripts/one-off/migrate-private-buckets.ts`) ran, but files have landed there since. `list(folder)` takes no options: it reads the cursor-paged `listV2` endpoint to the end in both buckets and returns every entry directly inside the folder, sorted by name, in the old `list` shape (`name` is the entry's own name; a sub-folder has a null `id`), the company copy winning a tie. Every key must sit under `${companyId}/` and pass `isUnsafeStoragePath`; anything else gets `{ data: null, error }` without touching storage. **`isUnsafeStoragePath(path)`** is THE storage-key traversal guard (dot segments, `\`, `?`, `#`, control characters, checked as given and after every decode so `%2e%2e` / `%252e%252e` are caught; malformed escapes refused) — every route that takes a key from a URL or form calls it rather than a local copy; **`safeStorageFileName(name)`** turns a caller-supplied file name into a safe last key segment (basename, no `%`) or null. This is the contract for document keys (`${companyId}/parts/…`, `/job/…`, `/tmp/…`, everything `getPrivateUrl` serves); the backup and audit-archive layouts (`exports/…`, `audit/…`) share the bucket under their own keys and keep using plain `client.storage.from(companyId)`. `getCompanyPrivateBucket` / `LEGACY_PRIVATE_BUCKET` / `hasCompanyPrivateObjectPathPrefix` are exported for the few places that need the bucket *name* (MediaUploader staging, route authorization, the assembler's bucket resolver) |+| `.` (root) | Cross-type helpers: `MEDIA_CONTENT_TYPES` + `getContentType` (the one extension→MIME map every file-serving route uses), `getFileExtension` / `effectiveExtension` (`.zst` unwrap), `getDocumentType` / `documentTypes` / `isPreviewableDocumentType` (file classification for the Documents UI), `convertKbToString`, `downloadUrl(url, filename)` (fetches first and throws on a failed response, so an expired session never saves an error page under the file's name), and `downloadBlob` / `downloadText` — THE browser "save this as a file" sequence (object URL → anchor click → revoke); never hand-roll it. **`storage(client)`** — the Carbon storage client, supabase-shaped: `.from(bucket)` is plain supabase for `public` / `temp-staging`; `.company(companyId)` is that company's private bucket (bucket id = companyId, THROWS on an empty id). Writes go to the company bucket only; reads (`download`, `info`, `exists`, `createSignedUrl`) fall back to the legacy shared `private` bucket, `move` retries as a move OUT of it, `list` unions both and `remove` deletes from both. The fallback stays until nothing writes to `private` any more: the one-off copy (`scripts/one-off/migrate-private-buckets.ts`) ran, but files have landed there since. `list(folder)` takes no options: it reads the cursor-paged `listV2` endpoint to the end in both buckets and returns every entry directly inside the folder, sorted by name, in the old `list` shape (`name` is the entry's own name; a sub-folder has a null `id`), the company copy winning a tie. Every key must sit under `${companyId}/` and pass `isUnsafeStoragePath`; anything else gets `{ data: null, error }` without touching storage. **`isUnsafeStoragePath(path)`** is THE storage-key traversal guard (dot segments, `\`, `?`, `#`, control characters, checked as given and after every decode so `%2e%2e` / `%252e%252e` are caught; malformed escapes refused) — every route that takes a key from a URL or form calls it rather than a local copy; **`safeStorageFileName(name)`** turns a caller-supplied file name into a safe last key segment (basename, no `%`) or null. This is the contract for document keys (`${companyId}/parts/…`, `/job/…`, `/tmp/…`, everything `getPrivateUrl` serves); the backup and audit-archive layouts (`exports/…`, `audit/…`) share the bucket under their own keys and keep using plain `client.storage.from(companyId)`. `getCompanyPrivateBucket` / `LEGACY_PRIVATE_BUCKET` / `hasCompanyPrivateObjectPathPrefix` are exported for the few places that need the bucket *name* (MediaUploader staging, route authorization, the assembler's bucket resolver) || `./csv` | `encodeCsv` (object rows; `header: false` encodes a later page of a streamed file — pages join with `\r\n`, see the Sync Activity export) / `encodeCsvTable` (header + cells) — the ONE CSV encoder, injection-safe by construction (`stripCsvFormulaPrefix` on every string cell); `parseCsv` (text) / `parseCsvFile` (browser File, streamed); `downloadCsv`; `CSV_CONTENT_TYPE`. papaparse underneath, in every runtime. The Table export button, report exports, import templates, import-error re-exports and the sales CSV import all go through here — before this there were two libraries (`json-2-csv` + papaparse) and two hand-rolled encoders, and only ONE of the five export sites protected against formula injection || `./media` | Images. **`MediaUploader`** — the configured client (constructor takes the storage client + HEIC staging location once, files-sdk style): `prepareForUpload(files)` (HEIC → JPEG sequentially + duplicate-name refusal, throws `DuplicateFileNameError`), `convertHeic(file)`, `prepareImage(file, shape)`. Underneath: `processImage` (the pipeline), `prepareImageUpload` (pipeline → native-decode fallback → imgproxy fallback), `convertHeicToJpeg` / `convertHeicFiles` / `findDuplicateFileName`, `transformImageViaStorage` (imgproxy round-trip), `isHeic`, `IMAGE_UPLOAD_MIME_TYPES`, plus the storage-path helpers `getPrivateUrl` / `getRawModelUrl` / `parseJobFilePath` || `./media/node` | `initNodeImageCodecs()` — Node-only wasm pre-instantiation; call once before the pipeline in Node (jobs, paperless, vitest). The wasm comes from the BUNDLER (`?inline` data URIs), never off disk — so this module is consumable only from a Vite pipeline, and that pipeline needs `assetsInclude: ["**/*.wasm"]` (already set in `apps/erp/vite.config.ts` and `@carbon/config/vitest`). `renderLabelLogo(bytes, ext, { widthDots, threshold?, crop? })` — a logo as a mono PNG data URL + ZPL `^GFA` field (inits the codecs itself; `@carbon/documents/labels` calls it). Never import from client code |diff --git a/packages/files/src/download.ts b/packages/files/src/download.tsindex 79df691c23..f375f4aafd 100644--- a/packages/files/src/download.ts+++ b/packages/files/src/download.ts@@ -18,6 +18,19 @@ export function downloadBlob(blob: Blob, filename: string): void {URL.revokeObjectURL(url);}+/**+ * Fetch `url` and download it as `filename`. Throws when the response is not a+ * success — an expired session or a missing file otherwise saves the error+ * page under the file's name.+ */+export async function downloadUrl(url: string, filename: string) {+ const response = await fetch(url);+ if (!response.ok) {+ throw new Error(`Download failed with status ${response.status}`);+ }+ downloadBlob(await response.blob(), filename);+}+/** Download text content under `filename` with the given MIME type. */export function downloadText(text: string,diff --git a/packages/files/src/pdf/worker.ts b/packages/files/src/pdf/worker.tsindex d5cde1b552..4b07649ff6 100644--- a/packages/files/src/pdf/worker.ts+++ b/packages/files/src/pdf/worker.ts@@ -9,8 +9,8 @@import workerSrc from "pdfjs-dist/build/pdf.worker.min.mjs?url";/**- * Point react-pdf's bundled pdfjs at the worker. Call once per app in the- * client entry — react-pdf ships its own pdfjs instance, and that instance+ * Point react-pdf's bundled pdfjs at the worker. Call at module scope in each+ * (lazy) module that renders a PDF — react-pdf ships its own pdfjs instance, and that instance* (not the one `./pdf` loads for text extraction) is what `<Document>` and* any browser code importing `pdfjs` from "react-pdf" use.*/diff --git a/packages/form/src/components/ArrayNumeric.tsx b/packages/form/src/components/ArrayNumeric.tsxindex 54d55c77e0..77a7d27e85 100644--- a/packages/form/src/components/ArrayNumeric.tsx+++ b/packages/form/src/components/ArrayNumeric.tsx@@ -127,7 +127,7 @@ const ArrayNumericInput = ({<FormControl isInvalid={!!error} isRequired><HStack className="w-full content-between"><NumberField- // @ts-ignore+ // @ts-expect-error{...getInputProps({id: name,...restdiff --git a/packages/form/src/components/PhoneInput.tsx b/packages/form/src/components/PhoneInput.tsxindex 73780fe477..9c8ad5611f 100644--- a/packages/form/src/components/PhoneInput.tsx+++ b/packages/form/src/components/PhoneInput.tsx@@ -60,7 +60,7 @@ const PhoneInput: ForwardRefExoticComponent<PhoneInputProps> = forwardRef<const onChange = (value: string) => {setValue(value);- // @ts-ignore+ // @ts-expect-errorprops.onChange?.(value);};@@ -93,7 +93,7 @@ const PhoneInput: ForwardRefExoticComponent<PhoneInputProps> = forwardRef<** @param {E164Number | undefined} value - The entered value*/- // @ts-ignore+ // @ts-expect-erroronChange={onChange}{...props}/>diff --git a/packages/form/src/components/Radios.tsx b/packages/form/src/components/Radios.tsxindex 386a33bea1..a0c3d5d9e8 100644--- a/packages/form/src/components/Radios.tsx+++ b/packages/form/src/components/Radios.tsx@@ -44,7 +44,6 @@ const Radios = ({)}<RadioGroup{...getInputProps({- // @ts-ignoreid: name})}name={name}diff --git a/packages/form/src/components/TimePicker.tsx b/packages/form/src/components/TimePicker.tsxindex 2f83e941c5..89121c8c35 100644--- a/packages/form/src/components/TimePicker.tsx+++ b/packages/form/src/components/TimePicker.tsx@@ -59,7 +59,7 @@ const TimePicker = ({ name, label, termId, onChange }: TimePickerProps) => {<input type="hidden" name={name} value={time?.toString()} /><TimePickerBasevalue={time ?? undefined}- //@ts-ignore+ //@ts-expect-erroronChange={handleChange}isDisabled={isDisabled}/>diff --git a/packages/jobs/manifests/schema.json b/packages/jobs/manifests/schema.jsonindex 600a57cc6b..662b209c73 100644--- a/packages/jobs/manifests/schema.json+++ b/packages/jobs/manifests/schema.json@@ -1,11 +1,11 @@{"kind": "carbon-company-backup","version": 1,- "schemaVersion": "20261002153217",+ "schemaVersion": "20261003224019","sourceCompanyId": "schema-baseline","sourceCompanyGroupId": null,"sourceCompanyName": null,- "exportedAt": "2026-10-02T15:23:41.816Z",+ "exportedAt": "2026-10-03T22:58:46.502Z","exportedBy": "schema-baseline","label": "schema baseline","includeStorage": "none",@@ -14,24 +14,24 @@"name": "account","rows": 0,"columns": [+ "id",+ "number",+ "name","class","incomeBalance","consolidatedRate","active",+ "createdBy","createdAt",+ "updatedBy","updatedAt","customFields",- "isGroup",- "accountType",- "isSystem",- "id",- "number",- "name",- "createdBy",- "updatedBy","tags","companyGroupId",- "parentId"+ "parentId",+ "isGroup",+ "accountType",+ "isSystem"]},{@@ -100,21 +100,21 @@"name": "accountingPeriod","rows": 0,"columns": [+ "id","startDate","endDate","status",+ "companyId","closedAt",+ "closedBy",+ "createdBy","createdAt",+ "updatedBy","updatedAt","closeStatus","fiscalYear","periodNumber","lockedAt",- "id",- "companyId",- "closedBy",- "createdBy",- "updatedBy","lockedBy"]},@@ -122,29 +122,22 @@"name": "accountingPeriodBalance","rows": 0,"columns": [- "endingBalance",- "endingBalanceDate",- "createdAt",- "updatedAt","id","companyId","accountingPeriodId","accountId",+ "endingBalance",+ "endingBalanceDate","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "accountingSyncOperation","rows": 0,"columns": [- "status",- "attemptCount",- "lastAttemptAt",- "completedAt",- "metadata",- "createdAt",- "updatedAt","id","companyId","integration",@@ -152,18 +145,30 @@"entityId","direction","trigger",+ "status","idempotencyKey",+ "attemptCount",+ "lastAttemptAt",+ "completedAt","errorCode","errorMessage","externalId",+ "metadata","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "accountingSyncTieOut","rows": 0,"columns": [+ "id",+ "companyId",+ "integration",+ "accountingPeriodId",+ "accountId","carbonPostedAmount","syncedAmount","docBackedAmount",@@ -174,15 +179,10 @@"internalDelta","externalDelta","computedAt",- "createdAt",- "updatedAt",- "id",- "companyId",- "integration",- "accountingPeriodId",- "accountId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{@@ -205,140 +205,140 @@"name": "agentThread","rows": 0,"columns": [- "lastContext",- "createdAt",- "updatedAt","id","companyId","userId","title","modelId",+ "lastContext","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "agentMessage","rows": 0,"columns": [- "context",- "inputTokens",- "outputTokens",- "createdAt",- "updatedAt","id","threadId","companyId","role",+ "context","feedback","feedbackNote","finishReason",+ "inputTokens",+ "outputTokens","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "agentMessagePart","rows": 0,"columns": [- "orderIndex",- "toolInput",- "toolOutput",- "toolDurationMs",- "createdAt",- "updatedAt","id","messageId","companyId",+ "orderIndex","type","textContent","toolName","toolClassification","toolCallId",+ "toolInput",+ "toolOutput","toolState",+ "toolDurationMs","errorMessage","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "approvalRequest","rows": 0,"columns": [+ "id","documentType",+ "documentId","status","amount",- "requestedAt",- "decisionAt",- "createdAt",- "updatedAt",- "id",- "documentId","requestedBy",+ "requestedAt","decisionBy",+ "decisionAt","decisionNotes","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "approvalRule","rows": 0,"columns": [+ "id","documentType","enabled",- "lowerBoundAmount",- "escalationDays",- "createdAt",- "updatedAt",- "id","approverGroupIds","defaultApproverId",+ "lowerBoundAmount",+ "escalationDays","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "auditLogArchive","rows": 0,"columns": [+ "id",+ "companyId",+ "archivePath","startDate","endDate","rowCount","sizeBytes",- "createdAt",- "id",- "companyId",- "archivePath"+ "createdAt"]},{"name": "changeOrderRequiredAction","rows": 0,"columns": [- "active",- "createdAt",- "updatedAt",- "customFields","id","companyId","name",+ "active","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "changeOrderType","rows": 0,"columns": [- "createdAt",- "updatedAt","id","name","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -346,7 +346,6 @@"name": "companyAccountsPayableBillingAddress","rows": 0,"columns": [- "updatedAt","id","name","addressLine1",@@ -358,6 +357,7 @@"phone","fax","email",+ "updatedAt","updatedBy"]},@@ -365,7 +365,6 @@"name": "companyAccountsReceivableBillingAddress","rows": 0,"columns": [- "updatedAt","id","name","addressLine1",@@ -377,6 +376,7 @@"phone","fax","email",+ "updatedAt","updatedBy"]},@@ -384,12 +384,29 @@"name": "companySettings","rows": 0,"columns": [+ "id","digitalQuoteEnabled",+ "digitalQuoteNotificationGroup","digitalQuoteIncludesPurchaseOrders",+ "rfqReadyNotificationGroup",+ "productLabelSize",+ "shelfLabelSize",+ "inventoryJobCompletedNotificationGroup",+ "salesJobCompletedNotificationGroup","materialGeneratedIds","useMetric","kanbanOutput",+ "gaugeCalibrationExpiredNotificationGroup","purchasePriceUpdateTiming",+ "supplierQuoteNotificationGroup",+ "maintenanceDispatchNotificationGroup",+ "qualityDispatchNotificationGroup",+ "operationsDispatchNotificationGroup",+ "otherDispatchNotificationGroup",+ "defaultSupplierCc",+ "defaultCustomerCc",+ "accountsPayableEmail",+ "accountsReceivableEmail","accountsPayableAddress","accountsReceivableAddress","quoteLineCategoryMarkups",@@ -407,65 +424,48 @@"showSupplierReadableId","showCustomerReadableId","autoStartOperationTimer",+ "plmReleaseControl","autoSelectMaterialWithoutPickingList",+ "incompletePickingListPolicy","includeMaterialsOnTraveler",+ "returnPickedMaterialTiming",+ "salesRuleNotificationGroup","showCurrencyTrailingZeros","requireMfa","allowLowercaseItemIds","includeOperationsOnTraveler","requireSupplierContactAndLocation","requireCustomerContactAndLocation",- "showBomExplorerReadableId",- "id",- "digitalQuoteNotificationGroup",- "rfqReadyNotificationGroup",- "productLabelSize",- "shelfLabelSize",- "inventoryJobCompletedNotificationGroup",- "salesJobCompletedNotificationGroup",- "gaugeCalibrationExpiredNotificationGroup",- "supplierQuoteNotificationGroup",- "maintenanceDispatchNotificationGroup",- "qualityDispatchNotificationGroup",- "operationsDispatchNotificationGroup",- "otherDispatchNotificationGroup",- "defaultSupplierCc",- "defaultCustomerCc",- "accountsPayableEmail",- "accountsReceivableEmail",- "plmReleaseControl",- "incompletePickingListPolicy",- "returnPickedMaterialTiming",- "salesRuleNotificationGroup"+ "showBomExplorerReadableId"]},{"name": "companyUsage","rows": 0,"columns": [+ "id","users","tasks","aiTokens","nextResetDatetime",+ "companyId","createdAt",- "updatedAt",- "id",- "companyId"+ "updatedAt"]},{"name": "consumable","rows": 0,"columns": [- "approved",- "customFields",- "createdAt",- "updatedAt","id",+ "approved","approvedBy",+ "customFields","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt","tags"]},@@ -473,7 +473,6 @@"name": "contact","rows": 0,"columns": [- "isCustomer","id","firstName","lastName",@@ -484,22 +483,23 @@"workPhone","fax","notes",- "companyId"+ "companyId",+ "isCustomer"]},{"name": "costCenter","rows": 0,"columns": [- "createdAt",- "updatedAt",- "customFields","id","name","parentCostCenterId","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","ownerId"]},@@ -507,52 +507,52 @@"name": "currency","rows": 0,"columns": [+ "id",+ "code","decimalPlaces","active",+ "createdBy","createdAt",+ "updatedBy","updatedAt","customFields",- "historicalExchangeRate",- "id",- "code",- "createdBy",- "updatedBy","tags",- "companyGroupId"+ "companyGroupId",+ "historicalExchangeRate"]},{"name": "customField","rows": 0,"columns": [- "sortOrder",- "dataTypeId",- "active",- "createdAt",- "updatedAt",- "required","id","name",+ "sortOrder","table",+ "dataTypeId","listOptions",+ "active","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",- "tags"+ "tags",+ "required"]},{"name": "customerStatus","rows": 0,"columns": [- "updatedAt",- "customFields",- "createdAt","id","name","companyId",+ "createdAt","createdBy","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -560,15 +560,15 @@"name": "customerType","rows": 0,"columns": [- "updatedAt",- "customFields",- "protected",- "createdAt","id","name",+ "protected","companyId",+ "createdAt","createdBy","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -576,15 +576,15 @@"name": "department","rows": 0,"columns": [- "createdAt",- "updatedAt",- "customFields","id","name","parentDepartmentId","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -592,14 +592,14 @@"name": "depreciationRun","rows": 0,"columns": [- "periodEnd",- "postedAt",- "createdAt","id","depreciationRunId",+ "periodEnd","status",+ "postedAt","postedBy","companyId",+ "createdAt","createdBy","updatedBy"]@@ -608,51 +608,51 @@"name": "dimension","rows": 0,"columns": [+ "id",+ "name","entityType",+ "companyGroupId","active","required",+ "createdBy","createdAt",- "updatedAt",- "id",- "name",- "companyGroupId",- "createdBy",- "updatedBy"+ "updatedBy",+ "updatedAt"]},{"name": "dimensionValue","rows": 0,"columns": [- "createdAt",- "updatedAt","id","dimensionId","name","companyGroupId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "document","rows": 0,"columns": [- "size",- "type",- "active",- "createdAt",- "updatedAt",- "sourceDocument","id","path","name","description",+ "size",+ "type","readGroups","writeGroups",+ "active","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "sourceDocument","sourceDocumentId"]},@@ -660,20 +660,20 @@"name": "documentExtraction","rows": 0,"columns": [- "documentType",- "status",- "extractedData",- "filteredData",- "createdAt",- "updatedAt","id","companyId","sourceDocument","sourceDocumentId","storagePath",+ "documentType",+ "status",+ "extractedData",+ "filteredData","error","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{@@ -690,46 +690,46 @@"name": "documentSection","rows": 0,"columns": [- "content",- "config",- "createdAt",- "updatedAt","id","companyId","name","placement",+ "content",+ "config","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "documentTemplate","rows": 0,"columns": [+ "id",+ "companyId",+ "documentType","formatVersion","blocks","theme","settings",- "createdAt",- "updatedAt",- "id",- "companyId",- "documentType","headerSectionId","footerSectionId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "documentTransaction","rows": 0,"columns": [- "type",- "createdAt","id","documentId",+ "type","userId",+ "createdAt","companyId"]},@@ -737,65 +737,64 @@"name": "employeeType","rows": 0,"columns": [+ "id",+ "name",+ "companyId","protected","createdAt","updatedAt",- "systemType",- "id",- "name",- "companyId"+ "systemType"]},{"name": "employee","rows": 0,- "columns": ["active", "id", "companyId", "employeeTypeId"]+ "columns": ["id", "companyId", "employeeTypeId", "active"]},{"name": "employeeTypePermission","rows": 0,"columns": [- "module",- "createdAt",- "updatedAt","employeeTypeId",+ "module","create","delete","update",- "view"+ "view",+ "createdAt",+ "updatedAt"]},{"name": "enforcementRule","rows": 0,"columns": [- "family",- "conditionAst",- "surfaces",- "targetType",- "appliesToAll",- "filteredItemMatchAll",- "active",- "createdAt",- "updatedAt",- "customFields","id","companyId",+ "family","name","description","message","severity",+ "conditionAst",+ "surfaces",+ "targetType",+ "appliesToAll","filteredItemTypes","filteredItemGroupIds",+ "filteredItemMatchAll",+ "active","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "enforcementRuleAcknowledgment","rows": 0,"columns": [- "createdAt","id","companyId","ruleId",@@ -808,6 +807,7 @@"outcome","message","createdBy",+ "createdAt","updatedBy"]},@@ -815,47 +815,47 @@"name": "eventSystemSubscription","rows": 0,"columns": [- "filter",- "config",- "active",- "createdAt","id","name","companyId","table","operations",- "handlerType"+ "filter",+ "handlerType",+ "config",+ "active",+ "createdAt"]},{"name": "exchangeRateOverride","rows": 0,"columns": [- "rate",- "createdAt",- "updatedAt","id","companyId","currencyCode",+ "rate","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "externalIntegrationMapping","rows": 0,"columns": [+ "id",+ "entityType",+ "entityId",+ "integration",+ "externalId","allowDuplicateExternalId","metadata","lastSyncedAt","remoteUpdatedAt","createdAt","updatedAt",- "id",- "entityType",- "entityId",- "integration",- "externalId","createdBy","companyId","updatedBy"@@ -864,36 +864,36 @@{"name": "fiscalYearSettings","rows": 0,- "columns": ["startMonth", "taxStartMonth", "companyId", "updatedBy"]+ "columns": ["companyId", "startMonth", "taxStartMonth", "updatedBy"]},{"name": "fixedAssetClass","rows": 0,"columns": [- "depreciationMethod",- "usefulLifeMonths",- "residualValuePercent",- "taxDepreciationMethod",- "taxUsefulLifeMonths",- "taxResidualValuePercent",- "macrsPropertyClass",- "macrsConvention",- "bonusDepreciationPercent",- "createdAt",- "updatedAt",- "customFields","id","name","description",+ "depreciationMethod",+ "usefulLifeMonths",+ "residualValuePercent","assetAccountId","accumulatedDepreciationAccountId","depreciationExpenseAccountId","writeOffAccountId","writeDownAccountId","lossOnDisposalAccountId",+ "taxDepreciationMethod",+ "taxUsefulLifeMonths",+ "taxResidualValuePercent",+ "macrsPropertyClass",+ "macrsConvention",+ "bonusDepreciationPercent","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "customFields","gainOnDisposalAccountId"]},@@ -901,13 +901,13 @@"name": "gaugeType","rows": 0,"columns": [- "customFields",- "createdAt",- "updatedAt","id","name","companyId",+ "customFields",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -915,6 +915,9 @@"name": "group","rows": 0,"columns": [+ "id",+ "name",+ "companyId","isIdentityGroup","isEmployeeTypeGroup","isCustomerOrgGroup",@@ -922,25 +925,22 @@"isSupplierTypeGroup","isSupplierOrgGroup","createdAt",- "updatedAt",- "id",- "name",- "companyId"+ "updatedAt"]},{"name": "holiday","rows": 0,"columns": [- "date",- "createdAt",- "updatedAt",- "customFields","id","name",+ "date","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -948,73 +948,69 @@"name": "implementationCheckState","rows": 0,"columns": [- "kind",- "createdAt",- "updatedAt","id","companyId","itemKey",+ "kind","value","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "implementationFieldValue","rows": 0,"columns": [- "createdAt",- "updatedAt","id","companyId","fieldKey","value","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "implementationRow","rows": 0,"columns": [- "payload",- "sortOrder",- "createdAt",- "updatedAt","id","companyId","collection",+ "payload",+ "sortOrder","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "invite","rows": 0,"columns": [- "permissions",- "role",- "createdAt",- "acceptedAt",- "revokedAt",- "attestedAt","id","code","email",+ "permissions",+ "role","companyId","createdBy",+ "createdAt",+ "acceptedAt",+ "revokedAt","updatedBy",- "attestedBy"+ "attestedBy",+ "attestedAt"]},{"name": "itarCertification","rows": 0,"columns": [- "certifiedAt",- "expiresAt",- "createdAt",- "updatedAt","id","companyId","type",@@ -1024,80 +1020,84 @@"fullLegalName","title","complianceContact",+ "certifiedAt","ipAddress","userAgent",+ "expiresAt","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "itemPostingGroup","rows": 0,"columns": [- "active",- "createdAt",- "updatedAt",- "customFields","id","name","description",+ "active","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags"]},{"name": "itemStockQuantities","rows": 0,- "columns": ["quantityOnHand", "itemId", "companyId", "locationId"]+ "columns": ["itemId", "companyId", "locationId", "quantityOnHand"]},{"name": "journal","rows": 0,"columns": [- "postingDate",- "createdAt",- "customFields",- "status",- "sourceType",- "postedAt",- "updatedAt",- "eliminationKind","id","description","accountingPeriodId","companyId",+ "postingDate",+ "createdAt",+ "customFields","tags","journalEntryId",+ "status",+ "sourceType","reversalOfId","reversedById",+ "postedAt","postedBy","createdBy",- "updatedBy"+ "updatedAt",+ "updatedBy",+ "eliminationKind"]},{"name": "journalLine","rows": 0,"columns": [- "amount",- "quantity",- "documentType",- "accrual",- "createdAt",- "customFields",- "updatedAt","id","journalId","description",+ "amount",+ "quantity",+ "documentType","documentId","externalDocumentId","journalLineReference","documentLineReference",+ "accrual","companyId",+ "createdAt",+ "customFields","tags","accountId",+ "updatedAt","updatedBy","intercompanyPartnerId","createdBy"@@ -1107,64 +1107,58 @@"name": "intercompanyTransaction","rows": 0,"columns": [- "amount",- "documentType",- "createdAt",- "updatedAt","id","companyGroupId","sourceCompanyId","targetCompanyId","sourceJournalLineId","targetJournalLineId",+ "amount","currencyCode","description",+ "documentType","documentId","status",- "eliminationJournalId"+ "eliminationJournalId",+ "createdAt",+ "updatedAt"]},{"name": "intercompanyEliminationLine","rows": 0,"columns": [- "role",- "amount",- "quantity",- "createdAt",- "updatedAt","id","companyId","intercompanyTransactionId",+ "role","journalLineId","accountId",+ "amount","itemId",+ "quantity","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "journalLineDimension","rows": 0,"columns": [- "createdAt","id","journalLineId","dimensionId","valueId",- "companyId"+ "companyId",+ "createdAt"]},{"name": "location","rows": 0,"columns": [- "latitude",- "longitude",- "createdAt",- "updatedAt",- "customFields",- "requiresStaffing","id","name","addressLine1",@@ -1174,17 +1168,29 @@"postalCode","countryCode","timezone",+ "latitude",+ "longitude","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags",- "code"+ "code",+ "requiresStaffing"]},{"name": "fixedAsset","rows": 0,"columns": [+ "id",+ "fixedAssetId",+ "fixedAssetClassId",+ "name",+ "description",+ "serialNumber","status","depreciationMethod","usefulLifeMonths",@@ -1201,34 +1207,28 @@"accumulatedDepreciation","accumulatedTaxDepreciation","assetLifetimeUsage",+ "locationId","disposalDate","disposalMethod","saleProceeds",+ "companyId","createdAt",+ "createdBy","updatedAt",+ "updatedBy","notes",- "customFields",- "id",- "fixedAssetId",- "fixedAssetClassId",- "name",- "description",- "serialNumber",- "locationId",- "companyId",- "createdBy",- "updatedBy"+ "customFields"]},{"name": "depreciationRunLine","rows": 0,"columns": [- "amount",- "taxAmount","id","depreciationRunId","fixedAssetId",+ "amount",+ "taxAmount","journalId","companyId"]@@ -1237,16 +1237,16 @@"name": "fixedAssetDisposal","rows": 0,"columns": [+ "id",+ "fixedAssetId","disposalMethod","disposalDate","saleProceeds","netBookValueAtDisposal","gainLoss",- "createdAt",- "id",- "fixedAssetId","journalId","companyId",+ "createdAt","createdBy","updatedBy"]@@ -1255,13 +1255,13 @@"name": "fixedAssetUsageLog","rows": 0,"columns": [+ "id",+ "fixedAssetId","periodStart","periodEnd","unitsProduced",- "createdAt",- "id",- "fixedAssetId","companyId",+ "createdAt","createdBy","updatedBy"]@@ -1270,50 +1270,50 @@"name": "inventoryCount","rows": 0,"columns": [- "status",- "isBlind",- "scope",- "snapshotAt",- "postedAt",- "createdAt",- "updatedAt",- "customFields","id","companyId","inventoryCountId","locationId",+ "status",+ "isBlind",+ "scope",+ "snapshotAt","notes","postedBy",+ "postedAt","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "maintenanceFailureMode","rows": 0,"columns": [- "createdAt",- "updatedAt",- "type","id","name","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "type"]},{"name": "materialForm","rows": 0,"columns": [- "customFields",- "createdAt",- "updatedAt","id","name","companyId",+ "customFields","createdBy",+ "createdAt","updatedBy",+ "updatedAt","tags","code"]@@ -1321,20 +1321,20 @@{"name": "materialDimension","rows": 0,- "columns": ["isMetric", "id", "materialFormId", "name", "companyId"]+ "columns": ["id", "materialFormId", "name", "isMetric", "companyId"]},{"name": "materialSubstance","rows": 0,"columns": [- "customFields",- "createdAt",- "updatedAt","id","name","companyId",+ "customFields","createdBy",+ "createdAt","updatedBy",+ "updatedAt","tags","code"]@@ -1365,17 +1365,17 @@"name": "material","rows": 0,"columns": [- "approved",- "customFields",- "createdAt",- "updatedAt","id","materialFormId","materialSubstanceId",+ "approved","approvedBy",+ "customFields","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt","tags","dimensionId","finishId",@@ -1392,29 +1392,29 @@"name": "modelUpload","rows": 0,"columns": [- "size",- "createdAt",- "updatedAt",- "processingStatus",- "componentCount",- "processedAt",- "optimizeStatus",- "optimizedAt",- "optimizedSize",- "originalSize","id","name",+ "size","modelPath","autodeskUrn","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","thumbnailPath",+ "processingStatus","processingError","glbPath","graphPath",+ "componentCount",+ "processedAt","optimizedModelPath",+ "optimizeStatus","optimizeError",+ "optimizedAt",+ "optimizedSize",+ "originalSize","originalPath"]},@@ -1422,79 +1422,79 @@"name": "assemblyPlanJob","rows": 0,"columns": [- "status",- "stats",- "createdAt",- "updatedAt","id","modelUploadId","kind",+ "status","planPath",+ "stats","error","companyId",- "createdBy"+ "createdBy",+ "createdAt",+ "updatedAt"]},{"name": "noQuoteReason","rows": 0,"columns": [- "createdAt",- "updatedAt",- "customFields","id","name","companyId",+ "createdAt","createdBy",- "updatedBy"+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "nonConformanceRequiredAction","rows": 0,"columns": [- "active",- "createdAt",- "updatedAt",- "systemType","id","companyId","name",+ "active",+ "createdAt","createdBy",- "updatedBy"+ "updatedAt",+ "updatedBy",+ "systemType"]},{"name": "nonConformanceType","rows": 0,"columns": [- "createdAt",- "updatedAt",- "customFields","id","name","companyId",+ "createdAt","createdBy",- "updatedBy"+ "updatedAt",+ "updatedBy",+ "customFields"]},{"name": "nonConformanceWorkflow","rows": 0,"columns": [+ "id",+ "name",+ "description","content","priority","source","approvalRequirements","active",- "createdAt",- "updatedAt",- "id",- "name",- "description","tags","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","requiredActionIds"]@@ -1503,29 +1503,29 @@"name": "nonConformance","rows": 0,"columns": [+ "id",+ "nonConformanceId",+ "name",+ "description","source","status","priority","approvalRequirements",+ "nonConformanceWorkflowId","content",+ "locationId",+ "nonConformanceTypeId","openDate","dueDate","closeDate","quantity",- "customFields",- "createdAt",- "updatedAt",- "id",- "nonConformanceId",- "name",- "description",- "nonConformanceWorkflowId",- "locationId",- "nonConformanceTypeId","assignee",+ "customFields","tags","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","requiredActionIds"]@@ -1534,29 +1534,29 @@"name": "changeOrder","rows": 0,"columns": [+ "id",+ "changeOrderId",+ "name","reasonForChange","description","type","status","priority",- "openDate",- "dueDate",- "customFields",- "createdAt",- "updatedAt",- "id",- "changeOrderId",- "name","changeOrderTypeId","nonConformanceId",+ "openDate",+ "dueDate","requiredActionIds","approvalRequirements","sourceType","sourceId","assignee",+ "customFields","tags","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -1564,20 +1564,20 @@"name": "changeOrderActionTask","rows": 0,"columns": [+ "id",+ "changeOrderId",+ "name","status","dueDate","completedDate",+ "assignee","notes","sortOrder",- "createdAt",- "updatedAt",- "id",- "changeOrderId",- "name",- "assignee","tags","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","actionTypeId"]@@ -1586,20 +1586,20 @@"name": "nonConformanceApprovalTask","rows": 0,"columns": [+ "id",+ "nonConformanceId","approvalType","status","dueDate","completedDate",+ "assignee","notes","sortOrder",- "createdAt",- "updatedAt",- "id",- "nonConformanceId",- "assignee","tags","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -1607,33 +1607,33 @@"name": "nonConformanceReviewer","rows": 0,"columns": [- "status",- "notes",- "createdAt",- "updatedAt",- "completedDate","id","title",+ "status","nonConformanceId",+ "notes","assignee","companyId",+ "createdAt","createdBy",- "updatedBy"+ "updatedAt",+ "updatedBy",+ "completedDate"]},{"name": "note","rows": 0,"columns": [- "noteRichText",- "active",- "createdAt",- "updatedAt","id","documentId","note",+ "noteRichText",+ "active","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -1641,10 +1641,6 @@"name": "notification","rows": 0,"columns": [- "payload",- "readAt",- "seenAt",- "createdAt","id","userId","companyId",@@ -1655,69 +1651,56 @@"from","documentType","documentId",- "digestedInto"+ "payload",+ "readAt",+ "seenAt",+ "digestedInto",+ "createdAt"]},{"name": "notificationDelivery","rows": 0,"columns": [- "successCount",- "lastDeliveredAt",- "createdAt","id","companyId","userId","event","documentId",- "lastDeliveryId"+ "successCount",+ "lastDeliveryId",+ "lastDeliveredAt",+ "createdAt"]},{"name": "notificationPreference","rows": 0,"columns": [- "enabled",- "updatedAt","id","userId","companyId","channel",- "topic"+ "topic",+ "enabled",+ "updatedAt"]},{- "name": "oauthCode",+ "name": "part","rows": 0,"columns": [- "createdAt",- "expiresAt","id",- "code",- "clientId",- "userId",- "companyId",- "redirectUri",- "codeChallenge",- "codeChallengeMethod",- "scope"- ]- },- {- "name": "part",- "rows": 0,- "columns": ["approved",+ "approvedBy","fromDate","toDate",- "createdAt",- "updatedAt",- "customFields",- "id",- "approvedBy","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -1725,19 +1708,19 @@"name": "paymentTerm","rows": 0,"columns": [+ "id",+ "name","daysDue","daysDiscount","discountPercentage","calculationMethod","active",- "createdAt",- "updatedAt",- "customFields",- "id",- "name","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "customFields","tags"]},@@ -1745,33 +1728,28 @@"name": "periodCloseTaskDefinition","rows": 0,"columns": [- "sortOrder",- "required",- "active",- "isSystem",- "createdAt",- "updatedAt",- "customFields","id","companyId","name","taskType","autoCheckKey",+ "sortOrder",+ "required","severity",+ "active",+ "isSystem","defaultAssigneeId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "periodCloseTask","rows": 0,"columns": [- "sortOrder",- "required",- "completedAt",- "createdAt",- "updatedAt","id","companyId","accountingPeriodId",@@ -1779,71 +1757,72 @@"name","taskType","autoCheckKey",+ "sortOrder",+ "required","severity","status","assigneeId","completedBy",+ "completedAt","skippedReason","evidenceJournalId","notes","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "pickingList","rows": 0,"columns": [- "status",- "dueDate",- "notes",- "createdAt",- "updatedAt",- "customFields","id","pickingListId",+ "status","locationId","assignee",+ "dueDate",+ "notes","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "pricingRule","rows": 0,"columns": [+ "id",+ "name","ruleType","amountType","amount","priority","minQuantity","maxQuantity",- "validFrom",- "validTo",- "active",- "createdAt",- "updatedAt",- "configurationPrices",- "id",- "name","customerIds","customerTypeIds","itemIds","itemPostingGroupId",+ "validFrom",+ "validTo",+ "active","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "configurationPrices"]},{"name": "printJob","rows": 0,"columns": [- "attempts",- "createdAt",- "updatedAt",- "completedAt","id","companyId","status",@@ -1856,16 +1835,18 @@"description","origin","error",+ "attempts","createdBy",- "updatedBy"+ "createdAt",+ "updatedAt",+ "updatedBy",+ "completedAt"]},{"name": "printerRoute","rows": 0,"columns": [- "createdAt",- "updatedAt","id","companyId","locationId",@@ -1874,6 +1855,8 @@"mediaSizeId","printerUrl","apiKey",+ "createdAt",+ "updatedAt","templateId"]},@@ -1881,70 +1864,70 @@"name": "process","rows": 0,"columns": [+ "id",+ "name","defaultStandardFactor",+ "companyId","customFields",+ "createdBy","createdAt",+ "updatedBy","updatedAt","processType",+ "tags","completeAllOnScan","active","requiresAbility","batchable","batchType",- "batchRules",- "id",- "name",- "companyId",- "createdBy",- "updatedBy",- "tags"+ "batchRules"]},{"name": "ability","rows": 0,"columns": [+ "id","curve","shadowWeeks","active",- "createdAt",- "updatedAt",- "recertifyEveryDays",- "id","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",- "processId"+ "processId",+ "recertifyEveryDays"]},{"name": "employeeAbility","rows": 0,"columns": [- "lastTrainingDate",- "expiresAt","id","employeeId","abilityId",- "companyId"+ "lastTrainingDate",+ "companyId",+ "expiresAt"]},{"name": "procedure","rows": 0,"columns": [- "version",- "status",- "content",- "createdAt",- "updatedAt","id","name","processId","description",+ "version",+ "status",+ "content","assignee","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","tags"]@@ -1953,14 +1936,14 @@"name": "procedureParameter","rows": 0,"columns": [- "createdAt",- "updatedAt","id","procedureId","key","value","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -1968,37 +1951,37 @@"name": "project","rows": 0,"columns": [- "active",- "createdAt",- "updatedAt","id","companyId","name","description",+ "active","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "purchasingRfq","rows": 0,"columns": [+ "id",+ "rfqId","revisionId","status",+ "employeeId","rfqDate","expirationDate","internalNotes","notes",- "customFields",- "createdAt",- "updatedAt",- "id",- "rfqId",- "employeeId","locationId","assignee","companyId",+ "customFields",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -2011,17 +1994,17 @@"name": "qualityDocument","rows": 0,"columns": [- "version",- "status",- "content",- "createdAt",- "updatedAt","id","name","description",+ "version",+ "status",+ "content","assignee","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","tags"]@@ -2030,41 +2013,36 @@"name": "reimbursement","rows": 0,"columns": [- "status",- "reimbursementDate",- "postingDate",- "exchangeRate",- "amount",- "postedAt",- "voidedAt",- "createdAt",- "updatedAt",- "customFields","id","companyId","reimbursementId","employeeId",+ "status","integration",+ "reimbursementDate",+ "postingDate","currencyCode",+ "exchangeRate",+ "amount","payableAccountId","reference","notes","journalId",+ "postedAt","postedBy",+ "voidedAt","voidedBy","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "reimbursementLine","rows": 0,"columns": [- "amount",- "sequence",- "createdAt",- "updatedAt",- "customFields","id","companyId","reimbursementId",@@ -2072,99 +2050,104 @@"costCenterId","projectId","description",+ "amount",+ "sequence","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "reimbursementLineDimension","rows": 0,"columns": [- "createdAt","id","reimbursementLineId","dimensionId","valueId",- "companyId"+ "companyId",+ "createdAt"]},{"name": "reportPin","rows": 0,"columns": [- "pinned",- "createdAt",- "updatedAt","reportKey","userId","companyId",+ "pinned","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "reportView","rows": 0,"columns": [- "config",- "visibility",- "createdAt",- "updatedAt","id","companyId","reportKey","name",+ "config",+ "visibility","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "returnReason","rows": 0,"columns": [- "inventoryValueZero",- "createdAt",- "updatedAt",- "customFields","id","name",+ "inventoryValueZero","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "scrapReason","rows": 0,"columns": [- "createdAt",- "updatedAt",- "customFields","id","name","companyId",+ "createdAt","createdBy",- "updatedBy"+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "searchIndexRegistry","rows": 0,- "columns": ["createdAt", "lastRebuiltAt", "companyId"]+ "columns": ["companyId", "createdAt", "lastRebuiltAt"]},{"name": "sequence","rows": 0,"columns": [- "next",- "size",- "step",- "updatedAt","table","name","prefix","suffix",+ "next",+ "size",+ "step","companyId",+ "updatedAt","updatedBy"]},@@ -2172,18 +2155,18 @@"name": "service","rows": 0,"columns": [+ "id","serviceType","approved",+ "approvedBy","fromDate","toDate","customFields",- "createdAt",- "updatedAt",- "id",- "approvedBy","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt","tags"]},@@ -2191,8 +2174,11 @@"name": "shift","rows": 0,"columns": [+ "id",+ "name","startTime","endTime",+ "locationId","sunday","monday","tuesday",@@ -2201,15 +2187,12 @@"friday","saturday","active",- "createdAt",- "updatedAt",- "customFields",- "id",- "name",- "locationId","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -2217,16 +2200,16 @@"name": "employeeJob","rows": 0,"columns": [- "updatedAt",- "customFields",- "startDate","id","locationId","shiftId","managerId","title",+ "startDate","companyId",+ "updatedAt","updatedBy",+ "customFields","departmentId","tags"]@@ -2240,34 +2223,34 @@"name": "peopleAbsence","rows": 0,"columns": [- "date",- "createdAt",- "updatedAt","id","companyId","employeeId",+ "date","shiftId","note","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "shippingMethod","rows": 0,"columns": [- "carrier",- "active",- "createdAt",- "updatedAt",- "customFields","id","name",+ "carrier","carrierAccountId","trackingUrl",+ "active","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "customFields","tags"]},@@ -2275,13 +2258,13 @@"name": "shippingTerm","rows": 0,"columns": [- "active",- "createdAt",- "updatedAt","id","name",+ "active","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","tags"]@@ -2290,49 +2273,15 @@"name": "slackDocumentThread","rows": 0,"columns": [- "createdAt",- "updatedAt","id","companyId","documentType","documentId","channelId","threadTs",- "createdBy",- "updatedBy"- ]- },- {- "name": "ssoConnection",- "rows": 0,- "columns": [- "active",- "requireSso","createdAt",- "updatedAt",- "id",- "companyId",- "providerId",- "metadataUrl",- "metadataXml","createdBy",- "updatedBy"- ]- },- {- "name": "ssoDomain",- "rows": 0,- "columns": [- "status",- "verifiedAt",- "createdAt","updatedAt",- "id",- "companyId",- "connectionId",- "domain",- "verificationToken",- "createdBy","updatedBy"]},@@ -2340,19 +2289,19 @@"name": "stockTransfer","rows": 0,"columns": [- "status",- "completedAt",- "createdAt",- "updatedAt",- "notes",- "customFields","id","stockTransferId","locationId",+ "status",+ "completedAt","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "notes","assignee",+ "customFields","tags"]},@@ -2360,21 +2309,20 @@"name": "storageType","rows": 0,"columns": [- "createdAt",- "updatedAt",- "customFields","id","name","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "suggestion","rows": 0,"columns": [- "createdAt","id","suggestion","emoji",@@ -2382,22 +2330,23 @@"attachmentPath","tags","userId",- "companyId"+ "companyId",+ "createdAt"]},{"name": "supplierType","rows": 0,"columns": [- "protected",- "createdAt",- "updatedAt",- "customFields","id","name",+ "protected","companyId",+ "createdAt","createdBy","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -2405,19 +2354,19 @@"name": "tableView","rows": 0,"columns": [- "type",- "sortOrder",- "columnPinning",- "columnVisibility",- "createdAt","id","name","table","description",+ "type",+ "sortOrder","columnOrder",+ "columnPinning",+ "columnVisibility","filters","sorts","companyId",+ "createdAt","createdBy","updatedBy"]@@ -2426,10 +2375,10 @@"name": "tag","rows": 0,"columns": [- "createdAt","name","table","companyId",+ "createdAt","createdBy","updatedBy"]@@ -2438,10 +2387,10 @@"name": "terms","rows": 0,"columns": [+ "id","purchasingTerms","salesTerms","updatedAt",- "id","updatedBy"]},@@ -2449,32 +2398,32 @@"name": "timeCardEntry","rows": 0,"columns": [- "clockIn",- "clockOut",- "createdAt",- "updatedAt","id","employeeId","companyId",+ "clockIn",+ "clockOut","note","autoCloseShiftId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "tool","rows": 0,"columns": [- "approved",- "customFields",- "createdAt",- "updatedAt","id",+ "approved","approvedBy",+ "customFields","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt","tags"]},@@ -2482,14 +2431,14 @@"name": "trackedActivity","rows": 0,"columns": [- "attributes",- "createdAt","id","type","sourceDocument","sourceDocumentId","sourceDocumentReadableId",+ "attributes","companyId",+ "createdAt","createdBy","updatedBy"]@@ -2498,22 +2447,22 @@"name": "training","rows": 0,"columns": [+ "id",+ "name",+ "description","version",+ "processId","status","frequency","type","content",- "createdAt",- "updatedAt",- "id",- "name",- "description",- "processId","estimatedDuration","tags","assignee","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","grantsAbilityId"]@@ -2522,13 +2471,13 @@"name": "trainingAssignment","rows": 0,"columns": [- "createdAt",- "updatedAt","id","trainingId","groupIds","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -2537,14 +2486,14 @@"rows": 0,"columns": ["id",- "completedAt",- "createdAt",- "updatedAt","trainingAssignmentId","employeeId","companyId",+ "completedAt","completedBy",+ "createdAt","createdBy",+ "updatedAt","updatedBy","period"]@@ -2553,22 +2502,22 @@"name": "trainingQuestion","rows": 0,"columns": [+ "id",+ "trainingId",+ "question","type","sortOrder","required",+ "options",+ "correctAnswers","correctBoolean","matchingPairs","correctNumber","tolerance",- "createdAt",- "updatedAt",- "id",- "trainingId",- "question",- "options",- "correctAnswers","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -2576,16 +2525,16 @@"name": "unitOfMeasure","rows": 0,"columns": [- "active",- "createdAt",- "updatedAt",- "customFields","id","code","name",+ "active","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -2593,31 +2542,31 @@"name": "item","rows": 0,"columns": [- "type",- "replenishmentSystem",- "defaultMethodType",- "itemTrackingType",- "active",- "createdAt",- "updatedAt",- "notes",- "embedding",- "sourcingType",- "revisionStatus","id","readableId","name","description",+ "type",+ "replenishmentSystem",+ "defaultMethodType",+ "itemTrackingType","unitOfMeasureCode",+ "active","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt","assignee","modelUploadId","thumbnailPath",+ "notes","trackingMethod",+ "embedding","revision",+ "sourcingType","mpn",+ "revisionStatus","changeOrderId"]},@@ -2625,8 +2574,6 @@"name": "assemblyComponentMapping","rows": 0,"columns": [- "createdAt",- "updatedAt","id","modelUploadId","geometryHash",@@ -2634,29 +2581,31 @@"confidence","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "assemblyInstruction","rows": 0,"columns": [- "status",- "version",- "publishedAt",- "settings",- "customFields",- "createdAt",- "updatedAt","id","name","modelUploadId","itemId","assemblyPlanJobId",+ "status",+ "version",+ "publishedAt",+ "settings","companyId",+ "customFields","tags","createdBy",+ "createdAt","updatedBy",+ "updatedAt","rootInstructionId"]},@@ -2664,99 +2613,97 @@"name": "assemblyInstructionStep","rows": 0,"columns": [+ "id",+ "assemblyInstructionId",+ "parentStepId","sortOrder",+ "title","type","description",+ "instructionText","required",+ "unitOfMeasureCode","minValue","maxValue",+ "listValues",+ "fileTypes","notes",+ "componentNodeIds","motion","camera","explode","fastener","warnings",+ "planConfidence","durationSeconds",+ "companyId",+ "createdBy","createdAt",+ "updatedBy","updatedAt","status","buildWave",- "isSubAssembly",- "id",- "assemblyInstructionId",- "parentStepId",- "title",- "instructionText",- "unitOfMeasureCode",- "listValues",- "fileTypes",- "componentNodeIds",- "planConfidence",- "companyId",- "createdBy",- "updatedBy","rootStepId","hiddenComponentNodeIds",- "usedInStepId"+ "usedInStepId",+ "isSubAssembly"]},{"name": "assemblyInstructionStepMaterial","rows": 0,"columns": [- "quantity",- "sortOrder",- "createdAt",- "updatedAt","id","stepId","itemId",+ "quantity",+ "sortOrder","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "assemblyInstructionStepSlide","rows": 0,"columns": [- "sortOrder",- "annotations",- "createdAt",- "updatedAt","id","stepId","imagePath","modelUploadId","caption",+ "sortOrder","size",+ "annotations","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "assemblyInstructionStepTool","rows": 0,"columns": [- "quantity",- "sortOrder",- "createdAt",- "updatedAt","id","stepId","itemId",+ "quantity",+ "sortOrder","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "assemblyUnit","rows": 0,"columns": [- "createdAt",- "updatedAt","id","modelUploadId","name",@@ -2764,7 +2711,9 @@"itemId","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt","sourceGroupId"]},@@ -2772,16 +2721,16 @@"name": "batchProperty","rows": 0,"columns": [- "dataType",- "sortOrder",- "createdAt",- "updatedAt","id","itemId","label",+ "dataType","listOptions",+ "sortOrder","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -2789,17 +2738,17 @@"name": "changeOrderSupersession","rows": 0,"columns": [- "supersessionMode",- "discontinuationDate",- "successorEffectivityDate",- "createdAt",- "updatedAt","id","changeOrderId","predecessorItemId","successorItemId",+ "supersessionMode",+ "discontinuationDate",+ "successorEffectivityDate","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -2807,11 +2756,11 @@"name": "configurationParameterGroup","rows": 0,"columns": [- "sortOrder",- "isUngrouped","id","itemId","name",+ "sortOrder",+ "isUngrouped","companyId"]},@@ -2819,18 +2768,18 @@"name": "configurationParameter","rows": 0,"columns": [- "dataType",- "sortOrder",- "createdAt",- "updatedAt","id","itemId","label","key",+ "dataType","listOptions","configurationParameterGroupId",+ "sortOrder","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","materialFormFilterId"]@@ -2839,11 +2788,11 @@"name": "configurationRule","rows": 0,"columns": [- "updatedAt","itemId","field","code","companyId",+ "updatedAt","updatedBy"]},@@ -2851,17 +2800,17 @@"name": "demandForecast","rows": 0,"columns": [- "forecastQuantity",- "confidence",- "createdAt",- "updatedAt","itemId","locationId","periodId",+ "forecastQuantity","forecastMethod",+ "confidence","notes","companyId","createdBy",+ "createdAt",+ "updatedAt","updatedBy"]},@@ -2869,17 +2818,17 @@"name": "demandProjection","rows": 0,"columns": [- "forecastQuantity",- "confidence",- "createdAt",- "updatedAt","itemId","locationId","periodId",+ "forecastQuantity","forecastMethod",+ "confidence","notes","companyId","createdBy",+ "createdAt",+ "updatedAt","updatedBy","id"]@@ -2888,11 +2837,11 @@"name": "enforcementRuleItemAssignment","rows": 0,"columns": [- "createdAt","itemId","ruleId","companyId","createdBy",+ "createdAt","updatedBy"]},@@ -2900,46 +2849,37 @@"name": "inspectionDocument","rows": 0,"columns": [+ "id",+ "companyId",+ "partId",+ "drawingNumber","version",+ "storagePath",+ "fileName","pageCount","defaultPageWidth","defaultPageHeight",+ "uploadedBy",+ "createdBy","createdAt",+ "updatedBy","updatedAt","samplingPlanType","samplingSampleSize","samplingPercentage","samplingAql","samplingInspectionLevel",- "samplingSeverity",- "id",- "companyId",- "partId",- "drawingNumber",- "storagePath",- "fileName",- "uploadedBy",- "createdBy",- "updatedBy"+ "samplingSeverity"]},{"name": "inspectionFeature","rows": 0,"columns": [- "pageNumber",- "createdAt",- "updatedAt",- "type",- "samplingPlanType",- "samplingSampleSize",- "samplingPercentage",- "samplingAql",- "samplingInspectionLevel",- "samplingSeverity","id","inspectionDocumentId","companyId",+ "pageNumber","label","description","nominalValue",@@ -2947,7 +2887,16 @@"toleranceMinus","unit","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "type",+ "samplingPlanType",+ "samplingSampleSize",+ "samplingPercentage",+ "samplingAql",+ "samplingInspectionLevel",+ "samplingSeverity","gaugeTypeId"]},@@ -2955,6 +2904,10 @@"name": "balloon","rows": 0,"columns": [+ "id",+ "inspectionDocumentId",+ "companyId",+ "inspectionFeatureId","pageNumber","regionX","regionY",@@ -2962,26 +2915,16 @@"regionHeight","xCoordinate","yCoordinate",- "createdAt",- "updatedAt",- "id",- "inspectionDocumentId",- "companyId",- "inspectionFeatureId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "inventoryCountLine","rows": 0,"columns": [- "systemQuantity",- "countedQuantity",- "countedAt",- "createdAt",- "updatedAt",- "customFields","id","companyId","inventoryCountId",@@ -2990,28 +2933,34 @@"storageUnitId","trackedEntityId","readableId",+ "systemQuantity",+ "countedQuantity","countedBy",+ "countedAt","postedItemLedgerId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "itemCost","rows": 0,"columns": [+ "itemId",+ "itemPostingGroupId","costingMethod","standardCost","unitCost","costIsAdjusted",- "createdAt",- "updatedAt",- "customFields",- "itemId",- "itemPostingGroupId","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -3019,20 +2968,22 @@"name": "itemInspectionDocumentAssignment","rows": 0,"columns": [- "usage",- "createdAt",- "updatedAt","itemId",+ "usage","inspectionDocumentId","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "itemPlanning","rows": 0,"columns": [+ "itemId",+ "locationId","reorderingPolicy","critical","demandAccumulationPeriod",@@ -3042,90 +2993,88 @@"minimumOrderQuantity","maximumOrderQuantity","orderMultiple",+ "companyId",+ "createdBy","createdAt",+ "updatedBy","updatedAt","customFields",+ "tags","maximumInventoryQuantity","demandAccumulationSafetyStock",- "minimumReserveQuantity",- "itemId",- "locationId",- "companyId",- "createdBy",- "updatedBy",- "tags"+ "minimumReserveQuantity"]},{"name": "itemSerialSequence","rows": 0,"columns": [- "next",- "size",- "step",- "createdAt",- "updatedAt","id","companyId","itemId","prefix","suffix",+ "next",+ "size",+ "step","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "itemShelfLife","rows": 0,"columns": [+ "itemId","mode","days",+ "triggerProcessId","triggerTiming",+ "companyId",+ "createdBy","createdAt",+ "updatedBy","updatedAt","customFields",- "calculateFromBom",- "itemId",- "triggerProcessId",- "companyId",- "createdBy",- "updatedBy"+ "calculateFromBom"]},{"name": "itemSupersession","rows": 0,"columns": [+ "itemId",+ "companyId","supersessionMode",+ "successorItemId","discontinuationDate","successorEffectivityDate","conversionFactor",- "createdAt",- "updatedAt",- "itemId",- "companyId",- "successorItemId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "itemUnitSalePrice","rows": 0,"columns": [+ "itemId","unitSalePrice",+ "currencyCode",+ "salesUnitOfMeasureCode","salesBlocked","priceIncludesTax","allowInvoiceDiscount",- "createdAt",- "updatedAt",- "customFields",- "itemId",- "currencyCode",- "salesUnitOfMeasureCode","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -3133,17 +3082,17 @@"name": "makeMethod","rows": 0,"columns": [- "createdAt",- "updatedAt",- "customFields",- "version",- "status","id","itemId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "customFields","tags",+ "version",+ "status","changeOrderId"]},@@ -3151,22 +3100,22 @@"name": "changeOrderAffectedItem","rows": 0,"columns": [- "sortOrder",- "changeType",- "supersessionMode",- "discontinuationDate",- "successorEffectivityDate",- "changeSummary",- "createdAt",- "updatedAt","id","changeOrderId","itemId",+ "sortOrder",+ "changeType","draftMakeMethodId","baseMakeMethodId",+ "supersessionMode",+ "discontinuationDate",+ "successorEffectivityDate","newItemId",+ "changeSummary","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -3174,61 +3123,61 @@"name": "nonConformanceItem","rows": 0,"columns": [- "createdAt",- "updatedAt",- "disposition",- "quantity","id","nonConformanceId","itemId","companyId",+ "createdAt","createdBy",- "updatedBy"+ "updatedAt",+ "updatedBy",+ "disposition",+ "quantity"]},{"name": "procedureStep","rows": 0,"columns": [+ "id",+ "procedureId",+ "name","required","sortOrder","type",+ "unitOfMeasureCode","minValue","maxValue",- "createdAt",- "updatedAt",- "description",- "id",- "procedureId",- "name",- "unitOfMeasureCode","listValues","fileTypes","companyId",+ "createdAt","createdBy",- "updatedBy"+ "updatedAt",+ "updatedBy",+ "description"]},{"name": "purchasingRfqLine","rows": 0,"columns": [+ "id",+ "purchasingRfqId",+ "itemId",+ "description","quantity",+ "purchaseUnitOfMeasureCode",+ "inventoryUnitOfMeasureCode","conversionFactor","order","internalNotes","externalNotes",+ "companyId","customFields","createdAt",+ "createdBy","updatedAt",- "id",- "purchasingRfqId",- "itemId",- "description",- "purchaseUnitOfMeasureCode",- "inventoryUnitOfMeasureCode",- "companyId",- "createdBy","updatedBy"]},@@ -3236,22 +3185,22 @@"name": "qualityDocumentStep","rows": 0,"columns": [- "required",- "sortOrder",- "type",- "minValue",- "maxValue",- "createdAt",- "updatedAt","id","qualityDocumentId","name","description",+ "required",+ "sortOrder",+ "type","unitOfMeasureCode",+ "minValue",+ "maxValue","listValues","fileTypes","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -3260,21 +3209,21 @@"rows": 0,"columns": ["id",+ "companyId",+ "title",+ "description","source",+ "sourceId","severity","likelihood",+ "itemId","status",+ "assignee",+ "createdBy","createdAt","updatedAt","notes","type",- "companyId",- "title",- "description",- "sourceId",- "itemId",- "assignee",- "createdBy","updatedBy"]},@@ -3282,19 +3231,19 @@"name": "trackedEntity","rows": 0,"columns": [+ "id","quantity","status",- "attributes",- "createdAt",- "expirationDate",- "id","sourceDocument","sourceDocumentId","sourceDocumentReadableId",+ "attributes","companyId",+ "createdAt","createdBy","readableId","itemId",+ "expirationDate","updatedBy"]},@@ -3302,15 +3251,15 @@"name": "nonConformanceItemTrackedEntity","rows": 0,"columns": [- "quantity",- "createdAt",- "updatedAt","id","nonConformanceItemId","nonConformanceId","trackedEntityId",+ "quantity","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -3318,13 +3267,13 @@"name": "nonConformanceTrackedEntity","rows": 0,"columns": [- "createdAt",- "updatedAt","id","nonConformanceId","trackedEntityId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -3332,11 +3281,11 @@"name": "trackedActivityInput","rows": 0,"columns": [- "quantity",- "createdAt","trackedActivityId","trackedEntityId",+ "quantity","companyId",+ "createdAt","createdBy","updatedBy"]@@ -3345,11 +3294,11 @@"name": "trackedActivityOutput","rows": 0,"columns": [- "quantity",- "createdAt","trackedActivityId","trackedEntityId",+ "quantity","companyId",+ "createdAt","createdBy","updatedBy"]@@ -3358,15 +3307,15 @@"name": "userAttributeCategory","rows": 0,"columns": [+ "id",+ "name","public","protected",+ "companyId","active","createdAt",- "updatedAt",- "id",- "name",- "companyId","createdBy",+ "updatedAt","updatedBy","emoji"]@@ -3375,17 +3324,17 @@"name": "userAttribute","rows": 0,"columns": [+ "id",+ "name","sortOrder",+ "userAttributeCategoryId","attributeDataTypeId",+ "listOptions","canSelfManage","active","createdAt",- "updatedAt",- "id",- "name",- "userAttributeCategoryId",- "listOptions","createdBy",+ "updatedAt","updatedBy"]},@@ -3393,78 +3342,78 @@"name": "userAttributeValue","rows": 0,"columns": [- "updatedAt",- "createdAt",- "valueBoolean",- "valueDate",- "valueNumeric","id","userAttributeId","userId",+ "valueBoolean",+ "valueDate",+ "valueNumeric","valueText","valueUser",+ "createdAt",+ "createdBy",+ "updatedAt","updatedBy",- "valueFile",- "createdBy"+ "valueFile"]},{"name": "userModulePreference","rows": 0,"columns": [- "position",- "hidden",- "updatedAt","id","userId","companyId",- "module"+ "module",+ "position",+ "hidden",+ "updatedAt"]},{"name": "userToCompany","rows": 0,- "columns": ["role", "userId", "companyId"]+ "columns": ["userId", "companyId", "role"]},{"name": "warehouse","rows": 0,"columns": [+ "id",+ "name",+ "locationId","requiresPick","requiresPutAway","requiresBin","requiresReceive","requiresShipment","active",- "createdAt",- "updatedAt",- "id",- "name",- "locationId","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "warehouseTransfer","rows": 0,"columns": [- "status",- "transferDate",- "expectedReceiptDate",- "createdAt",- "updatedAt",- "customFields","id","transferId","fromLocationId","toLocationId",+ "status",+ "transferDate",+ "expectedReceiptDate","notes","reference","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -3472,38 +3421,38 @@"name": "workCenter","rows": 0,"columns": [+ "id",+ "name",+ "description","laborRate","defaultStandardFactor",+ "locationId",+ "requiredAbilityId","active",+ "companyId","customFields",+ "createdBy","createdAt",+ "updatedBy","updatedAt","machineRate","overheadRate",+ "tags",+ "departmentId","alwaysOn","batchCapacity",- "minimumBatchQuantity",- "id",- "name",- "description",- "locationId",- "requiredAbilityId",- "companyId",- "createdBy",- "updatedBy",- "tags",- "departmentId"+ "minimumBatchQuantity"]},{"name": "enforcementRuleWorkCenterAssignment","rows": 0,"columns": [- "createdAt","workCenterId","ruleId","companyId","createdBy",+ "createdAt","updatedBy"]},@@ -3511,20 +3460,20 @@"name": "jobOperationBatch","rows": 0,"columns": [- "status",- "customFields",- "createdAt",- "updatedAt",- "mergeOutput","id","readableId","companyId","processId","workCenterId","locationId",+ "status","notes",+ "customFields","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "mergeOutput","outputLotNumber"]},@@ -3532,13 +3481,20 @@"name": "maintenanceSchedule","rows": 0,"columns": [+ "id",+ "name",+ "description",+ "workCenterId","frequency","priority","estimatedDuration","active","lastGeneratedAt","nextDueAt",+ "companyId",+ "createdBy","createdAt",+ "updatedBy","updatedAt","monday","tuesday",@@ -3548,209 +3504,202 @@"saturday","sunday","skipHolidays",- "takesWorkCenterOffline",- "id",- "name",- "description",- "workCenterId",- "companyId",- "createdBy",- "updatedBy","locationId",- "procedureId"+ "procedureId",+ "takesWorkCenterOffline"]},{"name": "maintenanceDispatch","rows": 0,"columns": [+ "id",+ "maintenanceDispatchId","content","status","priority","source",- "plannedStartTime",- "plannedEndTime",- "actualStartTime",- "actualEndTime",- "completedAt",- "createdAt",- "updatedAt",- "oeeImpact",- "severity",- "takesWorkCenterOffline",- "id",- "maintenanceDispatchId","workCenterId","maintenanceScheduleId","suspectedFailureModeId","actualFailureModeId",+ "plannedStartTime",+ "plannedEndTime",+ "actualStartTime",+ "actualEndTime","nonConformanceId",+ "completedAt","assignee","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "oeeImpact",+ "severity","locationId",- "procedureId"+ "procedureId",+ "takesWorkCenterOffline"]},{"name": "maintenanceDispatchComment","rows": 0,"columns": [- "createdAt",- "updatedAt","id","maintenanceDispatchId","comment","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "maintenanceDispatchEvent","rows": 0,"columns": [- "startTime",- "endTime",- "createdAt",- "updatedAt","id","maintenanceDispatchId","employeeId","workCenterId",+ "startTime",+ "endTime","notes","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "maintenanceDispatchItem","rows": 0,"columns": [- "quantity",- "unitCost",- "createdAt",- "updatedAt","id","maintenanceDispatchId","itemId",+ "quantity","unitOfMeasureCode",+ "unitCost","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "maintenanceDispatchItemTrackedEntity","rows": 0,"columns": [- "quantity",- "createdAt",- "updatedAt","id","maintenanceDispatchItemId","trackedEntityId",+ "quantity","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "maintenanceDispatchWorkCenter","rows": 0,"columns": [- "createdAt",- "updatedAt","id","maintenanceDispatchId","workCenterId","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "maintenanceScheduleItem","rows": 0,"columns": [- "quantity",- "createdAt",- "updatedAt","id","maintenanceScheduleId","itemId",+ "quantity","unitOfMeasureCode","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "peopleAssignment","rows": 0,"columns": [- "date",- "createdAt",- "updatedAt",- "overtimeHours",- "hours","id","companyId","locationId","workCenterId","employeeId",+ "date","shiftId","note","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "overtimeHours",+ "hours"]},{"name": "storageUnit","rows": 0,"columns": [- "active",- "createdAt",- "updatedAt",- "customFields",- "isWorkCenterDefault","id","locationId","warehouseId",+ "active","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","name","tags","parentId","storageTypeIds",- "workCenterId"+ "workCenterId",+ "isWorkCenterDefault"]},{"name": "itemLedger","rows": 0,"columns": [+ "id","entryNumber","postingDate","entryType","documentType",- "quantity",- "createdAt",- "trackedEntityStatus",- "id","documentId","externalDocumentId","itemId","locationId","storageUnitId",+ "quantity","companyId",+ "createdAt","createdBy","documentLineId","trackedEntityId","comment",+ "trackedEntityStatus","updatedBy","correctionOfItemLedgerId","scrapReasonId"@@ -3760,31 +3709,28 @@"name": "pickMethod","rows": 0,"columns": [- "createdAt",- "updatedAt",- "customFields",- "sortMethod","itemId","locationId","defaultStorageUnitId","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields",+ "sortMethod"]},{"name": "warehouseTransferLine","rows": 0,"columns": [- "quantity",- "shippedQuantity",- "receivedQuantity",- "createdAt",- "updatedAt",- "customFields","id","transferId","itemId",+ "quantity",+ "shippedQuantity",+ "receivedQuantity","fromLocationId","fromStorageUnitId","toLocationId",@@ -3793,70 +3739,64 @@"notes","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "workCenterProcess","rows": 0,"columns": [- "createdAt",- "updatedAt","workCenterId","processId","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "workCenterReplacementPart","rows": 0,"columns": [- "quantity",- "createdAt",- "updatedAt","id","workCenterId","itemId",+ "quantity","unitOfMeasureCode","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "workCenterShift","rows": 0,"columns": [- "createdAt",- "updatedAt","id","companyId","workCenterId","shiftId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "charge","rows": 0,"columns": [- "type",- "status",- "transactionDate",- "postingDate",- "exchangeRate",- "amount",- "postedAt",- "voidedAt",- "createdAt",- "updatedAt",- "customFields","id","companyId","chargeId",+ "type",+ "status","integration","cardAccountId","offsetAccountId",@@ -3865,23 +3805,27 @@"cardHolderName","cardLast4","memo",+ "transactionDate",+ "postingDate","currencyCode",+ "exchangeRate",+ "amount","journalId",+ "postedAt","postedBy",+ "voidedAt","voidedBy","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "chargeLine","rows": 0,"columns": [- "amount",- "sequence",- "createdAt",- "updatedAt",- "customFields","id","companyId","chargeId",@@ -3889,23 +3833,28 @@"costCenterId","projectId","description",+ "amount",+ "sequence","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "contractor","rows": 0,"columns": [+ "id","hoursPerWeek","active",- "createdAt",- "updatedAt",- "customFields",- "id","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -3913,10 +3862,10 @@"name": "contractorAbility","rows": 0,"columns": [- "createdAt","contractorId","abilityId","createdBy",+ "createdAt","companyId","updatedBy"]@@ -3925,23 +3874,23 @@"name": "costLedger","rows": 0,"columns": [+ "id","entryNumber","postingDate","itemLedgerType","costLedgerType","adjustment","documentType",- "quantity",- "cost",- "nominalCost",- "createdAt",- "remainingQuantity",- "id","documentId","externalDocumentId","itemId",+ "quantity",+ "cost",+ "nominalCost","companyId",+ "createdAt","supplierId",+ "remainingQuantity","appliesToCostLedgerId"]},@@ -3949,11 +3898,6 @@"name": "customer","rows": 0,"columns": [- "createdAt",- "updatedAt",- "customFields",- "taxPercent",- "embedding","id","name","customerTypeId",@@ -3962,13 +3906,18 @@"logo","assignee","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "customFields","currencyCode","phone","fax","website",+ "taxPercent","tags",+ "embedding","salesContactId","defaultCc","intercompanyCompanyId",@@ -3978,17 +3927,12 @@{"name": "customerAccount","rows": 0,- "columns": ["active", "id", "customerId", "companyId"]+ "columns": ["id", "customerId", "companyId", "active"]},{"name": "customerBankAccount","rows": 0,"columns": [- "isPrimary",- "active",- "createdAt",- "updatedAt",- "customFields","id","companyId","customerId",@@ -4001,9 +3945,14 @@"accountNumber","bankCode","swiftBic",+ "isPrimary",+ "active","notes","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -4011,46 +3960,46 @@"name": "customerItemPriceOverride","rows": 0,"columns": [- "validFrom",- "validTo",- "active",- "applyRulesOnTop",- "createdAt",- "updatedAt","id","customerId","customerTypeId","itemId","notes",+ "validFrom",+ "validTo",+ "active",+ "applyRulesOnTop","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "customerItemPriceOverrideBreak","rows": 0,"columns": [+ "id",+ "customerItemPriceOverrideId","quantity","overridePrice","active",- "createdAt",- "updatedAt",- "id",- "customerItemPriceOverrideId","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "customerLocation","rows": 0,"columns": [- "customFields","id","customerId","addressId",+ "customFields","name","tags","companyId"@@ -4060,12 +4009,12 @@"name": "customerContact","rows": 0,"columns": [- "customFields","id","customerId","contactId","customerLocationId","userId",+ "customFields","tags","companyId"]@@ -4086,13 +4035,13 @@"name": "customerPayment","rows": 0,"columns": [- "updatedAt","customerId","invoiceCustomerId","invoiceCustomerLocationId","invoiceCustomerContactId","paymentTermId","companyId",+ "updatedAt","updatedBy"]},@@ -4100,8 +4049,6 @@"name": "customerShipping","rows": 0,"columns": [- "updatedAt",- "incoterm","customerId","shippingCustomerId","shippingCustomerLocationId",@@ -4109,7 +4056,9 @@"shippingTermId","shippingMethodId","companyId",+ "updatedAt","updatedBy",+ "incoterm","incotermLocation"]},@@ -4117,16 +4066,16 @@"name": "customerTax","rows": 0,"columns": [- "taxExempt",- "taxExemptionReason",- "updatedAt","customerId","taxId","vatNumber","eori",+ "taxExempt",+ "taxExemptionReason","taxExemptionCertificateNumber","taxExemptionCertificatePath","companyId",+ "updatedAt","updatedBy"]},@@ -4134,17 +4083,17 @@"name": "fixture","rows": 0,"columns": [- "approved",- "customFields",- "createdAt",- "updatedAt","id","itemId","customerId",+ "approved","approvedBy",+ "customFields","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt","tags"]},@@ -4152,13 +4101,13 @@"name": "nonConformanceCustomer","rows": 0,"columns": [- "createdAt",- "updatedAt","id","nonConformanceId","customerId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -4177,21 +4126,11 @@"name": "salesOrder","rows": 0,"columns": [+ "id",+ "salesOrderId","revisionId","status","orderDate",- "closedAt",- "customFields",- "createdAt",- "updatedAt",- "exchangeRate",- "exchangeRateUpdatedAt",- "externalNotes",- "internalNotes",- "sentCompleteDate",- "completedDate",- "id",- "salesOrderId","currencyCode","customerId","customerLocationId",@@ -4199,12 +4138,22 @@"customerReference","assignee","companyId",+ "closedAt","closedBy",+ "customFields",+ "createdAt","createdBy",+ "updatedAt","updatedBy","locationId",+ "exchangeRate",+ "exchangeRateUpdatedAt",+ "externalNotes",+ "internalNotes","salesPersonId",+ "sentCompleteDate","opportunityId",+ "completedDate","customerEngineeringContactId"]},@@ -4217,18 +4166,30 @@"name": "salesOrderLine","rows": 0,"columns": [+ "id",+ "salesOrderId","salesOrderLineType",+ "itemId",+ "assetId",+ "description","saleQuantity","quantitySent","quantityInvoiced","unitPrice",+ "unitOfMeasureCode",+ "locationId",+ "storageUnitId","setupPrice","sentComplete","invoicedComplete",+ "companyId","createdAt",+ "createdBy","updatedAt",+ "updatedBy","customFields","status",+ "modelUploadId","promisedDate","addOnCost","methodType",@@ -4238,39 +4199,27 @@"internalNotes","externalNotes","sentDate",+ "accountId","nonTaxableAddOnCost",+ "pricingRuleId","priceTrace","sortOrder",- "configuration",- "id",- "salesOrderId",- "itemId",- "assetId",- "description",- "unitOfMeasureCode",- "locationId",- "storageUnitId",- "companyId",- "createdBy",- "updatedBy",- "modelUploadId",- "accountId",- "pricingRuleId"+ "configuration"]},{"name": "nonConformanceSalesOrderLine","rows": 0,"columns": [- "createdAt",- "updatedAt","id","nonConformanceId","salesOrderLineId","salesOrderId","salesOrderReadableId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -4278,43 +4227,43 @@"name": "salesOrderPayment","rows": 0,"columns": [- "paymentComplete",- "updatedAt",- "customFields","id","invoiceCustomerId","invoiceCustomerLocationId","invoiceCustomerContactId","paymentTermId",+ "paymentComplete","companyId",- "updatedBy"+ "updatedAt",+ "updatedBy",+ "customFields"]},{"name": "salesOrderShipment","rows": 0,"columns": [- "receiptRequestedDate",- "receiptPromisedDate",- "deliveryDate",- "dropShipment",- "updatedAt",- "customFields",- "shippingCost",- "incoterm","id","locationId","shippingMethodId","shippingTermId",+ "receiptRequestedDate",+ "receiptPromisedDate",+ "deliveryDate","notes","trackingNumber",+ "dropShipment","customerId","customerLocationId","supplierId","supplierLocationId","companyId","updatedBy",+ "updatedAt",+ "customFields","assignee",+ "shippingCost",+ "incoterm","incotermLocation"]},@@ -4322,10 +4271,10 @@"name": "salesOrderStatusHistory","rows": 0,"columns": [- "status",- "createdAt","id","salesOrderId",+ "status",+ "createdAt","createdBy","companyId","updatedBy"@@ -4335,11 +4284,11 @@"name": "salesOrderTransaction","rows": 0,"columns": [- "type",- "createdAt","id","salesOrderId",+ "type","userId",+ "createdAt","companyId"]},@@ -4347,17 +4296,9 @@"name": "salesReturnOrder","rows": 0,"columns": [+ "id",+ "salesReturnOrderId","status",- "exchangeRate",- "orderDate",- "expirationDate",- "internalNotes",- "externalNotes",- "createdAt",- "updatedAt",- "customFields",- "id",- "salesReturnOrderId","customerId","customerLocationId","customerContactId",@@ -4366,42 +4307,50 @@"salesOrderId","replacementSalesOrderId","currencyCode",+ "exchangeRate",+ "orderDate",+ "expirationDate",+ "internalNotes",+ "externalNotes","assignee","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "salesRfq","rows": 0,"columns": [- "revisionId",- "status",- "rfqDate",- "expirationDate",- "customFields",- "createdAt",- "updatedAt",- "externalNotes",- "internalNotes",- "completedDate","id","rfqId",+ "revisionId",+ "status","employeeId","customerId","customerContactId","customerReference",+ "rfqDate",+ "expirationDate","locationId","assignee","companyId",+ "customFields",+ "createdAt","createdBy",+ "updatedAt","updatedBy","customerLocationId",+ "externalNotes",+ "internalNotes","salesPersonId","tags","noQuoteReasonId","opportunityId",+ "completedDate","customerEngineeringContactId"]},@@ -4414,20 +4363,20 @@"name": "salesRfqLine","rows": 0,"columns": [- "quantity",- "order",- "internalNotes",- "externalNotes",- "customFields",- "createdAt",- "updatedAt","id","salesRfqId","itemId","description",+ "quantity","unitOfMeasureCode",+ "order",+ "internalNotes",+ "externalNotes","companyId",+ "customFields",+ "createdAt","createdBy",+ "updatedAt","updatedBy","modelUploadId","customerPartId",@@ -4441,10 +4390,10 @@"columns": ["id","documentType",- "createdAt",- "expiresAt","documentId","customerId",+ "createdAt",+ "expiresAt","companyId","supplierId"]@@ -4453,21 +4402,12 @@"name": "quote","rows": 0,"columns": [+ "id",+ "quoteId","revisionId","dueDate","expirationDate","status",- "customFields",- "createdAt",- "updatedAt",- "externalNotes",- "internalNotes",- "exchangeRate",- "exchangeRateUpdatedAt",- "externalLinkId",- "completedDate",- "id",- "quoteId","salesPersonId","estimatorId","customerId",@@ -4476,16 +4416,25 @@"customerReference","locationId","assignee",+ "customFields","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "externalNotes",+ "internalNotes","currencyCode",+ "exchangeRate",+ "exchangeRateUpdatedAt",+ "externalLinkId","digitalQuoteAcceptedBy","digitalQuoteAcceptedByEmail","tags","digitalQuoteRejectedBy","digitalQuoteRejectedByEmail","opportunityId",+ "completedDate","customerEngineeringContactId"]},@@ -4493,6 +4442,12 @@"name": "job","rows": 0,"columns": [+ "id",+ "jobId",+ "itemId",+ "unitOfMeasureCode",+ "customerId",+ "locationId","status","dueDate","deadlineType",@@ -4501,50 +4456,44 @@"quantityComplete","quantityShipped","quantityReceivedToInventory",+ "salesOrderId",+ "salesOrderLineId",+ "quoteId",+ "quoteLineId",+ "modelUploadId","notes",+ "assignee","customFields",+ "companyId","createdAt",+ "createdBy","updatedAt",+ "updatedBy",+ "tags","configuration","releasedDate","completedDate","estimatedTime","actualTime","startDate",+ "storageUnitId","priority","projectedCompletionAt",- "scheduleOutdatedAt",- "id",- "jobId",- "itemId",- "unitOfMeasureCode",- "customerId",- "locationId",- "salesOrderId",- "salesOrderLineId",- "quoteId",- "quoteLineId",- "modelUploadId",- "assignee",- "companyId",- "createdBy",- "updatedBy",- "tags",- "storageUnitId",- "scheduleOutdatedReason"+ "scheduleOutdatedReason",+ "scheduleOutdatedAt"]},{"name": "fulfillment","rows": 0,"columns": [- "type",- "quantity",- "createdAt","id","salesOrderLineId",+ "type",+ "quantity","jobId","companyId",+ "createdAt","createdBy","updatedBy"]@@ -4563,90 +4512,90 @@"name": "quoteLine","rows": 0,"columns": [- "quoteRevisionId",- "status",- "methodType",- "internalNotes",- "updatedAt",- "customFields",- "quantity",- "additionalCharges",- "taxPercent",- "unitPricePrecision",- "externalNotes",- "configuration",- "priceTrace",- "sortOrder","id","quoteId",+ "quoteRevisionId",+ "status","estimatorId","itemId","itemType","description","customerPartId","customerPartRevision",+ "methodType","unitOfMeasureCode",+ "internalNotes","companyId","createdBy",+ "updatedAt","updatedBy",+ "customFields","modelUploadId",+ "quantity",+ "additionalCharges","locationId","noQuoteReason",+ "taxPercent","tags",- "pricingRuleId"+ "unitPricePrecision",+ "externalNotes",+ "configuration",+ "pricingRuleId",+ "priceTrace",+ "sortOrder"]},{"name": "quoteLinePrice","rows": 0,"columns": [+ "quoteId",+ "quoteLineId","quantity","leadTime","discountPercent","createdAt",+ "createdBy","updatedAt",+ "updatedBy","unitPrice","exchangeRate","shippingCost","categoryMarkups",- "priceTrace",- "quoteId",- "quoteLineId",- "createdBy",- "updatedBy","companyId",- "priceSource"+ "priceSource",+ "priceTrace"]},{"name": "quotePayment","rows": 0,"columns": [- "updatedAt",- "customFields","id","invoiceCustomerId","invoiceCustomerLocationId","invoiceCustomerContactId","paymentTermId","companyId",- "updatedBy"+ "updatedAt",+ "updatedBy",+ "customFields"]},{"name": "quoteShipment","rows": 0,"columns": [- "receiptRequestedDate",- "updatedAt",- "shippingCost",- "incoterm","id","locationId","shippingMethodId","shippingTermId",+ "receiptRequestedDate","companyId","updatedBy",+ "updatedAt",+ "shippingCost",+ "incoterm","incotermLocation"]},@@ -4654,23 +4603,23 @@"name": "capacityReservation","rows": 0,"columns": [- "resourceKind",- "startAt",- "endAt",- "createdAt",- "updatedAt",- "earliestStartAt",- "workHours",- "isPlaceholder","id","companyId",+ "resourceKind","resourceId","operationId","jobId",+ "startAt",+ "endAt","scenarioId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "earliestStartAt","scheduleNote",+ "workHours",+ "isPlaceholder","jobOperationBatchId"]},@@ -4678,35 +4627,37 @@"name": "gauge","rows": 0,"columns": [- "dateAcquired",- "gaugeCalibrationStatus",- "gaugeStatus",- "gaugeRole",- "calibrationIntervalInMonths",- "lastCalibrationDate",- "nextCalibrationDate",- "customFields",- "createdAt",- "updatedAt",- "lastCalibrationStatus","id","gaugeId","supplierId","modelNumber","serialNumber","description",+ "dateAcquired","gaugeTypeId",+ "gaugeCalibrationStatus",+ "gaugeStatus",+ "gaugeRole",+ "calibrationIntervalInMonths",+ "lastCalibrationDate",+ "nextCalibrationDate","locationId","storageUnitId","companyId",+ "customFields",+ "createdAt","createdBy",- "updatedBy"+ "updatedAt",+ "updatedBy",+ "lastCalibrationStatus"]},{"name": "gaugeCalibrationRecord","rows": 0,"columns": [+ "id",+ "gaugeId","dateCalibrated","inspectionStatus","requiresAction",@@ -4714,25 +4665,28 @@"requiresRepair","notes","customFields",- "createdAt",- "updatedAt",- "temperature",- "humidity",- "calibrationAttempts",- "id",- "gaugeId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","supplierId",+ "temperature",+ "humidity","approvedBy",- "measurementStandard"+ "measurementStandard",+ "calibrationAttempts"]},{"name": "inspection","rows": 0,"columns": [+ "id",+ "inspectionId",+ "itemId",+ "itemReadableId",+ "supplierId","lotSize","samplingStandard","samplingPlanType",@@ -4742,23 +4696,18 @@"aql","inspectionLevel","severity",- "status",- "dispositionedAt",- "createdAt",- "updatedAt",- "sourceDocument",- "id",- "inspectionId",- "itemId",- "itemReadableId",- "supplierId","codeLetter",+ "status","notes","dispositionedBy",+ "dispositionedAt","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","inspectionDocumentId",+ "sourceDocument","sourceDocumentId","sourceDocumentLineId","sourceDocumentReadableId"@@ -4768,17 +4717,17 @@"name": "inspectionSample","rows": 0,"columns": [- "status",- "inspectedAt",- "createdAt",- "updatedAt","id","inspectionId","trackedEntityId",+ "status","notes","inspectedBy",+ "inspectedAt","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -4786,51 +4735,51 @@"name": "inspectionMeasurement","rows": 0,"columns": [- "value",- "status",- "inspectedAt",- "createdAt",- "updatedAt","id","inspectionId","inspectionSampleId","inspectionFeatureId",+ "value",+ "status","notes","inspectedBy",+ "inspectedAt","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "inspectionSamplingPlan","rows": 0,"columns": [- "sampleSize",- "acceptanceNumber",- "rejectionNumber",- "createdAt",- "updatedAt",- "gaugeRecordedAt","id","inspectionId","inspectionFeatureId",+ "sampleSize",+ "acceptanceNumber",+ "rejectionNumber","codeLetter","companyId","createdBy",+ "createdAt","updatedBy",- "gaugeId"+ "updatedAt",+ "gaugeId",+ "gaugeRecordedAt"]},{"name": "nonConformanceInspection","rows": 0,"columns": [- "createdAt","id","nonConformanceId","inspectionId","companyId",+ "createdAt","createdBy","updatedBy"]@@ -4839,6 +4788,10 @@"name": "inspectionHistory","rows": 0,"columns": [+ "id",+ "inspectionId",+ "itemId",+ "supplierId","samplingStandard","severity","inspectionLevel",@@ -4846,13 +4799,9 @@"lotSize","sampleSize","defectsFound",- "createdAt",- "id",- "inspectionId",- "itemId",- "supplierId","outcome","companyId",+ "createdAt","createdBy","updatedBy"]@@ -4861,92 +4810,86 @@"name": "itemReplenishment","rows": 0,"columns": [+ "itemId",+ "preferredSupplierId",+ "purchasingUnitOfMeasureCode","conversionFactor","purchasingBlocked","manufacturingBlocked","requiresConfiguration","lotSize",+ "companyId",+ "createdBy","createdAt",+ "updatedBy","updatedAt","customFields","scrapPercentage",- "leadTime",- "itemId",- "preferredSupplierId",- "purchasingUnitOfMeasureCode",- "companyId",- "createdBy",- "updatedBy",- "tags"+ "tags",+ "leadTime"]},{"name": "jobMakeMethod","rows": 0,"columns": [- "quantityPerParent",- "createdAt",- "updatedAt",- "customFields",- "requiresSerialTracking",- "requiresBatchTracking",- "version",- "itemScrapPercentage","id","jobId","parentMaterialId","itemId",+ "quantityPerParent","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",- "trackedEntityId"+ "customFields",+ "trackedEntityId",+ "requiresSerialTracking",+ "requiresBatchTracking",+ "version",+ "itemScrapPercentage"]},{"name": "jobMaterial","rows": 0,"columns": [- "methodType",- "order",- "quantity",- "scrapQuantity",- "unitCost",- "createdAt",- "updatedAt",- "customFields",- "estimatedQuantity",- "defaultStorageUnit",- "quantityIssued",- "requiresSerialTracking",- "requiresBatchTracking",- "kit",- "itemScrapPercentage",- "substitutionFactor","id","jobId","itemId","itemType",+ "methodType",+ "order","description",+ "quantity",+ "scrapQuantity","unitOfMeasureCode",+ "unitCost","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "customFields","jobMakeMethodId","jobOperationId",+ "estimatedQuantity",+ "defaultStorageUnit","storageUnitId",- "substitutedFromItemId"+ "quantityIssued",+ "requiresSerialTracking",+ "requiresBatchTracking",+ "kit",+ "itemScrapPercentage",+ "substitutedFromItemId",+ "substitutionFactor"]},{"name": "stockTransferLine","rows": 0,"columns": [- "quantity",- "pickedQuantity",- "requiresBatchTracking",- "requiresSerialTracking",- "createdAt",- "updatedAt","id","stockTransferId","jobId",@@ -4954,22 +4897,34 @@"itemId","fromStorageUnitId","toStorageUnitId",+ "quantity",+ "pickedQuantity","trackedEntityId",+ "requiresBatchTracking",+ "requiresSerialTracking","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},{"name": "jobMaterialStep","rows": 0,- "columns": ["quantity", "jobMaterialId", "jobOperationStepId"]+ "columns": ["jobMaterialId", "jobOperationStepId", "quantity"]},{"name": "jobOperation","rows": 0,"columns": [+ "id",+ "jobId",+ "jobMakeMethodId","order",+ "processId",+ "workCenterId",+ "description","setupTime","setupUnit","laborTime",@@ -4984,9 +4939,13 @@"operationMinimumCost","operationLeadTime","operationUnitCost",+ "operationSupplierProcessId","workInstruction",+ "companyId","createdAt",+ "createdBy","updatedAt",+ "updatedBy","customFields","operationQuantity","quantityComplete",@@ -4994,30 +4953,20 @@"quantityReworked","status","priority",+ "assignee",+ "tags",+ "procedureId","startDate","dueDate","hasConflict",+ "conflictReason","targetQuantity","manuallyScheduled",- "readyAt",- "projectedCompletionAt",- "id",- "jobId",- "jobMakeMethodId",- "processId",- "workCenterId",- "description",- "operationSupplierProcessId",- "companyId",- "createdBy",- "updatedBy",- "assignee",- "tags",- "procedureId",- "conflictReason","reworkId","assemblyInstructionId",+ "readyAt","inspectionDocumentId",+ "projectedCompletionAt","jobOperationBatchId"]},@@ -5025,25 +4974,25 @@"name": "jobOperationDependency","rows": 0,"columns": [- "createdAt","operationId","dependsOnId","jobId",- "companyId"+ "companyId",+ "createdAt"]},{"name": "jobOperationParameter","rows": 0,"columns": [- "createdAt",- "updatedAt","id","key","value","operationId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -5051,14 +5000,14 @@"name": "jobOperationTool","rows": 0,"columns": [- "quantity",- "createdAt",- "updatedAt","id","operationId","toolId",+ "quantity","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -5066,15 +5015,15 @@"name": "nonConformanceJobOperation","rows": 0,"columns": [- "createdAt",- "updatedAt","id","nonConformanceId","jobOperationId","jobId","jobReadableId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -5082,34 +5031,34 @@"name": "pickingListLine","rows": 0,"columns": [- "quantityToPick",- "quantityPicked",- "status",- "createdAt",- "updatedAt",- "customFields",- "quantityReturned","id","pickingListId","jobId","jobMaterialId","jobOperationId","itemId",+ "quantityToPick",+ "quantityPicked","storageUnitId","toStorageUnitId",+ "status","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields",+ "quantityReturned"]},{"name": "pickingListLineTrackedEntity","rows": 0,"columns": [- "quantity",- "quantityPicked","pickingListLineId","trackedEntityId",+ "quantity",+ "quantityPicked","companyId"]},@@ -5117,20 +5066,20 @@"name": "productionEvent","rows": 0,"columns": [+ "id",+ "jobOperationId","type","startTime","endTime",- "createdAt",- "updatedAt",- "postedToGL",- "id",- "jobOperationId","employeeId","workCenterId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","notes",+ "postedToGL","jobOperationBatchId"]},@@ -5138,18 +5087,18 @@"name": "productionQuantity","rows": 0,"columns": [- "type",- "quantity",- "createdAt",- "updatedAt","id","jobOperationId",+ "type",+ "quantity","setupProductionEventId","laborProductionEventId","machineProductionEventId","notes","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","scrapReasonId","inspectionId",@@ -5160,14 +5109,14 @@"name": "jobOperationNote","rows": 0,"columns": [- "createdAt",- "updatedAt","id","jobOperationId","note","companyId",+ "createdAt","createdBy","updatedBy",+ "updatedAt","productionQuantityId"]},@@ -5175,40 +5124,40 @@"name": "rework","rows": 0,"columns": [- "quantity",- "completedAt",- "createdAt",- "updatedAt","id","jobId","triggeredAtJobOperationId","targetJobOperationId","reason",+ "quantity","requestedById",- "companyId"+ "completedAt",+ "companyId",+ "createdAt",+ "updatedAt"]},{"name": "jobOperationStep","rows": 0,"columns": [+ "id",+ "name","required","sortOrder","type",+ "unitOfMeasureCode","minValue","maxValue",- "createdAt",- "updatedAt",- "description",- "id",- "name",- "unitOfMeasureCode","listValues","fileTypes","operationId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "description","nonConformanceActionId","nonConformanceInvestigationId","assemblyInstructionStepId"@@ -5218,36 +5167,36 @@"name": "jobOperationStepRecord","rows": 0,"columns": [- "numericValue",- "booleanValue",- "createdAt",- "updatedAt",- "index","jobOperationStepId","value",+ "numericValue",+ "booleanValue","userValue","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",- "id"+ "id",+ "index"]},{"name": "jobOperationStepSlide","rows": 0,"columns": [- "sortOrder",- "createdAt",- "updatedAt",- "annotations","id","stepId","imagePath","caption",+ "sortOrder","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt","size",+ "annotations","modelUploadId"]},@@ -5260,22 +5209,22 @@"name": "kanban","rows": 0,"columns": [- "replenishmentSystem",- "quantity",- "conversionFactor",- "autoRelease",- "createdAt",- "updatedAt",- "autoStartJob","id","itemId",+ "replenishmentSystem",+ "quantity","locationId","storageUnitId","supplierId","purchaseUnitOfMeasureCode",+ "conversionFactor",+ "autoRelease","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "autoStartJob","completedBarcodeOverride","jobId","fromStorageUnitId"@@ -5285,43 +5234,51 @@"name": "methodMaterial","rows": 0,"columns": [- "methodType",- "quantity",- "createdAt",- "updatedAt",- "customFields",- "order",- "scrapQuantity",- "kit",- "storageUnitIds",- "sourcingType","id","makeMethodId",+ "methodType","materialMakeMethodId","itemType","itemId",+ "quantity","unitOfMeasureCode","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "customFields",+ "order","methodOperationId",- "tags"+ "scrapQuantity",+ "tags",+ "kit",+ "storageUnitIds",+ "sourcingType"]},{"name": "methodMaterialStep","rows": 0,- "columns": ["quantity", "methodMaterialId", "methodOperationStepId"]+ "columns": ["methodMaterialId", "methodOperationStepId", "quantity"]},{"name": "methodOperation","rows": 0,"columns": [+ "id",+ "makeMethodId","order","operationOrder",+ "description",+ "companyId","createdAt",+ "createdBy","updatedAt",+ "updatedBy","customFields",+ "processId",+ "workCenterId","setupTime","setupUnit","laborTime",@@ -5329,21 +5286,13 @@"machineTime","machineUnit","operationType",+ "operationSupplierProcessId","workInstruction",+ "tags",+ "procedureId","operationMinimumCost","operationLeadTime","operationUnitCost",- "id",- "makeMethodId",- "description",- "companyId",- "createdBy",- "updatedBy",- "processId",- "workCenterId",- "operationSupplierProcessId",- "tags",- "procedureId","assemblyInstructionId","inspectionDocumentId"]@@ -5352,14 +5301,14 @@"name": "methodOperationParameter","rows": 0,"columns": [- "createdAt",- "updatedAt","id","key","value","operationId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -5367,23 +5316,23 @@"name": "methodOperationStep","rows": 0,"columns": [+ "id",+ "name","required","sortOrder","type",+ "unitOfMeasureCode","minValue","maxValue",- "createdAt",- "updatedAt",- "description",- "id",- "name",- "unitOfMeasureCode","listValues","fileTypes","operationId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "description","assemblyInstructionStepId"]},@@ -5391,18 +5340,18 @@"name": "methodOperationStepSlide","rows": 0,"columns": [- "sortOrder",- "createdAt",- "updatedAt",- "annotations","id","stepId","imagePath","caption",+ "sortOrder","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt","size",+ "annotations","modelUploadId"]},@@ -5410,14 +5359,14 @@"name": "methodOperationTool","rows": 0,"columns": [- "quantity",- "createdAt",- "updatedAt","id","operationId","toolId",+ "quantity","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -5430,13 +5379,13 @@"name": "nonConformanceActionProcess","rows": 0,"columns": [- "createdAt",- "updatedAt","id","actionTaskId","processId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -5444,19 +5393,19 @@"name": "nonConformanceActionTask","rows": 0,"columns": [+ "id",+ "nonConformanceId","status","dueDate","completedDate",+ "assignee","notes","sortOrder",- "createdAt",- "updatedAt",- "id",- "nonConformanceId",- "assignee","tags","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","actionTypeId","supplierId"@@ -5466,16 +5415,16 @@"name": "nonConformancePurchaseReturnOrderLine","rows": 0,"columns": [- "quantity",- "createdAt",- "updatedAt","id","nonConformanceId","purchaseReturnOrderLineId","purchaseReturnOrderId","purchaseReturnOrderReadableId",+ "quantity","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -5483,15 +5432,15 @@"name": "nonConformanceSalesReturnOrderLine","rows": 0,"columns": [- "createdAt",- "updatedAt","id","nonConformanceId","salesReturnOrderLineId","salesReturnOrderId","salesReturnOrderReadableId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -5499,31 +5448,31 @@"name": "nonConformanceSupplier","rows": 0,"columns": [- "createdAt",- "updatedAt",- "externalLinkId","id","nonConformanceId","supplierId","companyId",+ "createdAt","createdBy",- "updatedBy"+ "updatedAt",+ "updatedBy",+ "externalLinkId"]},{"name": "partner","rows": 0,"columns": [- "hoursPerWeek",- "active",- "createdAt",- "updatedAt",- "customFields","id",+ "hoursPerWeek","abilityId",+ "active","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -5531,31 +5480,31 @@"name": "payment","rows": 0,"columns": [+ "id",+ "paymentId","paymentType","status",+ "customerId",+ "supplierId","paymentDate","postingDate",+ "currencyCode","exchangeRate","totalAmount",- "postedAt",- "voidedAt",- "createdAt",- "updatedAt",- "customFields",- "id",- "paymentId",- "customerId",- "supplierId",- "currencyCode","bankAccount","reference","memo","journalId",+ "postedAt","postedBy",+ "voidedAt","voidedBy","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","employeeId"]},@@ -5563,47 +5512,47 @@"name": "purchaseInvoiceDelivery","rows": 0,"columns": [- "supplierShippingCost",- "updatedAt",- "customFields",- "incoterm","id","locationId","shippingMethodId","shippingTermId",+ "supplierShippingCost","companyId","updatedBy",+ "updatedAt",+ "customFields",+ "incoterm","incotermLocation"]},{"name": "purchaseInvoiceStatusHistory","rows": 0,- "columns": ["createdAt", "status", "id", "invoiceId", "companyId"]+ "columns": ["id", "invoiceId", "createdAt", "status", "companyId"]},{"name": "purchaseOrderDelivery","rows": 0,"columns": [- "receiptRequestedDate",- "receiptPromisedDate",- "deliveryDate",- "dropShipment",- "updatedAt",- "customFields",- "supplierShippingCost",- "incoterm","id","locationId","shippingMethodId","shippingTermId",+ "receiptRequestedDate",+ "receiptPromisedDate",+ "deliveryDate","notes","trackingNumber",+ "dropShipment","customerId","customerLocationId","companyId","updatedBy",+ "updatedAt",+ "customFields","tags",+ "supplierShippingCost",+ "incoterm","incotermLocation"]},@@ -5616,48 +5565,48 @@"name": "purchaseOrderLine","rows": 0,"columns": [- "sortOrder",+ "id",+ "purchaseOrderId","purchaseOrderLineType",+ "itemId",+ "assetId",+ "description","purchaseQuantity","quantityReceived","quantityInvoiced","supplierUnitPrice",+ "inventoryUnitOfMeasureCode",+ "purchaseUnitOfMeasureCode",+ "locationId",+ "storageUnitId","setupPrice","receivedComplete","invoicedComplete",+ "companyId","createdAt",+ "createdBy","updatedAt",+ "updatedBy","customFields","conversionFactor",+ "tags","internalNotes","externalNotes","exchangeRate","supplierShippingCost",+ "modelUploadId","supplierTaxAmount","taxPercent",+ "jobId",+ "jobOperationId","quantityShipped","promisedDate",+ "accountId","requiredDate","receivedDate",- "id",- "purchaseOrderId",- "itemId",- "assetId",- "description",- "inventoryUnitOfMeasureCode",- "purchaseUnitOfMeasureCode",- "locationId",- "storageUnitId",- "companyId",- "createdBy",- "updatedBy",- "tags",- "modelUploadId",- "jobId",- "jobOperationId",- "accountId","costCenterId","ownerId",+ "sortOrder","supplierPartId"]},@@ -5665,15 +5614,15 @@"name": "nonConformancePurchaseOrderLine","rows": 0,"columns": [- "createdAt",- "updatedAt","id","nonConformanceId","purchaseOrderLineId","purchaseOrderId","purchaseOrderReadableId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -5681,10 +5630,10 @@"name": "purchaseOrderStatusHistory","rows": 0,"columns": [- "status",- "createdAt","id","purchaseOrderId",+ "status",+ "createdAt","createdBy","companyId","updatedBy"@@ -5694,11 +5643,11 @@"name": "purchaseOrderTransaction","rows": 0,"columns": [- "type",- "createdAt","id","purchaseOrderId",+ "type","userId",+ "createdAt","companyId"]},@@ -5706,25 +5655,25 @@"name": "purchaseReturnOrderLineTrackedEntity","rows": 0,"columns": [- "quantity",- "createdAt",- "updatedAt","purchaseReturnOrderLineId","trackedEntityId",+ "quantity","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "purchasingRfqSupplier","rows": 0,"columns": [- "createdAt","id","purchasingRfqId","supplierId","companyId",+ "createdAt","createdBy","updatedBy"]@@ -5743,48 +5692,48 @@"name": "quoteMakeMethod","rows": 0,"columns": [- "quantityPerParent",- "createdAt",- "updatedAt",- "customFields",- "version","id","quoteId","quoteLineId","parentMaterialId","itemId",+ "quantityPerParent","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",- "tags"+ "customFields",+ "tags",+ "version"]},{"name": "quoteMaterial","rows": 0,"columns": [- "methodType",- "order",- "quantity",- "unitCost",- "createdAt",- "updatedAt",- "customFields",- "scrapQuantity",- "kit","id","quoteId","quoteLineId","itemId","itemType",+ "methodType",+ "order","description",+ "quantity","unitOfMeasureCode",+ "unitCost","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "customFields","quoteMakeMethodId","quoteOperationId",+ "scrapQuantity","tags",+ "kit","storageUnitId","unitCostSource"]@@ -5792,19 +5741,29 @@{"name": "quoteMaterialStep","rows": 0,- "columns": ["quantity", "quoteMaterialId", "quoteOperationStepId"]+ "columns": ["quoteMaterialId", "quoteOperationStepId", "quantity"]},{"name": "quoteOperation","rows": 0,"columns": [+ "id",+ "quoteId",+ "quoteLineId",+ "quoteMakeMethodId","order",+ "description","operationOrder","laborRate","overheadRate",+ "companyId","createdAt",+ "createdBy","updatedAt",+ "updatedBy","customFields",+ "processId",+ "workCenterId","setupTime","setupUnit","laborTime",@@ -5816,18 +5775,8 @@"operationMinimumCost","operationLeadTime","operationUnitCost",- "workInstruction",- "id",- "quoteId",- "quoteLineId",- "quoteMakeMethodId",- "description",- "companyId",- "createdBy",- "updatedBy",- "processId",- "workCenterId","operationSupplierProcessId",+ "workInstruction","tags","procedureId","assemblyInstructionId",@@ -5838,14 +5787,14 @@"name": "quoteOperationParameter","rows": 0,"columns": [- "createdAt",- "updatedAt","id","key","value","operationId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -5853,41 +5802,41 @@"name": "quoteOperationStep","rows": 0,"columns": [+ "id",+ "name","required","sortOrder","type",+ "unitOfMeasureCode","minValue","maxValue",- "createdAt",- "updatedAt",- "description",- "id",- "name",- "unitOfMeasureCode","listValues","fileTypes","operationId","companyId",+ "createdAt","createdBy",- "updatedBy"+ "updatedAt",+ "updatedBy",+ "description"]},{"name": "quoteOperationStepSlide","rows": 0,"columns": [- "sortOrder",- "createdAt",- "updatedAt",- "annotations","id","stepId","imagePath","caption",+ "sortOrder","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt","size",+ "annotations","modelUploadId"]},@@ -5895,14 +5844,14 @@"name": "quoteOperationTool","rows": 0,"columns": [- "quantity",- "createdAt",- "updatedAt","id","operationId","toolId",+ "quantity","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -5915,15 +5864,15 @@"name": "receiptFixedAssetLine","rows": 0,"columns": [- "received",- "createdAt",- "updatedAt","id","receiptId","purchaseOrderLineId",+ "received","serialNumber","companyId","createdBy",+ "createdAt",+ "updatedAt","updatedBy"]},@@ -5931,79 +5880,79 @@"name": "receiptLine","rows": 0,"columns": [- "orderQuantity",- "outstandingQuantity",- "receivedQuantity",- "unitPrice",- "createdAt",- "updatedAt",- "conversionFactor",- "requiresSerialTracking",- "requiresBatchTracking","id","receiptId","lineId","itemId",+ "orderQuantity",+ "outstandingQuantity",+ "receivedQuantity","locationId","storageUnitId","unitOfMeasure",+ "unitPrice","companyId",+ "createdAt","createdBy",- "updatedBy"+ "updatedAt",+ "updatedBy",+ "conversionFactor",+ "requiresSerialTracking",+ "requiresBatchTracking"]},{"name": "nonConformanceReceiptLine","rows": 0,"columns": [- "createdAt",- "updatedAt","id","nonConformanceId","receiptLineId","receiptId","receiptReadableId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]- },- {- "name": "salesInvoice",- "rows": 0,- "columns": [- "status",- "postingDate",- "dateIssued",- "dateDue",- "datePaid",- "subtotal",- "totalDiscount",- "totalAmount",- "totalTax",- "exchangeRate",- "exchangeRateUpdatedAt",- "customFields",- "internalNotes",- "externalNotes",- "createdAt",- "updatedAt",+ },+ {+ "name": "salesInvoice",+ "rows": 0,+ "columns": ["id","invoiceId",+ "status","customerId","customerReference","invoiceCustomerId","invoiceCustomerLocationId","invoiceCustomerContactId","paymentTermId",+ "postingDate",+ "dateIssued",+ "dateDue",+ "datePaid","locationId","currencyCode",+ "subtotal",+ "totalDiscount",+ "totalAmount",+ "totalTax",+ "exchangeRate",+ "exchangeRateUpdatedAt","opportunityId","shipmentId","assignee","companyId",+ "customFields",+ "internalNotes",+ "externalNotes","tags",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -6011,9 +5960,17 @@"name": "salesInvoiceLine","rows": 0,"columns": [+ "id",+ "invoiceId","invoiceLineType",+ "description",+ "itemId","methodType",+ "assetId","quantity",+ "unitOfMeasureCode",+ "locationId",+ "storageUnitId","exchangeRate","unitPrice","setupPrice",@@ -6022,45 +5979,37 @@"taxPercent","externalNotes","internalNotes",- "customFields",- "createdAt",- "updatedAt",- "nonTaxableAddOnCost",- "sortOrder",- "id",- "invoiceId",- "description",- "itemId",- "assetId",- "unitOfMeasureCode",- "locationId",- "storageUnitId","modelUploadId","opportunityId","salesOrderId","salesOrderLineId",+ "customFields","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",- "accountId"+ "accountId",+ "nonTaxableAddOnCost",+ "sortOrder"]},{"name": "salesInvoiceShipment","rows": 0,"columns": [- "shippingCost",- "customFields",- "createdAt",- "updatedAt",- "incoterm","id",+ "shippingCost","locationId","shippingMethodId","shippingTermId",+ "customFields","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "incoterm","incotermLocation"]},@@ -6068,73 +6017,73 @@"name": "salesReturnOrderLine","rows": 0,"columns": [+ "id",+ "salesReturnOrderId","lineNumber",+ "itemId","quantity","quantityReceived",+ "unitOfMeasureCode","unitPrice","restockFeePercent",- "disposition",- "closedComplete",- "createdAt",- "updatedAt",- "customFields",- "id",- "salesReturnOrderId",- "itemId",- "unitOfMeasureCode","returnReasonId","salesOrderLineId","shipmentLineId","salesInvoiceLineId",+ "disposition",+ "closedComplete","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "salesReturnOrderLineTrackedEntity","rows": 0,"columns": [- "quantity",- "createdAt",- "updatedAt","salesReturnOrderLineId","trackedEntityId",+ "quantity","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "salesReturnOrderCreditLine","rows": 0,"columns": [- "quantity",- "unitPrice",- "restockFee",- "createdAt",- "updatedAt","id","memoId","salesReturnOrderLineId",+ "quantity",+ "unitPrice",+ "restockFee","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "shipmentFixedAssetLine","rows": 0,"columns": [- "shipped",- "createdAt",- "updatedAt","id","shipmentId","salesOrderLineId",+ "shipped","serialNumber","companyId","createdBy",+ "createdAt",+ "updatedAt","updatedBy"]},@@ -6142,23 +6091,23 @@"name": "shipmentLine","rows": 0,"columns": [- "orderQuantity",- "outstandingQuantity",- "shippedQuantity",- "unitPrice",- "requiresSerialTracking",- "requiresBatchTracking",- "createdAt",- "updatedAt","id","shipmentId","lineId","itemId",+ "orderQuantity",+ "outstandingQuantity",+ "shippedQuantity","locationId","storageUnitId","unitOfMeasure",+ "unitPrice",+ "requiresSerialTracking",+ "requiresBatchTracking","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","fulfillmentId"]@@ -6167,15 +6116,15 @@"name": "nonConformanceShipmentLine","rows": 0,"columns": [- "createdAt",- "updatedAt","id","nonConformanceId","shipmentLineId","shipmentId","shipmentReadableId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy"]},@@ -6183,12 +6132,6 @@"name": "supplier","rows": 0,"columns": [- "createdAt",- "updatedAt",- "customFields",- "taxPercent",- "embedding",- "supplierStatus","id","name","supplierTypeId",@@ -6196,15 +6139,21 @@"logo","assignee","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "customFields","currencyCode","phone","fax","website","tags",+ "taxPercent",+ "embedding","purchasingContactId","defaultCc",+ "supplierStatus","intercompanyCompanyId","readableId"]@@ -6212,17 +6161,12 @@{"name": "supplierAccount","rows": 0,- "columns": ["active", "id", "supplierId", "companyId"]+ "columns": ["id", "supplierId", "companyId", "active"]},{"name": "supplierBankAccount","rows": 0,"columns": [- "isPrimary",- "active",- "createdAt",- "updatedAt",- "customFields","id","companyId","supplierId",@@ -6235,9 +6179,14 @@"accountNumber","bankCode","swiftBic",+ "isPrimary",+ "active","notes","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","tags"]},@@ -6250,26 +6199,26 @@"name": "receipt","rows": 0,"columns": [- "sourceDocument",- "status",- "postingDate",- "invoiced",- "createdAt",- "updatedAt",- "customFields",- "internalNotes","id","receiptId","locationId",+ "sourceDocument","sourceDocumentId","sourceDocumentReadableId","externalDocumentId","supplierId",+ "status",+ "postingDate",+ "invoiced","assignee","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy",+ "customFields","tags",+ "internalNotes","supplierInteractionId","postedBy"]@@ -6278,30 +6227,30 @@"name": "shipment","rows": 0,"columns": [- "sourceDocument",- "status",- "postingDate",- "invoiced",- "internalNotes",- "externalNotes",- "createdAt",- "updatedAt",- "customFields","id","shipmentId","locationId",+ "sourceDocument","sourceDocumentId","sourceDocumentReadableId","shippingMethodId","trackingNumber","customerId",+ "status",+ "postingDate","postedBy",+ "invoiced","assignee",+ "internalNotes",+ "externalNotes","opportunityId","companyId",+ "createdAt","createdBy",+ "updatedAt","updatedBy","tags",+ "customFields","supplierId","supplierInteractionId","externalDocumentId"@@ -6311,26 +6260,26 @@"name": "supplierLedger","rows": 0,"columns": [+ "id","entryNumber","postingDate","documentType",- "amount",- "createdAt",- "id","documentId","externalDocumentId","supplierId",- "companyId"+ "amount",+ "companyId",+ "createdAt"]},{"name": "supplierLocation","rows": 0,"columns": [- "customFields","id","supplierId","addressId",+ "customFields","name","tags","companyId"@@ -6340,12 +6289,12 @@"name": "supplierContact","rows": 0,"columns": [- "customFields","id","supplierId","contactId","supplierLocationId","userId",+ "customFields","tags","companyId"]@@ -6354,21 +6303,6 @@"name": "purchaseInvoice","rows": 0,"columns": [- "exchangeRate",- "postingDate",- "dateIssued",- "dateDue",- "datePaid",- "subtotal",- "totalDiscount",- "totalAmount",- "totalTax",- "customFields",- "createdAt",- "updatedAt",- "internalNotes",- "exchangeRateUpdatedAt",- "status","id","invoiceId","supplierId",@@ -6378,45 +6312,60 @@"invoiceSupplierContactId","paymentTermId","currencyCode",+ "exchangeRate",+ "postingDate",+ "dateIssued",+ "dateDue",+ "datePaid",+ "subtotal",+ "totalDiscount",+ "totalAmount",+ "totalTax","assignee","companyId",+ "customFields","createdBy",+ "createdAt","updatedBy",+ "updatedAt","tags","supplierInteractionId",- "locationId"+ "internalNotes",+ "exchangeRateUpdatedAt",+ "locationId",+ "status"]},{"name": "purchaseOrder","rows": 0,"columns": [+ "id",+ "purchaseOrderId","revisionId","status","orderDate",- "closedAt",- "customFields",- "createdAt",- "updatedAt",- "exchangeRate",- "exchangeRateUpdatedAt",- "internalNotes",- "externalNotes",- "purchaseOrderType",- "id",- "purchaseOrderId","supplierId","supplierLocationId","supplierContactId","supplierReference","assignee","companyId",+ "closedAt","closedBy",+ "customFields",+ "createdAt","createdBy",+ "updatedAt","updatedBy","currencyCode",+ "exchangeRate",+ "exchangeRateUpdatedAt","tags",+ "internalNotes",+ "externalNotes","supplierInteractionId",+ "purchaseOrderType","jobId","jobReadableId"]@@ -6425,22 +6374,9 @@"name": "purchaseInvoiceLine","rows": 0,"columns": [- "invoiceLineType",- "quantity",- "supplierUnitPrice",- "exchangeRate",- "createdAt",- "updatedAt",- "customFields",- "conversionFactor",- "internalNotes",- "supplierShippingCost",- "supplierTaxAmount",- "taxPercent",- "requiredDate",- "sortOrder","id","invoiceId",+ "invoiceLineType","purchaseOrderId","purchaseOrderLineId","itemId",@@ -6449,17 +6385,30 @@"storageUnitId","assetId","description",+ "quantity",+ "supplierUnitPrice",+ "exchangeRate","inventoryUnitOfMeasureCode","purchaseUnitOfMeasureCode","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields",+ "conversionFactor","tags",+ "internalNotes",+ "supplierShippingCost","modelUploadId",+ "supplierTaxAmount",+ "taxPercent","jobOperationId","accountId","costCenterId",+ "requiredDate","ownerId",+ "sortOrder","projectId"]},@@ -6467,13 +6416,13 @@"name": "purchaseInvoicePriceChange","rows": 0,"columns": [+ "id",+ "invoiceId",+ "invoiceLineId","previousPrice","newPrice","previousQuantity","newQuantity",- "id",- "invoiceId",- "invoiceLineId","updatedBy","companyId"]@@ -6482,16 +6431,16 @@"name": "purchaseOrderPayment","rows": 0,"columns": [- "paymentComplete",- "updatedAt",- "customFields","id","invoiceSupplierId","invoiceSupplierLocationId","invoiceSupplierContactId","paymentTermId",+ "paymentComplete","companyId",+ "updatedAt","updatedBy",+ "customFields","tags"]},@@ -6499,17 +6448,9 @@"name": "purchaseReturnOrder","rows": 0,"columns": [- "status",- "exchangeRate",- "orderDate",- "expirationDate",- "internalNotes",- "externalNotes",- "createdAt",- "updatedAt",- "customFields","id","purchaseReturnOrderId",+ "status","supplierId","supplierLocationId","supplierContactId",@@ -6518,41 +6459,49 @@"purchaseOrderId","replacementPurchaseOrderId","currencyCode",+ "exchangeRate",+ "orderDate",+ "expirationDate",+ "internalNotes",+ "externalNotes","assignee","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "memo","rows": 0,"columns": [+ "id",+ "memoId","direction","status",+ "customerId",+ "supplierId","memoDate","postingDate",+ "currencyCode","exchangeRate","amount",- "postedAt",- "voidedAt",- "createdAt",- "updatedAt",- "customFields",- "id",- "memoId",- "customerId",- "supplierId",- "currencyCode","reasonAccount","reference","notes","journalId",+ "postedAt","postedBy",+ "voidedAt","voidedBy","companyId","createdBy",+ "createdAt","updatedBy",+ "updatedAt",+ "customFields","salesReturnOrderId","purchaseReturnOrderId"]@@ -6561,6 +6510,12 @@"name": "invoiceSettlement","rows": 0,"columns": [+ "id",+ "paymentId",+ "memoId",+ "targetSalesInvoiceId",+ "targetPurchaseInvoiceId",+ "targetMemoId","appliedAmount","discountAmount","writeOffAmount",@@ -6568,19 +6523,13 @@"targetExchangeRate","fxGainLossAmount","appliedDate",- "createdAt",- "sourceAmount",- "id",- "paymentId",- "memoId",- "targetSalesInvoiceId",- "targetPurchaseInvoiceId",- "targetMemoId","companyId","createdBy",+ "createdAt","appliedViaPaymentId","updatedBy","sourcePaymentId",+ "sourceAmount","targetReimbursementId"]},@@ -6588,98 +6537,98 @@"name": "purchaseReturnOrderLine","rows": 0,"columns": [+ "id",+ "purchaseReturnOrderId","lineNumber",+ "itemId","quantity","quantityShipped",+ "unitOfMeasureCode","unitPrice","restockFeePercent",- "closedComplete",- "createdAt",- "updatedAt",- "customFields",- "id",- "purchaseReturnOrderId",- "itemId",- "unitOfMeasureCode","returnReasonId","purchaseOrderLineId","receiptLineId","purchaseInvoiceLineId",+ "closedComplete","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "customFields"]},{"name": "purchaseReturnOrderCreditLine","rows": 0,"columns": [- "quantity",- "unitPrice",- "restockFee",- "createdAt",- "updatedAt","id","memoId","purchaseReturnOrderLineId",+ "quantity",+ "unitPrice",+ "restockFee","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "supplierPart","rows": 0,"columns": [- "minimumOrderQuantity",- "conversionFactor",- "active",- "createdAt",- "updatedAt",- "customFields",- "unitPrice",- "orderMultiple","id","itemId","supplierId","supplierPartId","supplierUnitOfMeasureCode",+ "minimumOrderQuantity",+ "conversionFactor",+ "active","companyId","createdBy",+ "createdAt","updatedBy",- "tags"+ "updatedAt",+ "customFields",+ "unitPrice",+ "tags",+ "orderMultiple"]},{"name": "supplierPartPrice","rows": 0,"columns": [+ "supplierPartId","quantity","unitPrice","sourceType",- "createdAt",- "updatedAt",- "leadTime",- "supplierPartId","sourceDocumentId","companyId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt",+ "leadTime"]},{"name": "supplierPayment","rows": 0,"columns": [- "updatedAt",- "customFields","supplierId","invoiceSupplierId","invoiceSupplierLocationId","invoiceSupplierContactId","paymentTermId","companyId",+ "updatedAt","updatedBy",+ "customFields","tags"]},@@ -6687,17 +6636,17 @@"name": "supplierProcess","rows": 0,"columns": [- "minimumCost",- "leadTime",- "customFields",- "createdAt",- "updatedAt","id","supplierId","processId",+ "minimumCost",+ "leadTime","companyId",+ "customFields","createdBy",+ "createdAt","updatedBy",+ "updatedAt","tags"]},@@ -6705,32 +6654,32 @@"name": "supplierQuote","rows": 0,"columns": [+ "id",+ "supplierQuoteId","revisionId","quotedDate","expirationDate","status","internalNotes","externalNotes",- "exchangeRate",- "exchangeRateUpdatedAt",- "customFields",- "createdAt",- "updatedAt",- "supplierQuoteType",- "externalLinkId",- "id",- "supplierQuoteId","supplierId","supplierLocationId","supplierContactId","supplierReference","assignee","currencyCode",+ "exchangeRate",+ "exchangeRateUpdatedAt","companyId",+ "customFields","tags",+ "createdAt","createdBy",+ "updatedAt","updatedBy",- "supplierInteractionId"+ "supplierInteractionId",+ "supplierQuoteType",+ "externalLinkId"]},{@@ -6742,50 +6691,50 @@"name": "supplierQuoteLine","rows": 0,"columns": [- "supplierQuoteRevisionId",- "quantity",- "conversionFactor",- "updatedAt",- "customFields",- "internalNotes",- "externalNotes",- "requiredDate",- "sortOrder","id","supplierQuoteId",+ "supplierQuoteRevisionId",+ "quantity","itemId","description","supplierPartId","supplierPartRevision","inventoryUnitOfMeasureCode","purchaseUnitOfMeasureCode",+ "conversionFactor","companyId","createdBy",+ "updatedAt","updatedBy",+ "customFields","tags",+ "internalNotes",+ "externalNotes","costCenterId","accountId","supplierQuoteLineType",- "ownerId"+ "requiredDate",+ "ownerId",+ "sortOrder"]},{"name": "supplierQuoteLinePrice","rows": 0,"columns": [+ "supplierQuoteId",+ "supplierQuoteLineId","quantity","leadTime","supplierUnitPrice","exchangeRate","supplierShippingCost","createdAt",+ "createdBy","updatedAt",+ "updatedBy","supplierTaxAmount","taxPercent",- "supplierQuoteId",- "supplierQuoteLineId",- "createdBy",- "updatedBy","companyId"]},@@ -6793,9 +6742,6 @@"name": "supplierShipping","rows": 0,"columns": [- "updatedAt",- "customFields",- "incoterm","supplierId","shippingSupplierId","shippingSupplierLocationId",@@ -6803,8 +6749,11 @@"shippingTermId","shippingMethodId","companyId",+ "updatedAt","updatedBy",+ "customFields","tags",+ "incoterm","incotermLocation"]},@@ -6812,16 +6761,16 @@"name": "supplierTax","rows": 0,"columns": [- "taxExempt",- "taxExemptionReason",- "updatedAt","supplierId","taxId","vatNumber","eori",+ "taxExempt",+ "taxExemptionReason","taxExemptionCertificateNumber","taxExemptionCertificatePath","companyId",+ "updatedAt","updatedBy"]},@@ -6829,48 +6778,41 @@"name": "workflow","rows": 0,"columns": [- "nextRunAt",- "canvasState",- "createdAt",- "updatedAt","id","companyId","name","description","ownerId","publishedVersionId",+ "nextRunAt",+ "canvasState","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "workflowVersion","rows": 0,"columns": [+ "id",+ "companyId",+ "workflowId","versionNumber","formatVersion","nodes","edges",- "createdAt",- "updatedAt",- "id",- "companyId",- "workflowId","createdBy",- "updatedBy"+ "createdAt",+ "updatedBy",+ "updatedAt"]},{"name": "workflowRun","rows": 0,"columns": [- "isTest",- "depth",- "startedAt",- "completedAt",- "durationMs",- "compactedAt",- "createdAt","id","companyId","workflowId",@@ -6882,48 +6824,55 @@"ownerId","status","statusReason",+ "isTest","rootRunId","causedByRunId",+ "depth","path",- "error"+ "startedAt",+ "completedAt",+ "durationMs",+ "error",+ "compactedAt",+ "createdAt"]},{"name": "workflowStepRun","rows": 0,"columns": [- "sequence",- "input",- "output",- "startedAt",- "completedAt",- "durationMs",- "compactedAt",- "createdAt",- "detail","id","companyId","runId",+ "sequence","nodeId","nodeType","itemKey","status","statusReason",+ "input",+ "output","branchTaken",- "error"+ "startedAt",+ "completedAt",+ "durationMs",+ "error",+ "compactedAt",+ "createdAt",+ "detail"]},{"name": "workflowTriggerEvent","rows": 0,"columns": [- "createdAt","id","companyId","workflowId","workflowVersionId","eventId",- "origin"+ "origin",+ "createdAt"]}],@@ -6934,7 +6883,10 @@"companyIntegration","employeePin","oauthClient",+ "oauthCode","oauthToken",+ "ssoConnection",+ "ssoDomain","webhook"]}diff --git a/packages/jobs/src/inngest/functions/scheduled/company-cleanup.ts b/packages/jobs/src/inngest/functions/scheduled/company-cleanup.tsnew file mode 100644index 0000000000..781bc6065c--- /dev/null+++ b/packages/jobs/src/inngest/functions/scheduled/company-cleanup.ts@@ -0,0 +1,285 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import { getCarbonServiceRole } from "@carbon/auth/client.server";+import { fetchAllFromTable } from "@carbon/database";+import type { KyselyDatabase } from "@carbon/database/client";+import { STRIPE_BYPASS_COMPANY_IDS, STRIPE_BYPASS_USER_IDS } from "@carbon/env";+import { chunkArray, isInternalEmail } from "@carbon/utils";+import type { Kysely } from "kysely";+import { getJobDatabaseClient } from "../../../db";+import {+ canSetReplicationRole,+ getCompanyTableCatalog+} from "../tasks/company-backup";+import {+ type CompanyCandidate,+ selectInactiveCompanies+} from "./inactive-companies";+import { purgeCompany, removeCompanyLeftovers } from "./purge-company";++// What the weekly cleanup and the manual purge share: which companies are+// inactive, the check that one still is, and the delete itself.++type Logger = {+ info: (message: string, context?: Record<string, unknown>) => void;+ error: (message: string, context?: Record<string, unknown>) => void;+};++export const splitIds = (value: string | undefined) =>+ (value ?? "")+ .split(",")+ .map((id) => id.trim())+ .filter(Boolean);++export type GroupOwner = {+ id: string;+ email: string;+ firstName: string | null;+};++/** The owner of each company group, for protection and for the warning email. */+export async function getGroupOwners(+ groupIds: string[]+): Promise<Map<string, GroupOwner>> {+ const serviceRole = getCarbonServiceRole();+ const ownerIds = new Map<string, string>();+ for (const ids of chunkArray([...new Set(groupIds)], 200)) {+ const { data, error } = await serviceRole+ .from("companyGroup")+ .select("id, ownerId")+ .in("id", ids);+ if (error)+ throw new Error(`Failed to load company groups: ${error.message}`);+ for (const group of data) {+ if (group.ownerId) ownerIds.set(group.id, group.ownerId);+ }+ }++ const users = new Map<string, GroupOwner>();+ for (const ids of chunkArray([...new Set(ownerIds.values())], 200)) {+ const { data, error } = await serviceRole+ .from("user")+ .select("id, email, firstName")+ .in("id", ids);+ if (error) throw new Error(`Failed to load group owners: ${error.message}`);+ for (const user of data) users.set(user.id, user);+ }++ const owners = new Map<string, GroupOwner>();+ for (const [groupId, ownerId] of ownerIds) {+ const owner = users.get(ownerId);+ if (owner) owners.set(groupId, owner);+ }+ return owners;+}++/**+ * Every inactive company, oldest first: no plan row anywhere in its group, older+ * than a week, not a bypass company, and not in a group owned by a Carbon or+ * bypass user (those have plan access with no row). `deletable` leaves out the+ * ones with no group owner: nobody can be told, so they are never deleted.+ * Null when a read failed; the caller does nothing rather than act on part of+ * the picture.+ */+export async function loadInactiveCompanies(logger: Logger): Promise<{+ now: number;+ candidates: number;+ inactive: CompanyCandidate[];+ deletable: CompanyCandidate[];+} | null> {+ const serviceRole = getCarbonServiceRole();+ // Paged: PostgREST caps a plain select at 1000 rows, and a plan row cut+ // off there would make a paying company look planless.+ const [companies, plans] = await Promise.all([+ fetchAllFromTable<CompanyCandidate>(+ serviceRole,+ "company",+ "id, name, createdAt, companyGroupId"+ ),+ fetchAllFromTable<{ id: string }>(serviceRole, "companyPlan", "id")+ ]);+ if (companies.error || plans.error) {+ logger.error("Failed to load companies for cleanup", {+ error: companies.error ?? plans.error+ });+ return null;+ }++ const selection = {+ companies: companies.data,+ planCompanyIds: new Set(plans.data.map((plan) => plan.id)),+ protectedCompanyIds: new Set(splitIds(STRIPE_BYPASS_COMPANY_IDS)),+ now: Date.now(),+ limit: Number.POSITIVE_INFINITY+ };+ // Owners are looked up only for the candidates' groups: a group owned by+ // a Carbon or bypass user has plan access without a plan row.+ const candidates = selectInactiveCompanies({+ ...selection,+ protectedGroupIds: new Set()+ });+ let owners: Map<string, GroupOwner>;+ try {+ owners = await getGroupOwners(+ candidates.flatMap((c) => (c.companyGroupId ? [c.companyGroupId] : []))+ );+ } catch (error) {+ logger.error("Failed to load company group owners", { error });+ return null;+ }+ const bypassUsers = new Set(splitIds(STRIPE_BYPASS_USER_IDS));+ const protectedGroupIds = new Set(+ [...owners]+ .filter(+ ([, owner]) => bypassUsers.has(owner.id) || isInternalEmail(owner.email)+ )+ .map(([groupId]) => groupId)+ );+ const inactive = selectInactiveCompanies({ ...selection, protectedGroupIds });+ return {+ now: selection.now,+ candidates: candidates.length,+ inactive,+ deletable: inactive.filter(+ (c) => c.companyGroupId !== null && owners.has(c.companyGroupId)+ )+ };+}++/**+ * Whether a company is still inactive, read in the purge's own transaction: it+ * exists and is not bypassed, no company in its group has a plan, and the group+ * has an owner who is not internal or a bypass user. Returns that owner's id, or+ * null when the company must be kept. The list it came from was built minutes+ * (or retries) earlier.+ */+export async function inactiveCompanyOwner(+ trx: Kysely<KyselyDatabase>,+ companyId: string+): Promise<string | null> {+ if (splitIds(STRIPE_BYPASS_COMPANY_IDS).includes(companyId)) return null;+ const company = await trx+ .selectFrom("company")+ .select("companyGroupId")+ .where("id", "=", companyId)+ .executeTakeFirst();+ if (!company) return null;++ const groupId = company.companyGroupId;+ const paying = await trx+ .selectFrom("companyPlan")+ .select("id")+ .where((eb) =>+ groupId === null+ ? eb("id", "=", companyId)+ : eb(+ "id",+ "in",+ eb+ .selectFrom("company")+ .select("company.id")+ .where("company.companyGroupId", "=", groupId)+ )+ )+ .limit(1)+ .executeTakeFirst();+ if (paying) return null;++ if (groupId === null) return null;+ const owner = await trx+ .selectFrom("companyGroup")+ .innerJoin("user", "user.id", "companyGroup.ownerId")+ .select(["user.id", "user.email"])+ .where("companyGroup.id", "=", groupId)+ .executeTakeFirst();+ if (+ !owner ||+ splitIds(STRIPE_BYPASS_USER_IDS).includes(owner.id) ||+ isInternalEmail(owner.email)+ ) {+ return null;+ }+ return owner.id;+}++type CleanupTarget = Pick<CompanyCandidate, "id" | "name" | "companyGroupId">;++/**+ * Delete each company with everything it owns: its rows, Vault secrets, storage+ * bucket and legacy files in one transaction, then its search index and audit+ * log tables. `stillDue` is asked inside that transaction, so a plan bought since+ * the list was built stops the delete. A company that cannot be deleted is+ * logged and skipped; the table catalog is read once for the whole list.+ */+export async function deleteCompanies(+ companies: CleanupTarget[],+ stillDue: (+ trx: Kysely<KyselyDatabase>,+ companyId: string+ ) => Promise<boolean>,+ logger: Logger+): Promise<{ id: string; deleted: boolean }[]> {+ const serviceRole = getCarbonServiceRole();+ const db = getJobDatabaseClient();+ const replica = await canSetReplicationRole(db);+ const catalog = await getCompanyTableCatalog(db);+ const results: { id: string; deleted: boolean }[] = [];++ for (const company of companies) {+ try {+ const purged = await db.transaction().execute(async (trx) => {+ if (!(await stillDue(trx, company.id))) return false;+ await purgeCompany(trx, catalog, company.id, { replica });+ // Before the commit: when any of it fails the delete rolls back, and+ // the company, still due, is retried on the next run.+ const failures = await removeCompanyLeftovers(+ trx,+ serviceRole,+ company.id+ );+ if (failures.length > 0) {+ for (const failure of failures) {+ logger.error("Failed to remove company {failurePart}", {+ failurePart: failure.part,+ ...company,+ error: failure.error+ });+ }+ throw new Error(+ `Company cleanup incomplete: ${failures.map((f) => f.part).join(", ")}`+ );+ }+ return true;+ });+ if (!purged) {+ logger.info("Company no longer due for deletion; kept", company);+ results.push({ id: company.id, deleted: false });+ continue;+ }+ } catch (error) {+ logger.error("Failed to delete company", { ...company, replica, error });+ results.push({ id: company.id, deleted: false });+ continue;+ }++ // Per-company tables, named after the company and so outside the catalog.+ for (const fn of [+ "drop_company_search_index",+ "drop_audit_log_table"+ ] as const) {+ const { error } = await serviceRole.rpc(fn, { p_company_id: company.id });+ if (error) {+ logger.error("Failed to run {fn} for a deleted company", {+ fn,+ ...company,+ error+ });+ }+ }+ logger.info("Deleted company", company);+ results.push({ id: company.id, deleted: true });+ }+ return results;+}diff --git a/packages/jobs/src/inngest/functions/scheduled/index.ts b/packages/jobs/src/inngest/functions/scheduled/index.tsindex b99cb28683..a001184733 100644--- a/packages/jobs/src/inngest/functions/scheduled/index.ts+++ b/packages/jobs/src/inngest/functions/scheduled/index.ts@@ -12,6 +12,7 @@ export { mrpFunction } from "./mrp";export { nightlyReplanFunction } from "./nightly-replan";export { notificationDigestFunction } from "./notification-digest";export { notificationPurgeFunction } from "./notification-purge";+export { purgeInactiveCompaniesFunction } from "./purge-inactive-companies";export {markScheduleStaleFunction,scheduleReplanWaveFunctiondiff --git a/packages/jobs/src/inngest/functions/scheduled/purge-inactive-companies.test.ts b/packages/jobs/src/inngest/functions/scheduled/purge-inactive-companies.test.tsnew file mode 100644index 0000000000..fd68570b78--- /dev/null+++ b/packages/jobs/src/inngest/functions/scheduled/purge-inactive-companies.test.ts@@ -0,0 +1,54 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import { describe, expect, it, vi } from "vitest";++vi.mock("../../client", () => ({+ inngest: { createFunction: () => ({}) }+}));+vi.mock("./company-cleanup", () => ({}));++const { purgeRefusal, resolvePurgeOptions } = await import(+ "./purge-inactive-companies"+);++describe("purgeRefusal", () => {+ it("allows only a dashboard invoke on Cloud", () => {+ expect(purgeRefusal("inngest/function.invoked", "cloud")).toBeNull();+ });++ it.each([+ ["a sent event", "carbon/purge-inactive-companies", "cloud"],+ ["a cron tick", "inngest/scheduled.timer", "cloud"],+ ["Community", "inngest/function.invoked", "community"],+ ["Enterprise", "inngest/function.invoked", "enterprise"],+ ["no edition", "inngest/function.invoked", undefined]+ ])("refuses %s", (_label, name, edition) => {+ expect(purgeRefusal(name, edition)).not.toBeNull();+ });+});++describe("resolvePurgeOptions", () => {+ it.each([+ ["an empty payload", {}],+ ["dryRun true", { dryRun: true }],+ ["the string false", { dryRun: "false" }],+ ["zero", { dryRun: 0 }],+ ["null", { dryRun: null }]+ ])("is a dry run for %s", (_label, data) => {+ expect(resolvePurgeOptions(data).dryRun).toBe(true);+ });++ it("deletes only for dryRun false", () => {+ expect(resolvePurgeOptions({ dryRun: false }).dryRun).toBe(false);+ });++ it("caps a run at 500 companies and never goes below zero", () => {+ expect(resolvePurgeOptions({}).limit).toBe(500);+ expect(resolvePurgeOptions({ limit: 5000 }).limit).toBe(500);+ expect(resolvePurgeOptions({ limit: 25.9 }).limit).toBe(25);+ expect(resolvePurgeOptions({ limit: -3 }).limit).toBe(0);+ expect(resolvePurgeOptions({ limit: "50" }).limit).toBe(500);+ });+});diff --git a/packages/jobs/src/inngest/functions/scheduled/purge-inactive-companies.ts b/packages/jobs/src/inngest/functions/scheduled/purge-inactive-companies.tsnew file mode 100644index 0000000000..35b88f4ab4--- /dev/null+++ b/packages/jobs/src/inngest/functions/scheduled/purge-inactive-companies.ts@@ -0,0 +1,146 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import { chunkArray, Edition } from "@carbon/utils";+import { inngest } from "../../client";+import {+ deleteCompanies,+ inactiveCompanyOwner,+ loadInactiveCompanies+} from "./company-cleanup";++/** Ten companies a step, so this stays well under Inngest's per-run step limit. */+const MAX_COMPANIES_PER_RUN = 500;++/**+ * Only `dryRun: false` deletes: a missing payload, a typo or any other value is+ * a dry run. `limit` is clamped to 0..500, whole companies.+ */+export function resolvePurgeOptions(data: {+ dryRun?: unknown;+ limit?: unknown;+}): { dryRun: boolean; limit: number } {+ const requested =+ typeof data?.limit === "number" && Number.isFinite(data.limit)+ ? Math.trunc(data.limit)+ : MAX_COMPANIES_PER_RUN;+ return {+ dryRun: data?.dryRun !== false,+ limit: Math.min(Math.max(requested, 0), MAX_COMPANIES_PER_RUN)+ };+}++/**+ * A run started with the Invoke button of the Inngest dashboard (or dev server)+ * arrives as this event. Inngest reserves the `inngest/` prefix, so it cannot+ * be sent through the event API.+ */+const INVOKED = "inngest/function.invoked";++/**+ * Why a run must not purge, or null when it may. Cloud only: a self-hosted+ * install has no plans, so every company there reads as inactive. And only a+ * run someone started from the Inngest dashboard: a+ * `carbon/purge-inactive-companies` event sent with the event key is refused.+ */+export function purgeRefusal(+ eventName: string,+ edition: string | undefined+): string | null {+ if (edition !== Edition.Cloud) return "not Carbon Cloud";+ if (eventName !== INVOKED) return "not invoked from the Inngest dashboard";+ return null;+}++/**+ * Delete inactive companies now, with no warning email and no waiting period.+ * Run by hand with the Invoke button of the Inngest dashboard, on Carbon Cloud;+ * nothing schedules it and nothing else can start it (`purgeRefusal`).+ *+ * "Inactive" is the weekly cleanup's rule and nothing looser: no plan anywhere+ * in the group, older than a week, not a bypass company, and not owned by a+ * Carbon or bypass user. What it skips is the warning: the weekly job deletes+ * only a company whose owner was emailed a date, and this does not ask.+ *+ * `dryRun` defaults to TRUE. A deleted company cannot be brought back, and an+ * Invoke with an empty payload must not be what deletes five hundred of them:+ * the run then returns the companies it would delete, oldest first. Send+ * `{ "dryRun": false }` to delete; `limit` (at most 500) caps one run.+ */+export const purgeInactiveCompaniesFunction = inngest.createFunction(+ {+ id: "purge-inactive-companies",+ retries: 0,+ concurrency: { limit: 1 }+ },+ { event: "carbon/purge-inactive-companies" },+ async ({ event, step, logger }) => {+ const refused = purgeRefusal(event.name, process.env.CARBON_EDITION);+ if (refused) {+ logger.warn("Inactive company purge refused", { reason: refused });+ return { deleted: 0, reason: refused };+ }+ const { dryRun, limit } = resolvePurgeOptions(event.data);++ const plan = await step.run("plan-inactive-company-purge", async () => {+ const found = await loadInactiveCompanies(logger);+ if (!found) return null;+ return {+ inactive: found.inactive.length,+ withoutOwner: found.inactive.length - found.deletable.length,+ targets: found.deletable+ .slice(0, limit)+ .map(({ id, name, companyGroupId, createdAt }) => ({+ id,+ name,+ companyGroupId,+ createdAt+ }))+ };+ });+ if (!plan) return { dryRun, deleted: 0, reason: "nothing loaded" };++ const summary = {+ dryRun,+ inactive: plan.inactive,+ withoutOwner: plan.withoutOwner,+ selected: plan.targets.length+ };+ if (dryRun) {+ logger.info("Inactive company purge (dry run)", summary);+ return { ...summary, deleted: 0, companies: plan.targets };+ }++ let deleted = 0;+ const kept: string[] = [];+ const batches = chunkArray(plan.targets, 10);+ for (let i = 0; i < batches.length; i++) {+ try {+ // Re-checked in the purge's own transaction: a plan bought since the+ // list was built must stop the delete.+ const results = await step.run(`purge-inactive-companies-${i}`, () =>+ deleteCompanies(+ batches[i]!,+ async (trx, companyId) =>+ (await inactiveCompanyOwner(trx, companyId)) !== null,+ logger+ )+ );+ for (const result of results) {+ if (result.deleted) deleted++;+ else kept.push(result.id);+ }+ } catch (error) {+ logger.error("Failed to purge a batch of inactive companies", {+ batch: i,+ error+ });+ kept.push(...batches[i]!.map((company) => company.id));+ }+ }++ logger.info("Inactive company purge", { ...summary, deleted, kept });+ return { ...summary, deleted, kept };+ }+);diff --git a/packages/jobs/src/inngest/functions/scheduled/weekly.ts b/packages/jobs/src/inngest/functions/scheduled/weekly.tsindex 83465ea68c..b5a204a175 100644--- a/packages/jobs/src/inngest/functions/scheduled/weekly.ts+++ b/packages/jobs/src/inngest/functions/scheduled/weekly.ts@@ -9,48 +9,34 @@ import {CompanyDeletionWarningEmail,isReminderItemStatus} from "@carbon/documents/email";-import {- getAppUrl,- STRIPE_BYPASS_COMPANY_IDS,- STRIPE_BYPASS_USER_IDS-} from "@carbon/env";+import { getAppUrl } from "@carbon/env";import { sendEmail } from "@carbon/lib/email.server";import {MAX_NOTIFICATION_DELIVERIES,NotificationEvent} from "@carbon/notifications";-import {- chunkArray,- datetime,- Edition,- formatDate,- isInternalEmail-} from "@carbon/utils";+import { chunkArray, datetime, Edition, formatDate } from "@carbon/utils";import { render } from "@react-email/components";import type { Kysely } from "kysely";-import { getJobDatabaseClient } from "../../../db";import { inngest } from "../../client";import {- canSetReplicationRole,- getCompanyTableCatalog-} from "../tasks/company-backup";+ deleteCompanies,+ getGroupOwners,+ inactiveCompanyOwner,+ loadInactiveCompanies+} from "./company-cleanup";import {type CompanyCandidate,isDueForDeletion,- selectInactiveCompanies,splitByWarning,type Warning} from "./inactive-companies";-import { purgeCompany, removeCompanyLeftovers } from "./purge-company";--/** Keeps a backlog under Inngest's per-run step limit; later weeks drain the rest. */-const MAX_COMPANY_DELETIONS_PER_RUN = 100;-const splitIds = (value: string | undefined) =>- (value ?? "")- .split(",")- .map((id) => id.trim())- .filter(Boolean);+/**+ * Keeps a backlog under Inngest's per-run step limit (ten companies a step, for+ * warnings and again for deletions); later weeks drain the rest.+ */+const MAX_COMPANY_DELETIONS_PER_RUN = 500;/** Marker per warned company in `externalIntegrationMapping`; the purge clears it. */const WARNING_INTEGRATION = "inactive-company-warning";@@ -63,99 +49,18 @@ const NOTHING_TO_DO: {staleWarningIds: string[];} = { plannedAt: 0, toWarn: [], toDelete: [], staleWarningIds: [] };-type GroupOwner = { id: string; email: string; firstName: string | null };--/** The owner of each company group, for protection and for the warning email. */-async function getGroupOwners(- groupIds: string[]-): Promise<Map<string, GroupOwner>> {- const serviceRole = getCarbonServiceRole();- const ownerIds = new Map<string, string>();- for (const ids of chunkArray([...new Set(groupIds)], 200)) {- const { data, error } = await serviceRole- .from("companyGroup")- .select("id, ownerId")- .in("id", ids);- if (error)- throw new Error(`Failed to load company groups: ${error.message}`);- for (const group of data) {- if (group.ownerId) ownerIds.set(group.id, group.ownerId);- }- }-- const users = new Map<string, GroupOwner>();- for (const ids of chunkArray([...new Set(ownerIds.values())], 200)) {- const { data, error } = await serviceRole- .from("user")- .select("id, email, firstName")- .in("id", ids);- if (error) throw new Error(`Failed to load group owners: ${error.message}`);- for (const user of data) users.set(user.id, user);- }-- const owners = new Map<string, GroupOwner>();- for (const [groupId, ownerId] of ownerIds) {- const owner = users.get(ownerId);- if (owner) owners.set(groupId, owner);- }- return owners;-}-/*** Whether a planned delete still holds, read in the purge's own transaction: the- * company exists and is not bypassed, no company in its group has a plan, the- * group's current owner is the person who was warned (and is not internal or a- * bypass user), and that warning is due. The plan step ran minutes (or retries)- * earlier.+ * company is still inactive, the group's current owner is the person who was+ * warned, and that warning is due. The plan step ran minutes (or retries)+ * earlier, and a new owner has not been warned.*/async function isStillDueForDeletion(trx: Kysely<KyselyDatabase>,companyId: string): Promise<boolean> {- if (splitIds(STRIPE_BYPASS_COMPANY_IDS).includes(companyId)) return false;- const company = await trx- .selectFrom("company")- .select("companyGroupId")- .where("id", "=", companyId)- .executeTakeFirst();- if (!company) return false;-- const groupId = company.companyGroupId;- const paying = await trx- .selectFrom("companyPlan")- .select("id")- .where((eb) =>- groupId === null- ? eb("id", "=", companyId)- : eb(- "id",- "in",- eb- .selectFrom("company")- .select("company.id")- .where("company.companyGroupId", "=", groupId)- )- )- .limit(1)- .executeTakeFirst();- if (paying) return false;-- // Only an owned group is ever warned. The owner may have changed, or become- // internal, since the plan step, and a new owner has not been warned.- if (groupId === null) return false;- const owner = await trx- .selectFrom("companyGroup")- .innerJoin("user", "user.id", "companyGroup.ownerId")- .select(["user.id", "user.email"])- .where("companyGroup.id", "=", groupId)- .executeTakeFirst();- if (- !owner ||- splitIds(STRIPE_BYPASS_USER_IDS).includes(owner.id) ||- isInternalEmail(owner.email)- ) {- return false;- }+ const ownerId = await inactiveCompanyOwner(trx, companyId);+ if (ownerId === null) return false;const marker = await trx.selectFrom("externalIntegrationMapping")@@ -164,7 +69,7 @@ async function isStillDueForDeletion(.where("companyId", "=", companyId).executeTakeFirst();const warning = marker?.metadata as Warning | undefined;- if (warning?.ownerId !== owner.id) return false;+ if (warning?.ownerId !== ownerId) return false;return isDueForDeletion(warning, {now: Date.now(),today: datetime.today("UTC").toString()@@ -299,66 +204,11 @@ export const weeklyFunction = inngest.createFunction(const plan = await step.run("plan-inactive-company-cleanup", async () => {if (process.env.CARBON_EDITION !== Edition.Cloud) return NOTHING_TO_DO;- // Paged: PostgREST caps a plain select at 1000 rows, and a plan row cut- // off there would make a paying company look planless.- const [companies, plans] = await Promise.all([- fetchAllFromTable<CompanyCandidate>(- serviceRole,- "company",- "id, name, createdAt, companyGroupId"- ),- fetchAllFromTable<{ id: string }>(serviceRole, "companyPlan", "id")- ]);- if (companies.error || plans.error) {- logger.error("Failed to load companies for cleanup", {- error: companies.error ?? plans.error- });- return NOTHING_TO_DO;- }-- const selection = {- companies: companies.data,- planCompanyIds: new Set(plans.data.map((plan) => plan.id)),- protectedCompanyIds: new Set(splitIds(STRIPE_BYPASS_COMPANY_IDS)),- now: Date.now(),- limit: Number.POSITIVE_INFINITY- };- // Owners are looked up only for the candidates' groups: a group owned by- // a Carbon or bypass user has plan access without a plan row.- const candidates = selectInactiveCompanies({- ...selection,- protectedGroupIds: new Set()- });- let owners: Map<string, GroupOwner>;- try {- owners = await getGroupOwners(- candidates.flatMap((c) =>- c.companyGroupId ? [c.companyGroupId] : []- )- );- } catch (error) {- logger.error("Failed to load company group owners", { error });- return NOTHING_TO_DO;- }- // A group owned by a Carbon or bypass user has plan access without a row.- const bypassUsers = new Set(splitIds(STRIPE_BYPASS_USER_IDS));- const protectedGroupIds = new Set(- [...owners]- .filter(- ([, owner]) =>- bypassUsers.has(owner.id) || isInternalEmail(owner.email)- )- .map(([groupId]) => groupId)- );- const inactive = selectInactiveCompanies({- ...selection,- protectedGroupIds- });+ const found = await loadInactiveCompanies(logger);+ if (!found) return NOTHING_TO_DO;// Never warned means never deleted, so an ownerless company is kept. It is// left out of the capped lists, where it would hold a slot every week.- const warnable = inactive.filter(- (c) => c.companyGroupId !== null && owners.has(c.companyGroupId)- );+ const { inactive, deletable: warnable } = found;const markers = await fetchAllFromTable<{id: string;@@ -392,7 +242,7 @@ export const weeklyFunction = inngest.createFunction(inactive: warnable,warnings,clock: {- now: selection.now,+ now: found.now,today: datetime.today("UTC").toString()},limit: MAX_COMPANY_DELETIONS_PER_RUN@@ -406,14 +256,14 @@ export const weeklyFunction = inngest.createFunction(logger.info("Inactive companies", {inactive: inactive.length,- protectedByOwner: candidates.length - inactive.length,+ protectedByOwner: found.candidates - inactive.length,withoutOwner: inactive.length - warnable.length,toWarn: slim(toWarn),toDelete: slim(toDelete),staleWarnings: staleWarningIds.length});return {- plannedAt: selection.now,+ plannedAt: found.now,toWarn: slim(toWarn),toDelete: slim(toDelete),staleWarningIds@@ -456,74 +306,11 @@ export const weeklyFunction = inngest.createFunction(const batches = chunkArray(plan.toDelete, 10);for (let i = 0; i < batches.length; i++) {try {- await step.run(`delete-inactive-companies-${i}`, async () => {- const db = getJobDatabaseClient();- const replica = await canSetReplicationRole(db);- const catalog = await getCompanyTableCatalog(db);- const results: { id: string; deleted: boolean }[] = [];-- for (const company of batches[i]!) {- try {- // Re-checked in the purge's own transaction: a plan bought, or a- // warning cleared, since the plan step ran must stop the delete.- const purged = await db.transaction().execute(async (trx) => {- if (!(await isStillDueForDeletion(trx, company.id)))- return false;- await purgeCompany(trx, catalog, company.id, { replica });- // Before the commit: when any of it fails the delete rolls back,- // and the company, still warned and due, is retried next week.- const failures = await removeCompanyLeftovers(- trx,- serviceRole,- company.id- );- if (failures.length > 0) {- for (const failure of failures) {- logger.error("Failed to remove company {failurePart}", {- failurePart: failure.part,- ...company,- error: failure.error- });- }- throw new Error(- `Company cleanup incomplete: ${failures.map((f) => f.part).join(", ")}`- );- }- return true;- });- if (!purged) {- logger.info(- "Company no longer due for deletion; kept",- company- );- results.push({ id: company.id, deleted: false });- continue;- }- } catch (error) {- logger.error("Failed to delete company", {- ...company,- replica,- error- });- results.push({ id: company.id, deleted: false });- continue;- }-- const { error: searchError } = await serviceRole.rpc(- "drop_company_search_index",- { p_company_id: company.id }- );- if (searchError) {- logger.error("Failed to drop search index for company", {- ...company,- error: searchError- });- }- logger.info("Deleted company", company);- results.push({ id: company.id, deleted: true });- }- return results;- });+ // Re-checked in the purge's own transaction: a plan bought, or a+ // warning cleared, since the plan step ran must stop the delete.+ await step.run(`delete-inactive-companies-${i}`, () =>+ deleteCompanies(batches[i]!, isStillDueForDeletion, logger)+ );} catch (error) {logger.error("Failed to delete a batch of inactive companies", {batch: i,@@ -695,7 +482,5 @@ export const weeklyFunction = inngest.createFunction(reminders.notifyEvents);}-- console.log(`Weekly tasks completed: ${new Date().toISOString()}`);});diff --git a/packages/jobs/src/inngest/index.ts b/packages/jobs/src/inngest/index.tsindex ff697d6508..89fdcd9947 100644--- a/packages/jobs/src/inngest/index.ts+++ b/packages/jobs/src/inngest/index.ts@@ -5,6 +5,7 @@// Must load before any function module pulls in pdfjs (extract-document), whose// init runs `new DOMMatrix()` — undefined in the Node worker without this shim.import "@carbon/lib/shims";+import { Edition } from "@carbon/utils";// Re-export the inngest client and helpers@@ -72,6 +73,7 @@ import {nightlyReplanFunction,notificationDigestFunction,notificationPurgeFunction,+ purgeInactiveCompaniesFunction,scheduleReplanWaveFunction,updateExchangeRatesFunction,weeklyFunction,@@ -162,6 +164,10 @@ export const functions = [updateExchangeRatesFunction,notificationDigestFunction,notificationPurgeFunction,+ // Not registered off Cloud, so a self-hosted Inngest has nothing to invoke.+ ...(process.env.CARBON_EDITION === Edition.Cloud+ ? [purgeInactiveCompaniesFunction]+ : []),workflowRunRetentionFunction,// IntegrationsjiraSyncFunction,diff --git a/packages/lib/src/events.ts b/packages/lib/src/events.tsindex 8b182274f6..12cbbfeb58 100644--- a/packages/lib/src/events.ts+++ b/packages/lib/src/events.ts@@ -563,6 +563,15 @@ export type Events = {data: Record<string, never>;};+ // The trigger of the manual inactive-company purge. Sending it does nothing:+ // the function only runs when invoked from the Inngest dashboard, on Cloud.+ "carbon/purge-inactive-companies": {+ data: {+ dryRun?: boolean;+ limit?: number;+ };+ };+// Dispatch"carbon/dispatch": {data: {diff --git a/packages/onboarding/src/server.ts b/packages/onboarding/src/server.tsindex a2b6711785..f71615ecf4 100644--- a/packages/onboarding/src/server.ts+++ b/packages/onboarding/src/server.ts@@ -58,29 +58,38 @@ export function getImplementationRows(client: Client, companyId: string) {// Cheap existence probes that back the nested product steps' auto-detection.// Never persisted — overlaid on stored manual state at read time.+//+// `known` skips a probe: pass the signals already seen true (the app caches+// them), since "this company has a part" does not stop being true from one+// page load to the next.export async function detectImplementationSignals(client: Client,- companyId: string+ companyId: string,+ known: Partial<Signals> = {}): Promise<Signals> {- const probe = (+ const probe = async (+ signal: keyof Signals,table: "item" | "makeMethod" | "job" | "salesOrder" | "trackedEntity"- ) => client.from(table).select("id").eq("companyId", companyId).limit(1);+ ) => {+ if (known[signal]) return true;+ const result = await client+ .from(table)+ .select("id")+ .eq("companyId", companyId)+ .limit(1);+ return !!result.data?.length;+ };- const [items, methods, jobs, orders, tracked] = await Promise.all([- probe("item"),- probe("makeMethod"),- probe("job"),- probe("salesOrder"),- probe("trackedEntity")- ]);+ const [hasItems, hasMakeMethod, hasJob, hasSalesOrder, hasTrackedEntity] =+ await Promise.all([+ probe("hasItems", "item"),+ probe("hasMakeMethod", "makeMethod"),+ probe("hasJob", "job"),+ probe("hasSalesOrder", "salesOrder"),+ probe("hasTrackedEntity", "trackedEntity")+ ]);- return {- hasItems: !!items.data?.length,- hasMakeMethod: !!methods.data?.length,- hasJob: !!jobs.data?.length,- hasSalesOrder: !!orders.data?.length,- hasTrackedEntity: !!tracked.data?.length- };+ return { hasItems, hasMakeMethod, hasJob, hasSalesOrder, hasTrackedEntity };}export function enrollImplementation(diff --git a/packages/onboarding/src/ui/OnboardingHubSummary.tsx b/packages/onboarding/src/ui/OnboardingHubSummary.tsxindex 2adf27994c..88d1df4074 100644--- a/packages/onboarding/src/ui/OnboardingHubSummary.tsx+++ b/packages/onboarding/src/ui/OnboardingHubSummary.tsx@@ -11,6 +11,8 @@ type OnboardingHubSummaryProps = {label: string;done: number;total: number;+ // Progress is still loading: hold the layout, leave the numbers out.+ pending?: boolean;// The single next thing to do (drives the home-screen hand-holding).nextLabel?: string;// The CTA (app supplies a react-router <Link> wrapped in a Button for SPA nav).@@ -25,6 +27,7 @@ export function OnboardingHubSummary({label,done,total,+ pending = false,nextLabel,action,onDismiss@@ -48,9 +51,11 @@ export function OnboardingHubSummary({<div className="flex-1 min-w-0"><div className="flex items-center gap-2"><h3 className="text-base font-semibold tracking-tight">{label}</h3>- <span className="text-sm text-muted-foreground tabular-nums">- {done}/{total} <Trans>steps</Trans>- </span>+ {pending ? null : (+ <span className="text-sm text-muted-foreground tabular-nums">+ {done}/{total} <Trans>steps</Trans>+ </span>+ )}</div><div className="mt-2 h-2 w-full max-w-md rounded-full bg-muted overflow-hidden"><div@@ -61,7 +66,12 @@ export function OnboardingHubSummary({style={{ width: `${pct}%` }}/></div>- {nextLabel ? (+ {pending ? (+ // Same line box as the "Next:" line that replaces it.+ <p className="mt-2 text-sm" aria-hidden>+ + </p>+ ) : nextLabel ? (<p className="mt-2 text-sm text-muted-foreground truncate"><Trans>Next:</Trans>{" "}<span className="text-foreground font-medium">{nextLabel}</span>diff --git a/packages/planning/src/scheduling/master-data-provider.ts b/packages/planning/src/scheduling/master-data-provider.tsindex 107ed9cd3c..1aea22d943 100644--- a/packages/planning/src/scheduling/master-data-provider.ts+++ b/packages/planning/src/scheduling/master-data-provider.ts@@ -2,15 +2,21 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import type { Database } from "@carbon/database";+import {+ type Database,+ getLocationTimeZone as readLocationTimeZone+} from "@carbon/database";import type { DB } from "@carbon/database/client";import {getJobMethodTree,+ getJobMethodTreeArrayToTree,+ type JobMethod,type JobMethodTreeItem} from "@carbon/database/methods";+import { groupBy } from "@carbon/utils";import { parseDate } from "@internationalized/date";import type { SupabaseClient } from "@supabase/supabase-js";-import type { Kysely } from "kysely";+import { type Kysely, type Selectable, sql } from "kysely";import { type CalendarWindow, subtractIntervals } from "./calendar-utils.ts";import {businessDayFromMs,@@ -83,6 +89,7 @@ export type CrossJobOperation = {jobPriority: number | null;workCenterId: string | null;createdAt: Date | string | null;+ projectedCompletionAt: Date | string | null;setupTime: number | null;setupUnit: Database["public"]["Enums"]["factor"] | null;laborTime: number | null;@@ -164,6 +171,12 @@ export interface MasterDataProvider {getJobMethodTree(methodId: string): Promise<{ data: JobMethodTreeItem[] | null; error: unknown }>;+ /** Manufacturing lead time (raw, in days) of the item each make method builds. */+ getMakeMethodLeadTimes(+ makeMethodIds: string[]+ ): Promise<Map<string, unknown>>;+ /** The location's timezone, falling back to the company's. */+ getLocationTimeZone(locationId: string): Promise<string>;getProcessesWithWorkCenters(): Promise<ProcessWorkCenters[]>;getActiveWorkCenters(locationId: string): Promise<ActiveWorkCenter[]>;getCrossJobOperationsAtWorkCenters(@@ -218,6 +231,44 @@ export interface MasterDataProvider {): Promise<PeopleAbsenceRow[]>;}+function toJob<+ T extends {+ dueDate: unknown;+ timezone: string | null;+ projectedCompletionAt: unknown;+ }+>(job: T) {+ // pg returns DATE columns as JS Date objects; every consumer compares+ // dueDate lexicographically as "YYYY-MM-DD" (a Date silently fails those+ // comparisons — string > Date is always false)+ return {+ ...job,+ dueDate: toIsoDate(job.dueDate),+ timezone: job.timezone ?? "UTC",+ projectedCompletionAt:+ job.projectedCompletionAt == null+ ? null+ : toInstantIso(job.projectedCompletionAt as unknown as Date | string)+ };+}++type Row<T extends keyof DB> = Selectable<DB[T]>;++type JobPreload = {+ jobIds: Set<string>;+ jobs: Map<string, Job>;+ operations: Record<string, Row<"jobOperation">[]>;+ dependencies: Record<string, Row<"jobOperationDependency">[]>;+ unlinked: Record<string, { id: string; jobMakeMethodId: string }[]>;+ materials: Row<"jobMaterialWithMakeMethodId">[];+ jobIdByMakeMethodId: Map<string, string>;+ rootByJobId: Map<string, { id: string; itemId: string | null }>;+ treeByRootId: Record<string, JobMethod[]>;+ leadTimeByMakeMethodId: Map<string, unknown>;+ operationIds: Set<string>;+ operationsWithEvents: Set<string>;+};+/*** Live implementation backed by Kysely (and the Supabase client for the* job-method-tree RPC). Queries are moved verbatim from the engine,@@ -232,12 +283,13 @@ export class KyselyMasterDataProvider implements MasterDataProvider {* Batch mode: when several jobs are scheduled in one invocation, the* company's STATIC master data (processes, work centers, qualifications,* shift windows, dispatch policies) is identical for every job — cache it- * on first read instead of re-querying per job. Job-scoped reads- * (operations, dependencies) and live reservations are NEVER cached:- * reservations must stay DB-fresh so each job in the batch sees the- * previous jobs' just-persisted placements.+ * on first read instead of re-querying per job. Live reservations are+ * NEVER cached: they must stay DB-fresh so each job in the batch sees the+ * previous jobs' just-persisted placements. Job-scoped rows (operations,+ * dependencies, method trees) are read once for the batch by `preloadJobs`.*/private companyCache: Map<string, Promise<unknown>> | null = null;+ private preload: JobPreload | null = null;constructor(db: Kysely<DB>,@@ -263,8 +315,105 @@ export class KyselyMasterDataProvider implements MasterDataProvider {return hit as Promise<T>;}- async getJob(jobId: string): Promise<Job | undefined> {- const job = await this.db+ /**+ * Read every job-scoped row the engine needs for these jobs in one query per+ * table, so a location run does not repeat ~15 reads per job. Call it after+ * anything that writes those rows for the batch (the batch pre-pass). Each+ * job's rows are served to that job's own engine, which reads them before it+ * writes any of them; reads that follow a write stay live.+ */+ async preloadJobs(jobIds: string[]): Promise<void> {+ if (jobIds.length === 0) return;+ const [jobs, operations, dependencies, makeMethods, unlinked, materials] =+ await Promise.all([+ this.jobQuery().where("job.id", "in", jobIds).execute(),+ this.db+ .selectFrom("jobOperation")+ .selectAll()+ .where("jobId", "in", jobIds)+ .where("companyId", "=", this.companyId)+ .orderBy("order")+ .execute(),+ this.db+ .selectFrom("jobOperationDependency")+ .selectAll()+ .where("jobId", "in", jobIds)+ .where("companyId", "=", this.companyId)+ .execute(),+ this.db+ .selectFrom("jobMakeMethod")+ .select(["id", "itemId", "jobId", "parentMaterialId"])+ .where("jobId", "in", jobIds)+ .where("companyId", "=", this.companyId)+ .execute(),+ this.db+ .selectFrom("jobMaterial")+ .select(["id", "jobMakeMethodId", "jobId"])+ .where("jobId", "in", jobIds)+ .where("companyId", "=", this.companyId)+ .where("jobOperationId", "is", null)+ .execute(),+ this.db+ .selectFrom("jobMaterialWithMakeMethodId")+ .selectAll()+ .where("jobId", "in", jobIds)+ .where("companyId", "=", this.companyId)+ .execute()+ ]);++ const roots = makeMethods.filter((m) => m.parentMaterialId === null);+ const rootIds = roots.map((m) => m.id);+ const itemIds = [+ ...new Set(+ makeMethods.map((m) => m.itemId).filter((id): id is string => !!id)+ )+ ];+ const operationIds = operations.map((o) => o.id);++ const [trees, replenishments, withEvents] = await Promise.all([+ rootIds.length === 0+ ? { rows: [] as (JobMethod & { rootMethodId: string })[] }+ : sql<JobMethod & { rootMethodId: string }>`+ SELECT r.id AS "rootMethodId", t.*+ FROM unnest(${rootIds}::text[]) AS r(id),+ LATERAL get_job_methods_by_method_id(r.id) WITH ORDINALITY AS t+ ORDER BY r.id, t.ordinality+ `.execute(this.db),+ itemIds.length === 0+ ? ([] as { itemId: string; leadTime: number }[])+ : this.db+ .selectFrom("itemReplenishment")+ .select(["itemId", "leadTime"])+ .where("itemId", "in", itemIds)+ .where("companyId", "=", this.companyId)+ .execute(),+ this.readOperationsWithEvents(operationIds)+ ]);++ const leadTimeByItemId = new Map<string, unknown>(+ replenishments.map((r) => [r.itemId, r.leadTime])+ );+ const preload: JobPreload = {+ jobs: new Map(jobs.map((j) => [j.id as string, toJob(j)])),+ operations: groupBy(operations, (o) => o.jobId as string),+ dependencies: groupBy(dependencies, (d) => d.jobId),+ unlinked: groupBy(unlinked, (m) => m.jobId),+ materials,+ jobIdByMakeMethodId: new Map(makeMethods.map((m) => [m.id, m.jobId])),+ rootByJobId: new Map(roots.map((m) => [m.jobId, m])),+ treeByRootId: groupBy(trees.rows, (t) => t.rootMethodId),+ leadTimeByMakeMethodId: new Map(+ makeMethods.map((m) => [m.id, leadTimeByItemId.get(m.itemId ?? "")])+ ),+ operationIds: new Set(operationIds),+ operationsWithEvents: withEvents,+ jobIds: new Set(jobIds)+ };+ this.preload = preload;+ }++ private jobQuery() {+ return this.db.selectFrom("job").leftJoin("location", "location.id", "job.locationId").select([@@ -279,28 +428,29 @@ export class KyselyMasterDataProvider implements MasterDataProvider {"job.projectedCompletionAt","location.timezone"])+ .where("job.companyId", "=", this.companyId);+ }++ async getJob(jobId: string): Promise<Job | undefined> {+ if (this.preload?.jobIds.has(jobId)) return this.preload.jobs.get(jobId);+ const job = await this.jobQuery().where("job.id", "=", jobId)- .where("job.companyId", "=", this.companyId).executeTakeFirst();- if (!job) return undefined;- // pg returns DATE columns as JS Date objects; every consumer compares- // dueDate lexicographically as "YYYY-MM-DD" (a Date silently fails those- // comparisons — string > Date is always false)- return {- ...job,- dueDate: toIsoDate(job.dueDate),- timezone: job.timezone ?? "UTC",- projectedCompletionAt:- job.projectedCompletionAt == null- ? null- : toInstantIso(job.projectedCompletionAt as unknown as Date | string)- };+ return job && toJob(job);}async getOperations(jobId: string,opts?: { includeDone?: boolean }): Promise<BaseOperation[]> {+ if (this.preload?.jobIds.has(jobId)) {+ const all = this.preload.operations[jobId] ?? [];+ return (+ opts?.includeDone+ ? all+ : all.filter((o) => o.status !== "Done" && o.status !== "Canceled")+ ).map((o) => ({ ...o })) as BaseOperation[];+ }let query = this.db.selectFrom("jobOperation").selectAll()@@ -314,11 +464,13 @@ export class KyselyMasterDataProvider implements MasterDataProvider {}async getDependencies(jobId: string): Promise<JobOperationDependency[]> {- const deps = await this.db- .selectFrom("jobOperationDependency")- .selectAll()- .where("jobId", "=", jobId)- .execute();+ const deps = this.preload?.jobIds.has(jobId)+ ? (this.preload.dependencies[jobId] ?? [])+ : await this.db+ .selectFrom("jobOperationDependency")+ .selectAll()+ .where("jobId", "=", jobId)+ .execute();return deps.map((d) => ({operationId: d.operationId,@@ -361,6 +513,13 @@ export class KyselyMasterDataProvider implements MasterDataProvider {return [];}+ if (this.materialsAreLinked(makeMethodIds)) {+ const ids = new Set(makeMethodIds);+ return this.preload!.materials.filter(+ (m) => m.jobMakeMethodId && ids.has(m.jobMakeMethodId)+ );+ }+return await this.db.selectFrom("jobMaterialWithMakeMethodId").selectAll()@@ -375,6 +534,8 @@ export class KyselyMasterDataProvider implements MasterDataProvider {return [];}+ if (this.materialsAreLinked(makeMethodIds)) return [];+return await this.db.selectFrom("jobMaterial").select(["id", "jobMakeMethodId"])@@ -384,7 +545,27 @@ export class KyselyMasterDataProvider implements MasterDataProvider {.execute();}+ /**+ * True when these make methods belong to preloaded jobs that had every+ * material on an operation. A run only ever links unlinked materials, so+ * for such a job the preloaded material rows are still what is stored.+ */+ private materialsAreLinked(makeMethodIds: string[]): boolean {+ const preload = this.preload;+ if (!preload) return false;+ return makeMethodIds.every((id) => {+ const jobId = preload.jobIdByMakeMethodId.get(id);+ return jobId !== undefined && !preload.unlinked[jobId]?.length;+ });+ }+async getUnlinkedMaterials(jobId: string): Promise<UnlinkedMaterial[]> {+ if (this.preload?.jobIds.has(jobId)) {+ return (this.preload.unlinked[jobId] ?? []).map((m) => ({+ id: m.id,+ jobMakeMethodId: m.jobMakeMethodId+ }));+ }return await this.db.selectFrom("jobMaterial").select(["id", "jobMakeMethodId"])@@ -394,6 +575,10 @@ export class KyselyMasterDataProvider implements MasterDataProvider {}async getRootMakeMethod(jobId: string): Promise<RootMakeMethod | undefined> {+ if (this.preload?.jobIds.has(jobId)) {+ const root = this.preload.rootByJobId.get(jobId);+ return root && { id: root.id, itemId: root.itemId };+ }return await this.db.selectFrom("jobMakeMethod").select(["id", "itemId"])@@ -405,7 +590,47 @@ export class KyselyMasterDataProvider implements MasterDataProvider {async getJobMethodTree(methodId: string): Promise<{ data: JobMethodTreeItem[] | null; error: unknown }> {- return await getJobMethodTree(this.client, methodId);+ const rows = this.preload?.treeByRootId[methodId];+ if (rows) return { data: getJobMethodTreeArrayToTree(rows), error: null };+ return await getJobMethodTree(this.db, methodId);+ }++ async getMakeMethodLeadTimes(+ makeMethodIds: string[]+ ): Promise<Map<string, unknown>> {+ const preloaded = this.preload?.leadTimeByMakeMethodId;+ if (preloaded && makeMethodIds.every((id) => preloaded.has(id))) {+ return preloaded;+ }+ if (makeMethodIds.length === 0) return new Map();+ const makeMethods = await this.db+ .selectFrom("jobMakeMethod")+ .select(["id", "itemId"])+ .where("id", "in", makeMethodIds)+ .execute();+ const itemIds = [+ ...new Set(+ makeMethods.map((m) => m.itemId).filter((id): id is string => !!id)+ )+ ];+ if (itemIds.length === 0) return new Map();+ const replenishments = await this.db+ .selectFrom("itemReplenishment")+ .select(["itemId", "leadTime"])+ .where("itemId", "in", itemIds)+ .execute();+ const leadTimeByItemId = new Map<string, unknown>(+ replenishments.map((r) => [r.itemId, r.leadTime])+ );+ return new Map(+ makeMethods.map((m) => [m.id, leadTimeByItemId.get(m.itemId ?? "")])+ );+ }++ getLocationTimeZone(locationId: string): Promise<string> {+ return this.cached(`locationTimeZone:${locationId}`, () =>+ readLocationTimeZone(this.db, locationId, this.companyId)+ );}async getProcessesWithWorkCenters(): Promise<ProcessWorkCenters[]> {@@ -459,6 +684,7 @@ export class KyselyMasterDataProvider implements MasterDataProvider {"j.priority as jobPriority","jo.workCenterId","jo.createdAt",+ "jo.projectedCompletionAt","jo.setupTime","jo.setupUnit","jo.laborTime",@@ -539,6 +765,18 @@ export class KyselyMasterDataProvider implements MasterDataProvider {}async getOperationsWithEvents(operationIds: string[]): Promise<Set<string>> {+ const preload = this.preload;+ if (preload && operationIds.every((id) => preload.operationIds.has(id))) {+ return new Set(+ operationIds.filter((id) => preload.operationsWithEvents.has(id))+ );+ }+ return this.readOperationsWithEvents(operationIds);+ }++ private async readOperationsWithEvents(+ operationIds: string[]+ ): Promise<Set<string>> {const result = new Set<string>();if (operationIds.length === 0) {return result;@@ -770,10 +1008,40 @@ export class KyselyMasterDataProvider implements MasterDataProvider {if (workCenterIds.length === 0) {return new Map();}- return this.cached(- `workCenterAvailability:${[...workCenterIds].sort().join(",")}:${rangeStart}:${rangeEnd}`,- () => this.loadWorkCenterAvailability(workCenterIds, rangeStart, rangeEnd)- );+ const cache = this.companyCache;+ if (!cache) {+ return this.loadWorkCenterAvailability(+ workCenterIds,+ rangeStart,+ rangeEnd+ );+ }+ // Cached per work center: jobs in a batch ask for overlapping sets, and a+ // work center's windows do not depend on which others were asked for.+ const key = (id: string) =>+ `workCenterAvailability:${id}:${rangeStart}:${rangeEnd}`;+ const missing = workCenterIds.filter((id) => !cache.has(key(id)));+ if (missing.length > 0) {+ const loaded = this.loadWorkCenterAvailability(+ missing,+ rangeStart,+ rangeEnd+ );+ for (const id of missing) {+ cache.set(+ key(id),+ loaded.then((windows) => windows.get(id))+ );+ }+ }+ const result = new Map<string, CalendarWindow[]>();+ for (const id of workCenterIds) {+ const windows = (await cache.get(key(id))) as+ | CalendarWindow[]+ | undefined;+ if (windows) result.set(id, windows);+ }+ return result;}private async loadWorkCenterAvailability(diff --git a/packages/planning/src/scheduling/priority-calculator.test.ts b/packages/planning/src/scheduling/priority-calculator.test.tsnew file mode 100644index 0000000000..68eea574bb--- /dev/null+++ b/packages/planning/src/scheduling/priority-calculator.test.ts@@ -0,0 +1,37 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import { describe, expect, it } from "vitest";+import { sortOperationsByPriority } from "./priority-calculator.ts";+import type { OperationWithJobInfo } from "./types.ts";++const op = (+ id: string,+ projectedCompletionAt: string | null+): OperationWithJobInfo => ({+ id,+ dueDate: null,+ startDate: "2026-10-06",+ priority: null,+ deadlineType: "No Deadline",+ jobPriority: 1,+ workCenterId: "wc1",+ projectedCompletionAt+});++describe("sortOperationsByPriority", () => {+ it("orders same-day ties by planned finish, then id, whatever order they arrive in", () => {+ const ops = [+ op("c", null),+ op("b", "2026-10-06T15:00:00Z"),+ op("d", "2026-10-06T10:00:00Z"),+ op("a", "2026-10-06T15:00:00Z")+ ];+ const expected = ["d", "a", "b", "c"];+ expect(sortOperationsByPriority(ops).map((o) => o.id)).toEqual(expected);+ expect(+ sortOperationsByPriority([...ops].reverse()).map((o) => o.id)+ ).toEqual(expected);+ });+});diff --git a/packages/planning/src/scheduling/priority-calculator.ts b/packages/planning/src/scheduling/priority-calculator.tsindex a34029e9e8..adaac47c4e 100644--- a/packages/planning/src/scheduling/priority-calculator.ts+++ b/packages/planning/src/scheduling/priority-calculator.ts@@ -3,7 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { parseDate } from "@internationalized/date";-import { toInstantIso, toIsoDate } from "./date-utils.ts";+import { toInstantIso, toInstantMs, toIsoDate } from "./date-utils.ts";import type {DeadlineType,OperationWithJobInfo,@@ -35,7 +35,9 @@ function getDeadlinePriority(* next — so the placed start date is the primary key:* 1. Placed start date (earliest first, nulls last) — Primary* 2. Job Priority (lower number = higher priority) - Secondary- * 3. Deadline Type (ASAP > Hard > Soft > No Deadline) - Tie-breaker+ * 3. Deadline Type (ASAP > Hard > Soft > No Deadline)+ * 4. Planned finish (earliest first, nulls last)+ * 5. Operation id — the order is total, so it is the same on every run*/export function sortOperationsByPriority<T extends OperationWithJobInfo>(operations: T[]@@ -65,7 +67,21 @@ export function sortOperationsByPriority<T extends OperationWithJobInfo>(// 3. Deadline type (ASAP > Hard > Soft > No Deadline)const aDeadline = getDeadlinePriority(a.deadlineType);const bDeadline = getDeadlinePriority(b.deadlineType);- return aDeadline - bDeadline;+ if (aDeadline !== bDeadline) return aDeadline - bDeadline;++ // 4. Planned finish (earliest first, nulls last). The start date is only+ // a day, so operations placed on the same day queue in the order they are+ // planned to finish.+ const aFinish = a.projectedCompletionAt+ ? toInstantMs(a.projectedCompletionAt)+ : Number.POSITIVE_INFINITY;+ const bFinish = b.projectedCompletionAt+ ? toInstantMs(b.projectedCompletionAt)+ : Number.POSITIVE_INFINITY;+ if (aFinish !== bFinish) return aFinish < bFinish ? -1 : 1;++ // 5. Id, so the order never depends on the order rows were read in.+ return a.id < b.id ? -1 : a.id > b.id ? 1 : 0;});}@@ -165,7 +181,8 @@ export function toOperationWithJobInfo(jobPriority,workCenterId: operation.workCenterId ?? null,durationHours: operation.durationHours ?? null,- createdAt: operation.createdAt ? toInstantIso(operation.createdAt) : null+ createdAt: operation.createdAt ? toInstantIso(operation.createdAt) : null,+ projectedCompletionAt: operation.projectedCompletionAt ?? null};}diff --git a/packages/planning/src/scheduling/run-schedule.ts b/packages/planning/src/scheduling/run-schedule.tsindex 337992ce5a..dcb1682285 100644--- a/packages/planning/src/scheduling/run-schedule.ts+++ b/packages/planning/src/scheduling/run-schedule.ts@@ -179,6 +179,9 @@ export async function runLocationSchedule(});}+ // After the pre-pass, which writes member operations.+ await provider.preloadJobs(batch);+let conflictsDetected = 0;const failedJobIds: string[] = [];const newlyLate: NewlyLateJob[] = [];diff --git a/packages/planning/src/scheduling/scheduling-engine.ts b/packages/planning/src/scheduling/scheduling-engine.tsindex cd9ea071cb..3e6035b40e 100644--- a/packages/planning/src/scheduling/scheduling-engine.ts+++ b/packages/planning/src/scheduling/scheduling-engine.ts@@ -2,11 +2,7 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import {- type Database,- getCompanyTimeZone,- getLocationTimeZone-} from "@carbon/database";+import { type Database, getCompanyTimeZone } from "@carbon/database";import type { DB } from "@carbon/database/client";import { getLogger } from "@carbon/logger";import { datetime } from "@carbon/utils";@@ -52,6 +48,7 @@ import {toOperationWithJobInfo} from "./priority-calculator.ts";import type {+ AssemblyNode,BaseOperation,Job,JobOperationDependency,@@ -86,6 +83,64 @@ export function isDistinctFromAny(values: Record<string, unknown>) {return sql<boolean>`(${sql.join(comparisons, sql` or `)})`;}+const PLACEMENT_CASTS = {+ startDate: "date",+ projectedCompletionAt: "timestamptz",+ dueDate: "date",+ priority: "float8",+ workCenterId: "text",+ hasConflict: "boolean",+ conflictReason: "text"+} as const;++type PlacementColumn = keyof typeof PLACEMENT_CASTS;+type PlacementWrite = Partial<Record<PlacementColumn, unknown>>;++const PLACEMENT_COLUMNS = Object.keys(PLACEMENT_CASTS) as PlacementColumn[];++/**+ * Write the placements of operations that all set the same columns, in one+ * statement. Every UPDATE is queued for the audit/search handlers, so a row+ * whose placement is unchanged is not written at all.+ */+async function updatePlacements(+ trx: Kysely<DB>,+ rows: { id: string; placement: PlacementWrite }[],+ userId: string+) {+ const columns = PLACEMENT_COLUMNS.filter(+ (column) => rows[0]!.placement[column] !== undefined+ );+ const value = (column: PlacementColumn) =>+ sql`v.${sql.ref(column)}::${sql.raw(PLACEMENT_CASTS[column])}`;++ await sql`+ update "jobOperation" as o+ set ${sql.join([+ ...columns.map((c) => sql`${sql.ref(c)} = ${value(c)}`),+ sql`"updatedAt" = ${datetime.timestamp()}`,+ sql`"updatedBy" = ${userId}`+ ])}+ from (values ${sql.join(+ rows.map(+ (row) =>+ sql`(${sql.join([row.id, ...columns.map((c) => row.placement[c])])})`+ )+ )}) as v(${sql.join(["id", ...columns].map((c) => sql.ref(c)))})+ where o."id" = v."id"+ and ${+ columns.length === 0+ ? sql`true`+ : sql`(${sql.join(+ columns.map(+ (c) => sql`o.${sql.ref(c)} is distinct from ${value(c)}`+ ),+ sql` or `+ )})`+ }+ `.execute(trx);+}+/*** Unified Scheduling Engine* Orchestrates all scheduling operations for both initial scheduling and rescheduling@@ -107,6 +162,8 @@ export class SchedulingEngine {private timezone: string = "UTC";private assemblyHandler: AssemblyHandler;+ private assemblyTree: Promise<AssemblyNode | null> | null = null;+ private allOperations: Promise<BaseOperation[]> | null = null;private workCenterSelector: WorkCenterSelector | null = null;private materialManager: MaterialManager;private reservationsWritten = 0;@@ -212,7 +269,7 @@ export class SchedulingEngine {// "Today" (conflict detection, fallback anchor) follows the job site's// wall clock — scheduling is operational, not ledger-scoped.this.timezone = job.locationId- ? await getLocationTimeZone(this.db, job.locationId, this.companyId)+ ? await this.provider.getLocationTimeZone(job.locationId): await getCompanyTimeZone(this.db, this.companyId);// Initialize work center selector with location@@ -259,14 +316,29 @@ export class SchedulingEngine {}// Build assembly tree and get depth- const assemblyTree = await this.assemblyHandler.buildAssemblyTree(- this.jobId- );+ const assemblyTree = await this.loadAssemblyTree();if (assemblyTree) {this.assemblyDepth = this.assemblyHandler.getAssemblyDepth(assemblyTree);}}+ /**+ * The job's assembly tree and its full operation list are read once per+ * run: nothing in a run changes the method structure or which operations+ * exist, and each read was a round trip per phase per job.+ */+ private loadAssemblyTree(): Promise<AssemblyNode | null> {+ this.assemblyTree ??= this.assemblyHandler.buildAssemblyTree(this.jobId);+ return this.assemblyTree;+ }++ private loadAllOperations(): Promise<BaseOperation[]> {+ this.allOperations ??= this.provider.getOperations(this.jobId, {+ includeDone: true+ });+ return this.allOperations;+ }+/*** Populate `assemblyLeadTime` on each loaded operation from the manufacturing* lead time (itemReplenishment.leadTime) of the item its make method builds.@@ -283,43 +355,17 @@ export class SchedulingEngine {];if (makeMethodIds.length === 0) return;- const makeMethods = await this.db- .selectFrom("jobMakeMethod")- .select(["id", "itemId"])- .where("id", "in", makeMethodIds)- .execute();-- const itemIds = [- ...new Set(- makeMethods- .map((m) => m.itemId)- .filter((id): id is string => Boolean(id))- )- ];- if (itemIds.length === 0) return;-- const replenishments = await this.db- .selectFrom("itemReplenishment")- .select(["itemId", "leadTime"])- .where("itemId", "in", itemIds)- .execute();+ const leadTimes = await this.provider.getMakeMethodLeadTimes(makeMethodIds);// NUMERIC columns can come back from pg as strings — coerce to a number.const toLeadTimeDays = (value: unknown): number => {const n = Number(value ?? 0);return Number.isFinite(n) && n > 0 ? n : 0;};- const leadTimeByItemId = new Map(- replenishments.map((r) => [r.itemId, toLeadTimeDays(r.leadTime)])- );- const leadTimeByMakeMethodId = new Map(- makeMethods.map((m) => [m.id, leadTimeByItemId.get(m.itemId ?? "") ?? 0])- );for (const op of this.operations) {if (op.jobMakeMethodId) {- op.assemblyLeadTime =- leadTimeByMakeMethodId.get(op.jobMakeMethodId) ?? 0;+ op.assemblyLeadTime = toLeadTimeDays(leadTimes.get(op.jobMakeMethodId));}}}@@ -330,14 +376,10 @@ export class SchedulingEngine {*/async createDependencies(): Promise<void> {// Load all operations for dependency building (not just active ones)- const allOperations = await this.provider.getOperations(this.jobId, {- includeDone: true- });+ const allOperations = await this.loadAllOperations();// Build assembly tree- const assemblyTree = await this.assemblyHandler.buildAssemblyTree(- this.jobId- );+ const assemblyTree = await this.loadAssemblyTree();if (!assemblyTree) {log.warning("No assembly tree found for job", { jobId: this.jobId });return;@@ -476,7 +518,9 @@ export class SchedulingEngine {.execute();}});+ }+ if (this.persist) {// Unblock dependency-free operations to Ready (outside the rebuild txn so// the advisory lock is held only for the delete/insert). Two guards keep// this from RE-OPENING work that is already finished or in flight:@@ -497,21 +541,36 @@ export class SchedulingEngine {this.job.status);if (jobIsOpen) {- for (const [opId, deps] of allDependencies) {- if (deps.size === 0) {- await this.db- .updateTable("jobOperation")- .set({ status: "Ready" })- .where("id", "=", opId)- .where("status", "not in", [- "Ready",- "Done",- "Canceled",- "In Progress",- "Paused"- ])- .execute();- }+ const resettable = new Set(+ allOperations+ .filter(+ (op) =>+ ![+ "Ready",+ "Done",+ "Canceled",+ "In Progress",+ "Paused"+ ].includes(op.status ?? "")+ )+ .map((op) => op.id)+ );+ const unblocked = [...allDependencies]+ .filter(([opId, deps]) => deps.size === 0 && resettable.has(opId))+ .map(([opId]) => opId);+ if (unblocked.length > 0) {+ await this.db+ .updateTable("jobOperation")+ .set({ status: "Ready" })+ .where("id", "in", unblocked)+ .where("status", "not in", [+ "Ready",+ "Done",+ "Canceled",+ "In Progress",+ "Paused"+ ])+ .execute();}}}@@ -766,7 +825,8 @@ export class SchedulingEngine {jobPriority: wcOp.jobPriority ?? 99,workCenterId: scheduled.workCenterId ?? null,durationHours: scheduled.durationHours ?? null,- createdAt: toIsoOrNull(wcOp.createdAt)+ createdAt: toIsoOrNull(wcOp.createdAt),+ projectedCompletionAt: scheduled.projectedCompletionAt ?? null};}// Operation from another job - use DB data@@ -789,7 +849,8 @@ export class SchedulingEngine {machineUnit: wcOp.machineUnit ?? undefined,operationQuantity: wcOp.operationQuantity}),- createdAt: toIsoOrNull(wcOp.createdAt)+ createdAt: toIsoOrNull(wcOp.createdAt),+ projectedCompletionAt: toIsoOrNull(wcOp.projectedCompletionAt)};});@@ -807,7 +868,8 @@ export class SchedulingEngine {jobPriority: this.job?.priority ?? 99,workCenterId: op.workCenterId,durationHours: op.durationHours ?? null,- createdAt: toIsoOrNull(op.createdAt)+ createdAt: toIsoOrNull(op.createdAt),+ projectedCompletionAt: op.projectedCompletionAt ?? null});}}@@ -827,14 +889,10 @@ export class SchedulingEngine {*/async assignMaterials(): Promise<void> {// Load all operations (including Done) to find first ops correctly- const allOperations = await this.provider.getOperations(this.jobId, {- includeDone: true- });+ const allOperations = await this.loadAllOperations();// Build assembly tree- const assemblyTree = await this.assemblyHandler.buildAssemblyTree(- this.jobId- );+ const assemblyTree = await this.loadAssemblyTree();if (!assemblyTree) {return;}@@ -844,13 +902,8 @@ export class SchedulingEngine {this.assemblyHandler.getAllJobMakeMethodIds(assemblyTree);// Get materials that need assignment- const materials = await this.db- .selectFrom("jobMaterial")- .select(["id", "jobMakeMethodId"])- .where("jobMakeMethodId", "in", makeMethodIds)- .where("methodType", "=", "Make to Order")- .where("jobOperationId", "is", null)- .execute();+ const materials =+ await this.provider.getUnassignedMakeToOrderMaterials(makeMethodIds);// Group non-rework operations by jobMakeMethodIdconst operationsByMethod = new Map<string, BaseOperation[]>();@@ -864,6 +917,7 @@ export class SchedulingEngine {}// Assign first operation of each method to its materials+ const materialIdsByFirstOp = new Map<string, string[]>();for (const material of materials) {if (!material.jobMakeMethodId) continue;@@ -871,16 +925,21 @@ export class SchedulingEngine {const sortedOps = [...methodOps].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));- const firstOp = sortedOps[0];-- // Dry-run writes nothing (expedite what-if).- if (firstOp?.id && this.persist) {- await this.db- .updateTable("jobMaterial")- .set({ jobOperationId: firstOp.id })- .where("id", "=", material.id)- .execute();- }+ const firstOpId = sortedOps[0]?.id;+ if (!firstOpId || !material.id) continue;+ const ids = materialIdsByFirstOp.get(firstOpId) ?? [];+ ids.push(material.id);+ materialIdsByFirstOp.set(firstOpId, ids);+ }++ // Dry-run writes nothing (expedite what-if).+ if (!this.persist) return;+ for (const [jobOperationId, ids] of materialIdsByFirstOp) {+ await this.db+ .updateTable("jobMaterial")+ .set({ jobOperationId })+ .where("id", "in", ids)+ .execute();}}@@ -917,6 +976,10 @@ export class SchedulingEngine {// re-inserted) would free this job's capacity to other jobs' replans// while its operations already carry the new plan.await this.db.transaction().execute(async (trx) => {+ const placements = new Map<+ string,+ { id: string; placement: PlacementWrite }[]+ >();for (const op of this.scheduledOperations.values()) {const originalOp = this.operations.find((o) => o.id === op.id);const isManuallyScheduled = originalOp?.manuallyScheduled ?? false;@@ -936,7 +999,7 @@ export class SchedulingEngine {const storedDueDate = toIsoDate(originalOp?.dueDate ?? null);const writeDueDate = !isManuallyScheduled && needBy !== storedDueDate;- const placement = {+ const placement: PlacementWrite = {startDate: op.startDate,projectedCompletionAt: op.projectedCompletionAt ?? null,...(writeDueDate ? { dueDate: needBy } : {}),@@ -945,19 +1008,17 @@ export class SchedulingEngine {hasConflict: op.hasConflict,conflictReason: op.conflictReason};+ // Rows that write the same columns go in one statement.+ const shape = PLACEMENT_COLUMNS.filter(+ (column) => placement[column] !== undefined+ ).join();+ const group = placements.get(shape);+ if (group) group.push({ id: op.id, placement });+ else placements.set(shape, [{ id: op.id, placement }]);+ }- // Every UPDATE is queued for the audit/search handlers, so an op whose- // placement is unchanged must not be written at all.- await trx- .updateTable("jobOperation")- .set({- ...placement,- updatedAt: datetime.timestamp(),- updatedBy: this.userId- })- .where("id", "=", op.id)- .where(isDistinctFromAny(placement))- .execute();+ for (const rows of placements.values()) {+ await updatePlacements(trx, rows, this.userId);}// Rebuild this job's live capacity reservations from this run'sdiff --git a/packages/planning/src/scheduling/types.ts b/packages/planning/src/scheduling/types.tsindex bb1d9c48c2..1f3d52d2eb 100644--- a/packages/planning/src/scheduling/types.ts+++ b/packages/planning/src/scheduling/types.ts@@ -268,4 +268,5 @@ export type OperationWithJobInfo = {workCenterId: string | null;durationHours?: number | null;createdAt?: string | null;+ projectedCompletionAt?: string | null;};diff --git a/packages/react/AGENTS.md b/packages/react/AGENTS.mdindex f3742409e0..fbd898452c 100644--- a/packages/react/AGENTS.md+++ b/packages/react/AGENTS.md@@ -40,13 +40,13 @@ import { Button, Card, HStack, VStack, IconButton, cn } from "@carbon/react";- **Shortcuts**: combos are named constants — shared `SHORTCUTS` in `src/shortcuts.ts`, never string literals at call sites. `useShortcutKeys` (one binding) and `useShortcutKeyMap` (entries array, dev-warns on duplicates) both delegate to react-hotkeys-hook — never add a hand-rolled keydown listener; `useShortcutSequence` (`g`-then-letter) is the lone exception (no library sequence support). `isEditableTarget` (the one editable-target check; `isTextEntryTarget` is its fields-only half, for menu keys); menu items take `shortcut={MENU_ITEM_SHORTCUTS.x}`, live only while their menu is open, `ShortcutHelpOverlay` (the `?` overlay; apps declare entries). Enter vs ⌘Enter and badge visibility are design decisions — see `.claude/rules/conventions-ui.md` § Keyboard shortcuts- **Choice screens**: `ChoiceCardGroup` (card radios, `autoFocus` focuses the selected card) and `RadioGroupButton` (radio styled as a secondary Button) give one tab stop + arrow-key select; Enter stays free for the screen's continue action- **Layout**: `VStack` / `HStack` with numeric `spacing` prop (maps to `space-y-*`/`space-x-*`)-- **Overlays**: `Drawer`, `Modal`, `ModalDrawer` (unified drawer/modal), `BottomSheet`, `Popover`+- **Overlays**: `Drawer`, `Modal`, `ModalDrawer` (unified drawer/modal), `BottomSheet`, `Popover`. A controlled `Modal`/`Drawer` with no `onOpenChange` cannot be dismissed and shows no close button; never pass a handler that does nothing (`no-noop-open-change` check). A route rendered as a modal or drawer closes with `useCloseRoute()` (back when this tab has history, else the parent route), not `navigate(-1)`- **App nav**: `NavRail` is the primary left nav of both the ERP and MES shells (56px icon rail, expands after a 150ms mouse hover or when pinned via `SidebarProvider` (⌘B unless `keyboardShortcut={false}`, as in the ERP), left drawer below md that closes itself on navigation). Optional `header` (use `NavRailBrand` for a logo + name) and `footer` slots; `NavRailGroup` adds a titled section that shows as a divider while collapsed. Entries are `NavRailItem` (a button, or `asChild` for a trigger/link) and `NavRailLink`; `label` is a string and doubles as the accessible name. A Radix menu/popover opened from a `NavRailItem` keeps the rail as it was (open or collapsed) until it closes. Render inside `SidebarProvider`; the shadcn-style `Sidebar*` primitives remain for other layouts- **Links that prefetch**: `PrefetchLink` is a React Router `Link` that prefetches its destination when the pointer goes down on it. Use it instead of `<Link prefetch="intent">`, which prefetches on a 100 ms hover and so runs a page's loaders for every row the mouse passes over. `NavRailLink` and both apps' `Hyperlink` already use it- **Data**: `Table` (TanStack), chart components via sub-exports (`@carbon/react/Chart`)- **Rich text**: `@carbon/react/Editor` and `@carbon/react/RichText` (wraps `@carbon/tiptap`)-- **Error boundary**: `@carbon/react/ErrorBoundary` — `RootErrorBoundary` (drop-in root `ErrorBoundary` for RR v7 that maps 404 / other HTTP / thrown `Error` to a styled screen) plus its parts (`ErrorScreen`, `GlitchHeading`, `StatusReadout`, `MagneticLink`, `NoiseOverlay`). Wrap it in the app's `Document` and pass `env` so `window.env` is set (the client crashes hydration otherwise). Copy is intentionally hardcoded English, not i18n.-- **Polish**: shadows over borders, `tabular-nums` for dynamic numbers, `active:scale-[0.96]` on pressables, `text-balance`/`text-pretty` for text wrapping+- **Error boundary**: `@carbon/react/ErrorBoundary` — `RouteErrorBoundary` (exported as `ErrorBoundary` from a module layout so a failed loader shows inside the app shell) and `RootErrorBoundary` (drop-in root `ErrorBoundary` for RR v7 that maps 404 / other HTTP / thrown `Error` to a styled screen) plus its parts (`ErrorScreen`, `GlitchHeading`, `StatusReadout`, `MagneticLink`, `NoiseOverlay`). Wrap it in the app's `Document` and pass `env` so `window.env` is set (the client crashes hydration otherwise). Copy is intentionally hardcoded English, not i18n.+- **Polish**: shadows over borders, `tabular-nums` for dynamic numbers, `active:scale-[0.98]` on pressables, `text-balance`/`text-pretty` for text wrapping## Cross-Referencesdiff --git a/packages/react/package.json b/packages/react/package.jsonindex 745b51c02e..4955dbf647 100644--- a/packages/react/package.json+++ b/packages/react/package.json@@ -28,10 +28,8 @@"@radix-ui/react-slot": "1.2.4","@radix-ui/react-switch": "1.2.6","@radix-ui/react-tabs": "1.1.13",- "@radix-ui/react-toast": "1.2.15","@radix-ui/react-toggle": "1.1.10","@radix-ui/react-toggle-group": "1.1.11",- "@radix-ui/react-tooltip": "1.2.8","@react-aria/button": "3.14.5","@react-aria/calendar": "3.9.5","@react-aria/datepicker": "3.16.1",@@ -123,7 +121,7 @@"@internationalized/date": "catalog:","@lingui/react": "catalog:","@marsidev/react-turnstile": "catalog:",- "framer-motion": "catalog:",+ "motion": "catalog:","react": "catalog:","react-dom": "catalog:","react-icons": "catalog:",diff --git a/packages/react/src/Button.tsx b/packages/react/src/Button.tsxindex 588c6a84c2..ac3d90faf3 100644--- a/packages/react/src/Button.tsx+++ b/packages/react/src/Button.tsx@@ -23,7 +23,7 @@ export const buttonVariants = cva(// Transition: background/colors use 'ease' (150ms), transform uses 'ease-out' for responsive press feel"transform-gpu transition-[background-color,color,transform,box-shadow] duration-150 ease",// Active state: subtle scale down for tactile press feedback- "active:scale-[0.96] active:duration-75 active:ease-out",+ "active:scale-[0.98] active:duration-75 active:ease-out",// Accessibility: respect reduced motion preferences"motion-reduce:transform-none motion-reduce:transition-[background-color,color,box-shadow] corner-squircle"],diff --git a/packages/react/src/Card.tsx b/packages/react/src/Card.tsxindex 893c28e668..186bbc430a 100644--- a/packages/react/src/Card.tsx+++ b/packages/react/src/Card.tsx@@ -3,7 +3,13 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import type { HTMLAttributes } from "react";-import { createContext, forwardRef, useContext, useState } from "react";+import {+ createContext,+ forwardRef,+ useContext,+ useMemo,+ useState+} from "react";import { LuChevronDown, LuChevronUp } from "react-icons/lu";import { IconButton } from "./IconButton";import { cn } from "./utils/cn";@@ -37,16 +43,24 @@ const Card = forwardRef<HTMLDivElement, CardProps>(const isCollapsed = controlledIsCollapsed ?? uncontrolledIsCollapsed;- const toggle = () => {- if (onCollapsedChange) {- onCollapsedChange(!isCollapsed);- } else {- setUncontrolledIsCollapsed(!isCollapsed);- }- };+ // A stable value: an inline object re-rendered every consumer whenever the+ // card's parent rendered.+ const context = useMemo(+ () => ({+ isCollapsed,+ toggle: () => {+ if (onCollapsedChange) {+ onCollapsedChange(!isCollapsed);+ } else {+ setUncontrolledIsCollapsed(!isCollapsed);+ }+ }+ }),+ [isCollapsed, onCollapsedChange]+ );return (- <CardContext.Provider value={{ isCollapsed, toggle }}>+ <CardContext.Provider value={context}><divref={ref}className={cn(@@ -59,7 +73,7 @@ const Card = forwardRef<HTMLDivElement, CardProps>(<IconButtonaria-label={isCollapsed ? "Expand" : "Collapse"}variant="ghost"- onClick={toggle}+ onClick={context.toggle}className="absolute right-2 top-2"icon={isCollapsed ? (diff --git a/packages/react/src/Command.tsx b/packages/react/src/Command.tsxindex 3b6ee64c8c..7c39601ace 100644--- a/packages/react/src/Command.tsx+++ b/packages/react/src/Command.tsx@@ -16,7 +16,7 @@ import type {import { forwardRef } from "react";import { RxMagnifyingGlass } from "react-icons/rx";-import { Modal, ModalContent } from "./Modal";+import { Modal, ModalContent, ModalTitle } from "./Modal";import { cn } from "./utils/cn";const Command = forwardRef<@@ -34,12 +34,23 @@ const Command = forwardRef<));Command.displayName = CommandPrimitive.displayName;-interface CommandDialogProps extends DialogProps {}+interface CommandDialogProps extends DialogProps {+ /** Announced by screen readers; the palette shows no visible heading. */+ title?: string;+}-const CommandDialog = ({ children, ...props }: CommandDialogProps) => {+const CommandDialog = ({+ children,+ title = "Search",+ ...props+}: CommandDialogProps) => {return (<Modal {...props}>- <ModalContent className="overflow-hidden p-0 [&>button[type=button]]:top-1 [&>button[type=button]]:right-2 [&>button[type=button]]:p-3">+ <ModalContent+ aria-describedby={undefined}+ className="overflow-hidden p-0 [&>button[type=button]]:top-1 [&>button[type=button]]:right-2 [&>button[type=button]]:p-3"+ >+ <ModalTitle className="sr-only">{title}</ModalTitle><Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">{children}</Command>diff --git a/packages/react/src/Drawer.tsx b/packages/react/src/Drawer.tsxindex cb3f0f2d33..9ef529e5e5 100644--- a/packages/react/src/Drawer.tsx+++ b/packages/react/src/Drawer.tsx@@ -16,9 +16,10 @@ import { forwardRef } from "react";import { LuX } from "react-icons/lu";import { ClientOnly } from "./ClientOnly";+import { DialogRoot, useDialogDismissable } from "./Modal";import { cn } from "./utils/cn";-const Drawer = DialogPrimitive.Root;+const Drawer = DialogRoot;const DrawerTrigger = DialogPrimitive.Trigger;@@ -53,7 +54,7 @@ const DrawerOverlay = forwardRef<>(({ className, children, ...props }, ref) => (<DialogPrimitive.OverlayclassName={cn(- "fixed inset-0 z-50 bg-black/10 backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",+ "fixed inset-0 z-50 bg-black/20 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",className)}{...props}@@ -81,10 +82,12 @@ const sheetVariants = cva({variants: {position: {- top: "animate-in slide-in-from-top w-full duration-300",- bottom: "animate-in slide-in-from-bottom w-full duration-300",- left: "animate-in slide-in-from-left h-full duration-300",- right: "animate-in slide-in-from-right h-full duration-300"+ top: "data-[state=open]:animate-in data-[state=open]:slide-in-from-top data-[state=closed]:animate-out data-[state=closed]:slide-out-to-top data-[state=closed]:duration-200 w-full duration-300 ease-out",+ bottom:+ "data-[state=open]:animate-in data-[state=open]:slide-in-from-bottom data-[state=closed]:animate-out data-[state=closed]:slide-out-to-bottom data-[state=closed]:duration-200 w-full duration-300 ease-out",+ left: "data-[state=open]:animate-in data-[state=open]:slide-in-from-left data-[state=closed]:animate-out data-[state=closed]:slide-out-to-left data-[state=closed]:duration-200 h-full duration-300 ease-out",+ right:+ "data-[state=open]:animate-in data-[state=open]:slide-in-from-right data-[state=closed]:animate-out data-[state=closed]:slide-out-to-right data-[state=closed]:duration-200 h-full duration-300 ease-out"},size: {content: "",@@ -186,29 +189,34 @@ const DrawerContent = forwardRef<...props},ref- ) => (- <ClientOnly fallback={null}>- {() => (- <DrawerPortal position={position} container={container}>- {overlay && <DrawerOverlay />}- <DialogPrimitive.Content- ref={ref}- className={cn(sheetVariants({ position, size }), className)}- {...props}- >- {children}- <DialogPrimitive.Close- type="button"- className="absolute right-4 top-3 rounded-full p-2 opacity-70 transition-opacity hover:opacity-100 outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none data-[state=open]:bg-secondary"+ ) => {+ const dismissable = useDialogDismissable();+ return (+ <ClientOnly fallback={null}>+ {() => (+ <DrawerPortal position={position} container={container}>+ {overlay && <DrawerOverlay />}+ <DialogPrimitive.Content+ ref={ref}+ className={cn(sheetVariants({ position, size }), className)}+ {...props}>- <LuX className="h-5 w-5" />- <span className="sr-only">Close</span>- </DialogPrimitive.Close>- </DialogPrimitive.Content>- </DrawerPortal>- )}- </ClientOnly>- )+ {children}+ {dismissable && (+ <DialogPrimitive.Close+ type="button"+ className="absolute right-4 top-3 rounded-full p-2 opacity-70 transition-opacity hover:opacity-100 outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none data-[state=open]:bg-secondary"+ >+ <LuX className="h-5 w-5" />+ <span className="sr-only">Close</span>+ </DialogPrimitive.Close>+ )}+ </DialogPrimitive.Content>+ </DrawerPortal>+ )}+ </ClientOnly>+ );+ });DrawerContent.displayName = DialogPrimitive.Content.displayName;diff --git a/packages/react/src/Dropdown.tsx b/packages/react/src/Dropdown.tsxindex d24a665665..cfcb573308 100644--- a/packages/react/src/Dropdown.tsx+++ b/packages/react/src/Dropdown.tsx@@ -61,7 +61,7 @@ const DropdownMenuSubContent = forwardRef<ref={ref}onKeyDown={withMenuShortcuts(onKeyDown)}className={cn(- "z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 shadow-md dark:shadow-[0px_0px_0px_0.5px_rgba(0,0,0,1),_0px_4px_4px_rgba(0,0,0,0.24)]",+ "z-50 origin-(--radix-dropdown-menu-content-transform-origin) min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 shadow-md dark:shadow-[0px_0px_0px_0.5px_rgba(0,0,0,1),_0px_4px_4px_rgba(0,0,0,0.24)]",className)}{...props}@@ -80,7 +80,7 @@ const DropdownMenuContent = forwardRef<onKeyDown={withMenuShortcuts(onKeyDown)}sideOffset={sideOffset}className={cn(- "z-50 min-w-[8rem] overflow-hidden rounded-md border border-border bg-popover p-1 text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 shadow-md dark:shadow-[0px_0px_0px_0.5px_rgba(0,0,0,1),_0px_4px_4px_rgba(0,0,0,0.24)]",+ "z-50 origin-(--radix-dropdown-menu-content-transform-origin) min-w-[8rem] overflow-hidden rounded-md border border-border bg-popover p-1 text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 shadow-md dark:shadow-[0px_0px_0px_0.5px_rgba(0,0,0,1),_0px_4px_4px_rgba(0,0,0,0.24)]",className)}{...props}diff --git a/packages/react/src/Enumerable.tsx b/packages/react/src/Enumerable.tsxnew file mode 100644index 0000000000..952ff77a55--- /dev/null+++ b/packages/react/src/Enumerable.tsx@@ -0,0 +1,31 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import type { Color } from "@carbon/utils";+import { getColor, getColorByValue } from "@carbon/utils";+import type { BadgeProps } from "./Badge";+import { Badge } from "./Badge";+import { useMode } from "./hooks";++type EnumerableProps = BadgeProps & {+ value: string | null;+ color?: Color;+};++const Enumerable = ({ value, color, ...props }: EnumerableProps) => {+ const mode = useMode();+ if (!value) return null;++ const style = color ? getColor(color, mode) : getColorByValue(value, mode);+ return (+ <Badge+ style={style && { ...style, borderColor: `${style.color}33` }}+ {...props}+ >+ {value}+ </Badge>+ );+};++export { Enumerable };diff --git a/packages/react/src/ErrorBoundary/RouteErrorBoundary.tsx b/packages/react/src/ErrorBoundary/RouteErrorBoundary.tsxnew file mode 100644index 0000000000..05c259692e--- /dev/null+++ b/packages/react/src/ErrorBoundary/RouteErrorBoundary.tsx@@ -0,0 +1,61 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import { useEffect } from "react";+import { isRouteErrorResponse, useNavigate, useRouteError } from "react-router";+import { Button } from "../Button";++/**+ * The boundary for a route that renders inside the app shell:+ *+ * export { RouteErrorBoundary as ErrorBoundary } from "@carbon/react";+ *+ * A boundary replaces the route that exports it, so the root boundary takes the+ * whole page — sidebar and topbar included. Exported from a module layout, a+ * failed loader anywhere beneath it shows here and the shell stays usable.+ */+export function RouteErrorBoundary() {+ const error = useRouteError();+ const navigate = useNavigate();++ // React Router hands a route error to the boundary without logging it.+ useEffect(() => {+ // biome-ignore lint/suspicious/noConsole: surfacing the swallowed error is the point+ console.error("[RouteErrorBoundary]", error);+ }, [error]);++ const notFound = isRouteErrorResponse(error) && error.status === 404;+ const status = isRouteErrorResponse(error) ? error.status : undefined;++ return (+ <div+ role="alert"+ className="flex h-full w-full flex-col items-center justify-center gap-4 p-8 text-center"+ >+ <div className="flex flex-col gap-1">+ <h2 className="text-lg font-medium text-foreground">+ {notFound+ ? "This page could not be found"+ : "This page failed to load"}+ </h2>+ <p className="max-w-md text-sm text-muted-foreground text-balance">+ {notFound+ ? "It may have been moved or deleted, or it belongs to another company."+ : "Something went wrong on our side. Trying again usually fixes it."}+ {status && !notFound ? ` (${status})` : null}+ </p>+ </div>+ <div className="flex gap-2">+ {!notFound && (+ <Button variant="primary" onClick={() => navigate(0)}>+ Try again+ </Button>+ )}+ <Button variant="secondary" onClick={() => navigate(-1)}>+ Go back+ </Button>+ </div>+ </div>+ );+}diff --git a/packages/react/src/ErrorBoundary/index.ts b/packages/react/src/ErrorBoundary/index.tsindex 73cb0a4371..31402dc41a 100644--- a/packages/react/src/ErrorBoundary/index.ts+++ b/packages/react/src/ErrorBoundary/index.ts@@ -11,4 +11,5 @@ export { GlitchHeading } from "./GlitchHeading";export { MagneticLink } from "./MagneticLink";export { NoiseOverlay } from "./NoiseOverlay";export { RootErrorBoundary } from "./RootErrorBoundary";+export { RouteErrorBoundary } from "./RouteErrorBoundary";export { StatusReadout } from "./StatusReadout";diff --git a/packages/react/src/FunnelChart.tsx b/packages/react/src/FunnelChart.tsxindex 2e7fce6605..2b72f71132 100644--- a/packages/react/src/FunnelChart.tsx+++ b/packages/react/src/FunnelChart.tsx@@ -7,7 +7,7 @@ import { ParentSize } from "@visx/responsive";import { scaleLinear } from "@visx/scale";import { Area } from "@visx/shape";import { Text } from "@visx/text";-import { motion } from "framer-motion";+import { motion } from "motion/react";import { Fragment, useMemo, useRef, useState } from "react";import { useIsMobile } from "./hooks";import { cn } from "./utils/cn";diff --git a/packages/react/src/HoverCard.tsx b/packages/react/src/HoverCard.tsxindex 16404dd81a..06859ecc46 100644--- a/packages/react/src/HoverCard.tsx+++ b/packages/react/src/HoverCard.tsx@@ -23,7 +23,7 @@ const HoverCardContent = forwardRef<align={align}sideOffset={sideOffset}className={cn(- "relative z-[100] w-64 rounded-md border border-border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",+ "relative z-[100] origin-(--radix-hover-card-content-transform-origin) w-64 rounded-md border border-border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",className)}{...props}diff --git a/packages/react/src/Modal.tsx b/packages/react/src/Modal.tsxindex 0162002237..119e8fb05c 100644--- a/packages/react/src/Modal.tsx+++ b/packages/react/src/Modal.tsx@@ -13,13 +13,31 @@ import type {HTMLAttributes,KeyboardEvent} from "react";-import { forwardRef } from "react";+import { createContext, forwardRef, useContext } from "react";import { LuX } from "react-icons/lu";import { ClientOnly } from "./ClientOnly";import { cn } from "./utils/cn";-const Modal = DialogPrimitive.Root;+// A dialog held open with no `onOpenChange` cannot be closed by the X, Escape+// or a click outside, so it does not offer the X. Leave `onOpenChange` off to+// say "this cannot be dismissed" rather than passing a handler that does nothing.+const DismissableContext = createContext(true);+export const useDialogDismissable = () => useContext(DismissableContext);++export const DialogRoot = ({+ open,+ onOpenChange,+ ...props+}: DialogPrimitive.DialogProps) => (+ <DismissableContext.Provider+ value={open === undefined || onOpenChange !== undefined}+ >+ <DialogPrimitive.Root open={open} onOpenChange={onOpenChange} {...props} />+ </DismissableContext.Provider>+);++const Modal = DialogRoot;const ModalTrigger = DialogPrimitive.Trigger;@@ -36,7 +54,7 @@ const ModalOverlay = forwardRef<className={cn(// 'z-50 fixed h-full w-full left-0 top-0',// 'bg-alternative/90 backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',- "bg-alternative/90 backdrop-blur-sm",+ "bg-alternative/90","z-50 fixed inset-0 grid place-items-center overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-accent data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=closed]:animate-out data-[state=closed]:fade-out-0",className@@ -90,7 +108,7 @@ const ModalContentVariants = cva("scrollbar-thin scrollbar-track-transparent scrollbar-thumb-accent","data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0","data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95",- "data-[state=closed]:slide-out-to-left-[0%] data-[state=closed]:slide-out-to-top-[0%",+ "data-[state=closed]:slide-out-to-left-[0%] data-[state=closed]:slide-out-to-top-[0%]","data-[state=open]:slide-in-from-left-[0%] data-[state=open]:slide-in-from-top-[0%]","sm:rounded-2xl md:w-full","bg-card focus-visible:outline-none focus-visible:ring-0",@@ -131,36 +149,39 @@ const ModalContent = forwardRef<...props},ref- ) => (- <ClientOnly fallback={null}>- {() => (- <ModalPortal>- <ModalOverlay>- <DialogPrimitive.Content- ref={ref}- className={cn(ModalContentVariants({ size }), className)}- onOpenAutoFocus={(event) => {- onOpenAutoFocus?.(event);- if (!event.defaultPrevented) focusPrimaryAction(event);- }}- {...props}- >- {children}- {withCloseButton && (- <DialogPrimitive.Close- type="button"- className="absolute right-4 top-4 rounded-full opacity-70 transition-opacity hover:opacity-100 outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-foreground-muted p-3 hover:bg-accent/80"- >- <LuX className="h-4 w-4" />- <span className="sr-only">Close</span>- </DialogPrimitive.Close>- )}- </DialogPrimitive.Content>- </ModalOverlay>- </ModalPortal>- )}- </ClientOnly>- )+ ) => {+ const dismissable = useDialogDismissable();+ return (+ <ClientOnly fallback={null}>+ {() => (+ <ModalPortal>+ <ModalOverlay>+ <DialogPrimitive.Content+ ref={ref}+ className={cn(ModalContentVariants({ size }), className)}+ onOpenAutoFocus={(event) => {+ onOpenAutoFocus?.(event);+ if (!event.defaultPrevented) focusPrimaryAction(event);+ }}+ {...props}+ >+ {children}+ {withCloseButton && dismissable && (+ <DialogPrimitive.Close+ type="button"+ className="absolute right-4 top-4 rounded-full opacity-70 transition-opacity hover:opacity-100 outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-foreground-muted p-3 hover:bg-accent/80"+ >+ <LuX className="h-4 w-4" />+ <span className="sr-only">Close</span>+ </DialogPrimitive.Close>+ )}+ </DialogPrimitive.Content>+ </ModalOverlay>+ </ModalPortal>+ )}+ </ClientOnly>+ );+ });ModalContent.displayName = DialogPrimitive.Content.displayName;diff --git a/packages/react/src/Popover.tsx b/packages/react/src/Popover.tsxindex a37737ec62..7576e5b919 100644--- a/packages/react/src/Popover.tsx+++ b/packages/react/src/Popover.tsx@@ -26,7 +26,7 @@ const PopoverContent = forwardRef<align={align}sideOffset={sideOffset}className={cn(- "z-50 rounded-md border border-border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",+ "z-50 origin-(--radix-popover-content-transform-origin) rounded-md border border-border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",className)}{...props}diff --git a/packages/react/src/Select.tsx b/packages/react/src/Select.tsxindex 1a848883a9..0643b27d1f 100644--- a/packages/react/src/Select.tsx+++ b/packages/react/src/Select.tsx@@ -115,7 +115,7 @@ const SelectContent = forwardRef<<SelectPrimitive.Contentref={ref}className={cn(- "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",+ "relative z-50 origin-(--radix-select-content-transform-origin) max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",position === "popper" &&"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",classNamediff --git a/packages/react/src/TextShimmer.tsx b/packages/react/src/TextShimmer.tsxindex 31efea1a6d..291a4e1ded 100644--- a/packages/react/src/TextShimmer.tsx+++ b/packages/react/src/TextShimmer.tsx@@ -3,7 +3,7 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source."use client";-import { motion } from "framer-motion";+import { motion } from "motion/react";import type { JSX } from "react";import { memo, useMemo } from "react";import { cn } from "./utils/cn";diff --git a/packages/react/src/ToggleGroup.tsx b/packages/react/src/ToggleGroup.tsxindex fd2e0d61f4..030fa59fea 100644--- a/packages/react/src/ToggleGroup.tsx+++ b/packages/react/src/ToggleGroup.tsx@@ -8,7 +8,7 @@ import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group";import type { VariantProps } from "class-variance-authority";import type { ComponentPropsWithoutRef, ElementRef } from "react";-import { createContext, forwardRef, useContext } from "react";+import { createContext, forwardRef, useContext, useMemo } from "react";import { toggleVariants } from "./Toggle";import { cn } from "./utils/cn";@@ -21,17 +21,20 @@ const ToggleGroup = forwardRef<ElementRef<typeof ToggleGroupPrimitive.Root>,ComponentPropsWithoutRef<typeof ToggleGroupPrimitive.Root> &VariantProps<typeof toggleVariants>->(({ className, variant, size, children, ...props }, ref) => (- <ToggleGroupPrimitive.Root- ref={ref}- className={cn("flex items-center justify-center gap-1", className)}- {...props}- >- <ToggleGroupContext.Provider value={{ variant, size }}>- {children}- </ToggleGroupContext.Provider>- </ToggleGroupPrimitive.Root>-));+>(({ className, variant, size, children, ...props }, ref) => {+ const context = useMemo(() => ({ variant, size }), [variant, size]);+ return (+ <ToggleGroupPrimitive.Root+ ref={ref}+ className={cn("flex items-center justify-center gap-1", className)}+ {...props}+ >+ <ToggleGroupContext.Provider value={context}>+ {children}+ </ToggleGroupContext.Provider>+ </ToggleGroupPrimitive.Root>+ );+});ToggleGroup.displayName = ToggleGroupPrimitive.Root.displayName;diff --git a/packages/react/src/Tooltip.tsx b/packages/react/src/Tooltip.tsxindex c7f08ffd7f..2a54ab0aa9 100644--- a/packages/react/src/Tooltip.tsx+++ b/packages/react/src/Tooltip.tsx@@ -24,13 +24,18 @@ import { cn } from "./utils/cn";* Provider whose `delay` defaults to 0 to keep the original snappy behavior.*/+const DEFAULT_DELAY = 50;+type ProviderProps = TooltipPrimitive.Provider.Props & {/** Radix-compat alias for Base UI's `delay`. */delayDuration?: number;};const TooltipProvider = ({ delayDuration, delay, ...props }: ProviderProps) => (- <TooltipPrimitive.Provider delay={delay ?? delayDuration ?? 0} {...props} />+ <TooltipPrimitive.Provider+ delay={delay ?? delayDuration ?? DEFAULT_DELAY}+ {...props}+ />);TooltipProvider.displayName = "TooltipProvider";@@ -39,11 +44,16 @@ type RootProps = TooltipPrimitive.Root.Props & {delayDuration?: number;};-const Tooltip = ({ delayDuration = 50, ...props }: RootProps) => (- <TooltipPrimitive.Provider delay={delayDuration}>+// Without its own delay a tooltip joins the surrounding provider, so once one is+// open its neighbours open at once instead of each waiting out the delay again.+const Tooltip = ({ delayDuration, ...props }: RootProps) =>+ delayDuration === undefined ? (<TooltipPrimitive.Root {...props} />- </TooltipPrimitive.Provider>-);+ ) : (+ <TooltipPrimitive.Provider delay={delayDuration}>+ <TooltipPrimitive.Root {...props} />+ </TooltipPrimitive.Provider>+ );Tooltip.displayName = "Tooltip";type TriggerProps = TooltipPrimitive.Trigger.Props & {diff --git a/packages/react/src/hooks/index.ts b/packages/react/src/hooks/index.tsindex a0772344f1..dee118732d 100644--- a/packages/react/src/hooks/index.ts+++ b/packages/react/src/hooks/index.ts@@ -2,11 +2,13 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.+import { useCloseRoute } from "./useCloseRoute";import useDebounce from "./useDebounce";import useDisclosure from "./useDisclosure";import { useEdition } from "./useEdition";import useEscape from "./useEscape";import useHydrated from "./useHydrated";+import { useIdle } from "./useIdle";import useInitialDimensions from "./useInitialDimenions";import { useInterval } from "./useInterval";import useIsMobile from "./useIsMobile";@@ -41,6 +43,8 @@ export {useKeyboardWedge,useLocalStorage,useMode,+ useCloseRoute,+ useIdle,useMount,useNanoStore,useNProgress,diff --git a/packages/react/src/hooks/useCloseRoute.ts b/packages/react/src/hooks/useCloseRoute.tsnew file mode 100644index 0000000000..7fc66d0630--- /dev/null+++ b/packages/react/src/hooks/useCloseRoute.ts@@ -0,0 +1,24 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import { useCallback } from "react";+import { useNavigate } from "react-router";++/**+ * Closes a route that renders as a modal or drawer over its parent.+ *+ * Going back keeps the list's filters and scroll position, so that is used+ * whenever this tab has somewhere to go back to. Opened from a link, a new tab+ * or a refresh there is nothing to pop — `navigate(-1)` leaves the app or does+ * nothing — so it goes to the parent route instead.+ */+export function useCloseRoute() {+ const navigate = useNavigate();+ return useCallback(() => {+ // React Router numbers this tab's history entries from 0.+ const index = (window.history.state as { idx?: number } | null)?.idx ?? 0;+ if (index > 0) navigate(-1);+ else navigate("..");+ }, [navigate]);+}diff --git a/apps/erp/app/hooks/useIdle.tsx b/packages/react/src/hooks/useIdle.tsxsimilarity index 100%rename from apps/erp/app/hooks/useIdle.tsxrename to packages/react/src/hooks/useIdle.tsxdiff --git a/packages/react/src/index.tsx b/packages/react/src/index.tsxindex 1159ff677c..22c05dc611 100644--- a/packages/react/src/index.tsx+++ b/packages/react/src/index.tsx@@ -148,6 +148,7 @@ import {DropdownMenuSubTrigger,DropdownMenuTrigger} from "./Dropdown";+import { Enumerable } from "./Enumerable";import { File } from "./File";import {FormControl,@@ -402,6 +403,7 @@ export {AvatarGroupList,AvatarOverflowIndicator,Badge,+ Enumerable,BadgeCloseButton,Button,Card,diff --git a/packages/tiptap/package.json b/packages/tiptap/package.jsonindex 69850405ba..666ee1b8e1 100644--- a/packages/tiptap/package.json+++ b/packages/tiptap/package.json@@ -26,7 +26,6 @@"cmdk": "0.2.0","cookie": "catalog:","dompurify": "catalog:",- "jotai": "2.19.1","linkifyjs": "4.3.2","nanoid": "catalog:","react-markdown": "9.1.0",@@ -34,7 +33,8 @@"tippy.js": "6.3.7","tiptap-extension-global-drag-handle": "0.1.18","tiptap-markdown": "0.8.10",- "tunnel-rat": "0.1.2"+ "tunnel-rat": "0.1.2",+ "zustand": "catalog:"},"devDependencies": {"@carbon/config": "workspace:*",@@ -56,7 +56,6 @@},"peerDependencies": {"@internationalized/date": "catalog:",- "framer-motion": "catalog:","react": "catalog:","react-icons": "catalog:"},diff --git a/packages/tiptap/src/components/editor-command-item.tsx b/packages/tiptap/src/components/editor-command-item.tsxindex 96e569558b..8be73bb438 100644--- a/packages/tiptap/src/components/editor-command-item.tsx+++ b/packages/tiptap/src/components/editor-command-item.tsx@@ -5,10 +5,9 @@import type { Editor, Range } from "@tiptap/core";import { useCurrentEditor } from "@tiptap/react";import { CommandEmpty, CommandItem } from "cmdk";-import { useAtomValue } from "jotai";import type { ComponentPropsWithoutRef } from "react";import { forwardRef } from "react";-import { rangeAtom } from "../utils/atoms";+import { useCommandStore } from "../utils/store";interface EditorCommandItemProps {readonly onCommand: ({@@ -25,7 +24,7 @@ export const EditorCommandItem = forwardRef<EditorCommandItemProps & ComponentPropsWithoutRef<typeof CommandItem>>(({ children, onCommand, ...rest }, ref) => {const { editor } = useCurrentEditor();- const range = useAtomValue(rangeAtom);+ const range = useCommandStore((state) => state.range);if (!editor || !range) return null;diff --git a/packages/tiptap/src/components/editor-command.tsx b/packages/tiptap/src/components/editor-command.tsxindex d4ea8d1128..90ca7b9bcb 100644--- a/packages/tiptap/src/components/editor-command.tsx+++ b/packages/tiptap/src/components/editor-command.tsx@@ -4,12 +4,14 @@import type { Range } from "@tiptap/core";import { Command } from "cmdk";-import { useAtom, useSetAtom } from "jotai";import type { ComponentPropsWithoutRef, FC } from "react";import { createContext, forwardRef, useEffect } from "react";import type tunnel from "tunnel-rat";-import { queryAtom, rangeAtom } from "../utils/atoms";-import { novelStore } from "../utils/store";+import {+ setCommandQuery,+ setCommandRange,+ useCommandStore+} from "../utils/store";export const EditorCommandTunnelContext = createContext({} as ReturnType<typeof tunnel>@@ -24,8 +26,8 @@ export const EditorCommandOut: FC<EditorCommandOutProps> = ({query,range}) => {- const setQuery = useSetAtom(queryAtom, { store: novelStore });- const setRange = useSetAtom(rangeAtom, { store: novelStore });+ const setQuery = setCommandQuery;+ const setRange = setCommandRange;useEffect(() => {setQuery(query);@@ -71,7 +73,8 @@ export const EditorCommand = forwardRef<HTMLDivElement,ComponentPropsWithoutRef<typeof Command>>(({ children, className, ...rest }, ref) => {- const [query, setQuery] = useAtom(queryAtom);+ const query = useCommandStore((state) => state.query);+ const setQuery = setCommandQuery;return (<EditorCommandTunnelContext.Consumer>diff --git a/packages/tiptap/src/components/editor.tsx b/packages/tiptap/src/components/editor.tsxindex fe2b837988..2a56ec5d68 100644--- a/packages/tiptap/src/components/editor.tsx+++ b/packages/tiptap/src/components/editor.tsx@@ -4,11 +4,9 @@import type { EditorProviderProps, JSONContent } from "@tiptap/react";import { EditorProvider } from "@tiptap/react";-import { Provider } from "jotai";import type { FC, ReactNode } from "react";import { forwardRef, useRef } from "react";import tunnel from "tunnel-rat";-import { novelStore } from "../utils/store";import { EditorCommandTunnelContext } from "./editor-command";export interface EditorProps {@@ -24,11 +22,9 @@ export const EditorRoot: FC<EditorRootProps> = ({ children }) => {const tunnelInstance = useRef(tunnel()).current;return (- <Provider store={novelStore}>- <EditorCommandTunnelContext.Provider value={tunnelInstance}>- {children}- </EditorCommandTunnelContext.Provider>- </Provider>+ <EditorCommandTunnelContext.Provider value={tunnelInstance}>+ {children}+ </EditorCommandTunnelContext.Provider>);};diff --git a/packages/tiptap/src/index.ts b/packages/tiptap/src/index.tsindex c551cd7122..2817ac4898 100644--- a/packages/tiptap/src/index.ts+++ b/packages/tiptap/src/index.ts@@ -84,4 +84,8 @@ export {} from "./utils";// Store and Atoms-export { queryAtom, rangeAtom } from "./utils/atoms";+export {+ setCommandQuery,+ setCommandRange,+ useCommandStore+} from "./utils/store";diff --git a/packages/tiptap/src/utils/atoms.ts b/packages/tiptap/src/utils/atoms.tsdeleted file mode 100644index ec8da0a0e9..0000000000--- a/packages/tiptap/src/utils/atoms.ts+++ /dev/null@@ -1,9 +0,0 @@-// SPDX-License-Identifier: AGPL-3.0-only-// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,-// including ports, remain AGPLv3; serving them over a network requires releasing their source.--import type { Range } from "@tiptap/core";-import { atom } from "jotai";--export const queryAtom = atom("");-export const rangeAtom = atom(null as Range | null);diff --git a/packages/tiptap/src/utils/store.ts b/packages/tiptap/src/utils/store.tsindex 745259fa84..2acb391748 100644--- a/packages/tiptap/src/utils/store.ts+++ b/packages/tiptap/src/utils/store.ts@@ -2,7 +2,16 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import { createStore } from "jotai";+import type { Range } from "@tiptap/core";+import { create } from "zustand";-export const novelStore: any = createStore();-export * from "jotai";+// The slash-command query and the range it replaces. One store for the page:+// the command list renders through a tunnel, outside the editor's subtree.+export const useCommandStore = create<{ query: string; range: Range | null }>()(+ () => ({ query: "", range: null })+);++export const setCommandQuery = (query: string) =>+ useCommandStore.setState({ query });+export const setCommandRange = (range: Range | null) =>+ useCommandStore.setState({ range });diff --git a/packages/utils/AGENTS.md b/packages/utils/AGENTS.mdindex 5a87096412..c8e0b00aca 100644--- a/packages/utils/AGENTS.md+++ b/packages/utils/AGENTS.md@@ -61,7 +61,7 @@ pnpm --filter @carbon/utils typecheck| `string` | Slugify, truncate, camelCase/titleCase conversions || `items` | Item lookups and `getReadableIdWithRevision` (`readableId.revision`) || `revalidate` | `shouldRevalidate` predicates: `isSearchParamOnlyNavigation` (root loaders), `isUnaffectedByNavigation` (detail layouts — names the route/search params the loader reads) |-| `redirect` | `redirectBeforeLoaders(loader)` — route middleware for an index route that only redirects, so the redirect runs before its parents' loaders |+| `redirect` | `redirect(to, init?)` — the only redirect a loader or action uses: a path on this origin, anything else lands on the home page (`no-raw-redirect` check); `redirectExternal(url, init?)` to leave the origin on purpose with a URL the server built; `safePath(to, fallback)` for a destination that is stored or forwarded rather than redirected to. `redirectBeforeLoaders(loader)` — route middleware for an index route that only redirects, so the redirect runs before its parents' loaders || `status` | Status resolution, status color mapping || `rules` | Rule engine: condition AST, the shared `Operator` vocabulary, JIT-compiled evaluator + surfaces for storage rules and sales rules || `rule-filters` | Item scoping for broadcast rules (`ItemFilter`, `ruleAppliesToItem`, `toItemFilter`) — family-neutral, split out of `rules.ts` |diff --git a/packages/utils/src/redirect.test.ts b/packages/utils/src/redirect.test.tsnew file mode 100644index 0000000000..aac0bc341c--- /dev/null+++ b/packages/utils/src/redirect.test.ts@@ -0,0 +1,76 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import { afterEach, describe, expect, it, vi } from "vitest";+import { redirect, redirectExternal, safePath } from "./redirect";++const location = (response: Response) => response.headers.get("Location");++afterEach(() => vi.restoreAllMocks());++const OFF_ORIGIN: [string, FormDataEntryValue | null][] = [+ ["an absolute URL", "https://evil.com"],+ ["a protocol-relative URL", "//evil.com"],+ ["a backslash host", "/\\evil.com"],+ ["a tab before the second slash", "/\t/evil.com"],+ ["a newline before the second slash", "/\n/evil.com"],+ ["a tab before a backslash", "/\t\\evil.com"],+ ["a relative path", "x/sales"],+ ["a javascript URL", "javascript:alert(1)"],+ ["an empty value", ""],+ ["no value", null]+];++describe("redirect", () => {+ it("goes to a path on this origin", () => {+ const response = redirect("/x/sales/orders?tab=open");+ expect(response.status).toBe(302);+ expect(location(response)).toBe("/x/sales/orders?tab=open");+ });++ it.each(OFF_ORIGIN)("sends %s to the home page", (_label, to) => {+ vi.spyOn(console, "warn").mockImplementation(() => {});+ expect(location(redirect(to))).toBe("/");+ });++ it("keeps the status and headers it is given", () => {+ const response = redirect("/x", {+ status: 303,+ headers: [+ ["Set-Cookie", "a=1"],+ ["Set-Cookie", "b=2"]+ ]+ });+ expect(response.status).toBe(303);+ expect(response.headers.getSetCookie()).toEqual(["a=1", "b=2"]);+ expect(redirect("/x", 301).status).toBe(301);+ });+});++describe("redirectExternal", () => {+ it("goes to an http(s) URL", () => {+ expect(location(redirectExternal("https://connect.stripe.com/x"))).toBe(+ "https://connect.stripe.com/x"+ );+ });++ it.each([+ ["a javascript URL", "javascript:alert(1)"],+ ["a data URL", "data:text/html,x"],+ ["a bare path", "/x"]+ ])("sends %s to the home page", (_label, url) => {+ vi.spyOn(console, "warn").mockImplementation(() => {});+ expect(location(redirectExternal(url))).toBe("/");+ });+});++describe("safePath", () => {+ it("keeps a path on this origin", () => {+ expect(safePath("/x/parts", "/x")).toBe("/x/parts");+ });++ it.each(OFF_ORIGIN)("falls back for %s", (_label, to) => {+ expect(safePath(to, "/x")).toBe("/x");+ });+});diff --git a/packages/utils/src/redirect.ts b/packages/utils/src/redirect.tsindex c586d20f6d..4a6903a617 100644--- a/packages/utils/src/redirect.ts+++ b/packages/utils/src/redirect.ts@@ -37,3 +37,75 @@ export function redirectBeforeLoaders<Args extends { request: Request }>(return next();};}++const HOME = "/";++type RedirectTarget = FormDataEntryValue | null | undefined;++// Never a real host: only what a target resolves to against it is compared.+const BASE = "https://own.invalid";++function isOwnPath(to: RedirectTarget): to is string {+ if (typeof to !== "string" || !to.startsWith("/")) return false;+ // Resolved the way a browser resolves a Location header, rather than by+ // listing the spellings of another origin: `//host`, `/\host`, and `/` then+ // a tab or newline then `/host` (browsers drop those characters) all leave.+ try {+ return new URL(to, BASE).origin === BASE;+ } catch {+ return false;+ }+}++/** `to` when it is a path on this origin, otherwise `fallback`. */+export function safePath(to: RedirectTarget, fallback: string = HOME): string {+ return isOwnPath(to) ? to : fallback;+}++function redirectResponse(url: string, init: number | ResponseInit = 302) {+ const responseInit = typeof init === "number" ? { status: init } : init;+ const headers = new Headers(responseInit.headers);+ headers.set("Location", url);+ return new Response(null, {+ ...responseInit,+ status: responseInit.status ?? 302,+ headers+ });+}++/**+ * The only `redirect` a loader or action uses (`no-raw-redirect` check). It+ * goes to a path on this origin; anything else — an absolute URL, `//host`, an+ * empty value — lands on the home page, so a destination read from a query+ * string, a form or a database row cannot send the browser off-site.+ *+ * Leaving the origin on purpose (an OAuth provider, Stripe, the other app) is+ * `redirectExternal`.+ */+export function redirect(to: RedirectTarget, init?: number | ResponseInit) {+ if (!isOwnPath(to)) {+ if (to) console.warn("redirect: refused a target off this origin", { to });+ return redirectResponse(HOME, init);+ }+ return redirectResponse(to, init);+}++/**+ * A redirect that leaves this origin. The URL must be one the server built —+ * never a value a request supplied — and must be http(s).+ */+export function redirectExternal(url: string, init?: number | ResponseInit) {+ let protocol: string | undefined;+ try {+ protocol = new URL(url).protocol;+ } catch {+ // not an absolute URL+ }+ if (protocol !== "https:" && protocol !== "http:") {+ console.warn("redirectExternal: refused a URL that is not http(s)", {+ url+ });+ return redirectResponse(HOME, init);+ }+ return redirectResponse(url, init);+}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 26c1dfc3ce..c3d9f6d0f3 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -222,9 +222,6 @@ catalogs:dompurify:specifier: 3.4.0version: 3.4.0- framer-motion:- specifier: 11.18.2- version: 11.18.2intl-parse-accept-language:specifier: 1.0.0version: 1.0.0@@ -240,6 +237,9 @@ catalogs:match-sorter:specifier: 8.1.0version: 8.1.0+ motion:+ specifier: 12.38.0+ version: 12.38.0nanoid:specifier: 5.1.16version: 5.1.16@@ -882,9 +882,6 @@ importers:emoji-mart:specifier: 5.6.0version: 5.6.0- framer-motion:- specifier: 'catalog:'- version: 11.18.2(@emotion/[email protected])([email protected]([email protected]))([email protected])inngest:specifier: ^3.52.7version: 3.54.0(@opentelemetry/[email protected](@opentelemetry/[email protected]))([email protected])([email protected])([email protected])([email protected](@babel/[email protected])(@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected]))([email protected])([email protected])@@ -919,11 +916,11 @@ importers:specifier: 0.44.0version: 0.44.0motion:- specifier: 12.38.0+ specifier: 'catalog:'version: 12.38.0(@emotion/[email protected])([email protected]([email protected]))([email protected])motion-number:specifier: 0.1.7- version: 0.1.7([email protected](@emotion/[email protected])([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected])+ version: 0.1.7([email protected]([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected])nanoid:specifier: 'catalog:'version: 5.1.16@@ -1336,9 +1333,6 @@ importers:dompurify:specifier: 'catalog:'version: 3.4.0- framer-motion:- specifier: 'catalog:'- version: 11.18.2(@emotion/[email protected])([email protected]([email protected]))([email protected])isbot:specifier: 'catalog:'version: 5.1.37@@ -1351,6 +1345,9 @@ importers:localforage:specifier: 1.10.0version: 1.10.0+ motion:+ specifier: 'catalog:'+ version: 12.38.0(@emotion/[email protected])([email protected]([email protected]))([email protected])nanoid:specifier: 'catalog:'version: 5.1.16@@ -1526,9 +1523,6 @@ importers:cookie:specifier: 'catalog:'version: 1.1.1- framer-motion:- specifier: 'catalog:'- version: 11.18.2(@emotion/[email protected])([email protected]([email protected]))([email protected])isbot:specifier: 'catalog:'version: 5.1.37@@ -3332,18 +3326,12 @@ importers:'@radix-ui/react-tabs':specifier: 1.1.13version: 1.1.13(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@radix-ui/react-toast':- specifier: 1.2.15- version: 1.2.15(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])'@radix-ui/react-toggle':specifier: 1.1.10version: 1.1.10(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])'@radix-ui/react-toggle-group':specifier: 1.1.11version: 1.1.11(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@radix-ui/react-tooltip':- specifier: 1.2.8- version: 1.2.8(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])'@react-aria/button':specifier: 3.14.5@@ -3467,9 +3455,6 @@ importers:embla-carousel-react:specifier: 8.5.2version: 8.5.2([email protected])- framer-motion:- specifier: 'catalog:'- version: 11.18.2(@emotion/[email protected])([email protected]([email protected]))([email protected])input-otp:specifier: 1.4.2@@ -3482,6 +3467,9 @@ importers:match-sorter:specifier: 'catalog:'version: 8.1.0+ motion:+ specifier: 'catalog:'+ version: 12.38.0(@emotion/[email protected])([email protected]([email protected]))([email protected])nanoid:specifier: 'catalog:'version: 5.1.16@@ -3761,12 +3749,6 @@ importers:dompurify:specifier: 'catalog:'version: 3.4.0- framer-motion:- specifier: 'catalog:'- version: 11.18.2(@emotion/[email protected])([email protected]([email protected]))([email protected])- jotai:- specifier: 2.19.1- version: 2.19.1(@babel/[email protected])(@babel/[email protected])(@types/[email protected])([email protected])linkifyjs:specifier: 4.3.2version: 4.3.2@@ -3794,6 +3776,9 @@ importers:tunnel-rat:specifier: 0.1.2+ zustand:+ specifier: 'catalog:'+ version: 5.0.12(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))devDependencies:'@carbon/config':specifier: workspace:*@@ -7766,19 +7751,6 @@ packages:'@types/react-dom':optional: true- '@radix-ui/[email protected]':- resolution: {integrity: sha512-3OSz3TacUWy4WtOXV38DggwxoqJK4+eDkNMl5Z/MJZaoUPaP4/9lf81xXMe1I2ReTAptverZUpbPY4wWwWyL5g==}- peerDependencies:- '@types/react': 18.3.28- '@types/react-dom': 18.3.7- react: 18.3.1- react-dom: 18.3.1- peerDependenciesMeta:- '@types/react':- optional: true- '@types/react-dom':- optional: true-'@radix-ui/[email protected]':resolution: {integrity: sha512-5umnS0T8JQzQT6HbPyO7Hh9dgd82NmS36DQr+X/YJ9ctFNCiiQd6IJAYYZ33LUwm8M+taCz5t2ui29fHZc4Y6Q==}peerDependencies:@@ -7844,19 +7816,6 @@ packages:'@types/react-dom':optional: true- '@radix-ui/[email protected]':- resolution: {integrity: sha512-tY7sVt1yL9ozIxvmbtN5qtmH2krXcBCfjEiCgKGLqunJHvgvZG2Pcl2oQ3kbcZARb1BGEHdkLzcYGO8ynVlieg==}- peerDependencies:- '@types/react': 18.3.28- '@types/react-dom': 18.3.7- react: 18.3.1- react-dom: 18.3.1- peerDependenciesMeta:- '@types/react':- optional: true- '@types/react-dom':- optional: true-'@radix-ui/[email protected]':resolution: {integrity: sha512-GZtyzoHz95Rhs6S63D2t/eqvdFCm7I+yHMLVQheKM7nBD8mbZIt+ct1jz4536MDnaOGKIxynJ8eHTkVGVVkoTg==}peerDependencies:@@ -12419,20 +12378,6 @@ packages:resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}- resolution: {integrity: sha512-5F5Och7wrvtLVElIpclDT0CBzMVg3dL22B64aZwHtsIY8RB4mXICLrkajK4G9R+ieSAGcgrLeae2SeUTg2pr6w==}- peerDependencies:- '@emotion/is-prop-valid': '*'- react: 18.3.1- react-dom: 18.3.1- peerDependenciesMeta:- '@emotion/is-prop-valid':- optional: true- react:- optional: true- react-dom:- optional: true-resolution: {integrity: sha512-6e78rdVtnBvlEVgu6eFEAgG9v3wLnYEboM8I5O5EXvfKC8gxGQB8wXJdhkMy10iVcn05jl6CNw7/HTsTCfwcWg==}peerDependencies:@@ -13326,24 +13271,6 @@ packages:resolution: {integrity: sha512-d7kPDd34KO/YnzaDOlikGpOurfF0ByC2sEV4cANCtdqLlTfBlw2p14O/5d/zv40gJPbIQxfES3nSx1/oYNyuZQ==}- resolution: {integrity: sha512-sqm9lVZiqBHZH8aSRk32DSiZDHY3yUIlulXYn9GQj7/LvoUdYXSMti7ZPJGo+6zjzKFt5a25k/I6iBCi43PJcw==}- engines: {node: '>=12.20.0'}- peerDependencies:- '@babel/core': '>=7.0.0'- '@babel/template': '>=7.0.0'- '@types/react': 18.3.28- react: 18.3.1- peerDependenciesMeta:- '@babel/core':- optional: true- '@babel/template':- optional: true- '@types/react':- optional: true- react:- optional: true-resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}engines: {node: '>=10'}@@ -14130,9 +14057,6 @@ packages:resolution: {integrity: sha512-223dMRJtI/l25dJKWpgij2cMtywuG/WiUKXdvwfbhGKBhy1puASqXwFzmWZ7+K73vUPoR7SS2Qz2cI/g9MKw0A==}engines: {node: '>= 0.8.0'}- resolution: {integrity: sha512-g76KvA001z+atjfxczdRtw/RXOM3OMSdd1f4DL77qCTF/+avrRJiawSG4yDibEQ215sr9kpinSlX2pCTJ9zbhw==}-resolution: {integrity: sha512-HxU3ZaBwNPVQUBQf1xxgq+7JrPNZvjLVxgbpEZL7RrWJnsxOf0/OM+yrHG9ogLQ31Do/r57Oz2gQWPK+6q62mg==}@@ -14146,9 +14070,6 @@ packages:react: 18.3.1react-dom: 18.3.1- resolution: {integrity: sha512-49Kt+HKjtbJKLtgO/LKj9Ld+6vw9BjH5d9sc40R/kVyH8GLAXgT42M2NnuPcJNuA3s9ZfZBUcwIgpmZWGEE+hA==}-resolution: {integrity: sha512-8nadJAJjTtqRkmRF36FoJTrywK9nnFmnPwnSMyxaOCU7GDjN9RTMJIxx9De8ErM+vpPhMccr/6fo5WciyQLnMQ==}@@ -21184,26 +21105,6 @@ snapshots:'@types/react': 18.3.28'@types/react-dom': 18.3.7(@types/[email protected])- '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':- dependencies:- '@radix-ui/primitive': 1.1.3- '@radix-ui/react-collection': 1.1.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])- '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])- '@radix-ui/react-dismissable-layer': 1.1.11(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@radix-ui/react-portal': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@radix-ui/react-presence': 1.1.5(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@radix-ui/react-use-callback-ref': 1.1.1(@types/[email protected])([email protected])- '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])- '@radix-ui/react-use-layout-effect': 1.1.1(@types/[email protected])([email protected])- '@radix-ui/react-visually-hidden': 1.2.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- react: 18.3.1- react-dom: 18.3.1([email protected])- optionalDependencies:- '@types/react': 18.3.28- '@types/react-dom': 18.3.7(@types/[email protected])-'@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@radix-ui/primitive': 1.1.3@@ -21276,26 +21177,6 @@ snapshots:'@types/react': 18.3.28'@types/react-dom': 18.3.7(@types/[email protected])- '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':- dependencies:- '@radix-ui/primitive': 1.1.3- '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])- '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])- '@radix-ui/react-dismissable-layer': 1.1.11(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])- '@radix-ui/react-popper': 1.2.8(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@radix-ui/react-portal': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@radix-ui/react-presence': 1.1.5(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@radix-ui/react-slot': 1.2.3(@types/[email protected])([email protected])- '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])- '@radix-ui/react-visually-hidden': 1.2.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- react: 18.3.1- react-dom: 18.3.1([email protected])- optionalDependencies:- '@types/react': 18.3.28- '@types/react-dom': 18.3.7(@types/[email protected])-'@radix-ui/[email protected]([email protected])':dependencies:'@babel/runtime': 7.29.2@@ -27037,16 +26918,6 @@ snapshots:- [email protected](@emotion/[email protected])([email protected]([email protected]))([email protected]):- dependencies:- motion-dom: 11.18.1- motion-utils: 11.18.1- tslib: 2.8.1- optionalDependencies:- '@emotion/is-prop-valid': 1.4.0- react: 18.3.1- react-dom: 18.3.1([email protected])-[email protected](@emotion/[email protected])([email protected]([email protected]))([email protected]):dependencies:motion-dom: 12.40.0@@ -28032,13 +27903,6 @@ snapshots:- [email protected](@babel/[email protected])(@babel/[email protected])(@types/[email protected])([email protected]):- optionalDependencies:- '@babel/core': 7.29.0- '@babel/template': 7.28.6- '@types/react': 18.3.28- react: 18.3.1-@@ -29015,10 +28879,6 @@ snapshots:transitivePeerDependencies:- supports-color- dependencies:- motion-utils: 11.18.1-dependencies:motion-utils: 12.39.0@@ -29027,14 +28887,12 @@ snapshots:dependencies:motion-utils: 13.3.0- [email protected]([email protected](@emotion/[email protected])([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected]):+ [email protected]([email protected]([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected]):dependencies:- framer-motion: 11.18.2(@emotion/[email protected])([email protected]([email protected]))([email protected])react: 18.3.1react-dom: 18.3.1([email protected])- [email protected]: {}-diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yamlindex a5e082754e..73341b4cf0 100644--- a/pnpm-workspace.yaml+++ b/pnpm-workspace.yaml@@ -131,12 +131,12 @@ catalog:cross-env: 7.0.3dompurify: 3.4.0fast-xml-parser: 5.3.1- framer-motion: 11.18.2intl-parse-accept-language: 1.0.0isbot: '5'jose: 6.0.11kysely: 0.28.17match-sorter: 8.1.0+ motion: 12.38.0nanoid: 5.1.16nanostores: 0.9.5nodemon: 3.1.14