Skip to content

Commit 955f75b

Browse files
committed
Merge branch 'dmdimitrov/hgrid-advanced-filtering' of https://github.com/IgniteUI/igniteui-angular into dmdimitrov/hgrid-advanced-filtering
2 parents c80b486 + 2cd36b4 commit 955f75b

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ All notable changes for each version of this project will be documented in this
1313
- A column's `minWidth` and `maxWidth` constrain the user-specified `width` so that it cannot go outside their bounds.
1414
- In SSR mode grid with height 100% or with no height will render on the server with % size and with no data. The grid will show either the empty grid template or the loading indicator (if isLoading is true).
1515
- In SSR mode grid with width 100% or with no width will render on the server with % size and with all columns.
16+
- `IgxHierarchicalGrid`
17+
- New advanced filtering functionality is implemented.
18+
- Added a new `schema` input property that can be used to pass collection of `EntityType` objects. This property is required for remote data scenarios.
19+
- `IgxQueryBuilderComponent`, `IgxAdvancedFilteringDialogComponent`
20+
- Added support for entities with hierarchical structure.
21+
- `EntityType`
22+
- A new optional property called `childEntities` has been introduced that can be used to create nested entities.
1623

1724
## 19.1.1
1825
### New Features

projects/igniteui-angular/src/lib/data-operations/filtering-condition.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class IgxFilteringOperand {
5050
public conditionList(): string[] {
5151
return this.operations.filter(f => !f.hidden && !f.isNestedQuery).map((element) => element.name);
5252
}
53-
53+
5454
/**
5555
* Returns an array of names of the conditions which are visible in the UI, including "In" and "Not In", allowing the creation of sub-queries.
5656
* @hidden @internal

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,14 +563,14 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
563563
}
564564

565565
/**
566-
* Gets/Sets the entities used for advanced filtering.
566+
* Gets/Sets the collection of `EntityType` objects represented in hierarchical structure, which will be used in the advanced filtering dialog.
567567
*
568568
* @remarks
569569
* This property is required in remote data scenarios.
570570
* @example
571571
* ```typescript
572572
* const schema = this.grid.schema;
573-
* this.grid.schema = [];
573+
* this.grid.schema = [{ name: 'Products', fields: [...], childEntities: [...] }];
574574
* ```
575575
*/
576576
@Input()

0 commit comments

Comments
 (0)