cat-qw-lib 0.43.50 → 0.43.52

package/fesm2022/cat-qw-lib.mjs

@@ -689,10 +689,9 @@ class BaseControlComponent {
     query;
     destroy$ = new Subject();
     attributeDestroy$ = new Subject();
-    sanitizedInitialRecord;
-    sanitizedCurrentRecord;
     ngOnInit() {
         this.addToAttributeList();
+        // this.initialRecord = structuredClone(this.record); // Reset initial state after saving
         this.baseQuery.getIsFormSubmitted()
             .pipe(takeUntil(this.destroy$))
             .subscribe((res) => {
@@ -703,36 +702,19 @@ class BaseControlComponent {
                 this.baseStore.setIsFormSubmitted(false);
             }
         });
-        this.formStateService.selectIsFormNavigating()
-            .pipe(takeUntil(this.destroy$))
-            .subscribe((res) => {
-            if (res) {
-                this.checkUnsavedChanges();
-            }
-        });
-        this.formStateService.selectIsBrowserEvent()
-            .pipe(takeUntil(this.destroy$))
-            .subscribe((res) => {
-            if (res) {
-                this.checkUnsavedChangesforBrowser(true);
-            }
-        });
+        // this.formStateService.selectIsFormNavigating()
+        //   .pipe(takeUntil(this.destroy$))
+        //   .subscribe((res) => {
+        //     if (res) {
+        //       this.checkUnsavedChanges();
+        //     }
+        //   });
     }
-    ngOnChanges(changes) {
-        if (changes['store'] && this.store) {
+    ngOnChanges() {
+        if (this.store) {
             this.query = new BaseQuery(this.store);
         }
-        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);
-        }
+        // this.initialRecord = structuredClone(this.record);;
     }
     handleModelChange(event, valid, val) {
         if (this.attributeModel?.name) {
@@ -761,60 +743,34 @@ class BaseControlComponent {
     getValue() {
         return this.record[this.attributeModel.name];
     }
-    checkUnsavedChanges(isBrowserEvent) {
-        this.formStateService.selectInitialRecord().subscribe((res) => {
-            if (res) {
-                this.sanitizedInitialRecord = this.normalizeRecord(res);
-                this.sanitizedCurrentRecord = this.normalizeRecord(this.record);
-            }
-        });
-        const hasChanges = JSON.stringify(this.sanitizedInitialRecord) !== JSON.stringify(this.sanitizedCurrentRecord);
-        this.formStateService.selectIsFormSaved().subscribe((res) => {
-            if (res) {
-                this.formStateService.setShowConfirmation(false);
-                console.log("3 isFormSaved");
-            }
-            else {
-                if (!res && hasChanges) {
-                    console.log("4 not saved but hasChanges");
-                    this.formStateService.setShowConfirmation(true);
-                }
-                if (!res && !hasChanges) {
-                    console.log("5 not saved and not hasChanges");
-                    this.formStateService.setShowConfirmation(false);
-                }
-            }
-        });
-    }
-    checkUnsavedChangesforBrowser(isBrowserEvent) {
-        this.formStateService.selectInitialRecord().subscribe((res) => {
-            if (res) {
-                this.sanitizedInitialRecord = this.normalizeRecord(res);
-                this.sanitizedCurrentRecord = this.normalizeRecord(this.record);
-                console.log("1 sanitizedInitialRecord", this.sanitizedInitialRecord);
-                console.log("2 sanitizedCurrentRecord", this.sanitizedCurrentRecord);
-            }
-        });
-        const hasChanges = JSON.stringify(this.sanitizedInitialRecord) !== JSON.stringify(this.sanitizedCurrentRecord);
-        if (isBrowserEvent && hasChanges) {
-            this.formStateService.setShowBroswerConfirmDialog(true);
-        }
-        else {
-            this.formStateService.setShowBroswerConfirmDialog(false);
-        }
-    }
-    normalizeRecord(record) {
-        if (!record)
-            return {};
-        return Object.keys(record).reduce((acc, key) => {
-            let value = record[key];
-            if (value === undefined || value === SHARED.EMPTY) {
-                value = undefined;
-            }
-            acc[key] = value;
-            return acc;
-        }, {});
-    }
+    // checkUnsavedChanges() {
+    //   const sanitizedInitialRecord = this.normalizeRecord(this.initialRecord);
+    //   const sanitizedCurrentRecord = this.normalizeRecord(this.record);
+    //   const hasChanges = JSON.stringify(sanitizedInitialRecord) !== JSON.stringify(sanitizedCurrentRecord);
+    //   this.formStateService.selectIsFormSaved().subscribe((res: boolean) => {
+    //     if (res) {
+    //       this.formStateService.setShowConfirmation(false);
+    //     } else {
+    //       if (!res && hasChanges) {
+    //         this.formStateService.setShowConfirmation(true);
+    //       }
+    //       if (!res && !hasChanges) {
+    //         this.formStateService.setShowConfirmation(false);
+    //       }
+    //     }
+    //   })
+    // }
+    // private normalizeRecord(record: any): Record<string, any> {
+    //   if (!record) return {};
+    //   return Object.keys(record).reduce((acc, key) => {
+    //     let value = record[key];
+    //     if (value === undefined || value === SHARED.EMPTY) {
+    //       value = null;
+    //     }
+    //     acc[key] = value;
+    //     return acc;
+    //   }, {} as Record<string, any>);
+    // }
     ngOnDestroy() {
         this.destroy$.next();
         this.destroy$.complete();
@@ -1399,6 +1355,8 @@ class BaseFormComponent {
     onSave = new EventEmitter();
     onFormNavigate = new EventEmitter();
     onCancel = new EventEmitter();
+    sanitizedInitialRecord;
+    sanitizedCurrentRecord;
     constructor(formStateService, service, validatorService, router, activatedRoute, baseStore, baseQuery) {
         this.formStateService = formStateService;
         this.service = service;
@@ -1423,9 +1381,19 @@ class BaseFormComponent {
             this.service.getById(id).subscribe((res) => {
                 this.record = JSON.parse(JSON.stringify(res));
                 this.baseStore?.setRecordChange(res);
+                this.initialRecord = JSON.parse(JSON.stringify(res));
                 this.recordChange.next(res);
             });
         }
+        this.formStateService.selectIsFormNavigating()
+            .pipe(takeUntil(this.destroy$))
+            .subscribe((res) => {
+            if (res) {
+                console.log("0 unSavedCall", this.initialRecord);
+                console.log("1 unSavedCall", this.initialRecord);
+                this.checkUnsavedChanges();
+            }
+        });
     }
     handleBeforeUnload(event) {
         this.formStateService.setIsBrowserEvent(true);
@@ -1436,6 +1404,22 @@ class BaseFormComponent {
             }
         });
     }
+    checkUnsavedChanges() {
+        if (!this.initialRecord) {
+            this.initialRecord = JSON.parse(JSON.stringify(this.record)); // Ensure it's assigned
+            console.log("2 initialRecord =>", this.initialRecord);
+        }
+        const hasChanges = JSON.stringify(this.initialRecord) !== JSON.stringify(this.record);
+        const isSaved = this.formStateService.getIsFormSaved(); // Ensure this method exists
+        if (hasChanges && !isSaved) {
+            console.log("3");
+            this.formStateService.setShowConfirmation(true);
+        }
+        else {
+            console.log("4");
+            this.formStateService.setShowConfirmation(false);
+        }
+    }
     handleSubmit() {
         const validateRecords = this.validatorService
             ? this.validatorService.handleValidateRecords(this.record)