@solidev/data 0.3.0 → 0.4.0

package/lib/dispedit/fkselect/fkselect.component.d.ts

@@ -1,4 +1,4 @@
-import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
+import { EventEmitter, OnInit } from '@angular/core';
 import { DataModel } from '../../data/data-model';
 import { FilterData, Queryset } from '../../data/data-query';
 import { Collection } from '../../data/data-collection';
@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
 import { UntypedFormControl } from '@angular/forms';
 import * as i0 from "@angular/core";
 export type TplFun<T extends DataModel> = (data: T) => string;
-export declare class FkselectComponent<T extends DataModel, R extends DataModel> implements OnInit, OnDestroy {
+export declare class FkselectComponent<T extends DataModel, R extends DataModel> implements OnInit {
     model?: T;
     field?: string;
     edit: boolean;
@@ -27,10 +27,9 @@ export declare class FkselectComponent<T extends DataModel, R extends DataModel>
     fc: UntypedFormControl;
     searchFn: (text$: Observable<string>) => Observable<any>;
     displayFn: (x: any) => any;
-    private _subscription;
     private _tpl;
+    private destroy$;
     constructor();
-    ngOnDestroy(): void;
     ngOnInit(): void;
     clearAction(): void;
     /**

package/lib/dispedit/flags/flags.component.d.ts

@@ -1,4 +1,4 @@
-import { OnDestroy, OnInit } from '@angular/core';
+import { OnInit } from '@angular/core';
 import { DataModel } from '../../data/data-model';
 import { Observable } from 'rxjs';
 import { FormControl } from '@angular/forms';
@@ -8,7 +8,7 @@ export interface IFlagItem {
     flag: string;
     count: number;
 }
-export declare class FlagsComponent<T extends DataModel> implements OnInit, OnDestroy {
+export declare class FlagsComponent<T extends DataModel> implements OnInit {
     private _msg;
     model: T;
     field: string;
@@ -25,9 +25,8 @@ export declare class FlagsComponent<T extends DataModel> implements OnInit, OnDe
     txtflag: string;
     selflag: string;
     flaglist: IFlagItem[];
-    private _subscriptions$;
+    private destroy$;
     constructor(_msg: DataMessageService);
-    ngOnDestroy(): void;
     ngOnInit(): Promise<any>;
     addFreeFlag(): Promise<any>;
     addFlag(flag: string): Promise<any>;

package/lib/dispedit/m2mselect/m2mselect.component.d.ts

@@ -1,4 +1,4 @@
-import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
+import { EventEmitter, OnInit } from '@angular/core';
 import { FilterData, Queryset } from '../../data/data-query';
 import { Collection } from '../../data/data-collection';
 import { ControlValueAccessor, UntypedFormControl } from '@angular/forms';
@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
 import { TplFun } from '../fkselect/fkselect.component';
 import { DataModel } from '../../data/data-model';
 import * as i0 from "@angular/core";
-export declare class M2mselectComponent<T extends DataModel, R extends DataModel> implements OnDestroy, OnInit, ControlValueAccessor {
+export declare class M2mselectComponent<T extends DataModel, R extends DataModel> implements OnInit, ControlValueAccessor {
     model?: T;
     field?: string;
     edit: boolean;
@@ -33,8 +33,8 @@ export declare class M2mselectComponent<T extends DataModel, R extends DataModel
     searchFn: (text$: Observable<string>) => Observable<any>;
     displayFn: (x: any) => any;
     private touched;
-    private _subscription;
     private _tpl;
+    private destroy$;
     /**
      * Control value accessor onChange dummy callback;
      * @param fks
@@ -44,10 +44,6 @@ export declare class M2mselectComponent<T extends DataModel, R extends DataModel
      * Control value accessor onTouched dummy callback;
      */
     onTouched: () => void;
-    /**
-     * On Destroy clears subscriptions.
-     */
-    ngOnDestroy(): void;
     /**
      * OnChange register from controlValueAccessor
      * @param onChange callback

package/lib/messages/message-zone/message-zone.component.d.ts

@@ -1,14 +1,13 @@
-import { OnDestroy, OnInit } from '@angular/core';
+import { OnInit } from '@angular/core';
 import { DataMessageService, Message } from '../message.service';
 import * as i0 from "@angular/core";
-export declare class MessageZoneComponent implements OnInit, OnDestroy {
+export declare class MessageZoneComponent implements OnInit {
     messages: DataMessageService;
     filter?: string;
     current: Message[];
-    private _subscriptions$;
+    private destroy$;
     constructor(messages: DataMessageService);
     ngOnInit(): void;
-    ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MessageZoneComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MessageZoneComponent, "data-message-zone", never, { "filter": { "alias": "filter"; "required": false; }; }, {}, never, never, true, never>;
 }

package/lib/modellist/model-list-fields/model-list-field-header/model-list-field-header.component.d.ts

@@ -1,10 +1,10 @@
-import { OnDestroy, OnInit } from '@angular/core';
+import { OnInit } from '@angular/core';
 import { ModelList } from '../../model-list.service';
 import { DataModel } from '../../../data/data-model';
 import { ModelListField } from '../model-list-fields';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
 import * as i0 from "@angular/core";
-export declare class ModelListFieldHeaderComponent<T extends DataModel> implements OnInit, OnDestroy {
+export declare class ModelListFieldHeaderComponent<T extends DataModel> implements OnInit {
     list: ModelList<T>;
     field: string;
     sort?: boolean;
@@ -15,10 +15,9 @@ export declare class ModelListFieldHeaderComponent<T extends DataModel> implemen
     mnu?: NgbDropdown;
     dispMenuMode: "hide" | "side" | "click";
     dispSortMode: "hide" | "side" | "click";
-    private _subscriptions$;
+    private destroy$;
     constructor();
     ngOnInit(): void;
-    ngOnDestroy(): void;
     disable(): void;
     enable(f: ModelListField): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ModelListFieldHeaderComponent<any>, never>;

package/lib/modellist/model-list-filters/filters/model-list-autocomplete-filter/model-list-autocomplete-filter.component.d.ts

@@ -1,11 +1,11 @@
-import { OnDestroy, OnInit } from '@angular/core';
+import { OnInit } from '@angular/core';
 import { ModelList } from '../../../model-list.service';
 import { ModelListAutocompleteFilter } from './model-list-autocomplete-filter';
 import { DataModel } from '../../../../data/data-model';
 import { Observable } from 'rxjs';
 import { UntypedFormControl } from '@angular/forms';
 import * as i0 from "@angular/core";
-export declare class ModelListAutocompleteFilterComponent<T extends DataModel> implements OnInit, OnDestroy {
+export declare class ModelListAutocompleteFilterComponent<T extends DataModel> implements OnInit {
     list: ModelList<any>;
     filter: ModelListAutocompleteFilter<T>;
     classes: string[] | string;
@@ -14,11 +14,10 @@ export declare class ModelListAutocompleteFilterComponent<T extends DataModel> i
     display: (x: any) => any;
     protected _resetAfterSet: boolean;
     private _tpl;
-    private _subscription;
+    private destroy$;
     constructor();
     ngOnInit(): void;
     disable(): void;
-    ngOnDestroy(): void;
     scrollAction($event: any): void;
     private _setDisplay;
     /**

package/lib/modellist/model-list-filters/model-list-filter-group.d.ts

@@ -0,0 +1,11 @@
+import { ModelListFilter } from './model-list-filter';
+export declare class ModelListFilterGroup {
+    name: string;
+    label: string;
+    desc: string;
+    position: number;
+    allowed: boolean;
+    enabled: boolean;
+    filters: ModelListFilter[];
+    constructor(params: Partial<ModelListFilterGroup>);
+}

package/lib/modellist/model-list-filters/model-list-filter.d.ts

@@ -2,6 +2,7 @@ import { FilterData } from '../../data/data-query';
 import { Observable, ReplaySubject } from 'rxjs';
 import { FILTER_TYPE } from './filters/filtertypes';
 import { IDispEditChoice } from '../../dispedit/dispedit/dispedit.constants';
+import { ModelListFilterGroup } from './model-list-filter-group';
 export interface ModelListFilterParams {
     name: string;
     field: string;
@@ -11,6 +12,7 @@ export interface ModelListFilterParams {
     desc?: any;
     default?: any;
     displayClasses?: string[] | string;
+    group?: ModelListFilterGroup;
 }
 export declare class ModelListFilter implements ModelListFilterParams {
     name: string;
@@ -25,6 +27,7 @@ export declare class ModelListFilter implements ModelListFilterParams {
     displayClasses?: string[] | string;
     pristine: boolean;
     multi: boolean;
+    group?: ModelListFilterGroup;
     /** Single current value */
     protected _value: IDispEditChoice | null;
     /** Multiple current value */
@@ -37,6 +40,7 @@ export declare class ModelListFilter implements ModelListFilterParams {
     get mcurrent$(): Observable<IDispEditChoice[]>;
     get current$(): Observable<IDispEditChoice | null>;
     get valueChanges(): Observable<IDispEditChoice | IDispEditChoice[] | null>;
+    get summary(): string;
     updateFilter(filter: FilterData): void;
     clear(notify?: boolean): void;
     set(value: any, desc: string, notify?: boolean): boolean;

package/lib/modellist/model-list-filters/model-list-filters-select/model-list-filters-select.component.d.ts

@@ -1,13 +1,19 @@
+import { OnInit } from '@angular/core';
 import { ModelList } from '../../model-list.service';
 import { ModelListFilter } from '../model-list-filter';
+import { FormControl } from '@angular/forms';
 import * as i0 from "@angular/core";
-export declare class ModelListFiltersSelectComponent {
+export declare class ModelListFiltersSelectComponent implements OnInit {
     list: ModelList<any>;
     containerClasses: string[] | string;
     itemActiveClasses: string[] | string;
     itemInactiveClasses: string[] | string;
+    mode: 'select' | 'badge' | 'badge_summary';
+    selectForm: FormControl<ModelListFilter | null>;
+    private destroy$;
     constructor();
     toggle(f: ModelListFilter): void;
+    ngOnInit(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ModelListFiltersSelectComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<ModelListFiltersSelectComponent, "data-model-list-filters-select", never, { "list": { "alias": "list"; "required": false; }; "containerClasses": { "alias": "containerClasses"; "required": false; }; "itemActiveClasses": { "alias": "itemActiveClasses"; "required": false; }; "itemInactiveClasses": { "alias": "itemInactiveClasses"; "required": false; }; }, {}, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ModelListFiltersSelectComponent, "data-model-list-filters-select", never, { "list": { "alias": "list"; "required": false; }; "containerClasses": { "alias": "containerClasses"; "required": false; }; "itemActiveClasses": { "alias": "itemActiveClasses"; "required": false; }; "itemInactiveClasses": { "alias": "itemInactiveClasses"; "required": false; }; "mode": { "alias": "mode"; "required": false; }; }, {}, never, never, true, never>;
 }

package/lib/modellist/model-list-filters/model-list-filters.d.ts

@@ -1,15 +1,21 @@
 import { FilterData } from '../../data/data-query';
-import { Observable, ReplaySubject } from 'rxjs';
+import { Observable } from 'rxjs';
 import { FiltersParams } from '../model-list.service';
 import { ModelListFilter } from './model-list-filter';
+import { ModelListFilterGroup } from './model-list-filter-group';
 export declare class ModelListFilters {
+    private _enabled$;
     private _filters;
+    private _output$;
+    private _available$;
+    private _groups$;
     constructor(params?: FiltersParams);
-    private _output;
-    get output(): Observable<FilterData>;
-    _enabled: ReplaySubject<ModelListFilter[]>;
+    private _groups;
+    get groups(): Observable<ModelListFilterGroup[]>;
+    private _enabled;
     get enabled(): Observable<ModelListFilter[]>;
-    _available: ReplaySubject<ModelListFilter[]>;
+    private _available;
     get available(): Observable<ModelListFilter[]>;
+    get output(): Observable<FilterData>;
     update(): void;
 }

package/lib/modellist/model-list-paginator/model-list-paginator/model-list-paginator.component.d.ts

@@ -1,10 +1,9 @@
-import { OnChanges, OnDestroy } from '@angular/core';
+import { OnChanges } from '@angular/core';
 import { ModelList } from '../../model-list.service';
 import { FormControl } from '@angular/forms';
-import { Subject } from 'rxjs';
 import { DataModel } from '../../../data/data-model';
 import * as i0 from "@angular/core";
-export declare class ModelListPaginatorComponent<T extends DataModel> implements OnDestroy, OnChanges {
+export declare class ModelListPaginatorComponent<T extends DataModel> implements OnChanges {
     list: ModelList<T>;
     maxPages: number;
     hide: boolean;
@@ -14,9 +13,8 @@ export declare class ModelListPaginatorComponent<T extends DataModel> implements
     curPage: number;
     curCount: number;
     pageSize: number;
-    _unsubscribe: Subject<void>;
+    private destroy$;
     onPageChange(page: number): void;
-    ngOnDestroy(): void;
     ngOnChanges(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ModelListPaginatorComponent<any>, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<ModelListPaginatorComponent<any>, "data-model-list-paginator", never, { "list": { "alias": "list"; "required": false; }; "maxPages": { "alias": "maxPages"; "required": false; }; "hide": { "alias": "hide"; "required": false; }; }, {}, never, never, true, never>;

package/lib/modellist/model-list.service.d.ts

@@ -9,6 +9,7 @@ import { Collection } from '../data/data-collection';
 import { ModelListFilter } from './model-list-filters/model-list-filter';
 import { IFieldHeaderMessage } from './model-list-fields/model-list-field-header/messages';
 import { AuthServiceBase } from '../auth/auth.service';
+import { ModelListFilterGroup } from './model-list-filters/model-list-filter-group';
 import * as i0 from "@angular/core";
 export interface CustomField {
     name: string;
@@ -43,7 +44,7 @@ export interface FiltersParams {
     /** Excluded filter names */
     excluded?: string[];
     /** Filters definitions */
-    filters?: ModelListFilter[];
+    filters?: (ModelListFilter | ModelListFilterGroup)[];
 }
 export type PaginationParams = IQueryMetaNavParams;
 export type IModelListMessage = IFieldHeaderMessage;

package/lib/routing/breadcrumb/breadcrumb.component.d.ts

@@ -1,4 +1,4 @@
-import { OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
+import { OnChanges, OnInit, SimpleChanges } from '@angular/core';
 import { ActivatedRoute, Router, RouterState, UrlSegment } from '@angular/router';
 import { BaseRouteParams } from '../routing';
 import * as i0 from "@angular/core";
@@ -17,7 +17,7 @@ export interface IPathTreeItem {
  *   and data (input argument)
  * - icon: icon classes. Example fa fa-home for home & font awesome
  */
-export declare class BreadcrumbComponent implements OnChanges, OnInit, OnDestroy {
+export declare class BreadcrumbComponent implements OnChanges, OnInit {
     router: Router;
     route: ActivatedRoute;
     /**
@@ -29,10 +29,9 @@ export declare class BreadcrumbComponent implements OnChanges, OnInit, OnDestroy
      */
     icons: boolean;
     tree: IPathTreeItem[];
-    private _subscriptions;
+    private destroy$;
     constructor(router: Router, route: ActivatedRoute);
     ngOnInit(): void;
-    ngOnDestroy(): void;
     ngOnChanges(changes: SimpleChanges): void;
     getRouteTree(current: RouterState): void;
     getTitle(rdata: Partial<BaseRouteParams>, data: BaseRouteParams, u?: UrlSegment): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidev/data",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "peerDependencies": {
     "@angular/common": "^17",
     "@angular/core": "^17",

package/public-api.d.ts

@@ -10,6 +10,8 @@ export * from './lib/modellist/model-list-sorter/model-list-sorter/model-list-so
 export * from './lib/modellist/model-list-filters/model-list-filters-select/model-list-filters-select.component';
 export * from './lib/modellist/model-list-filters/model-list-filters/model-list-filters.component';
 export * from './lib/modellist/model-list-filters/model-list-filters';
+export * from './lib/modellist/model-list-filters/model-list-filter';
+export * from './lib/modellist/model-list-filters/model-list-filter-group';
 export * from './lib/modellist/model-list-filters/filters/model-list-autocomplete-filter/model-list-autocomplete-filter';
 export * from './lib/modellist/model-list-filters/filters/model-list-autocomplete-multi-filter/model-list-autocomplete-multi-filter';
 export * from './lib/modellist/model-list-filters/filters/model-list-datetime-filter/model-list-datetime-filter';