@memberjunction/ng-entity-viewer 6.1.4 → 6.1.5

package/dist/lib/entity-data-grid/entity-data-grid.component.js

@@ -3,11 +3,13 @@ import { trigger, transition, style, animate } from '@angular/animations';
 import { BaseAngularComponent } from '@memberjunction/ng-base-types';
 import { Subject } from 'rxjs';
 import { debounceTime, takeUntil } from 'rxjs/operators';
-import { LogError, RunView, RunViewParams, CoerceImageSrc, ParseCssHexColor, CompositeKey } from '@memberjunction/core';
+import { ExportColumnTypeForSQLType } from '../utils/export-column.util';
+import { LogError, RunView, RunViewParams, CoerceImageSrc, ParseCssHexColor, CompositeKey, IsDateOnlySQLType, FormatDateOnly, EntityFieldTSType } from '@memberjunction/core';
 import { UUIDsEqual } from '@memberjunction/global';
 import { EntityActionEngineBase } from '@memberjunction/actions-base';
 import { CommunicationEngineBase } from '@memberjunction/communication-types';
 import { buildPkString, canonicalizeColumnFields, computeFieldsList } from '../utils/record.util';
+import { AggregateField } from '../utils/aggregate-field.util';
 import { ViewInfo, UserViewEngine, UserInfoEngine } from '@memberjunction/core-entities';
 import { ModuleRegistry, AllCommunityModule, themeAlpine } from 'ag-grid-community';
 // Use the existing HighlightUtil from entity-viewer package
@@ -1594,11 +1596,33 @@ export class EntityDataGridComponent extends BaseAngularComponent {
                 minimumFractionDigits: 0
             });
         }
+        // A date aggregate reaches the browser as an ISO string: the server JSON-stringifies the value
+        // and the client parses it back, which turns a Date into text. Resolve the column's type first
+        // so a `date` column renders as its stored day whether the value is a Date or that string.
+        if (typeof value !== 'boolean' && this.aggregateIsDateOnly(agg)) {
+            return FormatDateOnly(value);
+        }
         if (value instanceof Date) {
             return value.toLocaleDateString();
         }
+        // A timestamp aggregate arrives as the same ISO string. It names an instant, so it is rendered
+        // in local time, as a Date instance would be — not printed as the wire text.
+        if (typeof value === 'string' && AggregateField(agg, this._entityInfo)?.TSType === EntityFieldTSType.Date) {
+            const date = new Date(value);
+            if (!isNaN(date.getTime()))
+                return date.toLocaleDateString();
+        }
         return String(value);
     }
+    /**
+     * Whether an aggregate summarises a date-only column. An aggregate carries no field metadata of
+     * its own, so the column is read from a single-field expression such as `MIN(IntakeDate)` or
+     * from the column the aggregate is pinned under. A `date` column is a calendar day and must not
+     * be shifted into the reader's zone (MJ#4210).
+     */
+    aggregateIsDateOnly(agg) {
+        return IsDateOnlySQLType(AggregateField(agg, this._entityInfo)?.Type);
+    }
     // ========================================
     // Event Outputs
     // ========================================
@@ -3135,7 +3159,7 @@ export class EntityDataGridComponent extends BaseAngularComponent {
             const useCustomFormat = customFormat && customFormat.type && customFormat.type !== 'auto';
             if (useCustomFormat) {
                 // Use custom formatting
-                displayValue = this.formatValueWithCustomFormat(params.value, customFormat);
+                displayValue = this.formatValueWithCustomFormat(params.value, customFormat, field);
                 // Check if formatCustomBoolean returned HTML (icon or checkbox)
                 if (customFormat.type === 'boolean' &&
                     (customFormat.booleanDisplay === 'icon' || customFormat.booleanDisplay === 'checkbox')) {
@@ -3159,20 +3183,7 @@ export class EntityDataGridComponent extends BaseAngularComponent {
                 }
                 // Date formatting
                 else if (fieldType === 'Date') {
-                    const date = params.value instanceof Date ? params.value : new Date(params.value);
-                    if (isNaN(date.getTime())) {
-                        displayValue = String(params.value);
-                    }
-                    else if (vc.friendlyDates) {
-                        displayValue = date.toLocaleDateString(undefined, {
-                            month: 'short',
-                            day: 'numeric',
-                            year: 'numeric'
-                        });
-                    }
-                    else {
-                        displayValue = date.toISOString().split('T')[0];
-                    }
+                    displayValue = this.formatDefaultDate(params.value, field, !!vc.friendlyDates);
                 }
                 // Currency formatting
                 else if (fieldType === 'number' && isCurrency) {
@@ -3290,7 +3301,21 @@ export class EntityDataGridComponent extends BaseAngularComponent {
     /**
      * Format a value using custom ColumnFormat settings
      */
-    formatValueWithCustomFormat(value, format) {
+    /**
+     * Default rendering of a date-family cell. A `date` column is a calendar day that arrives as UTC
+     * midnight; a local-zone formatter would land on the previous day for every reader west of
+     * Greenwich (MJ#4210). A timestamp names an instant and stays in local time.
+     */
+    formatDefaultDate(value, field, friendlyDates) {
+        const date = value instanceof Date ? value : new Date(value);
+        if (isNaN(date.getTime()))
+            return String(value);
+        if (!friendlyDates)
+            return date.toISOString().split('T')[0];
+        const options = { month: 'short', day: 'numeric', year: 'numeric' };
+        return IsDateOnlySQLType(field.Type) ? FormatDateOnly(date, options) : date.toLocaleDateString(undefined, options);
+    }
+    formatValueWithCustomFormat(value, format, field) {
         if (value == null)
             return '—';
         switch (format.type) {
@@ -3302,7 +3327,7 @@ export class EntityDataGridComponent extends BaseAngularComponent {
                 return this.formatCustomPercent(value, format);
             case 'date':
             case 'datetime':
-                return this.formatCustomDate(value, format);
+                return this.formatCustomDate(value, format, IsDateOnlySQLType(field.Type));
             case 'boolean':
                 return this.formatCustomBoolean(value, format);
             default:
@@ -3344,7 +3369,12 @@ export class EntityDataGridComponent extends BaseAngularComponent {
         // Assume value is already a percentage (e.g., 50 = 50%), divide by 100
         return new Intl.NumberFormat('en-US', options).format(num / 100);
     }
-    formatCustomDate(value, format) {
+    /**
+     * @param dateOnly The column is a SQL `date`: a calendar day at UTC midnight with no time to show.
+     * It is rendered in UTC so the day does not shift west of Greenwich, and a `datetime` column
+     * format cannot add a time of day to it (MJ#4210). A timestamp column keeps local rendering.
+     */
+    formatCustomDate(value, format, dateOnly) {
         const date = value instanceof Date ? value : new Date(value);
         if (isNaN(date.getTime()))
             return String(value);
@@ -3352,6 +3382,7 @@ export class EntityDataGridComponent extends BaseAngularComponent {
         const formatStr = format.dateFormat || 'medium';
         const includeWeekday = formatStr.includes('-weekday');
         const baseFormat = formatStr.replace('-weekday', '');
+        const withTime = format.type === 'datetime' && !dateOnly;
         let options;
         // Intl.DateTimeFormat doesn't allow combining dateStyle with weekday
         // So we must use individual components when weekday is requested
@@ -3366,7 +3397,7 @@ export class EntityDataGridComponent extends BaseAngularComponent {
                 // medium
                 options = { weekday: 'short', month: 'short', day: 'numeric', year: 'numeric' };
             }
-            if (format.type === 'datetime') {
+            if (withTime) {
                 options.hour = 'numeric';
                 options.minute = '2-digit';
             }
@@ -3376,11 +3407,11 @@ export class EntityDataGridComponent extends BaseAngularComponent {
             options = {
                 dateStyle: baseFormat === 'short' ? 'short' : baseFormat === 'long' ? 'long' : 'medium'
             };
-            if (format.type === 'datetime') {
+            if (withTime) {
                 options.timeStyle = 'short';
             }
         }
-        return new Intl.DateTimeFormat('en-US', options).format(date);
+        return dateOnly ? FormatDateOnly(date, options, 'en-US') : new Intl.DateTimeFormat('en-US', options).format(date);
     }
     formatCustomBoolean(value, format) {
         if (format.booleanDisplay === 'icon') {
@@ -4625,7 +4656,7 @@ export class EntityDataGridComponent extends BaseAngularComponent {
                 // exported a correctly-headed column of blank cells.
                 name: field?.Name ?? colField,
                 displayName: def.headerName || field?.DisplayNameOrName || colField,
-                dataType: this.mapFieldTypeToExportType(field?.Type)
+                dataType: ExportColumnTypeForSQLType(field?.Type)
             };
         });
     }
@@ -4633,27 +4664,6 @@ export class EntityDataGridComponent extends BaseAngularComponent {
     isExportableColumn(def) {
         return !!def.field && def.field !== ROW_NUMBER_FIELD && def.colId !== FILLER_COLUMN_ID;
     }
-    /**
-     * Map MemberJunction field types to export column types
-     */
-    mapFieldTypeToExportType(fieldType) {
-        if (!fieldType)
-            return 'string';
-        const type = fieldType.toLowerCase();
-        if (type.includes('int') || type.includes('decimal') || type.includes('float') || type.includes('numeric')) {
-            return 'number';
-        }
-        if (type.includes('date') || type.includes('time')) {
-            return 'date';
-        }
-        if (type.includes('bit') || type.includes('bool')) {
-            return 'boolean';
-        }
-        if (type.includes('money') || type.includes('currency')) {
-            return 'currency';
-        }
-        return 'string';
-    }
     /**
      * Generate default file name for export
      */
@@ -5319,5 +5329,5 @@ export class EntityDataGridComponent extends BaseAngularComponent {
             type: ViewChild,
             args: ['gridContainer']
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(EntityDataGridComponent, { className: "EntityDataGridComponent", filePath: "src/lib/entity-data-grid/entity-data-grid.component.ts", lineNumber: 193 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(EntityDataGridComponent, { className: "EntityDataGridComponent", filePath: "src/lib/entity-data-grid/entity-data-grid.component.ts", lineNumber: 195 }); })();
 //# sourceMappingURL=entity-data-grid.component.js.map