Merge branch '18.2.x' into sstoychev/flickering-test-combo

Author: damyanpetev

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, 18.1.x, 17.2.x, 16.1.x, 15.1.x ]
+    branches: [ master, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master, 18.1.x, 17.2.x, 16.1.x, 15.1.x ]
+    branches: [ master, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
   schedule:
     - cron: '33 4 * * 4'
 

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

@@ -134,6 +134,21 @@ describe('Excel Exporter', () => {
         await wrapper.verifyDataFilesContent(actualData.contactsDataSkippedColumnContent);
     });
 
+    it('should not fail when data contains null characters (#14944).', async () => {
+        options.columnWidth = 50;
+        const wrapper = await getExportedData([
+            'Terrance\u0000Orta',
+            'Richard Mahoney\x00LongerName',
+            'Donna\0Price',
+            'Lisa Landers',
+            'Dorothy H. Spencer'
+        ], options);
+
+        wrapper.verifyStructure();
+        await wrapper.verifyTemplateFilesContent();
+        await wrapper.verifyDataFilesContent(actualData.noHeadersStringDataWithNullChars);
+    });
+
     const getExportedData = (data: any[], exportOptions: IgxExcelExporterOptions) => {
         const result = new Promise<ZipWrapper>((resolve) => {
             exporter.exportEnded.pipe(first()).subscribe((value) => {

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

@@ -1935,4 +1935,22 @@ export class FileContentData {
 
         return this.createData();
     }
+
+    public get noHeadersStringDataWithNullChars() {
+        this._sharedStringsData = `count="6" uniqueCount="6"><si><t>Column1</t></si><si><t>TerranceOrta</t></si>` +
+            `<si><t>Richard MahoneyLongerName</t></si><si><t>DonnaPrice</t></si><si><t>Lisa Landers</t></si><si><t>` +
+            `Dorothy H. Spencer</t></si>`;
+
+        this._tableData = `ref="A1:A6" totalsRowShown="0"><autoFilter ref="A1:A6"/><tableColumns count="1">` +
+            `<tableColumn id="1" name="Column1"/></tableColumns>`;
+
+        this._worksheetData = `<dimension ref="A1:A6"/><sheetViews><sheetView tabSelected="1" workbookViewId="0"></sheetView>` +
+            `</sheetViews><sheetFormatPr defaultRowHeight="15" x14ac:dyDescent="0.25"/><cols><col min="1" max="1" ` +
+            `width="50" customWidth="1"/></cols><sheetData><row r="1"><c r="A1" t="s"><v>0</v></c></row><row r="2">` +
+            `<c r="A2" t="s"><v>1</v></c></row><row r="3"><c r="A3" t="s"><v>2</v></c></row><row r="4"><c r="A4" t="s"><v>3</v>` +
+            `</c></row><row r="5"><c r="A5" t="s"><v>4</v></c></row><row r="6"><c r="A6" t="s"><v>5</v></c></row></sheetData>`;
+
+        return this.createData();
+    }
+
 }

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

@@ -68,7 +68,9 @@ export class ExportUtilities {
                               .replace(/</g, '&lt;')
                               .replace(/>/g, '&gt;')
                               .replace(/"/g, '&quot;')
-                              .replace(/'/g, '&apos;');
+                              .replace(/'/g, '&apos;')
+                              // Bug #14944 - Remove the not supported null character (\u0000, \x00)
+                              .replace(/\x00/g, '');
         }
     }
 }