From 8c643fb1e6edfb2c5ee40289c281926dc7aeef98 Mon Sep 17 00:00:00 2001
From: igdmdimitrov <dmdimitrov@infragistics.com>
Date: Fri, 1 Nov 2024 14:31:11 +0200
Subject: [PATCH 1/2] feat(query-builder): don't show inner tree if not in edit
 mode and no conditions

---
 .../src/lib/query-builder/query-builder-tree.component.html   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.html b/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.html
index bd561a83a11..e777717851b 100644
--- a/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.html
+++ b/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.html
@@ -459,7 +459,9 @@ <h6 class="igx-filter-empty__title">
             </div>
         </div>
 
-        <ng-container *ngIf="(!expressionItem.inEditMode && expressionItem.expression.searchTree) || (expressionItem.inEditMode && selectedField?.filters?.condition(selectedCondition)?.isNestedQuery)">
+        <ng-container *ngIf="
+            (!expressionItem.inEditMode && expressionItem.expression.searchTree && expressionItem.expression.searchTree.filteringOperands?.length > 0) ||
+            (expressionItem.inEditMode && selectedField?.filters?.condition(selectedCondition)?.isNestedQuery)">
             <igx-query-builder-tree
                 [style.display]="expressionItem.inEditMode || expressionItem.expanded ? 'block' : 'none'"
                 [entities]="entities"

From a974892479a1879f17fbf58d746f7e6356f80e28 Mon Sep 17 00:00:00 2001
From: igdmdimitrov <dmdimitrov@infragistics.com>
Date: Fri, 1 Nov 2024 14:57:21 +0200
Subject: [PATCH 2/2] feat(query-builder): fix current group when add group in
 the middle

---
 .../src/lib/query-builder/query-builder-tree.component.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts b/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts
index e3d35b4c1d2..ef4545067f4 100644
--- a/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts
+++ b/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts
@@ -1655,21 +1655,21 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
         }
     }
 
-
     private init() {
         this.clearSelection();
         this.cancelOperandAdd();
         this.cancelOperandEdit();
 
-        // Ignore values of 'parent' and 'hovered' properties for the comparison
+        // Ignore values of certain properties for the comparison
+        const propsToIgnore = ['parent', 'hovered', 'ignoreCase', 'inEditMode', 'inAddMode'];
         const propsReplacer = function replacer(key, value) {
-            if (key === "parent" || key === "hovered" || key === "ignoreCase" || key === "inEditMode") {
+            if (propsToIgnore.indexOf(key) >= 0) {
                 return undefined;
             } else {
                 return value;
             }
         };
-        
+
         // Skip root being recreated if the same
         const newRootGroup = this.createExpressionGroupItem(this.expressionTree);
         if (JSON.stringify(this.rootGroup, propsReplacer) !== JSON.stringify(newRootGroup, propsReplacer)) {