@truedat/auth 7.5.9 → 7.5.10

package/src/users/components/__tests__/UserGroupAclRow.spec.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { waitFor } from "@testing-library/react";
 import { render } from "@truedat/test/render";
 import UserGroupAclRow from "../UserGroupAclRow";
@@ -7,7 +6,7 @@ describe("<UserGroupAclRow />", () => {
   const props = {
     resource: "resource1",
     role: "role1",
-    group: "grupo1"
+    group: "grupo1",
   };
 
   it("matches the latest snapshot", async () => {

package/src/users/components/__tests__/UserGroupAcls.spec.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { waitFor } from "@testing-library/react";
 import { render } from "@truedat/test/render";
 import { UserGroupAcls } from "../UserGroupAcls";
@@ -8,8 +7,8 @@ const renderOpts = {
     en: {
       "user.acl.role": "role",
       "user.acl.domain": "domain",
-      "user.acl": "acl"
-    }
+      "user.acl": "acl",
+    },
   },
   state: {
     user: {
@@ -17,16 +16,16 @@ const renderOpts = {
         {
           resource: { id: 1, name: "resource1", type: "domain" },
           role: { id: 2, name: "role1" },
-          group: { id: 6, name: "group1" }
+          group: { id: 6, name: "group1" },
         },
         {
           resource: { id: 2, name: "resource2", type: "domain" },
           role: { id: 3, name: "role2" },
-          group: { id: 3, name: "group2" }
-        }
-      ]
-    }
-  }
+          group: { id: 3, name: "group2" },
+        },
+      ],
+    },
+  },
 };
 
 describe("<UserGroupAcls />", () => {

package/src/users/components/__tests__/UserLoader.spec.js

@@ -0,0 +1,85 @@
+import React from "react";
+import { render, waitForLoad } from "@truedat/test/render";
+import { useParams } from "react-router";
+import UserLoader from "../UserLoader";
+import { clearUser, fetchUser } from "../../routines";
+
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"),
+  useParams: jest.fn(),
+}));
+
+describe("<UserLoader />", () => {
+  beforeEach(() => {
+    useParams.mockReturnValue({ id: null });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("matches the latest snapshot", async () => {
+    const rendered = render(<UserLoader />, {
+      state: {
+        userLoading: false,
+      },
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("dispatches clearUser when no id is provided", async () => {
+    const mockDispatch = jest.fn();
+    useParams.mockReturnValue({ id: null });
+
+    render(<UserLoader />, {
+      dispatch: mockDispatch,
+    });
+
+    expect(mockDispatch).toHaveBeenCalledWith(clearUser());
+  });
+
+  it("dispatches fetchUser when id is provided", async () => {
+    const mockDispatch = jest.fn();
+    useParams.mockReturnValue({ id: "123" });
+
+    render(<UserLoader />, {
+      dispatch: mockDispatch,
+    });
+
+    expect(mockDispatch).toHaveBeenCalledWith(fetchUser({ id: "123" }));
+  });
+
+  it("renders loading component when userLoading is true", async () => {
+    const rendered = render(<UserLoader />, {
+      state: {
+        userLoading: true,
+      },
+    });
+
+    expect(rendered.container.firstChild).not.toBeNull();
+  });
+
+  it("renders nothing when userLoading is false", async () => {
+    const rendered = render(<UserLoader />, {
+      state: {
+        userLoading: false,
+      },
+    });
+    await waitForLoad(rendered);
+
+    expect(rendered.container.firstChild).toBeNull();
+  });
+
+  it("dispatches clearUser on unmount", async () => {
+    const mockDispatch = jest.fn();
+    const { unmount } = render(<UserLoader />, {
+      dispatch: mockDispatch,
+    });
+
+    mockDispatch.mockClear();
+    unmount();
+
+    expect(mockDispatch).toHaveBeenCalledWith(clearUser());
+  });
+});

package/src/users/components/__tests__/UserPassword.spec.js

@@ -1,37 +1,24 @@
-import React from "react";
-import { waitFor } from "@testing-library/react";
-import { render } from "@truedat/test/render";
+import { render, waitForLoad } from "@truedat/test/render";
 import { UserPassword } from "../UserPassword";
 
 const renderOpts = {
-  messages: {
-    en: {
-      "actions.cancel": "cancel",
-      "form.validation.minLength": "{prop} min length {value}",
-      "form.validation.required": "{prop} required",
-      "login.form.re_password.label": "re_password",
-      "navigation.members.users": "users",
-      "user.password.change": "change password",
-      "user.password.new_password": "new_password",
-      "user.password.save": "save"
-    }
-  },
   state: {
     authentication: {
-      user_name: "foo"
-    }
-  }
+      user_name: "foo",
+    },
+  },
 };
 
 describe("<UserPassword />", () => {
   const user = {
     id: 1,
-    user_name: "joe"
+    user_name: "joe",
   };
   const props = { user };
 
   it("matches the latest snapshot", async () => {
-    const { container } = render(<UserPassword {...props} />, renderOpts);
-    await waitFor(() => expect(container).toMatchSnapshot());
+    const rendered = render(<UserPassword {...props} />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/users/components/__tests__/UserRoutes.spec.js

@@ -1,10 +1,135 @@
 import React from "react";
-import { shallow } from "enzyme";
+import { render, waitForLoad } from "@truedat/test/render";
 import { UserRoutes } from "../UserRoutes";
+import { useAuthorized } from "@truedat/core/hooks/useAuthorized";
+
+jest.mock("@truedat/core/hooks/useAuthorized", () => ({
+  useAuthorized: jest.fn(() => true),
+}));
+
+// Mock all components used in UserRoutes
+jest.mock("../Password", () => () => <div>Password</div>);
+jest.mock("../../../groups/components/GroupsLoader", () => () => (
+  <div>GroupsLoader</div>
+));
+jest.mock("../../../groups/components/GroupLoader", () => () => (
+  <div>GroupLoader</div>
+));
+jest.mock("../../../groups/components/Group", () => () => <div>Group</div>);
+jest.mock("../../../groups/components/GroupUsers", () => () => (
+  <div>GroupUsers</div>
+));
+jest.mock("../../../groups/components/NewGroup", () => () => (
+  <div>NewGroup</div>
+));
+jest.mock("../../../groups/components/EditGroup", () => () => (
+  <div>EditGroup</div>
+));
+jest.mock("../EditUser", () => () => <div>EditUser</div>);
+jest.mock("../GroupUserCrumbs", () => () => <div>GroupUserCrumbs</div>);
+jest.mock("../NewUser", () => () => <div>NewUser</div>);
+jest.mock("../User", () => () => <div>User</div>);
+jest.mock("../UserLoader", () => () => <div>UserLoader</div>);
+jest.mock("../UsersAndGroups", () => () => <div>UsersAndGroups</div>);
+jest.mock("../UsersLoader", () => () => <div>UsersLoader</div>);
+jest.mock("../UserPassword", () => () => <div>UserPassword</div>);
+jest.mock("@truedat/core/router/Unauthorized", () => () => (
+  <div>Unauthorized</div>
+));
 
 describe("<UserRoutes />", () => {
-  it("matches the latest snapshot", () => {
-    const wrapper = shallow(<UserRoutes />);
-    expect(wrapper).toMatchSnapshot();
+  it("renders correctly with default route", async () => {
+    const rendered = render(<UserRoutes />);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with users route", async () => {
+    const rendered = render(<UserRoutes />, {
+      routes: ["/users"],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with users/new route", async () => {
+    const rendered = render(<UserRoutes />, {
+      routes: ["/users/new"],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with users/:id route", async () => {
+    const rendered = render(<UserRoutes />, {
+      routes: ["/users/123"],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with users/:id/edit route", async () => {
+    const rendered = render(<UserRoutes />, {
+      routes: ["/users/123/edit"],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with users/:id/password route", async () => {
+    const rendered = render(<UserRoutes />, {
+      routes: ["/users/123/password"],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with groups route", async () => {
+    const rendered = render(<UserRoutes />, {
+      routes: ["/groups"],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with groups/new route", async () => {
+    const rendered = render(<UserRoutes />, {
+      routes: ["/groups/new"],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with groups/:id route", async () => {
+    const rendered = render(<UserRoutes />, {
+      routes: ["/groups/123"],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with groups/:id/edit route", async () => {
+    const rendered = render(<UserRoutes />, {
+      routes: ["/groups/123/edit"],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with PASSWORD route", async () => {
+    const rendered = render(<UserRoutes />, {
+      routes: ["/password"],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders unauthorized component when not authorized", async () => {
+    useAuthorized.mockReturnValueOnce(false);
+    const rendered = render(<UserRoutes />, {
+      routes: ["/users"],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/users/components/__tests__/UserSelector.spec.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { render } from "@truedat/test/render";
 import UserSelector from "../UserSelector";
 

package/src/users/components/__tests__/UsersAndGroups.spec.js

@@ -1,10 +1,50 @@
-import React from "react";
-import { render } from "@truedat/test/render";
+import { render, waitForLoad } from "@truedat/test/render";
+import { USERS, GROUPS } from "@truedat/core/routes";
 import { UsersAndGroups } from "../UsersAndGroups";
 
+// Mock the components used in UsersAndGroups
+jest.mock(
+  "../UserCards",
+  () =>
+    function UserCards() {
+      return <div>UserCards</div>;
+    }
+);
+jest.mock(
+  "../UserTabs",
+  () =>
+    function UserTabs() {
+      return <div>UserTabs</div>;
+    }
+);
+jest.mock(
+  "../../../groups/components/GroupCards",
+  () =>
+    function GroupCards() {
+      return <div>GroupCards</div>;
+    }
+);
+
 describe("<UsersAndGroups />", () => {
-  it("matches the latest snapshot", () => {
-    const { container } = render(<UsersAndGroups />);
-    expect(container).toMatchSnapshot();
+  it("renders correctly with default route", async () => {
+    const rendered = render(<UsersAndGroups />);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders UserCards on USERS route", async () => {
+    const rendered = render(<UsersAndGroups />, {
+      routes: [USERS],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders GroupCards on GROUPS route", async () => {
+    const rendered = render(<UsersAndGroups />, {
+      routes: [GROUPS],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/users/components/__tests__/UsersSearchLoader.spec.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { render } from "@truedat/test/render";
 import UsersSearchLoader from "../UsersSearchLoader";
 

package/src/users/components/__tests__/__snapshots__/EditUser.spec.js.snap

@@ -7,9 +7,10 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
   >
     <a
       class="section"
+      data-discover="true"
       href="/users"
     >
-      Users
+      navigation.members.users
     </a>
     <i
       aria-hidden="true"
@@ -18,7 +19,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
     <div
       class="active section"
     >
-      edit
+      users.actions.edit
     </div>
   </div>
   <div
@@ -34,7 +35,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
       <div
         class="content"
       >
-        edit
+        users.actions.edit
       </div>
     </h2>
     <form
@@ -46,7 +47,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
         <label
           for="user_name"
         >
-          Username
+          user.form.user_name
         </label>
         <div
           class="ui input"
@@ -54,7 +55,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
           <input
             autocomplete="off"
             id="user_name"
-            placeholder="pperez"
+            placeholder="user.form.placeholder.user_name"
             required=""
             type="text"
             value="fred"
@@ -67,7 +68,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
         <label
           for="external_id"
         >
-          External ID
+          user.form.external_id
         </label>
         <div
           class="ui input"
@@ -75,7 +76,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
           <input
             autocomplete="off"
             id="external_id"
-            placeholder="pperez"
+            placeholder="user.form.placeholder.external_id"
             type="text"
             value=""
           />
@@ -87,7 +88,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
         <label
           for="email"
         >
-          Email address
+          user.form.email
         </label>
         <div
           class="ui input"
@@ -95,7 +96,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
           <input
             autocomplete="off"
             id="email"
-            placeholder="pperez@example.com"
+            placeholder="user.form.placeholder.email"
             type="text"
             value=""
           />
@@ -107,7 +108,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
         <label
           for="full_name"
         >
-          Full name
+          user.form.full_name
         </label>
         <div
           class="ui input"
@@ -115,7 +116,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
           <input
             autocomplete="off"
             id="full_name"
-            placeholder="Pepe Perez"
+            placeholder="user.form.placeholder.full_name"
             required=""
             type="text"
             value="fredrik foobar"
@@ -126,7 +127,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
         class="required field"
       >
         <label>
-          role
+          user.form.role
         </label>
         <div
           aria-expanded="false"
@@ -142,7 +143,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
             class="divider text"
             role="alert"
           >
-            user
+            user.type.user
           </div>
           <i
             aria-hidden="true"
@@ -161,7 +162,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
               <span
                 class="text"
               >
-                user
+                user.type.user
               </span>
             </div>
             <div
@@ -174,7 +175,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
               <span
                 class="text"
               >
-                admin
+                user.type.admin
               </span>
             </div>
             <div
@@ -187,7 +188,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
               <span
                 class="text"
               >
-                service
+                user.type.service
               </span>
             </div>
             <div
@@ -200,7 +201,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
               <span
                 class="text"
               >
-                Ai Agent
+                user.type.agent
               </span>
             </div>
           </div>
@@ -210,7 +211,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
         class="field"
       >
         <label>
-          Groups
+          user.form.groups
         </label>
         <div
           aria-expanded="false"
@@ -235,7 +236,7 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
             class="divider default text"
             role="alert"
           >
-            Madrid DG
+            user.form.placeholder.groups
           </div>
           <i
             aria-hidden="true"
@@ -269,14 +270,15 @@ exports[`<EditUser /> matches the latest snapshot 1`] = `
           tabindex="-1"
           type="submit"
         >
-          save
+          actions.save
         </button>
         <a
           class="ui secondary button"
+          data-discover="true"
           href="/"
           role="button"
         >
-          cancel
+          actions.cancel
         </a>
       </div>
     </form>