cat-qw-lib 0.43.47 → 0.43.49

package/fesm2022/cat-qw-lib.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { EventEmitter, Component, Input, Output, Injectable, inject, ViewChild, ViewEncapsulation, HostListener, Pipe, Directive, NgModule, APP_INITIALIZER } from '@angular/core';
+import { EventEmitter, Component, Input, Output, Injectable, 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, take, Subject, takeUntil, firstValueFrom, of, tap as tap$1, map, debounceTime, distinctUntilChanged, catchError, Subscription } from 'rxjs';
+import { BehaviorSubject, 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';
@@ -664,72 +664,6 @@ 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;
@@ -750,7 +684,6 @@ class BaseControlComponent {
     textboxField;
     dropdown;
     textArea;
-    unsavedChangesService = inject(CheckUnsavedChangesService);
     initialRecord = {};
     static allAttributes = [];
     query;
@@ -831,9 +764,47 @@ class BaseControlComponent {
     checkUnsavedChanges(isBrowserEvent) {
         this.formStateService.selectInitialRecord().subscribe((res) => {
             if (res) {
-                this.unsavedChangesService.checkUnsavedChanges(res, this.record, isBrowserEvent);
+                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);
+        }
+        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);
+                }
+            }
+        });
+    }
+    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();