bx-rest 0.1.0 → 0.1.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/esm2020/request/disk/file.mjs +3 -3
- package/esm2020/request/disk/folder.mjs +2 -2
- package/esm2020/request/disk/storage.mjs +3 -3
- package/esm2020/request/lists/element.mjs +2 -2
- package/esm2020/request/user.mjs +32 -103
- package/esm2020/request-navvy/disk/file.mjs +12 -16
- package/esm2020/request-navvy/disk/folder.mjs +9 -10
- package/esm2020/request-navvy/disk/storage.mjs +21 -16
- package/esm2020/request-navvy/lists/element.mjs +7 -6
- package/esm2020/request-navvy/user.mjs +34 -22
- package/esm2020/services/http/HttpBX.mjs +13 -28
- package/esm2020/services/http/base/base.mjs +3 -4
- package/esm2020/services/http/base/http.mjs +6 -21
- package/esm2020/services/http/http.mjs +7 -71
- package/esm2020/services/navvy.mjs +26 -0
- package/esm2020/services/vanilla/sessionStorage.mjs +23 -0
- package/esm2020/typification/rest/user/get.mjs +1 -1
- package/fesm2015/bx-rest.mjs +242 -418
- package/fesm2015/bx-rest.mjs.map +1 -1
- package/fesm2020/bx-rest.mjs +242 -418
- package/fesm2020/bx-rest.mjs.map +1 -1
- package/package.json +1 -1
- package/request/user.d.ts +7 -7
- package/request-navvy/disk/file.d.ts +7 -9
- package/request-navvy/disk/folder.d.ts +3 -1
- package/request-navvy/disk/storage.d.ts +7 -2
- package/request-navvy/lists/element.d.ts +3 -1
- package/request-navvy/user.d.ts +14 -9
- package/services/http/HttpBX.d.ts +6 -6
- package/services/http/base/base.d.ts +4 -4
- package/services/http/base/http.d.ts +3 -3
- package/services/http/http.d.ts +3 -12
- package/services/navvy.d.ts +11 -0
- package/services/vanilla/sessionStorage.d.ts +7 -0
- package/typification/rest/user/get.d.ts +1 -1
- package/esm2020/store/users.mjs +0 -67
- package/store/users.d.ts +0 -34
|
@@ -2,33 +2,38 @@ import { Injectable } from '@angular/core';
|
|
|
2
2
|
import { map } from 'rxjs/operators';
|
|
3
3
|
import { BXRestMapResult } from '../../functions/mapResult';
|
|
4
4
|
import BXRestMapDiskStorage from '../../map/disk/storage';
|
|
5
|
+
import { of, tap } from 'rxjs';
|
|
5
6
|
import * as i0 from "@angular/core";
|
|
6
7
|
import * as i1 from "../../request/disk/storage";
|
|
8
|
+
import * as i2 from "../../services/navvy";
|
|
9
|
+
import * as i3 from "../../services/vanilla/sessionStorage";
|
|
7
10
|
export class BXRestNavvyDiskStorage {
|
|
8
11
|
// BXDiskFolder$ = new Observable<BXDiskFolderStore>()
|
|
9
|
-
constructor(BXRestDiskStorage, BXRestMapDiskStorage
|
|
12
|
+
constructor(BXRestDiskStorage, BXRestMapDiskStorage, Navvy, SessionStorage
|
|
10
13
|
// private store: Store<{ BXDiskFolder: BXDiskFolderStore }>,
|
|
11
14
|
) {
|
|
12
15
|
this.BXRestDiskStorage = BXRestDiskStorage;
|
|
13
16
|
this.BXRestMapDiskStorage = BXRestMapDiskStorage;
|
|
17
|
+
this.Navvy = Navvy;
|
|
18
|
+
this.SessionStorage = SessionStorage;
|
|
14
19
|
// this.BXDiskFolder$ = this.store.select('BXDiskFolder')
|
|
15
20
|
}
|
|
16
21
|
getforapp() {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
22
|
+
let res = this.SessionStorage.getItem(this.constructor.name + this.getforapp.name);
|
|
23
|
+
if (res) {
|
|
24
|
+
return of(res);
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
return this.Navvy.mapAndSnackBarError(this.BXRestDiskStorage.getforapp(), 'get root app folder').pipe(tap(v => {
|
|
28
|
+
if (v) {
|
|
29
|
+
this.SessionStorage.setItem(this.constructor.name + this.getforapp.name, v);
|
|
30
|
+
}
|
|
31
|
+
}));
|
|
32
|
+
}
|
|
28
33
|
}
|
|
29
34
|
// TODO: разобраться с фильтром позже
|
|
30
35
|
getchildren(param) {
|
|
31
|
-
return this.BXRestDiskStorage.getchildren(param).pipe(map(v =>
|
|
36
|
+
return this.Navvy.mapAndSnackBarError(this.BXRestDiskStorage.getchildren(param), 'get root app folders and files').pipe(map(v => {
|
|
32
37
|
if (v && v.length) {
|
|
33
38
|
return this.BXRestMapDiskStorage.getchildren(v);
|
|
34
39
|
}
|
|
@@ -43,12 +48,12 @@ export class BXRestNavvyDiskStorage {
|
|
|
43
48
|
return this.BXRestDiskStorage.uploadfile(param);
|
|
44
49
|
}
|
|
45
50
|
}
|
|
46
|
-
BXRestNavvyDiskStorage.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskStorage, deps: [{ token: i1.BXRestDiskStorage }, { token: BXRestMapDiskStorage }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
51
|
+
BXRestNavvyDiskStorage.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskStorage, deps: [{ token: i1.BXRestDiskStorage }, { token: BXRestMapDiskStorage }, { token: i2.Navvy }, { token: i3.SessionStorageServices }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
47
52
|
BXRestNavvyDiskStorage.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskStorage, providedIn: 'root' });
|
|
48
53
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskStorage, decorators: [{
|
|
49
54
|
type: Injectable,
|
|
50
55
|
args: [{
|
|
51
56
|
providedIn: 'root'
|
|
52
57
|
}]
|
|
53
|
-
}], ctorParameters: function () { return [{ type: i1.BXRestDiskStorage }, { type: BXRestMapDiskStorage }]; } });
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
}], ctorParameters: function () { return [{ type: i1.BXRestDiskStorage }, { type: BXRestMapDiskStorage }, { type: i2.Navvy }, { type: i3.SessionStorageServices }]; } });
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2J4LXJlc3Qvc3JjL3JlcXVlc3QtbmF2dnkvZGlzay9zdG9yYWdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFFMUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3JDLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUMzRCxPQUFPLG9CQUFvQixNQUFNLHdCQUF3QixDQUFBO0FBS3pELE9BQU8sRUFBRSxFQUFFLEVBQUUsR0FBRyxFQUFFLE1BQU0sTUFBTSxDQUFBOzs7OztBQUs5QixNQUFNLE9BQU8sc0JBQXNCO0lBRWpDLHNEQUFzRDtJQUV0RCxZQUNVLGlCQUFvQyxFQUNwQyxvQkFBMEMsRUFDMUMsS0FBWSxFQUNaLGNBQXNDO0lBQzlDLDZEQUE2RDs7UUFKckQsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUFtQjtRQUNwQyx5QkFBb0IsR0FBcEIsb0JBQW9CLENBQXNCO1FBQzFDLFVBQUssR0FBTCxLQUFLLENBQU87UUFDWixtQkFBYyxHQUFkLGNBQWMsQ0FBd0I7UUFJOUMseURBQXlEO0lBQzNELENBQUM7SUFFRCxTQUFTO1FBQ1AsSUFBSSxHQUFHLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQW9CLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDckcsSUFBRyxHQUFHLEVBQUM7WUFDTCxPQUFPLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQTtTQUNmO2FBQU07WUFDTCxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLFNBQVMsRUFBRSxFQUFFLHFCQUFxQixDQUFDLENBQUMsSUFBSSxDQUNuRyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUU7Z0JBQ04sSUFBRyxDQUFDLEVBQUM7b0JBQ0gsSUFBSSxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUE7aUJBQzVFO1lBQ0gsQ0FBQyxDQUFDLENBQ0gsQ0FBQTtTQUNGO0lBQ0gsQ0FBQztJQUVELHFDQUFxQztJQUNyQyxXQUFXLENBQUMsS0FBbUM7UUFDN0MsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUNuQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxFQUN6QyxnQ0FBZ0MsQ0FDakMsQ0FBQyxJQUFJLENBQ0osR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFO1lBQ04sSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLE1BQU0sRUFBRTtnQkFDakIsT0FBTyxJQUFJLENBQUMsb0JBQW9CLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO2FBQ2hEO1lBQ0QsT0FBTyxFQUFDLElBQUksRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBQyxDQUFBO1FBQy9CLENBQUMsQ0FBQyxDQUNILENBQUE7SUFDSCxDQUFDO0lBRUQsbURBQW1EO0lBQ25ELFNBQVMsQ0FBQyxLQUE2QztRQUNyRCxPQUFPLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUMsSUFBSSxDQUNqRCxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FDN0IsQ0FBQTtJQUNILENBQUM7SUFFRCxVQUFVLENBQUMsS0FBNkI7UUFDdEMsT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ2xELENBQUM7O21IQXREVSxzQkFBc0IsbURBVjVCLG9CQUFvQjt1SEFVZCxzQkFBc0IsY0FGckIsTUFBTTsyRkFFUCxzQkFBc0I7a0JBSGxDLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25COzBGQVRNLG9CQUFvQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJ1xyXG5pbXBvcnQgeyBCWFJlc3REaXNrU3RvcmFnZSB9IGZyb20gJy4uLy4uL3JlcXVlc3QvZGlzay9zdG9yYWdlJ1xyXG5pbXBvcnQgeyBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XHJcbmltcG9ydCB7IEJYUmVzdE1hcFJlc3VsdCB9IGZyb20gJy4uLy4uL2Z1bmN0aW9ucy9tYXBSZXN1bHQnXHJcbmltcG9ydCBCWFJlc3RNYXBEaXNrU3RvcmFnZSBmcm9tICcuLi8uLi9tYXAvZGlzay9zdG9yYWdlJ1xyXG5pbXBvcnQgeyBpQlhSZXN0UGFyYW1VcGxvYWRGaWxlIH0gZnJvbSAnLi4vLi4vdHlwaWZpY2F0aW9uL3Jlc3QvZGlzay9zdG9yYWdlL3VwbG9hZGZpbGUnXHJcbmltcG9ydCB7IE5hdnZ5IH0gZnJvbSAnLi4vLi4vc2VydmljZXMvbmF2dnknXHJcbmltcG9ydCB7IFNlc3Npb25TdG9yYWdlU2VydmljZXMgfSBmcm9tICcuLi8uLi9zZXJ2aWNlcy92YW5pbGxhL3Nlc3Npb25TdG9yYWdlJ1xyXG5pbXBvcnQgeyBpQlhSZXN0Rm9sZGVySW5mbyB9IGZyb20gJy4uLy4uL3R5cGlmaWNhdGlvbi9yZXN0L2Rpc2svZm9sZGVyJ1xyXG5pbXBvcnQgeyBvZiwgdGFwIH0gZnJvbSAncnhqcydcclxuXHJcbkBJbmplY3RhYmxlKHtcclxuICBwcm92aWRlZEluOiAncm9vdCdcclxufSlcclxuZXhwb3J0IGNsYXNzIEJYUmVzdE5hdnZ5RGlza1N0b3JhZ2Uge1xyXG5cclxuICAvLyBCWERpc2tGb2xkZXIkID0gbmV3IE9ic2VydmFibGU8QlhEaXNrRm9sZGVyU3RvcmU+KClcclxuXHJcbiAgY29uc3RydWN0b3IoXHJcbiAgICBwcml2YXRlIEJYUmVzdERpc2tTdG9yYWdlOiBCWFJlc3REaXNrU3RvcmFnZSxcclxuICAgIHByaXZhdGUgQlhSZXN0TWFwRGlza1N0b3JhZ2U6IEJYUmVzdE1hcERpc2tTdG9yYWdlLFxyXG4gICAgcHJpdmF0ZSBOYXZ2eTogTmF2dnksXHJcbiAgICBwcml2YXRlIFNlc3Npb25TdG9yYWdlOiBTZXNzaW9uU3RvcmFnZVNlcnZpY2VzXHJcbiAgICAvLyBwcml2YXRlIHN0b3JlOiBTdG9yZTx7IEJYRGlza0ZvbGRlcjogQlhEaXNrRm9sZGVyU3RvcmUgfT4sXHJcblxyXG4gICkge1xyXG4gICAgLy8gdGhpcy5CWERpc2tGb2xkZXIkID0gdGhpcy5zdG9yZS5zZWxlY3QoJ0JYRGlza0ZvbGRlcicpXHJcbiAgfVxyXG5cclxuICBnZXRmb3JhcHAoKSB7XHJcbiAgICBsZXQgcmVzID0gdGhpcy5TZXNzaW9uU3RvcmFnZS5nZXRJdGVtPGlCWFJlc3RGb2xkZXJJbmZvPih0aGlzLmNvbnN0cnVjdG9yLm5hbWUgKyB0aGlzLmdldGZvcmFwcC5uYW1lKVxyXG4gICAgaWYocmVzKXtcclxuICAgICAgcmV0dXJuIG9mKHJlcylcclxuICAgIH0gZWxzZSB7XHJcbiAgICAgIHJldHVybiB0aGlzLk5hdnZ5Lm1hcEFuZFNuYWNrQmFyRXJyb3IodGhpcy5CWFJlc3REaXNrU3RvcmFnZS5nZXRmb3JhcHAoKSwgJ2dldCByb290IGFwcCBmb2xkZXInKS5waXBlKFxyXG4gICAgICAgIHRhcCh2ID0+IHtcclxuICAgICAgICAgIGlmKHYpe1xyXG4gICAgICAgICAgICB0aGlzLlNlc3Npb25TdG9yYWdlLnNldEl0ZW0odGhpcy5jb25zdHJ1Y3Rvci5uYW1lICsgdGhpcy5nZXRmb3JhcHAubmFtZSwgdilcclxuICAgICAgICAgIH1cclxuICAgICAgICB9KVxyXG4gICAgICApXHJcbiAgICB9XHJcbiAgfVxyXG5cclxuICAvLyBUT0RPOiDRgNCw0LfQvtCx0YDQsNGC0YzRgdGPINGBINGE0LjQu9GM0YLRgNC+0Lwg0L/QvtC30LbQtVxyXG4gIGdldGNoaWxkcmVuKHBhcmFtOiB7IGlkOiBudW1iZXIsIGZpbHRlcj86IGFueSB9KSB7XHJcbiAgICByZXR1cm4gdGhpcy5OYXZ2eS5tYXBBbmRTbmFja0JhckVycm9yKFxyXG4gICAgICB0aGlzLkJYUmVzdERpc2tTdG9yYWdlLmdldGNoaWxkcmVuKHBhcmFtKSxcclxuICAgICAgJ2dldCByb290IGFwcCBmb2xkZXJzIGFuZCBmaWxlcydcclxuICAgICkucGlwZShcclxuICAgICAgbWFwKHYgPT4ge1xyXG4gICAgICAgIGlmICh2ICYmIHYubGVuZ3RoKSB7XHJcbiAgICAgICAgICByZXR1cm4gdGhpcy5CWFJlc3RNYXBEaXNrU3RvcmFnZS5nZXRjaGlsZHJlbih2KVxyXG4gICAgICAgIH1cclxuICAgICAgICByZXR1cm4ge2ZpbGU6IFtdLCBmb2xkZXI6IFtdfVxyXG4gICAgICB9KVxyXG4gICAgKVxyXG4gIH1cclxuXHJcbiAgLy8gVE9ETzog0YDQsNC30L7QsdGA0LDRgtGM0YHRjyDRh9GC0L4g0LLQvtC30LLRgNCw0YnQsNC10YIg0Lgg0YfRgtC+INCy0YHRgtCw0LLQu9GP0YLRjFxyXG4gIGFkZGZvbGRlcihwYXJhbTogeyBpZDogbnVtYmVyLCBkYXRhOiB7IE5BTUU6IHN0cmluZyB9IH0pIHtcclxuICAgIHJldHVybiB0aGlzLkJYUmVzdERpc2tTdG9yYWdlLmFkZGZvbGRlcihwYXJhbSkucGlwZShcclxuICAgICAgbWFwKHYgPT4gQlhSZXN0TWFwUmVzdWx0KHYpKVxyXG4gICAgKVxyXG4gIH1cclxuXHJcbiAgdXBsb2FkZmlsZShwYXJhbTogaUJYUmVzdFBhcmFtVXBsb2FkRmlsZSkge1xyXG4gICAgcmV0dXJuIHRoaXMuQlhSZXN0RGlza1N0b3JhZ2UudXBsb2FkZmlsZShwYXJhbSk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -1,24 +1,25 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { map } from 'rxjs/operators';
|
|
3
|
-
import { BXRestMapResult } from '../../functions/mapResult';
|
|
4
3
|
import BXRestListsElementMap from '../../map/lists/element';
|
|
5
4
|
import * as i0 from "@angular/core";
|
|
6
5
|
import * as i1 from "../../request/lists/element";
|
|
6
|
+
import * as i2 from "../../services/navvy";
|
|
7
7
|
export class BXRestNavvyListsElement {
|
|
8
|
-
constructor(BXRestListsElement, BXRestMap) {
|
|
8
|
+
constructor(BXRestListsElement, BXRestMap, Navvy) {
|
|
9
9
|
this.BXRestListsElement = BXRestListsElement;
|
|
10
10
|
this.BXRestMap = BXRestMap;
|
|
11
|
+
this.Navvy = Navvy;
|
|
11
12
|
}
|
|
12
13
|
get(pram) {
|
|
13
|
-
return this.BXRestListsElement.get(pram).pipe(map(v => (v) ? this.BXRestMap.get(
|
|
14
|
+
return this.Navvy.mapAndSnackBarError(this.BXRestListsElement.get(pram), 'Не удалось получить элемент списка').pipe(map(v => (v) ? this.BXRestMap.get(v) : undefined));
|
|
14
15
|
}
|
|
15
16
|
}
|
|
16
|
-
BXRestNavvyListsElement.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyListsElement, deps: [{ token: i1.BXRestListsElement }, { token: BXRestListsElementMap }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
17
|
+
BXRestNavvyListsElement.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyListsElement, deps: [{ token: i1.BXRestListsElement }, { token: BXRestListsElementMap }, { token: i2.Navvy }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
17
18
|
BXRestNavvyListsElement.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyListsElement, providedIn: 'root' });
|
|
18
19
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyListsElement, decorators: [{
|
|
19
20
|
type: Injectable,
|
|
20
21
|
args: [{
|
|
21
22
|
providedIn: 'root'
|
|
22
23
|
}]
|
|
23
|
-
}], ctorParameters: function () { return [{ type: i1.BXRestListsElement }, { type: BXRestListsElementMap }]; } });
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
}], ctorParameters: function () { return [{ type: i1.BXRestListsElement }, { type: BXRestListsElementMap }, { type: i2.Navvy }]; } });
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWxlbWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2J4LXJlc3Qvc3JjL3JlcXVlc3QtbmF2dnkvbGlzdHMvZWxlbWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRTFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUNwQyxPQUFPLHFCQUFxQixNQUFNLHlCQUF5QixDQUFBOzs7O0FBTTNELE1BQU0sT0FBTyx1QkFBdUI7SUFFbEMsWUFDVSxrQkFBc0MsRUFDdEMsU0FBZ0MsRUFDaEMsS0FBWTtRQUZaLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBb0I7UUFDdEMsY0FBUyxHQUFULFNBQVMsQ0FBdUI7UUFDaEMsVUFBSyxHQUFMLEtBQUssQ0FBTztJQUV0QixDQUFDO0lBRUQsR0FBRyxDQUFDLElBQWlDO1FBQ25DLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxtQkFBbUIsQ0FDbkMsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFDakMsb0NBQW9DLENBQ3JDLENBQUMsSUFBSSxDQUNKLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FDbEQsQ0FBQTtJQUNILENBQUM7O29IQWhCVSx1QkFBdUIsb0RBTjdCLHFCQUFxQjt3SEFNZix1QkFBdUIsY0FGdEIsTUFBTTsyRkFFUCx1QkFBdUI7a0JBSG5DLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25COzJGQUxNLHFCQUFxQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGlCWFJlc3RQYXJhbUxpc3RzRWxlbWVudEdldCB9IGZyb20gJy4uLy4uL3R5cGlmaWNhdGlvbi9yZXN0L2xpc3RzL2VsZW1lbnQvZ2V0J1xyXG5pbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSdcclxuaW1wb3J0IHsgQlhSZXN0TGlzdHNFbGVtZW50IH0gZnJvbSAnLi4vLi4vcmVxdWVzdC9saXN0cy9lbGVtZW50J1xyXG5pbXBvcnQgeyBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycydcclxuaW1wb3J0IEJYUmVzdExpc3RzRWxlbWVudE1hcCBmcm9tICcuLi8uLi9tYXAvbGlzdHMvZWxlbWVudCdcclxuaW1wb3J0IHsgTmF2dnkgfSBmcm9tICcuLi8uLi9zZXJ2aWNlcy9uYXZ2eSdcclxuXHJcbkBJbmplY3RhYmxlKHtcclxuICBwcm92aWRlZEluOiAncm9vdCdcclxufSlcclxuZXhwb3J0IGNsYXNzIEJYUmVzdE5hdnZ5TGlzdHNFbGVtZW50IHtcclxuXHJcbiAgY29uc3RydWN0b3IoXHJcbiAgICBwcml2YXRlIEJYUmVzdExpc3RzRWxlbWVudDogQlhSZXN0TGlzdHNFbGVtZW50LFxyXG4gICAgcHJpdmF0ZSBCWFJlc3RNYXA6IEJYUmVzdExpc3RzRWxlbWVudE1hcCxcclxuICAgIHByaXZhdGUgTmF2dnk6IE5hdnZ5LFxyXG4gICkge1xyXG4gIH1cclxuXHJcbiAgZ2V0KHByYW06IGlCWFJlc3RQYXJhbUxpc3RzRWxlbWVudEdldCkge1xyXG4gICAgcmV0dXJuIHRoaXMuTmF2dnkubWFwQW5kU25hY2tCYXJFcnJvcihcclxuICAgICAgdGhpcy5CWFJlc3RMaXN0c0VsZW1lbnQuZ2V0KHByYW0pLFxyXG4gICAgICAn0J3QtSDRg9C00LDQu9C+0YHRjCDQv9C+0LvRg9GH0LjRgtGMINGN0LvQtdC80LXQvdGCINGB0L/QuNGB0LrQsCdcclxuICAgICkucGlwZShcclxuICAgICAgbWFwKHYgPT4gKHYpID8gdGhpcy5CWFJlc3RNYXAuZ2V0KHYpIDogdW5kZWZpbmVkKSxcclxuICAgIClcclxuICB9XHJcblxyXG4gIC8vIGFkZChwYXJhbTogaVJlc3RCWFBhcmFtTGlzdHNFbGVtZW50QWRkKSB7XHJcbiAgLy8gICByZXR1cm4gdGhpcy5odHRwLnBvc3Q8aUh0dHBBbnN3ZXJCWDxudW1iZXI+Pih0aGlzLnVybC5hZGQsIHBhcmFtKVxyXG4gIC8vIH1cclxufVxyXG4iXX0=
|
|
@@ -1,53 +1,65 @@
|
|
|
1
1
|
import { of, tap } from 'rxjs';
|
|
2
|
-
import {
|
|
3
|
-
import { saveSelf } from '../store/users';
|
|
2
|
+
import { map } from 'rxjs/operators';
|
|
4
3
|
import { Injectable } from '@angular/core';
|
|
5
4
|
import * as i0 from "@angular/core";
|
|
6
5
|
import * as i1 from "../request/user";
|
|
7
|
-
import * as i2 from "
|
|
8
|
-
import * as i3 from "../
|
|
6
|
+
import * as i2 from "../map/user";
|
|
7
|
+
import * as i3 from "../services/navvy";
|
|
8
|
+
import * as i4 from "../services/vanilla/sessionStorage";
|
|
9
9
|
export class BXRestNavvyUser {
|
|
10
|
-
constructor(BXRestUser,
|
|
10
|
+
constructor(BXRestUser, BXRestUserMap, Navvy, SessionStorage) {
|
|
11
11
|
this.BXRestUser = BXRestUser;
|
|
12
|
-
this.store = store;
|
|
13
12
|
this.BXRestUserMap = BXRestUserMap;
|
|
14
|
-
this.
|
|
13
|
+
this.Navvy = Navvy;
|
|
14
|
+
this.SessionStorage = SessionStorage;
|
|
15
|
+
}
|
|
16
|
+
get(params = {}) {
|
|
17
|
+
return this.Navvy.mapAndSnackBarError(this.BXRestUser.get(params), 'Не удалось получить пользователей');
|
|
15
18
|
}
|
|
16
19
|
current(update = false) {
|
|
17
20
|
if (update) {
|
|
18
21
|
return this.self();
|
|
19
22
|
}
|
|
20
23
|
else {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
return this.self();
|
|
27
|
-
}
|
|
28
|
-
}), first());
|
|
24
|
+
let self = this.SessionStorage.getItem(this.constructor.name + this.self.name);
|
|
25
|
+
if (self) {
|
|
26
|
+
return of(self);
|
|
27
|
+
}
|
|
28
|
+
return this.self();
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
|
+
update(user, fieldUpdate) {
|
|
32
|
+
return this.Navvy.mapAndSnackBarError(this.BXRestUser.update(user, fieldUpdate), 'Не удалось обновить пользователя с ID' + user.ID);
|
|
33
|
+
}
|
|
31
34
|
self() {
|
|
32
|
-
return this.BXRestUser.current()
|
|
35
|
+
return this.Navvy.mapAndSnackBarError(this.BXRestUser.current(), 'Не удалось получить пользователя')
|
|
33
36
|
.pipe(map(v => {
|
|
34
|
-
if (v
|
|
35
|
-
return this.BXRestUserMap.current(v
|
|
37
|
+
if (v) {
|
|
38
|
+
return this.BXRestUserMap.current(v);
|
|
36
39
|
}
|
|
37
40
|
return undefined;
|
|
38
41
|
}), tap(v => {
|
|
39
42
|
if (v) {
|
|
40
|
-
this.
|
|
43
|
+
this.SessionStorage.setItem(this.constructor.name + this.self.name, v);
|
|
41
44
|
}
|
|
42
45
|
}));
|
|
43
46
|
}
|
|
47
|
+
search(params) {
|
|
48
|
+
return this.Navvy.mapAndSnackBarError(this.BXRestUser.search(params), 'Сервер не отвечает на запрос поиска');
|
|
49
|
+
}
|
|
50
|
+
access(access) {
|
|
51
|
+
return this.Navvy.mapAndSnackBarError(this.BXRestUser.access(access), 'Не удалось получить права');
|
|
52
|
+
}
|
|
53
|
+
fields() {
|
|
54
|
+
return this.Navvy.mapAndSnackBarError(this.BXRestUser.fields(), 'Не удалось поля');
|
|
55
|
+
}
|
|
44
56
|
}
|
|
45
|
-
BXRestNavvyUser.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyUser, deps: [{ token: i1.BXRestUser }, { token: i2.
|
|
57
|
+
BXRestNavvyUser.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyUser, deps: [{ token: i1.BXRestUser }, { token: i2.BXRestUserMap }, { token: i3.Navvy }, { token: i4.SessionStorageServices }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
46
58
|
BXRestNavvyUser.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyUser, providedIn: 'root' });
|
|
47
59
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyUser, decorators: [{
|
|
48
60
|
type: Injectable,
|
|
49
61
|
args: [{
|
|
50
62
|
providedIn: 'root'
|
|
51
63
|
}]
|
|
52
|
-
}], ctorParameters: function () { return [{ type: i1.BXRestUser }, { type: i2.
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
}], ctorParameters: function () { return [{ type: i1.BXRestUser }, { type: i2.BXRestUserMap }, { type: i3.Navvy }, { type: i4.SessionStorageServices }]; } });
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../projects/bx-rest/src/request-navvy/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAC9B,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;;;;;;AAa1C,MAAM,OAAO,eAAe;IAE1B,YACU,UAAsB,EACtB,aAA4B,EAC5B,KAAY,EACZ,cAAsC;QAHtC,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,UAAK,GAAL,KAAK,CAAO;QACZ,mBAAc,GAAd,cAAc,CAAwB;IAEhD,CAAC;IAED,GAAG,CAAC,SAA8B,EAAE;QAClC,OAAO,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,mCAAmC,CAAC,CAAA;IACzG,CAAC;IAED,OAAO,CAAC,MAAM,GAAG,KAAK;QACpB,IAAI,MAAM,EAAE;YACV,OAAO,IAAI,CAAC,IAAI,EAAE,CAAA;SACnB;aAAM;YACL,IAAI,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAgB,CAAA;YAC7F,IAAG,IAAI,EAAC;gBACN,OAAO,EAAE,CAAC,IAAI,CAAC,CAAA;aAChB;YACD,OAAO,IAAI,CAAC,IAAI,EAAE,CAAA;SACnB;IACH,CAAC;IAED,MAAM,CAAC,IAAiB,EAAE,WAAqB;QAC7C,OAAO,IAAI,CAAC,KAAK,CAAC,mBAAmB,CACnC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,EACzC,uCAAuC,GAAG,IAAI,CAAC,EAAE,CAClD,CAAA;IACH,CAAC;IAEO,IAAI;QACV,OAAO,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,kCAAkC,CAAC;aACjG,IAAI,CACH,GAAG,CAAC,CAAC,CAAC,EAAE;YACN,IAAI,CAAC,EAAE;gBACL,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;aACrC;YACD,OAAO,SAAS,CAAA;QAClB,CAAC,CAAC,EACF,GAAG,CAAC,CAAC,CAAC,EAAE;YACN,IAAI,CAAC,EAAE;gBACL,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aACxE;QACH,CAAC,CAAC,CACH,CAAA;IACL,CAAC;IAED,MAAM,CAAC,MAAiC;QACtC,OAAO,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,qCAAqC,CAAC,CAAA;IAC9G,CAAC;IAED,MAAM,CAAC,MAAgB;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC,CAAA;IACpG,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,iBAAiB,CAAC,CAAA;IACpF,CAAC;;4GA5DU,eAAe;gHAAf,eAAe,cAFd,MAAM;2FAEP,eAAe;kBAH3B,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","sourcesContent":["import { of, tap } from 'rxjs'\nimport { map } from 'rxjs/operators'\nimport { Injectable } from '@angular/core'\nimport { BXRestUser } from '../request/user'\nimport { BXRestUserMap } from '../map/user'\nimport { iBXRestParamUserGet } from '../typification/rest/user/get'\nimport { Navvy } from '../services/navvy'\nimport { SessionStorageServices } from '../services/vanilla/sessionStorage'\nimport { iBXRestUser } from '../typification/rest/user/user'\nimport UserFilterSearch from '../typification/rest/user/UserFilterSearch'\n\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class BXRestNavvyUser {\n\n  constructor(\n    private BXRestUser: BXRestUser,\n    private BXRestUserMap: BXRestUserMap,\n    private Navvy: Navvy,\n    private SessionStorage: SessionStorageServices\n  ) {\n  }\n\n  get(params: iBXRestParamUserGet = {}) {\n    return this.Navvy.mapAndSnackBarError(this.BXRestUser.get(params), 'Не удалось получить пользователей')\n  }\n\n  current(update = false) {\n    if (update) {\n      return this.self()\n    } else {\n      let self = this.SessionStorage.getItem(this.constructor.name + this.self.name) as iBXRestUser\n      if(self){\n        return of(self)\n      }\n      return this.self()\n    }\n  }\n\n  update(user: iBXRestUser, fieldUpdate: string[]) {\n    return this.Navvy.mapAndSnackBarError(\n      this.BXRestUser.update(user, fieldUpdate),\n      'Не удалось обновить пользователя с ID' + user.ID\n    )\n  }\n\n  private self() {\n    return this.Navvy.mapAndSnackBarError(this.BXRestUser.current(), 'Не удалось получить пользователя')\n      .pipe(\n        map(v => {\n          if (v) {\n            return this.BXRestUserMap.current(v)\n          }\n          return undefined\n        }),\n        tap(v => {\n          if (v) {\n            this.SessionStorage.setItem(this.constructor.name + this.self.name, v);\n          }\n        }),\n      )\n  }\n\n  search(params: string | UserFilterSearch) {\n    return this.Navvy.mapAndSnackBarError(this.BXRestUser.search(params), 'Сервер не отвечает на запрос поиска')\n  }\n\n  access(access: string[]) {\n    return this.Navvy.mapAndSnackBarError(this.BXRestUser.access(access), 'Не удалось получить права')\n  }\n\n  fields() {\n    return this.Navvy.mapAndSnackBarError(this.BXRestUser.fields(), 'Не удалось поля')\n  }\n\n  // getAll(params: iBXGetParam = {}): Observable<iBXRestUser [] | undefined> {\n  //   if (!Object.keys(params).length) {\n  //     params = clone(this.def.params)\n  //   }\n  //\n  //   const saveAllUser = compare(params, this.def.params)\n  //   return this.user$.pipe(\n  //     take(1),\n  //     mergeMap(v => {\n  //       if (v.load.all) {\n  //         if (compare(this.def.params, params)) {\n  //           return of(clone(v.data))\n  //         }\n  //       }\n  //\n  //       return this.getEndArray(params).pipe(\n  //         take(1),\n  //         map(v => {\n  //           if (v && v.result) {\n  //             let cl = clone(v.result)\n  //             return this.saveArrUser(cl)\n  //           }\n  //           return undefined\n  //         }),\n  //       )\n  //     }),\n  //     tap(v => {\n  //       if (v && v.length && saveAllUser) {\n  //         this.store.dispatch(loadAll({load: true}))\n  //       }\n  //       params.start = this.def.params.start\n  //     })\n  //   )\n  // }\n\n  // private saveArrUser(users: iBXRestUserHttp[]) {\n  //   let result: iBXRestUser [] = []\n  //   for (const user of users) {\n  //     result.push(this.userMap.HttpToBX(user))\n  //   }\n  //   this.store.dispatch(saveArr({arr: result}))\n  //\n  //   return result\n  // }\n\n  // getEndArray(params: UserFilter = {}): Observable<iHttpAnswerBX<iBXRestUserHttp[]> | undefined> {\n  //   return this.get(params).pipe(\n  //     mergeMap(items => {\n  //       if (items && items.result && typeof items.result === 'object') {\n  //         if (items.next) {\n  //           params.start = items.next\n  //           return this.getEndArray(params).pipe(map(vEnd => {\n  //             if (vEnd && items.result && vEnd.result) {\n  //               return {result: [...items.result, ...vEnd.result]}\n  //             }\n  //             return (items) ? items : undefined\n  //           }))\n  //         }\n  //         return of(items)\n  //       } else {\n  //         return of(undefined)\n  //       }\n  //     }),\n  //   )\n  // }\n\n}\n\n"]}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { throwError,
|
|
2
|
-
import {
|
|
1
|
+
import { throwError, mergeMap, forkJoin } from 'rxjs';
|
|
2
|
+
import { map } from 'rxjs/operators';
|
|
3
3
|
import { Injectable } from '@angular/core';
|
|
4
4
|
import clone from 'just-clone';
|
|
5
|
-
import
|
|
5
|
+
import { HttpServices } from './http';
|
|
6
6
|
import * as i0 from "@angular/core";
|
|
7
7
|
// type TransformFunction<T, R> = (input: T) => R;
|
|
8
|
-
export default class HttpBXServices extends
|
|
8
|
+
export default class HttpBXServices extends HttpServices {
|
|
9
9
|
timeNowOnServer() {
|
|
10
10
|
return this.httpGet('server.time').pipe(map(v => {
|
|
11
11
|
if (v && v.result) {
|
|
@@ -55,38 +55,30 @@ export default class HttpBXServices extends BaseHttpServices {
|
|
|
55
55
|
// override mapBranchResultWithoutKey<T>(res: iBatchRequestAnswer<T>[]): T[] {
|
|
56
56
|
// return flatten<T>(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)))
|
|
57
57
|
// }
|
|
58
|
-
post(name, params = {},
|
|
59
|
-
return this.httpPost(this.getNameMethod(name), params,
|
|
58
|
+
post(name, params = {}, settings = this.defSettings) {
|
|
59
|
+
return this.httpPost(this.getNameMethod(name), params, settings);
|
|
60
60
|
}
|
|
61
|
-
get(name, params = {},
|
|
62
|
-
return this.httpGet(this.getNameMethod(name), params,
|
|
61
|
+
get(name, params = {}, settings = this.defSettings) {
|
|
62
|
+
return this.httpGet(this.getNameMethod(name), params, settings);
|
|
63
63
|
}
|
|
64
|
-
httpPost(url, params = {},
|
|
64
|
+
httpPost(url, params = {}, settings = this.defSettings) {
|
|
65
65
|
return this.session.getAuthParams().pipe(mergeMap(auth => {
|
|
66
66
|
if (auth) {
|
|
67
67
|
const paramsClone = clone(params);
|
|
68
68
|
paramsClone[this.session.getKeyAuth()] = auth;
|
|
69
69
|
return this.session.getBaseUrl().pipe(mergeMap(v => {
|
|
70
70
|
if (v) {
|
|
71
|
-
return this.http.post(this.prepareBaseAddress(v) + url, this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings))
|
|
72
|
-
.pipe(take(1), catchError(err => {
|
|
73
|
-
if (!textError.length && err.error.error_description) {
|
|
74
|
-
textError = err.error.error_description;
|
|
75
|
-
}
|
|
76
|
-
this.snackBar.error('Ошибка: ' + textError);
|
|
77
|
-
return throwError(() => err);
|
|
78
|
-
}));
|
|
71
|
+
return this.http.post(this.prepareBaseAddress(v) + url, this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings));
|
|
79
72
|
}
|
|
80
73
|
return throwError(() => 'get base url error');
|
|
81
74
|
}));
|
|
82
75
|
}
|
|
83
76
|
else {
|
|
84
|
-
this.snackBar.error('Error: Auth not get');
|
|
85
77
|
return throwError(() => 'auth not get');
|
|
86
78
|
}
|
|
87
79
|
}));
|
|
88
80
|
}
|
|
89
|
-
httpGet(url, params = {},
|
|
81
|
+
httpGet(url, params = {}, settings = this.defSettings) {
|
|
90
82
|
return this.session.getAuthParams().pipe(mergeMap(auth => {
|
|
91
83
|
if (auth) {
|
|
92
84
|
if (params === null) {
|
|
@@ -99,19 +91,12 @@ export default class HttpBXServices extends BaseHttpServices {
|
|
|
99
91
|
};
|
|
100
92
|
return this.session.getBaseUrl().pipe(mergeMap(v => {
|
|
101
93
|
if (v) {
|
|
102
|
-
return this.http.get(this.prepareBaseAddress(v) + url, options)
|
|
103
|
-
if (!textError.length && err.error.error_description) {
|
|
104
|
-
textError = err.error.error_description;
|
|
105
|
-
}
|
|
106
|
-
this.snackBar.error('Ошибка: ' + textError);
|
|
107
|
-
return throwError(() => err);
|
|
108
|
-
}));
|
|
94
|
+
return this.http.get(this.prepareBaseAddress(v) + url, options);
|
|
109
95
|
}
|
|
110
96
|
return throwError(() => 'get base url error');
|
|
111
97
|
}));
|
|
112
98
|
}
|
|
113
99
|
else {
|
|
114
|
-
this.snackBar.error('Error: Auth not get');
|
|
115
100
|
return throwError(() => 'auth not get');
|
|
116
101
|
}
|
|
117
102
|
}));
|
|
@@ -128,4 +113,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
|
|
|
128
113
|
providedIn: 'root'
|
|
129
114
|
}]
|
|
130
115
|
}] });
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"HttpBX.js","sourceRoot":"","sources":["../../../../../projects/bx-rest/src/services/http/HttpBX.ts"],"names":[],"mappings":"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","sourcesContent":["import { Observable, throwError, take, mergeMap, forkJoin } from 'rxjs'\nimport { catchError, map } from 'rxjs/operators'\nimport { Injectable } from '@angular/core'\nimport clone from 'just-clone'\nimport { iHttpParamSettings } from '../../typification/rest/settings'\nimport BaseHttpServices from '../../services/http/http'\nimport {\n  iBatchRequestAnswer, iBatchRequestParam,\n  iBatchRequestParamArr,\n  iBatchRequestParamHttp,\n} from '../../typification/rest/batch/batchRequestParam'\nimport { iBXRestAnswer } from '../../typification/rest/base/answer'\n\n// type TransformFunction<T, R> = (input: T) => R;\n\n@Injectable({\n  providedIn: 'root'\n})\nexport default class HttpBXServices extends BaseHttpServices {\n\n  override timeNowOnServer() {\n    return this.httpGet<{ result?: Date, error?: string }>('server.time').pipe(\n      map(v => {\n        if (v && v.result) {\n          return new Date(v.result)\n        }\n        return undefined\n      }),\n    )\n  }\n\n  /**\n   * Это пиздец а не метод\n   * @param param\n   */\n  override branch<T, A>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): Observable<iBatchRequestAnswer<A>[] | undefined> {\n    let prepareParam = Object.entries<string>(this.prepareBatch<T>(param))\n    const size = 50 // больше не отдаст\n    let subarray = [] //массив в который будет выведен результат.\n    for (let i = 0; i < Math.ceil(prepareParam.length / size); i++) {\n      subarray[i] = prepareParam.slice((i * size), (i * size) + size)\n    }\n\n    return forkJoin(\n      subarray.map(i => {\n        return this.httpPost('batch.json', {\n          halt: 0,\n          cmd: Object.assign({}, ...i.map(x => {\n            return {[x[0]]: x[1]}\n          }))\n        })\n      })\n    ) as Observable<iBatchRequestAnswer<A>[]>\n  }\n\n  override prepareBatch<T>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): iBatchRequestParamHttp {\n    let res: iBatchRequestParamHttp = Object.keys(param).reduce(\n      (obj, key) => {\n        obj[key] = '';\n        return obj;\n      },\n      {} as iBatchRequestParamHttp\n    );\n    for (let key in param) {\n      if (typeof key === 'string' || typeof key === 'number' && param[key].param) {\n        res[key] = param[key].name + '?' + this.getHttpParamsGet(param[key].param).toString()\n      }\n    }\n    return res\n  }\n\n  // override mapBranchResult<T>(res: iBatchRequestAnswer<T>[]) {\n  //   return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)) as {\n  //     [key: keyBatch]: T\n  //   }\n  // }\n  //\n  // override mapBranchResultWithoutKey<T>(res: iBatchRequestAnswer<T>[]): T[] {\n  //   return flatten<T>(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)))\n  // }\n\n  post<T>(name: string[],\n          params: any = {},\n          textError = '',\n          settings: iHttpParamSettings = this.defSettings) {\n    return this.httpPost<iBXRestAnswer<T>>(this.getNameMethod(name), params, textError, settings)\n  }\n\n  get<T>(name: string[],\n         params: any = {},\n         textError = '',\n         settings: iHttpParamSettings = this.defSettings) {\n    return this.httpGet<iBXRestAnswer<T>>(this.getNameMethod(name), params, textError, settings)\n  }\n\n  override httpPost<T>(url: string,\n                       params: any = {},\n                       textError = '',\n                       settings: iHttpParamSettings = this.defSettings\n  ): Observable<T | undefined> {\n    return this.session.getAuthParams().pipe(\n      mergeMap(auth => {\n        if (auth) {\n          const paramsClone = clone(params)\n          paramsClone[this.session.getKeyAuth()] = auth\n          return this.session.getBaseUrl().pipe(\n            mergeMap(v => {\n              if (v) {\n                return this.http.post<T | undefined>(\n                  this.prepareBaseAddress(v) + url,\n                  this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings))\n                  .pipe(\n                    take(1),\n                    catchError(err => {\n                      if (!textError.length && err.error.error_description) {\n                        textError = err.error.error_description\n                      }\n\n                      this.snackBar.error('Ошибка: ' + textError)\n                      return throwError(() => err)\n                    })\n                  )\n              }\n              return throwError(() => 'get base url error')\n            }))\n        } else {\n          this.snackBar.error('Error: Auth not get')\n          return throwError(() => 'auth not get')\n        }\n      }))\n  }\n\n  override httpGet<T>(\n    url: string,\n    params: any = {},\n    textError = '',\n    settings: iHttpParamSettings = this.defSettings\n  ): Observable<T | undefined> {\n    return this.session.getAuthParams().pipe(\n      mergeMap(auth => {\n        if (auth) {\n          if (params === null) {\n            params = {}\n          }\n          const paramsClone = clone(params)\n          paramsClone[this.session.getKeyAuth()] = auth\n          let options = {\n            params: this.getHttpParamsGet(paramsClone)\n          }\n\n          return this.session.getBaseUrl().pipe(\n            mergeMap(v => {\n              if (v) {\n                return this.http.get<T>(this.prepareBaseAddress(v) + url, options).pipe(\n                  take(1),\n                  catchError(err => {\n                    if (!textError.length && err.error.error_description) {\n                      textError = err.error.error_description\n                    }\n\n                    this.snackBar.error('Ошибка: ' + textError)\n                    return throwError(() => err)\n                  }))\n              }\n              return throwError(() => 'get base url error')\n            })\n          )\n        } else {\n          this.snackBar.error('Error: Auth not get')\n          return throwError(() => 'auth not get')\n        }\n      })\n    )\n  }\n\n  override getNameMethod(arr: string[]) {\n    return arr.join('.')\n  }\n\n}\n\n"]}
|
|
116
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"HttpBX.js","sourceRoot":"","sources":["../../../../../projects/bx-rest/src/services/http/HttpBX.ts"],"names":[],"mappings":"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","sourcesContent":["import { Observable, throwError, mergeMap, forkJoin } from 'rxjs'\nimport { map } from 'rxjs/operators'\nimport { Injectable } from '@angular/core'\nimport clone from 'just-clone'\nimport { iHttpParamSettings } from '../../typification/rest/settings'\nimport { HttpServices } from './http'\nimport {\n  iBatchRequestAnswer, iBatchRequestParam,\n  iBatchRequestParamArr,\n  iBatchRequestParamHttp,\n} from '../../typification/rest/batch/batchRequestParam'\nimport { iBXRestAnswer } from '../../typification/rest/base/answer'\n\n// type TransformFunction<T, R> = (input: T) => R;\n\n@Injectable({\n  providedIn: 'root'\n})\nexport default class HttpBXServices extends HttpServices {\n\n  timeNowOnServer() {\n    return this.httpGet<{ result?: Date, error?: string }>('server.time').pipe(\n      map(v => {\n        if (v && v.result) {\n          return new Date(v.result)\n        }\n        return undefined\n      }),\n    )\n  }\n\n  /**\n   * Это пиздец а не метод\n   * @param param\n   */\n  branch<T, A>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): Observable<iBatchRequestAnswer<A>[] | undefined> {\n    let prepareParam = Object.entries<string>(this.prepareBatch<T>(param))\n    const size = 50 // больше не отдаст\n    let subarray = [] //массив в который будет выведен результат.\n    for (let i = 0; i < Math.ceil(prepareParam.length / size); i++) {\n      subarray[i] = prepareParam.slice((i * size), (i * size) + size)\n    }\n\n    return forkJoin(\n      subarray.map(i => {\n        return this.httpPost('batch.json', {\n          halt: 0,\n          cmd: Object.assign({}, ...i.map(x => {\n            return {[x[0]]: x[1]}\n          }))\n        })\n      })\n    ) as Observable<iBatchRequestAnswer<A>[]>\n  }\n\n  prepareBatch<T>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): iBatchRequestParamHttp {\n    let res: iBatchRequestParamHttp = Object.keys(param).reduce(\n      (obj, key) => {\n        obj[key] = '';\n        return obj;\n      },\n      {} as iBatchRequestParamHttp\n    );\n    for (let key in param) {\n      if (typeof key === 'string' || typeof key === 'number' && param[key].param) {\n        res[key] = param[key].name + '?' + this.getHttpParamsGet(param[key].param).toString()\n      }\n    }\n    return res\n  }\n\n  // override mapBranchResult<T>(res: iBatchRequestAnswer<T>[]) {\n  //   return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)) as {\n  //     [key: keyBatch]: T\n  //   }\n  // }\n  //\n  // override mapBranchResultWithoutKey<T>(res: iBatchRequestAnswer<T>[]): T[] {\n  //   return flatten<T>(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)))\n  // }\n\n  post<T>(name: string[],\n          params: any = {},\n          settings: iHttpParamSettings = this.defSettings) {\n    return this.httpPost<iBXRestAnswer<T>>(this.getNameMethod(name), params, settings)\n  }\n\n  get<T>(name: string[],\n         params: any = {},\n         settings: iHttpParamSettings = this.defSettings) {\n    return this.httpGet<iBXRestAnswer<T>>(this.getNameMethod(name), params, settings)\n  }\n\n  override httpPost<T>(url: string,\n                       params: any = {},\n                       settings: iHttpParamSettings = this.defSettings\n  ): Observable<T | undefined> {\n    return this.session.getAuthParams().pipe(\n      mergeMap(auth => {\n        if (auth) {\n          const paramsClone = clone(params)\n          paramsClone[this.session.getKeyAuth()] = auth\n          return this.session.getBaseUrl().pipe(\n            mergeMap(v => {\n              if (v) {\n                return this.http.post<T | undefined>(\n                  this.prepareBaseAddress(v) + url,\n                  this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings))\n              }\n              return throwError(() => 'get base url error')\n            }))\n        } else {\n          return throwError(() => 'auth not get')\n        }\n      }))\n  }\n\n  override httpGet<T>(\n    url: string,\n    params: any = {},\n    settings: iHttpParamSettings = this.defSettings\n  ): Observable<T | undefined> {\n    return this.session.getAuthParams().pipe(\n      mergeMap(auth => {\n        if (auth) {\n          if (params === null) {\n            params = {}\n          }\n          const paramsClone = clone(params)\n          paramsClone[this.session.getKeyAuth()] = auth\n          let options = {\n            params: this.getHttpParamsGet(paramsClone)\n          }\n\n          return this.session.getBaseUrl().pipe(\n            mergeMap(v => {\n              if (v) {\n                return this.http.get<T>(this.prepareBaseAddress(v) + url, options)\n              }\n              return throwError(() => 'get base url error')\n            })\n          )\n        } else {\n          return throwError(() => 'auth not get')\n        }\n      })\n    )\n  }\n\n  getNameMethod(arr: string[]) {\n    return arr.join('.')\n  }\n\n}\n\n"]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import SnackBarService from '../../../services/snack-bar/snack-bar.service';
|
|
2
2
|
import { of, } from 'rxjs';
|
|
3
|
-
import { HttpData } from '
|
|
3
|
+
import { HttpData } from '../HttpData';
|
|
4
4
|
import { Injectable } from '@angular/core';
|
|
5
5
|
import * as i0 from "@angular/core";
|
|
6
6
|
import * as i1 from "@angular/common/http";
|
|
@@ -10,10 +10,9 @@ export class BaseHttp extends HttpData {
|
|
|
10
10
|
this.http = http;
|
|
11
11
|
this.snackBar = snackBar;
|
|
12
12
|
}
|
|
13
|
-
handleError(result
|
|
13
|
+
handleError(result) {
|
|
14
14
|
return (error) => {
|
|
15
15
|
console.error(`failed: ${error.message}`);
|
|
16
|
-
this.snackBar.error('Ошибка: ' + textError);
|
|
17
16
|
return of(result);
|
|
18
17
|
};
|
|
19
18
|
}
|
|
@@ -26,4 +25,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
|
|
|
26
25
|
providedIn: 'root'
|
|
27
26
|
}]
|
|
28
27
|
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: SnackBarService }]; } });
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2J4LXJlc3Qvc3JjL3NlcnZpY2VzL2h0dHAvYmFzZS9iYXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sZUFBZSxNQUFNLCtDQUErQyxDQUFBO0FBQzNFLE9BQU8sRUFBYyxFQUFFLEdBQUcsTUFBTSxNQUFNLENBQUE7QUFDdEMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUN0QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFBOzs7QUFLMUMsTUFBTSxPQUFnQixRQUFTLFNBQVEsUUFBUTtJQUUzQyxZQUE2QixJQUFnQixFQUFTLFFBQXlCO1FBQzNFLEtBQUssRUFBRSxDQUFBO1FBRGtCLFNBQUksR0FBSixJQUFJLENBQVk7UUFBUyxhQUFRLEdBQVIsUUFBUSxDQUFpQjtJQUUvRSxDQUFDO0lBYUQsV0FBVyxDQUNQLE1BQVU7UUFDVixPQUFPLENBQUMsS0FBWSxFQUFpQixFQUFFO1lBQ25DLE9BQU8sQ0FBQyxLQUFLLENBQUMsV0FBVyxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQTtZQUN6QyxPQUFPLEVBQUUsQ0FBQyxNQUFXLENBQUMsQ0FBQTtRQUMxQixDQUFDLENBQUM7SUFDTixDQUFDOztxR0F2QmlCLFFBQVEsNENBUnZCLGVBQWU7eUdBUUEsUUFBUSxjQUZkLE1BQU07MkZBRUEsUUFBUTtrQkFIN0IsVUFBVTttQkFBQztvQkFDUixVQUFVLEVBQUUsTUFBTTtpQkFDckI7bUZBUE0sZUFBZSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGlIdHRwUGFyYW1TZXR0aW5ncyB9IGZyb20gJy4uLy4uLy4uL3R5cGlmaWNhdGlvbi9yZXN0L3NldHRpbmdzJ1xyXG5pbXBvcnQgeyBIdHRwQ2xpZW50IH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnXHJcbmltcG9ydCBTbmFja0JhclNlcnZpY2UgZnJvbSAnLi4vLi4vLi4vc2VydmljZXMvc25hY2stYmFyL3NuYWNrLWJhci5zZXJ2aWNlJ1xyXG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBvZiwgfSBmcm9tICdyeGpzJ1xyXG5pbXBvcnQgeyBIdHRwRGF0YSB9IGZyb20gJy4uL0h0dHBEYXRhJ1xyXG5pbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSdcclxuXHJcbkBJbmplY3RhYmxlKHtcclxuICAgIHByb3ZpZGVkSW46ICdyb290J1xyXG59KVxyXG5leHBvcnQgYWJzdHJhY3QgY2xhc3MgQmFzZUh0dHAgZXh0ZW5kcyBIdHRwRGF0YSB7XHJcblxyXG4gICAgcHJvdGVjdGVkIGNvbnN0cnVjdG9yKHB1YmxpYyBodHRwOiBIdHRwQ2xpZW50LCBwdWJsaWMgc25hY2tCYXI6IFNuYWNrQmFyU2VydmljZSkge1xyXG4gICAgICAgIHN1cGVyKClcclxuICAgIH1cclxuXHJcbiAgICBhYnN0cmFjdCBodHRwR2V0PFQ+KFxyXG4gICAgICAgIHVybDogc3RyaW5nLFxyXG4gICAgICAgIHBhcmFtczogYW55LFxyXG4gICAgICAgIHNldHRpbmdzOiBpSHR0cFBhcmFtU2V0dGluZ3NcclxuICAgICk6IE9ic2VydmFibGU8VCB8IHVuZGVmaW5lZD5cclxuXHJcbiAgICBhYnN0cmFjdCBodHRwUG9zdDxUPih1cmw6IHN0cmluZyxcclxuICAgICAgICAgICAgICAgICAgICAgICBwYXJhbXM6IGFueSAsXHJcbiAgICAgICAgICAgICAgICAgICAgICAgc2V0dGluZ3M6IGlIdHRwUGFyYW1TZXR0aW5nc1xyXG4gICAgKTogT2JzZXJ2YWJsZTxUIHwgdW5kZWZpbmVkPlxyXG5cclxuICAgIGhhbmRsZUVycm9yPFQ+KFxyXG4gICAgICAgIHJlc3VsdD86IFQpIHtcclxuICAgICAgICByZXR1cm4gKGVycm9yOiBFcnJvcik6IE9ic2VydmFibGU8VD4gPT4ge1xyXG4gICAgICAgICAgICBjb25zb2xlLmVycm9yKGBmYWlsZWQ6ICR7ZXJyb3IubWVzc2FnZX1gKVxyXG4gICAgICAgICAgICByZXR1cm4gb2YocmVzdWx0IGFzIFQpXHJcbiAgICAgICAgfTtcclxuICAgIH1cclxufVxyXG4iXX0=
|
|
@@ -1,28 +1,13 @@
|
|
|
1
|
-
import { throwError } from 'rxjs';
|
|
2
|
-
import { catchError } from 'rxjs/operators';
|
|
3
1
|
import { HttpParams } from '@angular/common/http';
|
|
4
|
-
import { BaseHttp } from '
|
|
2
|
+
import { BaseHttp } from './base';
|
|
5
3
|
export class BaseHttpServices extends BaseHttp {
|
|
6
|
-
httpGet(url, params = {},
|
|
4
|
+
httpGet(url, params = {}, settings = this.defSettings) {
|
|
7
5
|
return this.http.get(url, {
|
|
8
6
|
params: this.getHttpParamsGet(params, new HttpParams(), false, [], settings)
|
|
9
|
-
})
|
|
10
|
-
if (!textError.length && err.error.error_description) {
|
|
11
|
-
textError = err.error.error_description;
|
|
12
|
-
}
|
|
13
|
-
this.snackBar.error('Ошибка: ' + textError);
|
|
14
|
-
return throwError(() => err);
|
|
15
|
-
}));
|
|
7
|
+
});
|
|
16
8
|
}
|
|
17
|
-
httpPost(url, params = {},
|
|
18
|
-
return this.http.post(url, this.getHttpParamsPost(params, new FormData(), false, [], settings))
|
|
19
|
-
if (!textError.length && err.error.error_description) {
|
|
20
|
-
textError = err.error.error_description;
|
|
21
|
-
}
|
|
22
|
-
this.snackBar.error('Ошибка: ' + textError);
|
|
23
|
-
console.error(err);
|
|
24
|
-
return throwError(() => err);
|
|
25
|
-
}));
|
|
9
|
+
httpPost(url, params = {}, settings = this.defSettings) {
|
|
10
|
+
return this.http.post(url, this.getHttpParamsPost(params, new FormData(), false, [], settings));
|
|
26
11
|
}
|
|
27
12
|
}
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2J4LXJlc3Qvc3JjL3NlcnZpY2VzL2h0dHAvYmFzZS9odHRwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUVqRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBRWpDLE1BQU0sT0FBTyxnQkFBaUIsU0FBUSxRQUFRO0lBRW5DLE9BQU8sQ0FDVixHQUFXLEVBQ1gsTUFBTSxHQUFHLEVBQUUsRUFDWCxXQUErQixJQUFJLENBQUMsV0FBVztRQUUvQyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFnQixHQUFHLEVBQUU7WUFDckMsTUFBTSxFQUFFLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUUsSUFBSSxVQUFVLEVBQUUsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLFFBQVEsQ0FBQztTQUMvRSxDQUFDLENBQUE7SUFDTixDQUFDO0lBRU0sUUFBUSxDQUFJLEdBQVcsRUFDWCxTQUFjLEVBQUUsRUFDaEIsV0FBK0IsSUFBSSxDQUFDLFdBQVc7UUFFOUQsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FDakIsR0FBRyxFQUNILElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsSUFBSSxRQUFRLEVBQUUsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLFFBQVEsQ0FBQyxDQUN0RSxDQUFBO0lBQ0wsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnXHJcbmltcG9ydCB7IEh0dHBQYXJhbXMgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCdcclxuaW1wb3J0IHsgaUh0dHBQYXJhbVNldHRpbmdzIH0gZnJvbSAnLi4vLi4vLi4vdHlwaWZpY2F0aW9uL3Jlc3Qvc2V0dGluZ3MnXHJcbmltcG9ydCB7IEJhc2VIdHRwIH0gZnJvbSAnLi9iYXNlJ1xyXG5cclxuZXhwb3J0IGNsYXNzIEJhc2VIdHRwU2VydmljZXMgZXh0ZW5kcyBCYXNlSHR0cCB7XHJcblxyXG4gICAgcHVibGljIGh0dHBHZXQ8VD4oXHJcbiAgICAgICAgdXJsOiBzdHJpbmcsXHJcbiAgICAgICAgcGFyYW1zID0ge30sXHJcbiAgICAgICAgc2V0dGluZ3M6IGlIdHRwUGFyYW1TZXR0aW5ncyA9IHRoaXMuZGVmU2V0dGluZ3NcclxuICAgICk6IE9ic2VydmFibGU8VCB8IHVuZGVmaW5lZD4ge1xyXG4gICAgICAgIHJldHVybiB0aGlzLmh0dHAuZ2V0PFQgfCB1bmRlZmluZWQ+KHVybCwge1xyXG4gICAgICAgICAgICBwYXJhbXM6IHRoaXMuZ2V0SHR0cFBhcmFtc0dldChwYXJhbXMsIG5ldyBIdHRwUGFyYW1zKCksIGZhbHNlLCBbXSwgc2V0dGluZ3MpXHJcbiAgICAgICAgfSlcclxuICAgIH1cclxuXHJcbiAgICBwdWJsaWMgaHR0cFBvc3Q8VD4odXJsOiBzdHJpbmcsXHJcbiAgICAgICAgICAgICAgICAgICAgICAgcGFyYW1zOiBhbnkgPSB7fSxcclxuICAgICAgICAgICAgICAgICAgICAgICBzZXR0aW5nczogaUh0dHBQYXJhbVNldHRpbmdzID0gdGhpcy5kZWZTZXR0aW5nc1xyXG4gICAgKTogT2JzZXJ2YWJsZTxUIHwgdW5kZWZpbmVkPiB7XHJcbiAgICAgICAgcmV0dXJuIHRoaXMuaHR0cC5wb3N0PFQgfCB1bmRlZmluZWQ+KFxyXG4gICAgICAgICAgICB1cmwsXHJcbiAgICAgICAgICAgIHRoaXMuZ2V0SHR0cFBhcmFtc1Bvc3QocGFyYW1zLCBuZXcgRm9ybURhdGEoKSwgZmFsc2UsIFtdLCBzZXR0aW5ncylcclxuICAgICAgICApXHJcbiAgICB9XHJcbn1cclxuIl19
|