@recursyve/nice-data-filter-kit 15.2.0 → 15.3.1

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

@@ -2770,6 +2770,7 @@ const initialValue = {
     },
     baseRules: [],
     queryParams: null,
+    orderColumns: null,
     resetResult: false
 };
 class NiceFilterViewStore extends EntityStore {
@@ -3293,83 +3294,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                     args: [NiceFilterService]
                 }] }]; }, propDecorators: { resetResult: [] } });
 
-class AdvancedFiltersUtils {
-    static isSingleInput(filterOperator) {
-        if (!filterOperator) {
-            return false;
-        }
-        return AdvancedFiltersUtils.singleInputOperators.includes(filterOperator);
-    }
-    static isDoubleInput(filterOperator) {
-        if (!filterOperator) {
-            return false;
-        }
-        return AdvancedFiltersUtils.doubleInputOperators.includes(filterOperator);
-    }
-    static isNoInput(filterOperator) {
-        if (!filterOperator) {
-            return false;
-        }
-        return AdvancedFiltersUtils.noInputOperators.includes(filterOperator);
-    }
-    static createRule(config, operator) {
-        const base = {
-            id: config.id,
-            operation: operator || config.operators[0].id
-        };
-        switch (config.type) {
-            case FilterType.Text:
-                return {
-                    ...base,
-                    value: AdvancedFiltersUtils.isDoubleInput(operator) ? ["", ""] : ""
-                };
-            case FilterType.Number:
-            case FilterType.Select:
-                return {
-                    ...base,
-                    value: AdvancedFiltersUtils.isDoubleInput(operator) ? [null, null] : null
-                };
-            case FilterType.Date:
-                return {
-                    ...base,
-                    value: AdvancedFiltersUtils.isDoubleInput(operator) ? [new Date(), new Date()] : new Date()
-                };
-            case FilterType.Radio:
-                return {
-                    ...base,
-                    value: AdvancedFiltersUtils.isDoubleInput(operator)
-                        ? [config.options?.[0].key, config.options?.[0].key]
-                        : config.options?.[0].key
-                };
-        }
-    }
-}
-AdvancedFiltersUtils.noInputOperators = [
-    FilterOperatorTypes.IsEmpty,
-    FilterOperatorTypes.IsNotEmpty,
-    FilterOperatorTypes.IsNull,
-    FilterOperatorTypes.IsNotNull,
-    FilterOperatorTypes.None
-];
-AdvancedFiltersUtils.singleInputOperators = [
-    FilterOperatorTypes.Equal,
-    FilterOperatorTypes.NotEqual,
-    FilterOperatorTypes.Less,
-    FilterOperatorTypes.LessOrEqual,
-    FilterOperatorTypes.Greater,
-    FilterOperatorTypes.GreaterOrEqual,
-    FilterOperatorTypes.BeginsWith,
-    FilterOperatorTypes.NotBeginsWith,
-    FilterOperatorTypes.EndsWith,
-    FilterOperatorTypes.NotEndsWith,
-    FilterOperatorTypes.Contains,
-    FilterOperatorTypes.NotContains
-];
-AdvancedFiltersUtils.doubleInputOperators = [
-    FilterOperatorTypes.Between,
-    FilterOperatorTypes.NotBetween
-];
-
 const ADVANCED_FILTER_ICONS = new InjectionToken("advanced_filter_icons");
 
 class NiceFilterGroupIconPipe {
@@ -3522,9 +3446,8 @@ class NiceAdvancedFiltersButtonComponent {
         this.service.updateSubState("showAdvancedFilters", !this.query.getSubState("showAdvancedFilters"));
     }
     onSelectedFilter(filter) {
-        const rule = AdvancedFiltersUtils.createRule(filter);
-        this.service.setRules([{ condition: "and", rules: [rule] }]);
         this.service.updateSubState("showAdvancedFilters", true);
+        this.service.updateSubState("selectedFilter", filter);
     }
 }
 NiceAdvancedFiltersButtonComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: NiceAdvancedFiltersButtonComponent, deps: [{ token: ADVANCED_FILTER_ICONS, optional: true }, { token: NiceFilterViewQuery }, { token: NiceFilterViewService }], target: i0.ɵɵFactoryTarget.Component });
@@ -3682,6 +3605,83 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
             type: Injectable
         }], ctorParameters: function () { return [{ type: NiceFilterService }]; } });
 
+class AdvancedFiltersUtils {
+    static isSingleInput(filterOperator) {
+        if (!filterOperator) {
+            return false;
+        }
+        return AdvancedFiltersUtils.singleInputOperators.includes(filterOperator);
+    }
+    static isDoubleInput(filterOperator) {
+        if (!filterOperator) {
+            return false;
+        }
+        return AdvancedFiltersUtils.doubleInputOperators.includes(filterOperator);
+    }
+    static isNoInput(filterOperator) {
+        if (!filterOperator) {
+            return false;
+        }
+        return AdvancedFiltersUtils.noInputOperators.includes(filterOperator);
+    }
+    static createRule(config, operator) {
+        const base = {
+            id: config.id,
+            operation: operator || config.operators[0].id
+        };
+        switch (config.type) {
+            case FilterType.Text:
+                return {
+                    ...base,
+                    value: AdvancedFiltersUtils.isDoubleInput(operator) ? ["", ""] : ""
+                };
+            case FilterType.Number:
+            case FilterType.Select:
+                return {
+                    ...base,
+                    value: AdvancedFiltersUtils.isDoubleInput(operator) ? [null, null] : null
+                };
+            case FilterType.Date:
+                return {
+                    ...base,
+                    value: AdvancedFiltersUtils.isDoubleInput(operator) ? [new Date(), new Date()] : new Date()
+                };
+            case FilterType.Radio:
+                return {
+                    ...base,
+                    value: AdvancedFiltersUtils.isDoubleInput(operator)
+                        ? [config.options?.[0].key, config.options?.[0].key]
+                        : config.options?.[0].key
+                };
+        }
+    }
+}
+AdvancedFiltersUtils.noInputOperators = [
+    FilterOperatorTypes.IsEmpty,
+    FilterOperatorTypes.IsNotEmpty,
+    FilterOperatorTypes.IsNull,
+    FilterOperatorTypes.IsNotNull,
+    FilterOperatorTypes.None
+];
+AdvancedFiltersUtils.singleInputOperators = [
+    FilterOperatorTypes.Equal,
+    FilterOperatorTypes.NotEqual,
+    FilterOperatorTypes.Less,
+    FilterOperatorTypes.LessOrEqual,
+    FilterOperatorTypes.Greater,
+    FilterOperatorTypes.GreaterOrEqual,
+    FilterOperatorTypes.BeginsWith,
+    FilterOperatorTypes.NotBeginsWith,
+    FilterOperatorTypes.EndsWith,
+    FilterOperatorTypes.NotEndsWith,
+    FilterOperatorTypes.Contains,
+    FilterOperatorTypes.NotContains
+];
+AdvancedFiltersUtils.doubleInputOperators = [
+    FilterOperatorTypes.Between,
+    FilterOperatorTypes.NotBetween
+];
+
 class FilterComponent {
     constructor() {
         this.propagateChanges = (_) => { };
@@ -3914,10 +3914,17 @@ class NiceAdvancedFiltersComponent {
         this.rules$ = this.rulesFormArray.valueChanges.pipe(startWith(this.rulesFormArray.value));
     }
     ngOnInit() {
-        const { filterParameters } = this.query.getValue();
+        const { filterParameters, subStates } = this.query.getValue();
         if (filterParameters.rules?.length) {
             this.formGroup.patchValue(new AdvancedFiltersForm(filterParameters.rules[0]));
         }
+        if (subStates.selectedFilter) {
+            this.onClickAddRule(subStates.selectedFilter);
+            return;
+        }
+    }
+    ngOnDestroy() {
+        this.removeEmptyRules({ reload: false });
     }
     onClickAddRule(filterConfigurationModel) {
         this.rulesFormArray.push(new FilterForm(AdvancedFiltersUtils.createRule(filterConfigurationModel)));
@@ -3940,7 +3947,7 @@ class NiceAdvancedFiltersComponent {
         this.service.resetResult(true);
         this.service.filter();
     }
-    removeEmptyRules() {
+    removeEmptyRules({ reload } = { reload: true }) {
         if (this.rulesFormArray.length !== 1) {
             return;
         }
@@ -3958,6 +3965,9 @@ class NiceAdvancedFiltersComponent {
             return;
         }
         this.service.setRules([]);
+        if (!reload) {
+            return;
+        }
         if (filterParameters.rules[0].rules[0].value) {
             this.service.filter();
         }
@@ -4810,6 +4820,8 @@ class NiceFilterMatSortSortingDirective extends NiceNestedFilterView {
             this.sort.active = order.column;
         });
         this.sort.sortChange.pipe(takeUntil(this.unsubscribeAll$)).subscribe((sort) => {
+            const { orderColumns } = this.filterViewQuery.getValue();
+            const column = orderColumns?.[sort.active];
             if (!sort.direction) {
                 this.filterViewService.patchParameters({
                     order: null
@@ -4818,8 +4830,9 @@ class NiceFilterMatSortSortingDirective extends NiceNestedFilterView {
             else {
                 this.filterViewService.patchParameters({
                     order: {
-                        column: sort.active,
-                        direction: sort.direction
+                        column: column?.column ?? sort.active,
+                        direction: sort.direction,
+                        nullLast: column?.nullLast
                     }
                 });
             }