Merge branch '7.3.x' into fix-#4859

Author: kdinev

projects/igniteui-angular/src/lib/dialog/dialog.component.ts

@@ -259,8 +259,8 @@ export class IgxDialogComponent implements IToggleView, OnInit, OnDestroy, After
     public onRightButtonSelect = new EventEmitter<IDialogEventArgs>();
 
     private _animaitonSettings: PositionSettings = {
-        openAnimation: useAnimation(slideInBottom, {params: {fromPosition: 'translateY(100%)'}}),
-        closeAnimation: useAnimation(slideOutTop, {params: {toPosition: 'translateY(-100%)'}})
+        openAnimation: useAnimation(slideInBottom, { params: { fromPosition: 'translateY(100%)' } }),
+        closeAnimation: useAnimation(slideOutTop, { params: { toPosition: 'translateY(-100%)' } })
     };
 
     private _overlayDefaultSettings: OverlaySettings;
@@ -391,6 +391,9 @@ export class IgxDialogComponent implements IToggleView, OnInit, OnDestroy, After
     public open(overlaySettings: OverlaySettings = this._overlayDefaultSettings) {
         this.toggleRef.open(overlaySettings);
         this.onOpen.emit({ dialog: this, event: null });
+        if (!this.leftButtonLabel && !this.rightButtonLabel) {
+            this.toggleRef.element.focus();
+        }
     }
 
     /**

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

@@ -591,11 +591,14 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
     /**
     * Sets whether rows can be edited.
     * ```html
-    * <igx-grid #grid [showToolbar]="true" [rowEditable]="true" [columnHiding]="true"></igx-grid>
+    * <igx-grid #grid [showToolbar]="true" [rowEditable]="true" [primaryKey]="'ProductID'" [columnHiding]="true"></igx-grid>
     * ```
     * @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();

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

@@ -1342,6 +1342,36 @@ describe('IgxGrid Component Tests', () => {
         }));
 
         describe('Row Editing - General tests', () => {
+            it('Should throw a warning when [rowEditable] is set on a grid w/o [primaryKey]', fakeAsync(() => {
+                const fix = TestBed.createComponent(IgxGridRowEditingComponent);
+                fix.detectChanges();
+                const grid = fix.componentInstance.grid;
+                grid.primaryKey = null;
+                grid.rowEditable = false;
+                tick();
+                fix.detectChanges();
+
+                spyOn(console, 'warn');
+                grid.rowEditable = true;
+                tick();
+                fix.detectChanges();
+                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();
+
+                tick();
+                fix.detectChanges();
+                grid.primaryKey = 'ProductID';
+                grid.rowEditable = false;
+                tick();
+                fix.detectChanges();
+                grid.rowEditable = true;
+                tick();
+                fix.detectChanges();
+                expect(console.warn).toHaveBeenCalledTimes(1);
+                expect(grid.rowEditable).toBeTruthy();
+            }));
             it('Should be able to enter edit mode on dblclick, enter and f2', fakeAsync(() => {
                 const fix = TestBed.createComponent(IgxGridRowEditingComponent);
                 fix.detectChanges();

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

@@ -863,6 +863,7 @@ describe('IgxGrid - Row Drag Tests', () => {
         <igx-grid #grid
             [width]='width'
             [height]='height'
+            primaryKey="ID"
             [data]="data"
             [autoGenerate]="true" (onColumnInit)="columnsCreated($event)" (onGroupingDone)="onGroupingDoneHandler($event)"
             [rowEditable]="true" [rowDraggable]="enableRowDraggable"
@@ -916,7 +917,7 @@ export class IgxGridRowDraggableComponent extends DataParent {
             [width]="'800px'"
             [height]="'300px'"
             [data]="data"
-            [primaryKey]="'ID'"
+            primaryKey="ID"
             [autoGenerate]="true" (onGroupingDone)="onGroupingDoneHandler($event)"
             [rowEditable]="true" [rowDraggable]="true"
             >