@recursyve/nice-data-filter-kit 14.3.2 → 14.3.4

package/fesm2020/recursyve-nice-data-filter-kit.mjs

@@ -3021,7 +3021,7 @@ class NiceFilterViewService {
             this.store.setLoading(false);
         }
     }
-    setParameters(filterParameters, reload = false) {
+    setParameters(filterParameters, reload) {
         this.store.setParameters(filterParameters);
         if (reload) {
             this.filter();
@@ -3032,7 +3032,7 @@ class NiceFilterViewService {
         this.setParameters({
             ...filterParameters,
             start: 0
-        }, false);
+        });
         this.resetResult(true);
     }
     setQueryParams(queryParams) {
@@ -3046,20 +3046,22 @@ class NiceFilterViewService {
             this.filter();
         }
     }
-    setRules(rules, reload) {
+    setRules(rules) {
         if (!Array.isArray(rules)) {
             rules = [rules];
         }
         const { filterParameters } = this.store.getValue();
         const newRules = {
             order: filterParameters.order,
+            fallbackOrder: filterParameters.fallbackOrder,
             start: 0,
             length: filterParameters.length,
+            data: filterParameters.data,
             rules
         };
-        this.setParameters(newRules, reload);
+        this.setParameters(newRules);
     }
-    upsertRule(id, newRule, reload) {
+    upsertRule(id, newRule) {
         const { filterParameters } = this.store.getValue();
         const currentQuery = filterParameters.rules?.[0];
         const rule = {
@@ -3068,7 +3070,7 @@ class NiceFilterViewService {
         };
         const query = { rules: [rule], condition: "and" };
         if (!currentQuery || currentQuery.rules.length === 0) {
-            this.setRules(query, reload);
+            this.setRules(query);
             return;
         }
         const oldRule = currentQuery.rules.find((r) => r.id === id);
@@ -3078,7 +3080,7 @@ class NiceFilterViewService {
                 // Array replace
                 newRules = [
                     ...currentQuery.rules.slice(0, currentQuery.rules.indexOf(oldRule)),
-                    query,
+                    rule,
                     ...currentQuery.rules.slice(currentQuery.rules.indexOf(oldRule) + 1, currentQuery.rules.length)
                 ];
             }
@@ -3087,14 +3089,14 @@ class NiceFilterViewService {
             }
         }
         else {
-            newRules = [...newRules, query];
+            newRules = [...newRules, rule];
         }
         this.setRules({
             condition: currentQuery.condition,
             rules: newRules
-        }, reload);
+        });
     }
-    removeRule(id, reload) {
+    removeRule(id) {
         const { filterParameters } = this.store.getValue();
         const currentQuery = filterParameters.rules?.[0];
         const oldRule = currentQuery.rules.find((r) => r.id === id);
@@ -3105,7 +3107,7 @@ class NiceFilterViewService {
         this.setRules({
             condition: currentQuery.condition,
             rules: newRules
-        }, reload);
+        });
     }
     addValue(value, opts) {
         this.store.addValue(value, opts);
@@ -3369,7 +3371,7 @@ class NiceAdvancedFiltersButtonComponent {
     }
     onSelectedFilter(filter) {
         const rule = AdvancedFiltersUtils.createRule(filter);
-        this.service.setRules([{ condition: "and", rules: [rule] }], false);
+        this.service.setRules([{ condition: "and", rules: [rule] }]);
         this.service.updateSubState("showAdvancedFilters", true);
     }
 }
@@ -3772,7 +3774,8 @@ class NiceAdvancedFiltersComponent {
     onClickDeleteRule(index) {
         this.rulesFormArray.removeAt(index);
         if (!this.rulesFormArray.length) {
-            this.service.setRules([], true);
+            this.service.setRules([]);
+            this.service.filter();
             this.onClose();
         }
     }
@@ -3780,7 +3783,9 @@ class NiceAdvancedFiltersComponent {
         this.service.updateSubState("showAdvancedFilters", false);
     }
     onRefresh() {
-        this.service.setRules(this.formGroup.getRawValue().transform(), true);
+        this.service.setRules(this.formGroup.getRawValue().transform());
+        this.service.resetResult(true);
+        this.service.filter();
     }
 }
 NiceAdvancedFiltersComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: NiceAdvancedFiltersComponent, deps: [{ token: ADVANCED_FILTER_ICONS, optional: true }, { token: i1$3.GeneratedFormGroup }, { token: NiceFilterViewQuery }, { token: NiceFilterViewService }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
@@ -4078,12 +4083,16 @@ class NiceFilterInfiniteScrollDataViewComponent {
         this.data$ = this.query.selectAll();
     }
     async loadNextPage() {
-        const { filterParameters } = this.query.getValue();
+        const { filterParameters, filterResult } = this.query.getValue();
         this.service.setMode("accumulated");
-        await this.service.setParameters({
+        if (filterResult && filterResult.values.length >= filterResult.total) {
+            return;
+        }
+        this.service.setParameters({
             ...filterParameters,
             start: filterParameters.start + filterParameters.length
-        }, true);
+        });
+        this.service.filter();
     }
 }
 NiceFilterInfiniteScrollDataViewComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: NiceFilterInfiniteScrollDataViewComponent, deps: [{ token: NiceFilterViewQuery }, { token: NiceFilterViewService }], target: i0.ɵɵFactoryTarget.Component });
@@ -4117,7 +4126,8 @@ class NiceFilterSearchComponent {
             this.service.setParameters({
                 ...filterParameters,
                 search
-            }, true);
+            });
+            this.service.filter();
         }))
             .subscribe();
     }
@@ -4164,7 +4174,8 @@ class NiceFilterMatPaginatorPaginationDirective {
                 ...filterParameters,
                 start: page.pageIndex * page.pageSize,
                 length: page.pageSize
-            }, true);
+            });
+            this.service.filter();
         });
     }
     ngOnDestroy() {
@@ -4205,7 +4216,7 @@ class NiceFilterMatSortSortingDirective {
                 this.service.setParameters({
                     ...values,
                     order: {}
-                }, true);
+                });
             }
             else {
                 this.service.setParameters({
@@ -4214,8 +4225,9 @@ class NiceFilterMatSortSortingDirective {
                         column: sort.active,
                         direction: sort.direction
                     }
-                }, true);
+                });
             }
+            this.service.filter();
         });
     }
     ngOnDestroy() {
@@ -4304,7 +4316,10 @@ class NiceFilterQueryParamsDirective {
             const { filterParameters, filterResult } = this.query.getValue();
             if (FilterUtils.filterChangeNeedsRefresh(filterParameters, params) ||
                 !filterResult) {
-                this.service.setParameters(params, false);
+                this.service.setParameters({
+                    ...params,
+                    fallbackOrder: filterParameters.fallbackOrder
+                });
             }
             if (!this._initialized) {
                 this._initialized = true;
@@ -4394,21 +4409,30 @@ class NiceBaseFilterViewComponent {
      * Reset all rules with a new set of rules.
      */
     setRules(rules, reload = true) {
-        this.filterViewService.setRules(rules, reload);
+        this.filterViewService.setRules(rules);
+        if (reload) {
+            this.filterViewService.filter();
+        }
     }
     /**
      * Add or update a rule.
      * NOTE: This will only check for rules in the first element of the rules array in the current filterParameters.
      */
     upsertRule(id, newRule, reload = true) {
-        this.filterViewService.upsertRule(id, newRule, reload);
+        this.filterViewService.upsertRule(id, newRule);
+        if (reload) {
+            this.filterViewService.filter();
+        }
     }
     /**
      * Remove a rule.
      * NOTE: This will only check for rules in the first element of the rules array in the current filterParameters.
      */
     removeRule(id, reload = true) {
-        this.filterViewService.removeRule(id, reload);
+        this.filterViewService.removeRule(id);
+        if (reload) {
+            this.filterViewService.filter();
+        }
     }
     autoLoad(autoLoad) {
         const { autoLoad: defaultAutoLoad } = this.filterViewQuery.getValue();