Skip to content

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

Bugfix/fix loading state of lazy loaded activities table component (#2744)

Thomas Kaul6c3773705176
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d75dc04d9c..07078424fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
+- Fixed the loading state in the lazy-loaded activities table on the portfolio activities page (experimental)
- Fixed the edit of activity in the lazy-loaded activities table on the portfolio activities page (experimental)
## 2.30.0 - 2023-12-12
diff --git a/libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.html b/libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.html
index 7e5ce9d0fa..1173c48542 100644
--- a/libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.html
+++ b/libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.html
@@ -458,17 +458,6 @@
</table>
</div>
-<mat-paginator
- [length]="totalItems"
- [ngClass]="{
- 'd-none': (isLoading && totalItems === 0) || totalItems <= pageSize
- }"
- [pageIndex]="pageIndex"
- [pageSize]="pageSize"
- [showFirstLastButtons]="true"
- (page)="onChangePage($event)"
-></mat-paginator>
-
<ngx-skeleton-loader
*ngIf="isLoading"
animation="pulse"
@@ -479,6 +468,17 @@
}"
></ngx-skeleton-loader>
+<mat-paginator
+ [length]="totalItems"
+ [ngClass]="{
+ 'd-none': (isLoading && !totalItems) || totalItems <= pageSize
+ }"
+ [pageIndex]="pageIndex"
+ [pageSize]="pageSize"
+ [showFirstLastButtons]="true"
+ (page)="onChangePage($event)"
+></mat-paginator>
+
<div
*ngIf="
dataSource?.data.length === 0 && hasPermissionToCreateActivity && !isLoading