Merge pull request #6330 from IgniteUI/dmdimitrov/issue6224-8.2.x

Fixed index of last pinned column & awaiting async methods

Author: Lipata

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

@@ -76,12 +76,12 @@ describe('Excel Exporter', () => {
             fix.detectChanges();
 
             let wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridDataRecord5, 'One row only should have been exported!');
+            await wrapper.verifyDataFilesContent(actualData.simpleGridDataRecord5, 'One row only should have been exported!');
 
             options.ignoreFiltering = true;
             fix.detectChanges();
             wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridData, 'All 10 rows should have been exported!');
+            await wrapper.verifyDataFilesContent(actualData.simpleGridData, 'All 10 rows should have been exported!');
         });
 
         it('should honor filter criteria changes.', async () => {
@@ -92,14 +92,14 @@ describe('Excel Exporter', () => {
             options.ignoreFiltering = false;
 
             let wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridDataRecord5, 'One row should have been exported!');
+            await wrapper.verifyDataFilesContent(actualData.simpleGridDataRecord5, 'One row should have been exported!');
 
             grid.filter('JobTitle', 'Director', IgxStringFilteringOperand.instance().condition('equals'), true);
             fix.detectChanges();
 
             expect(grid.rowList.length).toEqual(2, 'Invalid number of rows after filtering!');
             wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridDataDirectors, 'Two rows should have been exported!');
+            await wrapper.verifyDataFilesContent(actualData.simpleGridDataDirectors, 'Two rows should have been exported!');
         });
 
         it('should honor \'ignoreColumnsVisibility\' option.', async () => {
@@ -115,12 +115,12 @@ describe('Excel Exporter', () => {
 
             expect(grid.visibleColumns.length).toEqual(2, 'Invalid number of visible columns!');
             let wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridNameJobTitle, 'Two columns should have been exported!');
+            await wrapper.verifyDataFilesContent(actualData.simpleGridNameJobTitle, 'Two columns should have been exported!');
 
             options.ignoreColumnsVisibility = true;
             fix.detectChanges();
             wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridData, 'All three columns should have been exported!');
+            await wrapper.verifyDataFilesContent(actualData.simpleGridData, 'All three columns should have been exported!');
         });
 
         it('should honor columns visibility changes.', async () => {
@@ -134,28 +134,28 @@ describe('Excel Exporter', () => {
 
             expect(grid.visibleColumns.length).toEqual(3, 'Invalid number of visible columns!');
             let wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridData, 'All columns should have been exported!');
+            await wrapper.verifyDataFilesContent(actualData.simpleGridData, 'All columns should have been exported!');
 
             grid.columns[0].hidden = true;
             fix.detectChanges();
 
             expect(grid.visibleColumns.length).toEqual(2, 'Invalid number of visible columns!');
             wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridNameJobTitle, 'Two columns should have been exported!');
+            await wrapper.verifyDataFilesContent(actualData.simpleGridNameJobTitle, 'Two columns should have been exported!');
 
             grid.columns[0].hidden = false;
             fix.detectChanges();
 
             expect(grid.visibleColumns.length).toEqual(3, 'Invalid number of visible columns!');
             wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridData, 'All columns should have been exported!');
+            await wrapper.verifyDataFilesContent(actualData.simpleGridData, 'All columns should have been exported!');
 
             grid.columns[0].hidden = undefined;
             fix.detectChanges();
 
             expect(grid.visibleColumns.length).toEqual(3, 'Invalid number of visible columns!');
             wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridData, 'All columns should have been exported!');
+            await wrapper.verifyDataFilesContent(actualData.simpleGridData, 'All columns should have been exported!');
         });
 
         it('should honor columns declaration order.', async () => {
@@ -166,7 +166,7 @@ describe('Excel Exporter', () => {
             const grid = fix.componentInstance.grid;
 
             const wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridNameJobTitleID);
+            await wrapper.verifyDataFilesContent(actualData.simpleGridNameJobTitleID);
         });
 
         it('should honor \'ignorePinning\' option.', async () => {
@@ -179,13 +179,13 @@ describe('Excel Exporter', () => {
 
             let wrapper = await getExportedData(grid, options);
             wrapper.verifyStructure();
-            // wrapper.verifyTemplateFilesContent();
-            wrapper.verifyDataFilesContent(actualData.gridNameFrozen, 'One frozen column should have been exported!');
+            // await wrapper.verifyTemplateFilesContent();
+            await wrapper.verifyDataFilesContent(actualData.gridNameFrozen, 'One frozen column should have been exported!');
 
             options.ignorePinning = true;
             fix.detectChanges();
             wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.gridNameIDJobTitle, 'No frozen columns should have been exported!');
+            await wrapper.verifyDataFilesContent(actualData.gridNameIDJobTitle, 'No frozen columns should have been exported!');
         });
 
         it('should honor pinned state changes.', async () => {
@@ -194,12 +194,22 @@ describe('Excel Exporter', () => {
             const grid = result.grid;
 
             let wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.gridNameFrozen, 'One frozen column should have been exported!');
+            await wrapper.verifyDataFilesContent(actualData.gridNameFrozen, 'One frozen column should have been exported!');
 
             grid.columns[1].pinned = false;
             fix.detectChanges();
             wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridData, 'No frozen columns should have been exported!');
+            await wrapper.verifyDataFilesContent(actualData.simpleGridData, 'No frozen columns should have been exported!');
+        });
+
+        it('should honor all pinned columns.', async() => {
+            const result = await TestMethods.createGridAndPinColumn(2, 0);
+            const fix = result.fixture;
+            const grid = result.grid;
+
+            const wrapper = await getExportedData(grid, options);
+            wrapper.verifyStructure();
+            await wrapper.verifyDataFilesContent(actualData.gridJobTitleIdFrozen, 'Not all pinned columns are frozen in the export!');
         });
 
         it('should honor applied sorting.', async () => {
@@ -212,7 +222,7 @@ describe('Excel Exporter', () => {
             fix.detectChanges();
 
             const wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridSortByName);
+            await wrapper.verifyDataFilesContent(actualData.simpleGridSortByName);
 
             // XXX : ???? What's the point of this?
             // grid.clearSort();
@@ -229,20 +239,21 @@ describe('Excel Exporter', () => {
             fix.detectChanges();
 
             let wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridSortByName, 'Ascending sorted data should have been exported.');
+            await wrapper.verifyDataFilesContent(actualData.simpleGridSortByName, 'Ascending sorted data should have been exported.');
 
             grid.sort({fieldName: 'Name', dir: SortingDirection.Desc, ignoreCase: true, strategy: DefaultSortingStrategy.instance()});
             fix.detectChanges();
 
             wrapper = await getExportedData(grid, options);
-            wrapper.verifyDataFilesContent(actualData.simpleGridSortByNameDesc(true), 'Descending sorted data should have been exported.');
+            await wrapper.verifyDataFilesContent(
+                actualData.simpleGridSortByNameDesc(true), 'Descending sorted data should have been exported.');
 
             grid.clearSort();
             grid.sort({fieldName: 'ID',  dir: SortingDirection.Asc, ignoreCase: true, strategy: DefaultSortingStrategy.instance()});
             fix.detectChanges();
 
             // wrapper = await getExportedData(grid, options);
-            // wrapper.verifyDataFilesContent(actualData.simpleGridSortByNameDesc(false), 'Unsorted data should have been exported.');
+            // await wrapper.verifyDataFilesContent(actualData.simpleGridSortByNameDesc(false), 'Unsorted data should have been exported.');
         });
 
         it('should export all columns with the width specified in options.', async () => {
@@ -323,7 +334,7 @@ describe('Excel Exporter', () => {
             expect(cols[0].index).toBe(0);
             expect(cols[1].header).toBe('JobTitle');
             expect(cols[1].index).toBe(1);
-            wrapper.verifyDataFilesContent(actualData.simpleGridNameJobTitle);
+            await wrapper.verifyDataFilesContent(actualData.simpleGridNameJobTitle);
         });
 
         it('should not export columns when \'onColumnExport\' is canceled.', async () => {
@@ -340,7 +351,7 @@ describe('Excel Exporter', () => {
             const wrapper = await getExportedData(grid, options);
             expect(wrapper.hasValues).toBe(false);
             wrapper.verifyStructure();
-            wrapper.verifyTemplateFilesContent();
+            await wrapper.verifyTemplateFilesContent();
         });
 
         it('should fire \'onRowExport\' for each grid row.', async () => {
@@ -378,7 +389,7 @@ describe('Excel Exporter', () => {
             const wrapper = await getExportedData(grid, options);
             expect(wrapper.hasValues).toBe(false);
             wrapper.verifyStructure();
-            wrapper.verifyTemplateFilesContent();
+            await wrapper.verifyTemplateFilesContent();
         });
 
         it('shouldn\'t affect grid sort expressions', async () => {

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

@@ -28,76 +28,76 @@ describe('Excel Exporter', () => {
         const wrapper = await getExportedData([], options);
 
         wrapper.verifyStructure();
-        wrapper.verifyTemplateFilesContent();
+        await wrapper.verifyTemplateFilesContent();
     });
 
     it('should export empty objects successfully.', async () => {
         const wrapper = await getExportedData(SampleTestData.emptyObjectData(), options);
 
         wrapper.verifyStructure();
-        wrapper.verifyTemplateFilesContent();
+        await wrapper.verifyTemplateFilesContent();
     });
 
     it('should export string data without headers successfully.', async () => {
         options.columnWidth = 50;
         const wrapper = await getExportedData(SampleTestData.stringArray(), options);
 
         wrapper.verifyStructure();
-        wrapper.verifyTemplateFilesContent();
-        wrapper.verifyDataFilesContent(actualData.noHeadersStringDataContent);
+        await wrapper.verifyTemplateFilesContent();
+        await wrapper.verifyDataFilesContent(actualData.noHeadersStringDataContent);
     });
 
     it('should export date time data without headers successfully.', async () => {
         options.columnWidth = 50;
         const wrapper = await getExportedData(SampleTestData.dateArray(), options);
 
         wrapper.verifyStructure();
-        wrapper.verifyTemplateFilesContent();
-        wrapper.verifyDataFilesContent(actualData.noHeadersDateTimeContent);
+        await wrapper.verifyTemplateFilesContent();
+        await wrapper.verifyDataFilesContent(actualData.noHeadersDateTimeContent);
     });
 
     it('should export number data without headers successfully.', async () => {
         options.columnWidth = 50;
         const wrapper = await getExportedData(SampleTestData.numbersArray(), options);
 
         wrapper.verifyStructure();
-        // wrapper.verifyTemplateFilesContent();
-        wrapper.verifyDataFilesContent(actualData.noHeadersNumberDataContent);
+        // await wrapper.verifyTemplateFilesContent();
+        await wrapper.verifyDataFilesContent(actualData.noHeadersNumberDataContent);
     });
 
     it('should export object data without headers successfully.', async () => {
         const wrapper = await getExportedData(SampleTestData.noHeadersObjectArray(), options);
 
         wrapper.verifyStructure();
-        wrapper.verifyTemplateFilesContent();
-        wrapper.verifyDataFilesContent(actualData.noHeadersObjectDataContent);
+        await wrapper.verifyTemplateFilesContent();
+        await wrapper.verifyDataFilesContent(actualData.noHeadersObjectDataContent);
     });
 
     it('should export regular data successfully.', async () => {
         options.columnWidth = 50;
         const wrapper = await getExportedData(SampleTestData.contactsData(), options);
 
         wrapper.verifyStructure();
-        wrapper.verifyTemplateFilesContent();
-        wrapper.verifyDataFilesContent(actualData.contactsDataContent);
+        await wrapper.verifyTemplateFilesContent();
+        await wrapper.verifyDataFilesContent(actualData.contactsDataContent);
     });
 
     it('should export data with missing values successfully.', async () => {
         options.columnWidth = 50;
         const wrapper = await getExportedData(SampleTestData.contactsDataPartial(), options);
 
         wrapper.verifyStructure();
-        wrapper.verifyTemplateFilesContent();
-        wrapper.verifyDataFilesContent(actualData.contactsPartialDataContent);
+        await wrapper.verifyTemplateFilesContent();
+        await wrapper.verifyDataFilesContent(actualData.contactsPartialDataContent);
     });
 
     it('should export data with special characters successully.', async () => {
         options.columnWidth = 50;
         const wrapper = await getExportedData(SampleTestData.contactsFunkyData(), options);
 
         wrapper.verifyStructure();
-        wrapper.verifyTemplateFilesContent();
-        wrapper.verifyDataFilesContent(actualData.contactsFunkyDataContent);
+        await wrapper.verifyTemplateFilesContent();
+        await wrapper.verifyDataFilesContent(actualData.contactsFunkyDataContent);
     });
 
     it('should throw an exception when setting negative width and height.', () => {

projects/igniteui-angular/src/lib/services/excel/test-data.service.spec.ts

@@ -699,6 +699,21 @@ export class FileContentData {
         return this.createData();
     }
 
+    get gridJobTitleIdFrozen() {
+        this._sharedStringsData = `count="23" uniqueCount="21"><si><t>JobTitle</t></si><si><t>ID</t></si><si><t>Name</t></si><si><t>Vice President</t></si><si><t>Casey Houston</t></si><si><t>Director</t></si><si><t>Gilberto Todd</t></si><si><t>Tanya Bennett</t></si><si><t>Software Developer</t></si><si><t>Jack Simon</t></si><si><t>Senior Software Developer</t></si><si><t>Celia Martinez</t></si><si><t>CEO</t></si><si><t>Erma Walsh</t></si><si><t>Associate Software Developer</t></si><si><t>Debra Morton</t></si><si><t>Software Development Team Lead</t></si><si><t>Erika Wells</t></si><si><t>Leslie Hansen</t></si><si><t>Manager</t></si><si><t>Eduardo Ramirez</t></si>`;
+
+        this._tableData = `ref="A1:C11" totalsRowShown="0">
+        <autoFilter ref="A1:C11"/><tableColumns count="3"><tableColumn id="1" name="JobTitle"/><tableColumn id="2" name="ID"/><tableColumn id="3" name="Name"/></tableColumns>`;
+
+        this._worksheetData = `<dimension ref="A1:C11"/>
+        <sheetViews><sheetView tabSelected="1" workbookViewId="0"><pane xSplit="2" topLeftCell="C1" activePane="topRight" state="frozen"/></sheetView></sheetViews>
+        <sheetFormatPr defaultRowHeight="15"  x14ac:dyDescent="0.25"/>
+        <cols><col min="1" max="1" width="50" customWidth="1"/><col min="2" max="2" width="50" customWidth="1"/><col min="3" max="3" width="50" customWidth="1"/></cols>
+        <sheetData><row r="1"><c r="A1" t="s"><v>0</v></c><c r="B1" t="s"><v>1</v></c><c r="C1" t="s"><v>2</v></c></row><row r="2"><c r="A2" t="s"><v>3</v></c><c r="B2" s="1"><v>1</v></c><c r="C2" t="s"><v>4</v></c></row><row r="3"><c r="A3" t="s"><v>5</v></c><c r="B3" s="1"><v>2</v></c><c r="C3" t="s"><v>6</v></c></row><row r="4"><c r="A4" t="s"><v>5</v></c><c r="B4" s="1"><v>3</v></c><c r="C4" t="s"><v>7</v></c></row><row r="5"><c r="A5" t="s"><v>8</v></c><c r="B5" s="1"><v>4</v></c><c r="C5" t="s"><v>9</v></c></row><row r="6"><c r="A6" t="s"><v>10</v></c><c r="B6" s="1"><v>5</v></c><c r="C6" t="s"><v>11</v></c></row><row r="7"><c r="A7" t="s"><v>12</v></c><c r="B7" s="1"><v>6</v></c><c r="C7" t="s"><v>13</v></c></row><row r="8"><c r="A8" t="s"><v>14</v></c><c r="B8" s="1"><v>7</v></c><c r="C8" t="s"><v>15</v></c></row><row r="9"><c r="A9" t="s"><v>16</v></c><c r="B9" s="1"><v>8</v></c><c r="C9" t="s"><v>17</v></c></row><row r="10"><c r="A10" t="s"><v>14</v></c><c r="B10" s="1"><v>9</v></c><c r="C10" t="s"><v>18</v></c></row><row r="11"><c r="A11" t="s"><v>19</v></c><c r="B11" s="1"><v>10</v></c><c r="C11" t="s"><v>20</v></c></row></sheetData>`;
+
+        return this.createData();
+    }
+
     get treeGridData() {
         this._sharedStringsData =
             `count="21" uniqueCount="19"><si><t>ID</t></si><si><t>ParentID</t></si><si><t>Name</t></si><si><t>JobTitle</t></si><si><t>Age</t></si><si><t>Casey Houston</t></si><si><t>Vice President</t></si><si><t>Gilberto Todd</t></si><si><t>Director</t></si><si><t>Tanya Bennett</t></si><si><t>Debra Morton</t></si><si><t>Associate Software Developer</t></si><si><t>Jack Simon</t></si><si><t>Software Developer</t></si><si><t>Erma Walsh</t></si><si><t>CEO</t></si><si><t>Eduardo Ramirez</t></si><si><t>Manager</t></si><si><t>Leslie Hansen</t></si>`;

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

@@ -140,7 +140,7 @@ export abstract class IgxBaseExporter {
             }
 
             if (column.pinned && exportColumn) {
-                this._indexOfLastPinnedColumn = index;
+                this._indexOfLastPinnedColumn++;
             }
         });