Browse Source

Task/show loading state on activities type filter change (#6677)

* Show loading state on activities type filter change

---------

Co-authored-by: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
pull/6682/head
Raphaël TISON 1 week ago
committed by GitHub
parent
commit
50751d3eb9
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 19
      apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

19
apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@ -65,7 +65,7 @@ export class GfActivitiesPageComponent implements OnInit {
public routeQueryParams: Subscription; public routeQueryParams: Subscription;
public sortColumn = 'date'; public sortColumn = 'date';
public sortDirection: SortDirection = 'desc'; public sortDirection: SortDirection = 'desc';
public totalItems: number; public totalItems: number | undefined;
public user: User; public user: User;
public constructor( public constructor(
@ -135,8 +135,11 @@ export class GfActivitiesPageComponent implements OnInit {
} }
public fetchActivities() { public fetchActivities() {
const dateRange = this.user?.settings?.dateRange; // Reset dataSource and totalItems to show loading state
this.dataSource = undefined;
this.totalItems = undefined;
const dateRange = this.user?.settings?.dateRange;
const range = this.isCalendarYear(dateRange) ? dateRange : undefined; const range = this.isCalendarYear(dateRange) ? dateRange : undefined;
this.dataService this.dataService
@ -200,6 +203,8 @@ export class GfActivitiesPageComponent implements OnInit {
.subscribe(); .subscribe();
this.fetchActivities(); this.fetchActivities();
this.changeDetectorRef.markForCheck();
}); });
} }
@ -214,6 +219,8 @@ export class GfActivitiesPageComponent implements OnInit {
.subscribe(); .subscribe();
this.fetchActivities(); this.fetchActivities();
this.changeDetectorRef.markForCheck();
}); });
} }
@ -289,6 +296,8 @@ export class GfActivitiesPageComponent implements OnInit {
.subscribe(); .subscribe();
this.fetchActivities(); this.fetchActivities();
this.changeDetectorRef.markForCheck();
}); });
} }
@ -316,6 +325,8 @@ export class GfActivitiesPageComponent implements OnInit {
.subscribe(); .subscribe();
this.fetchActivities(); this.fetchActivities();
this.changeDetectorRef.markForCheck();
}); });
} }
@ -365,6 +376,8 @@ export class GfActivitiesPageComponent implements OnInit {
.subscribe({ .subscribe({
next: () => { next: () => {
this.fetchActivities(); this.fetchActivities();
this.changeDetectorRef.markForCheck();
} }
}); });
} }
@ -422,6 +435,8 @@ export class GfActivitiesPageComponent implements OnInit {
.subscribe(); .subscribe();
this.fetchActivities(); this.fetchActivities();
this.changeDetectorRef.markForCheck();
} }
}); });
} }

Loading…
Cancel
Save