fix(query-builder): commit expressions properly in hgrid

Author: teodosiah

projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts

@@ -1608,8 +1608,8 @@ describe('IgxGrid - Advanced Filtering #grid - ', () => {
             fix.detectChanges(); 
 
             // Veify grid data
-            expect(hgrid.filteredData.length).toEqual(2);
-            expect(hgrid.rowList.length).toBe(2);
+            expect(hgrid.filteredData.length).toEqual(5);
+            expect(hgrid.rowList.length).toBe(5);
         }));
     });
 });

projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts

@@ -938,7 +938,8 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
                     !(this.selectedField?.filters?.condition(this.selectedCondition)?.isNestedQuery)
                 ) ||
                 (
-                    this.selectedField?.filters?.condition(this.selectedCondition)?.isNestedQuery && innerQuery && !!innerQuery.expressionTree && innerQuery.selectedReturnFields?.length > 0
+                    this.selectedField?.filters?.condition(this.selectedCondition)?.isNestedQuery && innerQuery && !!innerQuery.expressionTree && 
+                    (innerQuery.selectedReturnFields?.length > 0 || (innerQuery.selectedReturnFields?.length === 0 && this.isAdvancedFiltering()))
                 ) ||
                 this.selectedField.filters.condition(this.selectedCondition)?.isUnary
             );