@carlonicora/nextjs-jsonapi 5.4.0 → 5.5.0

package/src/features/tokenusage/tokenusage.modules.ts

@@ -1,3 +1,4 @@
+import { CoinsIcon } from "lucide-react";
 import { ModuleFactory, ModuleWithPermissions } from "../../permissions";
 import { TokenUsageAdminBreakdown } from "./data/tokenusage-admin-breakdown";
 import { TokenUsageAdminSummary } from "./data/tokenusage-admin-summary";
@@ -28,11 +29,20 @@ import { TokenUsageReportTimeline } from "./data/tokenusage-report-timeline";
  */
 export const tokenUsageModules = (factory: ModuleFactory) =>
   ({
-    TokenUsageAdminSummary: factory({ name: "tokenusages/administration/summary", model: TokenUsageAdminSummary }),
-    TokenUsageAdminTimeline: factory({ name: "tokenusages/administration/timeline", model: TokenUsageAdminTimeline }),
+    TokenUsageAdminSummary: factory({
+      name: "tokenusages/administration/summary",
+      model: TokenUsageAdminSummary,
+      icon: CoinsIcon,
+    }),
+    TokenUsageAdminTimeline: factory({
+      name: "tokenusages/administration/timeline",
+      model: TokenUsageAdminTimeline,
+      icon: CoinsIcon,
+    }),
     TokenUsageAdminBreakdown: factory({
       name: "tokenusages/administration/breakdown",
       model: TokenUsageAdminBreakdown,
+      icon: CoinsIcon,
     }),
     TokenUsageReportSummary: factory({ name: "tokenusages/reports/summary", model: TokenUsageReportSummary }),
     TokenUsageReportTimeline: factory({ name: "tokenusages/reports/timeline", model: TokenUsageReportTimeline }),

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

@@ -7,6 +7,7 @@ import { JsonApiHydratedDataInterface, Modules, rehydrate } from "../../../core"
 import { usePageUrlGenerator } from "../../../hooks";
 import { BreadcrumbItemData } from "../../../interfaces";
 import { Action } from "../../../permissions";
+import { getRoleId } from "../../../roles";
 import { UserDeleter, UserEditor, UserReactivator, UserResentInvitationEmail } from "../components/forms";
 import { UserInterface } from "../data";
 import { useCurrentUserContext } from "./CurrentUserContext";
@@ -18,6 +19,14 @@ interface UserContextType {
 
 const UserContext = createContext<UserContextType | undefined>(undefined);
 
+/**
+ * The platform-wide user list administrators use (PlatformUsersContainer). The
+ * User module's own `pageUrl` (/users) is the company-scoped list, which a
+ * system administrator, who belongs to no company, sees empty. Same path
+ * convention as the hrefs in AdminIndexContainer.
+ */
+const USERS_ADMIN_PAGE_URL = "/administration/users";
+
 type UserProviderProps = {
   children: ReactNode;
   dehydratedUser?: JsonApiHydratedDataInterface;
@@ -25,7 +34,7 @@ type UserProviderProps = {
 
 export const UserProvider = ({ children, dehydratedUser }: UserProviderProps) => {
   const generateUrl = usePageUrlGenerator();
-  const { hasPermissionToModule } = useCurrentUserContext<UserInterface>();
+  const { hasPermissionToModule, hasRole } = useCurrentUserContext<UserInterface>();
   const t = useTranslations();
 
   const [user, setUser] = useState<UserInterface | undefined>(
@@ -35,10 +44,16 @@ export const UserProvider = ({ children, dehydratedUser }: UserProviderProps) =>
   const breadcrumb = () => {
     const response: BreadcrumbItemData[] = [];
 
-    if (hasPermissionToModule({ module: Modules.User, action: Action.Update })) {
+    // Administrators are checked by role, as CompanyProvider does: an app may
+    // grant them no module permission, and their list is the administration one.
+    const isAdministrator = hasRole(getRoleId().Administrator);
+
+    // The list root comes first, linked ONLY when it is not the current page
+    // (same rule as CompanyProvider).
+    if (isAdministrator || hasPermissionToModule({ module: Modules.User, action: Action.Update })) {
       response.push({
         name: t(`entities.users`, { count: 2 }),
-        href: generateUrl({ page: Modules.User }),
+        ...(user ? { href: generateUrl({ page: isAdministrator ? USERS_ADMIN_PAGE_URL : Modules.User }) } : {}),
       });
     }
 

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

@@ -0,0 +1,95 @@
+import { render, screen } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { useSharedContext } from "../../../../contexts/SharedContext";
+import { UserProvider } from "../UserContext";
+
+const access = vi.hoisted(() => ({ isAdministrator: false, canUpdateUsers: false }));
+
+vi.mock("../CurrentUserContext", () => ({
+  useCurrentUserContext: () => ({
+    hasRole: (roleId: string) => access.isAdministrator && roleId === "administrator",
+    hasPermissionToModule: () => access.canUpdateUsers,
+  }),
+}));
+
+vi.mock("../../../../roles", () => ({
+  getRoleId: () => ({ Administrator: "administrator" }),
+}));
+
+// The title functions are not under test; the real forms pull in the editor stack.
+vi.mock("../../components/forms", () => ({
+  UserDeleter: () => null,
+  UserEditor: () => null,
+  UserReactivator: () => null,
+  UserResentInvitationEmail: () => null,
+}));
+
+// The registry throws for modules nobody registered. The dehydrated user is
+// handed back as-is so the spec does not depend on the User model.
+vi.mock("../../../../core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../../../../core")>();
+  return {
+    ...actual,
+    Modules: { User: { name: "users", pageUrl: "/users" } },
+    rehydrate: (_module: unknown, data: unknown) => data,
+  };
+});
+
+// next-intl is globally mocked in vitest.setup.ts with `t = (key) => key`, so a
+// translated label renders as its own key.
+function BreadcrumbProbe() {
+  const { breadcrumbs } = useSharedContext();
+  return <span data-testid="breadcrumbs">{JSON.stringify(breadcrumbs)}</span>;
+}
+
+const user = { id: "u1", name: "Ada", isDeleted: false, isActivated: true } as any;
+
+const renderBreadcrumbs = (dehydratedUser?: any) => {
+  render(
+    <UserProvider dehydratedUser={dehydratedUser}>
+      <BreadcrumbProbe />
+    </UserProvider>,
+  );
+  return JSON.parse(screen.getByTestId("breadcrumbs").textContent ?? "[]");
+};
+
+describe("UserContext breadcrumb", () => {
+  beforeEach(() => {
+    access.isAdministrator = false;
+    access.canUpdateUsers = false;
+  });
+
+  it("shows an administrator the users list as an unlinked root, even without the module permission", () => {
+    access.isAdministrator = true;
+
+    expect(renderBreadcrumbs()).toEqual([{ name: "entities.users" }]);
+  });
+
+  it("links an administrator's user detail back to the administration users list", () => {
+    access.isAdministrator = true;
+
+    expect(renderBreadcrumbs(user)).toEqual([
+      { name: "entities.users", href: "/administration/users" },
+      { name: "Ada", href: "/users/u1" },
+    ]);
+  });
+
+  it("shows a user manager the company users list as an unlinked root", () => {
+    access.canUpdateUsers = true;
+
+    expect(renderBreadcrumbs()).toEqual([{ name: "entities.users" }]);
+  });
+
+  it("links a user manager's user detail back to the company users list", () => {
+    access.canUpdateUsers = true;
+
+    expect(renderBreadcrumbs(user)).toEqual([
+      { name: "entities.users", href: "/users" },
+      { name: "Ada", href: "/users/u1" },
+    ]);
+  });
+
+  it("shows only the user to a viewer who can neither manage users nor administer", () => {
+    expect(renderBreadcrumbs(user)).toEqual([{ name: "Ada", href: "/users/u1" }]);
+  });
+});