@eintrek/erp-shell 0.1.20 → 0.1.21

package/dist/hooks/use-org-side-effects.d.ts

@@ -11,8 +11,19 @@
  */
 export declare function useInvalidateQueriesOnOrgChange(organizationId: number | string | null | undefined): void;
 /**
- * When `userId` changes (after the initial value), call `clearOrg`. Use
- * inside the ERP provider so logging out / switching user resets the
- * selected org cleanly.
+ * Clear the selected organization when the signed-in user actually changes.
+ *
+ * Only a transition between two KNOWN users counts. An empty or absent id
+ * means "not resolved yet" — it is not a different person, and treating it as
+ * one is what made this fire on every cold load: hosts derive the id as
+ * `session?.user?.id ?? ""`, so the first effect run saw `""`, and the moment
+ * NextAuth resolved, `"" !== "abc"` looked like a user switch and wiped the
+ * org. Downstream that nulls organizationId, which re-keys every org-scoped
+ * query and remounts the page — visible as settings snapping back to their
+ * defaults.
+ *
+ * Remembering the last known id (rather than the last value seen) keeps the
+ * real case working: user A signs out — id goes empty, ignored — user B signs
+ * in, A !== B, and the org is cleared.
  */
 export declare function useClearOrgOnUserChange(userId: string | null | undefined, clearOrg: (id: null) => Promise<void> | void): void;

package/dist/index.esm.js

@@ -367,18 +367,32 @@ function useInvalidateQueriesOnOrgChange(organizationId) {
     }, [organizationId, queryClient]);
 }
 /**
- * When `userId` changes (after the initial value), call `clearOrg`. Use
- * inside the ERP provider so logging out / switching user resets the
- * selected org cleanly.
+ * Clear the selected organization when the signed-in user actually changes.
+ *
+ * Only a transition between two KNOWN users counts. An empty or absent id
+ * means "not resolved yet" — it is not a different person, and treating it as
+ * one is what made this fire on every cold load: hosts derive the id as
+ * `session?.user?.id ?? ""`, so the first effect run saw `""`, and the moment
+ * NextAuth resolved, `"" !== "abc"` looked like a user switch and wiped the
+ * org. Downstream that nulls organizationId, which re-keys every org-scoped
+ * query and remounts the page — visible as settings snapping back to their
+ * defaults.
+ *
+ * Remembering the last known id (rather than the last value seen) keeps the
+ * real case working: user A signs out — id goes empty, ignored — user B signs
+ * in, A !== B, and the org is cleared.
  */
 function useClearOrgOnUserChange(userId, clearOrg) {
-    const previousUserIdRef = useRef(null);
+    const lastKnownUserIdRef = useRef(null);
     useEffect(() => {
-        if (previousUserIdRef.current !== null &&
-            previousUserIdRef.current !== userId) {
+        const next = userId ?? "";
+        if (next === "")
+            return;
+        const previous = lastKnownUserIdRef.current;
+        lastKnownUserIdRef.current = next;
+        if (previous !== null && previous !== next) {
             Promise.resolve(clearOrg(null)).catch(console.error);
         }
-        previousUserIdRef.current = userId ?? null;
     }, [userId, clearOrg]);
 }
 
@@ -1027,6 +1041,25 @@ function AppLayoutShell({ children, sidebar, loadingComponent, breadcrumb, permi
         code,
         organizations.length,
     ]);
+    // Key for the content subtree. It exists so switching organizations throws
+    // away the previous org's component state — but it must react ONLY to a real
+    // switch. organizationId legitimately passes through null while the context
+    // re-settles (session resolving, cookie write in flight), and keying on that
+    // unmounted and remounted the entire page: forms lost their loaded values,
+    // in-flight edits vanished, and settings pickers snapped back to defaults.
+    //
+    // Holding the last known id makes a transient null a no-op while a genuine
+    // org-to-org switch still changes the key.
+    const lastOrgKeyRef = React.useRef("no-org");
+    const currentOrgKey = organizationId === null ||
+        organizationId === undefined ||
+        String(organizationId).trim() === ""
+        ? null
+        : String(organizationId);
+    if (currentOrgKey !== null) {
+        lastOrgKeyRef.current = currentOrgKey;
+    }
+    const contentOrgKey = lastOrgKeyRef.current;
     // ≤1024px: sidebar renders as a modal overlay (backdrop dims content). >1024px:
     // sidebar is docked and the content gets a left margin to clear it.
     const [isSidebarModalLayout, setIsSidebarModalLayout] = React.useState(false);
@@ -1073,7 +1106,7 @@ function AppLayoutShell({ children, sidebar, loadingComponent, breadcrumb, permi
     const contentMargin = open && !isSidebarModalLayout ? "ml-[21.5rem]" : "";
     const needsLeftGutter = !(open && !isSidebarModalLayout);
     const wrap = permissionProvider ?? ((c) => c);
-    return (jsxs("div", { className: "flex min-h-screen w-full bg-background", children: [open && (jsx("div", { className: "fixed left-0 top-0 z-50 h-screen", children: sidebar })), open && isSidebarModalLayout && (jsx("button", { type: "button", "aria-label": "\u0E1B\u0E34\u0E14\u0E40\u0E21\u0E19\u0E39", className: "fixed inset-0 z-40 bg-black/50", onClick: () => setOpen(false) })), jsx("div", { className: cx("relative flex min-w-0 flex-1 flex-col transition-all", contentMargin), children: jsxs("main", { className: "flex flex-1 flex-col min-h-screen gap-4", children: [jsxs("div", { className: "sticky top-0 z-30 shrink-0 w-full", children: [jsx(HeaderBackground, {}), jsxs("header", { className: "relative shrink-0 gap-2 py-4 h-auto min-h-[123.5px] w-full z-10", children: [jsxs("div", { className: "flex w-full items-center gap-2 px-3 sm:px-4 lg:px-6", children: [jsx(SidebarTrigger, { className: "shrink-0 text-white hover:bg-white/10" }), jsx("div", { className: "flex-1 min-w-0", children: breadcrumb })] }), jsx("div", { id: "header-title" })] })] }), jsx(Suspense, { fallback: jsx("div", { className: "relative z-10 min-h-[calc(100vh-8rem)]", children: jsx("div", { className: "flex h-full items-center justify-center", children: jsxs("div", { className: "space-y-4 text-center", children: [jsx("div", { className: "mx-auto h-8 w-8 animate-spin rounded-full border-b-2 border-primary" }), jsx("p", { className: "text-sm text-muted-foreground", children: "\u0E01\u0E33\u0E25\u0E31\u0E07\u0E42\u0E2B\u0E25\u0E14..." })] }) }) }), children: jsx("div", { className: cx("relative z-10 pr-6", needsLeftGutter && "pl-6"), children: wrap(children) }, `org-${organizationId ?? "no-org"}`) })] }) })] }));
+    return (jsxs("div", { className: "flex min-h-screen w-full bg-background", children: [open && (jsx("div", { className: "fixed left-0 top-0 z-50 h-screen", children: sidebar })), open && isSidebarModalLayout && (jsx("button", { type: "button", "aria-label": "\u0E1B\u0E34\u0E14\u0E40\u0E21\u0E19\u0E39", className: "fixed inset-0 z-40 bg-black/50", onClick: () => setOpen(false) })), jsx("div", { className: cx("relative flex min-w-0 flex-1 flex-col transition-all", contentMargin), children: jsxs("main", { className: "flex flex-1 flex-col min-h-screen gap-4", children: [jsxs("div", { className: "sticky top-0 z-30 shrink-0 w-full", children: [jsx(HeaderBackground, {}), jsxs("header", { className: "relative shrink-0 gap-2 py-4 h-auto min-h-[123.5px] w-full z-10", children: [jsxs("div", { className: "flex w-full items-center gap-2 px-3 sm:px-4 lg:px-6", children: [jsx(SidebarTrigger, { className: "shrink-0 text-white hover:bg-white/10" }), jsx("div", { className: "flex-1 min-w-0", children: breadcrumb })] }), jsx("div", { id: "header-title" })] })] }), jsx(Suspense, { fallback: jsx("div", { className: "relative z-10 min-h-[calc(100vh-8rem)]", children: jsx("div", { className: "flex h-full items-center justify-center", children: jsxs("div", { className: "space-y-4 text-center", children: [jsx("div", { className: "mx-auto h-8 w-8 animate-spin rounded-full border-b-2 border-primary" }), jsx("p", { className: "text-sm text-muted-foreground", children: "\u0E01\u0E33\u0E25\u0E31\u0E07\u0E42\u0E2B\u0E25\u0E14..." })] }) }) }), children: jsx("div", { className: cx("relative z-10 pr-6", needsLeftGutter && "pl-6"), children: wrap(children) }, `org-${contentOrgKey}`) })] }) })] }));
 }
 /** Local tiny classnames helper — avoids pulling clsx/tailwind-merge into
  *  the shell just for the layout file. Falsy values are skipped. */