Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/add pagination to users table (#4092)

Ayush2198-sourcec85a1be3cf81
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b287755de1..aed13fe011 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## Unreleased
+
+### Added
+
+- Added pagination to the users table of the admin control panel
+
## 2.125.0 - 2024-11-30
### Changed
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 d619f4dd41..91c258f909 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
@@ -4,11 +4,19 @@ import { AdminService } from '@ghostfolio/client/services/admin.service';
import { DataService } from '@ghostfolio/client/services/data.service';
import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
import { UserService } from '@ghostfolio/client/services/user/user.service';
+import { DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config';
import { getDateFormatString, getEmojiFlag } from '@ghostfolio/common/helper';
import { AdminUsers, InfoItem, User } from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
+import {
+ ChangeDetectorRef,
+ Component,
+ OnDestroy,
+ OnInit,
+ ViewChild
+} from '@angular/core';
+import { MatPaginator, PageEvent } from '@angular/material/paginator';
import { MatTableDataSource } from '@angular/material/table';
import {
differenceInSeconds,
@@ -24,6 +32,8 @@ import { takeUntil } from 'rxjs/operators';
templateUrl: './admin-users.html'
})
export class AdminUsersComponent implements OnDestroy, OnInit {
+ @ViewChild(MatPaginator) paginator: MatPaginator;
+
public dataSource = new MatTableDataSource<AdminUsers['users'][0]>();
public defaultDateFormat: string;
public displayedColumns: string[] = [];
@@ -32,6 +42,8 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
public hasPermissionToImpersonateAllUsers: boolean;
public info: InfoItem;
public isLoading = false;
+ public pageSize = DEFAULT_PAGE_SIZE;
+ public totalItems = 0;
public user: User;
private unsubscribeSubject = new Subject<void>();
@@ -137,19 +149,33 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
window.location.reload();
}
+ public onChangePage(page: PageEvent) {
+ this.fetchUsers({
+ pageIndex: page.pageIndex
+ });
+ }
+
public ngOnDestroy() {
this.unsubscribeSubject.next();
this.unsubscribeSubject.complete();
}
- private fetchUsers() {
+ private fetchUsers({ pageIndex }: { pageIndex: number } = { pageIndex: 0 }) {
this.isLoading = true;
+ if (pageIndex === 0 && this.paginator) {
+ this.paginator.pageIndex = 0;
+ }
+
this.adminService
- .fetchUsers()
+ .fetchUsers({
+ skip: pageIndex * this.pageSize,
+ take: this.pageSize
+ })
.pipe(takeUntil(this.unsubscribeSubject))
- .subscribe(({ users }) => {
+ .subscribe(({ count, users }) => {
this.dataSource = new MatTableDataSource(users);
+ this.totalItems = count;
this.isLoading = false;
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 170b500ffd..ca8ef0558b 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,17 @@
></tr>
</table>
</div>
+
+ <mat-paginator
+ [length]="totalItems"
+ [ngClass]="{
+ 'd-none': (isLoading && totalItems === 0) || totalItems <= pageSize
+ }"
+ [pageSize]="pageSize"
+ [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 fcf25c8b5e..ca31317974 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
@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatMenuModule } from '@angular/material/menu';
+import { MatPaginatorModule } from '@angular/material/paginator';
import { MatTableModule } from '@angular/material/table';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
@@ -19,6 +20,7 @@ import { AdminUsersComponent } from './admin-users.component';
GfValueComponent,
MatButtonModule,
MatMenuModule,
+ MatPaginatorModule,
MatTableModule,
NgxSkeletonLoaderModule
],
diff --git a/apps/client/src/app/services/admin.service.ts b/apps/client/src/app/services/admin.service.ts
index d004671dda..5d252f00f6 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,10 +180,17 @@ export class AdminService {
return this.http.get<Tag[]>('/api/v1/tag');
}
- public fetchUsers() {
+ public fetchUsers({
+ skip,
+ take = DEFAULT_PAGE_SIZE
+ }: {
+ skip?: number;
+ take?: number;
+ }) {
let params = new HttpParams();
- params = params.append('take', 30);
+ params = params.append('skip', skip);
+ params = params.append('take', take);
return this.http.get<AdminUsers>('/api/v1/admin/user', { params });
}