@carlonicora/nextjs-jsonapi 1.131.0 → 1.131.2

package/src/features/user/contexts/CurrentUserContext.tsx

@@ -3,7 +3,7 @@
 import { useAtom } from "jotai";
 import { atomWithStorage } from "jotai/utils";
 import { usePathname } from "next/navigation";
-import React, { createContext, useCallback, useContext, useEffect, useRef, useState } from "react";
+import React, { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { useSocketContext } from "../../../contexts/SocketContext";
 import { Modules, rehydrate } from "../../../core";
 import { Action, checkPermissions, ModuleWithPermissions } from "../../../permissions";
@@ -66,13 +66,31 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
     return descriptor?.get?.call(Modules);
   };
 
-  const currentUser = dehydratedUser ? rehydrate<UserInterface>(Modules.User, dehydratedUser) : null;
+  const currentUser = useMemo(
+    () => (dehydratedUser ? rehydrate<UserInterface>(Modules.User, dehydratedUser) : null),
+    [dehydratedUser],
+  );
 
-  const company = currentUser?.company ?? null;
+  // Balances pushed by company:tokens_updated. Transient: a real user refresh is
+  // authoritative and clears this.
+  const [tokenOverride, setTokenOverride] = useState<{
+    availableMonthlyTokens: number;
+    availableExtraTokens: number;
+  } | null>(null);
+
+  const company = useMemo<CompanyInterface | null>(() => {
+    const c = currentUser?.company ?? null;
+    if (!c || !tokenOverride) return c;
+    return Object.assign(Object.create(Object.getPrototypeOf(c)), c, {
+      _availableMonthlyTokens: tokenOverride.availableMonthlyTokens,
+      _availableExtraTokens: tokenOverride.availableExtraTokens,
+    });
+  }, [currentUser, tokenOverride]);
 
   const setUser = (user?: UserInterface): void => {
     if (user) setDehydratedUser(user.dehydrate() as any);
     else setDehydratedUser(null);
+    setTokenOverride(null);
   };
 
   const hasRole = (roleId: string): boolean => {
@@ -159,6 +177,7 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
           }
 
           setDehydratedUser(fullUser.dehydrate() as any);
+          setTokenOverride(null);
         }
       } catch (error) {
         console.error("Failed to refresh user data:", error);
@@ -185,7 +204,23 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
       return;
     }
 
-    const handleCompanyUpdate = (data: { companyId: string; type: string }) => {
+    // Hot path: fires once per LLM call. Fully described by its payload — must
+    // never trigger an HTTP request.
+    const handleTokensUpdated = (data: {
+      companyId: string;
+      availableMonthlyTokens: number;
+      availableExtraTokens: number;
+    }) => {
+      if (data.companyId !== currentUser.company?.id) return;
+      setTokenOverride({
+        availableMonthlyTokens: data.availableMonthlyTokens,
+        availableExtraTokens: data.availableExtraTokens,
+      });
+    };
+
+    // Rare (Stripe webhooks only) and genuinely changes features, modules and
+    // permissions — a payload cannot economically carry that, so refetch.
+    const handleSubscriptionUpdated = (data: { companyId: string; type: string }) => {
       if (data.companyId === currentUser.company?.id && !isRefreshingRef.current) {
         isRefreshingRef.current = true;
         // Skip cookie update to prevent page reload - only update React state
@@ -195,13 +230,12 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
       }
     };
 
-    // Both events trigger the same refresh behavior
-    socket.on("company:tokens_updated", handleCompanyUpdate);
-    socket.on("company:subscription_updated", handleCompanyUpdate);
+    socket.on("company:tokens_updated", handleTokensUpdated);
+    socket.on("company:subscription_updated", handleSubscriptionUpdated);
 
     return () => {
-      socket.off("company:tokens_updated", handleCompanyUpdate);
-      socket.off("company:subscription_updated", handleCompanyUpdate);
+      socket.off("company:tokens_updated", handleTokensUpdated);
+      socket.off("company:subscription_updated", handleSubscriptionUpdated);
     };
   }, [socket, isConnected, currentUser?.company?.id]);
 

package/src/features/user/contexts/__tests__/CurrentUserContext.spec.tsx

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render } from "@testing-library/react";
+import { render, act } from "@testing-library/react";
 
 vi.mock("cookies-next", () => ({
   getCookie: vi.fn(() => undefined),
@@ -9,14 +9,54 @@ vi.mock("next/navigation", () => ({
   usePathname: () => "/",
 }));
 
+const socketMock = vi.hoisted(() => {
+  const handlers: Record<string, ((data: any) => void)[]> = {};
+  return {
+    socket: {
+      on: (event: string, handler: (data: any) => void) => {
+        (handlers[event] ??= []).push(handler);
+      },
+      off: (event: string, handler: (data: any) => void) => {
+        handlers[event] = (handlers[event] ?? []).filter((h) => h !== handler);
+      },
+    },
+    emit: (event: string, data: any) => {
+      (handlers[event] ?? []).forEach((h) => h(data));
+    },
+    reset: () => {
+      for (const key of Object.keys(handlers)) delete handlers[key];
+    },
+  };
+});
+
 vi.mock("../../../../contexts/SocketContext", () => ({
-  useSocketContext: () => ({ socket: null, isConnected: false }),
+  useSocketContext: () => ({ socket: socketMock.socket, isConnected: true }),
 }));
 
-vi.mock("../../../../core", () => ({
-  Modules: { User: { name: "users" } },
-  rehydrate: (_module: unknown, data: any) => data,
-}));
+vi.mock("../../../../core", () => {
+  // Mirrors the real Company model: public getters over private backing fields.
+  // The token overlay writes the backing fields, so a plain object would not
+  // exercise it.
+  class FakeCompany {
+    id = "";
+    monthlyTokens = 0;
+    _availableMonthlyTokens = 0;
+    _availableExtraTokens = 0;
+    get availableMonthlyTokens() {
+      return this._availableMonthlyTokens ?? 0;
+    }
+    get availableExtraTokens() {
+      return this._availableExtraTokens ?? 0;
+    }
+  }
+  return {
+    Modules: { User: { name: "users" } },
+    rehydrate: (_module: unknown, data: any) => ({
+      ...data,
+      company: data.company ? Object.assign(new FakeCompany(), data.company) : null,
+    }),
+  };
+});
 
 vi.mock("../../../../permissions", () => ({
   Action: { Read: "read", Write: "write", Create: "create", Update: "update", Delete: "delete" },
@@ -139,3 +179,106 @@ describe("CurrentUserProvider", () => {
     expect(getByTestId("current-user-id").textContent).toBe("new");
   });
 });
+
+describe("CurrentUserProvider token updates", () => {
+  const STORED_USER = {
+    id: "user-1",
+    roles: [],
+    modules: [],
+    company: {
+      id: "company-1",
+      monthlyTokens: 1000,
+      _availableMonthlyTokens: 900,
+      _availableExtraTokens: 50,
+    },
+  };
+
+  function CompanyConsumer() {
+    const { company } = useCurrentUserContext();
+    return (
+      <div data-testid="balances">
+        {company ? `${(company as any).availableMonthlyTokens}/${(company as any).availableExtraTokens}` : "null"}
+      </div>
+    );
+  }
+
+  beforeEach(() => {
+    localStorage.clear();
+    socketMock.reset();
+    vi.clearAllMocks();
+  });
+
+  it("patches balances from company:tokens_updated without refetching the user", async () => {
+    localStorage.setItem("user", JSON.stringify(STORED_USER));
+
+    const { getByTestId } = render(
+      <CurrentUserProvider>
+        <CompanyConsumer />
+      </CurrentUserProvider>,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve, 50));
+    expect(getByTestId("balances").textContent).toBe("900/50");
+
+    await act(async () => {
+      socketMock.emit("company:tokens_updated", {
+        type: "company:tokens_updated",
+        companyId: "company-1",
+        availableMonthlyTokens: 750,
+        availableExtraTokens: 40,
+      });
+    });
+
+    expect(getByTestId("balances").textContent).toBe("750/40");
+    expect(UserService.findFullUser).not.toHaveBeenCalled();
+  });
+
+  it("ignores company:tokens_updated for a different company", async () => {
+    localStorage.setItem("user", JSON.stringify(STORED_USER));
+
+    const { getByTestId } = render(
+      <CurrentUserProvider>
+        <CompanyConsumer />
+      </CurrentUserProvider>,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    await act(async () => {
+      socketMock.emit("company:tokens_updated", {
+        type: "company:tokens_updated",
+        companyId: "someone-else",
+        availableMonthlyTokens: 1,
+        availableExtraTokens: 1,
+      });
+    });
+
+    expect(getByTestId("balances").textContent).toBe("900/50");
+  });
+
+  it("still refetches the full user on company:subscription_updated", async () => {
+    localStorage.setItem("user", JSON.stringify(STORED_USER));
+    vi.mocked(UserService.findFullUser).mockResolvedValue({
+      ...STORED_USER,
+      dehydrate: () => STORED_USER,
+    } as any);
+
+    render(
+      <CurrentUserProvider>
+        <CompanyConsumer />
+      </CurrentUserProvider>,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    await act(async () => {
+      socketMock.emit("company:subscription_updated", {
+        type: "company:subscription_updated",
+        companyId: "company-1",
+      });
+      await new Promise((resolve) => setTimeout(resolve, 50));
+    });
+
+    expect(UserService.findFullUser).toHaveBeenCalledTimes(1);
+  });
+});

package/src/shadcnui/ui/sheet.tsx

@@ -48,7 +48,13 @@ function SheetContent({
 }) {
   return (
     <SheetPortal>
-      <SheetOverlay />
+      {/* forceRender: Base UI skips the backdrop entirely for a NESTED dialog
+          (`enabled: forceRender || !nested`). Without it a sheet opened from
+          inside another sheet has no backdrop, so nothing covers the parent
+          popup — which Base UI has marked inert. Clicks there are swallowed by
+          `inert` and never reach the dismiss logic, so the nested sheet cannot
+          be closed by clicking outside it. Non-nested sheets are unaffected. */}
+      <SheetOverlay forceRender />
       <SheetPrimitive.Popup
         data-slot="sheet-content"
         data-side={side}