Merge branch 'master' into vkombov/feat-10125-master

Author: Lipata

projects/igniteui-angular/src/lib/grids/columns/column.component.ts

@@ -38,7 +38,7 @@ import { IgxGridFilteringCellComponent } from '../filtering/base/grid-filtering-
 import { IgxGridHeaderGroupComponent } from '../headers/grid-header-group.component';
 import {
     IgxSummaryOperand, IgxNumberSummaryOperand, IgxDateSummaryOperand,
-    IgxCurrencySummaryOperand, IgxPercentSummaryOperand, IgxSummaryResult, IgxTimeSummaryOperand
+    IgxSummaryResult, IgxTimeSummaryOperand
 } from '../summaries/grid-summary';
 import {
     IgxCellTemplateDirective,
@@ -1711,6 +1711,8 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy {
                     this.summaries = IgxSummaryOperand;
                     break;
                 case GridColumnDataType.Number:
+                case GridColumnDataType.Currency:
+                case GridColumnDataType.Percent:
                     this.summaries = IgxNumberSummaryOperand;
                     break;
                 case GridColumnDataType.Date:
@@ -1720,12 +1722,6 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy {
                 case GridColumnDataType.Time:
                     this.summaries = IgxTimeSummaryOperand;
                     break;
-                case GridColumnDataType.Currency:
-                    this.summaries = IgxCurrencySummaryOperand;
-                    break;
-                case GridColumnDataType.Percent:
-                    this.summaries = IgxPercentSummaryOperand;
-                    break;
                 default:
                     this.summaries = IgxSummaryOperand;
                     break;

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

@@ -31,6 +31,7 @@ import { SortingDirection } from '../../data-operations/sorting-expression.inter
 import { DropPosition } from '../moving/moving.service';
 import { DatePipe } from '@angular/common';
 import { IgxGridGroupByRowComponent } from './groupby-row.component';
+import { IColumnPipeArgs } from 'igniteui-angular';
 
 describe('IgxGrid - Summaries #grid', () => {
 
@@ -154,7 +155,7 @@ describe('IgxGrid - Summaries #grid', () => {
             it('should properly render custom summaries', () => {
                 const summaryRow = GridSummaryFunctions.getRootSummaryRow(fixture);
                 GridSummaryFunctions.verifyColumnSummaries(summaryRow, 3, ['Count', 'Sum', 'Avg'], ['10', '39,004', '3,900.4']);
-                GridSummaryFunctions.verifyColumnSummaries(summaryRow, 4, ['Earliest'], ['5/17/1990']);
+                GridSummaryFunctions.verifyColumnSummaries(summaryRow, 4, ['Earliest', 'Items InStock'], ['May 17, 1990', '1337']);
 
                 grid.filter('UnitsInStock', '0', IgxNumberFilteringOperand.instance().condition('lessThan'), true);
                 fixture.detectChanges();
@@ -181,7 +182,7 @@ describe('IgxGrid - Summaries #grid', () => {
             it('should change custom summaries at runtime', () => {
                 const summaryRow = GridSummaryFunctions.getRootSummaryRow(fixture);
                 GridSummaryFunctions.verifyColumnSummaries(summaryRow, 3, ['Count', 'Sum', 'Avg'], ['10', '39,004', '3,900.4']);
-                GridSummaryFunctions.verifyColumnSummaries(summaryRow, 4, ['Earliest'], ['5/17/1990']);
+                GridSummaryFunctions.verifyColumnSummaries(summaryRow, 4, ['Earliest', 'Items InStock'], ['May 17, 1990', '1337']);
                 GridSummaryFunctions.verifyVisibleSummariesHeight(fixture, 3, grid.defaultSummaryHeight);
                 grid.getColumnByName('UnitsInStock').summaries = fixture.componentInstance.dealsSummaryMinMax;
                 fixture.detectChanges();
@@ -192,20 +193,20 @@ describe('IgxGrid - Summaries #grid', () => {
             it('should be able to access alldata from each summary', () => {
                 const summaryRow = GridSummaryFunctions.getRootSummaryRow(fixture);
                 GridSummaryFunctions.verifyColumnSummaries(summaryRow, 3, ['Count', 'Sum', 'Avg'], ['10', '39,004', '3,900.4']);
-                GridSummaryFunctions.verifyColumnSummaries(summaryRow, 4, ['Earliest'], ['5/17/1990']);
+                GridSummaryFunctions.verifyColumnSummaries(summaryRow, 4, ['Earliest', 'Items InStock'], ['May 17, 1990', '1337']);
                 GridSummaryFunctions.verifyVisibleSummariesHeight(fixture, 3, grid.defaultSummaryHeight);
                 grid.getColumnByName('UnitsInStock').summaries = fixture.componentInstance.inStockSummary;
                 fixture.detectChanges();
 
                 GridSummaryFunctions.verifyColumnSummaries(summaryRow, 3, ['Count', 'Min', 'Max', 'Sum', 'Avg', 'Items InStock'],
-                    ['10', '0', '20000', '39004', '3900.4', '6']);
-                GridSummaryFunctions.verifyColumnSummaries(summaryRow, 4, ['Earliest'], ['5/17/1990']);
+                    ['10', '0', '20,000', '39,004', '3,900.4', '6']);
+                GridSummaryFunctions.verifyColumnSummaries(summaryRow, 4, ['Earliest', 'Items InStock'], ['May 17, 1990', '1337']);
 
                 grid.getCellByColumn(4, 'InStock').update(true);
                 fixture.detectChanges();
 
                 GridSummaryFunctions.verifyColumnSummaries(summaryRow, 3, ['Count', 'Min', 'Max', 'Sum', 'Avg', 'Items InStock'],
-                    ['10', '0', '20000', '39004', '3900.4', '7']);
+                    ['10', '0', '20,000', '39,004', '3,900.4', '7']);
 
                 grid.filter('UnitsInStock', 0, IgxNumberFilteringOperand.instance().condition('equals'));
                 fixture.detectChanges();
@@ -292,7 +293,7 @@ describe('IgxGrid - Summaries #grid', () => {
                 expect(grid.hasSummarizedColumns).toBe(false);
             });
 
-            it('should change summary operand through grid API ', () => {
+            it('should change summary operand through grid API', () => {
                 grid.enableSummaries([{ fieldName: 'UnitsInStock', customSummary: fix.componentInstance.dealsSummaryMinMax }]);
                 fix.detectChanges();
 
@@ -2442,11 +2443,6 @@ class DealsSummary extends IgxNumberSummaryOperand {
     public operate(summaries?: any[]): IgxSummaryResult[] {
         const result = super.operate(summaries).filter((obj) => {
             if (obj.key === 'average' || obj.key === 'sum' || obj.key === 'count') {
-                const summaryResult = obj.summaryResult;
-                // apply formatting to float numbers
-                if (Number(summaryResult) === summaryResult) {
-                    obj.summaryResult = summaryResult.toLocaleString('en-us', { maximumFractionDigits: 2 });
-                }
                 return obj;
             }
         });
@@ -2462,11 +2458,6 @@ class DealsSummaryMinMax extends IgxNumberSummaryOperand {
     public operate(summaries?: any[]): IgxSummaryResult[] {
         const result = super.operate(summaries).filter((obj) => {
             if (obj.key === 'min' || obj.key === 'max') {
-                const summaryResult = obj.summaryResult;
-                // apply formatting to float numbers
-                if (Number(summaryResult) === summaryResult) {
-                    obj.summaryResult = summaryResult.toLocaleString('en-us', { maximumFractionDigits: 2 });
-                }
                 return obj;
             }
         });
@@ -2482,11 +2473,14 @@ class EarliestSummary extends IgxDateSummaryOperand {
     public operate(summaries?: any[]): IgxSummaryResult[] {
         const result = super.operate(summaries).filter((obj) => {
             if (obj.key === 'earliest') {
-                const date = obj.summaryResult ? new Date(obj.summaryResult) : undefined;
-                obj.summaryResult = date ? new Intl.DateTimeFormat('en-US').format(date) : undefined;
                 return obj;
             }
         });
+        result.push({
+            key: 'test',
+            label: 'Items InStock',
+            summaryResult: 1337
+        });
         return result;
     }
 }
@@ -2541,14 +2535,15 @@ class AllDataAvgSummary extends IgxSummaryOperand {
 
 @Component({
     template: `
-        <igx-grid #grid1 [data]="data" [primaryKey]="'ProductID'" [allowFiltering]="true">
+        <igx-grid #grid1 [data]="data" [primaryKey]="'ProductID'" [locale]="locale" [allowFiltering]="true">
             <igx-column field="ProductID" header="Product ID">
             </igx-column>
             <igx-column field="ProductName" [hasSummary]="true">
             </igx-column>
             <igx-column field="InStock" [dataType]="'boolean'" [hasSummary]="true">
             </igx-column>
-            <igx-column field="UnitsInStock" [dataType]="'number'" [hasSummary]="true"  [summaries]="dealsSummary">
+            <igx-column field="UnitsInStock" [dataType]="'number'" [hasSummary]="true" [pipeArgs]="formatOptions"
+            [summaries]="dealsSummary">
             </igx-column>
             <igx-column field="OrderDate" width="200px" [dataType]="'date'" [sortable]="true" [hasSummary]="true"
             [summaries]="earliest">
@@ -2566,5 +2561,9 @@ export class CustomSummariesComponent {
     public earliest = EarliestSummary;
     public inStockSummary = InStockSummary;
     public allDataAvgSummary = AllDataAvgSummary;
+    public formatOptions: IColumnPipeArgs = {
+        digitsInfo: '1.0-2'
+    };
+    public locale = 'en-US';
 }
 

projects/igniteui-angular/src/lib/grids/summaries/grid-summary.ts

@@ -6,6 +6,19 @@ export interface IgxSummaryResult {
     key: string;
     label: string;
     summaryResult: any;
+    /**
+     * Apply default formatting based on the grid column type.
+     * ```typescript
+     * const result: IgxSummaryResult = {
+     *   key: 'key',
+     *   label: 'label',
+     *   defaultFormatting: true
+     * }
+     * ```
+     *
+     * @memberof IgxSummaryResult
+     */
+    defaultFormatting?: boolean;
 }
 
 export interface ISummaryRecord {
@@ -65,6 +78,7 @@ export class IgxSummaryOperand {
         return [{
             key: 'count',
             label: 'Count',
+            defaultFormatting: false,
             summaryResult: IgxSummaryOperand.count(data)
         }];
     }
@@ -160,21 +174,25 @@ export class IgxNumberSummaryOperand extends IgxSummaryOperand {
         result.push({
             key: 'min',
             label: 'Min',
+            defaultFormatting: true,
             summaryResult: IgxNumberSummaryOperand.min(data)
         });
         result.push({
             key: 'max',
             label: 'Max',
+            defaultFormatting: true,
             summaryResult: IgxNumberSummaryOperand.max(data)
         });
         result.push({
             key: 'sum',
             label: 'Sum',
+            defaultFormatting: true,
             summaryResult: IgxNumberSummaryOperand.sum(data)
         });
         result.push({
             key: 'average',
             label: 'Avg',
+            defaultFormatting: true,
             summaryResult: IgxNumberSummaryOperand.average(data)
         });
         return result;
@@ -244,11 +262,13 @@ export class IgxDateSummaryOperand extends IgxSummaryOperand {
         result.push({
             key: 'earliest',
             label: 'Earliest',
+            defaultFormatting: true,
             summaryResult: IgxDateSummaryOperand.earliest(data)
         });
         result.push({
             key: 'latest',
             label: 'Latest',
+            defaultFormatting: true,
             summaryResult: IgxDateSummaryOperand.latest(data)
         });
         return result;
@@ -295,70 +315,15 @@ export class IgxTimeSummaryOperand extends IgxSummaryOperand {
         result.push({
             key: 'earliest',
             label: 'Earliest',
+            defaultFormatting: true,
             summaryResult: IgxTimeSummaryOperand.earliestTime(data)
         });
         result.push({
             key: 'latest',
             label: 'Latest',
+            defaultFormatting: true,
             summaryResult: IgxTimeSummaryOperand.latestTime(data)
         });
         return result;
     }
 }
-
-export class IgxCurrencySummaryOperand extends IgxSummaryOperand {
-
-    public operate(data: any[] = [], allData: any[] = [], fieldName?: string): IgxSummaryResult[] {
-        const result = super.operate(data, allData, fieldName);
-        result.push({
-            key: 'min',
-            label: 'Min',
-            summaryResult: IgxNumberSummaryOperand.min(data)
-        });
-        result.push({
-            key: 'max',
-            label: 'Max',
-            summaryResult: IgxNumberSummaryOperand.max(data)
-        });
-        result.push({
-            key: 'sum',
-            label: 'Sum',
-            summaryResult: IgxNumberSummaryOperand.sum(data)
-        });
-        result.push({
-            key: 'average',
-            label: 'Avg',
-            summaryResult: IgxNumberSummaryOperand.average(data)
-        });
-        return result;
-    }
-}
-
-export class IgxPercentSummaryOperand extends IgxSummaryOperand {
-
-    public operate(data: any[] = [], allData: any[] = [], fieldName?: string): IgxSummaryResult[] {
-        const result = super.operate(data, allData, fieldName);
-        result.push({
-            key: 'min',
-            label: 'Min',
-            summaryResult: IgxNumberSummaryOperand.min(data)
-        });
-        result.push({
-            key: 'max',
-            label: 'Max',
-            summaryResult: IgxNumberSummaryOperand.max(data)
-        });
-        result.push({
-            key: 'sum',
-            label: 'Sum',
-            summaryResult: IgxNumberSummaryOperand.sum(data)
-        });
-        result.push({
-            key: 'average',
-            label: 'Avg',
-            summaryResult: IgxNumberSummaryOperand.average(data)
-        });
-        return result;
-    }
-}
-

projects/igniteui-angular/src/lib/grids/summaries/summary-cell.component.html

@@ -15,15 +15,15 @@
                     {{
                         summaryFormatter
                         ? (summary | summaryFormatter:column.summaries:summaryFormatter)
-                        : (isNumberOperand() && summary.key !== 'count')
+                        : (isNumberColumn() && summary.defaultFormatting)
                         ? (summary.summaryResult | number:column.pipeArgs.digitsInfo:grid.locale)
-                        : ((isDateOperand() || isTimeOperand()) && summary.key !== 'count')
+                        : (isDateKindColumn() && summary.defaultFormatting)
                         ? (summary.summaryResult | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale)
-                        : (isCurrencyOperand() && summary.key !== 'count')
+                        : (isCurrencyColumn() && summary.defaultFormatting)
                         ? (summary.summaryResult | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
-                        : (isPercentOperand() && summary.key !== 'count')
+                        : (isPercentColumn() && summary.defaultFormatting)
                         ? (summary.summaryResult | percent:column.pipeArgs.digitsInfo:grid.locale)
-                        : (summary.key === 'count' && (isNumberOperand() || isDateOperand() || isCurrencyOperand() || isPercentOperand()))
+                        : (summary.key === 'count')
                         ? (summary.summaryResult | number:undefined:grid.locale)
                         : summary.summaryResult
                     }}

projects/igniteui-angular/src/lib/grids/summaries/summary-cell.component.ts

@@ -1,12 +1,7 @@
 import { Component, Input, HostBinding, HostListener, ChangeDetectionStrategy, ElementRef } from '@angular/core';
 import {
-    IgxCurrencySummaryOperand,
-    IgxDateSummaryOperand,
-    IgxNumberSummaryOperand,
-    IgxPercentSummaryOperand,
     IgxSummaryOperand,
-    IgxSummaryResult,
-    IgxTimeSummaryOperand
+    IgxSummaryResult
 } from './grid-summary';
 import { IgxColumnComponent } from '../columns/column.component';
 import { GridColumnDataType } from '../../data-operations/data-util';
@@ -118,35 +113,30 @@ export class IgxSummaryCellComponent {
     /**
      * @hidden @internal
      */
-    public isNumberOperand(): boolean {
-        return this.column.summaries?.constructor === IgxNumberSummaryOperand;
+    public isNumberColumn(): boolean {
+        return this.column.dataType === GridColumnDataType.Number;
     }
 
     /**
      * @hidden @internal
      */
-    public isDateOperand(): boolean {
-        return this.column.summaries?.constructor === IgxDateSummaryOperand;
+    public isDateKindColumn(): boolean {
+        return this.column.dataType === GridColumnDataType.Date ||
+               this.column.dataType === GridColumnDataType.DateTime ||
+               this.column.dataType === GridColumnDataType.Time;
     }
 
     /**
      * @hidden @internal
      */
-    public isTimeOperand(): boolean {
-        return this.column.summaries?.constructor === IgxTimeSummaryOperand;
+    public isCurrencyColumn(): boolean {
+        return this.column.dataType === GridColumnDataType.Currency;
     }
 
     /**
      * @hidden @internal
      */
-    public isCurrencyOperand(): boolean {
-        return this.column.summaries?.constructor === IgxCurrencySummaryOperand;
-    }
-
-    /**
-     * @hidden @internal
-     */
-    public isPercentOperand(): boolean {
-        return this.column.summaries?.constructor === IgxPercentSummaryOperand;
+    public isPercentColumn(): boolean {
+        return this.column.dataType === GridColumnDataType.Percent;
     }
 }

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

@@ -12,7 +12,6 @@ import {
 import { configureTestSuite } from '../../test-utils/configure-suite';
 import { setupGridScrollDetection } from '../../test-utils/helper-utils.spec';
 import { wait, UIInteractions } from '../../test-utils/ui-interactions.spec';
-import { IgxTreeGridRowComponent } from './tree-grid-row.component';
 import { GridSummaryFunctions, GridFunctions } from '../../test-utils/grid-functions.spec';
 import { IgxNumberFilteringOperand } from '../../data-operations/filtering-condition';
 import { DebugElement } from '@angular/core';
@@ -431,7 +430,7 @@ describe('IgxTreeGrid - Summaries #tGrid', () => {
 
             let summaryRow = GridSummaryFunctions.getSummaryRowByDataRowIndex(fix, 7);
             GridSummaryFunctions.verifyColumnSummaries(summaryRow, 3,
-                ['Count', 'Min', 'Max', 'Sum', 'Avg', 'Test'], ['3', '29', '43', '103', '34.333333333333336', '2']);
+                ['Count', 'Min', 'Max', 'Sum', 'Avg', 'Test'], ['3', '29', '43', '103', '34.333', '2']);
 
             summaryRow = GridSummaryFunctions.getSummaryRowByDataRowIndex(fix, 6);
             GridSummaryFunctions.verifyColumnSummaries(summaryRow, 3,