chore(*): Add handling for different date related dataTypes on column.

Author: MKirova

projects/igniteui-angular/src/lib/data-operations/data-util.ts

@@ -25,7 +25,7 @@ import { DefaultMergeStrategy, IGridMergeStrategy } from './merge-strategy';
 /**
  * @hidden
  */
- export const DataType = {
+export const DataType = {
     String: 'string',
     Number: 'number',
     Boolean: 'boolean',
@@ -95,10 +95,20 @@ export class DataUtil {
     ): any[] {
         let result = [];
         for (const col of columns) {
-            strategy.merge(data, col.field, col.mergingComparer, result, activeRowIndexes, grid);
+            const isDate = col?.dataType === 'date' || col?.dataType === 'dateTime';
+            const isTime = col?.dataType === 'time' || col?.dataType === 'dateTime';
+            strategy.merge(
+                data,
+                col.field,
+                col.mergingComparer,
+                result,
+                activeRowIndexes,
+                isDate,
+                isTime,
+                grid);
         }
         return result;
-}
+    }
 
     public static page<T>(data: T[], state: IPagingState, dataLength?: number): T[] {
         if (!state) {

projects/igniteui-angular/src/lib/data-operations/merge-strategy.ts

@@ -1,3 +1,4 @@
+import { columnFieldPath, parseDate, resolveNestedPath } from '../core/utils';
 import { GridType } from '../grids/common/grid.interface';
 
 
@@ -28,7 +29,11 @@ export interface IGridMergeStrategy {
         result: any[],
         /* The active row indexes, where merging should break the sequence. */
         activeRowIndexes: number[],
-        /* Optional reference to the grid */
+        /* (Optional) Indicates if the field is of type Date. */
+        isDate?: boolean,
+        /* (Optional) Indicates if the field is of type Time. */
+        isTime?: boolean,
+        /* (Optional) Reference to the grid */
         grid?: GridType
     ) => any[];
     /**
@@ -48,9 +53,11 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
     public merge(
         data: any[],
         field: string,
-        comparer: (prevRecord: any, record: any, field: string) => boolean = this.comparer,
+        comparer: (prevRecord: any, record: any, field: string, isDate?: boolean, isTime?: boolean) => boolean = this.comparer,
         result: any[],
         activeRowIndexes: number[],
+        isDate = false,
+        isTime = false,
         grid?: GridType
     ) {
         let prev = null;
@@ -69,7 +76,7 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
             }
             let recToUpdateData = recData ?? { recordRef: grid.isGhostRecord(rec) ? rec.recordRef : rec, cellMergeMeta: new Map<string, IMergeByResult>(), ghostRecord: rec.ghostRecord };
             recToUpdateData.cellMergeMeta.set(field, { rowSpan: 1 });
-            if (prev && comparer(prev.recordRef, recToUpdateData.recordRef, field) && prev.ghostRecord === recToUpdateData.ghostRecord) {
+            if (prev && comparer.call(this, prev.recordRef, recToUpdateData.recordRef, field, isDate, isTime) && prev.ghostRecord === recToUpdateData.ghostRecord) {
                 const root = prev.cellMergeMeta.get(field)?.root ?? prev;
                 root.cellMergeMeta.get(field).rowSpan += 1;
                 recToUpdateData.cellMergeMeta.get(field).root = root;
@@ -84,9 +91,9 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
     }
 
     /* blazorSuppress */
-    public comparer(prevRecord: any, record: any, field: string): boolean {
-        const a = prevRecord[field];
-        const b = record[field];
+    public comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {
+        const a = this.getFieldValue(prevRecord,field, isDate, isTime);
+        const b = this.getFieldValue(record,field, isDate, isTime);
         const an = (a === null || a === undefined);
         const bn = (b === null || b === undefined);
         if (an) {
@@ -99,14 +106,49 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
         }
         return a === b;
     }
+
+    /**
+     * Retrieves the value of the specified field from the given object, considering date and time data types.
+     * `key`: The key of the field to retrieve.
+     * `isDate`: (Optional) Indicates if the field is of type Date.
+     * `isTime`: (Optional) Indicates if the field is of type Time.
+     * Returns the value of the specified field in the data object.
+     * @internal
+     */
+    protected getFieldValue<T>(obj: T, key: string, isDate = false, isTime = false) {
+        let resolvedValue = resolveNestedPath(obj, columnFieldPath(key));
+        if (isDate || isTime) {
+            resolvedValue = this.getDateValue(resolvedValue, isDate, isTime);
+        }
+        return resolvedValue;
+    }
+
+    /**
+   * @internal
+   */
+    protected getDateValue<T>(obj: T, isDate = false, isTime = false) {
+        let date = obj instanceof Date ? obj : parseDate(obj);
+        let resolvedValue;
+        if (isDate && isTime) {
+            // date + time
+            resolvedValue = date.getTime();
+        } else if (date && isDate && !isTime) {
+            // date, but no time
+            resolvedValue = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0, 0).getTime();
+        } else if (date && isTime && !isDate) {
+            // just time
+            resolvedValue = new Date(new Date().setHours(date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds())).getTime();
+        }
+        return resolvedValue;
+    }
 }
 
 
 export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy {
     /* blazorSuppress */
-    public override comparer(prevRecord: any, record: any, field: string): boolean {
-        const a = prevRecord.data[field];
-        const b = record.data[field];
+    public override comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {
+        const a = this.getFieldValue( prevRecord.data, field, isDate, isTime);
+        const b = this.getFieldValue(record.data,field, isDate, isTime);
         const an = (a === null || a === undefined);
         const bn = (b === null || b === undefined);
         if (an) {
@@ -123,9 +165,9 @@ export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy {
 
 export class ByLevelTreeGridMergeStrategy extends DefaultMergeStrategy {
     /* blazorSuppress */
-    public override comparer(prevRecord: any, record: any, field: string): boolean {
-        const a = prevRecord.data[field];
-        const b = record.data[field];
+    public override comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {
+        const a = this.getFieldValue( prevRecord.data, field, isDate, isTime);
+        const b = this.getFieldValue(record.data,field, isDate, isTime);
         const levelA = prevRecord.level;
         const levelB = record.level;
         const an = (a === null || a === undefined);

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

@@ -1021,6 +1021,8 @@ class NoopMergeStrategy extends DefaultMergeStrategy {
         comparer: (prevRecord: any, record: any, field: string) => boolean = this.comparer,
         result: any[],
         activeRowIndexes: number[],
+        isDate?: boolean,
+        isTime?: boolean,
         grid?: GridType
     ) {
         return data;

src/app/grid-cellMerging/grid-cellMerging.component.html

@@ -52,7 +52,7 @@ <h4 class="sample-title">Grid with cell merge</h4>
     </igx-column>
     <igx-column field="ShipCountry" header="Ship Country" width="200px" [merge]="true" sortable="true">
     </igx-column>
-    <igx-column field="OrderDate" header="Order Date" width="200px" [dataType]="'date'" sortable="true">
+    <igx-column field="OrderDate" header="Order Date" width="200px" [merge]="true" [groupable]="true" [dataType]="'date'" sortable="true">
     </igx-column>
     <igx-column field="PostalCode" header="Postal Code" width="200px" >
     </igx-column>