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

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,7 +3046,7 @@ class NiceFilterViewService {
             this.filter();
         }
     }
-    setRules(rules, reload) {
+    setRules(rules) {
         if (!Array.isArray(rules)) {
             rules = [rules];
         }
@@ -3057,9 +3057,9 @@ class NiceFilterViewService {
             length: filterParameters.length,
             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 +3068,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);
@@ -3092,9 +3092,9 @@ class NiceFilterViewService {
         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 +3105,7 @@ class NiceFilterViewService {
         this.setRules({
             condition: currentQuery.condition,
             rules: newRules
-        }, reload);
+        });
     }
     addValue(value, opts) {
         this.store.addValue(value, opts);
@@ -3369,7 +3369,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);
     }
 }
@@ -3394,7 +3394,7 @@ __decorate([
 ], FilterFormValues.prototype, "value", void 0);
 __decorate([
     Control(),
-    AddValidatorIf(({ parent }) => parent.needsTwoValues, Validators.required),
+    AddValidatorIf(({ parent }) => QBFilterUtils.isDoubleInput(parent.operation), Validators.required),
     __metadata("design:type", Object)
 ], FilterFormValues.prototype, "secondValue", void 0);
 class FilterForm {
@@ -3409,7 +3409,6 @@ class FilterForm {
                 id: rule.id,
                 operation: rule.operation,
                 condition: "or",
-                needsTwoValues,
                 values: [
                     {
                         value: needsTwoValues ? rule.value[0] : rule.value,
@@ -3429,7 +3428,6 @@ class FilterForm {
             id: firstRule.id,
             operation: firstRule.operation,
             condition: query.condition,
-            needsTwoValues: firstRuleNeedsTwoValues,
             values: query.rules.map((rule) => ({
                 value: firstRuleNeedsTwoValues ? rule.value[0] : rule.value,
                 secondValue: firstRuleNeedsTwoValues ? rule.value[1] : undefined
@@ -3443,7 +3441,7 @@ class FilterForm {
             return {
                 id: this.id,
                 operation: this.operation,
-                value: this.needsTwoValues ? [value.value, value.secondValue] : value.value
+                value: QBFilterUtils.isDoubleInput(this.operation) ? [value.value, value.secondValue] : value.value
             };
         }
         return {
@@ -3451,7 +3449,7 @@ class FilterForm {
             rules: this.values.map((value) => ({
                 id: this.id,
                 operation: this.operation,
-                value: this.needsTwoValues ? [value.value, value.secondValue] : value.value
+                value: QBFilterUtils.isDoubleInput(this.operation) ? [value.value, value.secondValue] : value.value
             }))
         };
     }
@@ -3466,10 +3464,6 @@ __decorate([
     Required(),
     __metadata("design:type", String)
 ], FilterForm.prototype, "operation", void 0);
-__decorate([
-    Control(),
-    __metadata("design:type", Boolean)
-], FilterForm.prototype, "needsTwoValues", void 0);
 __decorate([
     Control(),
     Required(),
@@ -3778,7 +3772,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();
         }
     }
@@ -3786,7 +3781,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 });
@@ -4084,12 +4081,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 });
@@ -4123,7 +4124,8 @@ class NiceFilterSearchComponent {
             this.service.setParameters({
                 ...filterParameters,
                 search
-            }, true);
+            });
+            this.service.filter();
         }))
             .subscribe();
     }
@@ -4170,7 +4172,8 @@ class NiceFilterMatPaginatorPaginationDirective {
                 ...filterParameters,
                 start: page.pageIndex * page.pageSize,
                 length: page.pageSize
-            }, true);
+            });
+            this.service.filter();
         });
     }
     ngOnDestroy() {
@@ -4211,7 +4214,7 @@ class NiceFilterMatSortSortingDirective {
                 this.service.setParameters({
                     ...values,
                     order: {}
-                }, true);
+                });
             }
             else {
                 this.service.setParameters({
@@ -4220,8 +4223,9 @@ class NiceFilterMatSortSortingDirective {
                         column: sort.active,
                         direction: sort.direction
                     }
-                }, true);
+                });
             }
+            this.service.filter();
         });
     }
     ngOnDestroy() {
@@ -4310,7 +4314,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;
@@ -4400,21 +4404,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();