From f06603d228c56e0da00b2ee0852d76d24353ed32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20G=C3=BCnther?= <sven.guenther@it-agile.de>
Date: Wed, 17 Sep 2025 10:22:47 +0200
Subject: [PATCH] applied feedback

 * changelog: add the category ### Added and harmonize with the style of the other entries
 * rearranged lines of code in import activities dialog component
 * changed parameter type for onPageChangedEvent handler
 * removed comments
 * removed defensive checks
---
 CHANGELOG.md                                          |  4 +++-
 .../import-activities-dialog.component.ts             | 11 +++++------
 .../activities-table/activities-table.component.ts    |  9 +--------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53b8de8c9..ec985b776 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-- added paging to ImportAcitivitiesDialog
+### Added
+
+- Added paging of activities to import acitivities dialog
 
 ### Changed
 
diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts
index 03fc52af1..0e574d1b6 100644
--- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts
@@ -238,8 +238,8 @@ export class GfImportActivitiesDialog implements OnDestroy {
       .subscribe(({ activities }) => {
         this.activities = activities;
         this.dataSource = new MatTableDataSource(activities.reverse());
-        this.totalItems = activities.length;
         this.pageIndex = 0;
+        this.totalItems = activities.length;
 
         aStepper.next();
 
@@ -247,9 +247,8 @@ export class GfImportActivitiesDialog implements OnDestroy {
       });
   }
 
-  public onPageChanged(event: PageEvent) {
-    this.pageIndex = event.pageIndex;
-    // Client-side pagination - no need to refetch data as all activities are in memory
+  public onPageChanged({ pageIndex }: PageEvent) {
+    this.pageIndex = pageIndex;
   }
 
   public onReset(aStepper: MatStepper) {
@@ -347,8 +346,8 @@ export class GfImportActivitiesDialog implements OnDestroy {
               });
             this.activities = activities;
             this.dataSource = new MatTableDataSource(activities.reverse());
-            this.totalItems = activities.length;
             this.pageIndex = 0;
+            this.totalItems = activities.length;
           } catch (error) {
             console.error(error);
             this.handleImportError({ error, activities: content.activities });
@@ -366,8 +365,8 @@ export class GfImportActivitiesDialog implements OnDestroy {
             });
             this.activities = data.activities;
             this.dataSource = new MatTableDataSource(data.activities.reverse());
-            this.totalItems = data.activities.length;
             this.pageIndex = 0;
+            this.totalItems = data.activities.length;
           } catch (error) {
             console.error(error);
             this.handleImportError({
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts
index 9ad3cf387..3c6dd8072 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -168,9 +168,7 @@ export class GfActivitiesTableComponent
   }
 
   public ngAfterViewInit() {
-    if (this.dataSource && this.paginator) {
-      this.dataSource.paginator = this.paginator;
-    }
+    this.dataSource.paginator = this.paginator;
 
     this.sort.sortChange.subscribe((value: Sort) => {
       this.sortChanged.emit(value);
@@ -210,11 +208,6 @@ export class GfActivitiesTableComponent
 
     if (this.dataSource) {
       this.isLoading = false;
-
-      // Connect paginator when dataSource changes
-      if (this.paginator) {
-        this.dataSource.paginator = this.paginator;
-      }
     }
   }