cat-qw-lib 0.43.43 → 0.43.46

package/fesm2022/cat-qw-lib.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { EventEmitter, Component, Input, Output, Injectable, ViewChild, ViewEncapsulation, HostListener, Pipe, Directive, NgModule, APP_INITIALIZER } from '@angular/core';
+import { EventEmitter, Component, Input, Output, Injectable, inject, ViewChild, ViewEncapsulation, HostListener, Pipe, Directive, NgModule, APP_INITIALIZER } from '@angular/core';
 import * as i1 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import * as i3$1 from '@angular/forms';
@@ -23,7 +23,7 @@ import * as i3$2 from 'primeng/checkbox';
 import { CheckboxModule } from 'primeng/checkbox';
 import { EntityStore, StoreConfig, QueryEntity } from '@datorama/akita';
 import { __decorate } from 'tslib';
-import { BehaviorSubject, Subject, takeUntil, firstValueFrom, of, tap as tap$1, map, debounceTime, distinctUntilChanged, catchError, Subscription } from 'rxjs';
+import { BehaviorSubject, take, Subject, takeUntil, firstValueFrom, of, tap as tap$1, map, debounceTime, distinctUntilChanged, catchError, Subscription } from 'rxjs';
 import { DragDropModule } from 'primeng/dragdrop';
 import * as i5 from 'primeng/confirmdialog';
 import { ConfirmDialogModule } from 'primeng/confirmdialog';
@@ -597,20 +597,33 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.4", ngImpor
 class FormStateService {
     formChangesSubject$;
     isFormNavigating$;
+    isBrowserEvent$;
     isShowConfirmation$;
+    isShowBrowserConfirmation$;
     initialRecord$;
     constructor() {
         this.formChangesSubject$ = new BehaviorSubject(false);
         this.isFormNavigating$ = new BehaviorSubject(false);
+        this.isBrowserEvent$ = new BehaviorSubject(false);
         this.isShowConfirmation$ = new BehaviorSubject(false);
+        this.isShowBrowserConfirmation$ = new BehaviorSubject(false);
         this.initialRecord$ = new BehaviorSubject({});
     }
     setIsFormNavigating(isNavigation) {
         this.isFormNavigating$.next(isNavigation);
     }
+    setIsBrowserEvent(isNavigation) {
+        this.isFormNavigating$.next(isNavigation);
+    }
+    getIsBrowserEvent() {
+        return this.isBrowserEvent$.getValue();
+    }
     getIsFormNavigating() {
         return this.isFormNavigating$.getValue();
     }
+    selectIsBrowserEvent() {
+        return this.isBrowserEvent$.asObservable();
+    }
     selectIsFormNavigating() {
         return this.isFormNavigating$.asObservable();
     }
@@ -635,6 +648,12 @@ class FormStateService {
     selectInitialRecord() {
         return this.initialRecord$.asObservable();
     }
+    setShowBroswerConfirmDialog(value) {
+        return this.isShowBrowserConfirmation$.next(value);
+    }
+    selectShowBroswerConfirmDialog() {
+        return this.isShowBrowserConfirmation$.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' });
 }
@@ -645,6 +664,72 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.4", ngImpor
                 }]
         }], ctorParameters: () => [] });
 
+class CheckUnsavedChangesService {
+    formStateService;
+    sanitizedInitialRecord;
+    sanitizedCurrentRecord;
+    constructor(formStateService) {
+        this.formStateService = formStateService;
+    }
+    // checkUnsavedChanges(initialRecord: any, currentRecord: any, isBrowserEvent?: boolean) {
+    //   this.sanitizedInitialRecord = this.normalizeRecord(initialRecord);
+    //   this.sanitizedCurrentRecord = this.normalizeRecord(currentRecord);
+    //   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);
+    //   }
+    //   this.formStateService.selectIsFormSaved().subscribe((res: boolean) => {
+    //     if (res) {
+    //       this.formStateService.setShowConfirmation(false);
+    //       console.log('3 isFormSaved');
+    //     } else {
+    //       console.log(hasChanges ? '4 not saved but hasChanges' : '5 not saved and not hasChanges');
+    //       this.formStateService.setShowConfirmation(hasChanges);
+    //     }
+    //   });
+    // }
+    // private normalizeRecord(record: any): Record<string, any> {
+    //   if (!record) return {};
+    //   return Object.keys(record).reduce((acc, key) => {
+    //     let value = record[key];
+    //     acc[key] = value === undefined || value === SHARED.EMPTY ? undefined : value;
+    //     return acc;
+    //   }, {} as Record<string, any>);
+    // }
+    checkUnsavedChanges(initialRecord, currentRecord, isBrowserEvent) {
+        const sanitizedInitialRecord = this.normalizeRecord(initialRecord);
+        const sanitizedCurrentRecord = this.normalizeRecord(currentRecord);
+        console.log('1 sanitizedInitialRecord', sanitizedInitialRecord);
+        console.log('2 sanitizedCurrentRecord', sanitizedCurrentRecord);
+        const hasChanges = JSON.stringify(sanitizedInitialRecord) !== JSON.stringify(sanitizedCurrentRecord);
+        if (isBrowserEvent) {
+            console.log("3 for browser event");
+            this.formStateService.setShowBroswerConfirmDialog(hasChanges);
+        }
+        this.formStateService.selectIsFormSaved().pipe(take(1)).subscribe((isFormSaved) => {
+            this.formStateService.setShowConfirmation(!isFormSaved && hasChanges);
+            console.log(isFormSaved ? '3 isFormSaved' : hasChanges ? '4 not saved but hasChanges' : '5 not saved and not hasChanges');
+        });
+    }
+    normalizeRecord(record) {
+        if (!record)
+            return {};
+        return Object.fromEntries(Object.entries(record).map(([key, value]) => [key, value === undefined || value === SHARED.EMPTY ? undefined : value]));
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.4", ngImport: i0, type: CheckUnsavedChangesService, deps: [{ token: FormStateService }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.4", ngImport: i0, type: CheckUnsavedChangesService, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.4", ngImport: i0, type: CheckUnsavedChangesService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: () => [{ type: FormStateService }] });
+
 class BaseControlComponent {
     baseStore;
     baseQuery;
@@ -665,11 +750,14 @@ class BaseControlComponent {
     textboxField;
     dropdown;
     textArea;
+    unsavedChangesService = inject(CheckUnsavedChangesService);
     initialRecord = {};
     static allAttributes = [];
     query;
     destroy$ = new Subject();
     attributeDestroy$ = new Subject();
+    sanitizedInitialRecord;
+    sanitizedCurrentRecord;
     ngOnInit() {
         this.addToAttributeList();
         this.baseQuery.getIsFormSubmitted()
@@ -689,6 +777,13 @@ class BaseControlComponent {
                 this.checkUnsavedChanges();
             }
         });
+        this.formStateService.selectIsBrowserEvent()
+            .pipe(takeUntil(this.destroy$))
+            .subscribe((res) => {
+            if (res) {
+                this.checkUnsavedChanges(true);
+            }
+        });
     }
     ngOnChanges(changes) {
         if (changes['store'] && this.store) {
@@ -733,40 +828,13 @@ class BaseControlComponent {
     getValue() {
         return this.record[this.attributeModel.name];
     }
-    checkUnsavedChanges() {
+    checkUnsavedChanges(isBrowserEvent) {
         this.formStateService.selectInitialRecord().subscribe((res) => {
             if (res) {
-                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);
-                        }
-                    }
-                });
+                this.unsavedChangesService.checkUnsavedChanges(res, this.record, isBrowserEvent);
             }
         });
     }
-    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;
-        }, {});
-    }
     ngOnDestroy() {
         this.destroy$.next();
         this.destroy$.complete();
@@ -1380,8 +1448,8 @@ class BaseFormComponent {
         }
     }
     handleBeforeUnload(event) {
-        this.formStateService.setIsFormNavigating(true);
-        this.formStateService.selectShowConfirmation().subscribe((showConfirmation) => {
+        this.formStateService.setIsBrowserEvent(true);
+        this.formStateService.selectShowBroswerConfirmDialog().subscribe((showConfirmation) => {
             if (showConfirmation) {
                 event.preventDefault();
                 event.returnValue = SHARED.BROWSER_WARNING;