Merge branch '9.1.x' into dkamburov/fix-6860

Author: dkamburov

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts

@@ -1,5 +1,6 @@
 import { Component, HostBinding } from '@angular/core';
 import { IgxGridActionsBaseDirective } from './grid-actions-base.directive';
+import { showMessage } from '../../core/deprecateDecorators';
 
 @Component({
     selector: 'igx-grid-editing-actions',
@@ -16,6 +17,8 @@ export class IgxGridEditingActionsComponent extends IgxGridActionsBaseDirective
     @HostBinding('class.igx-action-strip__editing-actions')
     public cssClass = 'igx-action-strip__editing-actions';
 
+    private isMessageShown = false;
+
     /**
      * Enter row or cell edit mode depending the grid rowEditable option
      * @example
@@ -33,6 +36,12 @@ export class IgxGridEditingActionsComponent extends IgxGridActionsBaseDirective
         const row = this.strip.context;
         const firstEditable = row.cells.filter(cell => cell.editable)[0];
         const grid = row.grid;
+        if (!grid.hasEditableColumns) {
+            this.isMessageShown = showMessage(
+                'The grid should be editable in order to use IgxGridEditingActionsComponent',
+                this.isMessageShown);
+                return;
+        }
         // be sure row is in view
         if (grid.rowList.filter(r => r === row).length !== 0) {
             grid.crudService.begin(firstEditable);

projects/igniteui-angular/src/lib/grids/grid/grid-api.service.ts

@@ -43,12 +43,16 @@ export class IgxGridAPIService extends GridBaseAPIService<IgxGridComponent> {
             names.forEach((colName) => {
                 const grExprIndex = groupingState.findIndex((exp) => exp.fieldName === colName);
                 const grpExpandState = this.grid.groupingExpansionState;
-                /* remove expansion states related to the cleared group
-                and all with deeper hierarchy than the cleared group */
-                this.grid.groupingExpansionState = grpExpandState
-                    .filter((val) => {
-                        return val.hierarchy && val.hierarchy.length <= grExprIndex;
-                    });
+                 /* remove expansion states related to the cleared group
+                    and all with deeper hierarchy than the cleared group */
+                const newExpandState = grpExpandState.filter((val) => {
+                    return val.hierarchy && val.hierarchy.length <= grExprIndex;
+                });
+                /* Do not set the new instance produced by filter
+                    when there are no differences between expansion states */
+                if (newExpandState.length !== grpExpandState.length) {
+                   this.grid.groupingExpansionState = newExpandState;
+                }
             });
         } else {
             // clear all

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

@@ -1684,6 +1684,7 @@ describe('IgxGrid - Summaries #grid', () => {
             GridSummaryFunctions.verifyColumnSummaries(summaryRow, 4, ['Count', 'Min', 'Max', 'Sum', 'Avg'], ['2', '31', '43', '74', '37']);
 
             grid.clearGrouping('OnPTO');
+            fix.detectChanges();
             verifyBaseSummaries(fix);
             verifySummariesForParentID17(fix, 3);
             verifySummariesForParentID19(fix, 6);