Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into hPopov/refactor-grid-paging-tests-master

Author: HristoP96

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

@@ -214,6 +214,17 @@ describe('Excel Exporter', () => {
             await wrapper.verifyDataFilesContent(actualData.gridJobTitleIdFrozen, 'Not all pinned columns are frozen in the export!');
         });
 
+        it('should honor all pinned rows.', async() => {
+            const result = await TestMethods.createGridAndPinRow(0, 2);
+            const fix = result.fixture;
+            const grid = result.grid;
+
+            const wrapper = await getExportedData(grid, options);
+            wrapper.verifyStructure();
+            await wrapper.verifyPinRowData('<pane ySplit="3" topLeftCell="A4" activePane="topRight" state="frozen"/>',
+             'Not all pinned rows are frozen in the export!');
+        });
+
         it('should honor applied sorting.', async () => {
             const fix = TestBed.createComponent(GridIDNameJobTitleComponent);
             fix.detectChanges();

projects/igniteui-angular/src/lib/services/excel/excel-exporter-grid.spec.ts

@@ -77,7 +77,8 @@ export class IgxExcelExporterService extends IgxBaseExporter {
             }
         }
 
-        const worksheetData = new WorksheetData(data, options, this._indexOfLastPinnedColumn, this._sort, this._isTreeGrid);
+        const worksheetData = new WorksheetData(data, options, this._indexOfLastPinnedColumn,
+             this._indexOfLastPinnedRow, this._sort, this._isTreeGrid);
         this._xlsx = new JSZip();
 
         const rootFolder = ExcelElementsFactory.getExcelFolder(ExcelFolderTypes.RootExcelFolder);

projects/igniteui-angular/src/lib/services/excel/excel-exporter.ts

@@ -116,12 +116,23 @@ export class WorksheetFile implements IExcelFile {
 
             cols.push('</cols>');
 
-            if (worksheetData.indexOfLastPinnedColumn !== -1 &&
-                !worksheetData.options.ignorePinning &&
-                !worksheetData.options.ignoreColumnsOrder) {
-                const frozenColumnCount = worksheetData.indexOfLastPinnedColumn + 1;
-                const firstCell = ExcelStrings.getExcelColumn(frozenColumnCount) + '1';
-                freezePane = `<pane xSplit="${frozenColumnCount}" topLeftCell="${firstCell}" activePane="topRight" state="frozen"/>`;
+            const hasFrozenElements = !worksheetData.options.ignorePinning &&
+             (worksheetData.indexOfLastPinnedColumn !== -1 || worksheetData.indexOfLastPinnedRow !== -1);
+
+            if (hasFrozenElements) {
+                const hasFrozenCols = !worksheetData.options.ignoreColumnsOrder && worksheetData.indexOfLastPinnedColumn !== -1;
+                const hasFrozenRows = worksheetData.indexOfLastPinnedRow !== -1;
+
+                const frozenColumnCount = hasFrozenCols ? worksheetData.indexOfLastPinnedColumn + 1 : null;
+                const frozenRowCount = hasFrozenRows ? worksheetData.indexOfLastPinnedRow + 2 : null;
+
+                const frozenColumn = !hasFrozenCols ? 'A' : ExcelStrings.getExcelColumn(frozenColumnCount);
+                const firstCell = frozenColumn + (frozenRowCount + 1);
+
+                const xSplit = hasFrozenCols ? `xSplit="${frozenColumnCount}" ` : '';
+                const ySplit = hasFrozenRows ? `ySplit="${frozenRowCount}" ` : '';
+                const xySplit = (xSplit + ySplit).trim();
+                freezePane = `<pane ${xySplit} topLeftCell="${firstCell}" activePane="topRight" state="frozen"/>`;
             }
         }
         const hasTable = !worksheetData.isEmpty && worksheetData.options.exportAsTable;

projects/igniteui-angular/src/lib/services/excel/excel-files.ts

@@ -141,6 +141,14 @@ export class JSZipWrapper {
         });
     }
 
+    public async verifyPinRowData(pinData: string, message = '') {
+        let result;
+        await this.readDataFiles().then(() => {
+            result = this.dataFilesContent[1];
+            expect(result.fileContent.indexOf(pinData) !== -1).toBeTruthy(message);
+        });
+    }
+
     /* Verifies the contents of all files and asserts the result.
     Optionally, a message can be passed in, which, if specified, will be shown in the beginning of the comparison result. */
     public async verifyFilesContent(expectedData: IFileContent[], message = '') {

projects/igniteui-angular/src/lib/services/excel/jszip-verification-wrapper.spec.ts

@@ -11,7 +11,7 @@ export class WorksheetData {
     private _isSpecialData: boolean;
 
     constructor(private _data: any[], public options: IgxExcelExporterOptions, public indexOfLastPinnedColumn,
-                public sort: any, public isTreeGridData = false) {
+        public indexOfLastPinnedRow, public sort: any, public isTreeGridData = false) {
         this.initializeData();
     }
 

projects/igniteui-angular/src/lib/services/excel/worksheet-data.ts

@@ -72,6 +72,7 @@ export abstract class IgxBaseExporter {
 
     protected _isTreeGrid = false;
     protected _indexOfLastPinnedColumn = -1;
+    protected _indexOfLastPinnedRow = -1;
     protected _sort = null;
 
     /**
@@ -289,6 +290,14 @@ export abstract class IgxBaseExporter {
             }
         }
 
+        if (grid.hasPinnedRecords) {
+
+            const pinnedRecs = data.filter(x => grid.isRecordPinned(x));
+            const unpinnedRecs = data.filter(x => !grid.isRecordPinned(x));
+            data = [ ...pinnedRecs, ... unpinnedRecs];
+            this._indexOfLastPinnedRow = pinnedRecs.length - 1;
+        }
+
         return data;
     }
 
@@ -307,6 +316,7 @@ export abstract class IgxBaseExporter {
     private resetDefaults() {
         this._columnList = [];
         this._indexOfLastPinnedColumn = -1;
+        this._indexOfLastPinnedRow = -1;
         this._sort = null;
         this.flatRecords = [];
     }

projects/igniteui-angular/src/lib/services/exporter-common/base-export-service.ts

@@ -50,4 +50,21 @@ export class TestMethods {
         return { fixture: fix, grid: myGrid };
     }
 
+
+        /* Creates an instance of GridDeclarationComponent and pins the rows with the specified indices. */
+        public static async createGridAndPinRow(...rowIndices: any[]) {
+            const fix = TestBed.createComponent(GridIDNameJobTitleComponent);
+            fix.detectChanges();
+            await wait(16);
+
+            const myGrid = fix.componentInstance.grid;
+
+            // Pin columns
+            rowIndices.forEach((i) => {
+                myGrid.getRowByIndex(i).pin();
+            });
+
+            return { fixture: fix, grid: myGrid };
+        }
+
 }

projects/igniteui-angular/src/lib/services/exporter-common/test-methods.spec.ts

@@ -25,6 +25,18 @@ export class UIInteractions {
         return new KeyboardEvent(eventType, keyboardEvent);
     }
 
+    public static getMouseEvent(eventType, altKey = false, shift = false, ctrl = false) {
+        const clickEvent = {
+            altKey: altKey,
+            shiftKey: shift,
+            ctrlKey: ctrl,
+            stopPropagation: () => { },
+            stopImmediatePropagation: () => { },
+            preventDefault: () => { }
+        };
+        return new MouseEvent(eventType, clickEvent);
+    }
+
     public static triggerEventHandlerKeyDown(keyPressed: string, elem: DebugElement, altKey = false, shift = false, ctrl = false) {
         const event = {
             key: keyPressed,

projects/igniteui-angular/src/lib/test-utils/ui-interactions.spec.ts

@@ -3,6 +3,7 @@
         Allows rows to be pinned to the beginning/end of the grid.
     </app-page-header>
     <button (click)="grid1.addRow({'ID': 'TEST', 'CompanyName': 'Test'})">Add Row</button>
+    <button (click)="exportButtonHandler()">Export</button>
     <div class="sample-content">
         <div class="sample-column">
             <div class="sample-buttons">