@eintrek/erp-shell 0.1.12 → 0.1.13

package/dist/index.js

@@ -351,9 +351,15 @@ function useOrganizationIdState(initialOrganizationId, actions) {
 }
 
 /**
- * Invalidate ALL React Query queries when `organizationId` changes
- * (skips the initial mount). Use inside the ERP provider so org-scoped
- * data is refetched cleanly when the user switches org.
+ * Invalidate ALL React Query queries when `organizationId` changes between
+ * two real orgs (e.g. the user switches org in the picker). Skips the
+ * initial mount and the first-resolve transition (undefined/null/"" → x)
+ * — that's the URL `[code]` segment finally syncing into the ERP context,
+ * not a real switch, and invalidating there triggers a cascade of refetches
+ * on top of the queries that already just fired.
+ *
+ * Use inside the ERP provider so org-scoped data is wiped cleanly when the
+ * user really does switch between two orgs.
  */
 function useInvalidateQueriesOnOrgChange(organizationId) {
     const queryClient = reactQuery.useQueryClient();
@@ -367,7 +373,15 @@ function useInvalidateQueriesOnOrgChange(organizationId) {
         }
         if (previousRef.current === organizationId)
             return;
+        const wasEmpty = previousRef.current === undefined ||
+            previousRef.current === null ||
+            previousRef.current === "";
         previousRef.current = organizationId;
+        // First-resolve: nothing to invalidate yet (queries either haven't run
+        // or are running with the right key already). Real org switches (a → b)
+        // still hit the invalidate path below.
+        if (wasEmpty)
+            return;
         queryClient.invalidateQueries();
     }, [organizationId, queryClient]);
 }