@elderbyte/ngx-starter 16.2.12 → 16.3.1

package/lib/common/data/filters/filter-context.d.ts

@@ -1,6 +1,7 @@
 import { Filter } from './filter';
 import { Observable } from "rxjs";
 export declare class FilterContext {
+    static empty(): FilterContext;
     /***************************************************************************
      *                                                                         *
      * Fields                                                                  *

package/lib/components/forms/search/elder-search-context.directive.d.ts

@@ -4,7 +4,7 @@ import { SearchInput } from './model/search-input';
 import { Filter } from '../../../common/data/filters/filter';
 import { FilterContext } from '../../../common/data/filters/filter-context';
 import { SearchInputState } from './model/search-input-state';
-import SearchContextOrchestrator from "./search-context-orchestrator";
+import SearchFilterContext from './search-filter-context';
 import * as i0 from "@angular/core";
 /**
  * The search container manages a group of search-inputs
@@ -21,13 +21,14 @@ export declare class ElderSearchContextDirective implements AfterViewInit, OnDes
     private readonly destroy$;
     private readonly _searchInputs$;
     private readonly _searchStates$;
-    private _searchContextOrchestrator;
+    private readonly _searchFilterContext;
     /***************************************************************************
      *                                                                         *
      * Life Cycle                                                              *
      *                                                                         *
      **************************************************************************/
     ngAfterContentInit(): void;
+    private applyFilters;
     ngAfterViewInit(): void;
     ngOnDestroy(): void;
     /***************************************************************************
@@ -49,7 +50,7 @@ export declare class ElderSearchContextDirective implements AfterViewInit, OnDes
     get attributesSnapshot(): SearchInput[];
     get states$(): Observable<SearchInputState[]>;
     get statesSnapshot(): SearchInputState[];
-    get searchContextOrchestrator(): SearchContextOrchestrator;
+    get searchFilterContext(): SearchFilterContext;
     /**
      * Returns the current user touched attributes. (ignoring fallbacks)
      */

package/lib/components/forms/search/{search-context-orchestrator.d.ts → search-filter-context.d.ts}

@@ -1,9 +1,13 @@
-import { Observable } from "rxjs";
-import { Filter } from "../../../common/data/filters/filter";
-import { FilterContext } from "../../../common/data/filters/filter-context";
-export default class SearchContextOrchestrator {
-    readonly filterContext: FilterContext;
-    private forcedFilters?;
+import { Observable } from 'rxjs';
+import { Filter } from '../../../common/data/filters/filter';
+import { FilterContext } from '../../../common/data/filters/filter-context';
+export default class SearchFilterContext {
+    /***************************************************************************
+     *                                                                         *
+     * Private methods                                                         *
+     *                                                                         *
+     **************************************************************************/
+    private readonly _filterContext$;
     private readonly initialFilterContext;
     private readonly log;
     /***************************************************************************
@@ -11,12 +15,13 @@ export default class SearchContextOrchestrator {
      * Constructor                                                             *
      *                                                                         *
      **************************************************************************/
-    constructor(filterContext: FilterContext, forcedFilters?: Filter[]);
+    constructor();
     /***************************************************************************
      *                                                                         *
      * Properties                                                              *
      *                                                                         *
      **************************************************************************/
+    get filterContext(): FilterContext;
     get initialFilters$(): Observable<Filter[]>;
     get filters(): Observable<Filter[]>;
     /***************************************************************************
@@ -24,6 +29,6 @@ export default class SearchContextOrchestrator {
      * Public Api                                                              *
      *                                                                         *
      **************************************************************************/
+    init(ctx: FilterContext, forcedFilters: Filter[]): void;
     addInitialFilters(filters: Filter[]): void;
-    applyFilters(userFilters: Filter[]): void;
 }

package/lib/components/select/elder-select-base.d.ts

@@ -104,6 +104,7 @@ export declare abstract class ElderSelectBase<TId, TEntity, TValue> extends Elde
     set filters(filters: Filter[]);
     get filters(): Filter[];
     set dataSource(source: IDataSource<TEntity>);
+    get dataSource(): IDataSource<TEntity>;
     set data(data: Array<TEntity> | IDataContext<TEntity>);
     set dataContext(data: IDataContext<TEntity>);
     get dataContext(): IDataContext<TEntity>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elderbyte/ngx-starter",
-  "version": "16.2.12",
+  "version": "16.3.1",
   "peerDependencies": {
     "@angular/core": "^16.0.0 || ^17.0.0",
     "@angular/common": "^16.0.0 || ^17.0.0",

package/esm2022/lib/components/forms/search/search-context-orchestrator.mjs

@@ -1,55 +0,0 @@
-import { FilterContext } from "../../../common/data/filters/filter-context";
-import { startWith } from "rxjs/operators";
-import { LoggerFactory } from "@elderbyte/ts-logger";
-export default class SearchContextOrchestrator {
-    /***************************************************************************
-     *                                                                         *
-     * Constructor                                                             *
-     *                                                                         *
-     **************************************************************************/
-    constructor(filterContext, forcedFilters) {
-        this.filterContext = filterContext;
-        this.forcedFilters = forcedFilters;
-        this.initialFilterContext = new FilterContext();
-        this.log = LoggerFactory.getLogger(this.constructor.name);
-        this.initialFilterContext.updateFilters(filterContext.filtersSnapshot);
-        if (forcedFilters) {
-            this.initialFilterContext.updateFilters(forcedFilters);
-        }
-    }
-    /***************************************************************************
-     *                                                                         *
-     * Properties                                                              *
-     *                                                                         *
-     **************************************************************************/
-    get initialFilters$() {
-        return this.initialFilterContext.filters
-            .pipe(startWith(this.initialFilterContext.filtersSnapshot));
-    }
-    get filters() {
-        return this.filterContext.filters;
-    }
-    /***************************************************************************
-     *                                                                         *
-     * Public Api                                                              *
-     *                                                                         *
-     **************************************************************************/
-    addInitialFilters(filters) {
-        this.initialFilterContext.updateFilters(filters);
-    }
-    applyFilters(userFilters) {
-        const context = this.filterContext;
-        if (context) {
-            context.updateFilters(userFilters);
-            context.mergeFilters(this.forcedFilters);
-            this.log.trace("Search-Model filters updated:", Array.from(context.filtersSnapshot));
-        }
-        else {
-            this.log.warn("Failed to apply filters since no FilterContext is available!", {
-                userFilters: userFilters,
-                forcedFilters: this.forcedFilters
-            });
-        }
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VhcmNoLWNvbnRleHQtb3JjaGVzdHJhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvZWxkZXJieXRlL25neC1zdGFydGVyL3NyYy9saWIvY29tcG9uZW50cy9mb3Jtcy9zZWFyY2gvc2VhcmNoLWNvbnRleHQtb3JjaGVzdHJhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUM1RSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDM0MsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXJELE1BQU0sQ0FBQyxPQUFPLE9BQU8seUJBQXlCO0lBSzVDOzs7O2dGQUk0RTtJQUU1RSxZQUNrQixhQUE0QixFQUNwQyxhQUF3QjtRQURoQixrQkFBYSxHQUFiLGFBQWEsQ0FBZTtRQUNwQyxrQkFBYSxHQUFiLGFBQWEsQ0FBVztRQVpqQix5QkFBb0IsR0FBRyxJQUFJLGFBQWEsRUFBRSxDQUFDO1FBRTNDLFFBQUcsR0FBRyxhQUFhLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUM7UUFZcEUsSUFBSSxDQUFDLG9CQUFvQixDQUFDLGFBQWEsQ0FBQyxhQUFhLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDdkUsSUFBSSxhQUFhLEVBQUU7WUFDakIsSUFBSSxDQUFDLG9CQUFvQixDQUFDLGFBQWEsQ0FBQyxhQUFhLENBQUMsQ0FBQztTQUN4RDtJQUNILENBQUM7SUFFRDs7OztnRkFJNEU7SUFFNUUsSUFBVyxlQUFlO1FBQ3hCLE9BQU8sSUFBSSxDQUFDLG9CQUFvQixDQUFDLE9BQU87YUFDckMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsb0JBQW9CLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQztJQUNoRSxDQUFDO0lBRUQsSUFBVyxPQUFPO1FBQ2hCLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUM7SUFDcEMsQ0FBQztJQUVEOzs7O2dGQUk0RTtJQUVyRSxpQkFBaUIsQ0FBQyxPQUFpQjtRQUN4QyxJQUFJLENBQUMsb0JBQW9CLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ25ELENBQUM7SUFFTSxZQUFZLENBQ2pCLFdBQXFCO1FBRXJCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUM7UUFDbkMsSUFBSSxPQUFPLEVBQUU7WUFDWCxPQUFPLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1lBQ25DLE9BQU8sQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1lBQ3pDLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLCtCQUErQixFQUFFLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUM7U0FDdEY7YUFBTTtZQUNMLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLDhEQUE4RCxFQUFFO2dCQUM1RSxXQUFXLEVBQUUsV0FBVztnQkFDeEIsYUFBYSxFQUFFLElBQUksQ0FBQyxhQUFhO2FBQ2xDLENBQUMsQ0FBQztTQUNKO0lBQ0gsQ0FBQztDQVFGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gXCJyeGpzXCI7XG5pbXBvcnQgeyBGaWx0ZXIgfSBmcm9tIFwiLi4vLi4vLi4vY29tbW9uL2RhdGEvZmlsdGVycy9maWx0ZXJcIjtcbmltcG9ydCB7IEZpbHRlckNvbnRleHQgfSBmcm9tIFwiLi4vLi4vLi4vY29tbW9uL2RhdGEvZmlsdGVycy9maWx0ZXItY29udGV4dFwiO1xuaW1wb3J0IHsgc3RhcnRXaXRoIH0gZnJvbSBcInJ4anMvb3BlcmF0b3JzXCI7XG5pbXBvcnQgeyBMb2dnZXJGYWN0b3J5IH0gZnJvbSBcIkBlbGRlcmJ5dGUvdHMtbG9nZ2VyXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFNlYXJjaENvbnRleHRPcmNoZXN0cmF0b3Ige1xuICBwcml2YXRlIHJlYWRvbmx5IGluaXRpYWxGaWx0ZXJDb250ZXh0ID0gbmV3IEZpbHRlckNvbnRleHQoKTtcblxuICBwcml2YXRlIHJlYWRvbmx5IGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKHRoaXMuY29uc3RydWN0b3IubmFtZSk7XG5cbiAgLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuICAgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqXG4gICAqIENvbnN0cnVjdG9yICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICpcbiAgICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKlxuICAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovXG5cbiAgY29uc3RydWN0b3IoXG4gICAgcHVibGljIHJlYWRvbmx5IGZpbHRlckNvbnRleHQ6IEZpbHRlckNvbnRleHQsXG4gICAgcHJpdmF0ZSBmb3JjZWRGaWx0ZXJzPzogRmlsdGVyW11cbiAgKSB7XG4gICAgdGhpcy5pbml0aWFsRmlsdGVyQ29udGV4dC51cGRhdGVGaWx0ZXJzKGZpbHRlckNvbnRleHQuZmlsdGVyc1NuYXBzaG90KTtcbiAgICBpZiAoZm9yY2VkRmlsdGVycykge1xuICAgICAgdGhpcy5pbml0aWFsRmlsdGVyQ29udGV4dC51cGRhdGVGaWx0ZXJzKGZvcmNlZEZpbHRlcnMpO1xuICAgIH1cbiAgfVxuXG4gIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipcbiAgICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKlxuICAgKiBQcm9wZXJ0aWVzICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqXG4gICAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICpcbiAgICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqL1xuXG4gIHB1YmxpYyBnZXQgaW5pdGlhbEZpbHRlcnMkKCk6IE9ic2VydmFibGU8RmlsdGVyW10+IHtcbiAgICByZXR1cm4gdGhpcy5pbml0aWFsRmlsdGVyQ29udGV4dC5maWx0ZXJzXG4gICAgICAucGlwZShzdGFydFdpdGgodGhpcy5pbml0aWFsRmlsdGVyQ29udGV4dC5maWx0ZXJzU25hcHNob3QpKTtcbiAgfVxuXG4gIHB1YmxpYyBnZXQgZmlsdGVycygpIHtcbiAgICByZXR1cm4gdGhpcy5maWx0ZXJDb250ZXh0LmZpbHRlcnM7XG4gIH1cblxuICAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqXG4gICAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICpcbiAgICogUHVibGljIEFwaSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKlxuICAgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqXG4gICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi9cblxuICBwdWJsaWMgYWRkSW5pdGlhbEZpbHRlcnMoZmlsdGVyczogRmlsdGVyW10pIHtcbiAgICB0aGlzLmluaXRpYWxGaWx0ZXJDb250ZXh0LnVwZGF0ZUZpbHRlcnMoZmlsdGVycyk7XG4gIH1cblxuICBwdWJsaWMgYXBwbHlGaWx0ZXJzKFxuICAgIHVzZXJGaWx0ZXJzOiBGaWx0ZXJbXVxuICApOiB2b2lkIHtcbiAgICBjb25zdCBjb250ZXh0ID0gdGhpcy5maWx0ZXJDb250ZXh0O1xuICAgIGlmIChjb250ZXh0KSB7XG4gICAgICBjb250ZXh0LnVwZGF0ZUZpbHRlcnModXNlckZpbHRlcnMpO1xuICAgICAgY29udGV4dC5tZXJnZUZpbHRlcnModGhpcy5mb3JjZWRGaWx0ZXJzKTtcbiAgICAgIHRoaXMubG9nLnRyYWNlKFwiU2VhcmNoLU1vZGVsIGZpbHRlcnMgdXBkYXRlZDpcIiwgQXJyYXkuZnJvbShjb250ZXh0LmZpbHRlcnNTbmFwc2hvdCkpO1xuICAgIH0gZWxzZSB7XG4gICAgICB0aGlzLmxvZy53YXJuKFwiRmFpbGVkIHRvIGFwcGx5IGZpbHRlcnMgc2luY2Ugbm8gRmlsdGVyQ29udGV4dCBpcyBhdmFpbGFibGUhXCIsIHtcbiAgICAgICAgdXNlckZpbHRlcnM6IHVzZXJGaWx0ZXJzLFxuICAgICAgICBmb3JjZWRGaWx0ZXJzOiB0aGlzLmZvcmNlZEZpbHRlcnNcbiAgICAgIH0pO1xuICAgIH1cbiAgfVxuXG4gIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipcbiAgICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKlxuICAgKiBQcml2YXRlIG1ldGhvZHMgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqXG4gICAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICpcbiAgICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqL1xuXG59XG4iXX0=