@elderbyte/ngx-starter 18.4.0 → 18.4.1
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 +13 -13
- package/fesm2022/elderbyte-ngx-starter.mjs +9 -10
- package/fesm2022/elderbyte-ngx-starter.mjs.map +1 -1
- package/lib/components/forms/search/domain/url/elder-search-url.directive.d.ts +5 -5
- package/package.json +1 -1
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Directive } from '@angular/core';
|
|
2
2
|
import { LoggerFactory } from '@elderbyte/ts-logger';
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
3
|
+
import { filter, map } from 'rxjs/operators';
|
|
4
|
+
import { switchMap } from 'rxjs';
|
|
5
|
+
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
|
|
5
6
|
import * as i0 from "@angular/core";
|
|
6
7
|
import * as i1 from "../../elder-search-context.directive";
|
|
7
8
|
import * as i2 from "./elder-search-url.service";
|
|
@@ -27,7 +28,8 @@ export class ElderSearchUrlDirective {
|
|
|
27
28
|
* Constructor *
|
|
28
29
|
* *
|
|
29
30
|
**************************************************************************/
|
|
30
|
-
constructor(searchContextDirective, searchUrlService) {
|
|
31
|
+
constructor(searchContextDirective, destroyRef, searchUrlService) {
|
|
32
|
+
this.destroyRef = destroyRef;
|
|
31
33
|
this.searchUrlService = searchUrlService;
|
|
32
34
|
/***************************************************************************
|
|
33
35
|
* *
|
|
@@ -35,8 +37,7 @@ export class ElderSearchUrlDirective {
|
|
|
35
37
|
* *
|
|
36
38
|
**************************************************************************/
|
|
37
39
|
this.log = LoggerFactory.getLogger(this.constructor.name);
|
|
38
|
-
this.
|
|
39
|
-
this.searchContext$ = searchContextDirective.searchContext$;
|
|
40
|
+
this.searchContext$ = searchContextDirective.searchContext$.pipe(takeUntilDestroyed(destroyRef), filter(searchContext => this.contextSupportsSearchUrl(searchContext)));
|
|
40
41
|
this.searchContext$.pipe(switchMap(ctx => this.searchUrlService.urlFiltersOfContext$(ctx.id).pipe(map(urlFilters => new ContextWithUrlFilters(ctx, urlFilters))))).subscribe({
|
|
41
42
|
next: ctxUrls => {
|
|
42
43
|
this.applyUrlFilters(ctxUrls.context, ctxUrls.urlFilters);
|
|
@@ -49,11 +50,7 @@ export class ElderSearchUrlDirective {
|
|
|
49
50
|
* *
|
|
50
51
|
**************************************************************************/
|
|
51
52
|
ngAfterViewInit() {
|
|
52
|
-
this.searchContext$.pipe(
|
|
53
|
-
}
|
|
54
|
-
ngOnDestroy() {
|
|
55
|
-
this.destroy$.next();
|
|
56
|
-
this.destroy$.complete();
|
|
53
|
+
this.searchContext$.pipe(switchMap(searchContext => searchContext.userFilters$.pipe(map(filters => new ContextWithUserFilters(searchContext, filters))))).subscribe(ctxAndFilters => this.searchUrlService.updateQueryParams(ctxAndFilters.context.id, ctxAndFilters.userFilters));
|
|
57
54
|
}
|
|
58
55
|
/***************************************************************************
|
|
59
56
|
* *
|
|
@@ -72,7 +69,10 @@ export class ElderSearchUrlDirective {
|
|
|
72
69
|
}
|
|
73
70
|
}
|
|
74
71
|
}
|
|
75
|
-
|
|
72
|
+
contextSupportsSearchUrl(searchContext) {
|
|
73
|
+
return searchContext.id !== null && searchContext.id !== undefined; // Standalone Context has no id
|
|
74
|
+
}
|
|
75
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: ElderSearchUrlDirective, deps: [{ token: i1.ElderSearchContextDirective }, { token: i0.DestroyRef }, { token: i2.ElderSearchUrlService }], target: i0.ɵɵFactoryTarget.Directive }); }
|
|
76
76
|
static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.1.4", type: ElderSearchUrlDirective, isStandalone: true, selector: "[elderSearchUrl]", exportAs: ["elderSearchUrl"], ngImport: i0 }); }
|
|
77
77
|
}
|
|
78
78
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: ElderSearchUrlDirective, decorators: [{
|
|
@@ -82,5 +82,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.4", ngImpor
|
|
|
82
82
|
exportAs: 'elderSearchUrl',
|
|
83
83
|
standalone: true
|
|
84
84
|
}]
|
|
85
|
-
}], ctorParameters: () => [{ type: i1.ElderSearchContextDirective }, { type: i2.ElderSearchUrlService }] });
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
}], ctorParameters: () => [{ type: i1.ElderSearchContextDirective }, { type: i0.DestroyRef }, { type: i2.ElderSearchUrlService }] });
|
|
86
|
+
//# 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":"AAAA,OAAO,EAA4B,SAAS,EAAY,MAAM,eAAe,CAAC;AAC9E,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAC,MAAM,EAAE,GAAG,EAAY,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAsB,SAAS,EAAC,MAAM,MAAM,CAAC;AAIpD,OAAO,EAAC,kBAAkB,EAAC,MAAM,4BAA4B,CAAC;;;;AAE9D,MAAM,qBAAqB;IACzB,YACkB,OAAsB,EACtB,UAAsB;QADtB,YAAO,GAAP,OAAO,CAAe;QACtB,eAAU,GAAV,UAAU,CAAY;IAExC,CAAC;CACF;AAED,MAAM,sBAAsB;IAC1B,YACkB,OAAsB,EACtB,WAAqB;QADrB,YAAO,GAAP,OAAO,CAAe;QACtB,gBAAW,GAAX,WAAW,CAAU;IAEvC,CAAC;CACF;AAED;;;GAGG;AAMH,MAAM,OAAO,uBAAuB;IAYlC;;;;gFAI4E;IAE5E,YACE,sBAAmD,EAClC,UAAsB,EACtB,gBAAuC;QADvC,eAAU,GAAV,UAAU,CAAY;QACtB,qBAAgB,GAAhB,gBAAgB,CAAuB;QAnB1D;;;;oFAI4E;QAE3D,QAAG,GAAG,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAepE,IAAI,CAAC,cAAc,GAAG,sBAAsB,CAAC,cAAc,CAAC,IAAI,CAC9D,kBAAkB,CAAC,UAAU,CAAC,EAC9B,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC,CACtE,CAAC;QAEF,IAAI,CAAC,cAAc,CAAC,IAAI,CACtB,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CACtE,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,qBAAqB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAC9D,CAAC,CACH,CAAC,SAAS,CAAC;YACV,IAAI,EAAE,OAAO,CAAC,EAAE;gBACd,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;YAC3D,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED;;;;gFAI4E;IAErE,eAAe;QACpB,IAAI,CAAC,cAAc,CAAC,IAAI,CACtB,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,CACxD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,sBAAsB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CACnE,CAAC,CACH,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAC1B,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,aAAa,CAAC,WAAW,CAAC,CAC7F,CAAC;IACJ,CAAC;IAED;;;;gFAI4E;IAEpE,eAAe,CACrB,OAAsB,EACtB,UAAsB;QAEtB,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YACzB,MAAM,eAAe,GAAG,UAAU,CAAC,cAAc,EAAE,CAAC;YACpD,IAAG,eAAe,CAAC,MAAM,GAAG,CAAC,EAAC,CAAC;gBAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,wCAAwC,EAAE;oBACtD,OAAO,EAAE,OAAO;oBAChB,UAAU,EAAE,eAAe;iBAC5B,CAAC,CAAC;gBACH,OAAO,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;IACH,CAAC;IAEO,wBAAwB,CAAC,aAA4B;QAC3D,OAAO,aAAa,CAAC,EAAE,KAAK,IAAI,IAAI,aAAa,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,+BAA+B;IACrG,CAAC;8GA/EU,uBAAuB;kGAAvB,uBAAuB;;2FAAvB,uBAAuB;kBALnC,SAAS;mBAAC;oBACP,QAAQ,EAAE,kBAAkB;oBAC5B,QAAQ,EAAE,gBAAgB;oBAC1B,UAAU,EAAE,IAAI;iBACnB","sourcesContent":["import {AfterViewInit, DestroyRef, Directive, OnDestroy} from '@angular/core';\nimport {LoggerFactory} from '@elderbyte/ts-logger';\nimport {filter, 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';\nimport {takeUntilDestroyed} from '@angular/core/rxjs-interop';\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    standalone: true\n})\nexport class ElderSearchUrlDirective implements AfterViewInit {\n\n  /***************************************************************************\n   *                                                                         *\n   * Fields                                                                  *\n   *                                                                         *\n   **************************************************************************/\n\n  private readonly log = LoggerFactory.getLogger(this.constructor.name);\n\n  private readonly searchContext$: Observable<SearchContext>;\n\n  /***************************************************************************\n   *                                                                         *\n   * Constructor                                                             *\n   *                                                                         *\n   **************************************************************************/\n\n  constructor(\n    searchContextDirective: ElderSearchContextDirective,\n    private readonly destroyRef: DestroyRef,\n    private readonly searchUrlService: ElderSearchUrlService\n  ) {\n    this.searchContext$ = searchContextDirective.searchContext$.pipe(\n      takeUntilDestroyed(destroyRef),\n      filter(searchContext => this.contextSupportsSearchUrl(searchContext)),\n    );\n\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   * Life Cycle                                                              *\n   *                                                                         *\n   **************************************************************************/\n\n  public ngAfterViewInit(): void {\n    this.searchContext$.pipe(\n      switchMap(searchContext => searchContext.userFilters$.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  /***************************************************************************\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  private contextSupportsSearchUrl(searchContext: SearchContext): boolean {\n    return searchContext.id !== null && searchContext.id !== undefined; // Standalone Context has no id\n  }\n\n}\n\n"]}
|
|
@@ -29567,7 +29567,8 @@ class ElderSearchUrlDirective {
|
|
|
29567
29567
|
* Constructor *
|
|
29568
29568
|
* *
|
|
29569
29569
|
**************************************************************************/
|
|
29570
|
-
constructor(searchContextDirective, searchUrlService) {
|
|
29570
|
+
constructor(searchContextDirective, destroyRef, searchUrlService) {
|
|
29571
|
+
this.destroyRef = destroyRef;
|
|
29571
29572
|
this.searchUrlService = searchUrlService;
|
|
29572
29573
|
/***************************************************************************
|
|
29573
29574
|
* *
|
|
@@ -29575,8 +29576,7 @@ class ElderSearchUrlDirective {
|
|
|
29575
29576
|
* *
|
|
29576
29577
|
**************************************************************************/
|
|
29577
29578
|
this.log = LoggerFactory.getLogger(this.constructor.name);
|
|
29578
|
-
this.
|
|
29579
|
-
this.searchContext$ = searchContextDirective.searchContext$;
|
|
29579
|
+
this.searchContext$ = searchContextDirective.searchContext$.pipe(takeUntilDestroyed(destroyRef), filter(searchContext => this.contextSupportsSearchUrl(searchContext)));
|
|
29580
29580
|
this.searchContext$.pipe(switchMap(ctx => this.searchUrlService.urlFiltersOfContext$(ctx.id).pipe(map(urlFilters => new ContextWithUrlFilters(ctx, urlFilters))))).subscribe({
|
|
29581
29581
|
next: ctxUrls => {
|
|
29582
29582
|
this.applyUrlFilters(ctxUrls.context, ctxUrls.urlFilters);
|
|
@@ -29589,11 +29589,7 @@ class ElderSearchUrlDirective {
|
|
|
29589
29589
|
* *
|
|
29590
29590
|
**************************************************************************/
|
|
29591
29591
|
ngAfterViewInit() {
|
|
29592
|
-
this.searchContext$.pipe(
|
|
29593
|
-
}
|
|
29594
|
-
ngOnDestroy() {
|
|
29595
|
-
this.destroy$.next();
|
|
29596
|
-
this.destroy$.complete();
|
|
29592
|
+
this.searchContext$.pipe(switchMap(searchContext => searchContext.userFilters$.pipe(map(filters => new ContextWithUserFilters(searchContext, filters))))).subscribe(ctxAndFilters => this.searchUrlService.updateQueryParams(ctxAndFilters.context.id, ctxAndFilters.userFilters));
|
|
29597
29593
|
}
|
|
29598
29594
|
/***************************************************************************
|
|
29599
29595
|
* *
|
|
@@ -29612,7 +29608,10 @@ class ElderSearchUrlDirective {
|
|
|
29612
29608
|
}
|
|
29613
29609
|
}
|
|
29614
29610
|
}
|
|
29615
|
-
|
|
29611
|
+
contextSupportsSearchUrl(searchContext) {
|
|
29612
|
+
return searchContext.id !== null && searchContext.id !== undefined; // Standalone Context has no id
|
|
29613
|
+
}
|
|
29614
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: ElderSearchUrlDirective, deps: [{ token: ElderSearchContextDirective }, { token: i0.DestroyRef }, { token: ElderSearchUrlService }], target: i0.ɵɵFactoryTarget.Directive }); }
|
|
29616
29615
|
static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.1.4", type: ElderSearchUrlDirective, isStandalone: true, selector: "[elderSearchUrl]", exportAs: ["elderSearchUrl"], ngImport: i0 }); }
|
|
29617
29616
|
}
|
|
29618
29617
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: ElderSearchUrlDirective, decorators: [{
|
|
@@ -29622,7 +29621,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.4", ngImpor
|
|
|
29622
29621
|
exportAs: 'elderSearchUrl',
|
|
29623
29622
|
standalone: true
|
|
29624
29623
|
}]
|
|
29625
|
-
}], ctorParameters: () => [{ type: ElderSearchContextDirective }, { type: ElderSearchUrlService }] });
|
|
29624
|
+
}], ctorParameters: () => [{ type: ElderSearchContextDirective }, { type: i0.DestroyRef }, { type: ElderSearchUrlService }] });
|
|
29626
29625
|
|
|
29627
29626
|
// Because of AOT Compiler
|
|
29628
29627
|
function initSearchUrlService(searchUrlService) {
|