bx-rest 0.0.13 → 0.0.15

package/fesm2015/bx-rest.mjs

@@ -1,11 +1,8 @@
-import { __awaiter } from 'tslib';
-import * as i0 from '@angular/core';
-import { Injectable, NgModule, inject, Component, ViewEncapsulation, Inject } from '@angular/core';
-import { DateTime } from 'luxon';
-import { Subscription, filter, take, of, throwError, forkJoin, mergeMap } from 'rxjs';
+import { Subscription, filter, take, of, throwError, forkJoin, mergeMap, Observable } from 'rxjs';
 import { map, catchError, tap, mergeMap as mergeMap$1, first } from 'rxjs/operators';
 import clone from 'just-clone';
-import compare from 'just-compare';
+import * as i0 from '@angular/core';
+import { NgModule, inject, Component, ViewEncapsulation, Inject, Injectable } from '@angular/core';
 import * as i1$1 from '@angular/material/snack-bar';
 import { MatSnackBarRef, MAT_SNACK_BAR_DATA } from '@angular/material/snack-bar';
 import * as i2 from '@angular/material/icon';
@@ -14,187 +11,14 @@ import * as i1 from '@angular/material/button';
 import { MatButtonModule } from '@angular/material/button';
 import * as i1$2 from '@ngrx/store';
 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';
 import * as i3 from '@angular/common';
 
-const time = {
-    oneDayMilliseconds: 1000 * 60 * 60 * 24
-};
-
-class BaseServices {
-    toStr(val) {
-        return (val) ? String(val) : '';
-    }
-    toNumber(val) {
-        return (val && Number(val)) ? Number(val) : 0;
-    }
-    toDate(val, format, opt) {
-        if (val instanceof Date) {
-            return val;
-        }
-        else if (typeof val == 'string') {
-            if (format) {
-                if (opt) {
-                    return DateTime.fromFormat(val, format, opt).toJSDate();
-                }
-                return DateTime.fromFormat(val, format).toJSDate();
-            }
-            else {
-                return new Date(val);
-            }
-        }
-        else if (typeof val == 'number') {
-            return new Date(val);
-        }
-        console.error('Wrong date format', val, format);
-        throw 'Wrong date format';
-    }
-    getBXStrTime(date) {
-        return this.toISOStringWithTimezone(date);
-    }
-    toISOStringWithTimezone(date) {
-        const tzOffset = -date.getTimezoneOffset();
-        const diff = tzOffset >= 0 ? '+' : '-';
-        const pad = (n) => `${Math.floor(Math.abs(n))}`.padStart(2, '0');
-        return date.getFullYear() +
-            '-' + pad(date.getMonth() + 1) +
-            '-' + pad(date.getDate()) +
-            'T' + pad(date.getHours()) +
-            ':' + pad(date.getMinutes()) +
-            ':' + pad(date.getSeconds()) +
-            diff + pad(tzOffset / 60) +
-            ':' + pad(tzOffset % 60);
-    }
-    ;
-    toBool(val) {
-        switch (typeof val) {
-            case 'string':
-                val = val.toLowerCase();
-                if (val === 'n' || val === 'y') { // битриксовые понятия о bool
-                    return val === 'y';
-                }
-                else if (val === 'true' || val === 'false') { // битриксовые понятия о bool
-                    return val === 'true';
-                }
-                else {
-                    return false;
-                }
-            default:
-                return Boolean(val);
-        }
-    }
-    toBXYorN(val) {
-        return (val) ? 'Y' : 'N';
-    }
-    typeof(val) {
-        return typeof val;
-    }
-    typeDefClass(val) {
-        if (val) {
-            if (val instanceof Date) {
-                return 'date';
-            }
-            return undefined;
-        }
-        else {
-            return null;
-        }
-    }
-    toJSON(val) {
-        return JSON.stringify(val);
-    }
-    fromJSON(val) {
-        return JSON.parse(val);
-    }
-    prepareBaseAddress(url, add = '') {
-        if (url.search('https://') !== 0 && url.search('http://')) {
-            url = 'https://' + url;
-        }
-        if (url.lastIndexOf('/') !== (url.length - 1)) {
-            url = url + '/';
-        }
-        url = url + add;
-        return url;
-    }
-    getHomeAddress() {
-        // return this.prepareBaseAddress(environment.urls.home)
-        return this.prepareBaseAddress('b24.trace-studio.com');
-    }
-    dateDiff(a, b) {
-        return new Date(a.valueOf() - b.valueOf());
-    }
-    dateDiffInDays(a, b) {
-        return Math.floor(this.dateDiff(a, b).valueOf() / time.oneDayMilliseconds);
-    }
-    getBase64File(file) {
-        return new Promise((resolve, reject) => {
-            const reader = new FileReader();
-            reader.readAsDataURL(file);
-            reader.onload = () => resolve(reader.result);
-            reader.onerror = error => reject(error);
-        });
-    }
-    getBase64FileLikeStr(file) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let result = yield this.getBase64File(file);
-            if (typeof result === 'string') {
-                let split = result.split(',');
-                return {
-                    header: split[0],
-                    val: split[1]
-                };
-            }
-            return undefined;
-        });
-    }
-    sumArray(numbers) {
-        return numbers.reduce((a, b) => {
-            return a + b;
-        });
-    }
-    isItTheSameDate(date1, date2) {
-        return date1.getDate() === date2.getDate()
-            && date1.getMonth() === date2.getMonth()
-            && date1.getFullYear() === date2.getFullYear();
-    }
-    toUnix(date) {
-        return Math.floor(date.valueOf() / 1000);
-    }
-    arrSum(x) {
-        let s = 0;
-        for (let i = 0; i < x.length; i++) {
-            s += x[i];
-        }
-        return s;
-    }
-    getBaseUrlHttps(url, component = false) {
-        if (component) {
-            return encodeURI(this.cropUrl(url) + '/');
-        }
-        else {
-            return encodeURI('https://' + this.cropUrl(url) + '/');
-        }
-    }
-    cropUrl(url) {
-        url = (url) ? url.replace('https://', '') : '';
-        url = (url) ? url.replace('http://', '') : '';
-        url = (url) ? url.replace('https:', '') : '';
-        url = (url) ? url.replace('http:', '') : '';
-        return url;
-    }
-}
-BaseServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseServices, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-BaseServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseServices, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseServices, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 class BxRestModule {
 }
 BxRestModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BxRestModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
@@ -564,6 +388,181 @@ function authReducer(state = initialState$1, action) {
     return _authReducer(state, action);
 }
 
+const time = {
+    oneDayMilliseconds: 1000 * 60 * 60 * 24
+};
+
+class BaseServices {
+    toStr(val) {
+        return (val) ? String(val) : '';
+    }
+    toNum(val) {
+        return (val && Number(val)) ? Number(val) : 0;
+    }
+    toDate(val, format, opt) {
+        if (val instanceof Date) {
+            return val;
+        }
+        else if (typeof val == 'string') {
+            if (format) {
+                if (opt) {
+                    return DateTime.fromFormat(val, format, opt).toJSDate();
+                }
+                return DateTime.fromFormat(val, format).toJSDate();
+            }
+            else {
+                return new Date(val);
+            }
+        }
+        else if (typeof val == 'number') {
+            return new Date(val);
+        }
+        console.error('Wrong date format', val, format);
+        throw 'Wrong date format';
+    }
+    getBXStrTime(date) {
+        return this.toISOStringWithTimezone(date);
+    }
+    toISOStringWithTimezone(date) {
+        const tzOffset = -date.getTimezoneOffset();
+        const diff = tzOffset >= 0 ? '+' : '-';
+        const pad = (n) => `${Math.floor(Math.abs(n))}`.padStart(2, '0');
+        return date.getFullYear() +
+            '-' + pad(date.getMonth() + 1) +
+            '-' + pad(date.getDate()) +
+            'T' + pad(date.getHours()) +
+            ':' + pad(date.getMinutes()) +
+            ':' + pad(date.getSeconds()) +
+            diff + pad(tzOffset / 60) +
+            ':' + pad(tzOffset % 60);
+    }
+    ;
+    toBool(val) {
+        switch (typeof val) {
+            case 'string':
+                val = val.toLowerCase();
+                if (val === 'n' || val === 'y') { // битриксовые понятия о bool
+                    return val === 'y';
+                }
+                else if (val === 'true' || val === 'false') { // битриксовые понятия о bool
+                    return val === 'true';
+                }
+                else {
+                    return false;
+                }
+            default:
+                return Boolean(val);
+        }
+    }
+    toBXYorN(val) {
+        return (val) ? 'Y' : 'N';
+    }
+    typeof(val) {
+        return typeof val;
+    }
+    typeDefClass(val) {
+        if (val) {
+            if (val instanceof Date) {
+                return 'date';
+            }
+            return undefined;
+        }
+        else {
+            return null;
+        }
+    }
+    toJSON(val) {
+        return JSON.stringify(val);
+    }
+    fromJSON(val) {
+        return JSON.parse(val);
+    }
+    prepareBaseAddress(url, add = '') {
+        if (url.search('https://') !== 0 && url.search('http://')) {
+            url = 'https://' + url;
+        }
+        if (url.lastIndexOf('/') !== (url.length - 1)) {
+            url = url + '/';
+        }
+        url = url + add;
+        return url;
+    }
+    getHomeAddress() {
+        // return this.prepareBaseAddress(environment.urls.home)
+        return this.prepareBaseAddress('b24.trace-studio.com');
+    }
+    dateDiff(a, b) {
+        return new Date(a.valueOf() - b.valueOf());
+    }
+    dateDiffInDays(a, b) {
+        return Math.floor(this.dateDiff(a, b).valueOf() / time.oneDayMilliseconds);
+    }
+    getBase64File(file) {
+        return new Promise((resolve, reject) => {
+            const reader = new FileReader();
+            reader.readAsDataURL(file);
+            reader.onload = () => resolve(reader.result);
+            reader.onerror = error => reject(error);
+        });
+    }
+    getBase64FileLikeStr(file) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let result = yield this.getBase64File(file);
+            if (typeof result === 'string') {
+                let split = result.split(',');
+                return {
+                    header: split[0],
+                    val: split[1]
+                };
+            }
+            return undefined;
+        });
+    }
+    sumArray(numbers) {
+        return numbers.reduce((a, b) => {
+            return a + b;
+        });
+    }
+    isItTheSameDate(date1, date2) {
+        return date1.getDate() === date2.getDate()
+            && date1.getMonth() === date2.getMonth()
+            && date1.getFullYear() === date2.getFullYear();
+    }
+    toUnix(date) {
+        return Math.floor(date.valueOf() / 1000);
+    }
+    arrSum(x) {
+        let s = 0;
+        for (let i = 0; i < x.length; i++) {
+            s += x[i];
+        }
+        return s;
+    }
+    getBaseUrlHttps(url, component = false) {
+        if (component) {
+            return encodeURI(this.cropUrl(url) + '/');
+        }
+        else {
+            return encodeURI('https://' + this.cropUrl(url) + '/');
+        }
+    }
+    cropUrl(url) {
+        url = (url) ? url.replace('https://', '') : '';
+        url = (url) ? url.replace('http://', '') : '';
+        url = (url) ? url.replace('https:', '') : '';
+        url = (url) ? url.replace('http:', '') : '';
+        return url;
+    }
+}
+BaseServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseServices, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+BaseServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseServices, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseServices, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
 class LocalStorageServices {
     static get(name) {
         return localStorage.getItem(name);
@@ -1272,23 +1271,93 @@ const $task = 'task';
 const $calendar = 'calendar';
 const $meeting = 'meeting';
 const $list = 'list';
-const $search = 'search';
+const $search = 'search';
+const $accessibility = 'accessibility';
+const $delete = 'delete';
+const $nearest = 'nearest';
+const $params = 'params';
+const $status = 'status';
+const $resource = 'resource';
+const $booking = 'booking';
+const $section = 'section';
+const $settings = 'settings';
+const $tasks = 'tasks';
+const $elapseditem = 'elapseditem';
+const $getlist = 'getlist';
+const $approve = 'approve';
+const $complete = 'complete';
+const $counters = 'counters';
+const $deger = 'deger';
+const $delegate = 'delegate';
+const $disapprove = 'disapprove';
+const $favorite = 'favorite';
+const $files = 'files';
+const $file = 'file';
+const $attach = 'attach';
+const $field = 'field';
+const $getFields = 'get' + $field + 's';
+const $getaccess = 'getaccess';
+const $history = 'history';
+const $pause = 'pause';
+const $renew = 'renew';
+const $start = 'start';
+const $result = 'result';
+const $planner = 'planner';
+const $disk = 'disk';
+const $rename = 'rename';
+const $markdeleted = 'markdeleted';
+const $restore = 'restore';
+const $folder = 'folder';
+const $getchildren = 'getchildren';
+const $copyto = 'copyto';
+const $moveto = 'moveto';
+const $uploadfile = 'uploadfile';
+const $storage = 'storage';
+const $getTypes = 'getTypes';
+const $stages = 'stages';
+const $getmanifest = 'getmanifest';
+const $isactionallowed = 'isactionallowed';
+const $commentitem = 'commentitem';
+const $department = 'department';
+const $sonet_group = 'sonet_group';
+const $create = 'create';
+const $feature = 'feature';
+const $access = 'access';
+const $request = 'request';
+const $socialnetwork = 'socialnetwork';
+const $api = 'api';
+const $workgroup = 'workgroup';
+const $log = 'log';
+const $blogpost = 'blogpost';
+const $lists = 'lists';
+const $iblock = 'iblock';
+const $type = 'type';
+const $id = 'id';
+const $element = 'element';
+const $url = 'url';
 
-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 });
-BaseMapServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseMapServices, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseMapServices, decorators: [{
+function mapResult(v) {
+    if (v && (v.result || typeof v.result === 'boolean')) {
+        return v.result;
+    }
+    return undefined;
+}
+
+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 BitrixApiUserMapServices extends BaseMapServices {
+class BitrixApiUserMapServices extends BaseMapServices$1 {
     HttpToBX(user) {
         let res = Object.assign(clone(user), {
-            ID: this.toNumber(user.ID),
+            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),
@@ -1383,7 +1452,7 @@ class BXRestUser {
         this.url = {
             admin: [$user, 'admin'],
             get: [$user, $get],
-            self: [$user, 'current'],
+            current: [$user, 'current'],
             update: [$user, $update],
             search: [$user, $search],
             access: [$user, 'access'],
@@ -1400,6 +1469,9 @@ class BXRestUser {
         };
         this.user$ = this.store.select('users');
     }
+    admin() {
+        return this.http.get(this.url.admin);
+    }
     get(params = {}) {
         let copyParams = clone(params);
         this.setDefParam(copyParams);
@@ -1410,28 +1482,7 @@ class BXRestUser {
             }
         }));
     }
-    getOnePage(page = 1) {
-        return this.get({ start: (page - 1) * 50 }).pipe(map(v => {
-            let res = this.http.mapResult(v);
-            return (res) ? res.map(r => this.userMap.HttpToBX(r)) : undefined;
-        }));
-    }
-    getByID(id, reload = true) {
-        return this.getByIDs([id], reload).pipe(map(v => (v && v.length) ? v[0] : undefined));
-    }
-    getByIDs(ids, reload = true) {
-        ids = Array.from(new Set(ids));
-        return this.user$.pipe(take(1), mergeMap$1(v => {
-            if (!reload) {
-                let find = v.data.filter(i => ids.includes(i.ID));
-                if (find && find.length === ids.length) {
-                    return of(find);
-                }
-            }
-            return this.getAll({ ID: ids, ACTIVE: 2 }).pipe(map(v => (v && v.length) ? v : undefined));
-        }));
-    }
-    getSelf(update = false) {
+    current(update = false) {
         if (update) {
             return this.getSelfHttp();
         }
@@ -1447,7 +1498,7 @@ class BXRestUser {
         }
     }
     getSelfHttp() {
-        return this.http.get(this.url.self, {}, 'Не удалось получить пользователя')
+        return this.http.get(this.url.current, {}, 'Не удалось получить пользователя')
             .pipe(map(v => {
             if (v && v.result) {
                 return this.userMap.HttpToBX(v.result);
@@ -1460,79 +1511,42 @@ class BXRestUser {
         }));
     }
     access(access, textError = 'Не удалось получить права') {
-        return this.http.get(this.url.access, { ACCESS: access }, textError).pipe(map(v => this.http.mapResult(v)));
-    }
-    getByDepartment(id) {
-        const ids = (typeof id === 'number') ? [id] : id;
-        return this.user$.pipe(first(), mergeMap$1(v => {
-            if (v.load.all) {
-                return of(clone(v.data.filter(i => ids.find(id => i.UF_DEPARTMENT.includes(id)))));
-            }
-            if (ids.every(i => v.load.department.includes(i))) {
-                return of(clone(v.data.filter(i => ids.find(id => i.UF_DEPARTMENT.includes(id)))));
-            }
-            return this.getAll({ UF_DEPARTMENT: ids }).pipe(tap(_ => {
-                this.store.dispatch(saveIDLoadedDepartment({ id: ids }));
-            }));
-        }));
-    }
-    getAll(params = {}) {
-        if (!Object.keys(params).length) {
-            params = clone(this.def.params);
-        }
-        const saveAllUser = compare(params, this.def.params);
-        return this.user$.pipe(take(1), mergeMap$1(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;
-        }));
-    }
-    getAllByPersonalBirthday(day = undefined, month = undefined, checkWeekend = false) {
-        return this.http.timeNowOnServer().pipe(mergeMap$1(date => {
-            if (date) {
-                let daySent = (day) ? day : date.getDate();
-                let start = date.getFullYear() + 1;
-                let monthSent = (month) ? month : date.getMonth() + 1;
-                let arr = Array.from(Array(200).keys()).map(_ => {
-                    start--;
-                    let res = this.datePipe.transform(new Date(start, monthSent - 1, daySent), 'YYYY-MM-dd');
-                    return (res) ? res : '';
-                });
-                // TODO: Упростить
-                if (checkWeekend && date.getDay() === 1) {
-                    start = date.getFullYear() + 1;
-                    arr.push(...Array.from(Array(200).keys()).map(_ => {
-                        start--;
-                        let res = this.datePipe.transform(new Date(start, monthSent - 1, daySent - 1), 'YYYY-MM-dd');
-                        return (res) ? res : '';
-                    }));
-                    start = date.getFullYear() + 1;
-                    arr.push(...Array.from(Array(200).keys()).map(_ => {
-                        start--;
-                        let res = this.datePipe.transform(new Date(start, monthSent - 1, daySent - 2), 'YYYY-MM-dd');
-                        return (res) ? res : '';
-                    }));
-                }
-                return this.getAll({ PERSONAL_BIRTHDAY: arr });
-            }
-            this.snackBar.warning('Не удалось получить время сервера');
-            return of(undefined);
-        }));
-    }
+        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) {
@@ -1548,19 +1562,10 @@ class BXRestUser {
         if (typeof params.ACTIVE !== 'boolean') {
             params.ACTIVE = true;
         }
-        return this.http.get(this.url.search, params, 'Сервер не отвечает на запрос поиска')
-            .pipe(map(v => {
-            if (v && v.result) {
-                const mapResult = this.http.mapResult(v);
-                if (mapResult) {
-                    return this.saveArrUser(mapResult);
-                }
-            }
-            return undefined;
-        }));
+        return this.http.get(this.url.search, params, 'Сервер не отвечает на запрос поиска');
     }
     fields() {
-        return this.http.get(this.url.fields).pipe(map(v => this.http.mapResult(v)));
+        return this.http.get(this.url.fields);
     }
     update(user, fieldUpdate) {
         if (fieldUpdate && fieldUpdate.length) {
@@ -1583,27 +1588,25 @@ class BXRestUser {
             return of({});
         }
     }
-    getEndArray(params = {}) {
-        return this.get(params).pipe(mergeMap$1(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);
-            }
-        }));
-    }
-    // getUrlCompressedImage(url: string, width: number, height: number) {
-    //     return this.img.getUrlCompressed(url, width, height)
+    // 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')) {
@@ -1619,12 +1622,6 @@ class BXRestUser {
             delete params.UF_DEPARTMENT;
         }
     }
-    getInfoAboutCustomFieldsBX() {
-        return this.http.get(this.url.userfield.list).pipe(map(v => this.http.mapResult(v)));
-    }
-    itIsAdmin() {
-        return this.http.get(this.url.admin).pipe(map(v => this.http.mapResult(v)));
-    }
 }
 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 }, { token: i3.DatePipe }], target: i0.ɵɵFactoryTarget.Injectable });
 BXRestUser.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestUser, providedIn: 'root' });
@@ -1633,16 +1630,155 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: HttpBXServices }, { type: SnackBarService }, { type: i1$2.Store }, { type: BitrixApiUserMapServices }, { type: i3.DatePipe }]; } });
+        }], ctorParameters: function () { return [{ type: HttpBXServices }, { type: SnackBarService }, { type: i1$2.Store }, { type: BitrixApiUserMapServices }, { type: i3.DatePipe }]; } });
+class BXRestUserRes extends new Proxy(BXRestUser, {
+    get(target, prop, receiver) {
+        const res = Reflect.get(target, prop, receiver);
+        if (res in Observable) {
+            return Reflect.get(target, prop, receiver).pipe(
+            // @ts-ignore
+            map(v => mapResult(v)));
+        }
+        return res;
+    }
+}) {
+}
+BXRestUserRes.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestUserRes, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BXRestUserRes.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestUserRes, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestUserRes, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestLists {
+    constructor() {
+        this.url = {
+            add: [$lists, $add],
+            delete: [$lists, $delete],
+            get: [$lists, $get],
+            update: [$lists, $update],
+            getIblockTypeId: [$lists, $get, $iblock, $type, $id], // Метод возвращает id типа инфоблока
+        };
+    }
+}
+BXRestLists.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestLists, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+BXRestLists.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestLists, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestLists, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+class BXRestListsRes extends new Proxy(BXRestLists, {
+    get(target, prop, receiver) {
+        const res = Reflect.get(target, prop, receiver);
+        if (res in Observable) {
+            return Reflect.get(target, prop, receiver).pipe(
+            // @ts-ignore
+            map(v => mapResult(v)));
+        }
+        return res;
+    }
+}) {
+}
+BXRestListsRes.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsRes, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BXRestListsRes.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsRes, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsRes, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+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 });
+BaseMapServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseMapServices, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseMapServices, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestListsElementMap extends BaseMapServices {
+    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 BXRestListsElementBase {
+    constructor(http, mapResult) {
+        this.http = http;
+        this.mapResult = mapResult;
+        this.url = {
+            add: [$lists, $element, $add],
+            delete: [$lists, $element, $delete],
+            get: [$lists, $element, $get],
+            update: [$lists, $element, $update],
+            getFileUrl: [$lists, $element, $get, $file, $url] // Метод возвращает путь к файлу
+        };
+    }
+    get(pram) {
+        return this.http.post(this.url.get, pram)
+            .pipe(map(v => (v && v.result)
+            ? Object.assign(v, { result: v.result.map(i => this.mapResult.get(i)) })
+            : undefined));
+    }
+}
+class BXRestListsElement extends new Proxy(BXRestListsElementBase, {
+    get(target, prop, receiver) {
+        const res = Reflect.get(target, prop, receiver);
+        console.log('res', res);
+        if (res in Observable) {
+            let mapRes = new BXRestListsElementMap();
+            console.log('res', res);
+            return Reflect.get(target, prop, receiver).pipe(
+            // @ts-ignore
+            map(v => (v && v.result)
+                // @ts-ignore
+                ? Object.assign(v, { result: v.result.map(i => mapRes.get(i)) })
+                : undefined), 
+            // @ts-ignore
+            map(v => mapResult(v)));
+        }
+        return res;
+    }
+}) {
+}
+BXRestListsElement.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsElement, deps: null, 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'
+                }]
+        }] });
 
 /*
  * Public API Surface of bx-rest
  */
+// TODO: сделать экпорт по пути
 // export * from './request/bx-rest.module'
 
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { BXRestUser, BaseServices };
+export { BXRestListsElement, BXRestListsRes, BXRestUser, BXRestUserRes };
 //# sourceMappingURL=bx-rest.mjs.map