bx-rest 0.0.35 → 0.1.1

package/fesm2015/bx-rest.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
-import { NgModule, inject, Component, ViewEncapsulation, Inject, Injectable } from '@angular/core';
-import { Subscription, filter, take, of, throwError, forkJoin, mergeMap } from 'rxjs';
-import { map, catchError, mergeMap as mergeMap$1, first } from 'rxjs/operators';
+import { NgModule, inject, Component, ViewEncapsulation, Inject, Injectable, Optional } from '@angular/core';
+import { Subscription, filter, take, of, mergeMap, throwError, forkJoin, tap } from 'rxjs';
+import { map, catchError, take as take$1, mergeMap as mergeMap$1 } from 'rxjs/operators';
 import clone from 'just-clone';
 import * as i1$1 from '@angular/material/snack-bar';
 import { MatSnackBarRef, MAT_SNACK_BAR_DATA } from '@angular/material/snack-bar';
@@ -14,10 +14,26 @@ import { createAction, props, createReducer, on } from '@ngrx/store';
 import { __awaiter } from 'tslib';
 import { DateTime } from 'luxon';
 import * as i2$1 from '@angular/router';
-import flatten from 'just-flatten-it';
 import * as i1$3 from '@angular/common/http';
 import { HttpParams } from '@angular/common/http';
 
+const REST_SETTINGS = {
+    auth: {
+        source: 'cookies',
+        key: 'auth'
+    },
+    urls: {
+        home: 'b24.trace-studio.com'
+    }
+};
+
+function BXRestMapResult(v) {
+    if (v && (v.result || typeof v.result === 'boolean')) {
+        return v.result;
+    }
+    return undefined;
+}
+
 const $get = 'get';
 const $add = 'add';
 const $set = 'set';
@@ -439,9 +455,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                 }]
         }] });
 
-const save$1 = createAction('[Auth Component] Save', props());
+const save = createAction('[Auth Component] Save', props());
 const saveAccessToken = createAction('[Auth Component] SaveAccessToken', props());
-const initialState$1 = {
+const initialState = {
     access_token: '',
     client_endpoint: '',
     domain: '',
@@ -454,11 +470,11 @@ const initialState$1 = {
     status: '',
     user_id: 0
 };
-const _authReducer = createReducer(initialState$1, on(saveAccessToken, (s, data) => {
+const _authReducer = createReducer(initialState, on(saveAccessToken, (s, data) => {
     let copy = clone(s);
     return Object.assign(copy, data);
 }));
-function authReducer(state = initialState$1, action) {
+function authReducer(state = initialState, action) {
     return _authReducer(state, action);
 }
 
@@ -563,7 +579,7 @@ class BaseServices {
     }
     getHomeAddress() {
         // return this.prepareBaseAddress(environment.urls.home)
-        return this.prepareBaseAddress('b24.trace-studio.com');
+        return this.prepareBaseAddress(REST_SETTINGS.urls.home);
     }
     dateDiff(a, b) {
         return new Date(a.valueOf() - b.valueOf());
@@ -669,17 +685,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                 }]
         }] });
 
-const REST_SETTINGS = {
-    support: {
-        map: true,
-        result: true
-    },
-    auth: 'cookies',
-    urls: {
-        home: 'b24.trace-studio.com'
-    }
-};
-
 class RestServices {
     constructor() {
         this.BX24 = false;
@@ -700,7 +705,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }], ctorParameters: function () { return []; } });
 
 class SessionKeyServices extends BaseServices {
-    constructor(store, route, BxApiLib) {
+    constructor(store, route, BxApiLib, REST_SETTINGS) {
         super();
         this.store = store;
         this.route = route;
@@ -709,6 +714,7 @@ class SessionKeyServices extends BaseServices {
         this.subscribe = {
             authData: new Subscription()
         };
+        this.REST_SETTINGS = REST_SETTINGS;
         this.authData$ = this.store.select('auth');
         this.authData$.subscribe(authData => {
             if ((authData && !authData.access_token.length) || !authData) {
@@ -805,24 +811,34 @@ class SessionKeyServices extends BaseServices {
         this.subscribe.authData.unsubscribe();
     }
     getAuth() {
-        if (window.BX && window.BX.bitrix_sessid()) {
-            return window.BX.bitrix_sessid();
-        }
-        else if (this.getSessid().length) {
-            let str = this.getSessid();
-            return (str) ? str : '';
-        }
-        else {
-            return CookiesServices.get('auth');
+        switch (REST_SETTINGS.auth.key) {
+            case 'auth':
+                return CookiesServices.get('auth');
+            default:
+                if (window.BX && window.BX.bitrix_sessid()) {
+                    return window.BX.bitrix_sessid();
+                }
+                else if (this.getSessid().length) {
+                    let str = this.getSessid();
+                    return (str) ? str : '';
+                }
+                else {
+                    return CookiesServices.get('auth');
+                }
         }
     }
     getKeyAuth() {
-        if (window.BX && window.BX.bitrix_sessid()
-            || this.getSessid().length) {
-            return 'sessid';
+        if (REST_SETTINGS.auth.key.length) {
+            return REST_SETTINGS.auth.key;
         }
         else {
-            return 'auth';
+            if (window.BX && window.BX.bitrix_sessid()
+                || this.getSessid().length) {
+                return 'sessid';
+            }
+            else {
+                return 'auth';
+            }
         }
     }
     getSessid() {
@@ -848,7 +864,7 @@ class SessionKeyServices extends BaseServices {
         return false;
     }
     getAuthParams() {
-        switch (REST_SETTINGS.auth) {
+        switch (REST_SETTINGS.auth.source) {
             case 'cookies':
                 return of(this.getAuth());
             default:
@@ -856,21 +872,28 @@ class SessionKeyServices extends BaseServices {
         }
     }
     getBaseUrl() {
-        return of(this.prepareBaseAddress(REST_SETTINGS.urls.home, 'rest')); // TODO: вынести в настройки
+        return of(this.prepareBaseAddress(this.REST_SETTINGS.urls.home, 'rest'));
         // return this.authData$.pipe( // TODO: разобраться позже
         //   take(1),
         //   map(v => (v && v.domain) ? this.prepareBaseAddress(v.domain) : undefined)
         // )
     }
 }
-SessionKeyServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SessionKeyServices, deps: [{ token: i1$2.Store }, { token: i2$1.ActivatedRoute }, { token: RestServices }], target: i0.ɵɵFactoryTarget.Injectable });
+SessionKeyServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SessionKeyServices, deps: [{ token: i1$2.Store }, { token: i2$1.ActivatedRoute }, { token: RestServices }, { token: REST_SETTINGS, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
 SessionKeyServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SessionKeyServices, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SessionKeyServices, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1$2.Store }, { type: i2$1.ActivatedRoute }, { type: RestServices }]; } });
+        }], ctorParameters: function () {
+        return [{ type: i1$2.Store }, { type: i2$1.ActivatedRoute }, { type: RestServices }, { type: undefined, decorators: [{
+                        type: Optional
+                    }, {
+                        type: Inject,
+                        args: [REST_SETTINGS]
+                    }] }];
+    } });
 
 class HttpData extends BaseServices {
     constructor() {
@@ -975,12 +998,6 @@ class HttpData extends BaseServices {
         }
         return sendHttpParams;
     }
-    mapResult(v) {
-        if (v && (v.result || typeof v.result === 'boolean')) {
-            return v.result;
-        }
-        return undefined;
-    }
     sliceArrayIntoChunks(arr, chunkSize) {
         const res = [];
         for (let i = 0; i < arr.length; i += chunkSize) {
@@ -1000,10 +1017,9 @@ class BaseHttp extends HttpData {
         this.http = http;
         this.snackBar = snackBar;
     }
-    handleError(result, textError = 'получения данных') {
+    handleError(result) {
         return (error) => {
             console.error(`failed: ${error.message}`);
-            this.snackBar.error('Ошибка: ' + textError);
             return of(result);
         };
     }
@@ -1018,26 +1034,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }], ctorParameters: function () { return [{ type: i1$3.HttpClient }, { type: SnackBarService }]; } });
 
 class BaseHttpServices extends BaseHttp {
-    httpGet(url, params = {}, textError = '', settings = this.defSettings) {
+    httpGet(url, params = {}, settings = this.defSettings) {
         return this.http.get(url, {
             params: this.getHttpParamsGet(params, new HttpParams(), false, [], settings)
-        }).pipe(catchError(err => {
-            if (!textError.length && err.error.error_description) {
-                textError = err.error.error_description;
-            }
-            this.snackBar.error('Ошибка: ' + textError);
-            return throwError(() => err);
-        }));
+        });
     }
-    httpPost(url, params = {}, textError = '', settings = this.defSettings) {
-        return this.http.post(url, this.getHttpParamsPost(params, new FormData(), false, [], settings)).pipe(catchError(err => {
-            if (!textError.length && err.error.error_description) {
-                textError = err.error.error_description;
-            }
-            this.snackBar.error('Ошибка: ' + textError);
-            console.error(err);
-            return throwError(() => err);
-        }));
+    httpPost(url, params = {}, settings = this.defSettings) {
+        return this.http.post(url, this.getHttpParamsPost(params, new FormData(), false, [], settings));
     }
 }
 
@@ -1046,67 +1049,14 @@ class HttpServices extends BaseHttpServices {
         super(http, snackBar);
         this.session = session;
     }
-    timeNowOnServer() {
-        return this.httpGet('server.time').pipe(map(v => {
-            if (v && v.result) {
-                return new Date(v.result);
-            }
-            return undefined;
-        }));
-    }
-    /**
-     * Это пиздец а не метод
-     * @param param
-     */
-    branch(param) {
-        let prepareParam = Object.entries(this.prepareBatch(param));
-        const size = 50; // больше не отдаст
-        let subarray = []; //массив в который будет выведен результат.
-        for (let i = 0; i < Math.ceil(prepareParam.length / size); i++) {
-            subarray[i] = prepareParam.slice((i * size), (i * size) + size);
-        }
-        return forkJoin(subarray.map(i => {
-            return this.httpPost('batch.json', {
-                halt: 0,
-                cmd: Object.assign({}, ...i.map(x => {
-                    return { [x[0]]: x[1] };
-                }))
-            });
-        }));
-    }
-    prepareBatch(param) {
-        let res = Object.keys(param).reduce((obj, key) => {
-            obj[key] = '';
-            return obj;
-        }, {});
-        for (let key in param) {
-            if (typeof key === 'string' || typeof key === 'number' && param[key].param) {
-                res[key] = param[key].name + '?' + this.getHttpParamsGet(param[key].param).toString();
-            }
-        }
-        return res;
-    }
-    mapBranchResult(res) {
-        return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined));
-    }
-    mapBranchResultWithoutKey(res) {
-        return flatten(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)));
-    }
-    httpPost(url, params = {}, textError = '', settings = this.defSettings) {
+    httpPost(url, params = {}, settings = this.defSettings) {
         return this.session.getAuthParams().pipe(mergeMap(auth => {
             if (auth) {
                 const paramsClone = clone(params);
                 paramsClone[this.session.getKeyAuth()] = auth;
                 return this.session.getBaseUrl().pipe(mergeMap(v => {
                     if (v) {
-                        return this.http.post(this.prepareBaseAddress(v) + url, this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings))
-                            .pipe(take(1), catchError(err => {
-                            if (!textError.length && err.error.error_description) {
-                                textError = err.error.error_description;
-                            }
-                            this.snackBar.error('Ошибка: ' + textError);
-                            return throwError(() => err);
-                        }));
+                        return this.http.post(this.prepareBaseAddress(v) + url, this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings));
                     }
                     return throwError(() => 'get base url error');
                 }));
@@ -1117,7 +1067,7 @@ class HttpServices extends BaseHttpServices {
             }
         }));
     }
-    httpGet(url, params = {}, textError = '', settings = this.defSettings) {
+    httpGet(url, params = {}, settings = this.defSettings) {
         return this.session.getAuthParams().pipe(mergeMap(auth => {
             if (auth) {
                 if (params === null) {
@@ -1130,13 +1080,7 @@ class HttpServices extends BaseHttpServices {
                 };
                 return this.session.getBaseUrl().pipe(mergeMap(v => {
                     if (v) {
-                        return this.http.get(this.prepareBaseAddress(v) + url, options).pipe(take(1), catchError(err => {
-                            if (!textError.length && err.error.error_description) {
-                                textError = err.error.error_description;
-                            }
-                            this.snackBar.error('Ошибка: ' + textError);
-                            return throwError(() => err);
-                        }));
+                        return this.http.get(this.prepareBaseAddress(v) + url, options);
                     }
                     return throwError(() => 'get base url error');
                 }));
@@ -1147,9 +1091,6 @@ class HttpServices extends BaseHttpServices {
             }
         }));
     }
-    getNameMethod(arr) {
-        return arr.join('.');
-    }
 }
 HttpServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: HttpServices, deps: [{ token: i1$3.HttpClient }, { token: SnackBarService }, { token: SessionKeyServices }], target: i0.ɵɵFactoryTarget.Injectable });
 HttpServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: HttpServices, providedIn: 'root' });
@@ -1160,13 +1101,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: i1$3.HttpClient }, { type: SnackBarService }, { type: SessionKeyServices }]; } });
 
-function mapResult(v) {
-    if (v && (v.result || typeof v.result === 'boolean')) {
-        return v.result;
-    }
-    return undefined;
-}
-
+// type TransformFunction<T, R> = (input: T) => R;
 class HttpBXServices extends HttpServices {
     timeNowOnServer() {
         return this.httpGet('server.time').pipe(map(v => {
@@ -1208,66 +1143,39 @@ class HttpBXServices extends HttpServices {
         }
         return res;
     }
-    mapBranchResult(res) {
-        return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined));
-    }
-    mapBranchResultWithoutKey(res) {
-        return flatten(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)));
-    }
-    post(name, params = {}, textError = '', mapHttp = undefined, settings = this.defSettings) {
-        return this.httpPost(this.getNameMethod(name), params, textError, settings).pipe(map(v => {
-            console.log('result', v);
-            if (v && v.result && REST_SETTINGS.support.map && mapHttp) {
-                console.log('result2', mapHttp(v.result));
-                // console.log('result2', v, Array.isArray(v.result)
-                //   ? Object.assign(v, {result: v.result.map(i => mapHttp(i))}) as iHttpAnswerBX<R>
-                //   : Object.assign(v, {result: mapHttp(v.result)}) as iHttpAnswerBX<R>)
-                // Array.isArray(v.result)
-                //   ? Object.assign(v, {result: v.result.map(i => mapHttp(i))}) as iHttpAnswerBX<R>
-                //   :
-                return Object.assign(v, { result: mapHttp(v.result) });
-            }
-            return v;
-        }), map(v => (v && REST_SETTINGS.support.result) ? mapResult : v));
-    }
-    get(name, params = {}, textError = '', mapHttp = (v) => {
-        return v;
-    }, settings = this.defSettings) {
-        return this.httpGet(this.getNameMethod(name), params, textError, settings).pipe(map(v => {
-            if (v && v.result && REST_SETTINGS.support.map) {
-                return Array.isArray(v.result)
-                    ? Object.assign(v, { result: v.result.map(i => mapHttp(i)) })
-                    : Object.assign(v, { result: mapHttp(v.result) });
-            }
-            return v;
-        }), map(v => (v && REST_SETTINGS.support.result) ? mapResult : v));
+    // override mapBranchResult<T>(res: iBatchRequestAnswer<T>[]) {
+    //   return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)) as {
+    //     [key: keyBatch]: T
+    //   }
+    // }
+    //
+    // override mapBranchResultWithoutKey<T>(res: iBatchRequestAnswer<T>[]): T[] {
+    //   return flatten<T>(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)))
+    // }
+    post(name, params = {}, settings = this.defSettings) {
+        return this.httpPost(this.getNameMethod(name), params, settings);
+    }
+    get(name, params = {}, settings = this.defSettings) {
+        return this.httpGet(this.getNameMethod(name), params, settings);
     }
-    httpPost(url, params = {}, textError = '', settings = this.defSettings) {
+    httpPost(url, params = {}, settings = this.defSettings) {
         return this.session.getAuthParams().pipe(mergeMap(auth => {
             if (auth) {
                 const paramsClone = clone(params);
                 paramsClone[this.session.getKeyAuth()] = auth;
                 return this.session.getBaseUrl().pipe(mergeMap(v => {
                     if (v) {
-                        return this.http.post(this.prepareBaseAddress(v) + url, this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings))
-                            .pipe(take(1), catchError(err => {
-                            if (!textError.length && err.error.error_description) {
-                                textError = err.error.error_description;
-                            }
-                            this.snackBar.error('Ошибка: ' + textError);
-                            return throwError(() => err);
-                        }));
+                        return this.http.post(this.prepareBaseAddress(v) + url, this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings));
                     }
                     return throwError(() => 'get base url error');
                 }));
             }
             else {
-                this.snackBar.error('Error: Auth not get');
                 return throwError(() => 'auth not get');
             }
         }));
     }
-    httpGet(url, params = {}, textError = '', settings = this.defSettings) {
+    httpGet(url, params = {}, settings = this.defSettings) {
         return this.session.getAuthParams().pipe(mergeMap(auth => {
             if (auth) {
                 if (params === null) {
@@ -1280,19 +1188,12 @@ class HttpBXServices extends HttpServices {
                 };
                 return this.session.getBaseUrl().pipe(mergeMap(v => {
                     if (v) {
-                        return this.http.get(this.prepareBaseAddress(v) + url, options).pipe(take(1), catchError(err => {
-                            if (!textError.length && err.error.error_description) {
-                                textError = err.error.error_description;
-                            }
-                            this.snackBar.error('Ошибка: ' + textError);
-                            return throwError(() => err);
-                        }));
+                        return this.http.get(this.prepareBaseAddress(v) + url, options);
                     }
                     return throwError(() => 'get base url error');
                 }));
             }
             else {
-                this.snackBar.error('Error: Auth not get');
                 return throwError(() => 'auth not get');
             }
         }));
@@ -1310,40 +1211,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                 }]
         }] });
 
-let BaseMapServices$1 = class BaseMapServices extends BaseServices {
-};
-BaseMapServices$1.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseMapServices$1, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BaseMapServices$1.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseMapServices$1, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseMapServices$1, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
-class BXRestListsElementMap extends BaseMapServices$1 {
-    get(item) {
-        return Object.assign(item, {
-            BP_PUBLISHED: item.BP_PUBLISHED === 'Y',
-            CREATED_BY: this.toNum(item.CREATED_BY),
-            IBLOCK_ID: this.toNum(item.IBLOCK_ID),
-            ID: this.toNum(item.ID)
-        });
-    }
-}
-BXRestListsElementMap.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsElementMap, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BXRestListsElementMap.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsElementMap, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsElementMap, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 class BXRestListsElement {
-    constructor(http, mapResult) {
+    constructor(http) {
         this.http = http;
-        this.mapResult = mapResult;
         this.url = {
             add: [$lists, $element, $add],
             delete: [$lists, $element, $delete],
@@ -1353,19 +1223,19 @@ class BXRestListsElement {
         };
     }
     get(pram) {
-        return this.http.post(this.url.get, pram, 'Не Удалось получить элемент списка', (v) => v.map(i => this.mapResult.get(i)));
+        return this.http.post(this.url.get, pram);
     }
     customPipe() {
     }
 }
-BXRestListsElement.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsElement, deps: [{ token: HttpBXServices }, { token: BXRestListsElementMap }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestListsElement.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsElement, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
 BXRestListsElement.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsElement, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsElement, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: HttpBXServices }, { type: BXRestListsElementMap }]; } });
+        }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
 
 class BXRestLists {
     constructor(element) {
@@ -1388,70 +1258,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: BXRestListsElement }]; } });
 
-const save = createAction('[Users Component] Save', props());
-const saveArr = createAction('[Users Component] Save Arr', props());
-const update = createAction('[Users Component] Update', props());
-const loadAll = createAction('[Users Component] loadAll', props());
-const saveSelf = createAction('[Users Component] saveSelf', props());
-const saveIDLoadedDepartment = createAction('[Users Component] saveIDLoadedDepartment', props());
-const initialState = {
-    load: {
-        all: false,
-        department: []
-    },
-    self: undefined,
-    data: []
-};
-const _usersReducer = createReducer(initialState, on(saveIDLoadedDepartment, (s, data) => {
-    let copy = clone(s);
-    copy.load.department = [...copy.load.department, ...data.id];
-    return copy;
-}), on(save, (s, data) => {
-    const find = s.data.find(v => v.ID === data.ID);
-    if (!find) {
-        const copy = clone(s);
-        copy.data.push(data);
-        return copy;
-    }
-    return s;
-}), on(saveArr, (s, data) => {
-    const copy = clone(s);
-    if (copy.data && copy.data.length) {
-        for (const user of data.arr) {
-            const find = copy.data.find(v => v.ID === user.ID);
-            if (!find) {
-                copy.data.push(user);
-            }
-        }
-    }
-    else {
-        copy.data = [...data.arr];
-    }
-    return copy;
-}), on(update, (s, data) => {
-    const copy = clone(s);
-    let find = copy.data.findIndex(v => v.ID === data.ID);
-    if (find !== -1) {
-        const copy = clone(s);
-        copy.data.splice(find, 1, data);
-        // copy.data.push(data)
-        return copy;
-    }
-    return s;
-}), on(loadAll, (s, data) => {
-    if (data.load !== s.load.all) {
-        const copy = clone(s);
-        copy.load.all = data.load;
-        return copy;
-    }
-    return s;
-}), on(saveSelf, (s, data) => {
-    return Object.assign(Object.assign({}, s), { self: data.self });
-}));
-function usersReducer(state = initialState, action) {
-    return _usersReducer(state, action);
-}
-
 class BaseMapServices extends BaseServices {
 }
 BaseMapServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseMapServices, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
@@ -1463,8 +1269,102 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                 }]
         }] });
 
-class BitrixApiUserMapServices extends BaseMapServices {
-    HttpToBX(user) {
+class BXRestMapListsElement extends BaseMapServices {
+    get(items) {
+        return items.map(item => Object.assign(item, {
+            BP_PUBLISHED: item.BP_PUBLISHED === 'Y',
+            CREATED_BY: this.toNum(item.CREATED_BY),
+            IBLOCK_ID: this.toNum(item.IBLOCK_ID),
+            ID: this.toNum(item.ID)
+        }));
+    }
+}
+BXRestMapListsElement.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapListsElement, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BXRestMapListsElement.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapListsElement, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapListsElement, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestMapLists extends BaseMapServices {
+    constructor(element) {
+        super();
+        this.element = element;
+    }
+}
+BXRestMapLists.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapLists, deps: [{ token: BXRestMapListsElement }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestMapLists.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapLists, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapLists, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestMapListsElement }]; } });
+
+class Navvy {
+    constructor(snackBar) {
+        this.snackBar = snackBar;
+    }
+    mapAndSnackBarError(request, errorText) {
+        return request.pipe(map(v => BXRestMapResult(v)), catchError(err => {
+            this.snackBar.error(errorText);
+            return throwError(() => err);
+        }));
+    }
+}
+Navvy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: Navvy, deps: [{ token: SnackBarService }], target: i0.ɵɵFactoryTarget.Injectable });
+Navvy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: Navvy, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: Navvy, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: SnackBarService }]; } });
+
+class BXRestNavvyListsElement {
+    constructor(BXRestListsElement, BXRestMap, Navvy) {
+        this.BXRestListsElement = BXRestListsElement;
+        this.BXRestMap = BXRestMap;
+        this.Navvy = Navvy;
+    }
+    get(pram) {
+        return this.Navvy.mapAndSnackBarError(this.BXRestListsElement.get(pram), 'Не удалось получить элемент списка').pipe(map(v => (v) ? this.BXRestMap.get(v) : undefined));
+    }
+}
+BXRestNavvyListsElement.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyListsElement, deps: [{ token: BXRestListsElement }, { token: BXRestMapListsElement }, { token: Navvy }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestNavvyListsElement.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyListsElement, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyListsElement, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestListsElement }, { type: BXRestMapListsElement }, { type: Navvy }]; } });
+
+class BXRestNavvyLists {
+    constructor(element) {
+        this.element = element;
+        this.url = {
+            add: [$lists, $add],
+            delete: [$lists, $delete],
+            get: [$lists, $get],
+            update: [$lists, $update],
+            getIblockTypeId: [$lists, $get, $iblock, $type, $id], // Метод возвращает id типа инфоблока
+        };
+    }
+}
+BXRestNavvyLists.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLists, deps: [{ token: BXRestNavvyListsElement }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestNavvyLists.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLists, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLists, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestNavvyListsElement }]; } });
+
+class BXRestUserMap extends BaseMapServices {
+    current(user) {
         let res = Object.assign(clone(user), {
             ID: this.toNum(user.ID),
             IS_ONLINE: this.toBool(user.IS_ONLINE),
@@ -1539,9 +1439,9 @@ class BitrixApiUserMapServices extends BaseMapServices {
         return res.trim();
     }
 }
-BitrixApiUserMapServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BitrixApiUserMapServices, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BitrixApiUserMapServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BitrixApiUserMapServices, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BitrixApiUserMapServices, decorators: [{
+BXRestUserMap.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestUserMap, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BXRestUserMap.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestUserMap, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestUserMap, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1549,14 +1449,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }] });
 
 class BXRestUser {
-    constructor(http, snackBar, 
-    // private img: ImgServices,
-    //private dateTrace: DateTrace,
-    store, userMap) {
+    constructor(http, BXRestUserMap) {
         this.http = http;
-        this.snackBar = snackBar;
-        this.store = store;
-        this.userMap = userMap;
+        this.BXRestUserMap = BXRestUserMap;
         this.url = {
             admin: [$user, 'admin'],
             get: [$user, $get],
@@ -1575,7 +1470,6 @@ class BXRestUser {
         this.def = {
             params: { ACTIVE: 1, start: 0 }
         };
-        this.user$ = this.store.select('users');
     }
     admin() {
         return this.http.get(this.url.admin);
@@ -1583,84 +1477,30 @@ class BXRestUser {
     get(params = {}) {
         let copyParams = clone(params);
         this.setDefParam(copyParams);
-        return this.http.post(this.url.get, copyParams, 'Не удалось получить пользователей', (v) => { return v.map(i => this.userMap.HttpToBX(i)); });
-        // .pipe(
-        //   tap(v => {
-        //     if (v && v.result) {
-        //       this.saveArrUser(v.result)
-        //     }
-        //   })
-        // )
+        return this.http.post(this.url.get, copyParams);
     }
-    current(update = false) {
-        if (update) {
-            return this.getSelfHttp();
-        }
-        else {
-            return this.user$.pipe(mergeMap$1(v => {
-                if (v && v.self) {
-                    return of(v.self);
+    current() {
+        return this.http.get(this.url.current, {});
+    }
+    update(user, fieldUpdate) {
+        if (fieldUpdate && fieldUpdate.length) {
+            let sendData = {
+                ID: user.ID,
+            };
+            const userBX = this.BXRestUserMap.BXtoHttp(user);
+            for (const field of fieldUpdate) {
+                if (userBX[field]) {
+                    sendData[field] = userBX[field];
                 }
                 else {
-                    return this.getSelfHttp();
+                    return throwError(() => 'One sent field is empty');
                 }
-            }), first());
+            }
+            return this.http.post(this.url.update, sendData);
         }
-    }
-    getSelfHttp() {
-        return this.http.get(this.url.current, {}, 'Не удалось получить пользователя');
-        // .pipe(
-        //   tap(v => {
-        //     if (v) {
-        //       this.store.dispatch(saveSelf({self: v}))
-        //     }
-        //   }),
-        // )
-    }
-    access(access, textError = 'Не удалось получить права') {
-        return this.http.get(this.url.access, { ACCESS: access }, textError);
-    }
-    // getAll(params: iBXGetParam = {}): Observable<iBXRestUser [] | undefined> {
-    //   if (!Object.keys(params).length) {
-    //     params = clone(this.def.params)
-    //   }
-    //
-    //   const saveAllUser = compare(params, this.def.params)
-    //   return this.user$.pipe(
-    //     take(1),
-    //     mergeMap(v => {
-    //       if (v.load.all) {
-    //         if (compare(this.def.params, params)) {
-    //           return of(clone(v.data))
-    //         }
-    //       }
-    //
-    //       return this.getEndArray(params).pipe(
-    //         take(1),
-    //         map(v => {
-    //           if (v && v.result) {
-    //             let cl = clone(v.result)
-    //             return this.saveArrUser(cl)
-    //           }
-    //           return undefined
-    //         }),
-    //       )
-    //     }),
-    //     tap(v => {
-    //       if (v && v.length && saveAllUser) {
-    //         this.store.dispatch(loadAll({load: true}))
-    //       }
-    //       params.start = this.def.params.start
-    //     })
-    //   )
-    // }
-    saveArrUser(users) {
-        let result = [];
-        for (const user of users) {
-            result.push(this.userMap.HttpToBX(user));
+        else {
+            return throwError(() => 'All sent field for edit is empty');
         }
-        this.store.dispatch(saveArr({ arr: result }));
-        return result;
     }
     search(params) {
         if (typeof params === 'string') {
@@ -1669,52 +1509,14 @@ class BXRestUser {
         if (typeof params.ACTIVE !== 'boolean') {
             params.ACTIVE = true;
         }
-        return this.http.get(this.url.search, params, 'Сервер не отвечает на запрос поиска');
+        return this.http.get(this.url.search, params);
+    }
+    access(access) {
+        return this.http.get(this.url.access, { ACCESS: access });
     }
     fields() {
         return this.http.get(this.url.fields);
     }
-    update(user, fieldUpdate) {
-        if (fieldUpdate && fieldUpdate.length) {
-            let sendData = {
-                ID: user.ID,
-            };
-            const userBX = this.userMap.BXtoHttp(user);
-            for (const field of fieldUpdate) {
-                if (userBX[field]) {
-                    sendData[field] = userBX[field];
-                }
-                else {
-                    this.snackBar.error('Одно из указанных полей отправлено не верно');
-                }
-            }
-            return this.http.post(this.url.update, sendData, 'Не удалось обновить пользователя с ID' + user.ID);
-        }
-        else {
-            this.snackBar.error('Не указано ни одно поле для редактирования пользователя');
-            return of({});
-        }
-    }
-    // getEndArray(params: UserFilter = {}): Observable<iHttpAnswerBX<iBXRestUserHttp[]> | undefined> {
-    //   return this.get(params).pipe(
-    //     mergeMap(items => {
-    //       if (items && items.result && typeof items.result === 'object') {
-    //         if (items.next) {
-    //           params.start = items.next
-    //           return this.getEndArray(params).pipe(map(vEnd => {
-    //             if (vEnd && items.result && vEnd.result) {
-    //               return {result: [...items.result, ...vEnd.result]}
-    //             }
-    //             return (items) ? items : undefined
-    //           }))
-    //         }
-    //         return of(items)
-    //       } else {
-    //         return of(undefined)
-    //       }
-    //     }),
-    //   )
-    // }
     setDefParam(params) {
         if (!params.hasOwnProperty('ACTIVE')) {
             params.ACTIVE = this.def.params.ACTIVE;
@@ -1730,29 +1532,832 @@ class BXRestUser {
         }
     }
 }
-BXRestUser.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestUser, deps: [{ token: HttpBXServices }, { token: SnackBarService }, { token: i1$2.Store }, { token: BitrixApiUserMapServices }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestUser.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestUser, deps: [{ token: HttpBXServices }, { token: BXRestUserMap }], target: i0.ɵɵFactoryTarget.Injectable });
 BXRestUser.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestUser, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestUser, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: HttpBXServices }, { type: SnackBarService }, { type: i1$2.Store }, { type: BitrixApiUserMapServices }]; } });
+        }], ctorParameters: function () { return [{ type: HttpBXServices }, { type: BXRestUserMap }]; } });
 
-class BXRest {
-    constructor(user, lists) {
-        this.user = user;
-        this.lists = lists;
-    }
-}
-BXRest.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRest, deps: [{ token: BXRestUser }, { token: BXRestLists }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRest.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRest, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRest, decorators: [{
+class BXRestTasksTask {
+    constructor(http) {
+        this.http = http;
+        this.url = {
+            add: [$tasks, $task, $add],
+            approve: [$tasks, $task, $approve],
+            complete: [$tasks, $task, $complete],
+            counters: {
+                get: [$tasks, $task, $counters, $get], //Получает счетчики пользователя
+            },
+            deger: [$tasks, $task, $deger],
+            delegate: [$tasks, $task, $delegate],
+            delete: [$tasks, $task, $delete],
+            disapprove: [$tasks, $task, $disapprove],
+            favorite: {
+                add: [$tasks, $task, $favorite, $add],
+                delete: [$tasks, $task, $favorite, $delete], // Удаляет задачи из "Избранного"
+            },
+            files: {
+                attach: [$tasks, $task, $files, $attach], // Прикрепляет загруженный на диск файл к задаче
+            },
+            get: [$tasks, $task, $get],
+            getFields: [$tasks, $task, $getFields],
+            getaccess: [$tasks, $task, $getaccess],
+            history: {
+                list: [$tasks, $task, $history, $list], // Получает историю задачи
+            },
+            list: [$tasks, $task, $list],
+            pause: [$tasks, $task, $pause],
+            renew: [$tasks, $task, $renew],
+            start: [$tasks, $task, $start],
+            startwatch: [$tasks, $task, 'startwatch'],
+            stopwatch: [$tasks, $task, 'stopwatch'],
+            update: [$tasks, $task, $update],
+            result: {
+                list: [$tasks, $task, $result, $list],
+                addFromComment: [$tasks, $task, $result, 'addFromComment'],
+                deleteFromComment: [$tasks, $task, $result, 'deleteFromComment'], // Удаление результата задачи по комментарию из которого он был создан
+            },
+            planner: {
+                getlist: [$task, $planner, $getlist], // Возвращает массив, содержащий идентификаторы задач в плане на день
+            }
+        };
+    }
+    add(param) {
+        return this.http.post(this.url.add, param);
+    }
+}
+BXRestTasksTask.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTasksTask, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestTasksTask.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTasksTask, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTasksTask, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
+
+class BXRestTasks {
+    constructor(task) {
+        this.task = task;
+    }
+}
+BXRestTasks.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTasks, deps: [{ token: BXRestTasksTask }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestTasks.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTasks, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTasks, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestTasksTask }]; } });
+
+class BXRestDiskFile {
+    constructor(http) {
+        this.http = http;
+        this.url = {
+            getfields: [$disk, $file, $getFields],
+            get: [$disk, $file, $get],
+            rename: [$disk, $file, $rename],
+            copyto: [$disk, $file, $copyto],
+            moveto: [$disk, $file, $moveto],
+            delete: [$disk, $file, $delete],
+            markdeleted: [$disk, $file, $markdeleted],
+            restore: [$disk, $file, $restore],
+            uploadversion: [$disk, $file, 'uploadversion'],
+            getVersions: [$disk, $file, 'getVersions'],
+            restoreFromVersion: [$disk, $file, 'restoreFromVersion'],
+            getExternalLink: [$disk, $file, 'getexternallink'] //	Возвращает публичную ссылку на файл
+        };
+    }
+    get(id) {
+        return this.http.post(this.url.get, { id: id });
+    }
+    markDel(id) {
+        return this.http.post(this.url.markdeleted, { id: id });
+    }
+}
+BXRestDiskFile.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskFile, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestDiskFile.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskFile, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskFile, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
+
+class BXRestDiskFolder {
+    constructor(http) {
+        this.http = http;
+        this.url = {
+            getfields: [$disk, $folder, $getFields],
+            get: [$disk, $folder, $get],
+            getchildren: [$disk, $folder, $getchildren],
+            addsubfolder: [$disk, $folder, 'addsubfolder'],
+            copyto: [$disk, $folder, $copyto],
+            moveto: [$disk, $folder, $moveto],
+            rename: [$disk, $folder, $rename],
+            deletetree: [$disk, $folder, 'deletetree'],
+            markdeleted: [$disk, $folder, $markdeleted],
+            restore: [$disk, $folder, $restore],
+            uploadfile: [$disk, $folder, $uploadfile],
+            getExternalLink: [$disk, $folder, 'getExternalLink'] // Метод возвращает публичную ссылку
+        };
+    }
+    uploadfile(id, fileContent) {
+        return this.http.post(this.url.uploadfile, {
+            id: id,
+            fileContent: fileContent,
+            data: {
+                NAME: fileContent[0]
+            } // Обязательное поле NAME - имя нового файла
+            // generateUniqueName	Необязательный, по умолчанию false. При указании true, для загружаемого файла будет уникализировано имя, добавлением суффикса (1), (2) и т.п.
+            // rights	Необязательный, по умолчанию пустой массив. Массив прав доступа на загружаемый файл.
+        });
+    }
+    getchildren(id) {
+        return this.http.post(this.url.getchildren, { id: id });
+    }
+}
+BXRestDiskFolder.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskFolder, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestDiskFolder.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskFolder, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskFolder, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
+
+class BXRestDisk {
+    constructor(file, folder) {
+        this.file = file;
+        this.folder = folder;
+    }
+}
+BXRestDisk.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDisk, deps: [{ token: BXRestDiskFile }, { token: BXRestDiskFolder }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestDisk.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDisk, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDisk, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestDiskFile }, { type: BXRestDiskFolder }]; } });
+
+class SessionStorageServices {
+    setItem(name, value) {
+        sessionStorage.setItem(name, JSON.stringify(value));
+    }
+    getItem(name) {
+        const res = sessionStorage.getItem(name);
+        if (res) {
+            return JSON.parse(res);
+        }
+        return undefined;
+    }
+}
+SessionStorageServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SessionStorageServices, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+SessionStorageServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SessionStorageServices, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SessionStorageServices, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestNavvyUser {
+    constructor(BXRestUser, BXRestUserMap, Navvy, SessionStorage) {
+        this.BXRestUser = BXRestUser;
+        this.BXRestUserMap = BXRestUserMap;
+        this.Navvy = Navvy;
+        this.SessionStorage = SessionStorage;
+    }
+    get(params = {}) {
+        return this.Navvy.mapAndSnackBarError(this.BXRestUser.get(params), 'Не удалось получить пользователей');
+    }
+    current(update = false) {
+        if (update) {
+            return this.self();
+        }
+        else {
+            let self = this.SessionStorage.getItem(this.constructor.name + this.self.name);
+            if (self) {
+                return of(self);
+            }
+            return this.self();
+        }
+    }
+    update(user, fieldUpdate) {
+        return this.Navvy.mapAndSnackBarError(this.BXRestUser.update(user, fieldUpdate), 'Не удалось обновить пользователя с ID' + user.ID);
+    }
+    self() {
+        return this.Navvy.mapAndSnackBarError(this.BXRestUser.current(), 'Не удалось получить пользователя')
+            .pipe(map(v => {
+            if (v) {
+                return this.BXRestUserMap.current(v);
+            }
+            return undefined;
+        }), tap(v => {
+            if (v) {
+                this.SessionStorage.setItem(this.constructor.name + this.self.name, v);
+            }
+        }));
+    }
+    search(params) {
+        return this.Navvy.mapAndSnackBarError(this.BXRestUser.search(params), 'Сервер не отвечает на запрос поиска');
+    }
+    access(access) {
+        return this.Navvy.mapAndSnackBarError(this.BXRestUser.access(access), 'Не удалось получить права');
+    }
+    fields() {
+        return this.Navvy.mapAndSnackBarError(this.BXRestUser.fields(), 'Не удалось поля');
+    }
+}
+BXRestNavvyUser.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyUser, deps: [{ token: BXRestUser }, { token: BXRestUserMap }, { token: Navvy }, { token: SessionStorageServices }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestNavvyUser.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyUser, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyUser, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestUser }, { type: BXRestUserMap }, { type: Navvy }, { type: SessionStorageServices }]; } });
+
+class BXRestTaskMap extends BaseMapServices {
+    TaskBXHttpToTaskBX(item) {
+        let result = {};
+        if (item.id) {
+            result.id = this.toNum(item.id);
+        }
+        if (item.parentId) {
+            result.parentId = this.toNum(item.parentId);
+        }
+        if (item.priority) {
+            result.priority = this.toNum(item.priority);
+        }
+        if (item.status) {
+            result.status = this.toNum(item.status);
+        }
+        if (item.multitask) {
+            result.multitask = item.multitask === 'Y';
+        }
+        if (item.groupId) {
+            result.groupId = this.toNum(item.groupId);
+        }
+        if (item.stageId) {
+            result.stageId = this.toNum(item.stageId);
+        }
+        if (item.createdBy) {
+            result.createdBy = this.toNum(item.createdBy);
+        }
+        if (item.createdDate) {
+            result.createdDate = this.toDate(item.createdDate);
+        }
+        if (item.responsibleId) {
+            result.responsibleId = this.toNum(item.responsibleId);
+        }
+        if (item.changedBy) {
+            result.changedBy = this.toNum(item.changedBy);
+        }
+        if (item.changedDate) {
+            result.changedDate = this.toDate(item.changedDate);
+        }
+        if (item.statusChangedBy) {
+            result.statusChangedBy = this.toNum(item.statusChangedBy);
+        }
+        if (item.statusChangedDate) {
+            result.statusChangedDate = this.toDate(item.statusChangedDate);
+        }
+        if (item.closedBy) {
+            result.closedBy = this.toNum(item.closedBy);
+        }
+        if (item.closedDate) {
+            result.closedDate = this.toDate(item.closedDate);
+        }
+        if (item.dateStart) {
+            result.dateStart = this.toDate(item.dateStart);
+        }
+        if (item.deadline) {
+            result.deadline = this.toDate(item.deadline);
+        }
+        if (item.startDatePlan) {
+            result.startDatePlan = this.toDate(item.startDatePlan);
+        }
+        if (item.endDatePlan) {
+            result.endDatePlan = this.toDate(item.endDatePlan);
+        }
+        if (item.forumTopicId) {
+            result.forumTopicId = this.toNum(item.forumTopicId);
+        }
+        if (item.forumId) {
+            result.forumId = this.toNum(item.forumId);
+        }
+        if (item.viewedDate) {
+            result.viewedDate = this.toDate(item.viewedDate);
+        }
+        if (item.sorting) {
+            result.sorting = this.toNum(item.sorting);
+        }
+        if (item.durationPlan) {
+            result.durationPlan = this.toNum(item.durationPlan);
+        }
+        if (item.descriptionInBbcode) {
+            result.descriptionInBbcode = item.descriptionInBbcode === 'Y';
+        }
+        if (item.accomplices) {
+            result.accomplices = item.accomplices.map(i => this.toNum(i));
+        }
+        if (item.subStatus) {
+            result.subStatus = this.toNum(item.subStatus);
+        }
+        if (item.creator) {
+            result.creator = Object.assign(item.creator, { id: this.toNum(item.creator.id) });
+        }
+        if (item.responsible) {
+            result.responsible = Object.assign(item.responsible, { id: this.toNum(item.responsible.id) });
+        }
+        if (item.accomplicesData) {
+            result.accomplicesData =
+                Object.values(item.accomplicesData).map(i => Object.assign(i, { id: this.toNum(i.id) }));
+        }
+        if (item.allowTimeTracking) {
+            result.allowTimeTracking = item.allowTimeTracking === 'Y';
+        }
+        return Object.assign(item, result);
+    }
+}
+BXRestTaskMap.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTaskMap, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BXRestTaskMap.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTaskMap, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTaskMap, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+// export interface TimeProcess {
+//   total: number,
+//   next: number
+// }
+class BXRestNavvyTasksTask {
+    // pageSize = 50
+    // nowLoad$ = new ReplaySubject<TimeProcess>(1)
+    // def: { select: iBXRestTaskFieldsName[] } = {
+    //   select: ['ID', 'PARENT_ID', 'TITLE', 'DESCRIPTION', 'MARK', 'PRIORITY', 'STATUS', 'MULTITASK',
+    //     'GROUP_ID', 'STAGE_ID', 'CREATED_BY', 'CREATED_DATE', 'RESPONSIBLE_ID', 'ACCOMPLICES', 'AUDITORS',
+    //     'CHANGED_BY', 'CHANGED_DATE', 'STATUS_CHANGED_DATE', 'CLOSED_BY', 'CLOSED_DATE', 'DATE_START', 'VIEWED_DATE',
+    //     'DEADLINE', 'START_DATE_PLAN', 'END_DATE_PLAN', 'FORKED_BY_TEMPLATE_ID', 'TIME_ESTIMATE', 'TIME_SPENT_IN_LOGS',
+    //     'TAGS', 'ALLOW_TIME_TRACKING'
+    //   ]
+    // }
+    // storeTask$: Observable<iStoreTask>
+    constructor(BXRestTasks, snackBar, 
+    //  private store: Store<{ tasks: IStoreTask }>,
+    taskMap) {
+        this.BXRestTasks = BXRestTasks;
+        this.snackBar = snackBar;
+        this.taskMap = taskMap;
+        //  this.storeTask$ = this.store.select('tasks')
+        //  this.nowLoad$.next({
+        //    total: 0,
+        //    next: 0
+        //  })
+    }
+    add(param) {
+        return this.BXRestTasks.add(param).pipe(map(v => {
+            if (v && v.result && v.result.task) {
+                return this.taskMap.TaskBXHttpToTaskBX(v.result.task);
+            }
+            return undefined;
+        }));
+        // return this.http.post<{ task: TaskBXHttp }>(this.url.add, {fields: param}).pipe(
+        //   map(v => {
+        //       if (v && v.result && v.result.task) {
+        //         return Object.assign(
+        //           v,
+        //           {
+        //             result: this.taskBXMap.TaskBXHttpToTaskBX(v.result.task)
+        //           })
+        //       }
+        //       return undefined
+        //     }
+        //   ))
+    }
+}
+BXRestNavvyTasksTask.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTasksTask, deps: [{ token: BXRestTasksTask }, { token: SnackBarService }, { token: BXRestTaskMap }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestNavvyTasksTask.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTasksTask, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTasksTask, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestTasksTask }, { type: SnackBarService }, { type: BXRestTaskMap }]; } });
+
+class BXRestNavvyTasks {
+    constructor(task) {
+        this.task = task;
+    }
+}
+BXRestNavvyTasks.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTasks, deps: [{ token: BXRestNavvyTasksTask }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestNavvyTasks.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTasks, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTasks, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestNavvyTasksTask }]; } });
+
+class BXRestNavvyDiskFile extends BaseServices {
+    constructor(BXRestDiskFile, Navvy) {
+        super();
+        this.BXRestDiskFile = BXRestDiskFile;
+        this.Navvy = Navvy;
+    }
+    get(id) {
+        return this.Navvy.mapAndSnackBarError(this.BXRestDiskFile.get(id), 'Не удалось получить файл').pipe(map(v => {
+            if (v) {
+                return Object.assign(v, { SIZE: this.toNum(v.SIZE) });
+            }
+            return undefined;
+        }));
+    }
+    markDel(id) {
+        return this.Navvy.mapAndSnackBarError(this.BXRestDiskFile.markDel(id), 'Не удалось переместить файл в корзину')
+            .pipe(map(v => {
+            if (v) {
+                return Object.assign(v, { SIZE: this.toNum(v.SIZE) });
+            }
+            return undefined;
+        }));
+    }
+}
+BXRestNavvyDiskFile.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskFile, deps: [{ token: BXRestDiskFile }, { token: Navvy }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestNavvyDiskFile.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskFile, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskFile, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestDiskFile }, { type: Navvy }]; } });
+
+class BXRestMapDiskBase extends BaseMapServices {
+    separationFoldersAndFiles(arr) {
+        let result = { file: [], folder: [] };
+        for (let i of arr) {
+            if (this.instanceOfiFile(i)) {
+                result.file.push(Object.assign(i, {
+                    CREATED_BY: this.toNum(i.CREATED_BY),
+                    CREATE_TIME: this.toDate(i.CREATE_TIME),
+                    DELETED_BY: this.toNum(i.DELETED_BY),
+                    DELETED_TYPE: this.toNum(i.DELETED_TYPE),
+                    DELETE_TIME: (i.DELETE_TIME) ? this.toDate(i.DELETE_TIME) : null,
+                    ID: this.toNum(i.ID),
+                    PARENT_ID: this.toNum(i.PARENT_ID),
+                    REAL_OBJECT_ID: this.toNum(i.REAL_OBJECT_ID),
+                    STORAGE_ID: this.toNum(i.STORAGE_ID),
+                    UPDATED_BY: this.toNum(i.UPDATED_BY),
+                    UPDATE_TIME: this.toDate(i.UPDATE_TIME),
+                    SIZE: this.toNum(i.SIZE),
+                }));
+            }
+            else if (this.instanceOfiFolder(i)) {
+                result.folder.push(Object.assign(i, {
+                    CREATED_BY: this.toNum(i.CREATED_BY),
+                    CREATE_TIME: this.toDate(i.CREATE_TIME),
+                    DELETED_BY: this.toNum(i.DELETED_BY),
+                    DELETED_TYPE: this.toNum(i.DELETED_TYPE),
+                    DELETE_TIME: (i.DELETE_TIME) ? this.toDate(i.DELETE_TIME) : null,
+                    ID: this.toNum(i.ID),
+                    PARENT_ID: this.toNum(i.PARENT_ID),
+                    REAL_OBJECT_ID: this.toNum(i.REAL_OBJECT_ID),
+                    STORAGE_ID: this.toNum(i.STORAGE_ID),
+                    UPDATED_BY: this.toNum(i.UPDATED_BY),
+                    UPDATE_TIME: this.toDate(i.UPDATE_TIME),
+                }));
+            }
+        }
+        return result;
+    }
+    instanceOfiFile(object) {
+        return object && object.TYPE && object.TYPE === 'file';
+    }
+    instanceOfiFolder(object) {
+        return object && object.TYPE && object.TYPE === 'folder';
+    }
+}
+BXRestMapDiskBase.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskBase, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BXRestMapDiskBase.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskBase, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskBase, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestMapDiskFolder extends BXRestMapDiskBase {
+    getContent(arr) {
+        return this.separationFoldersAndFiles(arr);
+    }
+}
+BXRestMapDiskFolder.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskFolder, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BXRestMapDiskFolder.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskFolder, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskFolder, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestDiskNavvyFolder {
+    constructor(BXRestDiskFolder, BXRestMapDiskFolder, Navvy) {
+        this.BXRestDiskFolder = BXRestDiskFolder;
+        this.BXRestMapDiskFolder = BXRestMapDiskFolder;
+        this.Navvy = Navvy;
+    }
+    // uploadfile(id: number, fileContent: string[]) {
+    //   return this.httpPost(
+    //     this.url.uploadfile,
+    //     {
+    //       id: id, // Идентификатор папки. В текущем API загружать файл по пути к папке невозможно. Необходимо обязательно вычислить ID папки
+    //       fileContent: fileContent, // Аналогично 'DETAIL_PICTURE' в примере Обработка файлов (['имя файла', 'содержимое в base64'])
+    //       data: {
+    //         NAME: fileContent[0]
+    //       } // Обязательное поле NAME - имя нового файла
+    //       // generateUniqueName	Необязательный, по умолчанию false. При указании true, для загружаемого файла будет уникализировано имя, добавлением суффикса (1), (2) и т.п.
+    //       // rights	Необязательный, по умолчанию пустой массив. Массив прав доступа на загружаемый файл.
+    //     }
+    //   )
+    // }
+    getchildren(id) {
+        return this.Navvy.mapAndSnackBarError(this.BXRestDiskFolder.getchildren(id), 'get folders and files').pipe(map(v => {
+            if (v) {
+                return this.BXRestMapDiskFolder.getContent(v);
+            }
+            return { file: [], folder: [] };
+        }));
+    }
+}
+BXRestDiskNavvyFolder.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskNavvyFolder, deps: [{ token: BXRestDiskFolder }, { token: BXRestMapDiskFolder }, { token: Navvy }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestDiskNavvyFolder.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskNavvyFolder, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskNavvyFolder, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestDiskFolder }, { type: BXRestMapDiskFolder }, { type: Navvy }]; } });
+
+class BXRestMapDiskStorage extends BXRestMapDiskBase {
+    getchildren(arr) {
+        return this.separationFoldersAndFiles(arr);
+    }
+}
+BXRestMapDiskStorage.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskStorage, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BXRestMapDiskStorage.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskStorage, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskStorage, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestDiskStorage {
+    constructor(http) {
+        this.http = http;
+        this.url = {
+            getfields: [$disk, $storage, $getFields],
+            get: [$disk, $storage, $get],
+            rename: [$disk, $storage, $rename],
+            // Допустимо переименование только хранилища приложения (см. disk.storage.getforapp)
+            getlist: [$disk, $storage, $getlist],
+            gettypes: [$disk, $storage, $getTypes],
+            addfolder: [$disk, $storage, 'addfolder'],
+            getchildren: [$disk, $storage, $getchildren],
+            // которые находятся непосредственно в корне хранилища
+            uploadfile: [$disk, $storage, $uploadfile],
+            getforapp: [$disk, $storage, 'getforapp'] //	Возвращает описание хранилища,
+            // с которым может работать приложение для хранения своих данных (файлов и папок)
+        };
+    }
+    getforapp() {
+        return this.http.post(this.url.getforapp, {});
+    }
+    // TODO: разобраться с фильтром
+    getchildren(param) {
+        return this.http.post(this.url.getchildren, param);
+    }
+    // TODO: разобраться что возвращает и что вставлять
+    addfolder(param) {
+        return this.http.post(this.url.addfolder, param);
+    }
+    uploadfile(param) {
+        return this.http.post(this.url.uploadfile, param);
+    }
+}
+BXRestDiskStorage.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskStorage, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestDiskStorage.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskStorage, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskStorage, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
+
+class BXRestNavvyDiskStorage {
+    // BXDiskFolder$ = new Observable<BXDiskFolderStore>()
+    constructor(BXRestDiskStorage, BXRestMapDiskStorage, Navvy, SessionStorage
+    // private store: Store<{ BXDiskFolder: BXDiskFolderStore }>,
+    ) {
+        this.BXRestDiskStorage = BXRestDiskStorage;
+        this.BXRestMapDiskStorage = BXRestMapDiskStorage;
+        this.Navvy = Navvy;
+        this.SessionStorage = SessionStorage;
+        // this.BXDiskFolder$ = this.store.select('BXDiskFolder')
+    }
+    getforapp() {
+        let res = this.SessionStorage.getItem(this.constructor.name + this.getforapp.name);
+        if (res) {
+            return of(res);
+        }
+        else {
+            return this.Navvy.mapAndSnackBarError(this.BXRestDiskStorage.getforapp(), 'get root app folder').pipe(tap(v => {
+                if (v) {
+                    this.SessionStorage.setItem(this.constructor.name + this.getforapp.name, v);
+                }
+            }));
+        }
+    }
+    // TODO: разобраться с фильтром позже
+    getchildren(param) {
+        return this.Navvy.mapAndSnackBarError(this.BXRestDiskStorage.getchildren(param), 'get root app folders and files').pipe(map(v => {
+            if (v && v.length) {
+                return this.BXRestMapDiskStorage.getchildren(v);
+            }
+            return { file: [], folder: [] };
+        }));
+    }
+    // TODO: разобраться что возвращает и что вставлять
+    addfolder(param) {
+        return this.BXRestDiskStorage.addfolder(param).pipe(map(v => BXRestMapResult(v)));
+    }
+    uploadfile(param) {
+        return this.BXRestDiskStorage.uploadfile(param);
+    }
+}
+BXRestNavvyDiskStorage.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskStorage, deps: [{ token: BXRestDiskStorage }, { token: BXRestMapDiskStorage }, { token: Navvy }, { token: SessionStorageServices }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestNavvyDiskStorage.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskStorage, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskStorage, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestDiskStorage }, { type: BXRestMapDiskStorage }, { type: Navvy }, { type: SessionStorageServices }]; } });
+
+class BXRestNavvyDiskOperation {
+    constructor(folder, disk, storage) {
+        this.folder = folder;
+        this.disk = disk;
+        this.storage = storage;
+    }
+    // данные файла в base64
+    loadFileInAppFolder(file) {
+        return this.storage.getforapp().pipe(take$1(1), mergeMap$1(infoFolder => {
+            if (infoFolder) {
+                return this.storage.uploadfile({
+                    id: infoFolder.ID,
+                    fileContent: [file.name, file.val],
+                    data: {
+                        NAME: file.name
+                    },
+                    generateUniqueName: true
+                }).pipe(map(v => BXRestMapResult(v)));
+            }
+            return of(undefined);
+        }));
+    }
+    getOfCreateRootContentFolderApp(folderName) {
+        return this.getOfCreateRootFolderApp(folderName).pipe(mergeMap$1(v => {
+            if (v) {
+                return this.folder.getchildren(v.ID);
+            }
+            return of(undefined);
+        }));
+    }
+    getRootFoldersApp() {
+        // return this.BXDiskFolder$.pipe(
+        //   take(1),
+        //   mergeMap(
+        //     saveData => {
+        //       if (saveData.content.root.app) {
+        //         return of(saveData.content.root.app)
+        //       }
+        return this.storage.getforapp().pipe(mergeMap$1(v => {
+            if (v && v.ID) {
+                return this.storage.getchildren({ id: v.ID });
+                //   .pipe(
+                //   tap(v => {
+                //     if (v) {
+                //       this.store.dispatch(saveContentRootAppInfo({value: v}))
+                //     }
+                //   })
+                // )
+            }
+            return of(undefined);
+        }));
+        //     }
+        //   )
+        // )
+    }
+    /**
+     * Получать или создать папку, если её нет, с определенным именем для приложения
+     * @param folderName
+     */
+    getOfCreateRootFolderApp(folderName) {
+        return this.getRootFoldersApp().pipe(mergeMap$1(v => {
+            if (v) {
+                if (v.folder.length) {
+                    let find = v.folder.find(i => i.NAME === folderName);
+                    if (find) {
+                        return of(find);
+                    }
+                }
+            }
+            return this.storage.getforapp().pipe(mergeMap$1(v => {
+                if (v && v.ID) {
+                    return this.storage.addfolder({ id: v.ID, data: { NAME: folderName } });
+                }
+                return of(undefined);
+            }));
+        }));
+    }
+}
+BXRestNavvyDiskOperation.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskOperation, deps: [{ token: BXRestDiskNavvyFolder }, { token: BXRestNavvyDiskFile }, { token: BXRestNavvyDiskStorage }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestNavvyDiskOperation.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskOperation, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskOperation, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestDiskNavvyFolder }, { type: BXRestNavvyDiskFile }, { type: BXRestNavvyDiskStorage }]; } });
+
+class BXRestNavvyDisk {
+    constructor(file, folder, operation) {
+        this.file = file;
+        this.folder = folder;
+        this.operation = operation;
+    }
+}
+BXRestNavvyDisk.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDisk, deps: [{ token: BXRestNavvyDiskFile }, { token: BXRestDiskNavvyFolder }, { token: BXRestNavvyDiskOperation }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestNavvyDisk.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDisk, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDisk, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestNavvyDiskFile }, { type: BXRestDiskNavvyFolder }, { type: BXRestNavvyDiskOperation }]; } });
+
+class BXRest {
+    constructor(user, lists, tasks, disk) {
+        this.user = user;
+        this.lists = lists;
+        this.tasks = tasks;
+        this.disk = disk;
+    }
+}
+BXRest.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRest, deps: [{ token: BXRestUser }, { token: BXRestLists }, { token: BXRestTasks }, { token: BXRestDisk }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRest.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRest, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRest, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestUser }, { type: BXRestLists }, { type: BXRestTasks }, { type: BXRestDisk }]; } });
+class BXRestNavvy {
+    constructor(user, lists, tasks, disk) {
+        this.user = user;
+        this.lists = lists;
+        this.tasks = tasks;
+        this.disk = disk;
+    }
+}
+BXRestNavvy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvy, deps: [{ token: BXRestNavvyUser }, { token: BXRestNavvyLists }, { token: BXRestNavvyTasks }, { token: BXRestNavvyDisk }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestNavvy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvy, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvy, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestNavvyUser }, { type: BXRestNavvyLists }, { type: BXRestNavvyTasks }, { type: BXRestNavvyDisk }]; } });
+class BXRestMap {
+    constructor(lists) {
+        this.lists = lists;
+    }
+}
+BXRestMap.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMap, deps: [{ token: BXRestMapLists }], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestMap.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMap, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMap, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestUser }, { type: BXRestLists }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestMapLists }]; } });
 
 /*
  * Public API Surface of bx-rest
@@ -1762,5 +2367,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { BXRest };
+export { BXRest, BXRestMap, BXRestMapResult, BXRestNavvy, REST_SETTINGS };
 //# sourceMappingURL=bx-rest.mjs.map