Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular …

…into mkirkova/feat-12212
IgniteUI · Nov 11, 2022 · 3734b76 · 3734b76
2 parents ebfa4f6 + 76aa753
commit 3734b76
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,8 @@ All notable changes for each version of this project will be documented in this
     - `detailTemplate` - Gets/Sets the master-detail template.
 
     - **Behavioral Change** - When adding new row in grid with enabled batch editing, `rowChangesCount` displays the number of the defined columns.
+- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
+    - **Behavioral Change** - When editing a row, `rowChangesCount` and `hiddenColumnsCount`would be displayed.
 
 ## 14.2.0
 

diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts
@@ -787,6 +787,7 @@ describe('IgxGrid - Row Editing #grid', () => {
         });
 
         it(`Should update row changes when focus overlay buttons on tabbing`, (async () => {
+            grid.getColumnByName("ID").hidden = true;
             grid.tbody.nativeElement.focus();
             fix.detectChanges();
 
@@ -807,7 +808,7 @@ describe('IgxGrid - Row Editing #grid', () => {
             UIInteractions.triggerEventHandlerKeyDown('tab', gridContent, false, true);
             fix.detectChanges();
 
-            expect(GridFunctions.getRowEditingBannerText(fix)).toBe('You have 1 changes in this row');
+            expect(GridFunctions.getRowEditingBannerText(fix)).toBe('You have 1 changes in this row and 1 hidden columns');
 
             // go to last editable cell
             grid.rowEditTabs.first.handleTab(UIInteractions.getKeyboardEvent('keydown', 'tab', false, true));
@@ -827,7 +828,7 @@ describe('IgxGrid - Row Editing #grid', () => {
             UIInteractions.triggerEventHandlerKeyDown('tab', gridContent);
             fix.detectChanges();
 
-            expect(GridFunctions.getRowEditingBannerText(fix)).toBe('You have 2 changes in this row');
+            expect(GridFunctions.getRowEditingBannerText(fix)).toBe('You have 2 changes in this row and 1 hidden columns');
         }));
 
         it(`Should focus last edited cell after click on editable buttons`, (async () => {

diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.component.html b/projects/igniteui-angular/src/lib/grids/grid/grid.component.html
@@ -240,7 +240,7 @@
 </div>
 
 <ng-template #defaultRowEditText>
-    You have {{ rowChangesCount }} changes in this row
+    You have {{ rowChangesCount }} changes in this row and {{ hiddenColumnsCount }} hidden columns
 </ng-template>
 
 <ng-template #defaultRowEditActions>

diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html
@@ -193,7 +193,7 @@
     </div>
 </div>
 <ng-template #defaultRowEditText>
-    You have {{ rowChangesCount }} changes in this row
+    You have {{ rowChangesCount }} changes in this row and {{ hiddenColumnsCount }} hidden columns
 </ng-template>
 <ng-template #defaultRowEditActions>
     <button igxButton igxRowEditTabStop (click)="this.endRowEditTabStop(false, $event)">{{ this.resourceStrings.igx_grid_row_edit_btn_cancel }}</button>

diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts
@@ -1585,7 +1585,7 @@ describe('IgxHierarchicalGrid Runtime Row Island change Scenarios #hGrid', () =>
         const mainGridOverlayTextContent = mainGridOverlay.querySelector('.igx-banner__text').textContent;
         const mainGridOverlayActionsContent = mainGridOverlay.querySelector('.igx-banner__actions').textContent;
 
-        expect(mainGridOverlayTextContent).toBe(' You have 0 changes in this row\n');
+        expect(mainGridOverlayTextContent).toBe(' You have 0 changes in this row and 0 hidden columns\n');
         expect(mainGridOverlayActionsContent).toBe('CancelDone');
 
         hierarchicalGrid.expandRow(hierarchicalGrid.getRowByIndex(0).key);

diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html
@@ -181,7 +181,7 @@
 </div>
 
 <ng-template #defaultRowEditText>
-    You have {{ rowChangesCount }} changes in this row
+    You have {{ rowChangesCount }} changes in this row and {{ hiddenColumnsCount }} hidden columns
 </ng-template>
 
 <ng-template #defaultRowEditActions>