@universis/ngx-tables 6.0.2 → 6.0.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/bundles/universis-ngx-tables.umd.js +23 -7
- package/bundles/universis-ngx-tables.umd.js.map +1 -1
- package/bundles/universis-ngx-tables.umd.min.js +1 -1
- package/bundles/universis-ngx-tables.umd.min.js.map +1 -1
- package/esm2015/lib/directives/advanced-search-router-state.directive.js +19 -5
- package/esm5/lib/directives/advanced-search-router-state.directive.js +23 -7
- package/fesm2015/universis-ngx-tables.js +19 -5
- package/fesm2015/universis-ngx-tables.js.map +1 -1
- package/fesm5/universis-ngx-tables.js +23 -7
- package/fesm5/universis-ngx-tables.js.map +1 -1
- package/package.json +1 -1
|
@@ -29,15 +29,29 @@ export class AdvancedSearchRouterState extends AdvancedSearchState {
|
|
|
29
29
|
.subscribe((event) => {
|
|
30
30
|
// capture urls regarding tab changing while the component is active
|
|
31
31
|
if (event instanceof NavigationStart && !this._enteringState) {
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
try {
|
|
33
|
+
// set search state
|
|
34
|
+
this.searchState = new URL(event.url, location.origin).pathname;
|
|
35
|
+
}
|
|
36
|
+
catch (err) {
|
|
37
|
+
console.error('An error occured while trying to set search state for the current table', err);
|
|
38
|
+
// fallback to event url
|
|
39
|
+
this.searchState = event.url;
|
|
40
|
+
}
|
|
34
41
|
// toogle applyState
|
|
35
42
|
this._applyState = true;
|
|
36
43
|
}
|
|
37
44
|
// capture url of the first activation of the component (e.g. coming from another route)
|
|
38
45
|
if (event instanceof NavigationEnd && this._enteringState) {
|
|
39
|
-
|
|
40
|
-
|
|
46
|
+
try {
|
|
47
|
+
// set search state
|
|
48
|
+
this.searchState = new URL(event.urlAfterRedirects, location.origin).pathname;
|
|
49
|
+
}
|
|
50
|
+
catch (err) {
|
|
51
|
+
console.error('An error occured while trying to set search state for the current table', err);
|
|
52
|
+
// fallback to event urlAfterRedirects
|
|
53
|
+
this.searchState = event.urlAfterRedirects;
|
|
54
|
+
}
|
|
41
55
|
// toggle enteringState
|
|
42
56
|
this._enteringState = false;
|
|
43
57
|
}
|
|
@@ -87,4 +101,4 @@ if (false) {
|
|
|
87
101
|
AdvancedSearchRouterState.prototype._router;
|
|
88
102
|
}
|
|
89
103
|
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
104
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWR2YW5jZWQtc2VhcmNoLXJvdXRlci1zdGF0ZS5kaXJlY3RpdmUuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AdW5pdmVyc2lzL25neC10YWJsZXMvIiwic291cmNlcyI6WyJsaWIvZGlyZWN0aXZlcy9hZHZhbmNlZC1zZWFyY2gtcm91dGVyLXN0YXRlLmRpcmVjdGl2ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsT0FBTyxFQUFFLFNBQVMsRUFBcUIsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxhQUFhLEVBQUUsZUFBZSxFQUFFLE1BQU0sRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3pFLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFcEMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3hDLE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLDhEQUE4RCxDQUFDO0FBRTVHLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRXZFO0FBS0EsTUFBTSxnQ0FBaUMsU0FBUSxtQkFBbUI7Ozs7OztJQUtoRSxZQUNZLE1BQW9DLEVBQ3hCLEtBQTRCLEVBQ2pDOztRQUdqQixLQUFLLENBQUMsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBTFgsV0FBTSxHQUFOLE1BQU0sQ0FBOEI7UUFDeEIsVUFBSyxHQUFMLEtBQUssQ0FBdUI7UUFDakMsWUFBTyxHQUFQLE9BQU87OEJBTkQsSUFBSTsyQkFDUCxLQUFLOztRQVV6QixJQUFJLENBQUMsbUJBQW1CLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNO2FBQzNDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLEtBQUssWUFBWSxlQUFlLElBQUksS0FBSyxZQUFZLGFBQWEsQ0FBQyxDQUFDO2FBQzNGLFNBQVMsQ0FBQyxDQUFDLEtBQXNDLEVBQUUsRUFBRTs7WUFFcEQsSUFBSSxLQUFLLFlBQVksZUFBZSxJQUFJLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRTtnQkFDNUQsSUFBSTs7b0JBRUYsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxRQUFRLENBQUM7aUJBQ2pFO2dCQUFDLE9BQU8sR0FBRyxFQUFFO29CQUNaLE9BQU8sQ0FBQyxLQUFLLENBQUMseUVBQXlFLEVBQUUsR0FBRyxDQUFDLENBQUM7O29CQUU5RixJQUFJLENBQUMsV0FBVyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUM7aUJBQzlCOztnQkFFRCxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQzthQUN6Qjs7WUFFRCxJQUFJLEtBQUssWUFBWSxhQUFhLElBQUksSUFBSSxDQUFDLGNBQWMsRUFBRTtnQkFDekQsSUFBSTs7b0JBRUYsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLEdBQUcsQ0FBQyxLQUFLLENBQUMsaUJBQWlCLEVBQUUsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQztpQkFDL0U7Z0JBQUMsT0FBTyxHQUFHLEVBQUU7b0JBQ1osT0FBTyxDQUFDLEtBQUssQ0FBQyx5RUFBeUUsRUFBRSxHQUFHLENBQUMsQ0FBQzs7b0JBRTlGLElBQUksQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFDLGlCQUFpQixDQUFDO2lCQUM1Qzs7Z0JBRUQsSUFBSSxDQUFDLGNBQWMsR0FBRyxLQUFLLENBQUM7YUFDN0I7WUFDRCxJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUU7O2dCQUVwQixLQUFLLENBQUMsZUFBZSxFQUFFLENBQUM7Z0JBQ3hCLElBQUksQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFDO2FBQzFCO1NBQ0YsQ0FBQyxDQUFDO0tBQ047Ozs7SUFFRCxXQUFXOztRQUVULElBQUksSUFBSSxDQUFDLG1CQUFtQixFQUFFO1lBQzVCLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQztTQUN4Qzs7UUFFRCxPQUFPLEtBQUssQ0FBQyxXQUFXLEVBQUUsQ0FBQztLQUM1Qjs7O1lBOURGLFNBQVMsU0FBQzs7Z0JBRVQsUUFBUSxFQUFFLHFCQUFxQjthQUNoQzs7OztZQVBRLDRCQUE0QjtZQUg1QixLQUFLLHVCQW1CVCxRQUFRO1lBcEI0QixNQUFNIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRGlyZWN0aXZlLCBPbkRlc3Ryb3ksIE9uSW5pdCwgT3B0aW9uYWwgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE5hdmlnYXRpb25FbmQsIE5hdmlnYXRpb25TdGFydCwgUm91dGVyIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IFN0b3JlIH0gZnJvbSAnQG5ncngvc3RvcmUnO1xuaW1wb3J0IHsgU3Vic2NyaXB0aW9uIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBmaWx0ZXIgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBBZHZhbmNlZFRhYmxlU2VhcmNoQ29tcG9uZW50IH0gZnJvbSAnLi4vY29tcG9uZW50cy9hZHZhbmNlZC10YWJsZS9hZHZhbmNlZC10YWJsZS1zZWFyY2guY29tcG9uZW50JztcbmltcG9ydCB7IE5neFRhYmxlc1N0YXRlIH0gZnJvbSAnLi4vcmVkdWNlcnMnO1xuaW1wb3J0IHsgQWR2YW5jZWRTZWFyY2hTdGF0ZSB9IGZyb20gJy4vYWR2YW5jZS1zZWFyY2gtc3RhdGUuZGlyZWN0aXZlJztcblxuQERpcmVjdGl2ZSh7XG4gIC8vIHRzbGludDpkaXNhYmxlLW5leHQtbGluZTogZGlyZWN0aXZlLXNlbGVjdG9yXG4gIHNlbGVjdG9yOiAnW3JvdXRlclNlYXJjaFN0YXRlXSdcbn0pXG4vLyB0c2xpbnQ6ZGlzYWJsZS1uZXh0LWxpbmU6ZGlyZWN0aXZlLWNsYXNzLXN1ZmZpeFxuZXhwb3J0IGNsYXNzIEFkdmFuY2VkU2VhcmNoUm91dGVyU3RhdGUgZXh0ZW5kcyBBZHZhbmNlZFNlYXJjaFN0YXRlIGltcGxlbWVudHMgT25EZXN0cm95LCBPbkluaXQge1xuICBwcml2YXRlIF9yb3V0ZXJTdWJzY3JpcHRpb246IFN1YnNjcmlwdGlvbjtcbiAgcHJpdmF0ZSBfZW50ZXJpbmdTdGF0ZSA9IHRydWU7XG4gIHByaXZhdGUgX2FwcGx5U3RhdGUgPSBmYWxzZTtcblxuICBjb25zdHJ1Y3RvcihcbiAgICBwcm90ZWN0ZWQgc2VhcmNoOiBBZHZhbmNlZFRhYmxlU2VhcmNoQ29tcG9uZW50LFxuICAgIEBPcHRpb25hbCgpIHByb3RlY3RlZCBzdG9yZTogU3RvcmU8Tmd4VGFibGVzU3RhdGU+LFxuICAgIHByaXZhdGUgcmVhZG9ubHkgX3JvdXRlcjogUm91dGVyXG4gICkge1xuICAgIC8vIGNhbGwgc3VwZXIgY29uc3RydWN0b3JcbiAgICBzdXBlcihzZWFyY2gsIHN0b3JlKTtcbiAgICAvLyBzZXQgc2VhcmNoIHN0YXRlIGR5bmFtaWNhbGx5IGFjY29yZGluZyB0byByb3V0ZVxuICAgIHRoaXMuX3JvdXRlclN1YnNjcmlwdGlvbiA9IHRoaXMuX3JvdXRlci5ldmVudHNcbiAgICAgIC5waXBlKGZpbHRlcigoZXZlbnQpID0+IGV2ZW50IGluc3RhbmNlb2YgTmF2aWdhdGlvblN0YXJ0IHx8IGV2ZW50IGluc3RhbmNlb2YgTmF2aWdhdGlvbkVuZCkpXG4gICAgICAuc3Vic2NyaWJlKChldmVudDogTmF2aWdhdGlvblN0YXJ0IHwgTmF2aWdhdGlvbkVuZCkgPT4ge1xuICAgICAgICAvLyBjYXB0dXJlIHVybHMgcmVnYXJkaW5nIHRhYiBjaGFuZ2luZyB3aGlsZSB0aGUgY29tcG9uZW50IGlzIGFjdGl2ZVxuICAgICAgICBpZiAoZXZlbnQgaW5zdGFuY2VvZiBOYXZpZ2F0aW9uU3RhcnQgJiYgIXRoaXMuX2VudGVyaW5nU3RhdGUpIHtcbiAgICAgICAgICB0cnkge1xuICAgICAgICAgICAgLy8gc2V0IHNlYXJjaCBzdGF0ZVxuICAgICAgICAgICAgdGhpcy5zZWFyY2hTdGF0ZSA9IG5ldyBVUkwoZXZlbnQudXJsLCBsb2NhdGlvbi5vcmlnaW4pLnBhdGhuYW1lO1xuICAgICAgICAgIH0gY2F0Y2ggKGVycikge1xuICAgICAgICAgICAgY29uc29sZS5lcnJvcignQW4gZXJyb3Igb2NjdXJlZCB3aGlsZSB0cnlpbmcgdG8gc2V0IHNlYXJjaCBzdGF0ZSBmb3IgdGhlIGN1cnJlbnQgdGFibGUnLCBlcnIpO1xuICAgICAgICAgICAgLy8gZmFsbGJhY2sgdG8gZXZlbnQgdXJsXG4gICAgICAgICAgICB0aGlzLnNlYXJjaFN0YXRlID0gZXZlbnQudXJsO1xuICAgICAgICAgIH1cbiAgICAgICAgICAvLyB0b29nbGUgYXBwbHlTdGF0ZVxuICAgICAgICAgIHRoaXMuX2FwcGx5U3RhdGUgPSB0cnVlO1xuICAgICAgICB9XG4gICAgICAgIC8vIGNhcHR1cmUgdXJsIG9mIHRoZSBmaXJzdCBhY3RpdmF0aW9uIG9mIHRoZSBjb21wb25lbnQgKGUuZy4gY29taW5nIGZyb20gYW5vdGhlciByb3V0ZSlcbiAgICAgICAgaWYgKGV2ZW50IGluc3RhbmNlb2YgTmF2aWdhdGlvbkVuZCAmJiB0aGlzLl9lbnRlcmluZ1N0YXRlKSB7XG4gICAgICAgICAgdHJ5IHtcbiAgICAgICAgICAgIC8vIHNldCBzZWFyY2ggc3RhdGVcbiAgICAgICAgICAgIHRoaXMuc2VhcmNoU3RhdGUgPSBuZXcgVVJMKGV2ZW50LnVybEFmdGVyUmVkaXJlY3RzLCBsb2NhdGlvbi5vcmlnaW4pLnBhdGhuYW1lO1xuICAgICAgICAgIH0gY2F0Y2ggKGVycikge1xuICAgICAgICAgICAgY29uc29sZS5lcnJvcignQW4gZXJyb3Igb2NjdXJlZCB3aGlsZSB0cnlpbmcgdG8gc2V0IHNlYXJjaCBzdGF0ZSBmb3IgdGhlIGN1cnJlbnQgdGFibGUnLCBlcnIpO1xuICAgICAgICAgICAgLy8gZmFsbGJhY2sgdG8gZXZlbnQgdXJsQWZ0ZXJSZWRpcmVjdHNcbiAgICAgICAgICAgIHRoaXMuc2VhcmNoU3RhdGUgPSBldmVudC51cmxBZnRlclJlZGlyZWN0cztcbiAgICAgICAgICB9XG4gICAgICAgICAgLy8gdG9nZ2xlIGVudGVyaW5nU3RhdGVcbiAgICAgICAgICB0aGlzLl9lbnRlcmluZ1N0YXRlID0gZmFsc2U7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKHRoaXMuX2FwcGx5U3RhdGUpIHtcbiAgICAgICAgICAvLyBhcHBseSBuZXcgdGFibGUgc3RhdGVcbiAgICAgICAgICBzdXBlci5hcHBseVRhYmxlU3RhdGUoKTtcbiAgICAgICAgICB0aGlzLl9hcHBseVN0YXRlID0gZmFsc2U7XG4gICAgICAgIH1cbiAgICAgIH0pO1xuICB9XG5cbiAgbmdPbkRlc3Ryb3koKTogdm9pZCB7XG4gICAgLy8gZGVzdHJveSBvd24gc3Vic2NyaXB0aW9uc1xuICAgIGlmICh0aGlzLl9yb3V0ZXJTdWJzY3JpcHRpb24pIHtcbiAgICAgIHRoaXMuX3JvdXRlclN1YnNjcmlwdGlvbi51bnN1YnNjcmliZSgpO1xuICAgIH1cbiAgICAvLyBkZXN0cm95IHBhcmVudCBzdWJzY3JpcHRpb25zXG4gICAgcmV0dXJuIHN1cGVyLm5nT25EZXN0cm95KCk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -27,18 +27,34 @@ var AdvancedSearchRouterState = /** @class */ (function (_super) {
|
|
|
27
27
|
.subscribe(function (event) {
|
|
28
28
|
// capture urls regarding tab changing while the component is active
|
|
29
29
|
if (event instanceof NavigationStart && !_this._enteringState) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
try {
|
|
31
|
+
// set search state
|
|
32
|
+
// set search state
|
|
33
|
+
_this.searchState = new URL(event.url, location.origin).pathname;
|
|
34
|
+
}
|
|
35
|
+
catch (err) {
|
|
36
|
+
console.error('An error occured while trying to set search state for the current table', err);
|
|
37
|
+
// fallback to event url
|
|
38
|
+
// fallback to event url
|
|
39
|
+
_this.searchState = event.url;
|
|
40
|
+
}
|
|
33
41
|
// toogle applyState
|
|
34
42
|
// toogle applyState
|
|
35
43
|
_this._applyState = true;
|
|
36
44
|
}
|
|
37
45
|
// capture url of the first activation of the component (e.g. coming from another route)
|
|
38
46
|
if (event instanceof NavigationEnd && _this._enteringState) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
47
|
+
try {
|
|
48
|
+
// set search state
|
|
49
|
+
// set search state
|
|
50
|
+
_this.searchState = new URL(event.urlAfterRedirects, location.origin).pathname;
|
|
51
|
+
}
|
|
52
|
+
catch (err) {
|
|
53
|
+
console.error('An error occured while trying to set search state for the current table', err);
|
|
54
|
+
// fallback to event urlAfterRedirects
|
|
55
|
+
// fallback to event urlAfterRedirects
|
|
56
|
+
_this.searchState = event.urlAfterRedirects;
|
|
57
|
+
}
|
|
42
58
|
// toggle enteringState
|
|
43
59
|
// toggle enteringState
|
|
44
60
|
_this._enteringState = false;
|
|
@@ -95,4 +111,4 @@ if (false) {
|
|
|
95
111
|
AdvancedSearchRouterState.prototype._router;
|
|
96
112
|
}
|
|
97
113
|
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWR2YW5jZWQtc2VhcmNoLXJvdXRlci1zdGF0ZS5kaXJlY3RpdmUuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AdW5pdmVyc2lzL25neC10YWJsZXMvIiwic291cmNlcyI6WyJsaWIvZGlyZWN0aXZlcy9hZHZhbmNlZC1zZWFyY2gtcm91dGVyLXN0YXRlLmRpcmVjdGl2ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQXFCLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUN2RSxPQUFPLEVBQUUsYUFBYSxFQUFFLGVBQWUsRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRXBDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4QyxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSw4REFBOEQsQ0FBQztBQUU1RyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQzs7SUFPeEIscURBQW1CO0lBS2hFLG1DQUNZLE1BQW9DLEVBQ3hCLEtBQTRCLEVBQ2pDO1FBSG5CO1FBS0UseUJBQXlCO1FBQ3pCLGtCQUFNLE1BQU0sRUFBRSxLQUFLLENBQUMsU0FxQ3JCO1FBMUNXLFlBQU0sR0FBTixNQUFNLENBQThCO1FBQ3hCLFdBQUssR0FBTCxLQUFLLENBQXVCO1FBQ2pDLGFBQU8sR0FBUCxPQUFPOytCQU5ELElBQUk7NEJBQ1AsS0FBSzs7UUFVekIsQUFEQSxrREFBa0Q7UUFDbEQsS0FBSSxDQUFDLG1CQUFtQixHQUFHLEtBQUksQ0FBQyxPQUFPLENBQUMsTUFBTTthQUMzQyxJQUFJLENBQUMsTUFBTSxDQUFDLFVBQUMsS0FBSyxJQUFLLE9BQUEsS0FBSyxZQUFZLGVBQWUsSUFBSSxLQUFLLFlBQVksYUFBYSxFQUFsRSxDQUFrRSxDQUFDLENBQUM7YUFDM0YsU0FBUyxDQUFDLFVBQUMsS0FBc0M7O1lBRWhELElBQUksS0FBSyxZQUFZLGVBQWUsSUFBSSxDQUFDLEtBQUksQ0FBQyxjQUFjLEVBQUU7Z0JBQzVELElBQUk7O29CQUVGLEFBREEsbUJBQW1CO29CQUNuQixLQUFJLENBQUMsV0FBVyxHQUFHLElBQUksR0FBRyxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQztpQkFDakU7Z0JBQUMsT0FBTyxHQUFHLEVBQUU7b0JBQ1osT0FBTyxDQUFDLEtBQUssQ0FBQyx5RUFBeUUsRUFBRSxHQUFHLENBQUMsQ0FBQzs7b0JBRTlGLEFBREEsd0JBQXdCO29CQUN4QixLQUFJLENBQUMsV0FBVyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUM7aUJBQzlCOztnQkFFRCxBQURBLG9CQUFvQjtnQkFDcEIsS0FBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUM7YUFDekI7O1lBRUQsSUFBSSxLQUFLLFlBQVksYUFBYSxJQUFJLEtBQUksQ0FBQyxjQUFjLEVBQUU7Z0JBQ3pELElBQUk7O29CQUVGLEFBREEsbUJBQW1CO29CQUNuQixLQUFJLENBQUMsV0FBVyxHQUFHLElBQUksR0FBRyxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsRUFBRSxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsUUFBUSxDQUFDO2lCQUMvRTtnQkFBQyxPQUFPLEdBQUcsRUFBRTtvQkFDWixPQUFPLENBQUMsS0FBSyxDQUFDLHlFQUF5RSxFQUFFLEdBQUcsQ0FBQyxDQUFDOztvQkFFOUYsQUFEQSxzQ0FBc0M7b0JBQ3RDLEtBQUksQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFDLGlCQUFpQixDQUFDO2lCQUM1Qzs7Z0JBRUQsQUFEQSx1QkFBdUI7Z0JBQ3ZCLEtBQUksQ0FBQyxjQUFjLEdBQUcsS0FBSyxDQUFDO2FBQzdCO1lBQ0QsSUFBSSxLQUFJLENBQUMsV0FBVyxFQUFFOztnQkFFcEIsaUJBQU0sZUFBZSxZQUFFLENBQUM7Z0JBQ3hCLEtBQUksQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFDO2FBQzFCO1NBQ0YsQ0FBQyxDQUFDOztLQUNOOzs7O0lBRUQsK0NBQVc7OztJQUFYOztRQUVFLElBQUksSUFBSSxDQUFDLG1CQUFtQixFQUFFO1lBQzVCLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQztTQUN4Qzs7UUFFRCxPQUFPLGlCQUFNLFdBQVcsV0FBRSxDQUFDO0tBQzVCOztnQkE5REYsU0FBUyxTQUFDOztvQkFFVCxRQUFRLEVBQUUscUJBQXFCO2lCQUNoQzs7OztnQkFQUSw0QkFBNEI7Z0JBSDVCLEtBQUssdUJBbUJULFFBQVE7Z0JBcEI0QixNQUFNOztvQ0FEL0M7RUFjK0MsbUJBQW1CO1NBQXJELHlCQUF5QiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERpcmVjdGl2ZSwgT25EZXN0cm95LCBPbkluaXQsIE9wdGlvbmFsIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBOYXZpZ2F0aW9uRW5kLCBOYXZpZ2F0aW9uU3RhcnQsIFJvdXRlciB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBTdG9yZSB9IGZyb20gJ0BuZ3J4L3N0b3JlJztcbmltcG9ydCB7IFN1YnNjcmlwdGlvbiB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgZmlsdGVyIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgQWR2YW5jZWRUYWJsZVNlYXJjaENvbXBvbmVudCB9IGZyb20gJy4uL2NvbXBvbmVudHMvYWR2YW5jZWQtdGFibGUvYWR2YW5jZWQtdGFibGUtc2VhcmNoLmNvbXBvbmVudCc7XG5pbXBvcnQgeyBOZ3hUYWJsZXNTdGF0ZSB9IGZyb20gJy4uL3JlZHVjZXJzJztcbmltcG9ydCB7IEFkdmFuY2VkU2VhcmNoU3RhdGUgfSBmcm9tICcuL2FkdmFuY2Utc2VhcmNoLXN0YXRlLmRpcmVjdGl2ZSc7XG5cbkBEaXJlY3RpdmUoe1xuICAvLyB0c2xpbnQ6ZGlzYWJsZS1uZXh0LWxpbmU6IGRpcmVjdGl2ZS1zZWxlY3RvclxuICBzZWxlY3RvcjogJ1tyb3V0ZXJTZWFyY2hTdGF0ZV0nXG59KVxuLy8gdHNsaW50OmRpc2FibGUtbmV4dC1saW5lOmRpcmVjdGl2ZS1jbGFzcy1zdWZmaXhcbmV4cG9ydCBjbGFzcyBBZHZhbmNlZFNlYXJjaFJvdXRlclN0YXRlIGV4dGVuZHMgQWR2YW5jZWRTZWFyY2hTdGF0ZSBpbXBsZW1lbnRzIE9uRGVzdHJveSwgT25Jbml0IHtcbiAgcHJpdmF0ZSBfcm91dGVyU3Vic2NyaXB0aW9uOiBTdWJzY3JpcHRpb247XG4gIHByaXZhdGUgX2VudGVyaW5nU3RhdGUgPSB0cnVlO1xuICBwcml2YXRlIF9hcHBseVN0YXRlID0gZmFsc2U7XG5cbiAgY29uc3RydWN0b3IoXG4gICAgcHJvdGVjdGVkIHNlYXJjaDogQWR2YW5jZWRUYWJsZVNlYXJjaENvbXBvbmVudCxcbiAgICBAT3B0aW9uYWwoKSBwcm90ZWN0ZWQgc3RvcmU6IFN0b3JlPE5neFRhYmxlc1N0YXRlPixcbiAgICBwcml2YXRlIHJlYWRvbmx5IF9yb3V0ZXI6IFJvdXRlclxuICApIHtcbiAgICAvLyBjYWxsIHN1cGVyIGNvbnN0cnVjdG9yXG4gICAgc3VwZXIoc2VhcmNoLCBzdG9yZSk7XG4gICAgLy8gc2V0IHNlYXJjaCBzdGF0ZSBkeW5hbWljYWxseSBhY2NvcmRpbmcgdG8gcm91dGVcbiAgICB0aGlzLl9yb3V0ZXJTdWJzY3JpcHRpb24gPSB0aGlzLl9yb3V0ZXIuZXZlbnRzXG4gICAgICAucGlwZShmaWx0ZXIoKGV2ZW50KSA9PiBldmVudCBpbnN0YW5jZW9mIE5hdmlnYXRpb25TdGFydCB8fCBldmVudCBpbnN0YW5jZW9mIE5hdmlnYXRpb25FbmQpKVxuICAgICAgLnN1YnNjcmliZSgoZXZlbnQ6IE5hdmlnYXRpb25TdGFydCB8IE5hdmlnYXRpb25FbmQpID0+IHtcbiAgICAgICAgLy8gY2FwdHVyZSB1cmxzIHJlZ2FyZGluZyB0YWIgY2hhbmdpbmcgd2hpbGUgdGhlIGNvbXBvbmVudCBpcyBhY3RpdmVcbiAgICAgICAgaWYgKGV2ZW50IGluc3RhbmNlb2YgTmF2aWdhdGlvblN0YXJ0ICYmICF0aGlzLl9lbnRlcmluZ1N0YXRlKSB7XG4gICAgICAgICAgdHJ5IHtcbiAgICAgICAgICAgIC8vIHNldCBzZWFyY2ggc3RhdGVcbiAgICAgICAgICAgIHRoaXMuc2VhcmNoU3RhdGUgPSBuZXcgVVJMKGV2ZW50LnVybCwgbG9jYXRpb24ub3JpZ2luKS5wYXRobmFtZTtcbiAgICAgICAgICB9IGNhdGNoIChlcnIpIHtcbiAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoJ0FuIGVycm9yIG9jY3VyZWQgd2hpbGUgdHJ5aW5nIHRvIHNldCBzZWFyY2ggc3RhdGUgZm9yIHRoZSBjdXJyZW50IHRhYmxlJywgZXJyKTtcbiAgICAgICAgICAgIC8vIGZhbGxiYWNrIHRvIGV2ZW50IHVybFxuICAgICAgICAgICAgdGhpcy5zZWFyY2hTdGF0ZSA9IGV2ZW50LnVybDtcbiAgICAgICAgICB9XG4gICAgICAgICAgLy8gdG9vZ2xlIGFwcGx5U3RhdGVcbiAgICAgICAgICB0aGlzLl9hcHBseVN0YXRlID0gdHJ1ZTtcbiAgICAgICAgfVxuICAgICAgICAvLyBjYXB0dXJlIHVybCBvZiB0aGUgZmlyc3QgYWN0aXZhdGlvbiBvZiB0aGUgY29tcG9uZW50IChlLmcuIGNvbWluZyBmcm9tIGFub3RoZXIgcm91dGUpXG4gICAgICAgIGlmIChldmVudCBpbnN0YW5jZW9mIE5hdmlnYXRpb25FbmQgJiYgdGhpcy5fZW50ZXJpbmdTdGF0ZSkge1xuICAgICAgICAgIHRyeSB7XG4gICAgICAgICAgICAvLyBzZXQgc2VhcmNoIHN0YXRlXG4gICAgICAgICAgICB0aGlzLnNlYXJjaFN0YXRlID0gbmV3IFVSTChldmVudC51cmxBZnRlclJlZGlyZWN0cywgbG9jYXRpb24ub3JpZ2luKS5wYXRobmFtZTtcbiAgICAgICAgICB9IGNhdGNoIChlcnIpIHtcbiAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoJ0FuIGVycm9yIG9jY3VyZWQgd2hpbGUgdHJ5aW5nIHRvIHNldCBzZWFyY2ggc3RhdGUgZm9yIHRoZSBjdXJyZW50IHRhYmxlJywgZXJyKTtcbiAgICAgICAgICAgIC8vIGZhbGxiYWNrIHRvIGV2ZW50IHVybEFmdGVyUmVkaXJlY3RzXG4gICAgICAgICAgICB0aGlzLnNlYXJjaFN0YXRlID0gZXZlbnQudXJsQWZ0ZXJSZWRpcmVjdHM7XG4gICAgICAgICAgfVxuICAgICAgICAgIC8vIHRvZ2dsZSBlbnRlcmluZ1N0YXRlXG4gICAgICAgICAgdGhpcy5fZW50ZXJpbmdTdGF0ZSA9IGZhbHNlO1xuICAgICAgICB9XG4gICAgICAgIGlmICh0aGlzLl9hcHBseVN0YXRlKSB7XG4gICAgICAgICAgLy8gYXBwbHkgbmV3IHRhYmxlIHN0YXRlXG4gICAgICAgICAgc3VwZXIuYXBwbHlUYWJsZVN0YXRlKCk7XG4gICAgICAgICAgdGhpcy5fYXBwbHlTdGF0ZSA9IGZhbHNlO1xuICAgICAgICB9XG4gICAgICB9KTtcbiAgfVxuXG4gIG5nT25EZXN0cm95KCk6IHZvaWQge1xuICAgIC8vIGRlc3Ryb3kgb3duIHN1YnNjcmlwdGlvbnNcbiAgICBpZiAodGhpcy5fcm91dGVyU3Vic2NyaXB0aW9uKSB7XG4gICAgICB0aGlzLl9yb3V0ZXJTdWJzY3JpcHRpb24udW5zdWJzY3JpYmUoKTtcbiAgICB9XG4gICAgLy8gZGVzdHJveSBwYXJlbnQgc3Vic2NyaXB0aW9uc1xuICAgIHJldHVybiBzdXBlci5uZ09uRGVzdHJveSgpO1xuICB9XG59XG4iXX0=
|