chore(*): merge from base.

Author: MKirova

README.md

@@ -218,7 +218,7 @@ You can include Ignite UI for Angular in your project as a dependency using the
 
 - [COVID-19 Dashboard](https://github.com/IgniteUI/COVID-19-Dashboard) - This dynamic dashboard was built using Indigo.Design and Ignite UI for Angular leveraging timely reports data from CSSEGISandData/COVID-19 to create an useful and impactful visualization. Built in a matter of hours, it showcases the Ignite UI Category and Data Charts, Map and List components for Angular and the how easy it is to get those quickly configured and populated with data.
 
--[Inventory Management App](https://github.com/IgniteUI/InventoryManagementApp) - The Inventory Management App consists of 2 pages: The Products Page and the Dashboard Page. The Products Page contains a grid with product information and includes a number of useful features
+- [Inventory Management App](https://github.com/IgniteUI/InventoryManagementApp) - The Inventory Management App consists of 2 pages: The Products Page and the Dashboard Page. The Products Page contains a grid with product information and includes a number of useful features
 
 ### Angular apps with ASP.NET Core Web Application
 If you consider Angular client side application with ASP.NET Core application you can check out our [ASP.NET-Core-Samples](https://github.com/IgniteUI/ASP.NET-Core-Samples)

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

@@ -43,7 +43,7 @@ import { FilteringLogic, IFilteringExpression } from '../data-operations/filteri
 import { IGroupByRecord } from '../data-operations/groupby-record.interface';
 import { IgxGridForOfDirective } from '../directives/for-of/for_of.directive';
 import { IgxTextHighlightDirective } from '../directives/text-highlight/text-highlight.directive';
-import { IgxSummaryOperand, ISummaryExpression } from './summaries/grid-summary';
+import { ISummaryExpression } from './summaries/grid-summary';
 import { RowEditPositionStrategy, IPinningConfig } from './grid.common';
 import { IgxGridToolbarComponent } from './toolbar/grid-toolbar.component';
 import { IgxRowDirective } from './row.directive';

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-filtering.service.ts

@@ -18,9 +18,9 @@ export class IgxPivotFilteringService extends IgxFilteringService {
         const config = (grid as IgxPivotGridComponent).pivotConfiguration;
         const allDimensions = PivotUtil.flatten(config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null && x !== undefined));
         const dim = allDimensions.find(x => x.memberName === fieldName || x.member === fieldName);
-        dim.filters = undefined;
+        dim.filter = undefined;
         grid.filteringPipeTrigger++;
-        if (PivotUtil.flatten(config.columns).indexOf(dim) !== -1) {
+        if (allDimensions.indexOf(dim) !== -1) {
             // update columns
             (grid as any).setupColumns();
         }
@@ -33,16 +33,16 @@ export class IgxPivotFilteringService extends IgxFilteringService {
         const allDimensions = PivotUtil.flatten(config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null && x !== undefined));
         const enabledDimensions = allDimensions.filter(x => x && x.enabled);
         const dim = enabledDimensions.find(x => x.memberName === fieldName || x.member === fieldName);
-        const filteringTree = dim.filters || new FilteringExpressionsTree(FilteringLogic.And);
+        const filteringTree = dim.filter || new FilteringExpressionsTree(FilteringLogic.And);
         const fieldFilterIndex = filteringTree.findIndex(fieldName);
         if (fieldFilterIndex > -1) {
             filteringTree.filteringOperands.splice(fieldFilterIndex, 1);
         }
 
         this.prepare_filtering_expression(filteringTree, fieldName, term, conditionOrExpressionsTree, ignoreCase, fieldFilterIndex);
-        dim.filters = filteringTree;
+        dim.filter = filteringTree;
         grid.filteringPipeTrigger++;
-        if (PivotUtil.flatten(config.columns).indexOf(dim) !== -1) {
+        if (allDimensions.indexOf(dim) !== -1) {
             // update columns
             (grid as any).setupColumns();
         }

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

@@ -7,7 +7,6 @@ import {
     EventEmitter,
     ComponentFactoryResolver,
     ElementRef,
-    forwardRef,
     HostBinding,
     Inject,
     Input,
@@ -30,10 +29,10 @@ import { IgxGridBaseDirective } from '../grid-base.directive';
 import { IgxFilteringService } from '../filtering/grid-filtering.service';
 import { IgxGridSelectionService } from '../selection/selection.service';
 import { IgxForOfSyncService, IgxForOfScrollSyncService } from '../../directives/for-of/for_of.sync.service';
-import { GridServiceType, GridType, IGX_GRID_BASE, IGX_GRID_SERVICE_BASE, RowType } from '../common/grid.interface';
+import { GridType, IGX_GRID_BASE, RowType } from '../common/grid.interface';
 import { IgxGridCRUDService } from '../common/crud.service';
 import { IgxGridSummaryService } from '../summaries/grid-summary.service';
-import { DEFAULT_PIVOT_KEYS, IDimensionsChange, IPivotConfiguration, IPivotDimension, IPivotKeys, IValuesChange, PivotDimensionType } from './pivot-grid.interface';
+import { DEFAULT_PIVOT_KEYS, IDimensionsChange, IPivotConfiguration, IPivotDimension, IValuesChange, PivotDimensionType } from './pivot-grid.interface';
 import { IgxPivotHeaderRowComponent } from './pivot-header-row.component';
 import { IgxColumnGroupComponent } from '../columns/column-group.component';
 import { IgxColumnComponent } from '../columns/column.component';
@@ -316,6 +315,13 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
      */
     public dragRowID = null;
 
+    /**
+    * @hidden @internal
+    */
+    public get rootSummariesEnabled(): boolean {
+        return false;
+    }
+
     protected _defaultExpandState = false;
     private _data;
     private _filteredData;
@@ -545,6 +551,8 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
         // pivot grid always generates columns automatically.
         this.autoGenerate = true;
         this.uniqueColumnValuesStrategy = this.uniqueColumnValuesStrategy || this.uniqueDimensionValuesStrategy;
+        const config = this.pivotConfiguration;
+        this.filteringExpressionsTree = PivotUtil.buildExpressionTree(config);
         super.ngOnInit();
     }
 
@@ -1050,7 +1058,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
      */
     protected autogenerateColumns() {
         let columns = [];
-        const data = this.gridAPI.get_data();
+        const data = this.gridAPI.filterDataByExpressions(this.filteringExpressionsTree);
         this.dimensionDataColumns = this.generateDimensionColumns();
         let fieldsMap;
         if (this.pivotConfiguration.columnStrategy && this.pivotConfiguration.columnStrategy instanceof NoopPivotDimensionsStrategy) {
@@ -1130,9 +1138,9 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
         }
         currentFields.forEach((value, key) => {
             let shouldGenerate = true;
-            if (value.dimension && value.dimension.filters) {
+            if (value.dimension && value.dimension.filter) {
                 const state = {
-                    expressionsTree: value.dimension.filters.filteringOperands[0],
+                    expressionsTree: value.dimension.filter.filteringOperands[0],
                     strategy: this.filterStrategy || new DimensionValuesFilteringStrategy(),
                     advancedFilteringExpressionsTree: this.advancedFilteringExpressionsTree
                 };

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.pipes.spec.ts

@@ -6,6 +6,7 @@ import { IgxPivotNumericAggregate } from './pivot-grid-aggregate';
 import { IPivotConfiguration } from './pivot-grid.interface';
 import { IgxPivotColumnPipe, IgxPivotRowExpansionPipe, IgxPivotRowPipe } from './pivot-grid.pipes';
 import { PivotGridFunctions } from '../../test-utils/pivot-grid-functions.spec';
+import { DATA } from 'src/app/shared/pivot-data';
 
 describe('Pivot pipes #pivotGrid', () => {
     let rowPipe: IgxPivotRowPipe;
@@ -1532,4 +1533,117 @@ describe('Pivot pipes #pivotGrid', () => {
             { Years: '2021', AllProduct: 'All Products', Discontinued: 'false', Country: 'USA', SellerName: 'John' }
         ]);
     });
+    // automation for https://github.com/IgniteUI/igniteui-angular/issues/10545
+    it('should generate last dimension values for all records.', () => {
+        data = [
+            {
+                ProductCategory: 'Clothing', UnitPrice: 12.81, SellerName: 'Stanley',
+                Country: 'Bulgaria', City: 'Sofia', Date: '01/01/2021', UnitsSold: 282
+            },
+            {
+                ProductCategory: 'Clothing', UnitPrice: 49.57, SellerName: 'Elisa',
+                Country: 'USA', City: 'New York', Date: '01/05/2019', UnitsSold: 296
+            },
+            {
+                ProductCategory: 'Bikes', UnitPrice: 3.56, SellerName: 'Lydia',
+                Country: 'Uruguay', City: 'Ciudad de la Costa', Date: '01/06/2020', UnitsSold: 68
+            },
+            {
+                ProductCategory: 'Accessories', UnitPrice: 85.58, SellerName: 'David',
+                Country: 'USA', City: 'New York', Date: '04/07/2021', UnitsSold: 293
+            },
+            {
+                ProductCategory: 'Components', UnitPrice: 18.13, SellerName: 'John',
+                Country: 'USA', City: 'New York', Date: '12/08/2021', UnitsSold: 240
+            },
+            {
+                ProductCategory: 'Clothing', UnitPrice: 68.33, SellerName: 'Larry',
+                Country: 'Uruguay', City: 'Ciudad de la Costa', Date: '05/12/2020', UnitsSold: 456
+            },
+            {
+                ProductCategory: 'Clothing', UnitPrice: 16.05, SellerName: 'Walter',
+                Country: 'Bulgaria', City: 'Plovdiv', Date: '02/19/2020', UnitsSold: 492
+            }];
+        pivotConfig.columns = [{
+            memberName: 'Country',
+            enabled: true
+        }];
+        pivotConfig.rows = [
+            new IgxPivotDateDimension(
+                {
+                    memberName: 'Date',
+                    enabled: true
+                },
+                {
+                    months: false
+                }
+            ),
+            {
+                memberName: 'City',
+                enabled: true
+            },
+            {
+                memberFunction: () => 'All',
+                memberName: 'AllProducts',
+                enabled: true,
+                childLevel: {
+                    memberFunction: (recData) => recData.ProductCategory,
+                    memberName: 'ProductCategory',
+                    enabled: true
+                }
+            },
+            {
+                memberName: 'SellerName',
+                enabled: true
+            }
+        ];
+        const rowPipeResult = rowPipe.transform(data, pivotConfig, expansionStates);
+        const columnPipeResult = columnPipe.transform(rowPipeResult, pivotConfig, new Map<any, boolean>());
+        const rowStatePipeResult = rowStatePipe.transform(columnPipeResult, pivotConfig, expansionStates, true);
+        const sellers = rowStatePipeResult.map(x => x.SellerName);
+        // there should be no empty values.
+        expect(sellers.filter(x => x === undefined).length).toBe(0);
+    });
+
+    // automation for https://github.com/IgniteUI/igniteui-angular/issues/10662
+    it('should retain processed values for last dimension when bound to complex object.', () => {
+        data = DATA;
+        pivotConfig.rows = [
+            {
+                memberName: 'Date',
+                enabled: true,
+            },
+            {
+                memberName: 'AllProduct',
+                memberFunction: () => 'All Products',
+                enabled: true,
+                childLevel:
+                {
+
+                    memberName: 'Product',
+                    memberFunction: (recData) => recData.Product.Name,
+                    enabled: true
+                }
+            },
+            {
+                memberName: 'AllSeller',
+                memberFunction: () => 'All Sellers',
+                enabled: true,
+                childLevel:
+                {
+                    memberName: 'Seller',
+                    memberFunction: (recData) => recData.Seller.Name,
+                    enabled: true,
+                },
+            },
+        ];
+
+        const rowPipeResult = rowPipe.transform(data, pivotConfig, expansionStates);
+        const columnPipeResult = columnPipe.transform(rowPipeResult, pivotConfig, new Map<any, boolean>());
+        const rowStatePipeResult = rowStatePipe.transform(columnPipeResult, pivotConfig, expansionStates, true);
+
+        const res = rowStatePipeResult.filter(x => x.AllSeller === undefined).map(x => x.Seller);
+        // all values should be strings as the result of the processed member function is string.
+        expect(res.filter(x => typeof x !== 'string').length).toBe(0);
+    });
 });

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.pipes.ts

@@ -192,16 +192,8 @@ export class IgxPivotGridFilterPipe implements PipeTransform {
         advancedExpressionsTree: IFilteringExpressionsTree,
         _filterPipeTrigger: number,
         _pipeTrigger: number): any[] {
-        const allDimensions = config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null && x !== undefined);
-        const enabledDimensions = allDimensions.filter(x => x && x.enabled);
+        const expressionsTree = PivotUtil.buildExpressionTree(config);
 
-        const expressionsTree = new FilteringExpressionsTree(FilteringLogic.And);
-        // add expression trees from all filters
-        PivotUtil.flatten(enabledDimensions).forEach(x => {
-            if (x.filters) {
-                expressionsTree.filteringOperands.push(x.filters);
-            }
-        });
         const state = {
             expressionsTree,
             strategy: filterStrategy || new DimensionValuesFilteringStrategy(),

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

@@ -1,7 +1,7 @@
 import { fakeAsync, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { IgxPivotDateDimension, IgxPivotGridModule } from 'igniteui-angular';
+import { FilteringExpressionsTree, FilteringLogic, IgxPivotDateDimension, IgxPivotGridModule, IgxStringFilteringOperand } from 'igniteui-angular';
 import { IgxChipsAreaComponent } from '../../chips/chips-area.component';
 import { configureTestSuite } from '../../test-utils/configure-suite';
 import { GridFunctions, GridSelectionFunctions } from '../../test-utils/grid-functions.spec';
@@ -110,6 +110,37 @@ describe('Basic IgxPivotGrid #pivotGrid', () => {
         expect(pivotGrid.columns.length).not.toBe(9);
     });
 
+    it('should remove filter dimension from chip', () => {
+        const pivotGrid = fixture.componentInstance.pivotGrid;
+
+        const filteringExpressionTree = new FilteringExpressionsTree(FilteringLogic.And);
+        filteringExpressionTree.filteringOperands = [
+            {
+                condition: IgxStringFilteringOperand.instance().condition('equals'),
+                fieldName: 'SellerName',
+                searchVal: 'Stanley'
+            }
+        ];
+        const filterDimension = {
+            memberName: 'SellerName',
+            enabled: true,
+            filter: filteringExpressionTree
+        };
+        pivotGrid.pivotConfiguration.filters = [filterDimension];
+        pivotGrid.pipeTrigger++;
+        fixture.detectChanges();
+        expect(pivotGrid.pivotConfiguration.filters[0].enabled).toBeTrue();
+        expect(pivotGrid.rowList.length).toBe(2);
+
+        const headerRow = fixture.nativeElement.querySelector('igx-pivot-header-row');
+        const rowChip = headerRow.querySelector('igx-chip[id="SellerName"]');
+        const removeIcon = rowChip.querySelectorAll('igx-icon')[2];
+        removeIcon.click();
+        fixture.detectChanges();
+        expect(pivotGrid.pivotConfiguration.filters[0].enabled).toBeFalse();
+        expect(pivotGrid.rowList.length).toBe(5);
+    });
+
     it('should collapse column with 1 value dimension', () => {
         const pivotGrid = fixture.componentInstance.pivotGrid;
         pivotGrid.pivotConfiguration.values.pop();
@@ -484,6 +515,29 @@ describe('Basic IgxPivotGrid #pivotGrid', () => {
             expect(pivotGrid.gridAPI.get_cell_by_index(0, 'USA').value).toBe(0);
             expect(pivotGrid.gridAPI.get_cell_by_index(0, 'Uruguay').value).toBe(242.08);
         });
+        it('should show one aggregations drop-down at a time', () => {
+            const pivotGrid = fixture.componentInstance.pivotGrid;
+            pivotGrid.width = '1500px';
+            fixture.detectChanges();
+            const headerRow = fixture.nativeElement.querySelector('igx-pivot-header-row');
+            const valueChipUnitsSold = headerRow.querySelector('igx-chip[id="UnitsSold"]');
+
+            const aggregatesIconUnitsSold = valueChipUnitsSold.querySelectorAll('igx-icon')[1];
+            aggregatesIconUnitsSold.click();
+            fixture.detectChanges();
+
+            let dropDown = fixture.debugElement.queryAll(By.css(`.${CSS_CLASS_LIST}`));
+            expect(dropDown.length).toBe(1);
+
+            const valueChipUnitPrice = headerRow.querySelector('igx-chip[id="UnitPrice"]');
+
+            const aggregatesIconUnitPrice = valueChipUnitPrice.querySelectorAll('igx-icon')[1];
+            aggregatesIconUnitPrice.click();
+            fixture.detectChanges();
+
+            dropDown = fixture.debugElement.queryAll(By.css(`.${CSS_CLASS_LIST}`));
+            expect(dropDown.length).toBe(1);
+        });
 
         it('should allow reorder in row chip area.', () => {
             const pivotGrid = fixture.componentInstance.pivotGrid;

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.ts

@@ -120,7 +120,8 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent {
         this.grid.setupColumns();
         this.grid.filteringService.clearFilter(col.memberName);
         this.grid.pipeTrigger++;
-        this.grid.dimensionsChange.emit({ dimensions: this.grid.pivotConfiguration.columns, dimensionCollectionType: PivotDimensionType.Row });
+        this.grid.dimensionsChange.emit({dimensions: this.grid.pivotConfiguration.columns, dimensionCollectionType: PivotDimensionType.Row});
+        this.grid.reflow();
     }
 
     public valueRemoved(event: IBaseChipEventArgs) {