🧪 test(roles): update roles case tests

Author: thrownullexception

src/__tests__/actions/constants.spec.tsx

@@ -31,7 +31,7 @@ describe("pages/actions/constants", () => {
 
       expect(
         await screen.findByRole("row", {
-          name: "Key Sort By Key Value Sort By Value Action",
+          name: "Key Sort By Key Filter By Search Value Sort By Value Action",
         })
       ).toBeInTheDocument();
       expect(

src/__tests__/api/account/index.spec.ts

@@ -22,7 +22,7 @@ describe("/api/account/index", () => {
       [
         {
           "name": "Root User",
-          "role": "creator",
+          "role": "Creator",
           "username": "root",
         },
       ]
@@ -55,7 +55,7 @@ describe("/api/account/index", () => {
     expect(getRequest.res._getJSONData()[1]).toMatchInlineSnapshot(`
       {
         "name": "New user",
-        "role": "viewer",
+        "role": "Viewer",
         "username": "newuser",
       }
     `);
@@ -97,7 +97,7 @@ describe("/api/account/index", () => {
     expect(getRequest.res._getJSONData()[1]).toMatchInlineSnapshot(`
       {
         "name": "New user",
-        "role": "viewer",
+        "role": "Viewer",
         "username": "newuser",
       }
     `);

src/__tests__/roles/index.spec.tsx

@@ -24,7 +24,9 @@ describe("pages/roles", () => {
     );
 
     expect(
-      await screen.findByRole("row", { name: "Role Sort By Role Action" })
+      await screen.findByRole("row", {
+        name: "Role Sort By Role Filter By Search Action",
+      })
     ).toBeInTheDocument();
     expect(screen.getByRole("row", { name: "Creator" })).toBeInTheDocument();
     expect(screen.getByRole("row", { name: "Viewer" })).toBeInTheDocument();

src/__tests__/users/index.spec.tsx

@@ -25,17 +25,17 @@ describe("pages/users", () => {
 
     expect(
       await screen.findByRole("row", {
-        name: "Username Sort By Username Name Sort By Name Role Sort By Role Action",
+        name: "Username Sort By Username Filter By Search Name Sort By Name Filter By Search Role Sort By Role Filter By Search Action",
       })
     ).toBeInTheDocument();
     expect(
-      screen.getByRole("row", { name: "user-1 User 1 Role 1 Edit" })
+      screen.getByRole("row", { name: "user-1 User 1 role-1 Edit" })
     ).toBeInTheDocument();
     expect(
-      screen.getByRole("row", { name: "user-2 User 2 Role 2 Edit" })
+      screen.getByRole("row", { name: "user-2 User 2 role-2 Edit" })
     ).toBeInTheDocument();
     expect(
-      screen.getByRole("row", { name: "user-3 User 3 Role 3 Edit" })
+      screen.getByRole("row", { name: "user-3 User 3 role-3 Edit" })
     ).toBeInTheDocument();
   });
 

src/backend/users/users.controller.ts

@@ -1,5 +1,6 @@
 import { ForbiddenError } from "backend/lib/errors";
 import { RolesService, rolesService } from "backend/roles/roles.service";
+import { userFriendlyCase } from "frontend/lib/strings";
 import { REQUEST_ERROR_CODES } from "shared/constants/auth";
 import { ISignInForm } from "shared/form-schemas/auth/signin";
 import { IChangePasswordForm } from "shared/form-schemas/profile/password";
@@ -23,7 +24,10 @@ export class UsersController {
   }
 
   async listUsers() {
-    return await this._usersService.listUsers();
+    return (await this._usersService.listUsers()).map((user) => ({
+      ...user,
+      role: userFriendlyCase(user.role),
+    }));
   }
 
   async createUser(user: IAccountUser) {

src/backend/users/users.service.ts

@@ -11,7 +11,6 @@ import { HashService } from "backend/lib/hash/hash.service";
 import { IApplicationService } from "backend/types";
 import { IAccountUser, IAccountProfile } from "shared/types/user";
 import { ISuccessfullAuthenticationResponse } from "shared/types/auth";
-import { userFriendlyCase } from "frontend/lib/strings";
 
 const INVALID_LOGIN_MESSAGE = "Invalid Login";
 
@@ -64,7 +63,7 @@ export class UsersService implements IApplicationService {
       delete userCopy.systemProfile;
       delete userCopy.preferences;
 
-      return { ...userCopy, role: userFriendlyCase(user.role) };
+      return userCopy;
     });
   }
 

src/frontend/components/FEPaginationTable/useFEPagination.spec.ts

@@ -0,0 +1,9 @@
+import { noop } from "lodash";
+import { useFEPaginatedData } from "./useFEPagination";
+
+describe("Foo", () => {
+  it("Bar", () => {
+    noop(useFEPaginatedData);
+    expect(1).toBe(1);
+  });
+});

src/frontend/components/FEPaginationTable/useFEPagination.ts

@@ -24,19 +24,15 @@ export function useFEPaginatedData<T>(
   return useQuery<PaginatedData<T>>(
     getQueryCachekey(endPoint),
     async () => {
-      if (options?.wipData) {
-        return options.wipData;
-      }
       return await makeGetRequest(endPoint, "Data could not be retrieved");
     },
     {
       enabled: options.enabled,
       select: (data: any) => {
         let returnData: T[] = data as unknown as T[];
-        const pageSize = dataState.pageSize || DEFAULT_PAGE_SIZE;
         if (dataState.filters) {
           returnData = returnData.filter((datum) => {
-            return Object.values(dataState.filters || {}).every(($filter) => {
+            return (dataState.filters || []).every(($filter) => {
               const filter = $filter as unknown as QueryFilter;
               const filterValue = filter.value.value;
               const currentValue = get(datum, filter.id);
@@ -74,6 +70,8 @@ export function useFEPaginatedData<T>(
           });
         }
         const totalReturnData = returnData.length;
+        const pageSize = dataState.pageSize || DEFAULT_PAGE_SIZE;
+
         return {
           pageIndex: dataState.pageIndex,
           pageSize,