Skip to content

Commit

Permalink
Merge pull request #2084 from IDEMSInternational/fix/accordion-variables
Browse files Browse the repository at this point in the history
fix: for all components that render child rows, filter out non-display rows
  • Loading branch information
esmeetewinkel authored Sep 15, 2023
2 parents c0e7e97 + 63f23ad commit aace9ab
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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%"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
Expand Down

0 comments on commit aace9ab

Please sign in to comment.