@gipisistemas/ngx-core 1.0.16 → 1.0.17

package/fesm2022/gipisistemas-ngx-core.mjs

@@ -4864,12 +4864,12 @@ class FilterPersistenceService {
         this._injector = inject(EnvironmentInjector);
         this._baseAuthServiceToken = inject(BaseAuthServiceToken);
         this._localStorageToken = inject(LocalStorageToken);
+        this._STORAGE_KEY = 'gipi.filters';
     }
     /** Inicializa os filtros a partir da URL ou localStorage */
-    initializeFilter(storageKey, defaultFilter, useUserSegregation = true) {
+    initializeFilter(screenKey, defaultFilter) {
         return runInInjectionContext(this._injector, () => {
             const activatedRoute = inject(ActivatedRoute);
-            const normalizedStorageKey = this._normalizeStorageKey(storageKey, useUserSegregation);
             const rawQueryParams = activatedRoute.snapshot.queryParams;
             const hasAnyQueryParams = Object.keys(rawQueryParams).some((key) => {
                 const value = rawQueryParams[key];
@@ -4888,7 +4888,7 @@ class FilterPersistenceService {
                 return snapshotParams;
             }
             // FALLBACK do localStorage (somente se NÃO tiver nada na URL)
-            const saved = this._loadFromStorage(normalizedStorageKey);
+            const saved = this._loadFromStorage(screenKey);
             if (saved) {
                 this._updateUrl(this._serializeToQueryParams(saved));
                 return saved;
@@ -4897,32 +4897,20 @@ class FilterPersistenceService {
         });
     }
     /** Atualiza URL e storage quando os filtros mudam */
-    updateFilter(storageKey, filters, useUserSegregation = true) {
+    updateFilter(screenKey, filters) {
         const queryParams = this._serializeToQueryParams(filters);
         const cleanedParams = this._cleanQueryParams(queryParams);
         const mergedParams = this._mergeWithCurrentQueryParams(filters, cleanedParams);
-        const normalizedStorageKey = this._normalizeStorageKey(storageKey, useUserSegregation);
         // Atualiza URL
         this._updateUrl(mergedParams);
         // Salva no localStorage
-        this._saveToStorage(normalizedStorageKey, filters);
+        this._saveToStorage(screenKey, filters);
     }
     /** Limpa filtros da URL e storage */
-    clearFilter(storageKey, defaultFilter, useUserSegregation = true) {
-        const normalizedStorageKey = this._normalizeStorageKey(storageKey, useUserSegregation);
+    clearFilter(screenKey, defaultFilter) {
         const mergedParams = this._mergeWithCurrentQueryParams(defaultFilter, {});
         this._updateUrl(mergedParams);
-        this._saveToStorage(normalizedStorageKey, defaultFilter);
-    }
-    /** Normaliza a chave de storage incluindo o usuário quando necessário */
-    _normalizeStorageKey(storageKey, useUserSegregation = true) {
-        const prefix = 'gipi.filter';
-        let key = storageKey.startsWith(prefix) ? storageKey : `${prefix}${storageKey}`;
-        if (useUserSegregation) {
-            const userAndCompanyId = this._getCurrentUserAndCompanyId();
-            key = `${key}.user.${userAndCompanyId}`;
-        }
-        return key;
+        this._saveToStorage(screenKey, defaultFilter);
     }
     /** Obtém o ID do usuário atual */
     _getCurrentUserAndCompanyId() {
@@ -5047,21 +5035,29 @@ class FilterPersistenceService {
         });
         return { ...defaultFilter, ...parsed };
     }
-    _hasQueryParams(filters, defaultFilter) {
-        return JSON.stringify(filters) !== JSON.stringify(defaultFilter);
-    }
-    _saveToStorage(storageKey, filters) {
+    _saveToStorage(screenKey, filters) {
         try {
-            this._localStorageToken.setItem(storageKey, JSON.stringify(filters));
+            const userCompany = this._getCurrentUserAndCompanyId();
+            const storageRaw = this._localStorageToken.getItem(this._STORAGE_KEY);
+            const storage = storageRaw ? JSON.parse(storageRaw) : {};
+            if (!storage[userCompany]) {
+                storage[userCompany] = {};
+            }
+            storage[userCompany][screenKey] = filters;
+            this._localStorageToken.setItem(this._STORAGE_KEY, JSON.stringify(storage));
         }
         catch (error) {
             console.warn('Could not save filters to storage:', error);
         }
     }
-    _loadFromStorage(storageKey) {
+    _loadFromStorage(screenKey) {
         try {
-            const saved = this._localStorageToken.getItem(storageKey);
-            return saved ? JSON.parse(saved) : null;
+            const userCompany = this._getCurrentUserAndCompanyId();
+            const storageRaw = this._localStorageToken.getItem(this._STORAGE_KEY);
+            if (!storageRaw)
+                return null;
+            const storage = JSON.parse(storageRaw);
+            return storage?.[userCompany]?.[screenKey] ?? null;
         }
         catch {
             return null;
@@ -5112,8 +5108,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
  * const { filter, isInitializing, resetFilter } = useFilterPersistence({
  *   defaultFilter: new MyFilter(),
  *
- *   // Recomendado iniciar com 'gipi.filter.'
- *   storageKey: 'gipi.filter.default',
+ *   // Recomendação: this.getPath();
+ *   screenKey: 'page/filter/default',
  *
  *   // Opcional, padrão 100ms
  *   debounceTime: 200,
@@ -5125,13 +5121,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
  */
 function useFilterPersistence(config) {
     const filterPersistenceService = inject(FilterPersistenceService);
-    const { storageKey = 'gipi.filter.undefined', defaultFilter, debounceTime = 100, onFilterInit, useUserSegregation = true, } = config;
+    const { screenKey = 'page/filter/undefined', defaultFilter, debounceTime = 100, onFilterInit, } = config;
     const isInitializing = signal(true, ...(ngDevMode ? [{ debugName: "isInitializing" }] : []));
     const filter = signal(defaultFilter, ...(ngDevMode ? [{ debugName: "filter" }] : []));
     // Inicialização
     const initializeFilter = () => {
         try {
-            const persistedFilter = filterPersistenceService.initializeFilter(storageKey, defaultFilter, useUserSegregation);
+            const persistedFilter = filterPersistenceService.initializeFilter(screenKey, defaultFilter);
             filter.set(persistedFilter);
             if (onFilterInit) {
                 onFilterInit(persistedFilter);
@@ -5139,7 +5135,7 @@ function useFilterPersistence(config) {
         }
         catch {
             filter.set(defaultFilter);
-            filterPersistenceService.clearFilter(storageKey, defaultFilter, useUserSegregation);
+            filterPersistenceService.clearFilter(screenKey, defaultFilter);
             if (onFilterInit) {
                 onFilterInit(defaultFilter);
             }
@@ -5152,7 +5148,7 @@ function useFilterPersistence(config) {
         const init = isInitializing();
         if (init)
             return;
-        const timeoutId = setTimeout(() => filterPersistenceService.updateFilter(storageKey, currentFilter, useUserSegregation), debounceTime);
+        const timeoutId = setTimeout(() => filterPersistenceService.updateFilter(screenKey, currentFilter), debounceTime);
         return () => clearTimeout(timeoutId);
     });
     afterNextRender(() => initializeFilter());
@@ -5161,7 +5157,7 @@ function useFilterPersistence(config) {
         isInitializing: isInitializing.asReadonly(),
         reset: () => {
             filter.set(defaultFilter);
-            filterPersistenceService.clearFilter(storageKey, defaultFilter, useUserSegregation);
+            filterPersistenceService.clearFilter(screenKey, defaultFilter);
         },
         set: (newFilter) => {
             filter.set(newFilter);
@@ -5178,7 +5174,6 @@ class BaseListComponent extends BaseComponent {
         this.service = service;
         this.filterPersistenceService = inject(FilterPersistenceService);
         this.pageAdjustService = inject(PageAdjustService);
-        this._SESSION_STORAGE_FILTER = `gipi.filter.${this.getFilterStorageKey()}`;
         this._isHydrating = signal(true, ...(ngDevMode ? [{ debugName: "_isHydrating" }] : []));
         this._persistTimer = null;
         this.filter = signal(this.newFilter(), ...(ngDevMode ? [{ debugName: "filter" }] : []));
@@ -5229,7 +5224,7 @@ class BaseListComponent extends BaseComponent {
             // Debounce manual para evitar muitas atualizações
             this._persistTimer = setTimeout(() => {
                 const toPersist = this._filterToPersist(currentFilter);
-                this.filterPersistenceService.updateFilter(this._SESSION_STORAGE_FILTER, toPersist);
+                this.filterPersistenceService.updateFilter(this.getFilterStorageKey(), toPersist);
             }, 150);
         });
     }
@@ -5275,7 +5270,7 @@ class BaseListComponent extends BaseComponent {
         this._isHydrating.set(true);
         this.page.set(this.newPage());
         const defaultFilter = this.newFilter();
-        const persistedFilter = this.filterPersistenceService.initializeFilter(this._SESSION_STORAGE_FILTER, defaultFilter);
+        const persistedFilter = this.filterPersistenceService.initializeFilter(this.getFilterStorageKey(), defaultFilter);
         this.filter.set(persistedFilter);
         this.afterFilterInit();
         this.tableColumns.set(this.createTableColumns());
@@ -5630,7 +5625,7 @@ class BaseListComponent extends BaseComponent {
     }
     resetFilter() {
         // Limpa a persistência dos filtros
-        this.filterPersistenceService.clearFilter(this._SESSION_STORAGE_FILTER, this.newFilter());
+        this.filterPersistenceService.clearFilter(this.getFilterStorageKey(), this.newFilter());
         this.page.set(this.newPage());
         this.filter.set(this.newFilter());
         this.appliedFilters.set([]);
@@ -5685,13 +5680,6 @@ class BaseReportComponent extends BaseComponent {
     get currentReportType() {
         return this._currentReportType();
     }
-    get _SESSION_STORAGE_FILTER() {
-        const current = this._currentReportType();
-        if (!current) {
-            return `gipi.filter.unknown`;
-        }
-        return `gipi.filter.${current.getFilterStorageKey()}`;
-    }
     // Computed para facilitar o acesso ao tipo atual
     get currentType() {
         return computed(() => this._currentReportType()?.type || '');
@@ -5708,6 +5696,13 @@ class BaseReportComponent extends BaseComponent {
         this.filterPersistenceService = inject(FilterPersistenceService);
         this._isInitializingScreen = signal(true, ...(ngDevMode ? [{ debugName: "_isInitializingScreen" }] : []));
         this._currentReportType = signal(null, ...(ngDevMode ? [{ debugName: "_currentReportType" }] : []));
+        this._STORAGE_FILTER = computed(() => {
+            const current = this._currentReportType();
+            if (!current) {
+                return `gipi/filter/unknown`;
+            }
+            return current.getFilterStorageKey();
+        }, ...(ngDevMode ? [{ debugName: "_STORAGE_FILTER" }] : []));
         // Effect para persistência automática dos filtros
         effect(() => {
             const currentFilter = this._currentReportType().filter();
@@ -5717,7 +5712,7 @@ class BaseReportComponent extends BaseComponent {
                 return;
             }
             // Debounce manual para evitar muitas atualizações
-            setTimeout(() => this.filterPersistenceService.updateFilter(this._SESSION_STORAGE_FILTER, currentFilter), 100);
+            setTimeout(() => this.filterPersistenceService.updateFilter(this._STORAGE_FILTER(), currentFilter), 100);
         });
         // Effect para reagir à mudança de tipo de relatório
         effect(() => {
@@ -5737,7 +5732,7 @@ class BaseReportComponent extends BaseComponent {
             this.currentReportType = this.reportTypes[0];
         }
         const defaultFilter = this.currentReportType.newFilter();
-        const persistedFilter = this.filterPersistenceService.initializeFilter(this._SESSION_STORAGE_FILTER, defaultFilter);
+        const persistedFilter = this.filterPersistenceService.initializeFilter(this._STORAGE_FILTER(), defaultFilter);
         this.currentReportType.filter.set(persistedFilter);
         // Hook para ações após a inicialização do filtro
         this.currentReportType.afterFilterInit();
@@ -5882,14 +5877,14 @@ class BaseReportComponent extends BaseComponent {
     _persistCurrentTypeState() {
         if (this.currentReportType) {
             const currentFilter = this.currentReportType.filter();
-            this.filterPersistenceService.updateFilter(`gipi.filter.${this.currentReportType.getFilterStorageKey()}`, currentFilter);
+            this.filterPersistenceService.updateFilter(this.currentReportType.getFilterStorageKey(), currentFilter);
         }
     }
     /** Carrega o estado do novo tipo */
     _loadNewTypeState() {
         this._isInitializingScreen.set(true);
         const defaultFilter = this.currentReportType.newFilter();
-        const persistedFilter = this.filterPersistenceService.initializeFilter(this._SESSION_STORAGE_FILTER, defaultFilter);
+        const persistedFilter = this.filterPersistenceService.initializeFilter(this._STORAGE_FILTER(), defaultFilter);
         this.currentReportType.filter.set(persistedFilter);
         this.currentReportType.afterFilterInit();
         // Força uma busca dos dados