Browse Source

address pr comments

pull/3735/head
Shaunak Das 12 months ago
parent
commit
6f70ee1c5b
  1. 3
      apps/client/src/app/components/admin-jobs/admin-jobs.component.ts
  2. 3
      apps/client/src/app/components/admin-users/admin-users.component.ts
  3. 4
      apps/client/src/app/components/admin-users/admin-users.module.ts

3
apps/client/src/app/components/admin-jobs/admin-jobs.component.ts

@ -51,9 +51,9 @@ export class AdminJobsComponent implements OnDestroy, OnInit {
'status', 'status',
'actions' 'actions'
]; ];
public isLoading = false;
public statusFilterOptions = QUEUE_JOB_STATUS_LIST; public statusFilterOptions = QUEUE_JOB_STATUS_LIST;
public user: User; public user: User;
public isLoading = false;
private unsubscribeSubject = new Subject<void>(); private unsubscribeSubject = new Subject<void>();
@ -140,6 +140,7 @@ export class AdminJobsComponent implements OnDestroy, OnInit {
private fetchJobs(aStatus?: JobStatus[]) { private fetchJobs(aStatus?: JobStatus[]) {
this.isLoading = true; this.isLoading = true;
this.adminService this.adminService
.fetchJobs({ status: aStatus }) .fetchJobs({ status: aStatus })
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntil(this.unsubscribeSubject))

3
apps/client/src/app/components/admin-users/admin-users.component.ts

@ -32,8 +32,8 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
public hasPermissionForSubscription: boolean; public hasPermissionForSubscription: boolean;
public hasPermissionToImpersonateAllUsers: boolean; public hasPermissionToImpersonateAllUsers: boolean;
public info: InfoItem; public info: InfoItem;
public user: User;
public isLoading = false; public isLoading = false;
public user: User;
private unsubscribeSubject = new Subject<void>(); private unsubscribeSubject = new Subject<void>();
@ -144,6 +144,7 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
private fetchAdminData() { private fetchAdminData() {
this.isLoading = true; this.isLoading = true;
this.adminService this.adminService
.fetchAdminData() .fetchAdminData()
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntil(this.unsubscribeSubject))

4
apps/client/src/app/components/admin-users/admin-users.module.ts

@ -19,8 +19,8 @@ import { AdminUsersComponent } from './admin-users.component';
GfValueComponent, GfValueComponent,
MatButtonModule, MatButtonModule,
MatMenuModule, MatMenuModule,
NgxSkeletonLoaderModule, MatTableModule,
MatTableModule NgxSkeletonLoaderModule
], ],
schemas: [CUSTOM_ELEMENTS_SCHEMA] schemas: [CUSTOM_ELEMENTS_SCHEMA]
}) })

Loading…
Cancel
Save