From 94f333cab42a5e9f0deb44ecce31e8362f7b6ebc Mon Sep 17 00:00:00 2001 From: tobikugel Date: Tue, 2 Sep 2025 13:15:20 -0300 Subject: [PATCH] removes categoryName of interface, improves mergeInactiveRules --- .../rule-settings-dialog/rule-settings-dialog.html | 2 +- .../pages/portfolio/x-ray/x-ray-page.component.ts | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/apps/client/src/app/components/rule/rule-settings-dialog/rule-settings-dialog.html b/apps/client/src/app/components/rule/rule-settings-dialog/rule-settings-dialog.html index f5903e6d5..97854ad7d 100644 --- a/apps/client/src/app/components/rule/rule-settings-dialog/rule-settings-dialog.html +++ b/apps/client/src/app/components/rule/rule-settings-dialog/rule-settings-dialog.html @@ -1,4 +1,4 @@ -
{{ data.rule.categoryName }} › {{ data.rule.name }}
+
{{ data.rule.name }}
@if ( diff --git a/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.ts b/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.ts index 3ddf9da86..cff95b326 100644 --- a/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.ts +++ b/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.ts @@ -169,15 +169,9 @@ export class GfXRayPageComponent { private mergeInactiveRules( categories: PortfolioReportResponse['xRay']['categories'] ): PortfolioReportRule[] { - let inactiveRules: PortfolioReportRule[] = []; - - for (const category of categories) { - inactiveRules = inactiveRules.concat( - category.rules.filter(({ isActive }) => { - return !isActive; - }) - ); - } + const inactiveRules = categories.flatMap( + (category) => category.rules?.filter(({ isActive }) => !isActive) ?? [] + ); return inactiveRules; }