@carlonicora/nextjs-jsonapi 1.141.3 → 1.143.0

package/src/features/tokenusage/tokenusage-admin.module.ts

@@ -0,0 +1,22 @@
+import { ModuleFactory } from "../../permissions";
+import { TokenUsageAdminBreakdown } from "./data/tokenusage-admin-breakdown";
+import { TokenUsageAdminSummary } from "./data/tokenusage-admin-summary";
+import { TokenUsageAdminTimeline } from "./data/tokenusage-admin-timeline";
+
+/**
+ * Read-only reporting resources behind the administrative token-usage page.
+ * `name` is the endpoint path EndpointCreator builds URLs from; there is no
+ * pageUrl because these are not navigable resources.
+ *
+ * Distinct from the consuming app's own TokenUsage module (name "tokenusages",
+ * pageUrl "/tokenusage") — that one is an AppModuleDefinitions entry the package
+ * cannot reference, which is why these three exist.
+ */
+export const TokenUsageAdminSummaryModule = (factory: ModuleFactory) =>
+  factory({ name: "tokenusages/administration/summary", model: TokenUsageAdminSummary });
+
+export const TokenUsageAdminTimelineModule = (factory: ModuleFactory) =>
+  factory({ name: "tokenusages/administration/timeline", model: TokenUsageAdminTimeline });
+
+export const TokenUsageAdminBreakdownModule = (factory: ModuleFactory) =>
+  factory({ name: "tokenusages/administration/breakdown", model: TokenUsageAdminBreakdown });

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

@@ -71,26 +71,26 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
     [dehydratedUser],
   );
 
-  // Balances pushed by company:tokens_updated. Transient: a real user refresh is
+  // Balances pushed by company:credits_updated. Transient: a real user refresh is
   // authoritative and clears this.
-  const [tokenOverride, setTokenOverride] = useState<{
-    availableMonthlyTokens: number;
-    availableExtraTokens: number;
+  const [creditOverride, setCreditOverride] = useState<{
+    availableMonthlyCredits: number;
+    availableExtraCredits: number;
   } | null>(null);
 
   const company = useMemo<CompanyInterface | null>(() => {
     const c = currentUser?.company ?? null;
-    if (!c || !tokenOverride) return c;
+    if (!c || !creditOverride) return c;
     return Object.assign(Object.create(Object.getPrototypeOf(c)), c, {
-      _availableMonthlyTokens: tokenOverride.availableMonthlyTokens,
-      _availableExtraTokens: tokenOverride.availableExtraTokens,
+      _availableMonthlyCredits: creditOverride.availableMonthlyCredits,
+      _availableExtraCredits: creditOverride.availableExtraCredits,
     });
-  }, [currentUser, tokenOverride]);
+  }, [currentUser, creditOverride]);
 
   const setUser = (user?: UserInterface): void => {
     if (user) setDehydratedUser(user.dehydrate() as any);
     else setDehydratedUser(null);
-    setTokenOverride(null);
+    setCreditOverride(null);
   };
 
   const hasRole = (roleId: string): boolean => {
@@ -177,7 +177,7 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
           }
 
           setDehydratedUser(fullUser.dehydrate() as any);
-          setTokenOverride(null);
+          setCreditOverride(null);
         }
       } catch (error) {
         console.error("Failed to refresh user data:", error);
@@ -206,15 +206,15 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
 
     // Hot path: fires once per LLM call. Fully described by its payload — must
     // never trigger an HTTP request.
-    const handleTokensUpdated = (data: {
+    const handleCreditsUpdated = (data: {
       companyId: string;
-      availableMonthlyTokens: number;
-      availableExtraTokens: number;
+      availableMonthlyCredits: number;
+      availableExtraCredits: number;
     }) => {
       if (data.companyId !== currentUser.company?.id) return;
-      setTokenOverride({
-        availableMonthlyTokens: data.availableMonthlyTokens,
-        availableExtraTokens: data.availableExtraTokens,
+      setCreditOverride({
+        availableMonthlyCredits: data.availableMonthlyCredits,
+        availableExtraCredits: data.availableExtraCredits,
       });
     };
 
@@ -230,11 +230,11 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
       }
     };
 
-    socket.on("company:tokens_updated", handleTokensUpdated);
+    socket.on("company:credits_updated", handleCreditsUpdated);
     socket.on("company:subscription_updated", handleSubscriptionUpdated);
 
     return () => {
-      socket.off("company:tokens_updated", handleTokensUpdated);
+      socket.off("company:credits_updated", handleCreditsUpdated);
       socket.off("company:subscription_updated", handleSubscriptionUpdated);
     };
   }, [socket, isConnected, currentUser?.company?.id]);

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

@@ -39,14 +39,14 @@ vi.mock("../../../../core", () => {
   // exercise it.
   class FakeCompany {
     id = "";
-    monthlyTokens = 0;
-    _availableMonthlyTokens = 0;
-    _availableExtraTokens = 0;
-    get availableMonthlyTokens() {
-      return this._availableMonthlyTokens ?? 0;
+    monthlyCredits = 0;
+    _availableMonthlyCredits = 0;
+    _availableExtraCredits = 0;
+    get availableMonthlyCredits() {
+      return this._availableMonthlyCredits ?? 0;
     }
-    get availableExtraTokens() {
-      return this._availableExtraTokens ?? 0;
+    get availableExtraCredits() {
+      return this._availableExtraCredits ?? 0;
     }
   }
   return {
@@ -187,9 +187,9 @@ describe("CurrentUserProvider token updates", () => {
     modules: [],
     company: {
       id: "company-1",
-      monthlyTokens: 1000,
-      _availableMonthlyTokens: 900,
-      _availableExtraTokens: 50,
+      monthlyCredits: 1000,
+      _availableMonthlyCredits: 900,
+      _availableExtraCredits: 50,
     },
   };
 
@@ -197,7 +197,7 @@ describe("CurrentUserProvider token updates", () => {
     const { company } = useCurrentUserContext();
     return (
       <div data-testid="balances">
-        {company ? `${(company as any).availableMonthlyTokens}/${(company as any).availableExtraTokens}` : "null"}
+        {company ? `${(company as any).availableMonthlyCredits}/${(company as any).availableExtraCredits}` : "null"}
       </div>
     );
   }
@@ -208,7 +208,7 @@ describe("CurrentUserProvider token updates", () => {
     vi.clearAllMocks();
   });
 
-  it("patches balances from company:tokens_updated without refetching the user", async () => {
+  it("patches balances from company:credits_updated without refetching the user", async () => {
     localStorage.setItem("user", JSON.stringify(STORED_USER));
 
     const { getByTestId } = render(
@@ -221,11 +221,11 @@ describe("CurrentUserProvider token updates", () => {
     expect(getByTestId("balances").textContent).toBe("900/50");
 
     await act(async () => {
-      socketMock.emit("company:tokens_updated", {
-        type: "company:tokens_updated",
+      socketMock.emit("company:credits_updated", {
+        type: "company:credits_updated",
         companyId: "company-1",
-        availableMonthlyTokens: 750,
-        availableExtraTokens: 40,
+        availableMonthlyCredits: 750,
+        availableExtraCredits: 40,
       });
     });
 
@@ -233,7 +233,7 @@ describe("CurrentUserProvider token updates", () => {
     expect(UserService.findFullUser).not.toHaveBeenCalled();
   });
 
-  it("ignores company:tokens_updated for a different company", async () => {
+  it("ignores company:credits_updated for a different company", async () => {
     localStorage.setItem("user", JSON.stringify(STORED_USER));
 
     const { getByTestId } = render(
@@ -245,11 +245,11 @@ describe("CurrentUserProvider token updates", () => {
     await new Promise((resolve) => setTimeout(resolve, 50));
 
     await act(async () => {
-      socketMock.emit("company:tokens_updated", {
-        type: "company:tokens_updated",
+      socketMock.emit("company:credits_updated", {
+        type: "company:credits_updated",
         companyId: "someone-else",
-        availableMonthlyTokens: 1,
-        availableExtraTokens: 1,
+        availableMonthlyCredits: 1,
+        availableExtraCredits: 1,
       });
     });