@elderbyte/ngx-starter 16.4.4 → 16.4.6

package/fesm2022/elderbyte-ngx-starter.mjs

@@ -84,6 +84,7 @@ import { MatSidenavModule } from '@angular/material/sidenav';
 import * as i6 from '@angular/material/datepicker';
 import { MatDatepicker, MatDatepickerModule } from '@angular/material/datepicker';
 import localeDECH from '@angular/common/locales/de-CH';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { TemplatePortal } from '@angular/cdk/portal';
 import * as i1$a from '@angular/cdk/overlay';
 import { OverlayModule } from '@angular/cdk/overlay';
@@ -25934,12 +25935,6 @@ 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));
     }
@@ -25949,7 +25944,7 @@ class SearchContext {
      *                                                                         *
      **************************************************************************/
     get allFiltersChanged() {
-        return this.allFilters$.pipe(filter(filters => !!filters));
+        return this.allFilters$.pipe(filter(filters => !!filters), distinctUntilChanged((a, b) => FilterUtil.equals(a, b)));
     }
     get userFilters() {
         return this.userFilterContext.filtersSnapshot;
@@ -25960,23 +25955,23 @@ class SearchContext {
     get forcedFilters() {
         return this.forcedFilterContext.filtersSnapshot;
     }
-    updateDefaultFilters(filters) {
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+    updateUserFiltersSave(filters) {
         // this.log.error('updateDefaultFilters, acceptDefaultFilters: ' + this.acceptDefaultFilters, filters);
-        if (this.acceptDefaultFilters) {
-            this.userFilterContext.updateFilters(FilterUtil.strip(filters, this.forcedFilters));
-        }
-        return this.acceptDefaultFilters;
+        this.userFilterContext.updateFilters(FilterUtil.strip(filters, this.forcedFilters));
     }
     updateUserFilters(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) {
@@ -26036,20 +26031,21 @@ class ElderSearchContextDirective {
      * Constructor                                                             *
      *                                                                         *
      **************************************************************************/
-    constructor(searchContextService) {
+    constructor(searchContextService, destroyRef) {
+        this.destroyRef = destroyRef;
         /***************************************************************************
          *                                                                         *
          * Fields                                                                  *
          *                                                                         *
          **************************************************************************/
         this.log = LoggerFactory.getLogger(this.constructor.name);
-        this.destroy$ = new Subject();
+        this.filtersToApplyAtRegistration = new Map;
         this._searchInputs$ = new BehaviorSubject([]);
         this._searchStates$ = new BehaviorSubject([]);
         this._filterContext$ = new BehaviorSubject(null);
         this._searchContext$ = new BehaviorSubject(SearchContext.standalone());
         this.searchContextId$ = new BehaviorSubject(null);
-        this.searchContextId$.pipe(takeUntil(this.destroy$), filter(contextId => !!contextId), map(contextId => searchContextService.context(contextId))).subscribe(ctx => this._searchContext$.next(ctx));
+        this.searchContextId$.pipe(takeUntilDestroyed(this.destroyRef), filter(contextId => !!contextId), map(contextId => searchContextService.context(contextId))).subscribe(ctx => this._searchContext$.next(ctx));
     }
     /***************************************************************************
      *                                                                         *
@@ -26065,10 +26061,6 @@ class ElderSearchContextDirective {
         this.applySearchContextToInputs(searchContext);
         this.syncSearchInputsToSearchContext();
     }
-    ngOnDestroy() {
-        this.destroy$.next();
-        this.destroy$.complete();
-    }
     /***************************************************************************
      *                                                                         *
      * Properties                                                              *
@@ -26144,8 +26136,12 @@ class ElderSearchContextDirective {
      * Register a new search name in this container
      */
     register(searchInput) {
-        this.log.debug('Registering search input [' + searchInput.name + ']');
         const current = this._searchInputs$.getValue();
+        const toApply = this.filtersToApplyAtRegistration.get(searchInput.name);
+        if (toApply) {
+            searchInput.setValue(toApply.value);
+        }
+        this.log.debug('Registering search input [' + searchInput.name + ']. Late registration value:' + toApply?.value);
         this._searchInputs$.next([...current, searchInput]);
     }
     reset() {
@@ -26171,21 +26167,21 @@ class ElderSearchContextDirective {
         }
     }
     applyAsDefaultsUntilUserAction(searchContext, dcFilters) {
-        dcFilters.filters.pipe(map(filters => searchContext.updateDefaultFilters(filters)), takeWhile(acceptDefaultFilters => acceptDefaultFilters)).subscribe();
+        dcFilters.filters.pipe(takeUntilDestroyed(this.destroyRef), map(filters => searchContext.updateUserFiltersSave(filters))).subscribe();
     }
     syncSearchInputsToSearchContext() {
-        this._searchInputs$.pipe(takeUntil(this.destroy$), switchMap$1(inputs => combineLatest(inputs.map(i => i.state$))), debounceTime(5)).subscribe(states => {
+        this._searchInputs$.pipe(takeUntilDestroyed(this.destroyRef), 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$))
+            .pipe(takeUntilDestroyed(this.destroyRef), combineLatestWith(this._searchContext$))
             .subscribe(([inputFilters, searchContext]) => {
             searchContext.updateUserFilters(inputFilters);
         });
     }
     syncSearchContextToBoundFilterContext() {
-        this._searchContext$.pipe(takeUntil(this.destroy$), switchMap$1(context => context.allFiltersChanged)).subscribe(allFilters => this.applyToBoundFilterContext(allFilters));
+        this._searchContext$.pipe(takeUntilDestroyed(this.destroyRef), switchMap$1(context => context.allFiltersChanged)).subscribe(allFilters => this.applyToBoundFilterContext(allFilters));
     }
     applyToBoundFilterContext(filters) {
         const filterCtx = this.filterContext;
@@ -26210,7 +26206,10 @@ class ElderSearchContextDirective {
             filters.forEach(f => {
                 const input = inputsByName.get(f.key);
                 if (input) {
-                    input.applyInitialValue(f.value);
+                    input.setValue(f.value);
+                }
+                else {
+                    this.filtersToApplyAtRegistration.set(f.key, f);
                 }
             });
         }
@@ -26227,7 +26226,7 @@ class ElderSearchContextDirective {
             .filter(s => !!s.queryKey)
             .map(s => new Filter(s.queryKey, s.queryValue));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ElderSearchContextDirective, deps: [{ token: SearchContextService }], target: i0.ɵɵFactoryTarget.Directive }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ElderSearchContextDirective, deps: [{ token: SearchContextService }, { token: i0.DestroyRef }], target: i0.ɵɵFactoryTarget.Directive }); }
     static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.12", type: ElderSearchContextDirective, selector: "[elderSearchContext]", inputs: { searchContextId: "searchContextId", filterContext: ["elderSearchContext", "filterContext"], forcedFilters: "forcedFilters" }, exportAs: ["elderSearchContext"], ngImport: i0 }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ElderSearchContextDirective, decorators: [{
@@ -26236,7 +26235,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                     selector: '[elderSearchContext]',
                     exportAs: 'elderSearchContext'
                 }]
-        }], ctorParameters: function () { return [{ type: SearchContextService }]; }, propDecorators: { searchContextId: [{
+        }], ctorParameters: function () { return [{ type: SearchContextService }, { type: i0.DestroyRef }]; }, propDecorators: { searchContextId: [{
                 type: Input
             }], filterContext: [{
                 type: Input,
@@ -26362,28 +26361,6 @@ class ElderInitialValueDirective {
             this.initialDone$.next();
             this.initialDone$.complete();
         });
-        // this.ngModelValue = this.ngModel.model;
-        // ngModel.control.valueChanges
-        //   .pipe(
-        //     takeUntil(this.initialDone$),
-        //     takeUntil(this.unsubscribe$),
-        //     combineLatestWith(this.newValue$),
-        //     debounceTime(500)
-        //   ).subscribe({
-        //   next: ([ngModelValue, newValue]) => {
-        //     if (this.initialValue === ngModelValue) {
-        //       this.initialDone$.next();
-        //       this.initialDone$.complete();
-        //       ngModel.control.setValue(newValue ? newValue : ngModelValue); // Why set ngModelValue again??
-        //     } else {
-        //       this.log.warn('Initialisation not yet done!', {
-        //         initialValue: this.initialValue,
-        //         ngModelValue: ngModelValue,
-        //         newValue: newValue
-        //       });
-        //     }
-        //   }
-        // });
     }
     /***************************************************************************
      *                                                                         *
@@ -26399,7 +26376,7 @@ class ElderInitialValueDirective {
         return this.ngModel.control.valueChanges
             .pipe(takeUntil(this.destroy$));
     }
-    applyInitialValue(value) {
+    setValue(value) {
         if (value) {
             this.ngModel.control.setValue(value);
         }
@@ -26490,9 +26467,9 @@ class ElderSearchInputDirective {
      * Public API                                                              *
      *                                                                         *
      **************************************************************************/
-    applyInitialValue(queryString) {
+    setValue(queryString) {
         const value = this.convertQueryStringToRawModelValue(queryString);
-        this.initialValueDirective.applyInitialValue(value);
+        this.initialValueDirective.setValue(value);
     }
     reset() {
         this.ngModel.reset();