bx-rest 0.2.5 → 0.2.7

package/fesm2022/bx-rest.mjs

@@ -1,7 +1,6 @@
 import * as i0 from '@angular/core';
 import { NgModule, inject, Component, ViewEncapsulation, Inject, Injectable } from '@angular/core';
 import { Subscription, of, mergeMap, throwError, forkJoin, share, ReplaySubject, last, shareReplay, concat, from, concatMap, tap } from 'rxjs';
-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';
@@ -11,7 +10,9 @@ import * as i1 from '@angular/material/button';
 import { MatButtonModule } from '@angular/material/button';
 import { DateTime } from 'luxon';
 import * as i1$2 from '@angular/common/http';
-import { HttpParams } from '@angular/common/http';
+import { HttpParams, HttpHeaders } from '@angular/common/http';
+import flatten from 'just-flatten-it';
+import { map, catchError, mergeMap as mergeMap$1 } from 'rxjs/operators';
 
 const BX_REST_SETTINGS = {
     auth: {
@@ -1118,16 +1119,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
 
 // type TransformFunction<T, R> = (input: T) => R;
 class HttpBXServices extends HttpServices {
-    timeNowOnServer() {
-        return this.httpGet('server.time').pipe(map(v => {
-            if (v && v.result) {
-                return new Date(v.result);
-            }
-            return undefined;
-        }));
-    }
     /**
      * Это пиздец а не метод
+     * TODO: Удалить данный метод после реализации его в разделе Navvy
      * @param param
      */
     branch(param) {
@@ -1164,12 +1158,26 @@ 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)))
-    // }
+    mapBranchResultWithoutKey(res) {
+        return flatten(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)));
+    }
+    /**
+     * Основной метод для запросов
+     *
+     * @param name
+     * @param params
+     * @param settings
+     */
     post(name, params = {}, settings = this.defSettings) {
         return this.httpPost(this.getNameMethod(name), params, settings);
     }
+    /**
+     * Второстепенный метод для запросов. По возможности лучше не использовать
+     *
+     * @param name
+     * @param params
+     * @param settings
+     */
     get(name, params = {}, settings = this.defSettings) {
         return this.httpGet(this.getNameMethod(name), params, settings);
     }
@@ -1180,7 +1188,8 @@ class HttpBXServices extends HttpServices {
             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));
+                    // это более быстрый способ запроса чем отправка Form Data
+                    return this.http.post(this.prepareBaseAddress(v) + url, JSON.stringify(paramsClone), { headers: new HttpHeaders().set('Content-Type', 'application/json') });
                 }
                 return throwError(() => 'get base url error');
             }));
@@ -1199,6 +1208,7 @@ class HttpBXServices extends HttpServices {
             paramsClone[this.session.getKeyAuth()] = auth;
             let options = {
                 params: this.getHttpParamsGet(paramsClone)
+                // params: JSON.stringify(paramsClone)
             };
             return this.session.getBaseUrl().pipe(mergeMap(v => {
                 if (v) {
@@ -1262,13 +1272,13 @@ class BXRestUser {
         };
     }
     admin() {
-        return this.http.get(this.url.admin);
+        return this.http.post(this.url.admin);
     }
     get(params = {}) {
         return this.http.post(this.url.get, params);
     }
     current(update = false) {
-        let request = this.http.get(this.url.current, {});
+        let request = this.http.post(this.url.current, {});
         if (update) {
             return request;
         }
@@ -1280,13 +1290,13 @@ class BXRestUser {
         return this.http.post(this.url.update, user);
     }
     search(params) {
-        return this.http.get(this.url.search, params);
+        return this.http.post(this.url.search, params);
     }
     access(access) {
-        return this.http.get(this.url.access, { ACCESS: access });
+        return this.http.post(this.url.access, { ACCESS: access });
     }
     fields() {
-        return this.http.get(this.url.fields);
+        return this.http.post(this.url.fields);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUser, deps: [{ token: HttpBXServices }, { token: BXRestUserUserfield }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUser, providedIn: 'root' }); }
@@ -2576,7 +2586,8 @@ class BXRestNavvyUser {
         return this.Navvy.PagNav(this.BXRestUser.get, copyParams, 'Не удалось получить пользователей', this.BXRestUserMap.get);
     }
     current(update = false) {
-        return this.Navvy.simpleWithArg(this.self, update, '', this.BXRestUserMap.current);
+        const navvy = new Navvy(this, this.BXRestUserMap);
+        return navvy.simpleWithArg(this.self, update, '', this.BXRestUserMap.current);
     }
     /*
     update(user: iBXRestUser, fieldUpdate: string[]) {
@@ -2628,7 +2639,7 @@ class BXRestNavvyUser {
         else {
             let self = SessionStorage.getItem(this.constructor.name + this.self.name);
             if (self) {
-                return of({ result: self });
+                return of(self);
             }
             return this.BXRestUser.current(update)
                 .pipe(map(v => {
@@ -2636,7 +2647,7 @@ class BXRestNavvyUser {
                     return v;
                 }
                 return undefined;
-            }), tap(v => {
+            }), shareReplay(1), tap(v => {
                 if (v) {
                     SessionStorage.setItem(this.constructor.name + this.self.name, v);
                 }
@@ -2940,8 +2951,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
         }] });
 
 class BXRestNavvyOperationElapseditem {
-    constructor(BXRestNavvyElapseditem) {
+    constructor(http, BXRestNavvyElapseditem, BXRestMapElapseditem) {
+        this.http = http;
         this.BXRestNavvyElapseditem = BXRestNavvyElapseditem;
+        this.BXRestMapElapseditem = BXRestMapElapseditem;
     }
     getByInterval(idsUsers, dateStart, dateEnd) {
         const param = {
@@ -2956,6 +2969,21 @@ class BXRestNavvyOperationElapseditem {
         };
         return this.BXRestNavvyElapseditem.getList(param);
     }
+    getListByIDTask(ids) {
+        return this.http.branch(ids.map(i => {
+            return {
+                name: this.http.getNameMethod([$task, $elapseditem, $getlist]),
+                param: {
+                    TASKID: i
+                }
+            };
+        })).pipe(map(v => {
+            if (v && v.length) {
+                return this.http.mapBranchResultWithoutKey(v).map(i => this.BXRestMapElapseditem.getList(i));
+            }
+            return undefined;
+        }));
+    }
 }
 
 class BXRestMapTasksTask extends BaseMapServices {
@@ -3341,13 +3369,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
         }] });
 
 class BXRestNavvyElapseditem {
-    constructor(BXRestElapseditem, BXRestNavvyUser, BXRestNavvyTasks, BXRestMapElapseditem) {
+    constructor(BXRestElapseditem, BXRestNavvyUser, BXRestNavvyTasks, BXRestMapElapseditem, http) {
         this.BXRestElapseditem = BXRestElapseditem;
         this.BXRestNavvyUser = BXRestNavvyUser;
         this.BXRestNavvyTasks = BXRestNavvyTasks;
         this.BXRestMapElapseditem = BXRestMapElapseditem;
+        this.http = http;
         this.Navvy = new Navvy(this.BXRestElapseditem, this.BXRestMapElapseditem);
-        this.operation = new BXRestNavvyOperationElapseditem(this);
+        this.operation = new BXRestNavvyOperationElapseditem(this.http, this, this.BXRestMapElapseditem);
     }
     /*
     call(methodName: string, ...args: any[]){
@@ -3589,7 +3618,7 @@ class BXRestNavvyElapseditem {
             }
         })), 'Не удалось удалить элемент списка', v => (v === null));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyElapseditem, deps: [{ token: BXRestElapseditem }, { token: BXRestNavvyUser }, { token: BXRestNavvyTasks }, { token: BXRestMapTaskElapseditem }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyElapseditem, deps: [{ token: BXRestElapseditem }, { token: BXRestNavvyUser }, { token: BXRestNavvyTasks }, { token: BXRestMapTaskElapseditem }, { token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyElapseditem, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyElapseditem, decorators: [{
@@ -3597,7 +3626,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestElapseditem }, { type: BXRestNavvyUser }, { type: BXRestNavvyTasks }, { type: BXRestMapTaskElapseditem }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestElapseditem }, { type: BXRestNavvyUser }, { type: BXRestNavvyTasks }, { type: BXRestMapTaskElapseditem }, { type: HttpBXServices }]; } });
 
 class BXRestNavvyTask {
     constructor(elapseditem) {