@elderbyte/ngx-starter 14.6.0 → 14.7.0
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/esm2020/lib/common/data/data-context/data-context-active-page.mjs +1 -1
- package/esm2020/lib/common/data/data-context/data-context-base.mjs +2 -2
- package/esm2020/lib/common/data/data-context/data-context-continuable-base.mjs +1 -1
- package/esm2020/lib/common/data/data-context/data-context.mjs +1 -1
- package/esm2020/lib/common/data/datasource/data-source-adapter.mjs +1 -1
- package/esm2020/lib/common/data/datasource/data-source-processor.mjs +1 -1
- package/esm2020/lib/common/data/datasource/data-source.mjs +1 -1
- package/esm2020/lib/common/data/datasource/fetcher/delegate-data-source.mjs +1 -1
- package/esm2020/lib/common/data/datasource/local/local-list-data-source.mjs +1 -1
- package/esm2020/lib/common/data/datasource/local/local-paged-data-source.mjs +1 -1
- package/esm2020/lib/common/data/datasource/rest/rest-client.mjs +2 -2
- package/esm2020/lib/common/data/filters/filter-context.mjs +141 -0
- package/esm2020/lib/common/data/filters/filter.mjs +109 -0
- package/esm2020/lib/common/data/http-params-builder.mjs +2 -2
- package/esm2020/lib/common/data/public_api.mjs +3 -3
- package/esm2020/lib/common/data/required-filter-evaluator.mjs +1 -1
- package/esm2020/lib/common/data/token-chunk-request.mjs +1 -1
- package/esm2020/lib/common/utils/filter-util.mjs +1 -1
- package/esm2020/lib/components/csv/elder-csv-export-btn/elder-csv-export-btn.component.mjs +1 -1
- package/esm2020/lib/components/csv/elder-csv-stream-exporter.mjs +1 -1
- package/esm2020/lib/components/data-view/base/elder-data-view-options.mjs +1 -1
- package/esm2020/lib/components/forms/search/elder-search-context.directive.mjs +33 -19
- package/esm2020/lib/components/http-support/elder-http-client.service.mjs +1 -1
- package/esm2020/lib/components/input/autocomplete/elder-autocomplete-many.directive.mjs +2 -2
- package/esm2020/lib/components/input/autocomplete/elder-autocomplete.directive.mjs +2 -2
- package/esm2020/lib/components/measures/directives/elder-unit-select.directive.mjs +2 -2
- package/esm2020/lib/components/select/elder-select-base.mjs +2 -2
- package/esm2020/lib/components/select/popup/selection-model-popup.directive.mjs +1 -1
- package/fesm2015/elderbyte-ngx-starter.mjs +90 -27
- package/fesm2015/elderbyte-ngx-starter.mjs.map +1 -1
- package/fesm2020/elderbyte-ngx-starter.mjs +90 -27
- package/fesm2020/elderbyte-ngx-starter.mjs.map +1 -1
- package/lib/common/data/data-context/data-context-active-page.d.ts +1 -1
- package/lib/common/data/data-context/data-context-base.d.ts +2 -2
- package/lib/common/data/data-context/data-context-continuable-base.d.ts +1 -1
- package/lib/common/data/data-context/data-context.d.ts +2 -2
- package/lib/common/data/datasource/data-source-adapter.d.ts +1 -1
- package/lib/common/data/datasource/data-source-processor.d.ts +1 -1
- package/lib/common/data/datasource/data-source.d.ts +1 -1
- package/lib/common/data/datasource/fetcher/delegate-data-source.d.ts +1 -1
- package/lib/common/data/datasource/local/local-list-data-source.d.ts +1 -1
- package/lib/common/data/datasource/local/local-paged-data-source.d.ts +1 -1
- package/lib/common/data/datasource/rest/rest-client.d.ts +1 -1
- package/lib/common/data/{filter-context.d.ts → filters/filter-context.d.ts} +3 -1
- package/lib/common/data/{filter.d.ts → filters/filter.d.ts} +15 -3
- package/lib/common/data/http-params-builder.d.ts +1 -1
- package/lib/common/data/public_api.d.ts +2 -2
- package/lib/common/data/required-filter-evaluator.d.ts +2 -2
- package/lib/common/data/token-chunk-request.d.ts +1 -1
- package/lib/common/utils/filter-util.d.ts +1 -1
- package/lib/components/csv/elder-csv-export-btn/elder-csv-export-btn.component.d.ts +1 -1
- package/lib/components/csv/elder-csv-stream-exporter.d.ts +1 -1
- package/lib/components/data-view/base/elder-data-view-options.d.ts +1 -1
- package/lib/components/forms/search/elder-search-context.directive.d.ts +15 -12
- package/lib/components/http-support/elder-http-client.service.d.ts +1 -1
- package/lib/components/input/autocomplete/elder-autocomplete-many.directive.d.ts +1 -1
- package/lib/components/input/autocomplete/elder-autocomplete.directive.d.ts +1 -1
- package/lib/components/select/elder-select-base.d.ts +1 -1
- package/lib/components/select/popup/selection-model-popup.directive.d.ts +1 -1
- package/package.json +1 -1
- package/esm2020/lib/common/data/filter-context.mjs +0 -129
- package/esm2020/lib/common/data/filter.mjs +0 -72
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DataContextBase } from './data-context-base';
|
|
2
2
|
import { PageRequest } from '../page';
|
|
3
|
-
import { Filter } from '../filter';
|
|
3
|
+
import { Filter } from '../filters/filter';
|
|
4
4
|
import { Observable } from 'rxjs';
|
|
5
5
|
import { IDataContextActivePage } from './data-context';
|
|
6
6
|
import { Sort } from '../sort';
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Filter } from '../filter';
|
|
1
|
+
import { Filter } from '../filters/filter';
|
|
2
2
|
import { Sort } from '../sort';
|
|
3
3
|
import { CollectionViewer, DataSource } from '@angular/cdk/collections';
|
|
4
4
|
import { DataContextStatus } from './data-context-status';
|
|
5
5
|
import { Observable, Subject } from 'rxjs';
|
|
6
|
-
import { FilterContext } from '../filter-context';
|
|
6
|
+
import { FilterContext } from '../filters/filter-context';
|
|
7
7
|
import { DataContextSnapshot, IDataContext } from './data-context';
|
|
8
8
|
import { SortContext } from '../sort-context';
|
|
9
9
|
import { IDataSource } from '../datasource/data-source';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DataContextBase } from './data-context-base';
|
|
2
2
|
import { Sort } from '../sort';
|
|
3
|
-
import { Filter } from '../filter';
|
|
3
|
+
import { Filter } from '../filters/filter';
|
|
4
4
|
import { Observable } from 'rxjs';
|
|
5
5
|
import { IDataContextContinuable } from './data-context';
|
|
6
6
|
import { IDataSource } from '../datasource/data-source';
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { DataContextStatus } from './data-context-status';
|
|
2
2
|
import { Observable } from 'rxjs';
|
|
3
3
|
import { Sort } from '../sort';
|
|
4
|
-
import { Filter } from '../filter';
|
|
5
|
-
import { FilterContext } from '../filter-context';
|
|
4
|
+
import { Filter } from '../filters/filter';
|
|
5
|
+
import { FilterContext } from '../filters/filter-context';
|
|
6
6
|
import { PageRequest } from '../page';
|
|
7
7
|
import { SortContext } from '../sort-context';
|
|
8
8
|
import { IDataSource } from '../datasource/data-source';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IDataSource } from './data-source';
|
|
2
2
|
import { Observable } from 'rxjs';
|
|
3
|
-
import { Filter } from '../filter';
|
|
3
|
+
import { Filter } from '../filters/filter';
|
|
4
4
|
import { Sort } from '../sort';
|
|
5
5
|
export declare class DataSourceAdapter<T> {
|
|
6
6
|
private readonly dataSource;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IContinuableDataSource, IDataSource, IListDataSource, IPagedDataSource } from './data-source';
|
|
2
2
|
import { Page } from '../page';
|
|
3
|
-
import { Filter } from '../filter';
|
|
3
|
+
import { Filter } from '../filters/filter';
|
|
4
4
|
import { ContinuableListing } from '../continuable-listing';
|
|
5
5
|
import { Sort } from '../sort';
|
|
6
6
|
import { Observable } from 'rxjs/internal/Observable';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Observable } from 'rxjs';
|
|
2
2
|
import { Sort } from '../sort';
|
|
3
|
-
import { Filter } from '../filter';
|
|
3
|
+
import { Filter } from '../filters/filter';
|
|
4
4
|
import { Page, Pageable } from '../page';
|
|
5
5
|
import { TokenChunkRequest } from '../token-chunk-request';
|
|
6
6
|
import { ContinuableListing } from '../continuable-listing';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IContinuableDataSource, IDataSource, IListDataSource, IPagedDataSource } from '../data-source';
|
|
2
2
|
import { Observable } from 'rxjs';
|
|
3
|
-
import { Filter } from '../../filter';
|
|
3
|
+
import { Filter } from '../../filters/filter';
|
|
4
4
|
import { Sort } from '../../sort';
|
|
5
5
|
import { Page, Pageable } from '../../page';
|
|
6
6
|
import { TokenChunkRequest } from '../../token-chunk-request';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { HttpClient, HttpParams } from '@angular/common/http';
|
|
2
2
|
import { Observable } from 'rxjs';
|
|
3
3
|
import { Sort } from '../../sort';
|
|
4
|
-
import { Filter } from '../../filter';
|
|
4
|
+
import { Filter } from '../../filters/filter';
|
|
5
5
|
import { Page, Pageable } from '../../page';
|
|
6
6
|
import { ContinuableListing } from '../../continuable-listing';
|
|
7
7
|
import { TokenChunkRequest } from '../../token-chunk-request';
|
|
@@ -6,7 +6,7 @@ export declare class FilterContext {
|
|
|
6
6
|
* Fields *
|
|
7
7
|
* *
|
|
8
8
|
**************************************************************************/
|
|
9
|
-
private readonly _filters
|
|
9
|
+
private readonly _filters$;
|
|
10
10
|
/***************************************************************************
|
|
11
11
|
* *
|
|
12
12
|
* Static Utilities *
|
|
@@ -52,6 +52,8 @@ export declare class FilterContext {
|
|
|
52
52
|
*/
|
|
53
53
|
replaceFilters(newFilters?: Filter[]): void;
|
|
54
54
|
clear(): void;
|
|
55
|
+
mergeFilters(filters: Filter[]): void;
|
|
56
|
+
mergeFilter(filter: Filter): void;
|
|
55
57
|
/***************************************************************************
|
|
56
58
|
* *
|
|
57
59
|
* Private methods *
|
|
@@ -22,13 +22,19 @@ export declare class Filter {
|
|
|
22
22
|
constructor(key: string, value: string | string[] | null);
|
|
23
23
|
/***************************************************************************
|
|
24
24
|
* *
|
|
25
|
-
*
|
|
25
|
+
* Public API *
|
|
26
26
|
* *
|
|
27
27
|
**************************************************************************/
|
|
28
|
+
static merge(current: Filter, forcedFilter: Filter): Filter;
|
|
29
|
+
/**
|
|
30
|
+
* Checks if this filter supports multiple values.
|
|
31
|
+
* @param filter
|
|
32
|
+
*/
|
|
33
|
+
static isMulti(filter: Filter): boolean;
|
|
28
34
|
/**
|
|
29
35
|
* Checks if this filter has a value.
|
|
30
|
-
* This is the case when the value is non
|
|
31
|
-
* in case
|
|
36
|
+
* This is the case when the value is non-null and
|
|
37
|
+
* in case it's an array, also non-empty.
|
|
32
38
|
*/
|
|
33
39
|
static hasValue(self: Filter): boolean;
|
|
34
40
|
/**
|
|
@@ -37,4 +43,10 @@ export declare class Filter {
|
|
|
37
43
|
* @param other
|
|
38
44
|
*/
|
|
39
45
|
static equals(self: Filter, other: Filter): boolean;
|
|
46
|
+
/***************************************************************************
|
|
47
|
+
* *
|
|
48
|
+
* Private methods *
|
|
49
|
+
* *
|
|
50
|
+
**************************************************************************/
|
|
51
|
+
private static addValuesToSet;
|
|
40
52
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Filter } from './filter';
|
|
1
|
+
import { Filter } from './filters/filter';
|
|
2
2
|
import { Observable } from 'rxjs';
|
|
3
|
-
import { FilterContext } from './filter-context';
|
|
3
|
+
import { FilterContext } from './filters/filter-context';
|
|
4
4
|
export declare class RequiredFilterContextChangedEvent {
|
|
5
5
|
readonly requiredFilters: Array<string[]>;
|
|
6
6
|
readonly currentFilters: Filter[];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { OnInit } from '@angular/core';
|
|
2
2
|
import { IDataSource } from '../../../common/data/datasource/data-source';
|
|
3
|
-
import { Filter } from '../../../common/data/filter';
|
|
3
|
+
import { Filter } from '../../../common/data/filters/filter';
|
|
4
4
|
import { Sort } from '../../../common/data/sort';
|
|
5
5
|
import { CsvSpec } from '../../../common/csv/csv-spec';
|
|
6
6
|
import { CsvStreamExporterBuilderService } from '../elder-csv-stream-exporter-builder.service';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IDataSource } from '../../common/data/datasource/data-source';
|
|
2
|
-
import { Filter } from '../../common/data/filter';
|
|
2
|
+
import { Filter } from '../../common/data/filters/filter';
|
|
3
3
|
import { Sort } from '../../common/data/sort';
|
|
4
4
|
import { CsvSpec } from '../../common/csv/csv-spec';
|
|
5
5
|
import { TranslateService } from '@ngx-translate/core';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Sort } from '../../../common/data/sort';
|
|
2
|
-
import { Filter } from '../../../common/data/filter';
|
|
2
|
+
import { Filter } from '../../../common/data/filters/filter';
|
|
3
3
|
import { ElderDataViewInteractionMode } from '../elder-data-view-interaction-mode';
|
|
4
4
|
/**
|
|
5
5
|
* Options for supporting data view components.
|
|
@@ -1,38 +1,32 @@
|
|
|
1
|
-
import { AfterViewInit, OnDestroy
|
|
1
|
+
import { AfterViewInit, OnDestroy } from '@angular/core';
|
|
2
2
|
import { Observable } from 'rxjs/internal/Observable';
|
|
3
3
|
import { SearchInput } from './model/search-input';
|
|
4
|
-
import { Filter } from '../../../common/data/filter';
|
|
5
|
-
import { FilterContext } from '../../../common/data/filter-context';
|
|
4
|
+
import { Filter } from '../../../common/data/filters/filter';
|
|
5
|
+
import { FilterContext } from '../../../common/data/filters/filter-context';
|
|
6
6
|
import { SearchInputState } from './model/search-input-state';
|
|
7
7
|
import * as i0 from "@angular/core";
|
|
8
8
|
/**
|
|
9
9
|
* The search container manages a group of search-inputs
|
|
10
10
|
* and holds their values in a central search model.
|
|
11
11
|
*/
|
|
12
|
-
export declare class ElderSearchContextDirective implements
|
|
12
|
+
export declare class ElderSearchContextDirective implements AfterViewInit, OnDestroy {
|
|
13
13
|
/***************************************************************************
|
|
14
14
|
* *
|
|
15
15
|
* Fields *
|
|
16
16
|
* *
|
|
17
17
|
**************************************************************************/
|
|
18
|
+
private forcedFilters$;
|
|
18
19
|
private readonly log;
|
|
19
20
|
private readonly unsubscribe$;
|
|
20
21
|
private readonly _searchInputs;
|
|
21
22
|
private readonly _searchStates;
|
|
22
23
|
private readonly _filters;
|
|
23
24
|
private _filterContext;
|
|
24
|
-
/***************************************************************************
|
|
25
|
-
* *
|
|
26
|
-
* Constructor *
|
|
27
|
-
* *
|
|
28
|
-
**************************************************************************/
|
|
29
|
-
constructor();
|
|
30
25
|
/***************************************************************************
|
|
31
26
|
* *
|
|
32
27
|
* Life Cycle *
|
|
33
28
|
* *
|
|
34
29
|
**************************************************************************/
|
|
35
|
-
ngOnInit(): void;
|
|
36
30
|
ngAfterViewInit(): void;
|
|
37
31
|
ngOnDestroy(): void;
|
|
38
32
|
/***************************************************************************
|
|
@@ -42,6 +36,14 @@ export declare class ElderSearchContextDirective implements OnInit, AfterViewIni
|
|
|
42
36
|
**************************************************************************/
|
|
43
37
|
set filterContext(value: FilterContext);
|
|
44
38
|
get filterContext(): FilterContext;
|
|
39
|
+
/**
|
|
40
|
+
* Forced filters are always merged into the final FilterContext.
|
|
41
|
+
*
|
|
42
|
+
* This means they override user defined filters, but attempt
|
|
43
|
+
* to also keep the users intent (by merging) them.
|
|
44
|
+
*/
|
|
45
|
+
set forcedFilters(filters: Filter[]);
|
|
46
|
+
get forcedFilters(): Filter[];
|
|
45
47
|
get attributes(): Observable<SearchInput[]>;
|
|
46
48
|
get attributesSnapshot(): SearchInput[];
|
|
47
49
|
get states$(): Observable<SearchInputState[]>;
|
|
@@ -71,6 +73,7 @@ export declare class ElderSearchContextDirective implements OnInit, AfterViewIni
|
|
|
71
73
|
* *
|
|
72
74
|
**************************************************************************/
|
|
73
75
|
private convertToFilters;
|
|
76
|
+
private applyFilters;
|
|
74
77
|
static ɵfac: i0.ɵɵFactoryDeclaration<ElderSearchContextDirective, never>;
|
|
75
|
-
static ɵdir: i0.ɵɵDirectiveDeclaration<ElderSearchContextDirective, "[elderSearchContext]", ["elderSearchContext"], { "filterContext": "elderSearchContext"; }, {}, never, never, false>;
|
|
78
|
+
static ɵdir: i0.ɵɵDirectiveDeclaration<ElderSearchContextDirective, "[elderSearchContext]", ["elderSearchContext"], { "filterContext": "elderSearchContext"; "forcedFilters": "forcedFilters"; }, {}, never, never, false>;
|
|
76
79
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Page, Pageable } from '../../common/data/page';
|
|
2
|
-
import { Filter } from '../../common/data/filter';
|
|
2
|
+
import { Filter } from '../../common/data/filters/filter';
|
|
3
3
|
import { HttpClient, HttpParams } from '@angular/common/http';
|
|
4
4
|
import { Observable } from 'rxjs';
|
|
5
5
|
import * as i0 from "@angular/core";
|
|
@@ -2,7 +2,7 @@ import { ElementRef, OnDestroy, OnInit } from '@angular/core';
|
|
|
2
2
|
import { Subject } from 'rxjs';
|
|
3
3
|
import { ElderAutocompleteComponent } from './elder-autocomplete/elder-autocomplete.component';
|
|
4
4
|
import { MatAutocompleteTrigger } from '@angular/material/autocomplete';
|
|
5
|
-
import { Filter } from '../../../common/data/filter';
|
|
5
|
+
import { Filter } from '../../../common/data/filters/filter';
|
|
6
6
|
import { Sort } from '../../../common/data/sort';
|
|
7
7
|
import { TextResolverFn } from '../../select/elder-select-base';
|
|
8
8
|
import * as i0 from "@angular/core";
|
|
@@ -2,7 +2,7 @@ import { OnDestroy, OnInit } from '@angular/core';
|
|
|
2
2
|
import { MatAutocompleteTrigger } from '@angular/material/autocomplete';
|
|
3
3
|
import { ElderAutocompleteComponent } from './elder-autocomplete/elder-autocomplete.component';
|
|
4
4
|
import { Subject } from 'rxjs';
|
|
5
|
-
import { Filter } from '../../../common/data/filter';
|
|
5
|
+
import { Filter } from '../../../common/data/filters/filter';
|
|
6
6
|
import { IDataContext } from '../../../common/data/data-context/data-context';
|
|
7
7
|
import { Sort } from '../../../common/data/sort';
|
|
8
8
|
import * as i0 from "@angular/core";
|
|
@@ -2,7 +2,7 @@ import { ElementRef, EventEmitter, InjectionToken, NgZone, TemplateRef } from '@
|
|
|
2
2
|
import { BehaviorSubject, Observable } from 'rxjs';
|
|
3
3
|
import { IDataContext } from '../../common/data/data-context/data-context';
|
|
4
4
|
import { IDataSource } from '../../common/data/datasource/data-source';
|
|
5
|
-
import { Filter } from '../../common/data/filter';
|
|
5
|
+
import { Filter } from '../../common/data/filters/filter';
|
|
6
6
|
import { Sort } from '../../common/data/sort';
|
|
7
7
|
import { SelectionModelPopupDirective } from './popup/selection-model-popup.directive';
|
|
8
8
|
import { DataContextStatus } from '../../common/data/data-context/data-context-status';
|
|
@@ -3,7 +3,7 @@ import { MatDialog } from '@angular/material/dialog';
|
|
|
3
3
|
import { Observable } from 'rxjs';
|
|
4
4
|
import { KeyGetterFn, SelectionModel } from '../../../common/selection/selection-model';
|
|
5
5
|
import { Sort } from '../../../common/data/sort';
|
|
6
|
-
import { Filter } from '../../../common/data/filter';
|
|
6
|
+
import { Filter } from '../../../common/data/filters/filter';
|
|
7
7
|
import { ElderDataViewOptionsProvider } from '../../data-view/base/elder-data-view-options-provider';
|
|
8
8
|
import * as i0 from "@angular/core";
|
|
9
9
|
export declare function createSelectionModel(): SelectionModel<any>;
|
package/package.json
CHANGED
|
@@ -1,129 +0,0 @@
|
|
|
1
|
-
import { Filter } from './filter';
|
|
2
|
-
import { BehaviorSubject } from 'rxjs';
|
|
3
|
-
import { distinctUntilChanged } from 'rxjs/operators';
|
|
4
|
-
export class FilterContext {
|
|
5
|
-
constructor() {
|
|
6
|
-
/***************************************************************************
|
|
7
|
-
* *
|
|
8
|
-
* Fields *
|
|
9
|
-
* *
|
|
10
|
-
**************************************************************************/
|
|
11
|
-
this._filters = new BehaviorSubject([]);
|
|
12
|
-
}
|
|
13
|
-
/***************************************************************************
|
|
14
|
-
* *
|
|
15
|
-
* Static Utilities *
|
|
16
|
-
* *
|
|
17
|
-
**************************************************************************/
|
|
18
|
-
/**
|
|
19
|
-
* Update the given filters with new ones, merging the two.
|
|
20
|
-
* The updated filters take precedence.
|
|
21
|
-
* @param filters
|
|
22
|
-
* @param updatedFilters
|
|
23
|
-
*/
|
|
24
|
-
static updateFilters(filters, updatedFilters) {
|
|
25
|
-
const filterMap = new Map();
|
|
26
|
-
if (filters) {
|
|
27
|
-
filters.forEach(f => filterMap.set(f.key, f));
|
|
28
|
-
}
|
|
29
|
-
if (updatedFilters) {
|
|
30
|
-
updatedFilters.forEach(f => {
|
|
31
|
-
if (Filter.hasValue(f)) {
|
|
32
|
-
filterMap.set(f.key, f);
|
|
33
|
-
}
|
|
34
|
-
else {
|
|
35
|
-
if (filterMap.has(f.key)) {
|
|
36
|
-
filterMap.delete(f.key);
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
});
|
|
40
|
-
}
|
|
41
|
-
return Array.from(filterMap.values());
|
|
42
|
-
}
|
|
43
|
-
/***************************************************************************
|
|
44
|
-
* *
|
|
45
|
-
* Read API *
|
|
46
|
-
* *
|
|
47
|
-
**************************************************************************/
|
|
48
|
-
get filters() {
|
|
49
|
-
return this._filters.asObservable().pipe(distinctUntilChanged((a, b) => this.equals(a, b)));
|
|
50
|
-
}
|
|
51
|
-
get filtersSnapshot() {
|
|
52
|
-
return this._filters.getValue();
|
|
53
|
-
}
|
|
54
|
-
findFilterValue(key) {
|
|
55
|
-
const f = this.findFilter(key);
|
|
56
|
-
return f ? f.value : undefined;
|
|
57
|
-
}
|
|
58
|
-
findFilter(key) {
|
|
59
|
-
return this.filtersSnapshot
|
|
60
|
-
.filter(f => f.key === key)
|
|
61
|
-
.find(first => true);
|
|
62
|
-
}
|
|
63
|
-
/***************************************************************************
|
|
64
|
-
* *
|
|
65
|
-
* Public API *
|
|
66
|
-
* *
|
|
67
|
-
**************************************************************************/
|
|
68
|
-
removeFilter(key) {
|
|
69
|
-
const current = this.filtersSnapshot;
|
|
70
|
-
const newFilters = current.filter(f => f.key !== key);
|
|
71
|
-
if (current.length !== newFilters.length) {
|
|
72
|
-
this.replaceFilters(newFilters);
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
/**
|
|
76
|
-
* This method updatees / adds the given filter, leaving
|
|
77
|
-
* existing ones untouched.
|
|
78
|
-
* @param updatedFilter
|
|
79
|
-
*/
|
|
80
|
-
updateFilter(updatedFilter) {
|
|
81
|
-
if (updatedFilter) {
|
|
82
|
-
this.updateFilters([updatedFilter]);
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
/**
|
|
86
|
-
* This method updates / adds the given filters, leaving
|
|
87
|
-
* existing ones untouched.
|
|
88
|
-
* @param updatedFilters
|
|
89
|
-
*/
|
|
90
|
-
updateFilters(updatedFilters) {
|
|
91
|
-
if (updatedFilters && updatedFilters.length > 0) {
|
|
92
|
-
this.replaceFilters(FilterContext.updateFilters(this.filtersSnapshot, updatedFilters));
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
/**
|
|
96
|
-
* Replace all existing filters with the given new ones.
|
|
97
|
-
* @param newFilters
|
|
98
|
-
*/
|
|
99
|
-
replaceFilters(newFilters) {
|
|
100
|
-
this._filters.next(newFilters || []);
|
|
101
|
-
}
|
|
102
|
-
clear() {
|
|
103
|
-
this.replaceFilters([]);
|
|
104
|
-
}
|
|
105
|
-
/***************************************************************************
|
|
106
|
-
* *
|
|
107
|
-
* Private methods *
|
|
108
|
-
* *
|
|
109
|
-
**************************************************************************/
|
|
110
|
-
equals(aFilters, bFilters) {
|
|
111
|
-
if (aFilters.length !== bFilters.length) {
|
|
112
|
-
return false;
|
|
113
|
-
}
|
|
114
|
-
if (aFilters.length === 0 && bFilters.length === 0) {
|
|
115
|
-
return true;
|
|
116
|
-
}
|
|
117
|
-
// The both filter arrays have the same length, so we must compare them by value
|
|
118
|
-
const bIndex = new Map();
|
|
119
|
-
bFilters.forEach(f => bIndex.set(f.key, f));
|
|
120
|
-
for (const fa of aFilters) {
|
|
121
|
-
const bFilter = bIndex.get(fa.key);
|
|
122
|
-
if (!Filter.equals(bFilter, fa)) {
|
|
123
|
-
return false;
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
return true;
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"filter-context.js","sourceRoot":"","sources":["../../../../../../../projects/elderbyte/ngx-starter/src/lib/common/data/filter-context.ts"],"names":[],"mappings":"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","sourcesContent":["import {Filter} from './filter';\nimport {BehaviorSubject, Observable} from 'rxjs';\nimport {distinctUntilChanged} from 'rxjs/operators';\n\nexport class FilterContext {\n\n  /***************************************************************************\n   *                                                                         *\n   * Fields                                                                  *\n   *                                                                         *\n   **************************************************************************/\n\n  private readonly _filters = new BehaviorSubject<Filter[]>([]);\n\n  /***************************************************************************\n   *                                                                         *\n   * Static Utilities                                                        *\n   *                                                                         *\n   **************************************************************************/\n\n  /**\n   * Update the given filters with new ones, merging the two.\n   * The updated filters take precedence.\n   * @param filters\n   * @param updatedFilters\n   */\n  public static updateFilters(filters: Filter[], updatedFilters: Filter[]): Filter[] {\n    const filterMap = new Map<string, Filter>();\n\n    if (filters) {\n      filters.forEach(f => filterMap.set(f.key, f));\n    }\n\n    if (updatedFilters) {\n      updatedFilters.forEach(f => {\n        if (Filter.hasValue(f)) {\n          filterMap.set(f.key, f);\n        } else {\n          if (filterMap.has(f.key)) {\n            filterMap.delete(f.key);\n          }\n        }\n      });\n    }\n\n    return Array.from(filterMap.values());\n  }\n\n  /***************************************************************************\n   *                                                                         *\n   * Read API                                                                *\n   *                                                                         *\n   **************************************************************************/\n\n  public get filters(): Observable<Filter[]> {\n    return this._filters.asObservable().pipe(\n      distinctUntilChanged((a, b) => this.equals(a, b))\n    );\n  }\n\n  public get filtersSnapshot(): Filter[] {\n    return this._filters.getValue();\n  }\n\n  public findFilterValue(key: string): string | string[] | undefined {\n    const f = this.findFilter(key);\n    return f ? f.value : undefined;\n  }\n\n  public findFilter(key: string): Filter | undefined {\n    return this.filtersSnapshot\n      .filter(f => f.key === key)\n      .find(first => true);\n  }\n\n  /***************************************************************************\n   *                                                                         *\n   * Public API                                                              *\n   *                                                                         *\n   **************************************************************************/\n\n  public removeFilter(key: string): void {\n    const current = this.filtersSnapshot;\n    const newFilters = current.filter(f => f.key !== key);\n    if (current.length !== newFilters.length) {\n      this.replaceFilters(newFilters);\n    }\n  }\n\n  /**\n   * This method updatees / adds the given filter, leaving\n   * existing ones untouched.\n   * @param updatedFilter\n   */\n  public updateFilter(updatedFilter?: Filter): void {\n    if (updatedFilter) {\n      this.updateFilters([updatedFilter]);\n    }\n  }\n\n  /**\n   * This method updates / adds the given filters, leaving\n   * existing ones untouched.\n   * @param updatedFilters\n   */\n  public updateFilters(updatedFilters?: Filter[]): void {\n    if (updatedFilters && updatedFilters.length > 0) {\n      this.replaceFilters(\n        FilterContext.updateFilters(this.filtersSnapshot, updatedFilters)\n      );\n    }\n  }\n\n  /**\n   * Replace all existing filters with the given new ones.\n   * @param newFilters\n   */\n  public replaceFilters(newFilters?: Filter[]) {\n    this._filters.next(newFilters || []);\n  }\n\n  public clear(): void {\n    this.replaceFilters([]);\n  }\n\n  /***************************************************************************\n   *                                                                         *\n   * Private methods                                                         *\n   *                                                                         *\n   **************************************************************************/\n\n  private equals(aFilters: Filter[], bFilters: Filter[]): boolean {\n\n    if (aFilters.length !== bFilters.length) { return false; }\n    if (aFilters.length === 0 && bFilters.length === 0) { return true; }\n\n    // The both filter arrays have the same length, so we must compare them by value\n\n    const bIndex = new Map<string, Filter>();\n    bFilters.forEach(f => bIndex.set(f.key, f));\n\n    for (const fa of aFilters) {\n      const bFilter = bIndex.get(fa.key);\n      if (!Filter.equals(bFilter, fa)) {\n        return false;\n      }\n    }\n    return true;\n  }\n}\n"]}
|
|
@@ -1,72 +0,0 @@
|
|
|
1
|
-
import { Objects } from '../objects';
|
|
2
|
-
import { CollectionUtil } from '../utils/collection-util';
|
|
3
|
-
export class Filter {
|
|
4
|
-
/***************************************************************************
|
|
5
|
-
* *
|
|
6
|
-
* Constructor *
|
|
7
|
-
* *
|
|
8
|
-
**************************************************************************/
|
|
9
|
-
constructor(key, value) {
|
|
10
|
-
if (!key) {
|
|
11
|
-
throw new Error('ArgumentNull: Filter.key can not be null!');
|
|
12
|
-
}
|
|
13
|
-
this.key = key;
|
|
14
|
-
this.value = value;
|
|
15
|
-
}
|
|
16
|
-
/***************************************************************************
|
|
17
|
-
* *
|
|
18
|
-
* Properties *
|
|
19
|
-
* *
|
|
20
|
-
**************************************************************************/
|
|
21
|
-
/**
|
|
22
|
-
* Checks if this filter has a value.
|
|
23
|
-
* This is the case when the value is non null and
|
|
24
|
-
* in case its an array, also non empty.
|
|
25
|
-
*/
|
|
26
|
-
static hasValue(self) {
|
|
27
|
-
if (!self) {
|
|
28
|
-
return false;
|
|
29
|
-
}
|
|
30
|
-
if (Objects.nonNull(self.value)) {
|
|
31
|
-
if (self.value instanceof Array) {
|
|
32
|
-
return self.value.length > 0;
|
|
33
|
-
}
|
|
34
|
-
else {
|
|
35
|
-
return true;
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
return false;
|
|
39
|
-
}
|
|
40
|
-
/**
|
|
41
|
-
* Checks this filter has the same value as the other given filter.
|
|
42
|
-
* @param self
|
|
43
|
-
* @param other
|
|
44
|
-
*/
|
|
45
|
-
static equals(self, other) {
|
|
46
|
-
if (self === other) {
|
|
47
|
-
return true;
|
|
48
|
-
} // Same obj reference
|
|
49
|
-
if (!self) {
|
|
50
|
-
return false;
|
|
51
|
-
}
|
|
52
|
-
if (!other) {
|
|
53
|
-
return false;
|
|
54
|
-
}
|
|
55
|
-
if (self.key !== other.key) {
|
|
56
|
-
return false;
|
|
57
|
-
}
|
|
58
|
-
if (self.value === other.value) {
|
|
59
|
-
return true;
|
|
60
|
-
} // Same key and same value reference
|
|
61
|
-
// In case the filter has a multi value array, we need to compare those by value
|
|
62
|
-
if (self.value instanceof Array || other.value instanceof Array) {
|
|
63
|
-
const valueArr = self.value instanceof Array ? self.value : [self.value];
|
|
64
|
-
const otherArr = other instanceof Array ? other : [other];
|
|
65
|
-
return CollectionUtil.equalSetDeep(new Set(valueArr), new Set(otherArr));
|
|
66
|
-
}
|
|
67
|
-
else {
|
|
68
|
-
return false; // Otherwise, they are not equal
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvZWxkZXJieXRlL25neC1zdGFydGVyL3NyYy9saWIvY29tbW9uL2RhdGEvZmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBQyxPQUFPLEVBQUMsTUFBTSxZQUFZLENBQUM7QUFDbkMsT0FBTyxFQUFDLGNBQWMsRUFBQyxNQUFNLDBCQUEwQixDQUFDO0FBRXhELE1BQU0sT0FBTyxNQUFNO0lBb0JqQjs7OztnRkFJNEU7SUFFNUUsWUFDSSxHQUFXLEVBQ1gsS0FBK0I7UUFFakMsSUFBSSxDQUFDLEdBQUcsRUFBRTtZQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsMkNBQTJDLENBQUMsQ0FBQztTQUFFO1FBRTNFLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2YsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7SUFDckIsQ0FBQztJQUVEOzs7O2dGQUk0RTtJQUU1RTs7OztPQUlHO0lBQ0ksTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFZO1FBRWpDLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFBRSxPQUFPLEtBQUssQ0FBQztTQUFFO1FBRTVCLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDOUIsSUFBSSxJQUFJLENBQUMsS0FBSyxZQUFZLEtBQUssRUFBRTtnQkFDL0IsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUM7YUFDOUI7aUJBQU07Z0JBQ0wsT0FBTyxJQUFJLENBQUM7YUFDYjtTQUNIO1FBQ0QsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBWSxFQUFFLEtBQWE7UUFFOUMsSUFBSSxJQUFJLEtBQUssS0FBSyxFQUFFO1lBQUUsT0FBTyxJQUFJLENBQUM7U0FBRSxDQUFDLHFCQUFxQjtRQUUxRCxJQUFJLENBQUMsSUFBSSxFQUFFO1lBQUUsT0FBTyxLQUFLLENBQUM7U0FBRTtRQUM1QixJQUFJLENBQUMsS0FBSyxFQUFFO1lBQUUsT0FBTyxLQUFLLENBQUM7U0FBRTtRQUM3QixJQUFJLElBQUksQ0FBQyxHQUFHLEtBQUssS0FBSyxDQUFDLEdBQUcsRUFBRTtZQUFFLE9BQU8sS0FBSyxDQUFDO1NBQUU7UUFDN0MsSUFBSSxJQUFJLENBQUMsS0FBSyxLQUFLLEtBQUssQ0FBQyxLQUFLLEVBQUU7WUFBRSxPQUFPLElBQUksQ0FBQztTQUFFLENBQUMsb0NBQW9DO1FBRXJGLGdGQUFnRjtRQUVoRixJQUFJLElBQUksQ0FBQyxLQUFLLFlBQVksS0FBSyxJQUFJLEtBQUssQ0FBQyxLQUFLLFlBQVksS0FBSyxFQUFFO1lBQy9ELE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxLQUFLLFlBQVksS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUN6RSxNQUFNLFFBQVEsR0FBRyxLQUFLLFlBQVksS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDMUQsT0FBTyxjQUFjLENBQUMsWUFBWSxDQUFDLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxFQUFFLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7U0FDMUU7YUFBTTtZQUNMLE9BQU8sS0FBSyxDQUFDLENBQUMsZ0NBQWdDO1NBQy9DO0lBQ0gsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiXG5cbmltcG9ydCB7T2JqZWN0c30gZnJvbSAnLi4vb2JqZWN0cyc7XG5pbXBvcnQge0NvbGxlY3Rpb25VdGlsfSBmcm9tICcuLi91dGlscy9jb2xsZWN0aW9uLXV0aWwnO1xuXG5leHBvcnQgY2xhc3MgRmlsdGVyIHtcblxuICAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqXG4gICAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICpcbiAgICogRmllbGRzICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKlxuICAgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqXG4gICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi9cblxuICAvKipcbiAgICogVGhlIGZpbHRlciBrZXkuXG4gICAqIFVuaXF1ZSBpbnNpZGUgYSBGaWx0ZXJDb250ZXh0IG9yIEZpbHRlciByZXF1ZXN0LlxuICAgKi9cbiAgcHVibGljIHJlYWRvbmx5IGtleTogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBUaGUgZmlsdGVyIHZhbHVlIGFzIHN0cmluZy5cbiAgICogTXVsdGlwbGUgc3RyaW5nIHZhbHVlcyBhcmUgc3VwcG9ydGVkLlxuICAgKi9cbiAgcHVibGljIHJlYWRvbmx5IHZhbHVlOiBzdHJpbmcgfCBzdHJpbmdbXSB8IG51bGw7XG5cbiAgLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuICAgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqXG4gICAqIENvbnN0cnVjdG9yICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICpcbiAgICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKlxuICAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovXG5cbiAgY29uc3RydWN0b3IoXG4gICAgICBrZXk6IHN0cmluZyxcbiAgICAgIHZhbHVlOiBzdHJpbmcgfCBzdHJpbmdbXSB8IG51bGwpIHtcblxuICAgIGlmICgha2V5KSB7IHRocm93IG5ldyBFcnJvcignQXJndW1lbnROdWxsOiBGaWx0ZXIua2V5IGNhbiBub3QgYmUgbnVsbCEnKTsgfVxuXG4gICAgdGhpcy5rZXkgPSBrZXk7XG4gICAgdGhpcy52YWx1ZSA9IHZhbHVlO1xuICB9XG5cbiAgLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuICAgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqXG4gICAqIFByb3BlcnRpZXMgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICpcbiAgICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKlxuICAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovXG5cbiAgLyoqXG4gICAqIENoZWNrcyBpZiB0aGlzIGZpbHRlciBoYXMgYSB2YWx1ZS5cbiAgICogVGhpcyBpcyB0aGUgY2FzZSB3aGVuIHRoZSB2YWx1ZSBpcyBub24gbnVsbCBhbmRcbiAgICogaW4gY2FzZSBpdHMgYW4gYXJyYXksIGFsc28gbm9uIGVtcHR5LlxuICAgKi9cbiAgcHVibGljIHN0YXRpYyBoYXNWYWx1ZShzZWxmOiBGaWx0ZXIpOiBib29sZWFuIHtcblxuICAgIGlmICghc2VsZikgeyByZXR1cm4gZmFsc2U7IH1cblxuICAgIGlmIChPYmplY3RzLm5vbk51bGwoc2VsZi52YWx1ZSkpIHtcbiAgICAgICBpZiAoc2VsZi52YWx1ZSBpbnN0YW5jZW9mIEFycmF5KSB7XG4gICAgICAgICByZXR1cm4gc2VsZi52YWx1ZS5sZW5ndGggPiAwO1xuICAgICAgIH0gZWxzZSB7XG4gICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICB9XG4gICAgfVxuICAgIHJldHVybiBmYWxzZTtcbiAgfVxuXG4gIC8qKlxuICAgKiBDaGVja3MgdGhpcyBmaWx0ZXIgaGFzIHRoZSBzYW1lIHZhbHVlIGFzIHRoZSBvdGhlciBnaXZlbiBmaWx0ZXIuXG4gICAqIEBwYXJhbSBzZWxmXG4gICAqIEBwYXJhbSBvdGhlclxuICAgKi9cbiAgcHVibGljIHN0YXRpYyBlcXVhbHMoc2VsZjogRmlsdGVyLCBvdGhlcjogRmlsdGVyKTogYm9vbGVhbiB7XG5cbiAgICBpZiAoc2VsZiA9PT0gb3RoZXIpIHsgcmV0dXJuIHRydWU7IH0gLy8gU2FtZSBvYmogcmVmZXJlbmNlXG5cbiAgICBpZiAoIXNlbGYpIHsgcmV0dXJuIGZhbHNlOyB9XG4gICAgaWYgKCFvdGhlcikgeyByZXR1cm4gZmFsc2U7IH1cbiAgICBpZiAoc2VsZi5rZXkgIT09IG90aGVyLmtleSkgeyByZXR1cm4gZmFsc2U7IH1cbiAgICBpZiAoc2VsZi52YWx1ZSA9PT0gb3RoZXIudmFsdWUpIHsgcmV0dXJuIHRydWU7IH0gLy8gU2FtZSBrZXkgYW5kIHNhbWUgdmFsdWUgcmVmZXJlbmNlXG5cbiAgICAvLyBJbiBjYXNlIHRoZSBmaWx0ZXIgaGFzIGEgbXVsdGkgdmFsdWUgYXJyYXksIHdlIG5lZWQgdG8gY29tcGFyZSB0aG9zZSBieSB2YWx1ZVxuXG4gICAgaWYgKHNlbGYudmFsdWUgaW5zdGFuY2VvZiBBcnJheSB8fCBvdGhlci52YWx1ZSBpbnN0YW5jZW9mIEFycmF5KSB7XG4gICAgICBjb25zdCB2YWx1ZUFyciA9IHNlbGYudmFsdWUgaW5zdGFuY2VvZiBBcnJheSA/IHNlbGYudmFsdWUgOiBbc2VsZi52YWx1ZV07XG4gICAgICBjb25zdCBvdGhlckFyciA9IG90aGVyIGluc3RhbmNlb2YgQXJyYXkgPyBvdGhlciA6IFtvdGhlcl07XG4gICAgICByZXR1cm4gQ29sbGVjdGlvblV0aWwuZXF1YWxTZXREZWVwKG5ldyBTZXQodmFsdWVBcnIpLCBuZXcgU2V0KG90aGVyQXJyKSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIHJldHVybiBmYWxzZTsgLy8gT3RoZXJ3aXNlLCB0aGV5IGFyZSBub3QgZXF1YWxcbiAgICB9XG4gIH1cbn1cblxuIl19
|