Merge branch '18.1.x' into aahmedov/fix-replaceHardcodedStrings-14620-18.1.x

Author: kacheshmarova

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.interface.ts

@@ -59,7 +59,6 @@ export interface IPivotDimensionStrategy {
 export type PivotAggregation = (members: any[], data: any[]) => any;
 
 /* marshalByValue */
-/* jsonAPIComplexObject */
 /**
 * Interface describing a IPivotAggregator class.
 * Used for specifying custom aggregator lists.
@@ -85,7 +84,6 @@ export interface IPivotAggregator {
 }
 
 /* marshalByValue */
-/* jsonAPIComplexObject */
 /**
 * Configuration of the pivot grid.
 */
@@ -108,7 +106,6 @@ export interface IPivotConfiguration {
 
 /* blazorElement */
 /* marshalByValue */
-/* jsonAPIComplexObject */
 /**
 * Configuration of a pivot dimension.
 */
@@ -150,7 +147,6 @@ export interface IPivotDimension {
 }
 
 /* marshalByValue */
-/* jsonAPIComplexObject */
 /**
 * Configuration of a pivot value aggregation.
 */

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

@@ -20,7 +20,12 @@ import {
     GridWithThreeLevelsOfMultiColumnHeadersAndTwoRowsExportComponent,
     GroupedGridWithSummariesComponent,
     GridCurrencySummariesComponent,
-    GridUserMeetingDataComponent
+    GridUserMeetingDataComponent,
+    GridCustomSummaryComponent,
+    GridCustomSummaryWithNullAndZeroComponent,
+    GridCustomSummaryWithUndefinedZeroAndValidNumberComponent,
+    GridCustomSummaryWithUndefinedAndNullComponent,
+    GridCustomSummaryWithDateComponent
 } from '../../test-utils/grid-samples.spec';
 import { SampleTestData } from '../../test-utils/sample-test-data.spec';
 import { first } from 'rxjs/operators';
@@ -75,7 +80,12 @@ describe('Excel Exporter', () => {
                 IgxHierarchicalGridSummariesExportComponent,
                 GroupedGridWithSummariesComponent,
                 GridCurrencySummariesComponent,
-                GridUserMeetingDataComponent
+                GridUserMeetingDataComponent,
+                GridCustomSummaryComponent,
+                GridCustomSummaryWithNullAndZeroComponent,
+                GridCustomSummaryWithUndefinedZeroAndValidNumberComponent,
+                GridCustomSummaryWithUndefinedAndNullComponent,
+                GridCustomSummaryWithDateComponent
             ]
         }).compileComponents();
     }));
@@ -1355,6 +1365,56 @@ describe('Excel Exporter', () => {
 
             await exportAndVerify(grid, options, actualData.exportHierarchicalGridWithSummaries);
         });
+
+        it('should export grid with custom summaries, only with summary label as string', async () => {
+            fix = TestBed.createComponent(GridCustomSummaryComponent);
+            fix.detectChanges();
+            await wait(300);
+
+            grid = fix.componentInstance.grid;
+
+            await exportAndVerify(grid, options, actualData.exportGridWithCustomSummaryOnlyWithSummaryLabel);
+        });
+
+        it('should export grid with custom summaries, with null and zero (as number)', async () => {
+            fix = TestBed.createComponent(GridCustomSummaryWithNullAndZeroComponent);
+            fix.detectChanges();
+            await wait(300);
+
+            grid = fix.componentInstance.grid;
+
+            await exportAndVerify(grid, options, actualData.exportGridCustomSummaryWithNullAndZero);
+        });
+
+        it('should export grid with custom summaries, with undefined, zero and positive number (as number)', async () => {
+            fix = TestBed.createComponent(GridCustomSummaryWithUndefinedZeroAndValidNumberComponent);
+            fix.detectChanges();
+            await wait(300);
+
+            grid = fix.componentInstance.grid;
+
+            await exportAndVerify(grid, options, actualData.exportGridCustomSummaryWithUndefinedZeroAndValidNumber);
+        });
+
+        it('should export grid with custom summaries, with undefined and null', async () => {
+            fix = TestBed.createComponent(GridCustomSummaryWithUndefinedAndNullComponent);
+            fix.detectChanges();
+            await wait(300);
+
+            grid = fix.componentInstance.grid;
+
+            await exportAndVerify(grid, options, actualData.exportGridCustomSummaryWithUndefinedAndNull);
+        });
+
+        it('should export grid with custom summaries, with date', async () => {
+            fix = TestBed.createComponent(GridCustomSummaryWithDateComponent);
+            fix.detectChanges();
+            await wait(300);
+
+            grid = fix.componentInstance.grid;
+
+            await exportAndVerify(grid, options, actualData.exportGridCustomSummaryWithDate);
+        });
     });
 
     describe('', () => {

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

@@ -457,9 +457,34 @@ export class WorksheetFile implements IExcelFile {
                 summaryFunc = this.getSummaryFunction(cellValue.label, key, dimensionMapKey, level, targetCol);
 
                 if (!summaryFunc) {
-                    const cellStr = `${cellValue.label}: ${cellValue.value}`;
-                    const savedValue = dictionary.saveValue(cellStr, false);
-                    return `<c r="${columnName}" t="s" s="1"><v>${savedValue}</v></c>`;
+                    let summaryValue;
+
+                    const label = cellValue.label?.toString();
+                    const value = cellValue.value?.toString();
+
+                    if (label && value) {
+                        summaryValue = `${cellValue.label}: ${cellValue.value}`;
+                    } else if (label) {
+                        summaryValue = cellValue.label;
+                    } else if (value) {
+                        summaryValue = cellValue.value;
+                    }
+
+                    const savedValue = dictionary.saveValue(summaryValue, false);
+                    const isSavedAsString = savedValue !== -1;
+                    const isSavedAsDate = !isSavedAsString && summaryValue instanceof Date;
+
+                    if (isSavedAsDate) {
+                        const timeZoneOffset = summaryValue.getTimezoneOffset() * 60000;
+                        const isoString = (new Date(summaryValue - timeZoneOffset)).toISOString();
+                        summaryValue = isoString.substring(0, isoString.indexOf('.'));
+                    }
+
+                    const resolvedValue = isSavedAsString ? savedValue : summaryValue;
+                    const type = isSavedAsString ? `t="s"` : isSavedAsDate ? `t="d"` : '';
+                    const style = isSavedAsDate ? `s="2"` : `s="1"`;
+
+                    return `<c r="${columnName}" ${type} ${style}><v>${resolvedValue}</v></c>`;
                 }
 
                 return `<c r="${columnName}"><f t="array" ref="${columnName}">${summaryFunc}</f></c>`;
@@ -536,7 +561,7 @@ export class WorksheetFile implements IExcelFile {
         let result = '';
         const currencyInfo = this.currencyStyleMap.get(col.currencyCode);
 
-        switch(type.toLowerCase()) {
+        switch(type?.toString().toLowerCase()) {
             case "count":
                 return `"Count: "&amp;_xlfn.COUNTIF(${levelDimensions.startCoordinate}:${levelDimensions.endCoordinate}, ${recordLevel})`
             case "min":