Skip to content

Commit c1eda27

Browse files
committed
feat(filtering): null text & filterableCols #5496
1 parent 556f538 commit c1eda27

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

Diff for: projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.html

+7-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ <h4 class="igx-typography__h6">
3232
<igx-icon fontSet="material">add</igx-icon>
3333
<span>"Or" Group</span>
3434
</button>
35+
36+
<div style="display: flex; width: 100%;">
37+
<span style="display: flex; margin: auto;">
38+
Start with creating a group of conditions linked with "And" or "Or"
39+
</span>
40+
</div>
3541
</ng-container>
3642

3743
<ng-template #addExpressionsTemplate let-expressionItem let-afterExpression="afterExpression">
@@ -96,7 +102,7 @@ <h4 class="igx-typography__h6">
96102
type="box"
97103
[displayDensity]="displayDensity"
98104
[(ngModel)]="selectedColumn">
99-
<igx-select-item *ngFor="let column of grid.columns" [value]="column">
105+
<igx-select-item *ngFor="let column of filterableColumns" [value]="column">
100106
{{column.header}}
101107
</igx-select-item>
102108
</igx-select>

Diff for: projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.ts

+4
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
147147
return this.filteringService.grid;
148148
}
149149

150+
get filterableColumns(): IgxColumnComponent[] {
151+
return this.grid.columns.filter((col) => col.filterable);
152+
}
153+
150154
public dragMove(dragArgs: IDragBaseEventArgs) {
151155
const gridRect = this.grid.nativeElement.getBoundingClientRect();
152156
const dialogRect = dragArgs.owner.element.nativeElement.getBoundingClientRect();

0 commit comments

Comments
 (0)