fix(ui): data table inconsistencies

kouprlabs · Nov 10, 2024 · 1cde582 · 1cde582
1 parent 55763e5
commit 1cde582
Show file tree

Hide file tree

Showing 31 changed files with 1,538 additions and 1,454 deletions.
diff --git a/console/api/models/generic.py b/console/api/models/generic.py
@@ -47,7 +47,7 @@ class CountResponse(BaseModel):
 
 class GenericListResponse(BaseModel):
     totalElements: int
-    totalPages: int | None = Field(None)
+    totalPages: int
     page: int
     size: int
     data: List[Any]

diff --git a/console/api/routers/group.py b/console/api/routers/group.py
@@ -75,7 +75,11 @@ async def get_all_groups(data: Annotated[GroupListRequest, Depends()]):
         groups, count = fetch_groups(page=data.page, size=data.size)
 
         return GroupListResponse(
-            data=groups, totalElements=count, page=data.page, size=data.size
+            data=groups,
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
+            page=data.page,
+            size=data.size,
         )
     except EmptyDataException as e:
         logger.error(e)
@@ -101,9 +105,12 @@ async def get_search_groups(data: Annotated[GroupSearchRequest, Depends()]):
                 hits.append(group)
             except NotFoundException:
                 pass
+        count = len(groups["hits"])
+
         return GroupListResponse(
             data=hits,
-            totalElements=len(groups["hits"]),
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
             page=data.page,
             size=data.size,
         )

diff --git a/console/api/routers/invitation.py b/console/api/routers/invitation.py
@@ -64,7 +64,11 @@ async def get_all_invitations(data: Annotated[InvitationListRequest, Depends()])
         invitations, count = fetch_invitations(page=data.page, size=data.size)
 
         return InvitationListResponse(
-            data=invitations, totalElements=count, page=data.page, size=data.size
+            data=invitations,
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
+            page=data.page,
+            size=data.size,
         )
     except EmptyDataException as e:
         logger.error(e)

diff --git a/console/api/routers/organization.py b/console/api/routers/organization.py
@@ -90,7 +90,11 @@ async def get_all_organizations(data: Annotated[OrganizationListRequest, Depends
         organizations, count = fetch_organizations(page=data.page, size=data.size)
 
         return OrganizationListResponse(
-            data=organizations, totalElements=count, page=data.page, size=data.size
+            data=organizations,
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
+            page=data.page,
+            size=data.size,
         )
     except EmptyDataException as e:
         logger.error(e)
@@ -118,9 +122,12 @@ async def get_search_organizations(
                 hits.append(organization)
             except NotFoundException:
                 pass
+        count = len(organizations["hits"])
+
         return OrganizationListResponse(
             data=hits,
-            totalElements=len(organizations["hits"]),
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
             page=data.page,
             size=data.size,
         )
@@ -145,7 +152,11 @@ async def get_organization_users(
         )
 
         return OrganizationUserListResponse(
-            data=users, totalElements=count, page=data.page, size=data.size
+            data=users,
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
+            page=data.page,
+            size=data.size,
         )
     except EmptyDataException as e:
         logger.error(e)
@@ -171,7 +182,11 @@ async def get_organization_workspaces(
         )
 
         return OrganizationWorkspaceListResponse(
-            data=workspaces, totalElements=count, page=data.page, size=data.size
+            data=workspaces,
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
+            page=data.page,
+            size=data.size,
         )
     except EmptyDataException as e:
         logger.error(e)
@@ -197,7 +212,11 @@ async def get_organization_groups(
         )
 
         return OrganizationWorkspaceListResponse(
-            data=groups, totalElements=count, page=data.page, size=data.size
+            data=groups,
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
+            page=data.page,
+            size=data.size,
         )
     except EmptyDataException as e:
         logger.error(e)

diff --git a/console/api/routers/snapshot.py b/console/api/routers/snapshot.py
@@ -64,7 +64,11 @@ async def get_all_snapshots(data: Annotated[SnapshotListRequest, Depends()]):
         snapshots, count = fetch_snapshots(page=data.page, size=data.size)
 
         return SnapshotListResponse(
-            data=snapshots, totalElements=count["count"], page=data.page, size=data.size
+            data=snapshots,
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
+            page=data.page,
+            size=data.size,
         )
     except EmptyDataException as e:
         logger.error(e)

diff --git a/console/api/routers/user.py b/console/api/routers/user.py
@@ -59,7 +59,11 @@ async def get_user_organizations(
         )
 
         return UserOrganizationListResponse(
-            data=organizations, totalElements=count, page=data.page, size=data.size
+            data=organizations,
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
+            page=data.page,
+            size=data.size,
         )
     except EmptyDataException as e:
         logger.error(e)
@@ -83,7 +87,11 @@ async def get_user_workspaces(data: Annotated[UserWorkspaceListRequest, Depends(
         )
 
         return UserWorkspaceListResponse(
-            data=workspaces, totalElements=count, page=data.page, size=data.size
+            data=workspaces,
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
+            page=data.page,
+            size=data.size,
         )
     except EmptyDataException as e:
         logger.error(e)
@@ -106,7 +114,11 @@ async def get_user_groups(data: Annotated[UserGroupListRequest, Depends()]):
         )
 
         return UserGroupListResponse(
-            data=groups, totalElements=count, page=data.page, size=data.size
+            data=groups,
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
+            page=data.page,
+            size=data.size,
         )
     except EmptyDataException as e:
         logger.error(e)

diff --git a/console/api/routers/workspace.py b/console/api/routers/workspace.py
@@ -91,7 +91,11 @@ async def get_all_workspaces(data: Annotated[WorkspaceListRequest, Depends()]):
         workspaces, count = fetch_workspaces(page=data.page, size=data.size)
 
         return WorkspaceListResponse(
-            data=workspaces, totalElements=count, page=data.page, size=data.size
+            data=workspaces,
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
+            page=data.page,
+            size=data.size,
         )
     except EmptyDataException as e:
         logger.error(e)
@@ -117,9 +121,12 @@ async def get_search_workspaces(data: Annotated[WorkspaceSearchRequest, Depends(
                 hits.append(workspace)
             except NotFoundException:
                 pass
+        count = len(workspaces["hits"])
+
         return WorkspaceListResponse(
             data=hits,
-            totalElements=len(workspaces["hits"]),
+            totalElements=count,
+            totalPages=(count + data.size - 1) // data.size,
             page=data.page,
             size=data.size,
         )

diff --git a/idp/src/user/service.ts b/idp/src/user/service.ts
@@ -52,6 +52,7 @@ export interface UserAdminList {
   page: number
   size: number
   totalElements: number
+  totalPages: number
 }
 
 export type PictureDTO = {
@@ -147,6 +148,7 @@ export async function list({
         )
       ).map((value) => adminMapEntity(value)),
       totalElements: users.totalElements,
+      totalPages: Math.floor((users.totalElements + size - 1) / size),
       size: size,
       page: page,
     }
@@ -156,6 +158,7 @@ export async function list({
         adminMapEntity(value),
       ),
       totalElements: await userRepo.getCount(),
+      totalPages: Math.floor(((await userRepo.getCount()) + size - 1) / size),
       size: size,
       page: page,
     }

diff --git a/ui/bun.lockb b/ui/bun.lockb
diff --git a/ui/package.json b/ui/package.json
@@ -23,7 +23,7 @@
     "@emotion/react": "11.13.3",
     "@emotion/styled": "11.13.0",
     "@google/model-viewer": "4.0.0",
-    "@koupr/ui": "1.10.8",
+    "@koupr/ui": "1.10.9",
     "@nivo/core": "0.87.0",
     "@nivo/pie": "0.87.0",
     "@reduxjs/toolkit": "2.3.0",

diff --git a/ui/src/client/console/console.ts b/ui/src/client/console/console.ts
@@ -23,7 +23,7 @@ export type ConsoleObject =
 
 export interface ListResponse<T> {
   totalElements: number
-  totalPages: number | null
+  totalPages: number
   page: number
   size: number
   data: T[]

diff --git a/ui/src/client/idp/user.ts b/ui/src/client/idp/user.ts
@@ -31,6 +31,7 @@ export interface ConsoleUser extends User {
 export interface List {
   data: ConsoleUser[]
   totalElements: number
+  totalPages: number
   page: number
   size: number
 }