Skip to content

Commit 27e7dad

Browse files
authored
Merge branch 'master' into mkirova/add-row-pinning-integration
2 parents f022e5d + fddcc63 commit 27e7dad

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4384,7 +4384,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
43844384
public refreshGridState(args?) {
43854385
this.endEdit(true);
43864386
this.selectionService.clearHeaderCBState();
4387-
this.summaryService.clearSummaryCache(args);
4387+
this.summaryService.clearSummaryCache();
43884388
}
43894389

43904390
// TODO: We have return values here. Move them to event args ??

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
33
import { async, TestBed, fakeAsync } from '@angular/core/testing';
44
import { configureTestSuite } from '../../test-utils/configure-suite';
55
import { DebugElement } from '@angular/core';
6-
import { GridFunctions } from '../../test-utils/grid-functions.spec';
6+
import { GridFunctions, GridSummaryFunctions } from '../../test-utils/grid-functions.spec';
77
import {
88
IgxAddRowComponent
99
} from '../../test-utils/grid-samples.spec';
@@ -15,6 +15,7 @@ import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec';
1515
import { IgxGridRowComponent } from './grid-row.component';
1616

1717
describe('IgxGrid - Row Adding #grid', () => {
18+
const SUMMARY_ROW = 'igx-grid-summary-row';
1819
let fixture;
1920
let grid: IgxGridComponent;
2021
let gridContent: DebugElement;
@@ -242,5 +243,21 @@ describe('IgxGrid - Row Adding #grid', () => {
242243
expect(rowOffsets.top >= gridOffsets.top && rowOffsets.bottom <= gridOffsets.bottom).toBeTruthy();
243244
});
244245

246+
it('should update summaries after row is added via the UI.', () => {
247+
grid.getColumnByName('ID').hasSummary = true;
248+
fixture.detectChanges();
249+
let summaryRow = fixture.debugElement.query(By.css(SUMMARY_ROW));
250+
GridSummaryFunctions.verifyColumnSummaries(summaryRow, 0, ['Count'], ['27']);
251+
252+
grid.rowList.first.beginAddRow();
253+
fixture.detectChanges();
254+
255+
grid.endEdit(true);
256+
fixture.detectChanges();
257+
258+
summaryRow = fixture.debugElement.query(By.css(SUMMARY_ROW));
259+
GridSummaryFunctions.verifyColumnSummaries(summaryRow, 0, ['Count'], ['28']);
260+
});
261+
245262
});
246263
});

src/app/grid-add-row/grid-add-row.sample.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
[pinned]="c.pinned"
2020
[hidden]="c.hidden"
2121
[groupable]='true'
22+
[hasSummary]="true"
2223
>
2324
</igx-column>
2425

0 commit comments

Comments
 (0)