cat-qw-lib 0.43.41 → 0.43.43

package/fesm2022/cat-qw-lib.mjs

@@ -598,10 +598,12 @@ class FormStateService {
     formChangesSubject$;
     isFormNavigating$;
     isShowConfirmation$;
+    initialRecord$;
     constructor() {
         this.formChangesSubject$ = new BehaviorSubject(false);
         this.isFormNavigating$ = new BehaviorSubject(false);
         this.isShowConfirmation$ = new BehaviorSubject(false);
+        this.initialRecord$ = new BehaviorSubject({});
     }
     setIsFormNavigating(isNavigation) {
         this.isFormNavigating$.next(isNavigation);
@@ -627,6 +629,12 @@ class FormStateService {
     selectShowConfirmation() {
         return this.isShowConfirmation$.asObservable();
     }
+    setInitialRecord(value) {
+        return this.initialRecord$.next(value);
+    }
+    selectInitialRecord() {
+        return this.initialRecord$.asObservable();
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.4", ngImport: i0, type: FormStateService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.4", ngImport: i0, type: FormStateService, providedIn: 'root' });
 }
@@ -683,13 +691,19 @@ class BaseControlComponent {
         });
     }
     ngOnChanges(changes) {
-        if (this.store) {
+        if (changes['store'] && this.store) {
             this.query = new BaseQuery(this.store);
         }
-        if (changes['record'] && changes['record'].currentValue) {
-            // Only update initialRecord when a new record is received from the server
-            this.initialRecord = structuredClone(changes['record'].currentValue);
-            console.log("onchange initialRecord=>", this.initialRecord);
+        if (changes['record'] && this.record) {
+            console.log('🔄 Updating initialRecord with:', this.record);
+            this.setInitialRecord(this.record);
+        }
+    }
+    setInitialRecord(record) {
+        if (record) {
+            console.log('🔄 Setting Initial Record:', record);
+            this.initialRecord = structuredClone(record);
+            this.formStateService.setInitialRecord(this.initialRecord);
         }
     }
     handleModelChange(event, valid, val) {
@@ -720,26 +734,24 @@ class BaseControlComponent {
         return this.record[this.attributeModel.name];
     }
     checkUnsavedChanges() {
-        console.log("1=> initialRecord", this.initialRecord);
-        console.log("2=> Record", this.record);
-        const sanitizedInitialRecord = this.normalizeRecord(this.initialRecord);
-        const sanitizedCurrentRecord = this.normalizeRecord(this.record);
-        console.log("3=> currentRecord", sanitizedCurrentRecord);
-        console.log("4=> Initial Record", sanitizedInitialRecord);
-        const hasChanges = JSON.stringify(sanitizedInitialRecord) !== JSON.stringify(sanitizedCurrentRecord);
-        this.formStateService.selectIsFormSaved().subscribe((res) => {
+        this.formStateService.selectInitialRecord().subscribe((res) => {
             if (res) {
-                this.formStateService.setShowConfirmation(false);
-            }
-            else {
-                if (!res && hasChanges) {
-                    console.log("hasChange");
-                    this.formStateService.setShowConfirmation(true);
-                }
-                if (!res && !hasChanges) {
-                    console.log("No hasChange");
-                    this.formStateService.setShowConfirmation(false);
-                }
+                const sanitizedInitialRecord = this.normalizeRecord(res);
+                const sanitizedCurrentRecord = this.normalizeRecord(this.record);
+                const hasChanges = JSON.stringify(sanitizedInitialRecord) !== JSON.stringify(sanitizedCurrentRecord);
+                this.formStateService.selectIsFormSaved().subscribe((res) => {
+                    if (res) {
+                        this.formStateService.setShowConfirmation(false);
+                    }
+                    else {
+                        if (!res && hasChanges) {
+                            this.formStateService.setShowConfirmation(true);
+                        }
+                        if (!res && !hasChanges) {
+                            this.formStateService.setShowConfirmation(false);
+                        }
+                    }
+                });
             }
         });
     }
@@ -749,7 +761,7 @@ class BaseControlComponent {
         return Object.keys(record).reduce((acc, key) => {
             let value = record[key];
             if (value === undefined || value === SHARED.EMPTY) {
-                value = null;
+                value = undefined;
             }
             acc[key] = value;
             return acc;