bx-rest 0.1.18 → 0.1.19

package/fesm2022/bx-rest.mjs

@@ -1,8 +1,8 @@
 import * as i0 from '@angular/core';
 import { NgModule, inject, Component, ViewEncapsulation, Inject, Injectable } from '@angular/core';
 import { Subscription, of, mergeMap, throwError, forkJoin, share, from, concatMap, last, concat, tap, shareReplay } from 'rxjs';
-import clone from 'just-clone';
 import { map, catchError, 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';
 import * as i2 from '@angular/material/icon';
@@ -114,7 +114,9 @@ const $activity = 'activity';
 const $robot = 'robot';
 const $send = 'send';
 const $share = 'share';
-const $blogcomment = 'blogcomment';
+const $blogcomment = 'blogcomment';
+const $server = 'server';
+const $time = 'time';
 
 class BxRestModule {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BxRestModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
@@ -1234,7 +1236,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
         }] });
 
 class BXRestUserMap extends BaseMapServices {
-    current(user) {
+    get(v) {
+        return (v) ? v.map(i => this.userHttpToTrace(i)) : undefined;
+    }
+    current(v) {
+        return this.userHttpToTrace(v);
+    }
+    userHttpToTrace(user) {
         let res = Object.assign(clone(user), {
             ID: this.toNum(user.ID),
             IS_ONLINE: this.toBool(user.IS_ONLINE),
@@ -1337,17 +1345,12 @@ class BXRestUser {
                 list: [$user, 'userfield', $list]
             }
         };
-        this.def = {
-            params: { ACTIVE: 1, start: 0 }
-        };
     }
     admin() {
         return this.http.get(this.url.admin);
     }
     get(params = {}) {
-        let copyParams = clone(params);
-        this.setDefParam(copyParams);
-        return this.http.post(this.url.get, copyParams);
+        return this.http.post(this.url.get, params);
     }
     current(update = false) {
         let request = this.http.get(this.url.current, {});
@@ -1379,12 +1382,6 @@ class BXRestUser {
         }
     }
     search(params) {
-        if (typeof params === 'string') {
-            params = { FIND: params };
-        }
-        if (typeof params.ACTIVE !== 'boolean') {
-            params.ACTIVE = true;
-        }
         return this.http.get(this.url.search, params);
     }
     access(access) {
@@ -1393,23 +1390,6 @@ class BXRestUser {
     fields() {
         return this.http.get(this.url.fields);
     }
-    setDefParam(params) {
-        if (!params.FILTER) {
-            params.FILTER = {};
-        }
-        if (!params.hasOwnProperty('ACTIVE')) {
-            params.FILTER.ACTIVE = this.def.params.ACTIVE;
-        }
-        if (params.FILTER.ACTIVE && params.FILTER.ACTIVE === 2) {
-            delete params.FILTER.ACTIVE;
-        }
-        if (!params.hasOwnProperty('start')) {
-            params.start = this.def.params.start;
-        }
-        if (params.FILTER.UF_DEPARTMENT && !params.FILTER.UF_DEPARTMENT.length) {
-            delete params.FILTER.UF_DEPARTMENT;
-        }
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUser, deps: [{ token: HttpBXServices }, { token: BXRestUserMap }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUser, providedIn: 'root' }); }
 }
@@ -2251,6 +2231,26 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
 
+class BXRestServer {
+    constructor(http) {
+        this.http = http;
+        this.url = {
+            time: [$server, $time]
+        };
+    }
+    time() {
+        return this.http.post(this.url.time);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestServer, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestServer, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestServer, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
+
 class NavvySupport {
     constructor(requestClass, mapClass) {
         this.requestClass = requestClass;
@@ -2288,9 +2288,6 @@ class NavvySimple extends NavvySupport {
     result() {
         return this.mapAndSnackBarError(this.func).pipe(map(v => (v && this.map) ? this.map.call(this.mapClass, v) : v));
     }
-    // TODO: реализовать
-    resultAll() {
-    }
 }
 
 class NavvyPagNavBase extends NavvySupport {
@@ -2499,8 +2496,19 @@ class BXRestNavvyUser {
     constructor(BXRestUserMap, BXRestUser) {
         this.BXRestUserMap = BXRestUserMap;
         this.BXRestUser = BXRestUser;
+        this.def = {
+            params: { ACTIVE: 1, start: 0 }
+        };
         this.Navvy = new Navvy(this.BXRestUser, this.BXRestUserMap);
     }
+    admin() {
+        return this.Navvy.simple(this.BXRestUser.admin, 'Информация о возможных принадлежности человека к администратору не получена');
+    }
+    get(params = {}) {
+        let copyParams = clone(params);
+        this.setDefParam(copyParams);
+        return this.Navvy.PagNav(this.BXRestUser.get, copyParams, 'Не удалось получить пользователей', this.BXRestUserMap.get);
+    }
     current(update = false) {
         return this.Navvy.simpleWithArg(this.self, update, '', this.BXRestUserMap.current);
     }
@@ -2513,7 +2521,13 @@ class BXRestNavvyUser {
     }
     */
     search(params) {
-        return this.Navvy.simpleWithArg(this.BXRestUser.search, params, 'Сервер не отвечает на запрос поиска');
+        if (typeof params === 'string') {
+            params = { FIND: params };
+        }
+        if (typeof params.ACTIVE !== 'boolean') {
+            params.ACTIVE = true;
+        }
+        return this.Navvy.PagNav(this.BXRestUser.search, params, 'Сервер не отвечает на запрос поиска', this.BXRestUserMap.get);
     }
     access(params) {
         return this.Navvy.simpleWithArg(this.BXRestUser.access, params, 'Не удалось получить права');
@@ -2543,6 +2557,86 @@ class BXRestNavvyUser {
             }));
         }
     }
+    // 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
+    // }
+    // 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.FILTER) {
+            params.FILTER = {};
+        }
+        if (!params.hasOwnProperty('ACTIVE')) {
+            params.FILTER.ACTIVE = this.def.params.ACTIVE;
+        }
+        if (params.FILTER.ACTIVE && params.FILTER.ACTIVE === 2) {
+            delete params.FILTER.ACTIVE;
+        }
+        if (!params.hasOwnProperty('start')) {
+            params.start = this.def.params.start;
+        }
+        if (params.FILTER.UF_DEPARTMENT && !params.FILTER.UF_DEPARTMENT.length) {
+            delete params.FILTER.UF_DEPARTMENT;
+        }
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyUser, deps: [{ token: BXRestUserMap }, { token: BXRestUser }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyUser, providedIn: 'root' }); }
 }
@@ -4168,8 +4262,26 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: BXRestSonetGroup }, { type: BXRestMapSonetGroup }]; } });
 
+class BXRestNavvyServer {
+    constructor(BXRestServer) {
+        this.BXRestServer = BXRestServer;
+        this.Navvy = new Navvy(this.BXRestServer, undefined);
+    }
+    time() {
+        return this.Navvy.simple(this.BXRestServer.time, 'Не удалось получить время сервера');
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyServer, deps: [{ token: BXRestServer }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyServer, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyServer, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestServer }]; } });
+
 class BXRest {
-    constructor(user, lists, task, tasks, disk, bizproc, log, calendar, sonet_group) {
+    constructor(user, lists, task, tasks, disk, bizproc, log, calendar, sonet_group, server) {
         this.user = user;
         this.lists = lists;
         this.task = task;
@@ -4179,8 +4291,9 @@ class BXRest {
         this.log = log;
         this.calendar = calendar;
         this.sonet_group = sonet_group;
+        this.server = server;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRest, deps: [{ token: BXRestUser }, { token: BXRestLists }, { token: BXRestTask }, { token: BXRestTasks }, { token: BXRestDisk }, { token: BXRestBizproc }, { token: BXRestLog }, { token: BXRestCalendar }, { token: BXRestSonetGroup }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRest, deps: [{ token: BXRestUser }, { token: BXRestLists }, { token: BXRestTask }, { token: BXRestTasks }, { token: BXRestDisk }, { token: BXRestBizproc }, { token: BXRestLog }, { token: BXRestCalendar }, { token: BXRestSonetGroup }, { token: BXRestServer }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRest, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRest, decorators: [{
@@ -4188,9 +4301,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestUser }, { type: BXRestLists }, { type: BXRestTask }, { type: BXRestTasks }, { type: BXRestDisk }, { type: BXRestBizproc }, { type: BXRestLog }, { type: BXRestCalendar }, { type: BXRestSonetGroup }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestUser }, { type: BXRestLists }, { type: BXRestTask }, { type: BXRestTasks }, { type: BXRestDisk }, { type: BXRestBizproc }, { type: BXRestLog }, { type: BXRestCalendar }, { type: BXRestSonetGroup }, { type: BXRestServer }]; } });
 class BXRestNavvy {
-    constructor(user, lists, task, tasks, disk, bizproc, log, calendar, sonet_group) {
+    constructor(user, lists, task, tasks, disk, bizproc, log, calendar, sonet_group, server) {
         this.user = user;
         this.lists = lists;
         this.task = task;
@@ -4200,8 +4313,9 @@ class BXRestNavvy {
         this.log = log;
         this.calendar = calendar;
         this.sonet_group = sonet_group;
+        this.server = server;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvy, deps: [{ token: BXRestNavvyUser }, { token: BXRestNavvyLists }, { token: BXRestNavvyTask }, { token: BXRestNavvyTasks }, { token: BXRestNavvyDisk }, { token: BXRestNavvyBizproc }, { token: BXRestNavvyLog }, { token: BXRestNavvyCalendar }, { token: BXRestNavvySonetGroup }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvy, deps: [{ token: BXRestNavvyUser }, { token: BXRestNavvyLists }, { token: BXRestNavvyTask }, { token: BXRestNavvyTasks }, { token: BXRestNavvyDisk }, { token: BXRestNavvyBizproc }, { token: BXRestNavvyLog }, { token: BXRestNavvyCalendar }, { token: BXRestNavvySonetGroup }, { token: BXRestNavvyServer }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvy, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvy, decorators: [{
@@ -4209,7 +4323,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestNavvyUser }, { type: BXRestNavvyLists }, { type: BXRestNavvyTask }, { type: BXRestNavvyTasks }, { type: BXRestNavvyDisk }, { type: BXRestNavvyBizproc }, { type: BXRestNavvyLog }, { type: BXRestNavvyCalendar }, { type: BXRestNavvySonetGroup }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestNavvyUser }, { type: BXRestNavvyLists }, { type: BXRestNavvyTask }, { type: BXRestNavvyTasks }, { type: BXRestNavvyDisk }, { type: BXRestNavvyBizproc }, { type: BXRestNavvyLog }, { type: BXRestNavvyCalendar }, { type: BXRestNavvySonetGroup }, { type: BXRestNavvyServer }]; } });
 class BXRestMap {
     constructor(lists) {
         this.lists = lists;