bx-rest 0.1.0 → 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, Optional } from '@angular/core';
-import { Subscription, filter, take, of, throwError, forkJoin, mergeMap, tap } from 'rxjs';
-import { map, catchError, mergeMap as mergeMap$1, first, take as take$1 } from 'rxjs/operators';
+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';
@@ -455,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: '',
@@ -470,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);
 }
 
@@ -1017,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);
         };
     }
@@ -1035,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));
     }
 }
 
@@ -1063,68 +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<T>(res: iBatchRequestAnswer<T>[]){
-    //     return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)) as {[key:keyBatch]: T}
-    // }
-    //
-    // mapBranchResultWithoutKey<T>(res: iBatchRequestAnswer<T>[]): T[]{
-    //     return flatten<T>(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');
                 }));
@@ -1135,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) {
@@ -1148,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');
                 }));
@@ -1165,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' });
@@ -1229,38 +1152,30 @@ class HttpBXServices extends HttpServices {
     // 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 = {}, textError = '', settings = this.defSettings) {
-        return this.httpPost(this.getNameMethod(name), params, textError, settings);
+    post(name, params = {}, settings = this.defSettings) {
+        return this.httpPost(this.getNameMethod(name), params, settings);
     }
-    get(name, params = {}, textError = '', settings = this.defSettings) {
-        return this.httpGet(this.getNameMethod(name), params, textError, 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) {
@@ -1273,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');
             }
         }));
@@ -1315,7 +1223,7 @@ class BXRestListsElement {
         };
     }
     get(pram) {
-        return this.http.post(this.url.get, pram, 'Не Удалось получить элемент списка');
+        return this.http.post(this.url.get, pram);
     }
     customPipe() {
     }
@@ -1395,23 +1303,44 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                 }]
         }], 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) {
+    constructor(BXRestListsElement, BXRestMap, Navvy) {
         this.BXRestListsElement = BXRestListsElement;
         this.BXRestMap = BXRestMap;
+        this.Navvy = Navvy;
     }
     get(pram) {
-        return this.BXRestListsElement.get(pram).pipe(map(v => (v) ? this.BXRestMap.get(BXRestMapResult(v)) : undefined));
+        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 }], target: i0.ɵɵFactoryTarget.Injectable });
+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 }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestListsElement }, { type: BXRestMapListsElement }, { type: Navvy }]; } });
 
 class BXRestNavvyLists {
     constructor(element) {
@@ -1434,10 +1363,95 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                 }]
         }], 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),
+            DATE_REGISTER: this.toDate(user.DATE_REGISTER),
+            PERSONAL_BIRTHDAY: this.toDate(user.PERSONAL_BIRTHDAY),
+        });
+        if (user.LAST_LOGIN) {
+            res.LAST_LOGIN = this.toDate(user.LAST_LOGIN);
+        }
+        return res;
+    }
+    BXtoHttp(user) {
+        return Object.assign(clone(user), {
+            ID: this.toStr(user.ID),
+            IS_ONLINE: this.toBXYorN(user.IS_ONLINE),
+            DATE_REGISTER: this.getBXStrTime(user.DATE_REGISTER),
+            PERSONAL_BIRTHDAY: this.toStr(user.PERSONAL_BIRTHDAY),
+            LAST_LOGIN: this.toStr(user.LAST_LOGIN)
+        });
+    }
+    getFIO(user) {
+        let res = '';
+        if (!user.LAST_NAME) {
+            const SECOND_NAME = (user.SECOND_NAME) ? user.SECOND_NAME : '';
+            const NAME = (user.NAME) ? user.NAME : '';
+            res = NAME + ' ' + SECOND_NAME;
+        }
+        else if (!user.NAME) {
+            res = user.LAST_NAME;
+        }
+        else if (!user.SECOND_NAME) {
+            res = user.LAST_NAME + ' ' + user.NAME;
+        }
+        else {
+            res = user.LAST_NAME + ' ' + user.NAME + ' ' + user.SECOND_NAME;
+        }
+        return res.trim();
+    }
+    getFI(user) {
+        let res = '';
+        if (!user.LAST_NAME) {
+            const NAME = (user.NAME) ? user.NAME : '';
+            res = NAME;
+        }
+        else if (!user.NAME) {
+            res = user.LAST_NAME;
+        }
+        else {
+            res = user.LAST_NAME + ' ' + user.NAME;
+        }
+        return res.trim();
+    }
+    getFIOShort(user) {
+        let res = '';
+        if (!user.LAST_NAME) {
+            const SECOND_NAME = (user.SECOND_NAME) ? user.SECOND_NAME : '';
+            const NAME = (user.NAME) ? user.NAME : '';
+            res = NAME + ' ' + SECOND_NAME;
+        }
+        else if (!user.NAME) {
+            res = user.LAST_NAME;
+        }
+        else if (!user.SECOND_NAME) {
+            res = user.LAST_NAME + ' ' + user.NAME.charAt(0).toUpperCase() + '.';
+        }
+        else {
+            res =
+                user.LAST_NAME + ' ' +
+                    user.NAME.charAt(0).toUpperCase() + '.' +
+                    user.SECOND_NAME.charAt(0).toUpperCase() + '.';
+        }
+        return res.trim();
+    }
+}
+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'
+                }]
+        }] });
+
 class BXRestUser {
-    constructor(http, snackBar) {
+    constructor(http, BXRestUserMap) {
         this.http = http;
-        this.snackBar = snackBar;
+        this.BXRestUserMap = BXRestUserMap;
         this.url = {
             admin: [$user, 'admin'],
             get: [$user, $get],
@@ -1463,64 +1477,31 @@ class BXRestUser {
     get(params = {}) {
         let copyParams = clone(params);
         this.setDefParam(copyParams);
-        return this.http.post(this.url.get, copyParams, 'Не удалось получить пользователей');
-        // .pipe(
-        //   tap(v => {
-        //     if (v && v.result) {
-        //       this.saveArrUser(v.result)
-        //     }
-        //   })
-        // )
+        return this.http.post(this.url.get, copyParams);
     }
     current() {
-        return this.http.get(this.url.current, {}, 'Не удалось получить пользователя');
+        return this.http.get(this.url.current, {});
     }
-    access(access, textError = 'Не удалось получить права') {
-        return this.http.get(this.url.access, { ACCESS: access }, textError);
+    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 throwError(() => 'One sent field is empty');
+                }
+            }
+            return this.http.post(this.url.update, sendData);
+        }
+        else {
+            return throwError(() => 'All sent field for edit is empty');
+        }
     }
-    // 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
-    //     })
-    //   )
-    // }
-    // private saveArrUser(users: iBXRestUserHttp[]) {
-    //   let result: iBXRestUser [] = []
-    //   for (const user of users) {
-    //     result.push(this.userMap.HttpToBX(user))
-    //   }
-    //   this.store.dispatch(saveArr({arr: result}))
-    //
-    //   return result
-    // }
     search(params) {
         if (typeof params === 'string') {
             params = { FIND: params };
@@ -1528,51 +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;
@@ -1588,14 +1532,14 @@ class BXRestUser {
         }
     }
 }
-BXRestUser.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestUser, deps: [{ token: HttpBXServices }, { token: SnackBarService }], 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 }]; } });
+        }], ctorParameters: function () { return [{ type: HttpBXServices }, { type: BXRestUserMap }]; } });
 
 class BXRestTasksTask {
     constructor(http) {
@@ -1687,10 +1631,10 @@ class BXRestDiskFile {
         };
     }
     get(id) {
-        return this.http.post(this.url.get, { id: id }, 'Не удалось получить файл');
+        return this.http.post(this.url.get, { id: id });
     }
     markDel(id) {
-        return this.http.post(this.url.markdeleted, { id: 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 });
@@ -1732,7 +1676,7 @@ class BXRestDiskFolder {
         });
     }
     getchildren(id) {
-        return this.http.post(this.url.getchildren, { id: id }, 'get folders and files');
+        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 });
@@ -1759,149 +1703,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: BXRestDiskFile }, { type: BXRestDiskFolder }]; } });
 
-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 BXRestUserMap extends BaseMapServices {
-    current(user) {
-        let res = Object.assign(clone(user), {
-            ID: this.toNum(user.ID),
-            IS_ONLINE: this.toBool(user.IS_ONLINE),
-            DATE_REGISTER: this.toDate(user.DATE_REGISTER),
-            PERSONAL_BIRTHDAY: this.toDate(user.PERSONAL_BIRTHDAY),
-        });
-        if (user.LAST_LOGIN) {
-            res.LAST_LOGIN = this.toDate(user.LAST_LOGIN);
-        }
-        return res;
-    }
-    BXtoHttp(user) {
-        return Object.assign(clone(user), {
-            ID: this.toStr(user.ID),
-            IS_ONLINE: this.toBXYorN(user.IS_ONLINE),
-            DATE_REGISTER: this.getBXStrTime(user.DATE_REGISTER),
-            PERSONAL_BIRTHDAY: this.toStr(user.PERSONAL_BIRTHDAY),
-            LAST_LOGIN: this.toStr(user.LAST_LOGIN)
-        });
-    }
-    getFIO(user) {
-        let res = '';
-        if (!user.LAST_NAME) {
-            const SECOND_NAME = (user.SECOND_NAME) ? user.SECOND_NAME : '';
-            const NAME = (user.NAME) ? user.NAME : '';
-            res = NAME + ' ' + SECOND_NAME;
-        }
-        else if (!user.NAME) {
-            res = user.LAST_NAME;
-        }
-        else if (!user.SECOND_NAME) {
-            res = user.LAST_NAME + ' ' + user.NAME;
-        }
-        else {
-            res = user.LAST_NAME + ' ' + user.NAME + ' ' + user.SECOND_NAME;
-        }
-        return res.trim();
-    }
-    getFI(user) {
-        let res = '';
-        if (!user.LAST_NAME) {
-            const NAME = (user.NAME) ? user.NAME : '';
-            res = NAME;
-        }
-        else if (!user.NAME) {
-            res = user.LAST_NAME;
-        }
-        else {
-            res = user.LAST_NAME + ' ' + user.NAME;
-        }
-        return res.trim();
+class SessionStorageServices {
+    setItem(name, value) {
+        sessionStorage.setItem(name, JSON.stringify(value));
     }
-    getFIOShort(user) {
-        let res = '';
-        if (!user.LAST_NAME) {
-            const SECOND_NAME = (user.SECOND_NAME) ? user.SECOND_NAME : '';
-            const NAME = (user.NAME) ? user.NAME : '';
-            res = NAME + ' ' + SECOND_NAME;
-        }
-        else if (!user.NAME) {
-            res = user.LAST_NAME;
-        }
-        else if (!user.SECOND_NAME) {
-            res = user.LAST_NAME + ' ' + user.NAME.charAt(0).toUpperCase() + '.';
+    getItem(name) {
+        const res = sessionStorage.getItem(name);
+        if (res) {
+            return JSON.parse(res);
         }
-        else {
-            res =
-                user.LAST_NAME + ' ' +
-                    user.NAME.charAt(0).toUpperCase() + '.' +
-                    user.SECOND_NAME.charAt(0).toUpperCase() + '.';
-        }
-        return res.trim();
+        return undefined;
     }
 }
-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: [{
+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'
@@ -1909,49 +1725,61 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }] });
 
 class BXRestNavvyUser {
-    constructor(BXRestUser, store, BXRestUserMap) {
+    constructor(BXRestUser, BXRestUserMap, Navvy, SessionStorage) {
         this.BXRestUser = BXRestUser;
-        this.store = store;
         this.BXRestUserMap = BXRestUserMap;
-        this.user$ = this.store.select('users');
+        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 {
-            return this.user$.pipe(mergeMap$1(v => {
-                if (v && v.self) {
-                    return of(v.self);
-                }
-                else {
-                    return this.self();
-                }
-            }), first());
+            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.BXRestUser.current()
+        return this.Navvy.mapAndSnackBarError(this.BXRestUser.current(), 'Не удалось получить пользователя')
             .pipe(map(v => {
-            if (v && v.result) {
-                return this.BXRestUserMap.current(v.result);
+            if (v) {
+                return this.BXRestUserMap.current(v);
             }
             return undefined;
         }), tap(v => {
             if (v) {
-                this.store.dispatch(saveSelf({ self: 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: i1$2.Store }, { token: BXRestUserMap }], target: i0.ɵɵFactoryTarget.Injectable });
+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: i1$2.Store }, { type: BXRestUserMap }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestUser }, { type: BXRestUserMap }, { type: Navvy }, { type: SessionStorageServices }]; } });
 
 class BXRestTaskMap extends BaseMapServices {
     TaskBXHttpToTaskBX(item) {
@@ -2138,42 +1966,37 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }], ctorParameters: function () { return [{ type: BXRestNavvyTasksTask }]; } });
 
 class BXRestNavvyDiskFile extends BaseServices {
-    constructor(BXRestDiskFile) {
+    constructor(BXRestDiskFile, Navvy) {
         super();
         this.BXRestDiskFile = BXRestDiskFile;
+        this.Navvy = Navvy;
     }
     get(id) {
-        return this.BXRestDiskFile.get(id).pipe(map(v => {
-            if (v && v.result) {
-                let newResult = Object.assign(v.result, { SIZE: this.toNum(v.result.SIZE) });
-                return Object.assign(v, {
-                    result: newResult
-                });
+        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.BXRestDiskFile.markDel(id)
+        return this.Navvy.mapAndSnackBarError(this.BXRestDiskFile.markDel(id), 'Не удалось переместить файл в корзину')
             .pipe(map(v => {
-            if (v && v.result) {
-                let newResult = Object.assign(v.result, { SIZE: this.toNum(v.result.SIZE) });
-                return Object.assign(v, {
-                    result: newResult
-                });
+            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 }], target: i0.ɵɵFactoryTarget.Injectable });
+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 }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestDiskFile }, { type: Navvy }]; } });
 
 class BXRestMapDiskBase extends BaseMapServices {
     separationFoldersAndFiles(arr) {
@@ -2244,11 +2067,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }] });
 
 class BXRestDiskNavvyFolder {
-    constructor(BXRestDiskFolder, BXRestMapDiskFolder
-    // private diskFileBaseMap: diskFileBaseMapServices
-    ) {
+    constructor(BXRestDiskFolder, BXRestMapDiskFolder, Navvy) {
         this.BXRestDiskFolder = BXRestDiskFolder;
         this.BXRestMapDiskFolder = BXRestMapDiskFolder;
+        this.Navvy = Navvy;
     }
     // uploadfile(id: number, fileContent: string[]) {
     //   return this.httpPost(
@@ -2265,22 +2087,22 @@ class BXRestDiskNavvyFolder {
     //   )
     // }
     getchildren(id) {
-        return this.BXRestDiskFolder.getchildren(id).pipe(map(v => {
-            if (v && v.result) {
-                return this.BXRestMapDiskFolder.getContent(BXRestMapResult(v));
+        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 }], target: i0.ɵɵFactoryTarget.Injectable });
+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 }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestDiskFolder }, { type: BXRestMapDiskFolder }, { type: Navvy }]; } });
 
 class BXRestMapDiskStorage extends BXRestMapDiskBase {
     getchildren(arr) {
@@ -2315,11 +2137,11 @@ class BXRestDiskStorage {
         };
     }
     getforapp() {
-        return this.http.post(this.url.getforapp, {}, 'get root app folder');
+        return this.http.post(this.url.getforapp, {});
     }
     // TODO: разобраться с фильтром
     getchildren(param) {
-        return this.http.post(this.url.getchildren, param, 'get root app folders and files');
+        return this.http.post(this.url.getchildren, param);
     }
     // TODO: разобраться что возвращает и что вставлять
     addfolder(param) {
@@ -2340,29 +2162,31 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
 
 class BXRestNavvyDiskStorage {
     // BXDiskFolder$ = new Observable<BXDiskFolderStore>()
-    constructor(BXRestDiskStorage, BXRestMapDiskStorage
+    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() {
-        // return this.BXDiskFolder$.pipe(
-        //   take(1),
-        //   mergeMap(
-        //     saveData => {
-        //       if (saveData.folder.app) {
-        //         return of(saveData.folder.app)
-        //       }
-        return this.BXRestDiskStorage.getforapp().pipe(map(v => BXRestMapResult(v)));
-        //     }
-        //   )
-        // )
+        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.BXRestDiskStorage.getchildren(param).pipe(map(v => BXRestMapResult(v)), map(v => {
+        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);
             }
@@ -2377,14 +2201,14 @@ class BXRestNavvyDiskStorage {
         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 }], target: i0.ɵɵFactoryTarget.Injectable });
+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 }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestDiskStorage }, { type: BXRestMapDiskStorage }, { type: Navvy }, { type: SessionStorageServices }]; } });
 
 class BXRestNavvyDiskOperation {
     constructor(folder, disk, storage) {