ngx-wapp-components 3.2.11 → 3.2.12-alpha.2

package/fesm2022/ngx-wapp-components.mjs

@@ -5531,14 +5531,73 @@ class WFilterPanelComponent {
         this.hasDefaultValues = new EventEmitter();
         this.stateOptions = [{ label: this.translationsObject.advancedSearch.andButtonLabel, value: 'and' }, { label: this.translationsObject.advancedSearch.orButtonLabel, value: 'or' }];
     }
-    ngOnInit() {
-        this.isAdvancedSearch = this.sessionStorage.getLastFilterPanelQuery(this.tenantId, this.filterId)?.advancedQueryValue ? true : false;
-        if ((this.storedQuery?.advancedQueryValue && this.storedQuery?.advancedQueryValue.rules.length == 0) || (this.storedQuery?.basicQueryValue && this.storedQuery?.basicQueryValue.rules.length == 0)) {
-            //Do nothing
+    cloneDeep(value) {
+        return JSON.parse(JSON.stringify(value));
+    }
+    hasStoredQueryValues() {
+        return !!(this.storedQuery?.id === this.filterId &&
+            ((this.storedQuery?.basicQueryValue?.rules?.length ?? 0) > 0 ||
+                (this.storedQuery?.advancedQueryValue?.rules?.length ?? 0) > 0 ||
+                (this.storedQuery?.groupedQueryValue?.rules?.length ?? 0) > 0));
+    }
+    buildQueryFromStored(source) {
+        return {
+            type: this.getQueryType(),
+            basic: this.storedQuery?.basicQueryValue ? this.cloneDeep(this.storedQuery?.basicQueryValue) : null,
+            advanced: this.storedQuery?.advancedQueryValue ? this.cloneDeep(this.storedQuery?.advancedQueryValue) : null,
+            grouped: this.isAdvancedSearch && this.filterPanelObject.allowGrouped && this.groupedQueryCtrl ? this.cloneDeep(this.groupedQueryCtrl?.value) : null,
+            options: {
+                periodSelectType: this.periodSelectComponent ? this.periodSelectComponent.periodCategorySelected : null,
+                source,
+            }
+        };
+    }
+    buildQueryFromControls(source) {
+        return {
+            type: this.getQueryType(),
+            basic: this.isAdvancedSearch ? null : this.cloneDeep(this.queryCtrl.value),
+            advanced: this.isAdvancedSearch ? this.cloneDeep(this.advancedQueryCtrl.value) : null,
+            grouped: this.isAdvancedSearch && this.filterPanelObject.allowGrouped ? this.cloneDeep(this.groupedQueryCtrl.value) : null,
+            options: {
+                periodSelectType: this.periodSelectComponent ? this.periodSelectComponent.periodCategorySelected : null,
+                source,
+            }
+        };
+    }
+    normalizeQueryForEmit(queries, persistOnStorage) {
+        this.setEntity(queries);
+        queries = this.initializeOperators(queries);
+        queries = this.handleEmptyFieldsQuery(queries);
+        if (queries.type !== QueryResultType.NoFilters) {
+            this.nullableFilterOperationHandle(queries.basic ? queries.basic : queries.advanced);
+            this.setPeriodSelectValue(queries.basic ? queries.basic : queries.advanced);
         }
-        else {
-            this.storedQuery = this.sessionStorage.getLastFilterPanelQuery(this.tenantId, this.filterId);
+        this.setEmtpyArraysToNull(queries.basic ? queries.basic : queries.advanced);
+        if (persistOnStorage) {
+            let storedQuery = {
+                id: this.filterId,
+                basicQueryValue: queries.basic,
+                advancedQueryValue: queries.advanced,
+                groupedQueryValue: queries.grouped
+            };
+            if (!(storedQuery.advancedQueryValue && storedQuery.advancedQueryValue.rules.length === 0)) {
+                this.sessionStorage.setLastFilterPanelQuery(this.tenantId, storedQuery);
+            }
+        }
+        this.keepLocalDateFilterOperationHandle(queries.basic ? queries.basic : queries.advanced);
+        queries = this.deleteFieldsWithoutValue(queries);
+        queries = this.handleEmptyFieldsQuery(queries);
+        if (queries.advanced) {
+            queries.advanced = this.modifyTreeListValueParentToNull(queries.advanced);
+        }
+        else if (queries.basic) {
+            queries.basic = this.modifyTreeListValueParentToNull(queries.basic);
         }
+        return queries;
+    }
+    ngOnInit() {
+        this.isAdvancedSearch = this.sessionStorage.getLastFilterPanelQuery(this.tenantId, this.filterId)?.advancedQueryValue ? true : false;
+        this.storedQuery = this.sessionStorage.getLastFilterPanelQuery(this.tenantId, this.filterId);
         this.getQueryBuilderFilterPanel();
     }
     initQueryBuilderControls() {
@@ -5547,28 +5606,15 @@ class WFilterPanelComponent {
         if (this.filterPanelObject.allowGrouped) {
             this.groupedQueryCtrl = this.formBuilder.control(this.groupedQuery);
         }
-        if ((this.storedQuery?.advancedQueryValue && this.storedQuery?.advancedQueryValue.rules.length == 0) || (this.storedQuery?.basicQueryValue && this.storedQuery?.basicQueryValue.rules.length == 0)) {
-            //Do nothing
-        }
-        else {
-            let lastQuery = {
-                type: this.getQueryType(),
-                basic: this.storedQuery?.basicQueryValue ? Object.assign({}, this.storedQuery?.basicQueryValue) : null,
-                advanced: this.storedQuery?.advancedQueryValue ? Object.assign({}, this.storedQuery?.advancedQueryValue) : null,
-                grouped: this.isAdvancedSearch && this.filterPanelObject.allowGrouped && this.groupedQueryCtrl ? Object.assign({}, this.groupedQueryCtrl?.value) : null
-            };
-            this.setNoFiltersQueryType(lastQuery)
-                .then((res) => {
-                lastQuery = this.deleteFieldsWithoutValue(lastQuery);
-                lastQuery = this.handleEmptyFieldsQuery(lastQuery);
-                this.lastQuery.emit(lastQuery);
-            }).then(() => {
-                this.inverseNullableFilterOperationHandle(this.advancedQueryCtrl.value);
-            })
-                .then(() => {
-                this.onSearchClicked();
-            });
+        const hasStoredQuery = this.hasStoredQueryValues();
+        const initSource = hasStoredQuery ? 'init-storage' : 'init-default';
+        if (hasStoredQuery) {
+            let lastQuery = this.normalizeQueryForEmit(this.buildQueryFromStored(initSource), false);
+            this.lastQuery.emit(this.cloneDeep(lastQuery));
+            this.onSearchClicked(initSource, lastQuery);
+            return;
         }
+        this.onSearchClicked(initSource);
     }
     nullableSelectPlaceholder(rule, options) {
         if (rule.operator == 'is' && rule.value == 'null') {
@@ -5582,6 +5628,9 @@ class WFilterPanelComponent {
         return this.translationsObject.fieldsPlaceholders.list;
     }
     setEmtpyArraysToNull(query) {
+        if (!query) {
+            return;
+        }
         if ("rules" in query) {
             query.rules.forEach((rule) => {
                 this.setEmtpyArraysToNull(rule);
@@ -5611,54 +5660,18 @@ class WFilterPanelComponent {
             }
         }
     }
-    onSearchClicked() {
-        let queries = {
-            type: this.getQueryType(),
-            basic: this.isAdvancedSearch ? null : Object.assign({}, this.queryCtrl.value),
-            advanced: this.isAdvancedSearch ? Object.assign({}, this.advancedQueryCtrl.value) : null,
-            grouped: this.isAdvancedSearch && this.filterPanelObject.allowGrouped ? Object.assign({}, this.groupedQueryCtrl.value) : null,
-            options: {
-                periodSelectType: this.periodSelectComponent ? this.periodSelectComponent.periodCategorySelected : null,
-            }
-        };
-        this.setEntity(queries);
-        queries = this.initializeOperators(queries);
-        this.setNoFiltersQueryType(queries).then((resQueries) => {
-            if (resQueries.type != 0) {
-                this.nullableFilterOperationHandle(queries.basic ? queries.basic : queries.advanced);
-                this.setPeriodSelectValue(queries.basic ? queries.basic : queries.advanced);
-            }
-        }).then((resQueries) => {
-            let storedQuery = {
-                id: this.filterId,
-                basicQueryValue: queries.basic,
-                advancedQueryValue: queries.advanced,
-                groupedQueryValue: queries.grouped
+    onSearchClicked(source = 'user-click', preBuiltQuery) {
+        let queries = preBuiltQuery ? this.cloneDeep(preBuiltQuery) : this.buildQueryFromControls(source);
+        if (!preBuiltQuery) {
+            queries = this.normalizeQueryForEmit(queries, true);
+        }
+        else {
+            queries.options = {
+                ...(queries.options ?? {}),
+                source,
             };
-            this.setEmtpyArraysToNull(queries.basic ? queries.basic : queries.advanced);
-            if (storedQuery.advancedQueryValue && storedQuery.advancedQueryValue.rules == 0) {
-                //Do nothing
-            }
-            else {
-                this.sessionStorage.setLastFilterPanelQuery(this.tenantId, storedQuery);
-            }
-            this.keepLocalDateFilterOperationHandle(queries.basic ? queries.basic : queries.advanced);
-        }).then((resQueries) => {
-            queries = this.deleteFieldsWithoutValue(queries);
-            queries = this.handleEmptyFieldsQuery(queries);
-            if (queries.advanced) {
-                queries.advanced = this.modifyTreeListValueParentToNull(queries.advanced);
-            }
-            else {
-                queries.basic = this.modifyTreeListValueParentToNull(queries.basic);
-            }
-            this.searchClicked.emit(queries);
-        }).then(() => {
-            this.inverseNullableFilterOperationHandle(this.advancedQueryCtrl.value);
-        })
-            .catch((error) => {
-            console.error("Error en la promesa:", error);
-        });
+        }
+        this.searchClicked.emit(queries);
     }
     setNoFiltersQueryType(queries) {
         return new Promise((resolve, reject) => {
@@ -5680,14 +5693,23 @@ class WFilterPanelComponent {
         }
     }
     handleEmptyFieldsQuery(queries) {
-        if (queries.advanced != null && queries.advanced?.rules.length == 0) {
-            queries.type = 0;
+        const basicHasRules = !!queries.basic?.rules?.length;
+        const advancedHasRules = !!queries.advanced?.rules?.length;
+        const groupedHasRules = !!queries.grouped?.rules?.length;
+        if (groupedHasRules) {
+            queries.type = QueryResultType.Grouped;
+        }
+        else if (advancedHasRules) {
+            queries.type = QueryResultType.Advanced;
         }
-        if (queries.basic != null && queries.basic?.rules.length == 0) {
-            queries.type = 0;
+        else if (basicHasRules) {
+            queries.type = QueryResultType.Basic;
+        }
+        else {
+            queries.type = QueryResultType.NoFilters;
         }
-        if (queries.grouped != null && queries.grouped?.rules.length == 0) {
-            queries.type = 0;
+        if (queries.grouped && !groupedHasRules) {
+            queries.grouped = null;
         }
         return queries;
     }
@@ -5744,7 +5766,7 @@ class WFilterPanelComponent {
         }
     }
     keepLocalDateFilterOperationHandle(query) {
-        if (this.fieldsToKeepLocalDate.length > 0) {
+        if (this.fieldsToKeepLocalDate.length > 0 && query) {
             if ("rules" in query) {
                 query.rules.forEach((rule) => {
                     this.keepLocalDateFilterOperationHandle(rule);
@@ -5879,7 +5901,7 @@ class WFilterPanelComponent {
             return QueryResultType.Basic;
         }
         else {
-            if (this.isAdvancedSearch && this.groupedQueryCtrl?.value) {
+            if (this.isAdvancedSearch && this.groupedQueryCtrl?.value?.rules?.length) {
                 return QueryResultType.Grouped;
             }
             else {