@yuuvis/client-framework 2.1.0 → 2.1.2

package/fesm2022/yuuvis-client-framework-forms.mjs

@@ -373,7 +373,7 @@ class DatetimeComponent extends AbstractMatFormField {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     registerOnTouched() { }
     onValueChange(e) {
-        this.propagateChange(this.withTime() ? e : e.toISOString().split('T')[0]);
+        this.propagateChange(e);
     }
     ngOnInit() {
         this.focusHandled.set(true);
@@ -420,18 +420,9 @@ class DatetimeRangeComponent extends AbstractMatFormField {
     }
     #dRef;
     #checkForEqualsRange(value) {
-        const removeZ = (v) => (typeof v === 'string' && v.endsWith('Z') ? v.slice(0, -1) : v);
-        if (value.firstValue && typeof value.firstValue === 'string') {
-            value.firstValue = removeZ(value.firstValue);
-        }
-        if (value.secondValue && typeof value.secondValue === 'string') {
-            value.secondValue = removeZ(value.secondValue);
-        }
-        const firstEndsWith = value.firstValue.endsWith(Utils.DEFAULT_RANGE_TIME_V1);
-        const secondEndsWith = value.secondValue && value.secondValue.endsWith(Utils.DEFAULT_RANGE_TIME_V2);
-        const firstDate = value.firstValue.slice(0, 10);
-        const secondDate = value.secondValue && value.secondValue.slice(0, 10);
-        if (firstEndsWith && secondEndsWith && firstDate === secondDate) {
+        const firstDate = value.firstValue;
+        const secondDate = value.secondValue ? new Date(value.secondValue.getTime() - Utils.DEFAULT_TIME_OFFSET_V2) : undefined;
+        if (firstDate.getTime() === secondDate?.getTime()) {
             return {
                 operator: Operator.EQUAL,
                 firstValue: value.firstValue,
@@ -441,14 +432,15 @@ class DatetimeRangeComponent extends AbstractMatFormField {
         return value;
     }
     writeValue(value) {
-        if (value && (value.firstValue || value.secondValue)) {
-            value = this.#checkForEqualsRange(value);
-            this.value = value;
-            const match = this.availableSearchOptions.find((o) => o.value === value.operator);
+        let _value = value && Utils.getDateRangeFrom(value);
+        if (_value && (_value.firstValue || _value.secondValue)) {
+            _value = this.#checkForEqualsRange(_value);
+            this.value = _value;
+            const match = this.availableSearchOptions.find((o) => o.value === _value?.operator);
             this.rangeForm.patchValue({
-                dateValueFrom: value.secondValue && value.firstValue,
+                dateValueFrom: _value.secondValue && _value.firstValue,
                 operator: match ? match.value : this.availableSearchOptions[0].value,
-                dateValue: value.secondValue || value.firstValue
+                dateValue: _value.secondValue || _value.firstValue
             });
         }
         else {
@@ -462,12 +454,12 @@ class DatetimeRangeComponent extends AbstractMatFormField {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function
     registerOnTouched(fn) { }
     #onValueChange() {
-        const dateValue = this.rangeForm.value.dateValue || undefined;
+        const dateValue = this.rangeForm.value.dateValue;
         const operator = this.rangeForm.value.operator;
         if (operator === Operator.INTERVAL_INCLUDE_BOTH) {
-            const dateValueFrom = this.rangeForm.value.dateValueFrom || undefined;
-            if (dateValueFrom || dateValue) {
-                this._isValid = this.rangeForm.valid && !!dateValueFrom && !!dateValue;
+            const dateValueFrom = this.rangeForm.value.dateValueFrom;
+            if (dateValueFrom && dateValue) {
+                this._isValid = this.rangeForm.valid;
                 this.value = !this._isValid
                     ? null
                     : {
@@ -477,7 +469,7 @@ class DatetimeRangeComponent extends AbstractMatFormField {
                     };
             }
         }
-        else {
+        else if (dateValue) {
             this._isValid = this.rangeForm.valid;
             this.value = !this._isValid
                 ? null
@@ -489,20 +481,11 @@ class DatetimeRangeComponent extends AbstractMatFormField {
         }
         this.propagateChange(this.value);
     }
-    #toDate(value) {
-        if (value instanceof Date)
-            return value;
-        if (typeof value === 'string') {
-            const parsed = new Date(value);
-            return isNaN(parsed.getTime()) ? null : parsed;
-        }
-        return null;
-    }
     #getValidator() {
         return (control) => {
             const operator = control.get('operator')?.value;
-            const dateValue = this.#toDate(control.get('dateValue')?.value);
-            const dateValueFrom = this.#toDate(control.get('dateValueFrom')?.value);
+            const dateValue = Utils.getDateFrom(control.get('dateValue')?.value);
+            const dateValueFrom = Utils.getDateFrom(control.get('dateValueFrom')?.value);
             const singleValueOperators = new Set([Operator.EQUAL, Operator.GREATER_OR_EQUAL, Operator.LESS_OR_EQUAL]);
             const rangeOperators = new Set([Operator.INTERVAL_INCLUDE_BOTH]);
             if (this.situation === Situation.SEARCH && !rangeOperators.has(operator))