@elderbyte/ngx-starter 14.6.0 → 14.7.0

package/fesm2020/elderbyte-ngx-starter.mjs

@@ -6,7 +6,7 @@ import * as i1 from '@angular/platform-browser';
 import { Duration, Period, TemporalQueries, LocalTime, Instant, LocalDate, nativeJs, ZoneId } from '@js-joda/core';
 import { LoggerFactory } from '@elderbyte/ts-logger';
 import { BehaviorSubject, Subject, EMPTY, combineLatest, merge, of, forkJoin, throwError, mergeWith, switchMap as switchMap$1, Observable, ReplaySubject, fromEvent, NEVER } from 'rxjs';
-import { distinctUntilChanged, map, filter, takeUntil, debounceTime, catchError, first, take, switchMap, mergeMap, takeWhile, tap, expand, reduce, startWith, skip, delay, share, throttleTime, flatMap, timeout, skipWhile } from 'rxjs/operators';
+import { distinctUntilChanged, map, filter, takeUntil, debounceTime, catchError, first, take, switchMap, mergeMap, takeWhile, tap, expand, reduce, startWith, skip, delay, share, throttleTime, combineLatestWith, flatMap, timeout, skipWhile } from 'rxjs/operators';
 import * as i1$2 from '@angular/common/http';
 import { HttpParams, HttpEventType, HttpRequest, HttpClient, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { DataSource } from '@angular/cdk/collections';
@@ -2299,13 +2299,34 @@ class Filter {
     }
     /***************************************************************************
      *                                                                         *
-     * Properties                                                              *
+     * Public API                                                              *
      *                                                                         *
      **************************************************************************/
+    static merge(current, forcedFilter) {
+        let newFilterValue;
+        if (Filter.isMulti(current) || Filter.isMulti(forcedFilter)) {
+            // We have a list of values. We just have to ensure our forced values are in there
+            const valueSet = new Set();
+            Filter.addValuesToSet(valueSet, current);
+            Filter.addValuesToSet(valueSet, forcedFilter);
+            newFilterValue = Array.from(valueSet);
+        }
+        else {
+            newFilterValue = forcedFilter.value;
+        }
+        return new Filter(current.key, newFilterValue);
+    }
+    /**
+     * Checks if this filter supports multiple values.
+     * @param filter
+     */
+    static isMulti(filter) {
+        return Array.isArray(filter.value);
+    }
     /**
      * Checks if this filter has a value.
-     * This is the case when the value is non null and
-     * in case its an array, also non empty.
+     * This is the case when the value is non-null and
+     * in case it's an array, also non-empty.
      */
     static hasValue(self) {
         if (!self) {
@@ -2343,15 +2364,31 @@ class Filter {
             return true;
         } // Same key and same value reference
         // In case the filter has a multi value array, we need to compare those by value
-        if (self.value instanceof Array || other.value instanceof Array) {
-            const valueArr = self.value instanceof Array ? self.value : [self.value];
-            const otherArr = other instanceof Array ? other : [other];
+        if (Array.isArray(self.value) || Array.isArray(other.value)) {
+            const valueArr = Array.isArray(self.value) ? self.value : [self.value];
+            const otherArr = Array.isArray(other.value) ? other.value : [other.value];
             return CollectionUtil.equalSetDeep(new Set(valueArr), new Set(otherArr));
         }
         else {
             return false; // Otherwise, they are not equal
         }
     }
+    /***************************************************************************
+     *                                                                         *
+     * Private methods                                                         *
+     *                                                                         *
+     **************************************************************************/
+    static addValuesToSet(valueSet, filter) {
+        const filterValue = filter.value;
+        if (Array.isArray(filterValue)) {
+            const values = filterValue;
+            values.forEach(v => valueSet.add(v));
+        }
+        else {
+            const value = filterValue;
+            valueSet.add(value);
+        }
+    }
 }
 
 class FilterContext {
@@ -2361,7 +2398,7 @@ class FilterContext {
          * Fields                                                                  *
          *                                                                         *
          **************************************************************************/
-        this._filters = new BehaviorSubject([]);
+        this._filters$ = new BehaviorSubject([]);
     }
     /***************************************************************************
      *                                                                         *
@@ -2399,10 +2436,10 @@ class FilterContext {
      *                                                                         *
      **************************************************************************/
     get filters() {
-        return this._filters.asObservable().pipe(distinctUntilChanged((a, b) => this.equals(a, b)));
+        return this._filters$.asObservable().pipe(distinctUntilChanged((a, b) => this.equals(a, b)));
     }
     get filtersSnapshot() {
-        return this._filters.getValue();
+        return this._filters$.getValue();
     }
     findFilterValue(key) {
         const f = this.findFilter(key);
@@ -2450,11 +2487,23 @@ class FilterContext {
      * @param newFilters
      */
     replaceFilters(newFilters) {
-        this._filters.next(newFilters || []);
+        this._filters$.next(newFilters || []);
     }
     clear() {
         this.replaceFilters([]);
     }
+    mergeFilters(filters) {
+        filters.forEach(filter => this.mergeFilter(filter));
+    }
+    mergeFilter(filter) {
+        const existing = this.findFilter(filter.key);
+        if (!existing) {
+            this.updateFilter(filter);
+        }
+        else {
+            this.updateFilter(Filter.merge(existing, filter));
+        }
+    }
     /***************************************************************************
      *                                                                         *
      * Private methods                                                         *
@@ -18901,18 +18950,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0", ngImpor
  * and holds their values in a central search model.
  */
 class ElderSearchContextDirective {
-    /***************************************************************************
-     *                                                                         *
-     * Constructor                                                             *
-     *                                                                         *
-     **************************************************************************/
     constructor() {
         /***************************************************************************
          *                                                                         *
          * Fields                                                                  *
          *                                                                         *
          **************************************************************************/
-        this.log = LoggerFactory.getLogger('ElderSearchContextDirective');
+        this.forcedFilters$ = new BehaviorSubject$1([]);
+        this.log = LoggerFactory.getLogger(this.constructor.name);
         this.unsubscribe$ = new Subject$1();
         this._searchInputs = new BehaviorSubject$1([]);
         this._searchStates = new BehaviorSubject$1([]);
@@ -18923,16 +18968,12 @@ class ElderSearchContextDirective {
      * Life Cycle                                                              *
      *                                                                         *
      **************************************************************************/
-    ngOnInit() { }
     ngAfterViewInit() {
-        this._searchInputs.pipe(takeUntil(this.unsubscribe$), switchMap(inputs => combineLatest(inputs.map(i => i.state$))), debounceTime(5)).subscribe(states => {
+        this._searchInputs.pipe(takeUntil(this.unsubscribe$), switchMap(inputs => combineLatest(inputs.map(i => i.state$))), combineLatestWith(this.forcedFilters$), debounceTime(5)).subscribe(([states, forcedFilters]) => {
             this._searchStates.next(states);
-            const filters = this.convertToFilters(states);
-            this._filters.next(filters);
-            this.log.trace('Search-Model filters updated:', filters);
-            if (this.filterContext) {
-                this.filterContext.updateFilters(filters);
-            }
+            const userFilters = this.convertToFilters(states);
+            this._filters.next(userFilters);
+            this.applyFilters(userFilters, forcedFilters);
         });
     }
     ngOnDestroy() {
@@ -18950,6 +18991,18 @@ class ElderSearchContextDirective {
     get filterContext() {
         return this._filterContext;
     }
+    /**
+     * Forced filters are always merged into the final FilterContext.
+     *
+     * This means they override user defined filters, but attempt
+     * to also keep the users intent (by merging) them.
+     */
+    set forcedFilters(filters) {
+        this.forcedFilters$.next(filters);
+    }
+    get forcedFilters() {
+        return this.forcedFilters$.getValue();
+    }
     get attributes() {
         return this._searchInputs.asObservable();
     }
@@ -19006,18 +19059,28 @@ class ElderSearchContextDirective {
         return states
             .map(s => new Filter(s.queryKey, s.queryValue));
     }
+    applyFilters(userFilters, forcedFilters) {
+        const context = this.filterContext;
+        if (context) {
+            context.updateFilters(userFilters);
+            context.mergeFilters(forcedFilters);
+            this.log.trace('Search-Model filters updated:', Array.from(context.filtersSnapshot));
+        }
+    }
 }
 ElderSearchContextDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0", ngImport: i0, type: ElderSearchContextDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-ElderSearchContextDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0", type: ElderSearchContextDirective, selector: "[elderSearchContext]", inputs: { filterContext: ["elderSearchContext", "filterContext"] }, exportAs: ["elderSearchContext"], ngImport: i0 });
+ElderSearchContextDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0", type: ElderSearchContextDirective, selector: "[elderSearchContext]", inputs: { filterContext: ["elderSearchContext", "filterContext"], forcedFilters: "forcedFilters" }, exportAs: ["elderSearchContext"], ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0", ngImport: i0, type: ElderSearchContextDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[elderSearchContext]',
                     exportAs: 'elderSearchContext'
                 }]
-        }], ctorParameters: function () { return []; }, propDecorators: { filterContext: [{
+        }], propDecorators: { filterContext: [{
                 type: Input,
                 args: ['elderSearchContext']
+            }], forcedFilters: [{
+                type: Input
             }] } });
 
 /**