@recursyve/nice-data-filter-kit 15.1.1 → 15.3.0

package/lib/components/nice-filter-view/components/advanced-filters/advanced-filters.component.d.ts

@@ -22,6 +22,7 @@ export declare class NiceAdvancedFiltersComponent implements OnInit {
     onClickDeleteRule(index: number): void;
     onClose(): void;
     onRefresh(): void;
+    removeEmptyRules(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<NiceAdvancedFiltersComponent, [{ optional: true; }, null, null, null, null]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<NiceAdvancedFiltersComponent, "nice-advanced-filters", never, {}, {}, never, never, false, never>;
 }

package/lib/components/nice-filter-view/components/export-buttons/export-buttons.component.d.ts

@@ -10,7 +10,6 @@ export declare class NiceFilterExportButtonsComponent {
     icons: NiceBaseIconOptions;
     private readonly exportsSettings;
     private niceFilterViewQuery;
-    private niceFilterViewService;
     private selectableListService;
     private query;
     private service;
@@ -19,7 +18,7 @@ export declare class NiceFilterExportButtonsComponent {
     downloadFileName: string;
     canPrint: boolean;
     loading$: import("rxjs").Observable<boolean>;
-    constructor(icons: NiceBaseIconOptions, exportsSettings: ExportSettings, niceFilterViewQuery: NiceFilterViewQuery, niceFilterViewService: NiceFilterViewService, selectableListService: NiceSelectableListService, query: NiceFilterViewQuery, service: NiceFilterViewService, bottomSheet: MatBottomSheet);
+    constructor(icons: NiceBaseIconOptions, exportsSettings: ExportSettings, niceFilterViewQuery: NiceFilterViewQuery, selectableListService: NiceSelectableListService, query: NiceFilterViewQuery, service: NiceFilterViewService, bottomSheet: MatBottomSheet);
     clickExport(): void;
     clickXlsx(ids?: number[]): void;
     clickCsv(ids?: number[]): void;

package/lib/components/nice-filter-view/directives/mat-paginator.d.ts

@@ -1,16 +1,11 @@
-import { OnDestroy, OnInit } from "@angular/core";
+import { OnInit } from "@angular/core";
 import { MatPaginator } from "@angular/material/paginator";
-import { NiceFilterViewQuery } from "../store/nice-filter-view.query";
-import { NiceFilterViewService } from "../store/nice-filter-view.service";
+import { NiceNestedFilterView } from "../nice-nested-filter-view";
 import * as i0 from "@angular/core";
-export declare class NiceFilterMatPaginatorPaginationDirective implements OnInit, OnDestroy {
-    private query;
-    private service;
+export declare class NiceFilterMatPaginatorPaginationDirective extends NiceNestedFilterView implements OnInit {
     private paginator;
-    private unsubscribeAll$;
-    constructor(query: NiceFilterViewQuery, service: NiceFilterViewService, paginator: MatPaginator);
+    constructor(paginator: MatPaginator);
     ngOnInit(): void;
-    ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<NiceFilterMatPaginatorPaginationDirective, never>;
     static ɵdir: i0.ɵɵDirectiveDeclaration<NiceFilterMatPaginatorPaginationDirective, "mat-paginator[niceFilterPagination]", never, {}, {}, never, never, false, never>;
 }

package/lib/components/nice-filter-view/directives/mat-sort.d.ts

@@ -1,16 +1,11 @@
-import { OnDestroy, OnInit } from "@angular/core";
+import { OnInit } from "@angular/core";
 import { MatSort } from "@angular/material/sort";
-import { NiceFilterViewQuery } from "../store/nice-filter-view.query";
-import { NiceFilterViewService } from "../store/nice-filter-view.service";
+import { NiceNestedFilterView } from "../nice-nested-filter-view";
 import * as i0 from "@angular/core";
-export declare class NiceFilterMatSortSortingDirective implements OnInit, OnDestroy {
-    private query;
-    private service;
+export declare class NiceFilterMatSortSortingDirective extends NiceNestedFilterView implements OnInit {
     private sort;
-    private unsubscribeAll$;
-    constructor(query: NiceFilterViewQuery, service: NiceFilterViewService, sort: MatSort);
+    constructor(sort: MatSort);
     ngOnInit(): void;
-    ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<NiceFilterMatSortSortingDirective, never>;
     static ɵdir: i0.ɵɵDirectiveDeclaration<NiceFilterMatSortSortingDirective, "mat-table[matSort][niceFilterSorting]", never, {}, {}, never, never, false, never>;
 }

package/lib/components/nice-filter-view/models/order-options.model.d.ts

@@ -0,0 +1,7 @@
+export interface OrderColumnOptions {
+    column?: string;
+    nullLast?: boolean;
+}
+export interface OrderOptions {
+    [order: string]: OrderColumnOptions;
+}

package/lib/components/nice-filter-view/nice-base-filter-view.component.d.ts

@@ -5,6 +5,7 @@ import { QueryModel, QueryRuleModel, RuleModel } from "../../models/query.model"
 import { NiceFilterService } from "../base-list/providers/base-filter.service";
 import { NiceAdvancedFiltersButtonComponent } from "./components/advanced-filters/button/advanced-filters-button.component";
 import { NiceFilterQueryParamsDirective } from "./directives/query-params.directive";
+import { AfterQueryParamLoadedCallback } from "./nice-nested-filter-view";
 import { NiceFilterViewQuery } from "./store/nice-filter-view.query";
 import { NiceFilterViewService } from "./store/nice-filter-view.service";
 import * as i0 from "@angular/core";
@@ -20,6 +21,7 @@ export declare abstract class NiceBaseFilterViewComponent<Filter extends NiceFil
     protected advancedFiltersButton: NiceAdvancedFiltersButtonComponent;
     private advancedFilters;
     private selectableListDirective;
+    private readonly _afterQueryParamHooks;
     filterViewLoading$: Observable<boolean>;
     filterViewCount$: Observable<number>;
     ngOnInit(autoLoad?: boolean, { mode, loadConfig, configQueryParams }?: NiceBaseFilterViewInitOptions): void;
@@ -44,6 +46,21 @@ export declare abstract class NiceBaseFilterViewComponent<Filter extends NiceFil
      * NOTE: These rules will be injected in each filter request.
      */
     setBaseRules(rule: (QueryRuleModel | QueryModel)[], reload?: boolean): void;
+    /**
+     * Add a rule to the set of rules that won't be saved in the current filterParameters config.
+     * NOTE: These rules will be injected in each filter request.
+     */
+    addBaseRule(rule: QueryRuleModel, reload?: boolean): void;
+    /**
+     * Add a rule to the set of rules that won't be saved in the current filterParameters config.
+     * NOTE: These rules will be injected in each filter request.
+     */
+    upsertBaseRule(rule: QueryRuleModel, reload?: boolean): void;
+    /**
+     * Remove a rule to the set of rules that won't be saved in the current filterParameters config.
+     * NOTE: These rules will be injected in each filter request.
+     */
+    removeBaseRule(id: string, reload?: boolean): void;
     /**
      * Reset all rules with a new set of rules.
      */
@@ -58,8 +75,10 @@ export declare abstract class NiceBaseFilterViewComponent<Filter extends NiceFil
      * NOTE: This will only check for rules in the first element of the rules array in the current filterParameters.
      */
     removeRule(id: string, reload?: boolean): void;
+    protected afterInit(fn: AfterQueryParamLoadedCallback): void;
     private autoLoad;
     private loadConfig;
+    private onInit;
     static ɵfac: i0.ɵɵFactoryDeclaration<NiceBaseFilterViewComponent<any>, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<NiceBaseFilterViewComponent<any>, "ng-component", never, {}, {}, never, never, false, never>;
 }

package/lib/components/nice-filter-view/nice-nested-filter-view.d.ts

@@ -0,0 +1,23 @@
+import { OnDestroy, OnInit } from "@angular/core";
+import { Observable, Subject } from "rxjs";
+import { NiceFilterService } from "../base-list/providers/base-filter.service";
+import { NiceFilterQueryParamsDirective } from "./directives/query-params.directive";
+import { NiceFilterViewQuery } from "./store/nice-filter-view.query";
+import { NiceFilterViewService } from "./store/nice-filter-view.service";
+import * as i0 from "@angular/core";
+export type AfterQueryParamLoadedCallback = () => void;
+export declare abstract class NiceNestedFilterView<Filter extends NiceFilterService<any> = NiceFilterService<any>> implements OnInit, OnDestroy {
+    private readonly _afterQueryParamHooks;
+    protected unsubscribeAll$: Subject<void>;
+    protected filterViewService: NiceFilterViewService<Filter>;
+    protected filterViewQuery: NiceFilterViewQuery;
+    protected queryParams: NiceFilterQueryParamsDirective | null;
+    filterViewLoading$: Observable<boolean>;
+    filterViewCount$: Observable<number>;
+    ngOnInit(): void;
+    ngOnDestroy(): void;
+    protected afterInit(fn: AfterQueryParamLoadedCallback): void;
+    private onInit;
+    static ɵfac: i0.ɵɵFactoryDeclaration<NiceNestedFilterView<any>, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<NiceNestedFilterView<any>, never, never, {}, {}, never, never, false, never>;
+}

package/lib/components/nice-filter-view/public-api.d.ts

@@ -14,3 +14,4 @@ export * from "./store/nice-filter-view.query";
 export * from "./nice-base-filter-view.component";
 export * from "./nice-filter-view.component";
 export * from "./nice-filter-view.module";
+export * from "./nice-nested-filter-view";

package/lib/components/nice-filter-view/store/nice-filter-view.service.d.ts

@@ -25,9 +25,13 @@ export declare class NiceFilterViewService<Filter extends NiceFilterService<any>
      */
     setParameters(filterParameters: FilterParametersModel, reload: boolean): void;
     setParameters(filterParameters: FilterParametersModel): void;
+    patchParameters(filterParameters: FilterParametersModel): void;
     resetPaging(): void;
     setQueryParams(queryParams: QueryParams): void;
     setBaseRules(rule: (QueryRuleModel | QueryModel)[], reload: boolean): void;
+    addBaseRule(rule: QueryRuleModel, reload: boolean): void;
+    upsertBaseRules(rule: QueryRuleModel, reload: boolean): void;
+    removeBaseRules(key: string, reload: boolean): void;
     setRules(rules: QueryModel | QueryModel[]): void;
     upsertRule(id: string, newRule: RuleModel): void;
     removeRule(id: string): void;

package/lib/components/nice-filter-view/store/nice-filter-view.store.d.ts

@@ -4,6 +4,7 @@ import { StoreConfigOptions } from "@datorama/akita/src/lib/storeConfig";
 import { QueryParams } from "../../../api/filter.api";
 import { FilterConfigurationModel, FilterParametersModel, FilterResultModel } from "../../../models/filter.model";
 import { QueryModel, QueryRuleModel } from "../../../models/query.model";
+import { OrderOptions } from "../models/order-options.model";
 import * as i0 from "@angular/core";
 export interface NiceFilterViewState extends EntityState {
     subStates: HashMap<any>;
@@ -16,7 +17,8 @@ export interface NiceFilterViewState extends EntityState {
     filterResult: FilterResultModel | null;
     filterParameters: FilterParametersModel;
     baseRules: (QueryRuleModel | QueryModel)[];
-    queryParams: QueryParams;
+    queryParams: QueryParams | null;
+    orderColumns: OrderOptions | null;
     resetResult: boolean;
 }
 export declare const initialValue: NiceFilterViewState;
@@ -24,6 +26,7 @@ export declare class NiceFilterViewStore extends EntityStore<NiceFilterViewState
     constructor(state: Partial<NiceFilterViewState>, store: StoreConfigOptions);
     setFilterConfigLoading(loading: boolean): void;
     setParameters(filterParameters: FilterParametersModel): void;
+    patchParameters(filterParameters: FilterParametersModel): void;
     setResult(filterResult: FilterResultModel): void;
     addValue(value: any, opts?: AddEntitiesOptions): void;
     addValues(values: any[], opts?: AddEntitiesOptions): void;

package/lib/models/filter.model.d.ts

@@ -1,14 +1,14 @@
 import { QueryModel } from "./query.model";
 export interface FilterParametersModel {
-    start?: number;
-    length?: number;
+    start?: number | null;
+    length?: number | null;
     order?: OrderModel | null;
-    fallbackOrder?: OrderModel | OrderModel[];
-    search?: string;
-    rules?: QueryModel[];
-    draw?: number;
-    data?: object;
-    groupBy?: string;
+    fallbackOrder?: OrderModel | OrderModel[] | null;
+    search?: string | null;
+    rules?: QueryModel[] | null;
+    draw?: number | null;
+    data?: object | null;
+    groupBy?: string | null;
 }
 export interface FilterPageMode {
     number: number;
@@ -18,9 +18,9 @@ export interface FilterSearchModel {
     value: string;
 }
 export interface OrderModel {
-    column?: string;
-    direction?: "asc" | "desc";
-    nullLast?: boolean;
+    column?: string | null;
+    direction?: "asc" | "desc" | null;
+    nullLast?: boolean | null;
 }
 export interface FilterQueryModel {
     page?: FilterPageMode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@recursyve/nice-data-filter-kit",
-  "version": "15.1.1",
+  "version": "15.3.0",
   "exports": {
     ".": {
       "sass": "./_index.scss",