From ee8e547f2ac2e3d8f850e5ac59c2a6d4e683e1b9 Mon Sep 17 00:00:00 2001
From: Ayush2198-source <jaiswal.ayush2198@gmail.com>
Date: Mon, 2 Dec 2024 00:23:48 +0530
Subject: [PATCH] code review changes

---
 .../components/admin-users/admin-users.component.ts   | 10 +++++++---
 .../src/app/components/admin-users/admin-users.html   |  2 ++
 .../app/components/admin-users/admin-users.module.ts  |  4 ++--
 apps/client/src/app/services/admin.service.ts         | 11 +++++++++--
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/apps/client/src/app/components/admin-users/admin-users.component.ts b/apps/client/src/app/components/admin-users/admin-users.component.ts
index f185401df..d684961b6 100644
--- a/apps/client/src/app/components/admin-users/admin-users.component.ts
+++ b/apps/client/src/app/components/admin-users/admin-users.component.ts
@@ -42,10 +42,10 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
   public hasPermissionToImpersonateAllUsers: boolean;
   public info: InfoItem;
   public isLoading = false;
-  public user: User;
-
   public pageSize = DEFAULT_PAGE_SIZE;
   public totalItems = 0;
+  public user: User;
+
   private unsubscribeSubject = new Subject<void>();
 
   public constructor(
@@ -167,12 +167,16 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
     }
 
     this.adminService
-      .fetchUsers(pageIndex * this.pageSize, this.pageSize)
+      .fetchUsers({
+        skip: pageIndex * this.pageSize,
+        take: this.pageSize
+      })
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(({ count, users }) => {
         this.totalItems = count;
 
         this.dataSource = new MatTableDataSource(users);
+
         this.isLoading = false;
 
         this.changeDetectorRef.markForCheck();
diff --git a/apps/client/src/app/components/admin-users/admin-users.html b/apps/client/src/app/components/admin-users/admin-users.html
index 1a66423bb..ca8ef0558 100644
--- a/apps/client/src/app/components/admin-users/admin-users.html
+++ b/apps/client/src/app/components/admin-users/admin-users.html
@@ -267,6 +267,7 @@
           ></tr>
         </table>
       </div>
+
       <mat-paginator
         [length]="totalItems"
         [ngClass]="{
@@ -276,6 +277,7 @@
         [showFirstLastButtons]="true"
         (page)="onChangePage($event)"
       />
+
       @if (isLoading) {
         <ngx-skeleton-loader
           animation="pulse"
diff --git a/apps/client/src/app/components/admin-users/admin-users.module.ts b/apps/client/src/app/components/admin-users/admin-users.module.ts
index cc394c4ef..af4acc77d 100644
--- a/apps/client/src/app/components/admin-users/admin-users.module.ts
+++ b/apps/client/src/app/components/admin-users/admin-users.module.ts
@@ -21,8 +21,8 @@ import { AdminUsersComponent } from './admin-users.component';
     MatButtonModule,
     MatMenuModule,
     MatTableModule,
-    NgxSkeletonLoaderModule,
-    MatPaginatorModule
+    MatPaginatorModule,
+    NgxSkeletonLoaderModule
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
diff --git a/apps/client/src/app/services/admin.service.ts b/apps/client/src/app/services/admin.service.ts
index e297dfca9..5d252f00f 100644
--- a/apps/client/src/app/services/admin.service.ts
+++ b/apps/client/src/app/services/admin.service.ts
@@ -10,6 +10,7 @@ import {
   HEADER_KEY_TOKEN,
   PROPERTY_API_KEY_GHOSTFOLIO
 } from '@ghostfolio/common/config';
+import { DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config';
 import { DATE_FORMAT } from '@ghostfolio/common/helper';
 import {
   AssetProfileIdentifier,
@@ -179,11 +180,17 @@ export class AdminService {
     return this.http.get<Tag[]>('/api/v1/tag');
   }
 
-  public fetchUsers(skip: number, take: number) {
+  public fetchUsers({
+    skip,
+    take = DEFAULT_PAGE_SIZE
+  }: {
+    skip?: number;
+    take?: number;
+  }) {
     let params = new HttpParams();
 
-    params = params.append('take', take);
     params = params.append('skip', skip);
+    params = params.append('take', take);
 
     return this.http.get<AdminUsers>('/api/v1/admin/user', { params });
   }