@elderbyte/ngx-starter 16.4.3 → 16.4.4

package/fesm2022/elderbyte-ngx-starter.mjs

@@ -5,7 +5,7 @@ import { Pipe, Injectable, LOCALE_ID, Inject, NgModule, Optional, SkipSelf, Dire
 import * as i1 from '@angular/platform-browser';
 import { Duration, Period, TemporalQueries, LocalTime, Instant, LocalDate, nativeJs, ZoneId, DateTimeFormatter, convert, ZonedDateTime, Temporal } from '@js-joda/core';
 import { LoggerFactory } from '@elderbyte/ts-logger';
-import { timer, defer, ReplaySubject, concat, finalize, exhaustMap, BehaviorSubject, lastValueFrom, Subject, switchMap, of, combineLatest, EMPTY, merge, forkJoin, throwError, mergeWith, Observable, zip, mergeMap as mergeMap$1, fromEvent, combineLatestWith as combineLatestWith$1, skipUntil, NEVER } from 'rxjs';
+import { timer, defer, ReplaySubject, concat, finalize, exhaustMap, BehaviorSubject, Subject, switchMap, of, combineLatest, EMPTY, merge, forkJoin, throwError, mergeWith, Observable, zip, mergeMap as mergeMap$1, fromEvent, combineLatestWith as combineLatestWith$1, skipUntil, NEVER } from 'rxjs';
 import { tap, takeUntil, takeWhile, map, filter, distinctUntilChanged, debounceTime, catchError, first, take, switchMap as switchMap$1, mergeMap, expand, reduce, startWith, skip, delay, share, combineLatestWith, 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';
@@ -2704,10 +2704,9 @@ class FilterContext {
         }
         return Array.from(filterMap.values());
     }
-    static async of(filters) {
+    static of(filters) {
         const filterContext = new FilterContext();
-        filterContext.updateFilters(filters);
-        await lastValueFrom(filterContext.filters);
+        filterContext.replaceFilters(filters);
         return filterContext;
     }
     /***************************************************************************
@@ -25935,6 +25934,12 @@ class SearchContext {
         this.userFilterContext = new FilterContext();
         this.forcedFilterContext = new FilterContext();
         this.allFilters$ = new BehaviorSubject(undefined);
+        /***************************************************************************
+         *                                                                         *
+         * Public API                                                              *
+         *                                                                         *
+         **************************************************************************/
+        this.acceptDefaultFilters = true;
         this.id = id;
         this.userFilterContext.filters.pipe(combineLatestWith(this.forcedFilterContext.filters), skip(1), map(([userFilters, forcedFilters]) => FilterUtil.mergeCombine(userFilters, forcedFilters)), tap(x => this.log.debug('allFilters changed: ', x))).subscribe(merged => this.allFilters$.next(merged));
     }
@@ -25947,24 +25952,36 @@ class SearchContext {
         return this.allFilters$.pipe(filter(filters => !!filters));
     }
     get userFilters() {
-        return this.userFilterContext;
+        return this.userFilterContext.filtersSnapshot;
+    }
+    get userFilters$() {
+        return this.userFilterContext.filters;
     }
     get forcedFilters() {
-        return this.forcedFilterContext;
+        return this.forcedFilterContext.filtersSnapshot;
+    }
+    updateDefaultFilters(filters) {
+        // this.log.error('updateDefaultFilters, acceptDefaultFilters: ' + this.acceptDefaultFilters, filters);
+        if (this.acceptDefaultFilters) {
+            this.userFilterContext.updateFilters(FilterUtil.strip(filters, this.forcedFilters));
+        }
+        return this.acceptDefaultFilters;
     }
-    /***************************************************************************
-     *                                                                         *
-     * Public API                                                              *
-     *                                                                         *
-     **************************************************************************/
     updateUserFilters(filters) {
-        this.userFilterContext.updateFilters(filters);
+        if (filters.length > 0) {
+            // this.log.error('updateUserFilters', filters);
+            this.acceptDefaultFilters = false;
+            this.userFilterContext.updateFilters(filters);
+        }
     }
     replaceUserFilters(filters) {
+        // this.log.error('replaceUserFilters', filters);
+        this.acceptDefaultFilters = false;
         this.userFilterContext.replaceFilters(filters);
     }
     replaceForcedFilters(filters) {
         this.forcedFilterContext.replaceFilters(filters);
+        // Maybe clean up existing user filters here
     }
 }
 
@@ -26043,7 +26060,7 @@ class ElderSearchContextDirective {
         this.applyDefaultFiltersToSearchContext();
         this.syncSearchContextToBoundFilterContext();
     }
-    ngAfterContentInit() {
+    ngAfterViewInit() {
         const searchContext = this.searchContext;
         this.applySearchContextToInputs(searchContext);
         this.syncSearchInputsToSearchContext();
@@ -26098,7 +26115,7 @@ class ElderSearchContextDirective {
         this.searchContext.replaceForcedFilters(filters);
     }
     get forcedFilters() {
-        return this.searchContext.forcedFilters.filtersSnapshot;
+        return this.searchContext.forcedFilters;
     }
     get attributes() {
         return this._searchInputs$.asObservable();
@@ -26146,18 +26163,21 @@ class ElderSearchContextDirective {
     applyDefaultFiltersToSearchContext() {
         const dcFilters = this.filterContext;
         const searchContext = this.searchContext;
-        if (searchContext.userFilters.isEmpty) {
-            if (!dcFilters.isEmpty) {
-                // Consider all filters in DC as defaults, expect for foced filters.
-                searchContext.updateUserFilters(FilterUtil.strip(dcFilters.filtersSnapshot, this.forcedFilters));
-            }
+        if (searchContext.userFilters.length === 0) {
+            this.applyAsDefaultsUntilUserAction(searchContext, dcFilters);
         }
         else {
-            dcFilters.replaceFilters(searchContext.userFilters.filtersSnapshot);
+            dcFilters.replaceFilters(searchContext.userFilters);
         }
     }
+    applyAsDefaultsUntilUserAction(searchContext, dcFilters) {
+        dcFilters.filters.pipe(map(filters => searchContext.updateDefaultFilters(filters)), takeWhile(acceptDefaultFilters => acceptDefaultFilters)).subscribe();
+    }
     syncSearchInputsToSearchContext() {
-        const inputFilters$ = this._searchInputs$.pipe(switchMap$1(inputs => combineLatest(inputs.map(i => i.state$))), debounceTime(5), tap(states => this._searchStates$.next(states)), map(states => this.convertToFilters(states)));
+        this._searchInputs$.pipe(takeUntil(this.destroy$), switchMap$1(inputs => combineLatest(inputs.map(i => i.state$))), debounceTime(5)).subscribe(states => {
+            this._searchStates$.next(states);
+        });
+        const inputFilters$ = this._searchStates$.pipe(map(states => this.convertToFilters(states)), filter(filters => filters.length > 0));
         inputFilters$
             .pipe(takeUntil(this.destroy$), combineLatestWith(this._searchContext$))
             .subscribe(([inputFilters, searchContext]) => {
@@ -26178,7 +26198,7 @@ class ElderSearchContextDirective {
         }
     }
     applySearchContextToInputs(searchContext) {
-        this.applyFiltersToInputs(searchContext.userFilters.filtersSnapshot);
+        this.applyFiltersToInputs(searchContext.userFilters);
     }
     applyFiltersToInputs(filters) {
         if (filters.length > 0) {
@@ -26414,10 +26434,12 @@ class ElderSearchInputDirective {
     constructor(searchContext, ngModel) {
         this.searchContext = searchContext;
         this.ngModel = ngModel;
-        this._state = new BehaviorSubject(SearchInputState.unknown());
         this.destroy$ = new Subject();
         this.log = LoggerFactory.getLogger(this.constructor.name);
         this.initialValueDirective = new ElderInitialValueDirective(ngModel);
+        this._state$ = this.buildInputStateObservable().pipe(
+        // tap(state => this.log.error('EMIT SEARCH INPUT STATE [' + state.queryKey + ']: ' + state.queryValue + (state.pristine ? '(pristine)' : ''), state))
+        );
     }
     /***************************************************************************
      *                                                                         *
@@ -26431,11 +26453,6 @@ class ElderSearchInputDirective {
     ngAfterViewInit() {
         this._extractedName = this.extractName();
         this.log.debug(this._extractedName + "|" + this.queryKey + "|" + this.resolvePath);
-        this.stateObservable()
-            .subscribe(state => {
-            // this.log.error('EMIT SEARCH INPUT STATE [' + state.queryKey + ']: ' + state.queryValue + (state.pristine ? '(pristine)' : ''), state)
-            this.emitState(state);
-        });
     }
     ngOnDestroy() {
         this.destroy$.next();
@@ -26447,10 +26464,7 @@ class ElderSearchInputDirective {
      *                                                                         *
      **************************************************************************/
     get state$() {
-        return this._state.asObservable();
-    }
-    get stateSnapshot() {
-        return this._state.getValue();
+        return this._state$;
     }
     get name() {
         if (this.queryKey) {
@@ -26492,10 +26506,13 @@ class ElderSearchInputDirective {
         return this.ngModel.control.valueChanges
             .pipe(takeUntil(this.destroy$));
     }
-    stateObservable() {
+    buildInputStateObservable() {
         const viewStabilized$ = of('stabilized$').pipe(delay(20), first());
         const inputStateChanges$ = this.valueChanges$.pipe(takeUntil(this.destroy$), map(value => this.buildInputState(value, true)), skipUntil(viewStabilized$), debounceTime(20));
-        const startWithAsync$ = of('start').pipe(map(start => this.buildInputState(this.ngModel.control.value, false)));
+        const startWithAsync$ = of('start').pipe(map(start => {
+            const state = this.buildInputState(this.ngModel.control.value, false);
+            return state;
+        }));
         return concat(startWithAsync$, inputStateChanges$);
     }
     buildInputState(controlValue, userEvent) {
@@ -26527,9 +26544,6 @@ class ElderSearchInputDirective {
         }
         return queryValue;
     }
-    emitState(state) {
-        this._state.next(state);
-    }
     checkAndConvertFaultyValuesToNull(value) {
         let fixedValue = value;
         fixedValue = this.convertEmptyArrayToNull(fixedValue);
@@ -27360,7 +27374,7 @@ class ElderSearchUrlDirective {
      *                                                                         *
      **************************************************************************/
     ngAfterViewInit() {
-        this.searchContext$.pipe(takeUntil(this.destroy$), switchMap(searchContext => searchContext.userFilters.filters.pipe(map(filters => new ContextWithUserFilters(searchContext, filters))))).subscribe(ctxAndFilters => this.searchUrlService.updateQueryParams(ctxAndFilters.context.id, ctxAndFilters.userFilters));
+        this.searchContext$.pipe(takeUntil(this.destroy$), switchMap(searchContext => searchContext.userFilters$.pipe(map(filters => new ContextWithUserFilters(searchContext, filters))))).subscribe(ctxAndFilters => this.searchUrlService.updateQueryParams(ctxAndFilters.context.id, ctxAndFilters.userFilters));
     }
     ngOnDestroy() {
         this.destroy$.next();