From e23cca38c9b9c8fffe67f25cfc91d0dae643d4f2 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Mon, 2 Dec 2024 21:27:36 +0100 Subject: [PATCH] Refactoring --- .../admin-users/admin-users.component.ts | 14 +++++++------- .../components/admin-users/admin-users.module.ts | 2 +- 2 files changed, 8 insertions(+), 8 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 d684961b6..91c258f90 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 @@ -149,16 +149,17 @@ export class AdminUsersComponent implements OnDestroy, OnInit { window.location.reload(); } - public ngOnDestroy() { - this.unsubscribeSubject.next(); - this.unsubscribeSubject.complete(); - } - public onChangePage(page: PageEvent) { this.fetchUsers({ pageIndex: page.pageIndex }); } + + public ngOnDestroy() { + this.unsubscribeSubject.next(); + this.unsubscribeSubject.complete(); + } + private fetchUsers({ pageIndex }: { pageIndex: number } = { pageIndex: 0 }) { this.isLoading = true; @@ -173,9 +174,8 @@ export class AdminUsersComponent implements OnDestroy, OnInit { }) .pipe(takeUntil(this.unsubscribeSubject)) .subscribe(({ count, users }) => { - this.totalItems = count; - this.dataSource = new MatTableDataSource(users); + this.totalItems = count; this.isLoading = false; 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 af4acc77d..ca3131797 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 @@ -20,8 +20,8 @@ import { AdminUsersComponent } from './admin-users.component'; GfValueComponent, MatButtonModule, MatMenuModule, - MatTableModule, MatPaginatorModule, + MatTableModule, NgxSkeletonLoaderModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA]