Skip to content

Commit 85e1b9e

Browse files
LipataLipata
committed
Merge branch 'VSlavov/grid-edit-events' of https://github.com/IgniteUI/igniteui-angular into VSlavov/grid-edit-events
2 parents 206bc36 + ce916ac commit 85e1b9e

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ describe('IgxGrid - CRUD operations', () => {
137137
});
138138

139139
it('should support updating a row through the grid API', () => {
140-
spyOn(grid.onEditDone, 'emit').and.callThrough();
140+
spyOn(grid.onCellEdit, 'emit').and.callThrough();
141141

142142
// Update non-existing row
143143
grid.updateRow({ index: -100, value: -100 }, 100);
@@ -159,13 +159,13 @@ describe('IgxGrid - CRUD operations', () => {
159159
cancel: false
160160
};
161161

162-
expect(grid.onEditDone.emit).toHaveBeenCalledWith(args);
162+
expect(grid.onCellEdit.emit).toHaveBeenCalledWith(args);
163163
expect(grid.rowList.first.cells.first.value).toEqual(200);
164164
expect(grid.data[0].index).toEqual(200);
165165
});
166166

167167
it('should support updating a cell value through the grid API', () => {
168-
spyOn(grid.onEditDone, 'emit').and.callThrough();
168+
spyOn(grid.onCellEdit, 'emit').and.callThrough();
169169

170170
// Update a non-existing cell
171171
grid.updateCell(-100, 100, 'index');
@@ -187,7 +187,7 @@ describe('IgxGrid - CRUD operations', () => {
187187
grid.updateCell('change', 1, 'index');
188188
fix.detectChanges();
189189

190-
expect(grid.onEditDone.emit).toHaveBeenCalledWith(args);
190+
expect(grid.onCellEdit.emit).toHaveBeenCalledWith(args);
191191
expect(grid.rowList.first.cells.first.value).toEqual(200);
192192
expect(grid.rowList.first.cells.first.nativeElement.textContent).toMatch('200');
193193
});
@@ -364,7 +364,7 @@ describe('IgxGrid - CRUD operations', () => {
364364
[data]="data"
365365
(onRowAdded)="rowAdded($event)"
366366
(onRowDeleted)="rowDeleted($event)"
367-
(onEditDone)="editDone($event)"
367+
(onCellEdit)="editDone($event)"
368368
[autoGenerate]="true"
369369
[primaryKey]="'index'">
370370
</igx-grid>

‎projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-crud.spec.ts

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ describe('IgxTreeGrid - CRUD', () => {
306306
});
307307

308308
it('should support updating a root row through the treeGrid API', () => {
309-
spyOn(treeGrid.onEditDone, 'emit').and.callThrough();
309+
spyOn(treeGrid.onCellEdit, 'emit').and.callThrough();
310310

311311
verifyCellValue(fix, 0, 'Name', 'John Winchester');
312312
verifyRowsCount(fix, 3, 10);
@@ -324,7 +324,7 @@ describe('IgxTreeGrid - CRUD', () => {
324324
fix.detectChanges();
325325

326326
const rowComponent = treeGrid.getRowByKey(999);
327-
expect(treeGrid.onEditDone.emit).toHaveBeenCalledWith({
327+
expect(treeGrid.onCellEdit.emit).toHaveBeenCalledWith({
328328
row: rowComponent,
329329
cell: null,
330330
currentValue: oldRow,
@@ -335,7 +335,7 @@ describe('IgxTreeGrid - CRUD', () => {
335335
});
336336

337337
it('should support updating a child row through the treeGrid API', () => {
338-
spyOn(treeGrid.onEditDone, 'emit').and.callThrough();
338+
spyOn(treeGrid.onCellEdit, 'emit').and.callThrough();
339339

340340
verifyCellValue(fix, 6, 'Name', 'Peter Lewis');
341341
verifyRowsCount(fix, 3, 10);
@@ -353,7 +353,7 @@ describe('IgxTreeGrid - CRUD', () => {
353353
fix.detectChanges();
354354

355355
const rowComponent = treeGrid.getRowByKey(888);
356-
expect(treeGrid.onEditDone.emit).toHaveBeenCalledWith({
356+
expect(treeGrid.onCellEdit.emit).toHaveBeenCalledWith({
357357
row: rowComponent,
358358
cell: null,
359359
currentValue: oldRow,
@@ -364,7 +364,7 @@ describe('IgxTreeGrid - CRUD', () => {
364364
});
365365

366366
it('should support updating a child row through the rowObject API', () => {
367-
spyOn(treeGrid.onEditDone, 'emit').and.callThrough();
367+
spyOn(treeGrid.onCellEdit, 'emit').and.callThrough();
368368

369369
verifyCellValue(fix, 6, 'Name', 'Peter Lewis');
370370
verifyRowsCount(fix, 3, 10);
@@ -382,7 +382,7 @@ describe('IgxTreeGrid - CRUD', () => {
382382
fix.detectChanges();
383383

384384
const rowComponent = treeGrid.getRowByKey(888);
385-
expect(treeGrid.onEditDone.emit).toHaveBeenCalledWith({
385+
expect(treeGrid.onCellEdit.emit).toHaveBeenCalledWith({
386386
row: rowComponent,
387387
cell: null,
388388
currentValue: oldRow,
@@ -399,7 +399,7 @@ describe('IgxTreeGrid - CRUD', () => {
399399
treeGrid.moveColumn(sourceColumn, targetColumn, DropPosition.BeforeDropTarget);
400400
fix.detectChanges();
401401

402-
spyOn(treeGrid.onEditDone, 'emit').and.callThrough();
402+
spyOn(treeGrid.onCellEdit, 'emit').and.callThrough();
403403

404404
verifyCellValue(fix, 6, 'Age', '25');
405405
verifyRowsCount(fix, 3, 10);
@@ -411,7 +411,7 @@ describe('IgxTreeGrid - CRUD', () => {
411411
fix.detectChanges();
412412

413413
const cellComponent = treeGrid.getCellByKey(299, 'Age');
414-
expect(treeGrid.onEditDone.emit).toHaveBeenCalledWith({
414+
expect(treeGrid.onCellEdit.emit).toHaveBeenCalledWith({
415415
row: cellComponent.row,
416416
cell: cellComponent,
417417
currentValue: oldCellValue,
@@ -428,7 +428,7 @@ describe('IgxTreeGrid - CRUD', () => {
428428
treeGrid.moveColumn(sourceColumn, targetColumn, DropPosition.BeforeDropTarget);
429429
fix.detectChanges();
430430

431-
spyOn(treeGrid.onEditDone, 'emit').and.callThrough();
431+
spyOn(treeGrid.onCellEdit, 'emit').and.callThrough();
432432

433433
verifyCellValue(fix, 6, 'Age', '25');
434434
verifyRowsCount(fix, 3, 10);
@@ -440,7 +440,7 @@ describe('IgxTreeGrid - CRUD', () => {
440440
fix.detectChanges();
441441

442442
const cellComponent = treeGrid.getCellByKey(299, 'Age');
443-
expect(treeGrid.onEditDone.emit).toHaveBeenCalledWith({
443+
expect(treeGrid.onCellEdit.emit).toHaveBeenCalledWith({
444444
row: cellComponent.row,
445445
cell: cellComponent,
446446
currentValue: oldCellValue,
@@ -460,7 +460,7 @@ describe('IgxTreeGrid - CRUD', () => {
460460
});
461461

462462
it('should support updating a root row through the treeGrid API', () => {
463-
spyOn(treeGrid.onEditDone, 'emit').and.callThrough();
463+
spyOn(treeGrid.onCellEdit, 'emit').and.callThrough();
464464

465465
verifyCellValue(fix, 0, 'Name', 'Casey Houston');
466466
verifyRowsCount(fix, 8, 8);
@@ -479,7 +479,7 @@ describe('IgxTreeGrid - CRUD', () => {
479479
fix.detectChanges();
480480

481481
const rowComponent = treeGrid.getRowByKey(1);
482-
expect(treeGrid.onEditDone.emit).toHaveBeenCalledWith({
482+
expect(treeGrid.onCellEdit.emit).toHaveBeenCalledWith({
483483
row: rowComponent,
484484
cell: null,
485485
currentValue: oldRow,
@@ -491,7 +491,7 @@ describe('IgxTreeGrid - CRUD', () => {
491491
});
492492

493493
it('should support updating a root row by changing its ID (its children should become root rows)', () => {
494-
spyOn(treeGrid.onEditDone, 'emit').and.callThrough();
494+
spyOn(treeGrid.onCellEdit, 'emit').and.callThrough();
495495

496496
verifyCellValue(fix, 0, 'Name', 'Casey Houston');
497497
verifyRowsCount(fix, 8, 8);
@@ -511,7 +511,7 @@ describe('IgxTreeGrid - CRUD', () => {
511511
fix.detectChanges();
512512

513513
const rowComponent = treeGrid.getRowByKey(999);
514-
expect(treeGrid.onEditDone.emit).toHaveBeenCalledWith({
514+
expect(treeGrid.onCellEdit.emit).toHaveBeenCalledWith({
515515
row: rowComponent,
516516
cell: null,
517517
currentValue: oldRow,
@@ -524,7 +524,7 @@ describe('IgxTreeGrid - CRUD', () => {
524524
});
525525

526526
it('should support updating a child row through the treeGrid API', () => {
527-
spyOn(treeGrid.onEditDone, 'emit').and.callThrough();
527+
spyOn(treeGrid.onCellEdit, 'emit').and.callThrough();
528528

529529
verifyCellValue(fix, 3, 'Name', 'Debra Morton');
530530
verifyRowsCount(fix, 8, 8);
@@ -542,7 +542,7 @@ describe('IgxTreeGrid - CRUD', () => {
542542
fix.detectChanges();
543543

544544
const rowComponent = treeGrid.getRowByKey(888);
545-
expect(treeGrid.onEditDone.emit).toHaveBeenCalledWith({
545+
expect(treeGrid.onCellEdit.emit).toHaveBeenCalledWith({
546546
row: rowComponent,
547547
cell: null,
548548
currentValue: oldRow,
@@ -553,7 +553,7 @@ describe('IgxTreeGrid - CRUD', () => {
553553
});
554554

555555
it('should support updating a child row through the rowObject API', () => {
556-
spyOn(treeGrid.onEditDone, 'emit').and.callThrough();
556+
spyOn(treeGrid.onCellEdit, 'emit').and.callThrough();
557557

558558
verifyCellValue(fix, 3, 'Name', 'Debra Morton');
559559
verifyRowsCount(fix, 8, 8);
@@ -571,7 +571,7 @@ describe('IgxTreeGrid - CRUD', () => {
571571
fix.detectChanges();
572572

573573
const rowComponent = treeGrid.getRowByKey(888);
574-
expect(treeGrid.onEditDone.emit).toHaveBeenCalledWith({
574+
expect(treeGrid.onCellEdit.emit).toHaveBeenCalledWith({
575575
row: rowComponent,
576576
cell: null,
577577
currentValue: oldRow,
@@ -582,7 +582,7 @@ describe('IgxTreeGrid - CRUD', () => {
582582
});
583583

584584
it('should support updating a child row by changing its original parentID', () => {
585-
spyOn(treeGrid.onEditDone, 'emit').and.callThrough();
585+
spyOn(treeGrid.onCellEdit, 'emit').and.callThrough();
586586

587587
verifyCellValue(fix, 3, 'Name', 'Debra Morton');
588588
verifyCellValue(fix, 5, 'Name', 'Erma Walsh');
@@ -602,7 +602,7 @@ describe('IgxTreeGrid - CRUD', () => {
602602
fix.detectChanges();
603603

604604
const rowComponent = treeGrid.getRowByKey(4); // original component: Name = 'Jack Simon'
605-
expect(treeGrid.onEditDone.emit).toHaveBeenCalledWith({
605+
expect(treeGrid.onCellEdit.emit).toHaveBeenCalledWith({
606606
row: rowComponent,
607607
cell: null,
608608
currentValue: oldRow,
@@ -621,7 +621,7 @@ describe('IgxTreeGrid - CRUD', () => {
621621
treeGrid.moveColumn(sourceColumn, targetColumn, DropPosition.BeforeDropTarget);
622622
fix.detectChanges();
623623

624-
spyOn(treeGrid.onEditDone, 'emit').and.callThrough();
624+
spyOn(treeGrid.onCellEdit, 'emit').and.callThrough();
625625

626626
verifyCellValue(fix, 3, 'Name', 'Debra Morton');
627627
verifyRowsCount(fix, 8, 8);
@@ -633,7 +633,7 @@ describe('IgxTreeGrid - CRUD', () => {
633633
fix.detectChanges();
634634

635635
const cellComponent = treeGrid.getCellByKey(7, 'Name');
636-
expect(treeGrid.onEditDone.emit).toHaveBeenCalledWith({
636+
expect(treeGrid.onCellEdit.emit).toHaveBeenCalledWith({
637637
row: cellComponent.row,
638638
cell: cellComponent,
639639
currentValue: oldCellValue,
@@ -650,7 +650,7 @@ describe('IgxTreeGrid - CRUD', () => {
650650
treeGrid.moveColumn(sourceColumn, targetColumn, DropPosition.BeforeDropTarget);
651651
fix.detectChanges();
652652

653-
spyOn(treeGrid.onEditDone, 'emit').and.callThrough();
653+
spyOn(treeGrid.onCellEdit, 'emit').and.callThrough();
654654

655655
verifyCellValue(fix, 3, 'Name', 'Debra Morton');
656656
verifyRowsCount(fix, 8, 8);
@@ -663,7 +663,7 @@ describe('IgxTreeGrid - CRUD', () => {
663663
fix.detectChanges();
664664

665665
const cellComponent = treeGrid.getCellByKey(7, 'Name');
666-
expect(treeGrid.onEditDone.emit).toHaveBeenCalledWith({
666+
expect(treeGrid.onCellEdit.emit).toHaveBeenCalledWith({
667667
row: cellComponent.row,
668668
cell: cellComponent,
669669
currentValue: oldCellValue,
@@ -801,7 +801,7 @@ describe('IgxTreeGrid - CRUD', () => {
801801
const cellComponent = treeGrid.getCellByColumn(0, 'ID');
802802
const cellDomNumber = fix.debugElement.queryAll(By.css(CELL_CSS_CLASS))[0];
803803

804-
treeGrid.onEditDone.pipe(first()).subscribe((args) => {
804+
treeGrid.onCellEdit.pipe(first()).subscribe((args) => {
805805
expect(args.newValue).toBe(146);
806806
});
807807

@@ -945,7 +945,7 @@ describe('IgxTreeGrid - CRUD', () => {
945945
const cellComponent = treeGrid.getCellByColumn(0, 'ID');
946946
const cellDomNumber = fix.debugElement.queryAll(By.css(CELL_CSS_CLASS))[0];
947947

948-
treeGrid.onEditDone.pipe(first()).subscribe((args) => {
948+
treeGrid.onCellEdit.pipe(first()).subscribe((args) => {
949949
expect(args.newValue).toBe(146);
950950
});
951951

‎projects/igniteui-angular/src/lib/test-utils/template-strings.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ export class EventSubscriptions {
397397

398398
public static onRowDeleted = ` (onRowDeleted)="rowDeleted($event)"`;
399399

400-
public static onEditDone = ` (onEditDone)="editDone($event)"`;
400+
public static onEditDone = ` (onCellEdit)="editDone($event)"`;
401401

402402
public static onRowSelectionChange = ` (onRowSelectionChange)="rowSelectionChange($event)"`;
403403

0 commit comments

Comments
 (0)