@elderbyte/ngx-starter 16.3.0 → 16.3.2

package/fesm2022/elderbyte-ngx-starter.mjs

@@ -2539,6 +2539,9 @@ class FilterContext {
          **************************************************************************/
         this._filters$ = new BehaviorSubject([]);
     }
+    static empty() {
+        return new FilterContext();
+    }
     /***************************************************************************
      *                                                                         *
      * Static Utilities                                                        *
@@ -25822,58 +25825,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
                 type: Input
             }] } });
 
-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
-            });
-        }
-    }
-}
-
 /**
  * The search container manages a group of search-inputs
  * and holds their values in a central search model.
@@ -25890,6 +25841,7 @@ class ElderSearchContextDirective {
         this.destroy$ = new Subject$1();
         this._searchInputs$ = new BehaviorSubject$1([]);
         this._searchStates$ = new BehaviorSubject$1([]);
+        this._filterContext$ = new BehaviorSubject$1(null);
     }
     /***************************************************************************
      *                                                                         *
@@ -25897,19 +25849,32 @@ class ElderSearchContextDirective {
      *                                                                         *
      **************************************************************************/
     ngAfterContentInit() {
-        this._searchInputs$.pipe(takeUntil(this.destroy$), switchMap(inputs => combineLatest(inputs.map(i => i.state$))), debounceTime(5)).subscribe((states) => {
+        this._searchInputs$.pipe(takeUntil(this.destroy$), switchMap(inputs => combineLatest(inputs.map(i => i.state$))), combineLatestWith(this._forcedFilters$), debounceTime(5)).subscribe(([states, forcedFilters]) => {
             this._searchStates$.next(states);
             const userFilters = this.convertToFilters(states);
-            this.searchContextOrchestrator.applyFilters(userFilters);
+            this.applyFilters(userFilters, forcedFilters);
         });
     }
+    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));
+        }
+        else {
+            this.log.warn("Failed to apply filters since no FilterContext is available!", {
+                userFilters: userFilters,
+                forcedFilters: forcedFilters
+            });
+        }
+    }
     ngAfterViewInit() {
-        this.subscribeInitialFilters();
+        this.applyModelToInputs();
     }
     ngOnDestroy() {
         this.destroy$.next();
         this.destroy$.complete();
-        this._searchContextOrchestrator = null;
     }
     /***************************************************************************
      *                                                                         *
@@ -25917,21 +25882,23 @@ class ElderSearchContextDirective {
      *                                                                         *
      **************************************************************************/
     set filterContext(value) {
+        let context;
         if (value) {
-            if (typeof value !== 'string') {
-                this._searchContextOrchestrator = new SearchContextOrchestrator(value, this.forcedFilters);
+            if (typeof value !== "string") {
+                context = value;
             }
             else {
-                this.log.warn('Illegal value provided for property filterContext: ', JSON.stringify(value));
-                throw new Error('Illegal value provided for property filterContext! ' + value);
+                this.log.warn("Illegal value provided for property filterContext: ", JSON.stringify(value));
+                throw new Error("Illegal value provided for property filterContext! " + value);
             }
         }
         else {
-            this._searchContextOrchestrator = new SearchContextOrchestrator(null);
+            context = FilterContext.empty();
         }
+        this._filterContext$.next(context);
     }
     get filterContext() {
-        return this.searchContextOrchestrator.filterContext;
+        return this._filterContext$.getValue();
     }
     /**
      * Forced filters are always merged into the final FilterContext.
@@ -25957,9 +25924,6 @@ class ElderSearchContextDirective {
     get statesSnapshot() {
         return this._searchStates$.getValue();
     }
-    get searchContextOrchestrator() {
-        return this._searchContextOrchestrator;
-    }
     /**
      * Returns the current user touched attributes. (ignoring fallbacks)
      */
@@ -25975,7 +25939,7 @@ class ElderSearchContextDirective {
      * Register a new search name in this container
      */
     register(searchInput) {
-        this.log.debug('Registering search input [' + searchInput.name + ']');
+        this.log.debug("Registering search input [" + searchInput.name + "]");
         const current = this._searchInputs$.getValue();
         this._searchInputs$.next([...current, searchInput]);
     }
@@ -25991,14 +25955,27 @@ class ElderSearchContextDirective {
      * Private                                                                 *
      *                                                                         *
      **************************************************************************/
-    subscribeInitialFilters() {
-        this.searchContextOrchestrator.initialFilters$.pipe(takeUntil(this.destroy$), combineLatestWith(this._searchInputs$)).subscribe(([initialFilters, searchInputs]) => {
-            searchInputs.forEach(input => {
-                const filter = this.findFilterForInput(input, initialFilters);
-                if (filter) {
-                    input.applyInitialValue(filter.value);
-                }
-            });
+    applyModelToInputs() {
+        this.log.warn('applyModelToInputs', {
+            filterSnapshot: this._filterContext$.getValue().filtersSnapshot,
+            forcedFilters: this.forcedFilters
+        });
+        const mergedFilters = this.mergeFilters(this._filterContext$.getValue().filtersSnapshot, this.forcedFilters);
+        this.applyFiltersToInputs(mergedFilters);
+    }
+    mergeFilters(filtersA, filtersB) {
+        const mergeContext = new FilterContext();
+        mergeContext.updateFilters(filtersA);
+        mergeContext.mergeFilters(filtersB);
+        return mergeContext.filtersSnapshot;
+    }
+    applyFiltersToInputs(filters) {
+        this.log.warn('applyFiltersToInputs', filters);
+        this._searchInputs$.getValue().forEach(input => {
+            const filter = this.findFilterForInput(input, filters);
+            if (filter) {
+                input.applyInitialValue(filter.value);
+            }
         });
     }
     findFilterForInput(input, filters) {
@@ -26020,12 +25997,12 @@ class ElderSearchContextDirective {
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: ElderSearchContextDirective, decorators: [{
             type: Directive,
             args: [{
-                    selector: '[elderSearchContext]',
-                    exportAs: 'elderSearchContext'
+                    selector: "[elderSearchContext]",
+                    exportAs: "elderSearchContext"
                 }]
         }], propDecorators: { filterContext: [{
                 type: Input,
-                args: ['elderSearchContext']
+                args: ["elderSearchContext"]
             }], forcedFilters: [{
                 type: Input
             }] } });
@@ -26121,7 +26098,7 @@ class ElderInitialValueDirective {
      **************************************************************************/
     constructor(ngModel) {
         //TODO: The debounce time is a hacky workaround, find a proper way to set initial value.
-        // Currently two way binding ngModel deosnt work.
+        // ngModel regular and two way binding differ in initial value, which led to this solution
         this.ngModel = ngModel;
         /***************************************************************************
          *                                                                         *
@@ -26132,19 +26109,15 @@ class ElderInitialValueDirective {
         this.initialValue$ = new BehaviorSubject(null);
         this.destroy$ = new Subject();
         this.initialDone$ = new Subject();
-        this.isInitial = true;
         const ngModelValue$ = of("dummy")
             .pipe(delay(10), map(() => this.ngModel.model));
         ngModelValue$
-            .pipe(combineLatestWith$1(this.initialValue$), takeUntil(this.initialDone$), takeUntil(this.destroy$)).subscribe({
-            next: ([ngModelValue, initialValue]) => {
-                this.log.warn("initialValue: " + initialValue);
-                if (initialValue) {
-                    ngModel.control.setValue(initialValue);
-                }
-                this.initialDone$.next();
-                this.initialDone$.complete();
+            .pipe(combineLatestWith$1(this.initialValue$), takeUntil(this.initialDone$), takeUntil(this.destroy$)).subscribe(([ngModelValue, initialValue]) => {
+            if (initialValue) {
+                ngModel.control.setValue(initialValue);
             }
+            this.initialDone$.next();
+            this.initialDone$.complete();
         });
         // this.ngModelValue = this.ngModel.model;
         // ngModel.control.valueChanges
@@ -26181,9 +26154,7 @@ class ElderInitialValueDirective {
      **************************************************************************/
     get valueChanges$() {
         return this.ngModel.control.valueChanges
-            .pipe(takeUntil(this.destroy$)
-        //filter(value => this.filterInitialValue(value))
-        );
+            .pipe(takeUntil(this.destroy$));
     }
     applyInitialValue(value) {
         this.initialValue$.next(value);
@@ -26192,18 +26163,6 @@ class ElderInitialValueDirective {
         this.destroy$.next();
         this.destroy$.complete();
     }
-    /***************************************************************************
-     *                                                                         *
-     * Private methods                                                         *
-     *                                                                         *
-     **************************************************************************/
-    filterInitialValue(value) {
-        if (this.isInitial && this.ngModelValue$ === value) {
-            this.isInitial = false;
-            return false;
-        }
-        return true;
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: ElderInitialValueDirective, deps: [{ token: i3.NgModel, host: true }], target: i0.ɵɵFactoryTarget.Directive }); }
     static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.11", type: ElderInitialValueDirective, selector: "[elderInitialValue]", exportAs: ["elderInitialValue"], ngImport: i0 }); }
 }
@@ -26240,10 +26199,13 @@ class ElderSearchInputDirective {
      * Life Cycle                                                              *
      *                                                                         *
      **************************************************************************/
-    ngAfterViewInit() {
+    ngOnInit() {
         this._extractedName = this.extractName();
-        this.log.debug(this.extractName() + "|" + this.queryKey + "|" + this.resolvePath);
         this.searchContext.register(this);
+    }
+    ngAfterViewInit() {
+        this._extractedName = this.extractName();
+        this.log.debug(this._extractedName + "|" + this.queryKey + "|" + this.resolvePath);
         this.stateObservable().subscribe(state => {
             this.emitState(state);
         });
@@ -26899,71 +26861,101 @@ class ElderSearchContextFilters {
 }
 
 class ElderSearchUrlBindingService {
+    /***************************************************************************
+     *                                                                         *
+     * Constructor                                                             *
+     *                                                                         *
+     **************************************************************************/
     constructor(router, route) {
         this.router = router;
         this.route = route;
-        //A search param has following structure: search-[searchContextId]-[filterId]=[value]
+        //A search param has following structure: q-[searchContextId]-[filterId]=[value]
         //Example: search-browser1-hasStarted=true
-        this._searchMap$ = new BehaviorSubject$1(new Map());
+        /***************************************************************************
+         *                                                                         *
+         * Fields                                                                  *
+         *                                                                         *
+         **************************************************************************/
+        this.log = LoggerFactory.getLogger(this.constructor.name);
+        this._searchMap$ = new BehaviorSubject$1({
+            value: new Map(),
+            emit: true
+        });
         this._initialSearchMap$ = new BehaviorSubject$1(new Map());
         this.searchParamPrefix = "q";
         this.unsubscribe$ = new Subject();
         this.router.events.pipe(first()).subscribe(() => {
             this.handleSearchParameters(this.route.snapshot.queryParams);
         });
-        this._searchMap$.pipe(takeUntil(this.unsubscribe$)).subscribe(searchMap => {
+        this._searchMap$.pipe(filter(searchMapUpdate => searchMapUpdate.emit), takeUntil(this.unsubscribe$)).subscribe(searchMapUpdate => {
+            this.log.warn("SET URL");
+            const searchMap = searchMapUpdate.value;
             const resetParams = this.resetSearchParams();
             const queryParams = { ...resetParams, ...this.buildQueryParams(searchMap) };
+            this.log.warn("searchMap :", searchMap);
+            this.log.warn("queryParams :", queryParams);
             this.router.navigate([], {
-                relativeTo: this.route,
                 queryParams: queryParams,
                 replaceUrl: true,
                 queryParamsHandling: "merge"
             });
         });
+        this.router.events.subscribe((event) => this.log.warn("Type: " + event.constructor?.name, event));
     }
-    resetSearchParams() {
-        let params = { ...this.route.snapshot.queryParams };
-        const searchParams = this.extractSearchParameters(params);
-        for (const searchParam of searchParams) {
-            params[searchParam] = null;
-        }
-        return params;
-    }
-    buildQueryParams(searchMap) {
-        const params = {};
-        for (const searchContextId of searchMap.keys()) {
-            const filters = searchMap.get(searchContextId).filters;
-            for (const filter of filters.values()) {
-                params[`${this.searchParamPrefix}-${searchContextId}-${filter.key}`] = this.convertValueToArrayOrSingleValue(filter.value);
-            }
-        }
-        return params;
-    }
-    convertValueToArrayOrSingleValue(value) {
-        return Array.isArray(value) ? `(${value.toString()})` : value;
+    /***************************************************************************
+     *                                                                         *
+     * Life Cycle                                                              *
+     *                                                                         *
+     **************************************************************************/
+    ngOnDestroy() {
+        this.unsubscribe$.next();
+        this.unsubscribe$.complete();
     }
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
     get initialSearchMap$() {
         return this._initialSearchMap$;
     }
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
     updateFiltersForContext(searchContextId, filters) {
-        const searchMap = this._searchMap$.getValue();
+        const searchMapUpdate = this._searchMap$.getValue();
+        const searchMap = searchMapUpdate.value;
         const filtersMap = new Map(filters
             .filter(filter => filter.value != null)
             .map(filter => {
             return [filter.key, filter];
         }));
         searchMap.set(searchContextId, new ElderSearchContextFilters(searchContextId, filtersMap));
-        this._searchMap$.next(searchMap);
+        this._searchMap$.next({ value: searchMap, emit: true });
     }
+    resetFilterForContext(contextId) {
+        const searchMapUpdate = this._searchMap$.getValue();
+        const searchMap = searchMapUpdate.value;
+        if (searchMap.has(contextId)) {
+            searchMap.delete(contextId);
+            this._searchMap$.next({ value: searchMap, emit: false });
+        }
+    }
+    /***************************************************************************
+     *                                                                         *
+     * Private methods                                                         *
+     *                                                                         *
+     **************************************************************************/
     handleSearchParameters(params) {
         const searchParamKeys = this.extractSearchParameters(params);
         const searchMap = this.buildSearchContextMap(params, searchParamKeys);
-        this._searchMap$.next(searchMap);
+        this._searchMap$.next({ value: searchMap, emit: true });
         this._initialSearchMap$.next(searchMap);
     }
     extractSearchParameters(params) {
-        return Object.getOwnPropertyNames(params).filter(param => param.startsWith(this.searchParamPrefix));
+        return Object.getOwnPropertyNames(params).filter(param => param.startsWith(this.searchParamPrefix + "-"));
     }
     buildSearchContextMap(params, searchParamKeys) {
         const searchMap = new Map();
@@ -27012,9 +27004,26 @@ class ElderSearchUrlBindingService {
     convertValueToArray(value) {
         return value.slice(1).slice(0, -1).split(",");
     }
-    ngOnDestroy() {
-        this.unsubscribe$.next();
-        this.unsubscribe$.complete();
+    resetSearchParams() {
+        let params = { ...this.route.snapshot.queryParams };
+        const searchParams = this.extractSearchParameters(params);
+        for (const searchParam of searchParams) {
+            params[searchParam] = null;
+        }
+        return params;
+    }
+    buildQueryParams(searchMap) {
+        const params = {};
+        for (const searchContextId of searchMap.keys()) {
+            const filters = searchMap.get(searchContextId).filters;
+            for (const filter of filters.values()) {
+                params[`${this.searchParamPrefix}-${searchContextId}-${filter.key}`] = this.convertValueToArrayOrSingleValue(filter.value);
+            }
+        }
+        return params;
+    }
+    convertValueToArrayOrSingleValue(value) {
+        return Array.isArray(value) ? `(${value.toString()})` : value;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: ElderSearchUrlBindingService, deps: [{ token: i1$3.Router }, { token: i1$3.ActivatedRoute }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: ElderSearchUrlBindingService, providedIn: "root" }); }
@@ -27053,12 +27062,17 @@ class ElderSearchContextUrlBindingDirective {
      *                                                                         *
      **************************************************************************/
     ngAfterViewInit() {
-        this.urlBindingService.initialSearchMap$.pipe(first(), takeUntil(this._unsubscribe$), filter(searchMap => searchMap.has(this._urlBinding)), map(searchMap => searchMap.get(this._urlBinding)), map(filterMap => Array.from(filterMap.filters.values()))).subscribe(filters => {
-            this.searchContext.searchContextOrchestrator.addInitialFilters(filters);
-        });
-        this.searchContext.searchContextOrchestrator.filters.pipe(takeUntil(this._unsubscribe$)).subscribe(filters => this.urlBindingService.updateFiltersForContext(this._urlBinding, filters));
+        if (this._urlBinding) {
+            this.urlBindingService.initialSearchMap$.pipe(first(), takeUntil(this._unsubscribe$), filter(searchMap => searchMap.has(this._urlBinding)), map(searchMap => searchMap.get(this._urlBinding)), map(filterMap => Array.from(filterMap.filters.values()))).subscribe(filters => {
+                this.searchContext.filterContext.updateFilters(filters);
+                this.searchContext.applyModelToInputs();
+                // this.searchContext.searchFilterContext.addInitialFilters(filters)
+            });
+            this.searchContext.filterContext.filters.pipe(takeUntil(this._unsubscribe$)).subscribe(filters => this.urlBindingService.updateFiltersForContext(this._urlBinding, filters));
+        }
     }
     ngOnDestroy() {
+        this.urlBindingService.resetFilterForContext(this._urlBinding);
         this._unsubscribe$.next();
         this._unsubscribe$.complete();
     }