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

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

@@ -3083,7 +3083,7 @@ class NiceFilterViewService {
             }
         });
     }
-    setParameters(filterParameters, reload = false) {
+    setParameters(filterParameters, reload) {
         this.store.setParameters(filterParameters);
         if (reload) {
             this.filter();
@@ -3091,7 +3091,7 @@ class NiceFilterViewService {
     }
     resetPaging() {
         const { filterParameters } = this.store.getValue();
-        this.setParameters(Object.assign(Object.assign({}, filterParameters), { start: 0 }), false);
+        this.setParameters(Object.assign(Object.assign({}, filterParameters), { start: 0 }));
         this.resetResult(true);
     }
     setQueryParams(queryParams) {
@@ -3105,7 +3105,7 @@ class NiceFilterViewService {
             this.filter();
         }
     }
-    setRules(rules, reload) {
+    setRules(rules) {
         if (!Array.isArray(rules)) {
             rules = [rules];
         }
@@ -3116,16 +3116,16 @@ class NiceFilterViewService {
             length: filterParameters.length,
             rules
         };
-        this.setParameters(newRules, reload);
+        this.setParameters(newRules);
     }
-    upsertRule(id, newRule, reload) {
+    upsertRule(id, newRule) {
         var _a;
         const { filterParameters } = this.store.getValue();
         const currentQuery = (_a = filterParameters.rules) === null || _a === void 0 ? void 0 : _a[0];
         const rule = Object.assign({ id }, newRule);
         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);
@@ -3149,9 +3149,9 @@ class NiceFilterViewService {
         this.setRules({
             condition: currentQuery.condition,
             rules: newRules
-        }, reload);
+        });
     }
-    removeRule(id, reload) {
+    removeRule(id) {
         var _a;
         const { filterParameters } = this.store.getValue();
         const currentQuery = (_a = filterParameters.rules) === null || _a === void 0 ? void 0 : _a[0];
@@ -3163,7 +3163,7 @@ class NiceFilterViewService {
         this.setRules({
             condition: currentQuery.condition,
             rules: newRules
-        }, reload);
+        });
     }
     addValue(value, opts) {
         this.store.addValue(value, opts);
@@ -3350,7 +3350,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);
     }
 }
@@ -3765,7 +3765,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();
         }
     }
@@ -3773,7 +3774,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 });
@@ -4074,9 +4077,13 @@ class NiceFilterInfiniteScrollDataViewComponent {
     }
     loadNextPage() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { filterParameters } = this.query.getValue();
+            const { filterParameters, filterResult } = this.query.getValue();
             this.service.setMode("accumulated");
-            yield this.service.setParameters(Object.assign(Object.assign({}, filterParameters), { start: filterParameters.start + filterParameters.length }), true);
+            if (filterResult && filterResult.values.length >= filterResult.total) {
+                return;
+            }
+            this.service.setParameters(Object.assign(Object.assign({}, filterParameters), { start: filterParameters.start + filterParameters.length }));
+            this.service.filter();
         });
     }
 }
@@ -4108,7 +4115,8 @@ class NiceFilterSearchComponent {
                 this.service.resetPaging();
             }
             const { filterParameters } = this.query.getValue();
-            this.service.setParameters(Object.assign(Object.assign({}, filterParameters), { search }), true);
+            this.service.setParameters(Object.assign(Object.assign({}, filterParameters), { search }));
+            this.service.filter();
         }))
             .subscribe();
     }
@@ -4153,7 +4161,8 @@ class NiceFilterMatPaginatorPaginationDirective {
         });
         this.paginator.page.pipe(takeUntil(this.unsubscribeAll$)).subscribe((page) => {
             const { filterParameters } = this.query.getValue();
-            this.service.setParameters(Object.assign(Object.assign({}, filterParameters), { start: page.pageIndex * page.pageSize, length: page.pageSize }), true);
+            this.service.setParameters(Object.assign(Object.assign({}, filterParameters), { start: page.pageIndex * page.pageSize, length: page.pageSize }));
+            this.service.filter();
         });
     }
     ngOnDestroy() {
@@ -4191,14 +4200,15 @@ class NiceFilterMatSortSortingDirective {
             const { filterParameters } = this.query.getValue();
             if (!sort.direction) {
                 const { order } = filterParameters, values = __rest(filterParameters, ["order"]);
-                this.service.setParameters(Object.assign(Object.assign({}, values), { order: {} }), true);
+                this.service.setParameters(Object.assign(Object.assign({}, values), { order: {} }));
             }
             else {
                 this.service.setParameters(Object.assign(Object.assign({}, filterParameters), { order: {
                         column: sort.active,
                         direction: sort.direction
-                    } }), true);
+                    } }));
             }
+            this.service.filter();
         });
     }
     ngOnDestroy() {
@@ -4287,7 +4297,7 @@ class NiceFilterQueryParamsDirective {
             const { filterParameters, filterResult } = this.query.getValue();
             if (FilterUtils.filterChangeNeedsRefresh(filterParameters, params) ||
                 !filterResult) {
-                this.service.setParameters(params, false);
+                this.service.setParameters(params);
             }
             if (!this._initialized) {
                 this._initialized = true;
@@ -4377,21 +4387,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();