From ca37c1493de14dcf6745cb9f039a65b32cf6f436 Mon Sep 17 00:00:00 2001
From: Johnny McQuade <jfmcquade@hotmail.com>
Date: Fri, 15 Sep 2023 16:00:57 +0100
Subject: [PATCH 1/2] fix: accordion component rendering unwanted rows

---
 .../template/components/accordion/accordion.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/components/template/components/accordion/accordion.component.html b/src/app/shared/components/template/components/accordion/accordion.component.html
index 393a6690b7..13fdf7bcac 100644
--- a/src/app/shared/components/template/components/accordion/accordion.component.html
+++ b/src/app/shared/components/template/components/accordion/accordion.component.html
@@ -5,7 +5,7 @@
 >
   <ion-accordion
     [value]="childRow.name"
-    *ngFor="let childRow of _row.rows; index as i"
+    *ngFor="let childRow of _row.rows | filterDisplayComponent; index as i"
     toggle-icon="arrow-down-circle"
     [style.z-index]="_row.rows.length - i"
   >

From 63f23ad270121db70a911bed840579de97880cf9 Mon Sep 17 00:00:00 2001
From: Johnny McQuade <jfmcquade@hotmail.com>
Date: Fri, 15 Sep 2023 16:04:25 +0100
Subject: [PATCH 2/2] fix: filter out non-display rows from all components that
 render child rows

---
 .../components/animated-slides/animated-slides.component.html   | 2 +-
 .../layout/accordion-section/accordion-section.component.html   | 2 +-
 .../advanced-dashed-box/advanced-dashed-box.component.html      | 2 +-
 .../components/template/components/layout/animated_section.ts   | 2 +-
 .../template/components/layout/animated_section_group.ts        | 2 +-
 .../components/layout/display-grid/display-grid.component.html  | 2 +-
 src/app/shared/components/template/components/layout/form.ts    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/components/template/components/animated-slides/animated-slides.component.html b/src/app/shared/components/template/components/animated-slides/animated-slides.component.html
index f647a355bf..de20e3a7a4 100644
--- a/src/app/shared/components/template/components/animated-slides/animated-slides.component.html
+++ b/src/app/shared/components/template/components/animated-slides/animated-slides.component.html
@@ -5,7 +5,7 @@
   </ion-button>
   <div class="section-container">
     <section
-      *ngFor="let childRow of _row.rows; let idx = index"
+      *ngFor="let childRow of _row.rows | filterDisplayComponent; let idx = index"
       [@fadeInOut]="slideParams[idx].animation === 'fade' ? fadeSection[idx] : null"
       [@noFade]="slideParams[idx].animation === 'none' ? fadeSection[idx] : null"
     >
diff --git a/src/app/shared/components/template/components/layout/accordion-section/accordion-section.component.html b/src/app/shared/components/template/components/layout/accordion-section/accordion-section.component.html
index 294a5d9fdd..2aca087ce0 100644
--- a/src/app/shared/components/template/components/layout/accordion-section/accordion-section.component.html
+++ b/src/app/shared/components/template/components/layout/accordion-section/accordion-section.component.html
@@ -43,7 +43,7 @@ <h2 (click)="toggleOpen()">{{ title }}</h2>
     >
       <plh-template-component
         style="z-index: 2"
-        *ngFor="let childRow of _row.rows; trackBy: trackByRow"
+        *ngFor="let childRow of _row.rows | filterDisplayComponent; trackBy: trackByRow"
         [row]="childRow"
         [parent]="parent"
       >
diff --git a/src/app/shared/components/template/components/layout/advanced-dashed-box/advanced-dashed-box.component.html b/src/app/shared/components/template/components/layout/advanced-dashed-box/advanced-dashed-box.component.html
index f5809598ae..a26949005f 100644
--- a/src/app/shared/components/template/components/layout/advanced-dashed-box/advanced-dashed-box.component.html
+++ b/src/app/shared/components/template/components/layout/advanced-dashed-box/advanced-dashed-box.component.html
@@ -4,7 +4,7 @@
       <img [src]="icon_src | plhAsset" alt="" />
     </div>
     <plh-template-component
-      *ngFor="let childRow of _row.rows; trackBy: trackByRow"
+      *ngFor="let childRow of _row.rows | filterDisplayComponent; trackBy: trackByRow"
       [row]="childRow"
       [parent]="parent"
       style="width: 100%"
diff --git a/src/app/shared/components/template/components/layout/animated_section.ts b/src/app/shared/components/template/components/layout/animated_section.ts
index b9e874d85f..86b523d659 100644
--- a/src/app/shared/components/template/components/layout/animated_section.ts
+++ b/src/app/shared/components/template/components/layout/animated_section.ts
@@ -6,7 +6,7 @@ import { TemplateLayoutComponent } from "./layout";
   selector: "plh-tmpl-animated-section",
   template: `
     <plh-template-component
-      *ngFor="let childRow of _row.rows; trackBy: trackByRow"
+      *ngFor="let childRow of _row.rows | filterDisplayComponent; trackBy: trackByRow"
       [row]="childRow"
       [parent]="parent"
       [@fadeSection]="_row?.hidden ? 'out' : 'in'"
diff --git a/src/app/shared/components/template/components/layout/animated_section_group.ts b/src/app/shared/components/template/components/layout/animated_section_group.ts
index aedca9fbc0..5c732a7a6a 100644
--- a/src/app/shared/components/template/components/layout/animated_section_group.ts
+++ b/src/app/shared/components/template/components/layout/animated_section_group.ts
@@ -5,7 +5,7 @@ import { TemplateBaseComponent } from "../base";
   selector: "plh-tmpl-animated-section-group",
   template: `<div class="animated-section-group">
     <plh-template-component
-      *ngFor="let childRow of _row.rows; trackBy: trackByRow"
+      *ngFor="let childRow of _row.rows | filterDisplayComponent; trackBy: trackByRow"
       [row]="childRow"
       [parent]="parent"
     ></plh-template-component>
diff --git a/src/app/shared/components/template/components/layout/display-grid/display-grid.component.html b/src/app/shared/components/template/components/layout/display-grid/display-grid.component.html
index 4a1a062821..0c95a42949 100644
--- a/src/app/shared/components/template/components/layout/display-grid/display-grid.component.html
+++ b/src/app/shared/components/template/components/layout/display-grid/display-grid.component.html
@@ -1,6 +1,6 @@
 <div class="display-grid" [ngStyle]="gridStyle">
   <plh-template-component
-    *ngFor="let childRow of _row.rows; trackBy: trackByRow"
+    *ngFor="let childRow of _row.rows | filterDisplayComponent; trackBy: trackByRow"
     [row]="childRow"
     [parent]="parent"
     [attr.data-rowname]="_row.name"
diff --git a/src/app/shared/components/template/components/layout/form.ts b/src/app/shared/components/template/components/layout/form.ts
index f4077018d0..07a3c81973 100644
--- a/src/app/shared/components/template/components/layout/form.ts
+++ b/src/app/shared/components/template/components/layout/form.ts
@@ -12,7 +12,7 @@ import { Device } from "@capacitor/device";
   selector: "plh-tmpl-form",
   template: ` <div>
     <plh-template-component
-      *ngFor="let childRow of _row.rows; trackBy: trackByRow"
+      *ngFor="let childRow of _row.rows | filterDisplayComponent; trackBy: trackByRow"
       [row]="childRow"
       [parent]="parent"
     >