@planeasyinc/le-angular 0.0.18 → 0.0.20

package/dist/fesm2022/planeasyinc-le-angular.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { InjectionToken, inject, signal, Injectable, computed, effect, untracked, Directive, input, ChangeDetectionStrategy, Component, output, forwardRef, ViewContainerRef, Injector, Renderer2, ElementRef, DestroyRef, ChangeDetectorRef, viewChild } from '@angular/core';
+import { InjectionToken, inject, signal, Injectable, computed, effect, untracked, Directive, input, ChangeDetectionStrategy, Component, output, forwardRef, ViewContainerRef, Injector, Renderer2, ElementRef, DestroyRef, viewChild } from '@angular/core';
 import { HttpContextToken, HttpClient, HttpContext, HttpRequest, HttpEventType } from '@angular/common/http';
 import { map, filter, distinctUntilChanged, BehaviorSubject, Subject, takeUntil, firstValueFrom, of, tap, catchError, from, concatMap, finalize, fromEvent, startWith } from 'rxjs';
 import { decodeJwt, UrlFragmentBuilder, normalizeConfig } from '@planeasyinc/le-core';
@@ -1725,13 +1725,27 @@ const traverse = (entity, path, cb) => {
 const isTabJSON = (control) => {
     return control.name.toLowerCase().includes('json');
 };
-const getTabFormValues = (control, engine) => {
+/**
+ *
+ * @param source Control Config with nested controls
+ * @param target Control Config with json value
+ * @param engine Form Engine
+ *
+ * @description
+ * Traverse source Control Config tree, get latest value from state.
+ * If no value found in state, set target Control Config initial value
+ */
+const getTabFormValues = (source, target, engine) => {
     const result = {};
-    traverse(control, ['meta', 'controls'], (ctrl) => {
+    const targetValueObject = mapJSONToFormValues(target.value);
+    traverse(source, ['meta', 'controls'], (ctrl) => {
         if (!ctrl.id) {
             return;
         }
-        const value = engine.values.get(ctrl.id);
+        let value = engine.values.get(ctrl.id);
+        if (value === undefined) {
+            value = targetValueObject[ctrl.id];
+        }
         if (value === undefined) {
             return;
         }
@@ -1743,7 +1757,10 @@ const mapFormValuesToJSON = (values) => {
     return JSON.stringify(values, null, 2);
 };
 const mapJSONToFormValues = (json) => {
-    return JSON.parse(json);
+    if (typeof json === 'string') {
+        return JSON.parse(json);
+    }
+    throw new Error('The `json` parameter is not a valid JSON');
 };
 const getTabJSONControl = (control, engine) => {
     let result;
@@ -2018,7 +2035,6 @@ class FormViewComponent {
     attachmentService = inject(FormViewAttachmentService);
     viewportScroller = inject(ViewportScroller);
     toastService = inject(LeToastService);
-    cdr = inject(ChangeDetectorRef);
     _isLoading = signal(false);
     _form = signal(null);
     _sections = signal([]);
@@ -2121,8 +2137,8 @@ class FormViewComponent {
                     });
                 }
                 else {
-                    const value = mapFormValuesToJSON(getTabFormValues(action.source, engine));
                     const target = getTabJSONControl(action.target, engine);
+                    const value = mapFormValuesToJSON(getTabFormValues(action.source, target, engine));
                     engine.values.set(target.id, value);
                 }
             }