diff --git a/api-reference/10 UI Components/dxDataGrid/9 Types/DataGridPredefinedCommands/DataGridPredefinedCommands.md b/api-reference/10 UI Components/dxDataGrid/9 Types/DataGridPredefinedCommands/DataGridPredefinedCommands.md index 4330c77ffc..c5ea15b2b0 100644 --- a/api-reference/10 UI Components/dxDataGrid/9 Types/DataGridPredefinedCommands/DataGridPredefinedCommands.md +++ b/api-reference/10 UI Components/dxDataGrid/9 Types/DataGridPredefinedCommands/DataGridPredefinedCommands.md @@ -31,7 +31,7 @@ The following code snippet lists available commands with their arguments: width: number | string; }; filterValue: { - expression: FilterExprObj | null; + expression: FilterExprTree | null; }; clearFilter: {}; focusRowByKey: { diff --git a/api-reference/40 Common Types/15 grids/BasicFilterExprObj/BasicFilterExprObj.md b/api-reference/40 Common Types/15 grids/BasicFilterExpr/BasicFilterExpr.md similarity index 91% rename from api-reference/40 Common Types/15 grids/BasicFilterExprObj/BasicFilterExprObj.md rename to api-reference/40 Common Types/15 grids/BasicFilterExpr/BasicFilterExpr.md index c5f611091e..fca48e03b7 100644 --- a/api-reference/40 Common Types/15 grids/BasicFilterExprObj/BasicFilterExprObj.md +++ b/api-reference/40 Common Types/15 grids/BasicFilterExpr/BasicFilterExpr.md @@ -1,7 +1,7 @@ --- -id: BasicFilterExprObj +id: BasicFilterExpr module: common/grids -export: BasicFilterExprObj +export: BasicFilterExpr type: Object --- --- diff --git a/api-reference/40 Common Types/15 grids/CombinedFilterExprObj/CombinedFilterExprObj.md b/api-reference/40 Common Types/15 grids/CombinedFilterExpr/CombinedFilterExpr.md similarity index 51% rename from api-reference/40 Common Types/15 grids/CombinedFilterExprObj/CombinedFilterExprObj.md rename to api-reference/40 Common Types/15 grids/CombinedFilterExpr/CombinedFilterExpr.md index 1bc7f78296..a59ffbd868 100644 --- a/api-reference/40 Common Types/15 grids/CombinedFilterExprObj/CombinedFilterExprObj.md +++ b/api-reference/40 Common Types/15 grids/CombinedFilterExpr/CombinedFilterExpr.md @@ -1,7 +1,7 @@ --- -id: CombinedFilterExprObj +id: CombinedFilterExpr module: common/grids -export: CombinedFilterExprObj +export: CombinedFilterExpr type: Object --- --- @@ -12,6 +12,6 @@ A combined DataGrid/TreeList filter expression. This object includes the following fields: - **type**: The expression type. Set to *"combined"*. -- **left**: The first filter expression. +- **leftId**: The ID of the first filter expression's node ([FilterExprNode]({basewidgetpath}/FilterExprNode/)). - **combiner**: The combination operation. Accepted values: *"and"*, *"or"*. -- **right**: The second filter expression. \ No newline at end of file +- **rightId**: The ID of the second filter expression's node ([FilterExprNode]({basewidgetpath}/FilterExprNode/)). \ No newline at end of file diff --git a/api-reference/40 Common Types/15 grids/FilterExpr/FilterExpr.md b/api-reference/40 Common Types/15 grids/FilterExpr/FilterExpr.md new file mode 100644 index 0000000000..d9bc26d2b7 --- /dev/null +++ b/api-reference/40 Common Types/15 grids/FilterExpr/FilterExpr.md @@ -0,0 +1,16 @@ +--- +id: FilterExpr +module: common/grids +export: FilterExpr +type: BasicFilterExpr | CombinedFilterExpr | NegatedFilterExpr +--- +--- +##### shortDescription +A DataGrid/TreeList filter expression. + +--- +**FilterExpr** is a union of multiple types whose structure depends on the represented filter expression. For additional information, see the following topics: + +- [BasicFilterExpr](/api-reference/40%20Common%20Types/15%20grids/BasicFilterExpr '{basewidgetpath}/BasicFilterExpr/') +- [CombinedFilterExpr](/api-reference/40%20Common%20Types/15%20grids/CombinedFilterExpr '{basewidgetpath}/CombinedFilterExpr/') +- [NegatedFilterExpr](/api-reference/40%20Common%20Types/15%20grids/NegatedFilterExpr '{basewidgetpath}/NegatedFilterExpr/') \ No newline at end of file diff --git a/api-reference/40 Common Types/15 grids/FilterExprNode/FilterExprNode.md b/api-reference/40 Common Types/15 grids/FilterExprNode/FilterExprNode.md new file mode 100644 index 0000000000..69d89afb6c --- /dev/null +++ b/api-reference/40 Common Types/15 grids/FilterExprNode/FilterExprNode.md @@ -0,0 +1,14 @@ +--- +id: FilterExprNode +module: common/grids +export: FilterExprNode +--- +--- +##### shortDescription +A node in a filter expression tree ([FilterExprTree]({basewidgetpath}/FilterExprTree/)). + +--- +This object includes the following fields: + +- **id**: A unique identifier for the node. Nodes reference each other by ID. +- **expr**: The filter expression ([FilterExpr]({basewidgetpath}/FilterExpr/)). \ No newline at end of file diff --git a/api-reference/40 Common Types/15 grids/FilterExprObj/FilterExprObj.md b/api-reference/40 Common Types/15 grids/FilterExprObj/FilterExprObj.md deleted file mode 100644 index 417a20b5ec..0000000000 --- a/api-reference/40 Common Types/15 grids/FilterExprObj/FilterExprObj.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -id: FilterExprObj -module: common/grids -export: FilterExprObj -type: BasicFilterExprObj | CombinedFilterExprObj | NegatedFilterExprObj ---- ---- -##### shortDescription -A DataGrid/TreeList filter expression. - ---- -**FilterExprObj** is a union of multiple types that changes based on the represented filter expression. Refer to the following topics for additional information: - -- [BasicFilterExprObj](/api-reference/40%20Common%20Types/15%20grids/BasicFilterExprObj '{basewidgetpath}/BasicFilterExprObj/') -- [CombinedFilterExprObj](/api-reference/40%20Common%20Types/15%20grids/CombinedFilterExprObj '{basewidgetpath}/CombinedFilterExprObj/') -- [NegatedFilterExprObj](/api-reference/40%20Common%20Types/15%20grids/NegatedFilterExprObj '{basewidgetpath}/NegatedFilterExprObj/') \ No newline at end of file diff --git a/api-reference/40 Common Types/15 grids/FilterExprTree/FilterExprTree.md b/api-reference/40 Common Types/15 grids/FilterExprTree/FilterExprTree.md new file mode 100644 index 0000000000..f3970c7d65 --- /dev/null +++ b/api-reference/40 Common Types/15 grids/FilterExprTree/FilterExprTree.md @@ -0,0 +1,16 @@ +--- +id: FilterExprTree +module: common/grids +export: FilterExprTree +--- +--- +##### shortDescription +A complex filter expression in a flat data structure. + +--- +**FilterExprTree** stores a filter expression tree as a flat list rather than a hierarchical structure. This flat structure improves compatibility with AI services for the AI Assistant's `filterValue` command. + +This object includes the following fields: + +- **rootId**: The ID of the root [FilterExprNode]({basewidgetpath}/FilterExprNode/). This node is evaluated first. **rootId** must match the **id** value of an object in the **nodes** array. +- **nodes**: An array of [FilterExprNode]({basewidgetpath}/FilterExprNode/) objects. Each node must have a unique **id**. diff --git a/api-reference/40 Common Types/15 grids/NegatedFilterExprObj/NegatedFilterExprObj.md b/api-reference/40 Common Types/15 grids/NegatedFilterExpr/NegatedFilterExpr.md similarity index 67% rename from api-reference/40 Common Types/15 grids/NegatedFilterExprObj/NegatedFilterExprObj.md rename to api-reference/40 Common Types/15 grids/NegatedFilterExpr/NegatedFilterExpr.md index 593ac70d28..706feb00d3 100644 --- a/api-reference/40 Common Types/15 grids/NegatedFilterExprObj/NegatedFilterExprObj.md +++ b/api-reference/40 Common Types/15 grids/NegatedFilterExpr/NegatedFilterExpr.md @@ -1,7 +1,7 @@ --- -id: NegatedFilterExprObj +id: NegatedFilterExpr module: common/grids -export: NegatedFilterExprObj +export: NegatedFilterExpr type: Object --- --- @@ -12,4 +12,4 @@ A negated ([unary NOT](/concepts/70%20Data%20Binding/5%20Data%20Layer/2%20Readin This object includes the following fields: - **type**: The expression type. Set to *"negated"*. -- **expression**: A filter expression ([FilterExprObj](/api-reference/40%20Common%20Types/15%20grids/FilterExprObj '{basewidgetpath}/FilterExprObj/')) to negate. \ No newline at end of file +- **expressionId**: The ID of a filter expression node ([FilterExprNode]({basewidgetpath}/FilterExprNode/)) to negate. \ No newline at end of file diff --git a/api-reference/40 Common Types/15 grids/PredefinedCommands/PredefinedCommands.md b/api-reference/40 Common Types/15 grids/PredefinedCommands/PredefinedCommands.md index 6da16d16b1..7699bbdf38 100644 --- a/api-reference/40 Common Types/15 grids/PredefinedCommands/PredefinedCommands.md +++ b/api-reference/40 Common Types/15 grids/PredefinedCommands/PredefinedCommands.md @@ -30,7 +30,7 @@ The following code snippet lists available commands with their arguments: width: number | string; }; filterValue: { - expression: FilterExprObj | null; + expression: FilterExprTree | null; }; clearFilter: {}; focusRowByKey: { diff --git a/api-reference/NewTopics/BasicFilterExpr/BasicFilterExpr.md b/api-reference/NewTopics/BasicFilterExpr/BasicFilterExpr.md deleted file mode 100644 index c23fe88a23..0000000000 --- a/api-reference/NewTopics/BasicFilterExpr/BasicFilterExpr.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -id: BasicFilterExpr -module: common/grids -export: BasicFilterExpr -type: Object ---- ---- -##### shortDescription - - ---- - \ No newline at end of file diff --git a/api-reference/NewTopics/CombinedFilterExpr/CombinedFilterExpr.md b/api-reference/NewTopics/CombinedFilterExpr/CombinedFilterExpr.md deleted file mode 100644 index a50f83f6a9..0000000000 --- a/api-reference/NewTopics/CombinedFilterExpr/CombinedFilterExpr.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -id: CombinedFilterExpr -module: common/grids -export: CombinedFilterExpr -type: Object ---- ---- -##### shortDescription - - ---- - \ No newline at end of file diff --git a/api-reference/NewTopics/FilterExpr/FilterExpr.md b/api-reference/NewTopics/FilterExpr/FilterExpr.md deleted file mode 100644 index db37b53e78..0000000000 --- a/api-reference/NewTopics/FilterExpr/FilterExpr.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -id: FilterExpr -module: common/grids -export: FilterExpr -type: BasicFilterExpr | CombinedFilterExpr | NegatedFilterExpr ---- ---- -##### shortDescription - - ---- - \ No newline at end of file diff --git a/api-reference/NewTopics/FilterExprNode/FilterExprNode.md b/api-reference/NewTopics/FilterExprNode/FilterExprNode.md deleted file mode 100644 index 02e8b5c030..0000000000 --- a/api-reference/NewTopics/FilterExprNode/FilterExprNode.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -id: FilterExprNode -module: common/grids -export: FilterExprNode ---- ---- -##### shortDescription - - ---- - \ No newline at end of file diff --git a/api-reference/NewTopics/FilterExprTree/FilterExprTree.md b/api-reference/NewTopics/FilterExprTree/FilterExprTree.md deleted file mode 100644 index 44378c77b5..0000000000 --- a/api-reference/NewTopics/FilterExprTree/FilterExprTree.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -id: FilterExprTree -module: common/grids -export: FilterExprTree ---- ---- -##### shortDescription - - ---- - \ No newline at end of file diff --git a/api-reference/NewTopics/NegatedFilterExpr/NegatedFilterExpr.md b/api-reference/NewTopics/NegatedFilterExpr/NegatedFilterExpr.md deleted file mode 100644 index 257f4b3ce7..0000000000 --- a/api-reference/NewTopics/NegatedFilterExpr/NegatedFilterExpr.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -id: NegatedFilterExpr -module: common/grids -export: NegatedFilterExpr -type: Object ---- ---- -##### shortDescription - - ---- - \ No newline at end of file