Browse Source

code review changes

pull/4092/head
Ayush2198-source 9 months ago
committed by Thomas Kaul
parent
commit
ee8e547f2a
  1. 10
      apps/client/src/app/components/admin-users/admin-users.component.ts
  2. 2
      apps/client/src/app/components/admin-users/admin-users.html
  3. 4
      apps/client/src/app/components/admin-users/admin-users.module.ts
  4. 11
      apps/client/src/app/services/admin.service.ts

10
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();

2
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"

4
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]
})

11
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 });
}

Loading…
Cancel
Save