Merge branch 'master' into ibarakov/fix-7090-master

Author: DiyanDimitrov

CHANGELOG.md

@@ -7,7 +7,7 @@ All notable changes for each version of this project will be documented in this
 - `IgxDatePicker`
     - Added `aria-labelledby` property for the input field. This will ensure the users of assistive technologies will also know what component is used for, upon input focus.
 - `IgxInputGroup`
-    - **Breaking Change** - Removed `fluent`, `fluent_search`, `bootstrap`, and `indigo` as possible values for the `type` input property. 
+    - **Breaking Change** - Removed `fluent`, `fluent_search`, `bootstrap`, and `indigo` as possible values for the `type` input property.
     - **Behavioral Change** - The styling of the input group is now dictated by the theme being used. The remaining `types` - `line`, `border`, and `box` will only have effect on the styling when used with the `material` theme. The `search` type will affect styling when used with all themes. Changing the theme at runtime will not change the styling of the input group, a page refresh is required.
 - `IgxOverlay`
     - **Breaking Change** - `target` property in `PositionSettings` has been deprecated. You can set the attaching target for the component to show in `OverlaySettings` instead.
@@ -20,6 +20,7 @@ All notable changes for each version of this project will be documented in this
 ### New Features
 - `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
     - When triggering an export of the grid via the toolbar and the export takes more than 500 milliseconds, the export button becomes disabled and an indeterminate progress bar is shown at the bottom of the toolbar until the export is finished.
+    - Added *getRowData(rowSelector)* method that returns an object that represents the data that is contained in the specified row component.
 - ` IGX_INPUT_GROUP_TYPE` injection token
     - Allows for setting an input group `type` on a global level, so all input-group instances, including components using such an instance as a template will have their input group type set to the one specified by the token. It can be overridden on a component level by explicitly setting a `type`.
 - ` IgxExcelExporterService`
@@ -32,7 +33,7 @@ All notable changes for each version of this project will be documented in this
 - `IgxOverlay`
     - The `PositionSettings` `target` property has been deprecated and moved to `OverlaySettings`.
     - An optional Point/HTML Element parameter `target` has been added to the `position()` method
-    
+
 ## 10.1.0
 
 ### General
@@ -54,7 +55,7 @@ All notable changes for each version of this project will be documented in this
 - `igxGrid`
     - **Behavioral Change** - For numeric columns, the onCellEdit arguments' newValue will now contain the numeric value that will be committed instead of the string input.
     - Added `onScroll` event, which is emitted when the grid is scrolled vertically or horizontally.
-    - Each grid now expose a default handling for boolean column types. The column will display `check` or `close` icon, instead of true/false by default. 
+    - Each grid now expose a default handling for boolean column types. The column will display `check` or `close` icon, instead of true/false by default.
 - `igxTreeGrid`
     - Removed `onDataPreLoad` event as it is specific for remote virtualization implementation, which is not supported for the `igxTreeGrid`. A more generic `onScroll` event is exposed and can be used instead.
 - `IgxTimePicker`

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

@@ -4209,6 +4209,25 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
         }
     }
 
+    /**
+     * Returns the data that is contained in the row component.
+     * @remarks
+     * If the primary key is not specified the row selector match the row data.
+     * @example
+     * ```typescript
+     * const data = grid.getRowData(94741);
+     * ```
+     * @param rowSelector correspond to rowID
+     */
+    public getRowData(rowSelector: any) {
+        if (!this.primaryKey) {
+            return rowSelector;
+        }
+        const data = this.gridAPI.get_all_data(this.transactions.enabled);
+        const index = this.gridAPI.get_row_index_in_data(rowSelector);
+        return index < 0 ? {} : data[index];
+    }
+
     /**
      * Sort a single `IgxColumnComponent`.
      * @remarks

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

@@ -1637,7 +1637,39 @@ describe('IgxGrid Component Tests #grid', () => {
                 scrollPosition: grid.headerContainer.getScrollForIndex(6, true),
                 event: horizontalScrollEvent
             });
+        });
+
+        it(`Verify that getRowData returns correct data`, () => {
+            const fix = TestBed.createComponent(IgxGridDefaultRenderingComponent);
+            fix.componentInstance.initColumnsRows(5, 5);
+            fix.detectChanges();
+
+            const grid = fix.componentInstance.grid;
+            const cols = fix.componentInstance.columns;
+
+            const row = {'col0': 0, 'col1': 4, 'col2': 8, 'col3': 12, 'col4': 16};
+            const secondRow = {'col0': 0, 'col1': 1, 'col2': 2, 'col3': 3, 'col4': 4};
+
+            expect(grid.getRowData(row)).toEqual(row);
+
+            grid.primaryKey = 'col1';
+            fix.detectChanges();
+
+            expect(grid.getRowData(4)).toEqual(row);
+
+            grid.filter(cols[1].key, 2, IgxNumberFilteringOperand.instance().condition('greaterThan'));
+            fix.detectChanges();
+
+            expect(grid.getRowData(4)).toEqual(row);
+            expect(grid.getRowData(1)).toEqual(secondRow);
+            expect(grid.getRowData(7)).toEqual({});
+
+            grid.sort({ fieldName: 'col2', dir: SortingDirection.Desc, ignoreCase: true });
+            fix.detectChanges();
 
+            expect(grid.getRowData(4)).toEqual(row);
+            expect(grid.getRowData(1)).toEqual(secondRow);
+            expect(grid.getRowData(7)).toEqual({});
         });
     });
 

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

@@ -225,6 +225,26 @@ describe('IgxHierarchicalGrid Integration #hGrid', () => {
             fixture.detectChanges();
             expect(childGrid.getCellByColumn(0, 'ProductName').nativeElement.innerText).toEqual('Product: A0');
         }));
+
+        it('should return correctly the rowData', () => {
+            hierarchicalGrid.primaryKey = 'ID';
+            fixture.detectChanges();
+
+            const rowData = hierarchicalGrid.getRowByKey('2').rowData;
+            expect(hierarchicalGrid.getRowData('2')).toEqual(rowData);
+
+            hierarchicalGrid.sort({ fieldName: 'ChildLevels', dir: SortingDirection.Desc, ignoreCase: true });
+            fixture.detectChanges();
+
+            expect(hierarchicalGrid.getRowData('2')).toEqual(rowData);
+            expect(hierarchicalGrid.getRowData('101')).toEqual({});
+
+            hierarchicalGrid.filter('ID', '1', IgxStringFilteringOperand.instance().condition('startsWith'));
+            fixture.detectChanges();
+
+            expect(hierarchicalGrid.getRowData('2')).toEqual(rowData);
+            expect(hierarchicalGrid.getRowData('101')).toEqual({});
+        });
     });
 
     describe('Sorting', () => {

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

@@ -1170,6 +1170,40 @@ describe('IgxTreeGrid - Integration #tGrid', () => {
             expect(() => grid.addRow(grid.data, 1)).toThrow(Error(`Cannot add child row to deleted parent row`));
             expect(grid.transactions.getTransactionLog().length).toBe(1);
         }));
+
+        it('should return correctly the rowData', fakeAsync(() => {
+            const fixture = TestBed.createComponent(IgxTreeGridRowEditingTransactionComponent);
+            const grid = (fixture as ComponentFixture<IgxTreeGridRowEditingTransactionComponent>).componentInstance.treeGrid;
+            grid.cascadeOnDelete = false;
+            tick();
+            fixture.detectChanges();
+
+            const row = {'ID': 2, 'ParentID': 1, 'Name': 'Gilberto Todd', 'JobTitle': 'Director', 'Age': 41};
+            expect(grid.getRowData(2)).toEqual(row);
+
+            grid.sort({ fieldName: 'Age', dir: SortingDirection.Desc, ignoreCase: true });
+            fixture.detectChanges();
+
+            expect(grid.getRowData(2)).toEqual(row);
+            expect(grid.getRowData(11)).toEqual({});
+
+            grid.filter('Age', 43, IgxNumberFilteringOperand.instance().condition('greaterThan'));
+            fixture.detectChanges();
+
+            expect(grid.getRowData(2)).toEqual(row);
+            expect(grid.getRowData(11)).toEqual({});
+
+            const newRow = {'ID': 11, 'ParentID': 1, 'Name': 'Joe Peterson', 'JobTitle': 'Manager', 'Age': 37};
+            grid.addRow(newRow);
+            fixture.detectChanges();
+
+            grid.clearFilter();
+            tick();
+            fixture.detectChanges();
+
+            expect(grid.transactions.getTransactionLog().length).toEqual(1);
+            expect(grid.getRowData(11)).toEqual(newRow);
+        }));
     });
 
     describe('Multi-column header', () => {