@elderbyte/ngx-starter 16.4.2 → 16.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/components/forms/search/domain/url/elder-search-url.directive.mjs +20 -9
- package/fesm2022/elderbyte-ngx-starter.mjs +18 -7
- package/fesm2022/elderbyte-ngx-starter.mjs.map +1 -1
- package/lib/components/forms/search/domain/url/elder-search-url.directive.d.ts +0 -1
- package/package.json +1 -1
|
@@ -1,10 +1,22 @@
|
|
|
1
1
|
import { Directive } from '@angular/core';
|
|
2
2
|
import { LoggerFactory } from '@elderbyte/ts-logger';
|
|
3
|
-
import {
|
|
3
|
+
import { map, takeUntil } from 'rxjs/operators';
|
|
4
4
|
import { Subject, switchMap } from 'rxjs';
|
|
5
5
|
import * as i0 from "@angular/core";
|
|
6
6
|
import * as i1 from "../../elder-search-context.directive";
|
|
7
7
|
import * as i2 from "./elder-search-url.service";
|
|
8
|
+
class ContextWithUrlFilters {
|
|
9
|
+
constructor(context, urlFilters) {
|
|
10
|
+
this.context = context;
|
|
11
|
+
this.urlFilters = urlFilters;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
class ContextWithUserFilters {
|
|
15
|
+
constructor(context, userFilters) {
|
|
16
|
+
this.context = context;
|
|
17
|
+
this.userFilters = userFilters;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
8
20
|
/**
|
|
9
21
|
* The search container manages a group of search-inputs
|
|
10
22
|
* and holds their values in a central search model.
|
|
@@ -24,9 +36,12 @@ export class ElderSearchUrlDirective {
|
|
|
24
36
|
**************************************************************************/
|
|
25
37
|
this.log = LoggerFactory.getLogger(this.constructor.name);
|
|
26
38
|
this.destroy$ = new Subject();
|
|
27
|
-
this.searchContextId = searchContextDirective.searchContextId;
|
|
28
39
|
this.searchContext$ = searchContextDirective.searchContext$;
|
|
29
|
-
this.searchContext$.pipe(
|
|
40
|
+
this.searchContext$.pipe(switchMap(ctx => this.searchUrlService.urlFiltersOfContext$(ctx.id).pipe(map(urlFilters => new ContextWithUrlFilters(ctx, urlFilters))))).subscribe({
|
|
41
|
+
next: ctxUrls => {
|
|
42
|
+
this.applyUrlFilters(ctxUrls.context, ctxUrls.urlFilters);
|
|
43
|
+
}
|
|
44
|
+
});
|
|
30
45
|
}
|
|
31
46
|
/***************************************************************************
|
|
32
47
|
* *
|
|
@@ -34,11 +49,7 @@ export class ElderSearchUrlDirective {
|
|
|
34
49
|
* *
|
|
35
50
|
**************************************************************************/
|
|
36
51
|
ngAfterViewInit() {
|
|
37
|
-
|
|
38
|
-
this.searchContext$.pipe(takeUntil(this.destroy$), switchMap(searchContext => searchContext.userFilters.filters)).subscribe(userFilters =>
|
|
39
|
-
// this.urlBindingService.updateFiltersForContext(this.searchContextId, userFilters)
|
|
40
|
-
this.searchUrlService.updateQueryParams(this.searchContextId, userFilters));
|
|
41
|
-
}
|
|
52
|
+
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));
|
|
42
53
|
}
|
|
43
54
|
ngOnDestroy() {
|
|
44
55
|
this.destroy$.next();
|
|
@@ -71,4 +82,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
71
82
|
exportAs: 'elderSearchUrl'
|
|
72
83
|
}]
|
|
73
84
|
}], ctorParameters: function () { return [{ type: i1.ElderSearchContextDirective }, { type: i2.ElderSearchUrlService }]; } });
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"elder-search-url.directive.js","sourceRoot":"","sources":["../../../../../../../../../../projects/elderbyte/ngx-starter/src/lib/components/forms/search/domain/url/elder-search-url.directive.ts"],"names":[],"mappings":"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","sourcesContent":["import {AfterViewInit, Directive, OnDestroy} from '@angular/core';\nimport {LoggerFactory} from '@elderbyte/ts-logger';\nimport {map, takeUntil} from 'rxjs/operators';\nimport {ElderSearchContextDirective} from '../../elder-search-context.directive';\nimport {Observable, Subject, switchMap} from 'rxjs';\nimport {SearchContext} from '../context/search-context';\nimport {ElderSearchUrlService, UrlFilters} from './elder-search-url.service';\nimport {Filter} from '../../../../../common/data/filters/filter';\n\nclass ContextWithUrlFilters {\n  constructor(\n    public readonly context: SearchContext,\n    public readonly urlFilters: UrlFilters,\n  ) {\n  }\n}\n\nclass ContextWithUserFilters {\n  constructor(\n    public readonly context: SearchContext,\n    public readonly userFilters: Filter[],\n  ) {\n  }\n}\n\n/**\n * The search container manages a group of search-inputs\n * and holds their values in a central search model.\n */\n@Directive({\n  selector: '[elderSearchUrl]',\n  exportAs: 'elderSearchUrl'\n})\nexport class ElderSearchUrlDirective implements AfterViewInit, OnDestroy {\n\n  /***************************************************************************\n   *                                                                         *\n   * Fields                                                                  *\n   *                                                                         *\n   **************************************************************************/\n\n  private readonly log = LoggerFactory.getLogger(this.constructor.name);\n\n  private readonly destroy$ = new Subject<void>();\n\n  private readonly searchContext$: Observable<SearchContext>;\n\n  /***************************************************************************\n   *                                                                         *\n   * Constructor                                                             *\n   *                                                                         *\n   **************************************************************************/\n\n  constructor(\n    searchContextDirective: ElderSearchContextDirective,\n    private readonly searchUrlService: ElderSearchUrlService\n  ) {\n    this.searchContext$ = searchContextDirective.searchContext$;\n    this.searchContext$.pipe(\n      switchMap(ctx => this.searchUrlService.urlFiltersOfContext$(ctx.id).pipe(\n        map(urlFilters => new ContextWithUrlFilters(ctx, urlFilters))\n      ))\n    ).subscribe({\n      next: ctxUrls => {\n        this.applyUrlFilters(ctxUrls.context, ctxUrls.urlFilters)\n      }\n    });\n  }\n\n\n  /***************************************************************************\n   *                                                                         *\n   * Life Cycle                                                              *\n   *                                                                         *\n   **************************************************************************/\n\n  public ngAfterViewInit(): void {\n    this.searchContext$.pipe(\n      takeUntil(this.destroy$),\n      switchMap(searchContext => searchContext.userFilters.filters.pipe(\n        map(filters => new ContextWithUserFilters(searchContext, filters))\n      ))\n    ).subscribe(ctxAndFilters =>\n      this.searchUrlService.updateQueryParams(ctxAndFilters.context.id, ctxAndFilters.userFilters)\n    );\n  }\n\n  public ngOnDestroy(): void {\n    this.destroy$.next();\n    this.destroy$.complete();\n  }\n\n  /***************************************************************************\n   *                                                                         *\n   * Private methods                                                         *\n   *                                                                         *\n   **************************************************************************/\n\n  private applyUrlFilters(\n    context: SearchContext,\n    urlFilters: UrlFilters\n  ): void {\n    if (!urlFilters.consumed) {\n      const consumedFilters = urlFilters.consumeFilters();\n      if(consumedFilters.length > 0){\n        this.log.info('URL SEARCH BINDING Replacing Filters: ', {\n          context: context,\n          urlFilters: consumedFilters\n        });\n        context.replaceUserFilters(consumedFilters);\n      }\n    }\n  }\n\n}\n\n"]}
|
|
@@ -27316,6 +27316,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
27316
27316
|
}]
|
|
27317
27317
|
}], ctorParameters: function () { return [{ type: i1$3.Router }]; } });
|
|
27318
27318
|
|
|
27319
|
+
class ContextWithUrlFilters {
|
|
27320
|
+
constructor(context, urlFilters) {
|
|
27321
|
+
this.context = context;
|
|
27322
|
+
this.urlFilters = urlFilters;
|
|
27323
|
+
}
|
|
27324
|
+
}
|
|
27325
|
+
class ContextWithUserFilters {
|
|
27326
|
+
constructor(context, userFilters) {
|
|
27327
|
+
this.context = context;
|
|
27328
|
+
this.userFilters = userFilters;
|
|
27329
|
+
}
|
|
27330
|
+
}
|
|
27319
27331
|
/**
|
|
27320
27332
|
* The search container manages a group of search-inputs
|
|
27321
27333
|
* and holds their values in a central search model.
|
|
@@ -27335,9 +27347,12 @@ class ElderSearchUrlDirective {
|
|
|
27335
27347
|
**************************************************************************/
|
|
27336
27348
|
this.log = LoggerFactory.getLogger(this.constructor.name);
|
|
27337
27349
|
this.destroy$ = new Subject();
|
|
27338
|
-
this.searchContextId = searchContextDirective.searchContextId;
|
|
27339
27350
|
this.searchContext$ = searchContextDirective.searchContext$;
|
|
27340
|
-
this.searchContext$.pipe(
|
|
27351
|
+
this.searchContext$.pipe(switchMap(ctx => this.searchUrlService.urlFiltersOfContext$(ctx.id).pipe(map(urlFilters => new ContextWithUrlFilters(ctx, urlFilters))))).subscribe({
|
|
27352
|
+
next: ctxUrls => {
|
|
27353
|
+
this.applyUrlFilters(ctxUrls.context, ctxUrls.urlFilters);
|
|
27354
|
+
}
|
|
27355
|
+
});
|
|
27341
27356
|
}
|
|
27342
27357
|
/***************************************************************************
|
|
27343
27358
|
* *
|
|
@@ -27345,11 +27360,7 @@ class ElderSearchUrlDirective {
|
|
|
27345
27360
|
* *
|
|
27346
27361
|
**************************************************************************/
|
|
27347
27362
|
ngAfterViewInit() {
|
|
27348
|
-
|
|
27349
|
-
this.searchContext$.pipe(takeUntil(this.destroy$), switchMap(searchContext => searchContext.userFilters.filters)).subscribe(userFilters =>
|
|
27350
|
-
// this.urlBindingService.updateFiltersForContext(this.searchContextId, userFilters)
|
|
27351
|
-
this.searchUrlService.updateQueryParams(this.searchContextId, userFilters));
|
|
27352
|
-
}
|
|
27363
|
+
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));
|
|
27353
27364
|
}
|
|
27354
27365
|
ngOnDestroy() {
|
|
27355
27366
|
this.destroy$.next();
|