cat-qw-lib 0.43.16 → 0.43.18

package/fesm2022/cat-qw-lib.mjs

@@ -600,9 +600,6 @@ class FormStateService {
         this.formChangesSubject$ = new BehaviorSubject(false);
         this.isFormNavigating$ = new BehaviorSubject(false);
     }
-    setFormChanges(hasChanges) {
-        this.formChangesSubject$.next(hasChanges);
-    }
     setIsFormNavigating(isNavigation) {
         this.isFormNavigating$.next(isNavigation);
     }
@@ -612,10 +609,13 @@ class FormStateService {
     selectIsFormNavigating() {
         return this.isFormNavigating$.asObservable();
     }
-    getSUnsavedChanges() {
+    setIsFormSaved(hasChanges) {
+        this.formChangesSubject$.next(hasChanges);
+    }
+    getIsFormSaved() {
         return this.formChangesSubject$.getValue();
     }
-    selectSUnsavedChanges() {
+    selectIsFormSaved() {
         return this.formChangesSubject$.asObservable();
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.4", ngImport: i0, type: FormStateService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
@@ -666,12 +666,10 @@ class BaseControlComponent {
             }
         });
         this.formStateService.selectIsFormNavigating().subscribe((res) => {
+            console.log("1 isFormNavigating =>", res);
             if (res) {
-                this.formStateService.selectSUnsavedChanges().subscribe((res) => {
-                    if (res) {
-                        this.checkUnsavedChanges();
-                    }
-                });
+                console.log("2 call checkUnSaved =>", res);
+                this.checkUnsavedChanges();
             }
         });
     }
@@ -709,10 +707,23 @@ class BaseControlComponent {
         return this.record[this.attributeModel.name];
     }
     checkUnsavedChanges() {
-        const hasChanges = JSON.stringify(this.initialRecord) !== JSON.stringify(this.record);
-        if (this.formStateService && hasChanges) {
-            this.formStateService.setFormChanges(hasChanges);
-        }
+        this.formStateService.selectIsFormSaved().subscribe((res) => {
+            console.log("3=> isFormSaved", res);
+            if (res === false) {
+                console.log("4=> if false", res);
+                const hasChanges = JSON.stringify(this.initialRecord) !== JSON.stringify(this.record);
+                if (this.formStateService && hasChanges) {
+                    console.log("5=> false", hasChanges);
+                    this.formStateService.setIsFormSaved(hasChanges);
+                }
+            }
+            else {
+                if (this.formStateService) {
+                    console.log("6=> else");
+                    this.formStateService.setIsFormSaved(false);
+                }
+            }
+        });
     }
     ngOnDestroy() {
         this.destroy$.next();
@@ -1389,7 +1400,8 @@ class BaseFormComponent {
                 this.record = {};
                 this.baseStore?.setIsApiValidated(null);
                 if (this.formStateService) {
-                    this.formStateService.setFormChanges(false);
+                    console.log("Update");
+                    this.formStateService.setIsFormSaved(true);
                 }
                 this.onFormNavigate.emit(response);
             },
@@ -1407,7 +1419,8 @@ class BaseFormComponent {
                 this.record = {};
                 this.baseStore?.setIsApiValidated(null);
                 if (this.formStateService) {
-                    this.formStateService.setIsFormNavigating(false);
+                    console.log("Add");
+                    this.formStateService.setIsFormSaved(true);
                 }
                 this.onFormNavigate.emit(response);
             },