@sd-angular/core 19.0.44 → 19.0.46

package/fesm2022/sd-angular-core-components-form-generic.mjs

@@ -1,6 +1,7 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injectable, Pipe, SecurityContext, Input, ChangeDetectionStrategy, Component, ViewChild, EventEmitter, Output, ViewChildren, QueryList, ChangeDetectorRef, input, effect, untracked, viewChild, signal, computed } from '@angular/core';
 import { Utilities, StringUtilities as StringUtilities$1 } from '@sdcorejs/utils/fns';
+import { ɵSD_LOCAL_DATE_TIME as _SD_LOCAL_DATE_TIME, ɵsdInjectDateTime as _sdInjectDateTime, SdDateTimeService } from '@sd-angular/core/services/date-time';
 import { DateUtilities } from '@sd-angular/core/utilities';
 import * as i3 from '@angular/cdk/drag-drop';
 import { moveItemInArray, transferArrayItem, DragDropModule } from '@angular/cdk/drag-drop';
@@ -19,9 +20,9 @@ import { SdNotifyService, SdConfirmService } from '@sd-angular/core/services';
 import { Subscription, Subject, filter, debounceTime, startWith, combineLatest } from 'rxjs';
 import { SdSection } from '@sd-angular/core/components/section';
 import { startWith as startWith$1, debounceTime as debounceTime$1 } from 'rxjs/operators';
-import { DateUtilities as DateUtilities$1, StringUtilities, ArrayUtilities, NumberUtilities } from '@sd-angular/core/utilities/extensions';
 import { EMPTY_STR } from '@sdcorejs/utils/constants';
 import * as i1 from '@sd-angular/core/pipes';
+import { StringUtilities, ArrayUtilities, NumberUtilities } from '@sd-angular/core/utilities/extensions';
 import * as i1$1 from '@angular/platform-browser';
 import { SdInput, SdChip, SdChipCalendar, SdSelect, SdAutocomplete, SdRadio, SdInputNumber as SdInputNumber$1 } from '@sd-angular/core/forms';
 import { SdInputNumber } from '@sd-angular/core/forms/input-number';
@@ -262,23 +263,25 @@ const DayInfoPreviouses = [
     // { value: 'LASTMONTH', display: 'Tháng trước', format: (n: number) => `${n || 1}LastMonth` },
     // { value: 'NEXTMONTH', display: 'Tháng tới', format: (n: number) => `${n || 1}NextMonth` },
 ];
-const GetDatetimeValue = (value) => {
+// why: a relative value is the current instant shifted by whole days, formatted once in the zone; formatting
+// a wall-clock carrier such as now() in the zone would shift it a second time.
+const GetDatetimeValue = (value, dateTime = _SD_LOCAL_DATE_TIME) => {
     if (!value || typeof value !== 'string') {
         return undefined;
     }
     if (value === 'now') {
-        return DateUtilities.toFormat(new Date(), 'yyyy/MM/dd HH:mm:ss');
+        return dateTime.toFormat(new Date(), 'yyyy/MM/dd HH:mm:ss');
     }
     if (value?.endsWith('LastDay')) {
         const relatedValue = +value.replace('LastDay', '');
         if (relatedValue) {
-            return DateUtilities.toFormat(DateUtilities.addDays(new Date(), -relatedValue), 'yyyy/MM/dd HH:mm:ss');
+            return dateTime.toFormat(DateUtilities.addDays(new Date(), -relatedValue), 'yyyy/MM/dd HH:mm:ss');
         }
     }
     if (value?.endsWith('NextDay')) {
         const relatedValue = +value.replace('LastDay', '');
         if (relatedValue) {
-            return DateUtilities.toFormat(DateUtilities.addDays(new Date(), relatedValue), 'yyyy/MM/dd HH:mm:ss');
+            return dateTime.toFormat(DateUtilities.addDays(new Date(), relatedValue), 'yyyy/MM/dd HH:mm:ss');
         }
     }
     return undefined;
@@ -405,7 +408,7 @@ const GetAttributes = (components) => {
     }
     return attributes;
 };
-const TemplateToCondition = (template, entity) => {
+const TemplateToCondition = (template, entity, dateTime = _SD_LOCAL_DATE_TIME) => {
     if (!template) {
         return undefined;
     }
@@ -423,7 +426,7 @@ const TemplateToCondition = (template, entity) => {
             if (typeof val === 'string') {
                 // Xử lý đối với trường hợp string là 'datetime' thì cần format thành string đồng nhất để compare chính xác
                 if (DateUtilities.isDate(val)) {
-                    template = template.replace(match, `'${DateUtilities.toFormat(val, 'yyyy/MM/dd HH:mm:ss')}'`);
+                    template = template.replace(match, `'${dateTime.toFormat(val, 'yyyy/MM/dd HH:mm:ss')}'`);
                 }
                 else {
                     // Nếu là chuỗi thì thêm dấu nháy khi replace giá trị để so sánh, ví dụ 'a' === 'a'
@@ -448,14 +451,14 @@ const GetEntityValue = (entity, key) => {
     }
     return value;
 };
-const NormalizeExpressionValue = (value) => {
+const NormalizeExpressionValue = (value, dateTime) => {
     if (typeof value === 'string' && DateUtilities.isDate(value)) {
-        return DateUtilities.toFormat(value, 'yyyy/MM/dd HH:mm:ss');
+        return dateTime.toFormat(value, 'yyyy/MM/dd HH:mm:ss');
     }
     return value;
 };
-const EvaluateExpressionCondition = (condition, entity) => {
-    const actualValue = NormalizeExpressionValue(GetEntityValue(entity, condition.field));
+const EvaluateExpressionCondition = (condition, entity, dateTime) => {
+    const actualValue = NormalizeExpressionValue(GetEntityValue(entity, condition.field), dateTime);
     const { operator } = condition;
     if (!operator) {
         return undefined;
@@ -466,11 +469,11 @@ const EvaluateExpressionCondition = (condition, entity) => {
     if (operator === 'NOT_NULL') {
         return !!actualValue;
     }
-    const expectedValue = typeof condition.value === 'string' ? GetDatetimeValue(condition.value) || condition.value : condition.value;
+    const expectedValue = typeof condition.value === 'string' ? GetDatetimeValue(condition.value, dateTime) || condition.value : condition.value;
     if (expectedValue === undefined || expectedValue === null || expectedValue === '') {
         return undefined;
     }
-    const normalizedExpectedValue = NormalizeExpressionValue(expectedValue);
+    const normalizedExpectedValue = NormalizeExpressionValue(expectedValue, dateTime);
     if (operator === 'EQUAL') {
         return actualValue === normalizedExpectedValue;
     }
@@ -491,12 +494,12 @@ const EvaluateExpressionCondition = (condition, entity) => {
     }
     return undefined;
 };
-const EvaluateExpression = (condition, entity) => {
+const EvaluateExpression = (condition, entity, dateTime = _SD_LOCAL_DATE_TIME) => {
     if (condition.type === 'combinator') {
         if (!condition.conditions?.length) {
             return undefined;
         }
-        const results = condition.conditions.map(child => EvaluateExpression(child, entity));
+        const results = condition.conditions.map(child => EvaluateExpression(child, entity, dateTime));
         if (results.some(result => typeof result !== 'boolean')) {
             return undefined;
         }
@@ -505,14 +508,14 @@ const EvaluateExpression = (condition, entity) => {
         }
         return results.some(result => result === true);
     }
-    return EvaluateExpressionCondition(condition, entity);
+    return EvaluateExpressionCondition(condition, entity, dateTime);
 };
-const ExpressionToJavascriptExpression = (condition) => {
+const ExpressionToJavascriptExpression = (condition, dateTime = _SD_LOCAL_DATE_TIME) => {
     const queries = [];
     if (condition.type === 'combinator') {
         if (condition.conditions?.length) {
             for (const child of condition.conditions) {
-                queries.push(`(${ExpressionToJavascriptExpression(child)})`);
+                queries.push(`(${ExpressionToJavascriptExpression(child, dateTime)})`);
             }
         }
         // Nếu nhiều hơn 1 điều kiện, bọc điều kiện bằng cặp ngoặc ()
@@ -525,10 +528,10 @@ const ExpressionToJavascriptExpression = (condition) => {
         }
     }
     else {
-        return ConvertToJavascriptExpression(condition);
+        return ConvertToJavascriptExpression(condition, dateTime);
     }
 };
-const ConvertToJavascriptExpression = (condition) => {
+const ConvertToJavascriptExpression = (condition, dateTime) => {
     const { value } = condition;
     // Convert thành syntax ${field}
     const field = '${' + condition.field + '}';
@@ -546,7 +549,7 @@ const ConvertToJavascriptExpression = (condition) => {
         return undefined;
     }
     // Xử lý đối với trường hợp string là 'datetime' thì value sẽ có thể là 'now', '1LastDay' ....
-    const datetimeValue = GetDatetimeValue(value);
+    const datetimeValue = GetDatetimeValue(value, dateTime);
     if (operator === 'EQUAL') {
         // Nếu là chuỗi thì thêm dấu nháy, nếu không thì bỏ qua
         if (typeof value === 'string') {
@@ -789,6 +792,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.21", ngImpo
 class ComponentViewedPipe {
     formatNumberPipe;
     formGenericService;
+    // why: datetime values show as the wall clock of ISdCoreConfiguration.timeZone; outside DI it stays local.
+    #dateTime = _sdInjectDateTime() ?? _SD_LOCAL_DATE_TIME;
     constructor(formatNumberPipe, formGenericService) {
         this.formatNumberPipe = formatNumberPipe;
         this.formGenericService = formGenericService;
@@ -809,10 +814,10 @@ class ComponentViewedPipe {
         }
         if (component.type === 'datetime') {
             if (component.subtype === 'datetime') {
-                return DateUtilities$1.toFormat(val, 'dd/MM/yyyy HH:mm') || EMPTY_STR;
+                return this.#dateTime.toFormat(val, 'dd/MM/yyyy HH:mm') || EMPTY_STR;
             }
             else {
-                return DateUtilities$1.toFormat(val, 'dd/MM/yyyy') || EMPTY_STR;
+                return this.#dateTime.toFormat(val, 'dd/MM/yyyy') || EMPTY_STR;
             }
         }
         if (component.type === 'select' || component.type === 'radio' || component.type === 'checklist') {
@@ -876,13 +881,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.21", ngImpo
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // Xử lý thông tin required, disabled, hidden của component
 class WhenExpressionPipe {
+    // why: date conditions compare in ISdCoreConfiguration.timeZone; `new WhenExpressionPipe()` outside DI stays local.
+    #dateTime = _sdInjectDateTime() ?? _SD_LOCAL_DATE_TIME;
     #hidden = (component, variables) => {
         if (component.properties?.hidden) {
             return true;
         }
         const hiddenWhenExpression = component.properties?.hiddenWhenExpression;
         if (hiddenWhenExpression) {
-            const result = EvaluateExpression(hiddenWhenExpression, variables);
+            const result = EvaluateExpression(hiddenWhenExpression, variables, this.#dateTime);
             if (typeof result === 'boolean') {
                 return result;
             }
@@ -890,7 +897,7 @@ class WhenExpressionPipe {
         }
         const visibleWhenExpression = component.properties?.visibleWhenExpression;
         if (visibleWhenExpression) {
-            const result = EvaluateExpression(visibleWhenExpression, variables);
+            const result = EvaluateExpression(visibleWhenExpression, variables, this.#dateTime);
             if (typeof result === 'boolean') {
                 return !result;
             }
@@ -901,7 +908,7 @@ class WhenExpressionPipe {
     #disabled = (component, variables) => {
         const disabledWhenExpression = component.properties?.disabledWhenExpression;
         if (disabledWhenExpression) {
-            const result = EvaluateExpression(disabledWhenExpression, variables);
+            const result = EvaluateExpression(disabledWhenExpression, variables, this.#dateTime);
             if (typeof result === 'boolean') {
                 return result;
             }
@@ -912,7 +919,7 @@ class WhenExpressionPipe {
     #required = (component, variables) => {
         const requiredWhenExpression = component.properties?.requiredWhenExpression;
         if (requiredWhenExpression) {
-            const result = EvaluateExpression(requiredWhenExpression, variables);
+            const result = EvaluateExpression(requiredWhenExpression, variables, this.#dateTime);
             if (typeof result === 'boolean') {
                 return result;
             }
@@ -2969,6 +2976,8 @@ class SdFormRender {
     setVariables = new Subject();
     ref = inject(ChangeDetectorRef);
     formGenericConfiguration = inject(SD_FORM_GENERIC_CONFIGURATION, { optional: true });
+    // why: validation expressions compare dates in ISdCoreConfiguration.timeZone.
+    #dateTime = inject(SdDateTimeService);
     ngAfterViewInit() {
         this.#subscription.add(combineLatest([this.#configurationChanges, this.#entityChanges])
             .pipe(startWith$1([]))
@@ -3032,7 +3041,7 @@ class SdFormRender {
         const messages = [];
         for (const validation of this.configuration?.validations?.filter(e => e.alert === alert) || []) {
             if (validation.type === 'expression') {
-                const result = EvaluateExpression(validation.expression, this.entity);
+                const result = EvaluateExpression(validation.expression, this.entity, this.#dateTime);
                 if (result) {
                     messages.push(validation.message);
                 }
@@ -3148,6 +3157,8 @@ class ExpressionBuilderComponent {
     modelChange = new EventEmitter();
     sdChange = new EventEmitter();
     edit = new EventEmitter();
+    // why: a picked datetime is a model value; keep it in ISdCoreConfiguration.timeZone like the expressions that read it.
+    #dateTime = inject(SdDateTimeService);
     constructor(ref) {
         this.ref = ref;
     }
@@ -3210,7 +3221,7 @@ class ExpressionBuilderComponent {
             condition.value = DayInfoPreviouses.find(e => e.value === condition.dayInfo.related)?.format(condition.dayInfo.relatedValue) ?? null;
         }
         else if (condition.value?.type === 'DATETIME' && condition.value) {
-            condition.value = DateUtilities$1.toFormat(condition.value, 'yyyy/MM/dd HH:mm:00');
+            condition.value = this.#dateTime.toFormat(condition.value, 'yyyy/MM/dd HH:mm:00');
         }
     };
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.21", ngImport: i0, type: ExpressionBuilderComponent, deps: [{ token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
@@ -4141,8 +4152,10 @@ class DatetimeControl {
     set _component(component) {
         this.component = component;
     }
-    date = DateUtilities.toFormat(new Date(), 'dd/MM/yyyy');
-    datetime = DateUtilities.toFormat(new Date(), 'dd/MM/yyyy HH:mm');
+    // why: the builder preview shows today as the app does, in ISdCoreConfiguration.timeZone.
+    #dateTime = inject(SdDateTimeService);
+    date = this.#dateTime.toFormat(new Date(), 'dd/MM/yyyy');
+    datetime = this.#dateTime.toFormat(new Date(), 'dd/MM/yyyy HH:mm');
     #subscription = new Subscription();
     constructor(ref, builderService) {
         this.ref = ref;