From 5599b41b835b5c92fdd0d9bdba1bf4ff75db970c Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 16 Dec 2023 09:19:09 +0100
Subject: [PATCH] Bugfix/fix edit of activity in lazy loaded activities table
 (#2749)

* Fix edit

* Update changelog
---
 CHANGELOG.md                                                | 4 ++++
 .../pages/portfolio/activities/activities-page.component.ts | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19bb10858..177c415da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Improved the language localization for Türkçe (`tr`)
 
+### Fixed
+
+- Fixed the edit of activity in the lazy-loaded activities table on the portfolio activities page (experimental)
+
 ## 2.30.0 - 2023-12-12
 
 ### Added
diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
index f72f83e97..5d3468319 100644
--- a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
@@ -72,6 +72,12 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
               return id === params['activityId'];
             });
 
+            this.openUpdateActivityDialog(activity);
+          } else if (this.dataSource) {
+            const activity = this.dataSource.data.find(({ id }) => {
+              return id === params['activityId'];
+            });
+
             this.openUpdateActivityDialog(activity);
           } else {
             this.router.navigate(['.'], { relativeTo: this.route });