Skip to content

RowEdit + PrimaryKey warning fix - master #5050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 17, 2019
Merged

RowEdit + PrimaryKey warning fix - master #5050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7be078
fix(grid): fix row editing warning to show when !primaryKey, #5010
ViktorSlavov Jun 12, 2019
9e56b7b
Merge branch 'master' into vslavov/row-editing-warning-master
kdinev Jun 13, 2019
265fa97
fix(grid): move row edit warning to crudService.beginRowEdit, #5010
ViktorSlavov Jun 13, 2019
460732a
test(grid): rework rowEdit/primaryKey warning test, #5010
ViktorSlavov Jun 13, 2019
94ac19e
Merge branch 'master' into vslavov/row-editing-warning-master
ViktorSlavov Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions projects/igniteui-angular/src/lib/core/grid-selection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ export class IgxGridCRUDService {
}

beginRowEdit() {
if (this.grid.rowEditable && (this.grid.primaryKey === undefined || this.grid.primaryKey === null)) {
console.warn('The grid must have a `primaryKey` specified when using `rowEditable`!');
}
this.row = this.createRow(this.cell);
const args = {
rowID: this.row.id,
Expand Down
3 changes: 0 additions & 3 deletions projects/igniteui-angular/src/lib/grids/grid-base.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,9 +596,6 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
* @memberof IgxGridBaseComponent
*/
set rowEditable(val: boolean) {
if (val && (this.primaryKey === undefined || this.primaryKey === null)) {
console.warn('The grid must have a `primaryKey` specified when using `rowEditable`!');
}
this._rowEditable = val;
if (this.gridAPI.grid) {
this.refreshGridState();
Expand Down
15 changes: 7 additions & 8 deletions projects/igniteui-angular/src/lib/grids/grid/grid.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,22 +1391,21 @@ describe('IgxGrid Component Tests', () => {
grid.rowEditable = true;
fix.detectChanges();
tick(16);
expect(console.warn).toHaveBeenCalledWith('The grid must have a `primaryKey` specified when using `rowEditable`!');
expect(console.warn).toHaveBeenCalledTimes(1);
// Throws warinig but still sets the property correctly
expect(grid.rowEditable).toBeTruthy();

const cell = grid.getRowByIndex(2).cells.toArray()[1].nativeElement;
spyOn(grid, 'openRowOverlay');
cell.dispatchEvent(new Event('focus'));
tick(16);
fix.detectChanges();
grid.primaryKey = 'ProductID';
grid.rowEditable = false;
fix.detectChanges();
cell.dispatchEvent(new Event('dblclick'));
tick(16);
grid.rowEditable = true;
fix.detectChanges();
tick(16);
expect(console.warn).toHaveBeenCalledWith('The grid must have a `primaryKey` specified when using `rowEditable`!');
expect(console.warn).toHaveBeenCalledTimes(1);
expect(grid.rowEditable).toBeTruthy();
// Still calls openRowOverlay, just logs the warning
expect(grid.openRowOverlay).toHaveBeenCalled();
}));
it('Should be able to enter edit mode on dblclick, enter and f2', fakeAsync(() => {
const fix = TestBed.createComponent(IgxGridRowEditingComponent);
Expand Down