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

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

@@ -1,5 +1,5 @@
 import { plainToInstance } from 'class-transformer';
-import { map, takeUntil, debounceTime, switchMap, distinctUntilChanged } from 'rxjs/operators';
+import { map, takeUntil, debounceTime, switchMap, distinctUntilChanged, withLatestFrom } from 'rxjs/operators';
 import { HttpParams } from '@angular/common/http';
 import * as i5 from '@recursyve/nice-ui-kit.v2';
 import { isNullOrUndefined, ObjectUtils, FileUtils, ArrayUtils, ExportBottomSheetComponent, NiceLoadingSpinnerModule, NiceTypeaheadModule, NiceExportBottomSheetModule, NiceAsyncTypeaheadProvider, NICE_ASYNC_TYPEAHEAD_PROVIDER, NiceAsyncTypeaheadModule } from '@recursyve/nice-ui-kit.v2';
@@ -3053,8 +3053,10 @@ class NiceFilterViewService {
         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);
@@ -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,7 +3089,7 @@ class NiceFilterViewService {
             }
         }
         else {
-            newRules = [...newRules, query];
+            newRules = [...newRules, rule];
         }
         this.setRules({
             condition: currentQuery.condition,
@@ -3168,6 +3170,7 @@ class AdvancedFiltersUtils {
                     ...base,
                     value: AdvancedFiltersUtils.isDoubleInput(operator) ? ["", ""] : ""
                 };
+            case FilterType.Number:
             case FilterType.Select:
                 return {
                     ...base,
@@ -3185,11 +3188,6 @@ class AdvancedFiltersUtils {
                         ? [config.options?.[0].key, config.options?.[0].key]
                         : config.options?.[0].key
                 };
-            case FilterType.Number:
-                return {
-                    ...base,
-                    value: AdvancedFiltersUtils.isDoubleInput(operator) ? [0, 0] : 0
-                };
         }
     }
 }
@@ -3362,7 +3360,10 @@ class NiceAdvancedFiltersButtonComponent {
         this.query = query;
         this.service = service;
         this.shouldShowAdvancedFilters$ = this.query.selectSubState("showAdvancedFilters");
-        this.hasParameters$ = this.query.selectFilterParameters().pipe(map((parameter) => !!parameter.rules?.length));
+        this.hasParameters$ = this.query.selectFilterParameters().pipe(withLatestFrom(this.query.selectFilterConfig()), map(([parameter, config]) => !!parameter
+            .rules
+            ?.filter((rule) => config.some((conf) => conf.id === rule.rules[0].id))
+            ?.length));
     }
     clickToggleShowAdvancedFilters() {
         this.service.updateSubState("showAdvancedFilters", !this.query.getSubState("showAdvancedFilters"));
@@ -4314,7 +4315,10 @@ class NiceFilterQueryParamsDirective {
             const { filterParameters, filterResult } = this.query.getValue();
             if (FilterUtils.filterChangeNeedsRefresh(filterParameters, params) ||
                 !filterResult) {
-                this.service.setParameters(params);
+                this.service.setParameters({
+                    ...params,
+                    fallbackOrder: filterParameters.fallbackOrder
+                });
             }
             if (!this._initialized) {
                 this._initialized = true;