Merge branch 'master' into mkirova/row-pinning-editing

Author: ChronosSF

CHANGELOG.md

@@ -14,6 +14,17 @@ All notable changes for each version of this project will be documented in this
 ### New Features
 
 - `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
+    - Added ability to pin rows to top or bottom depending on the new `pinning` input.
+    And new API methods `pinRow` and `unpinRow`.
+    ```html
+    <igx-grid [data]="data" [pinning]="pinningConfiguration"></igx-grid>
+    ```
+    ```typescript
+    public pinningConfiguration: IPinningConfig = { rows: RowPinningPosition.Bottom };
+    ```
+    ```typescript
+    this.grid.pinRow(rowID);
+    ```
     - Added support for pinning columns on the right. Change the position of pinning using the new `pinning` input.
     ```html
     <igx-grid [data]="data" [pinning]="pinningConfiguration"></igx-grid>

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

@@ -13,6 +13,7 @@ import { DefaultSortingStrategy } from '../../data-operations/sorting-strategy';
 import { IgxStringFilteringOperand } from '../../data-operations/filtering-condition';
 import { configureTestSuite } from '../../test-utils/configure-suite';
 import { IgxGridHeaderComponent } from '../headers/grid-header.component';
+import { GridSummaryFunctions } from '../../test-utils/grid-functions.spec';
 
 const GRID_COL_THEAD_TITLE_CLASS = 'igx-grid__th-title';
 const GRID_COL_GROUP_THEAD_TITLE_CLASS = 'igx-grid__thead-title';
@@ -179,6 +180,8 @@ describe('IgxGrid - multi-column headers #grid', () => {
         expect(getColGroup(grid, 'General Information').hidden).toEqual(false);
     }));
 
+
+
     it('Width should be correct. Column group with column. No width.', fakeAsync(/** height/width setter rAF */() => {
         const fixture = TestBed.createComponent(OneGroupOneColGridComponent);
         fixture.detectChanges();
@@ -1215,6 +1218,28 @@ describe('IgxGrid - multi-column headers #grid', () => {
         expect(grid.getCellByColumn(4, 'Country').value).toEqual('Sweden');
     }));
 
+    it('summaries - verify summaries when there are grouped columns', fakeAsync(() => {
+        const fixture = TestBed.createComponent(ColumnGroupFourLevelTestComponent);
+        fixture.detectChanges();
+        const grid = fixture.componentInstance.grid;
+        const allColumns = grid.columnList;
+        allColumns.forEach((col) => {
+            if (!col.columnGroup) {
+                col.hasSummary = true;
+            }
+        });
+        fixture.detectChanges();
+
+        const summaryRow = GridSummaryFunctions.getRootSummaryRow(fixture);
+        GridSummaryFunctions.verifyColumnSummaries(summaryRow, 0, ['Count'], ['27']);
+        GridSummaryFunctions.verifyColumnSummaries(summaryRow, 1, ['Count'], ['27']);
+        GridSummaryFunctions.verifyColumnSummaries(summaryRow, 2, ['Count'], ['27']);
+        GridSummaryFunctions.verifyColumnSummaries(summaryRow, 3, ['Count'], ['27']);
+        GridSummaryFunctions.verifyColumnSummaries(summaryRow, 4, ['Count'], ['27']);
+        GridSummaryFunctions.verifyColumnSummaries(summaryRow, 5, ['Count'], ['27']);
+        GridSummaryFunctions.verifyColumnSummaries(summaryRow, 6, ['Count'], ['27']);
+    }));
+
     it('filtering - filter a grouped column', fakeAsync(() => {
         const fixture = TestBed.createComponent(ColumnGroupFourLevelTestComponent);
         fixture.detectChanges();
@@ -1275,6 +1300,7 @@ describe('IgxGrid - multi-column headers #grid', () => {
     }));
 
 
+
     it('grouping - verify grouping when there are grouped columns', fakeAsync(/** height/width setter rAF */() => {
         const fixture = TestBed.createComponent(ColumnGroupGroupingTestComponent);
         fixture.detectChanges();