bx-rest 0.1.11 → 0.1.16

package/{fesm2020 → 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, tap } from 'rxjs';
+import { Subscription, of, mergeMap, throwError, forkJoin, share, from, concatMap, last, concat, tap, shareReplay } from 'rxjs';
 import clone from 'just-clone';
-import { map, catchError, take, mergeMap as mergeMap$1 } from 'rxjs/operators';
+import { map, catchError, mergeMap as mergeMap$1 } from 'rxjs/operators';
 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';
@@ -117,15 +117,15 @@ const $share = 'share';
 const $blogcomment = 'blogcomment';
 
 class BxRestModule {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BxRestModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "16.2.6", ngImport: i0, type: BxRestModule, imports: [MatIconModule,
+            MatButtonModule], exports: [MatButtonModule,
+            MatIconModule] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BxRestModule, imports: [MatIconModule,
+            MatButtonModule, MatButtonModule,
+            MatIconModule] }); }
 }
-BxRestModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BxRestModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-BxRestModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.9", ngImport: i0, type: BxRestModule, imports: [MatIconModule,
-        MatButtonModule], exports: [MatButtonModule,
-        MatIconModule] });
-BxRestModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BxRestModule, imports: [MatIconModule,
-        MatButtonModule, MatButtonModule,
-        MatIconModule] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BxRestModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BxRestModule, decorators: [{
             type: NgModule,
             args: [{
                     declarations: [],
@@ -154,10 +154,10 @@ class ToastMessageComponent {
         }
         return '';
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: ToastMessageComponent, deps: [{ token: MAT_SNACK_BAR_DATA }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.6", type: ToastMessageComponent, isStandalone: true, selector: "app-view", ngImport: i0, template: "<div class=\"w-100 d-flex\">\n  <span matSnackBarLabel [class]=\"getClass()\">\n  {{ data.message }}\n</span>\n  <span matSnackBarActions [class]=\"getClass()\">\n  <button mat-button matSnackBarAction (click)=\"snackBarRef.dismissWithAction()\">\n    <mat-icon>\n      close\n    </mat-icon>\n  </button>\n</span>\n</div>\n\n", styles: [":host{display:flex;background-color:red}:host .mdc-snackbar__surface{padding:0;margin:0}:host .error-message{color:red}:host.error-box{background-color:#eec1c1}:host.error-box .error-message{color:red}mat-snack-bar-container.mdc-snackbar.error-box .mdc-snackbar__surface{background-color:#eec1c1}mat-snack-bar-container.mdc-snackbar.error-box .error-message{color:red}mat-snack-bar-container.mdc-snackbar.warning-box .mdc-snackbar__surface{background-color:#f0f2b9}mat-snack-bar-container.mdc-snackbar.warning-box .warning-message{color:#15140f}mat-snack-bar-container.mdc-snackbar.success-box .mdc-snackbar__surface{background-color:#daf7d1}mat-snack-bar-container.mdc-snackbar.success-box .success-message{color:#423f31}\n"], dependencies: [{ kind: "ngmodule", type: BxRestModule }, { kind: "component", type: i1.MatButton, selector: "    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { kind: "component", type: i2.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }], encapsulation: i0.ViewEncapsulation.None }); }
 }
-ToastMessageComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: ToastMessageComponent, deps: [{ token: MAT_SNACK_BAR_DATA }], target: i0.ɵɵFactoryTarget.Component });
-ToastMessageComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.9", type: ToastMessageComponent, isStandalone: true, selector: "app-view", ngImport: i0, template: "<div class=\"w-100 d-flex\">\n  <span matSnackBarLabel [class]=\"getClass()\">\n  {{ data.message }}\n</span>\n  <span matSnackBarActions [class]=\"getClass()\">\n  <button mat-button matSnackBarAction (click)=\"snackBarRef.dismissWithAction()\">\n    <mat-icon>\n      close\n    </mat-icon>\n  </button>\n</span>\n</div>\n\n", styles: [":host{display:flex;background-color:red}:host .mdc-snackbar__surface{padding:0;margin:0}:host .error-message{color:red}:host.error-box{background-color:#eec1c1}:host.error-box .error-message{color:red}mat-snack-bar-container.mdc-snackbar.error-box .mdc-snackbar__surface{background-color:#eec1c1}mat-snack-bar-container.mdc-snackbar.error-box .error-message{color:red}mat-snack-bar-container.mdc-snackbar.warning-box .mdc-snackbar__surface{background-color:#f0f2b9}mat-snack-bar-container.mdc-snackbar.warning-box .warning-message{color:#15140f}mat-snack-bar-container.mdc-snackbar.success-box .mdc-snackbar__surface{background-color:#daf7d1}mat-snack-bar-container.mdc-snackbar.success-box .success-message{color:#423f31}\n"], dependencies: [{ kind: "ngmodule", type: BxRestModule }, { kind: "component", type: i1.MatButton, selector: "    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { kind: "component", type: i2.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }], encapsulation: i0.ViewEncapsulation.None });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: ToastMessageComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: ToastMessageComponent, decorators: [{
             type: Component,
             args: [{ selector: 'app-view', encapsulation: ViewEncapsulation.None, standalone: true, imports: [BxRestModule], template: "<div class=\"w-100 d-flex\">\n  <span matSnackBarLabel [class]=\"getClass()\">\n  {{ data.message }}\n</span>\n  <span matSnackBarActions [class]=\"getClass()\">\n  <button mat-button matSnackBarAction (click)=\"snackBarRef.dismissWithAction()\">\n    <mat-icon>\n      close\n    </mat-icon>\n  </button>\n</span>\n</div>\n\n", styles: [":host{display:flex;background-color:red}:host .mdc-snackbar__surface{padding:0;margin:0}:host .error-message{color:red}:host.error-box{background-color:#eec1c1}:host.error-box .error-message{color:red}mat-snack-bar-container.mdc-snackbar.error-box .mdc-snackbar__surface{background-color:#eec1c1}mat-snack-bar-container.mdc-snackbar.error-box .error-message{color:red}mat-snack-bar-container.mdc-snackbar.warning-box .mdc-snackbar__surface{background-color:#f0f2b9}mat-snack-bar-container.mdc-snackbar.warning-box .warning-message{color:#15140f}mat-snack-bar-container.mdc-snackbar.success-box .mdc-snackbar__surface{background-color:#daf7d1}mat-snack-bar-container.mdc-snackbar.success-box .success-message{color:#423f31}\n"] }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
@@ -193,10 +193,10 @@ class SnackBarService {
             panelClass: name + '-box'
         });
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: SnackBarService, deps: [{ token: i1$1.MatSnackBar }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: SnackBarService, providedIn: 'root' }); }
 }
-SnackBarService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SnackBarService, deps: [{ token: i1$1.MatSnackBar }], target: i0.ɵɵFactoryTarget.Injectable });
-SnackBarService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SnackBarService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SnackBarService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: SnackBarService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -409,10 +409,10 @@ class JSONServices {
     static serialize(data) {
         return serialize(data);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: JSONServices, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: JSONServices, providedIn: 'root' }); }
 }
-JSONServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: JSONServices, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-JSONServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: JSONServices, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: JSONServices, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: JSONServices, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -450,10 +450,10 @@ class CookiesServices {
         }
         return false;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: CookiesServices, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: CookiesServices, providedIn: 'root' }); }
 }
-CookiesServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: CookiesServices, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-CookiesServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: CookiesServices, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: CookiesServices, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: CookiesServices, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -623,10 +623,10 @@ class BaseServices {
         url = (url) ? url.replace('http:', '') : '';
         return url;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseServices, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseServices, providedIn: 'root' }); }
 }
-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: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseServices, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -655,10 +655,10 @@ class LocalStorageServices {
     static del(name) {
         localStorage.removeItem(name);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: LocalStorageServices, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: LocalStorageServices, providedIn: 'root' }); }
 }
-LocalStorageServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: LocalStorageServices, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-LocalStorageServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: LocalStorageServices, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: LocalStorageServices, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: LocalStorageServices, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -676,10 +676,10 @@ class SessionStorage {
         }
         return undefined;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: SessionStorage, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: SessionStorage, providedIn: 'root' }); }
 }
-SessionStorage.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SessionStorage, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-SessionStorage.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SessionStorage, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SessionStorage, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: SessionStorage, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -695,10 +695,10 @@ class RestServices {
     init(callBack) {
         return (this.BX24) ? this.BX24.init(callBack) : false;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: RestServices, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: RestServices, providedIn: 'root' }); }
 }
-RestServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: RestServices, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-RestServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: RestServices, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: RestServices, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: RestServices, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -900,10 +900,10 @@ class SessionKeyServices extends BaseServices {
         //   map(v => (v && v.domain) ? this.prepareBaseAddress(v.domain) : undefined)
         // )
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: SessionKeyServices, deps: [{ token: RestServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: SessionKeyServices, providedIn: 'root' }); }
 }
-SessionKeyServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SessionKeyServices, deps: [{ token: RestServices }], target: i0.ɵɵFactoryTarget.Injectable });
-SessionKeyServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SessionKeyServices, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: SessionKeyServices, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: SessionKeyServices, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1038,10 +1038,10 @@ class BaseHttp extends HttpData {
             return of(result);
         };
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseHttp, deps: [{ token: i1$2.HttpClient }, { token: SnackBarService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseHttp, providedIn: 'root' }); }
 }
-BaseHttp.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseHttp, deps: [{ token: i1$2.HttpClient }, { token: SnackBarService }], target: i0.ɵɵFactoryTarget.Injectable });
-BaseHttp.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseHttp, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseHttp, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseHttp, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1104,10 +1104,10 @@ class HttpServices extends BaseHttpServices {
             return throwError(() => 'auth not get');
         }
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: HttpServices, deps: [{ token: i1$2.HttpClient }, { token: SnackBarService }, { token: SessionKeyServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: HttpServices, providedIn: 'root' }); }
 }
-HttpServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: HttpServices, deps: [{ token: i1$2.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' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: HttpServices, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: HttpServices, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1212,10 +1212,10 @@ class HttpBXServices extends HttpServices {
     getNameMethod(arr) {
         return arr.join('.');
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: HttpBXServices, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: HttpBXServices, providedIn: 'root' }); }
 }
-HttpBXServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: HttpBXServices, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-HttpBXServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: HttpBXServices, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: HttpBXServices, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: HttpBXServices, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1223,10 +1223,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }] });
 
 class BaseMapServices extends BaseServices {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseMapServices, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseMapServices, providedIn: 'root' }); }
 }
-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: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseMapServices, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1308,10 +1308,10 @@ class BXRestUserMap extends BaseMapServices {
         }
         return res.trim();
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUserMap, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUserMap, providedIn: 'root' }); }
 }
-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: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUserMap, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1349,8 +1349,14 @@ class BXRestUser {
         this.setDefParam(copyParams);
         return this.http.post(this.url.get, copyParams);
     }
-    current() {
-        return this.http.get(this.url.current, {});
+    current(update = false) {
+        let request = this.http.get(this.url.current, {});
+        if (update) {
+            return request;
+        }
+        else {
+            return request.pipe(share());
+        }
     }
     update(user, fieldUpdate) {
         if (fieldUpdate && fieldUpdate.length) {
@@ -1404,16 +1410,42 @@ class BXRestUser {
             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' }); }
 }
-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: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUser, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
         }], ctorParameters: function () { return [{ type: HttpBXServices }, { type: BXRestUserMap }]; } });
 
+class BXRestListsField {
+    constructor(http) {
+        this.http = http;
+        this.url = {
+            add: [$lists, $field, $add],
+            delete: [$lists, $field, $delete],
+            get: [$lists, $field, $get],
+            type: {
+                get: [$lists, $field, $type, $get], // Метод возвращает доступные типа полей для указанного списка
+            },
+            update: [$lists, $field, $update], // Метод обновляет поле списка
+        };
+    }
+    get(param) {
+        return this.http.post(this.url.get, param);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestListsField, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestListsField, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestListsField, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
+
 class BXRestListsElement {
     constructor(http) {
         this.http = http;
@@ -1431,10 +1463,10 @@ class BXRestListsElement {
     add(param) {
         return this.http.post(this.url.add, param);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestListsElement, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestListsElement, providedIn: 'root' }); }
 }
-BXRestListsElement.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsElement, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestListsElement.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsElement, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsElement, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestListsElement, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1442,8 +1474,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
 
 class BXRestLists {
-    constructor(element, http) {
+    constructor(element, field, http) {
         this.element = element;
+        this.field = field;
         this.http = http;
         this.url = {
             add: [$lists, $add],
@@ -1456,15 +1489,15 @@ class BXRestLists {
     get(pram) {
         return this.http.post(this.url.get, pram);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestLists, deps: [{ token: BXRestListsElement }, { token: BXRestListsField }, { token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestLists, providedIn: 'root' }); }
 }
-BXRestLists.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestLists, deps: [{ token: BXRestListsElement }, { token: HttpBXServices }], 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: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestLists, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestListsElement }, { type: HttpBXServices }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestListsElement }, { type: BXRestListsField }, { type: HttpBXServices }]; } });
 
 class BXRestElapseditem {
     constructor(http) {
@@ -1514,10 +1547,10 @@ class BXRestElapseditem {
     isActionAllowed(param) {
         return this.http.post(this.url.isactionallowed, param);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestElapseditem, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestElapseditem, providedIn: 'root' }); }
 }
-BXRestElapseditem.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestElapseditem, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestElapseditem.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestElapseditem, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestElapseditem, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestElapseditem, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1528,10 +1561,10 @@ class BXRestTask {
     constructor(elapseditem) {
         this.elapseditem = elapseditem;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTask, deps: [{ token: BXRestElapseditem }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTask, providedIn: 'root' }); }
 }
-BXRestTask.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTask, deps: [{ token: BXRestElapseditem }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestTask.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTask, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTask, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTask, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1741,10 +1774,10 @@ class BXRestTasksTask {
     getaccess(param) {
         return this.http.post(this.url.getaccess, param);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTasksTask, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTasksTask, providedIn: 'root' }); }
 }
-BXRestTasksTask.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTasksTask, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestTasksTask.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTasksTask, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTasksTask, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTasksTask, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1755,10 +1788,10 @@ class BXRestTasks {
     constructor(task) {
         this.task = task;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTasks, deps: [{ token: BXRestTasksTask }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTasks, providedIn: 'root' }); }
 }
-BXRestTasks.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTasks, deps: [{ token: BXRestTasksTask }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestTasks.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTasks, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTasks, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTasks, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1786,13 +1819,13 @@ class BXRestDiskFile {
     get(id) {
         return this.http.post(this.url.get, { id: id });
     }
-    markDel(id) {
+    markdeleted(id) {
         return this.http.post(this.url.markdeleted, { id: id });
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDiskFile, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDiskFile, providedIn: 'root' }); }
 }
-BXRestDiskFile.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskFile, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestDiskFile.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskFile, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskFile, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDiskFile, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1831,10 +1864,10 @@ class BXRestDiskFolder {
     getchildren(id) {
         return this.http.post(this.url.getchildren, { id: id });
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDiskFolder, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDiskFolder, providedIn: 'root' }); }
 }
-BXRestDiskFolder.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskFolder, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestDiskFolder.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskFolder, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskFolder, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDiskFolder, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1851,10 +1884,10 @@ class BXRestDiskAttachedObject {
     get(id) {
         return this.http.post(this.url.get, { id: id });
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDiskAttachedObject, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDiskAttachedObject, providedIn: 'root' }); }
 }
-BXRestDiskAttachedObject.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskAttachedObject, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestDiskAttachedObject.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskAttachedObject, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskAttachedObject, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDiskAttachedObject, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1867,10 +1900,10 @@ class BXRestDisk {
         this.folder = folder;
         this.attachedObject = attachedObject;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDisk, deps: [{ token: BXRestDiskFile }, { token: BXRestDiskFolder }, { token: BXRestDiskAttachedObject }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDisk, providedIn: 'root' }); }
 }
-BXRestDisk.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDisk, deps: [{ token: BXRestDiskFile }, { token: BXRestDiskFolder }, { token: BXRestDiskAttachedObject }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestDisk.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDisk, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDisk, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDisk, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1883,10 +1916,10 @@ class BXRestBizprocWorkflowInstance {
             list: [$bizproc, $workflow, $instances, $list], // Возвращает список запущенных бизнес-процессов. Алиас bizproc.workflow.instances
         };
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocWorkflowInstance, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocWorkflowInstance, providedIn: 'root' }); }
 }
-BXRestBizprocWorkflowInstance.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocWorkflowInstance, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestBizprocWorkflowInstance.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocWorkflowInstance, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocWorkflowInstance, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocWorkflowInstance, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1906,10 +1939,10 @@ class BXRestBizprocWorkflowTemplate {
     list(param = { select: [], filter: {} }) {
         return this.http.post(this.url.list, param);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocWorkflowTemplate, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocWorkflowTemplate, providedIn: 'root' }); }
 }
-BXRestBizprocWorkflowTemplate.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocWorkflowTemplate, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestBizprocWorkflowTemplate.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocWorkflowTemplate, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocWorkflowTemplate, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocWorkflowTemplate, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1931,10 +1964,10 @@ class BXRestBizprocWorkflow {
     start(param) {
         return this.http.post(this.url.start, param);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocWorkflow, deps: [{ token: BXRestBizprocWorkflowInstance }, { token: BXRestBizprocWorkflowTemplate }, { token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocWorkflow, providedIn: 'root' }); }
 }
-BXRestBizprocWorkflow.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocWorkflow, deps: [{ token: BXRestBizprocWorkflowInstance }, { token: BXRestBizprocWorkflowTemplate }, { token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestBizprocWorkflow.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocWorkflow, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocWorkflow, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocWorkflow, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1951,10 +1984,10 @@ class BXRestBizprocActivity {
             log: [$bizproc, $activity, $log] // Записывает информацию в лог бизнес-процесса
         };
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocActivity, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocActivity, providedIn: 'root' }); }
 }
-BXRestBizprocActivity.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocActivity, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestBizprocActivity.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocActivity, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocActivity, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocActivity, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1968,10 +2001,10 @@ class BXRestBizprocTask {
             list: [$bizproc, $task, $list], // Возвращает список заданий бизнес-процессов
         };
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocTask, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocTask, providedIn: 'root' }); }
 }
-BXRestBizprocTask.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocTask, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestBizprocTask.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocTask, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocTask, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocTask, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1987,10 +2020,10 @@ class BXRestBizprocRobot {
             update: [$bizproc, $robot, $update] // Обновляет поля робота
         };
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocRobot, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocRobot, providedIn: 'root' }); }
 }
-BXRestBizprocRobot.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocRobot, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestBizprocRobot.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocRobot, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocRobot, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocRobot, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -2003,10 +2036,10 @@ class BXRestBizprocEvent {
             send: [$bizproc, $event, $send], // Возвращает действию выходные параметры, заданные в описании действия
         };
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocEvent, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocEvent, providedIn: 'root' }); }
 }
-BXRestBizprocEvent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocEvent, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestBizprocEvent.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocEvent, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizprocEvent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizprocEvent, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -2021,10 +2054,10 @@ class BXRestBizproc {
         this.robot = robot;
         this.event = event;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizproc, deps: [{ token: BXRestBizprocWorkflow }, { token: BXRestBizprocActivity }, { token: BXRestBizprocTask }, { token: BXRestBizprocRobot }, { token: BXRestBizprocEvent }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizproc, providedIn: 'root' }); }
 }
-BXRestBizproc.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizproc, deps: [{ token: BXRestBizprocWorkflow }, { token: BXRestBizprocActivity }, { token: BXRestBizprocTask }, { token: BXRestBizprocRobot }, { token: BXRestBizprocEvent }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestBizproc.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizproc, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBizproc, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestBizproc, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -2051,10 +2084,10 @@ class BXRestLogBlogPost {
     get(param = {}) {
         return this.http.post(this.url.get, param);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestLogBlogPost, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestLogBlogPost, providedIn: 'root' }); }
 }
-BXRestLogBlogPost.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestLogBlogPost, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestLogBlogPost.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestLogBlogPost, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestLogBlogPost, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestLogBlogPost, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -2067,10 +2100,10 @@ class BXRestLogBlogComment {
             add: [$log, $blogcomment, $add], //	Добавляет комментарий к сообщению Живой ленты
         };
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestLogBlogComment, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestLogBlogComment, providedIn: 'root' }); }
 }
-BXRestLogBlogComment.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestLogBlogComment, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestLogBlogComment.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestLogBlogComment, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestLogBlogComment, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestLogBlogComment, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -2082,10 +2115,10 @@ class BXRestLog {
         this.blogPost = blogPost;
         this.blogComment = blogComment;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestLog, deps: [{ token: BXRestLogBlogPost }, { token: BXRestLogBlogComment }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestLog, providedIn: 'root' }); }
 }
-BXRestLog.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestLog, deps: [{ token: BXRestLogBlogPost }, { token: BXRestLogBlogComment }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestLog.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestLog, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestLog, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestLog, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -2106,10 +2139,10 @@ class BXRestCalendarEvent {
     get(param) {
         return this.http.post(this.url.get, param);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestCalendarEvent, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestCalendarEvent, providedIn: 'root' }); }
 }
-BXRestCalendarEvent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestCalendarEvent, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestCalendarEvent.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestCalendarEvent, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestCalendarEvent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestCalendarEvent, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -2155,10 +2188,10 @@ class BXRestCalendar {
     constructor(event) {
         this.event = event;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestCalendar, deps: [{ token: BXRestCalendarEvent }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestCalendar, providedIn: 'root' }); }
 }
-BXRestCalendar.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestCalendar, deps: [{ token: BXRestCalendarEvent }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestCalendar.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestCalendar, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestCalendar, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestCalendar, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -2208,105 +2241,366 @@ class BXRestSonetGroup {
     }) {
         return this.http.post(this.url.get, param);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestSonetGroup, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestSonetGroup, providedIn: 'root' }); }
 }
-BXRestSonetGroup.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestSonetGroup, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestSonetGroup.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestSonetGroup, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestSonetGroup, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestSonetGroup, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
         }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
 
-class Navvy {
-    constructor(snackBar) {
-        this.snackBar = snackBar;
-    }
-    mapAndSnackBarError(request, errorText) {
+class NavvySupport {
+    constructor(requestClass, mapClass) {
+        this.requestClass = requestClass;
+        this.mapClass = mapClass;
+        this.pageSize = 50; // больше всё равно не дас
+    }
+    mapAndSnackBarError(request
+    // errorText: string
+    ) {
         return request.pipe(map(v => BXRestMapResult(v)), catchError(err => {
-            this.snackBar.error(errorText);
+            // 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 }]; } });
+    mapResult(param, map) {
+        return (param && param.result) ? Object.assign(param, { result: map(param.result) }) : undefined;
+    }
+}
 
-class BXRestNavvyUser {
-    constructor(BXRestUser, BXRestUserMap, Navvy) {
-        this.BXRestUser = BXRestUser;
-        this.BXRestUserMap = BXRestUserMap;
-        this.Navvy = Navvy;
+class NavvySimple extends NavvySupport {
+    constructor(requestClass, mapClass, func, testError = '', map = undefined
+    // private snackBar: SnackBarService,
+    ) {
+        super(requestClass, mapClass);
+        this.func = func;
+        this.testError = testError;
+        this.map = map;
     }
-    get(params = {}) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestUser.get(params), 'Не удалось получить пользователей');
+    resultVanilla() {
+        return this.func;
     }
-    current(update = false) {
-        if (update) {
-            return this.self();
-        }
-        else {
-            let self = SessionStorage.getItem(this.constructor.name + this.self.name);
-            if (self) {
-                return of(self);
-            }
-            return this.self();
-        }
+    mapForVanilla() {
+        return this.func.pipe(map(v => (v && v.result && this.map) ? Object.assign(v, { result: this.map.call(this.mapClass, v.result) }) : v));
     }
-    update(user, fieldUpdate) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestUser.update(user, fieldUpdate), 'Не удалось обновить пользователя с ID' + user.ID);
+    result() {
+        return this.mapAndSnackBarError(this.func).pipe(map(v => (v && this.map) ? this.map.call(this.mapClass, v) : v));
+    }
+    // TODO: реализовать
+    resultAll() {
     }
-    self() {
-        return this.Navvy.mapAndSnackBarError(this.BXRestUser.current(), 'Не удалось получить пользователя')
+}
+
+class NavvyPagNavBase extends NavvySupport {
+    //  load: number = 0
+    constructor(requestClass, mapClass, func, param, testError = '', map = undefined) {
+        super(requestClass, mapClass);
+        this.func = func;
+        this.param = param;
+        this.testError = testError;
+        this.map = map;
+    }
+    resultVanilla() {
+        return this.func.call(this.requestClass, this.param);
+    }
+    mapForVanilla() {
+        return this.mapForVanillaEnd(this.func, this.param);
+    }
+    mapForVanillaEnd(func, param) {
+        return func.call(this.requestClass, param).pipe(map(v => (v && v.result && this.map) ? Object.assign(v, { result: this.map.call(this.mapClass, v.result) }) : v));
+    }
+    result() {
+        return this.resultEnd(this.func, this.param);
+    }
+    resultEnd(func, param) {
+        return this.mapAndSnackBarError(func.call(this.requestClass, param)).pipe(map(v => (v && this.map) ? this.map.call(this.mapClass, v) : v));
+    }
+}
+
+/**
+ * Класс-прослойка-обработчик для методов работающих на альтернативной постраничной навигации тика как методы по
+ * затраченному времени на задачи https://dev.1c-bitrix.ru/rest_help/tasks/task/elapseditem/index.php
+ *
+ * не завершенный класс, работаем от частного к общему
+ */
+class NavvyAlterPagNav extends NavvyPagNavBase {
+    resultAll() {
+        return this.mapAndSnackBarError(this.getAllTaskElapsedItem(this.func.call, this.param));
+    }
+    /**
+     * Метод в котором все должно крутиться, не конечный вариант
+     * работаем от частного к общему
+     *
+     * @param func
+     * @param param
+     */
+    getAllTaskElapsedItem(func, param = undefined) {
+        return func.call(this.requestClass, param).pipe(mergeMap(items => {
+            if (items && items.result) {
+                if (items.next) {
+                    param = (param) ? param : {};
+                    param.PARAMS = {
+                        NAV_PARAMS: {
+                            nPageSize: this.pageSize,
+                            iNumPage: items.next / this.pageSize + 1
+                        }
+                    };
+                    let requests = [];
+                    for (let i = 0; i < this.pageSize; i + this.pageSize) {
+                        let paramClone = clone(param);
+                        paramClone.PARAMS = {
+                            NAV_PARAMS: {
+                                nPageSize: this.pageSize,
+                                iNumPage: (items.next + i) / this.pageSize + 1
+                            }
+                        };
+                        requests.push(paramClone);
+                    }
+                    return from(requests).pipe(concatMap(param => func.call(this.requestClass, param)));
+                    /*
+                    return this.getAllTaskElapsedItem(func, param).pipe(
+                      map(vEnd => {
+                        if (vEnd && vEnd.result && items.result) {
+                          return merge(clone(vEnd), {result: [...items.result, ...vEnd.result]})
+                        }
+                        return items
+                      })
+                    )
+                     */
+                }
+            }
+            return from([items]);
+        }), catchError(err => {
+            // this.snackBar.error("Проблемы с поточным получение затреканого времени")
+            console.error(err);
+            return throwError(() => err);
+        }));
+    }
+}
+
+// TODO: реализовать загрузку всего в очереди
+class NavvyPagNav extends NavvyPagNavBase {
+    resultAll() {
+        let save = [];
+        return this.resultAllEnd()
             .pipe(map(v => {
             if (v) {
-                return this.BXRestUserMap.current(v);
+                save.push(...v);
             }
-            return undefined;
-        }), tap(v => {
+            return save;
+        }), last());
+    }
+    resultAllEnd() {
+        // return  this.mapForVanillaEnd(this.func, this.param)
+        return this.resultVanilla().pipe(mergeMap(items => {
+            if (items && items.result) {
+                if (items.total && items.next) {
+                    let requests = [];
+                    for (let i = items.next; i < items.total; i = i + this.pageSize) {
+                        let paramClone = clone(this.param);
+                        paramClone.start = i;
+                        requests.push(paramClone);
+                    }
+                    return concat(this.mapResultForGetAll(items), from(requests).pipe(concatMap(param => this.resultEnd(this.func, param))));
+                }
+            }
+            return this.mapResultForGetAll(items);
+        }), catchError(err => {
+            // this.snackBar.error("Проблемы с поточным получение затреканого времени")
+            console.error(err);
+            return throwError(() => err);
+        }));
+    }
+    mapResultForGetAll(items) {
+        return (items?.result) ? from([items.result]).pipe(map(v => (v && this.map) ? this.map.call(this.mapClass, v) : v)) : from([]);
+    }
+}
+
+class NavvyPagNavWithUselessKey extends NavvyPagNavBase {
+    resultAll() {
+        let save = [];
+        return this.resultAllEnd()
+            .pipe(map(v => {
             if (v) {
-                SessionStorage.setItem(this.constructor.name + this.self.name, v);
+                save.push(...v);
+            }
+            return save;
+        }), last());
+    }
+    resultAllEnd() {
+        return this.mapForVanillaEnd(this.func, this.param).pipe(mergeMap(items => {
+            if (items && items.result) {
+                if (items.total && items.next) {
+                    let requests = [];
+                    for (let i = 0; i < items.total; i = i + this.pageSize) {
+                        let paramClone = clone(this.param);
+                        paramClone.start = i;
+                        requests.push(paramClone);
+                    }
+                    /*
+                    return from(requests.map(param => this.resultEnd(this.func, param))).pipe(
+                      // toArray(),
+                      mergeMap(v => {
+                        return v
+                      })
+                    )
+                    */
+                    return from(requests).pipe(concatMap(param => this.resultEnd(this.func, param)));
+                    /*
+                    return this.getAllTaskElapsedItem(func, param).pipe(
+                      map(vEnd => {
+                        if (vEnd && vEnd.result && items.result) {
+                          return merge(clone(vEnd), {result: [...items.result, ...vEnd.result]})
+                        }
+                        return items
+                      })
+                    )
+                     */
+                }
             }
+            return from([1]).pipe(concatMap(_ => this.resultEnd(this.func, this.param)));
+            // return from([BXRestMapResult(items)])
+            // as ReturnType<Observable<T | undefined>, Observable<R | undefined>>
+        }), catchError(err => {
+            // this.snackBar.error("Проблемы с поточным получение затреканого времени")
+            console.error(err);
+            return throwError(() => err);
         }));
     }
+}
+
+class Navvy {
+    constructor(requestClass, mapClass
+    // private snackBar: SnackBarService,
+    ) {
+        this.requestClass = requestClass;
+        this.mapClass = mapClass;
+    }
+    simple(func, testError = '', map = undefined) {
+        return new NavvySimple(this.requestClass, this.mapClass, func.call(this.requestClass), testError, map);
+    }
+    simpleWithArg(func, arg, testError = '', map = undefined) {
+        return new NavvySimple(this.requestClass, this.mapClass, func.call(this.requestClass, arg), testError, map);
+    }
+    PagNav(func, arg, testError = '', map = undefined) {
+        return new NavvyPagNav(this.requestClass, this.mapClass, func, arg, testError, map);
+    }
+    PagNavWithUselessKey(func, arg, testError = '', map = undefined) {
+        return new NavvyPagNavWithUselessKey(this.requestClass, this.mapClass, func, arg, testError, map);
+    }
+    alterPagNav(func, arg = undefined, testError = '', map = undefined) {
+        return new NavvyAlterPagNav(this.requestClass, this.mapClass, func, arg, testError, map);
+    }
+}
+
+class BXRestNavvyUser {
+    constructor(BXRestUserMap, BXRestUser) {
+        this.BXRestUserMap = BXRestUserMap;
+        this.BXRestUser = BXRestUser;
+        this.Navvy = new Navvy(this.BXRestUser, this.BXRestUserMap);
+    }
+    current(update = false) {
+        return this.Navvy.simpleWithArg(this.self, update, '', this.BXRestUserMap.current);
+    }
+    /*
+    update(user: iBXRestUser, fieldUpdate: string[]) {
+      return this.Navvy.simple(
+        this.BXRestUser.update(user, fieldUpdate),
+        'Не удалось обновить пользователя с ID' + user.ID
+      )
+    }
+    */
     search(params) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestUser.search(params), 'Сервер не отвечает на запрос поиска');
+        return this.Navvy.simpleWithArg(this.BXRestUser.search, params, 'Сервер не отвечает на запрос поиска');
     }
-    access(access) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestUser.access(access), 'Не удалось получить права');
+    access(params) {
+        return this.Navvy.simpleWithArg(this.BXRestUser.access, params, 'Не удалось получить права');
     }
     fields() {
-        return this.Navvy.mapAndSnackBarError(this.BXRestUser.fields(), 'Не удалось поля');
+        return this.Navvy.simple(this.BXRestUser.fields, 'Не удалось поля');
     }
+    self(update = false) {
+        if (update) {
+            return this.BXRestUser.current(update);
+        }
+        else {
+            let self = SessionStorage.getItem(this.constructor.name + this.self.name);
+            if (self) {
+                return of({ result: self });
+            }
+            return this.BXRestUser.current(update)
+                .pipe(map(v => {
+                if (v) {
+                    return v;
+                }
+                return undefined;
+            }), tap(v => {
+                if (v) {
+                    SessionStorage.setItem(this.constructor.name + this.self.name, v);
+                }
+            }));
+        }
+    }
+    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' }); }
 }
-BXRestNavvyUser.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyUser, deps: [{ token: BXRestUser }, { token: BXRestUserMap }, { token: Navvy }], 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: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyUser, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestUser }, { type: BXRestUserMap }, { type: Navvy }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestUserMap }, { type: BXRestUser }]; } });
+
+class BXRestMapListsField {
+    get(v) {
+        return (v) ? Object.values(v) : undefined;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapListsField, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapListsField, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapListsField, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestNavvyListsField {
+    constructor(BXRestListsField, BXRestMapListsField) {
+        this.BXRestListsField = BXRestListsField;
+        this.BXRestMapListsField = BXRestMapListsField;
+        this.Navvy = new Navvy(this.BXRestListsField, this.BXRestMapListsField);
+    }
+    get(param) {
+        return this.Navvy.PagNavWithUselessKey(this.BXRestListsField.get, param, 'Не удалось получить поля списка', this.BXRestMapListsField.get);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyListsField, deps: [{ token: BXRestListsField }, { token: BXRestMapListsField }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyListsField, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyListsField, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestListsField }, { type: BXRestMapListsField }]; } });
 
 class BXRestMapListsElement extends BaseMapServices {
     get(items) {
-        return items.map(item => Object.assign(item, {
-            BP_PUBLISHED: item.BP_PUBLISHED === 'Y',
-            CREATED_BY: this.toNum(item.CREATED_BY),
-            IBLOCK_ID: this.toNum(item.IBLOCK_ID),
-            ID: this.toNum(item.ID)
-        }));
-    }
+        return (items)
+            ? items.map(item => Object.assign(item, {
+                BP_PUBLISHED: item.BP_PUBLISHED === 'Y',
+                CREATED_BY: this.toNum(item.CREATED_BY),
+                IBLOCK_ID: this.toNum(item.IBLOCK_ID),
+                ID: this.toNum(item.ID)
+            }))
+            : undefined;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapListsElement, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapListsElement, providedIn: 'root' }); }
 }
-BXRestMapListsElement.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapListsElement, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BXRestMapListsElement.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapListsElement, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapListsElement, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapListsElement, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -2314,32 +2608,28 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }] });
 
 class BXRestNavvyListsElement {
-    constructor(BXRestListsElement, BXRestMap, Navvy) {
+    constructor(BXRestListsElement, BXRestMap) {
         this.BXRestListsElement = BXRestListsElement;
         this.BXRestMap = BXRestMap;
-        this.Navvy = Navvy;
+        this.Navvy = new Navvy(this.BXRestListsElement, this.BXRestMap);
     }
     get(param) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestListsElement.get(param), 'Не удалось получить элемент списка').pipe(map(v => (v) ? this.BXRestMap.get(v) : undefined));
+        return this.Navvy.PagNav(this.BXRestListsElement.get, param, 'Не удалось получить элемент списка', this.BXRestMap.get);
     }
     add(param) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestListsElement.add(param), 'Не удалось получить элемент списка');
+        return this.Navvy.simpleWithArg(this.BXRestListsElement.add, param, 'Не удалось добавить элемент списка');
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyListsElement, deps: [{ token: BXRestListsElement }, { token: BXRestMapListsElement }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyListsElement, providedIn: 'root' }); }
 }
-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: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyListsElement, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestListsElement }, { type: BXRestMapListsElement }, { type: Navvy }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestListsElement }, { type: BXRestMapListsElement }]; } });
 
 class BXRestMapLists extends BaseMapServices {
-    constructor(element) {
-        super();
-        this.element = element;
-    }
     get(value) {
         return (value) ? value.map(i => this.iBXRestListItemHttpToiBXRestListItem(i)) : undefined;
     }
@@ -2359,7 +2649,7 @@ class BXRestMapLists extends BaseMapServices {
             ELEMENT_NAME: this.toStr(itemLists.ELEMENT_NAME),
             EXTERNAL_ID: this.toStr(itemLists.EXTERNAL_ID),
             IBLOCK_TYPE_ID: this.toStr(itemLists.IBLOCK_TYPE_ID),
-            ID: Number(itemLists.ID),
+            ID: this.toNum(itemLists.ID),
             INDEX_ELEMENT: itemLists.INDEX_ELEMENT === 'Y',
             INDEX_SECTION: itemLists.INDEX_SECTION === 'Y',
             LANG_DIR: this.toStr(itemLists.LANG_DIR),
@@ -2385,7 +2675,7 @@ class BXRestMapLists extends BaseMapServices {
             SECTION_PROPERTY: this.toStr(itemLists.SECTION_PROPERTY),
             SERVER_NAME: this.toStr(itemLists.SERVER_NAME),
             SOCNET_GROUP_ID: this.toStr(itemLists.SOCNET_GROUP_ID),
-            SORT: this.toStr(itemLists.SOCNET_GROUP_ID),
+            SORT: this.toNum(itemLists.SOCNET_GROUP_ID),
             TIMESTAMP_X: new Date(itemLists.TIMESTAMP_X),
             TMP_ID: this.toStr(itemLists.SOCNET_GROUP_ID),
             VERSION: Number(itemLists.VERSION),
@@ -2393,35 +2683,36 @@ class BXRestMapLists extends BaseMapServices {
             XML_ID: this.toStr(itemLists.SOCNET_GROUP_ID),
         };
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapLists, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapLists, providedIn: 'root' }); }
 }
-BXRestMapLists.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapLists, deps: [{ token: BXRestMapListsElement }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestMapLists.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapLists, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapLists, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapLists, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestMapListsElement }]; } });
+        }] });
 
 class BXRestNavvyLists {
-    constructor(element, BXRestLists, Navvy, mapList) {
+    constructor(element, field, mapList, BXRestLists) {
         this.element = element;
-        this.BXRestLists = BXRestLists;
-        this.Navvy = Navvy;
+        this.field = field;
         this.mapList = mapList;
+        this.BXRestLists = BXRestLists;
+        this.Navvy = new Navvy(this.BXRestLists, this.mapList);
     }
     get(param) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestLists.get(param), 'Не удалось получить список').pipe(map(v => this.mapList.get(v)));
+        return this.Navvy.PagNav(this.BXRestLists.get, param, 'Не удалось получить список', this.mapList.get);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyLists, deps: [{ token: BXRestNavvyListsElement }, { token: BXRestNavvyListsField }, { token: BXRestMapLists }, { token: BXRestLists }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyLists, providedIn: 'root' }); }
 }
-BXRestNavvyLists.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLists, deps: [{ token: BXRestNavvyListsElement }, { token: BXRestLists }, { token: Navvy }, { token: BXRestMapLists }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyLists.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLists, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLists, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyLists, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestNavvyListsElement }, { type: BXRestLists }, { type: Navvy }, { type: BXRestMapLists }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestNavvyListsElement }, { type: BXRestNavvyListsField }, { type: BXRestMapLists }, { type: BXRestLists }]; } });
 
 class Permission {
     static get() {
@@ -2453,25 +2744,28 @@ class Permission {
             SessionStorage.setItem('permission', permission);
         }
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: Permission, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: Permission, providedIn: 'root' }); }
 }
-Permission.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: Permission, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-Permission.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: Permission, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: Permission, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: Permission, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
         }] });
 
-class BXRestTaskMap extends BaseMapServices {
+class BXRestMapTasksTask extends BaseMapServices {
+    getaccess(v) {
+        return (v && v.allowedActions) ? v.allowedActions : undefined;
+    }
     add(item) {
-        return this.TaskBXHttpToTaskBX(item);
+        return (item) ? this.TaskBXHttpToTaskBX(item.task) : undefined;
     }
     get(item) {
-        return this.TaskBXHttpToTaskBX(item);
+        return (item && item.task) ? this.TaskBXHttpToTaskBX(item.task) : undefined;
     }
     list(item) {
-        return item.map(i => this.TaskBXHttpToTaskBX(i));
+        return (item && item.tasks) ? item.tasks.map(i => this.TaskBXHttpToTaskBX(i)) : undefined;
     }
     TaskBXHttpToTaskBX(item) {
         let result = {};
@@ -2574,10 +2868,10 @@ class BXRestTaskMap extends BaseMapServices {
         }
         return Object.assign(item, result);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasksTask, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasksTask, providedIn: 'root' }); }
 }
-BXRestTaskMap.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTaskMap, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BXRestTaskMap.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTaskMap, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestTaskMap, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasksTask, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -2589,16 +2883,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
 //   next: number
 // }
 class BXRestNavvyTasksTask {
-    // storeTask$: Observable<iStoreTask>
-    constructor(BXRestTasksTask, snackBar, 
+    constructor(BXRestTasksTask, 
+    // private snackBar: SnackBarService,
     //  private store: Store<{ tasks: IStoreTask }>,
-    taskMap, 
-    // private taskResultMap: BitrixApiTaskResultMapServices
-    Navvy) {
+    BXRestMapTasksTask) {
         this.BXRestTasksTask = BXRestTasksTask;
-        this.snackBar = snackBar;
-        this.taskMap = taskMap;
-        this.Navvy = Navvy;
+        this.BXRestMapTasksTask = BXRestMapTasksTask;
         // pageSize = 50
         // nowLoad$ = new ReplaySubject<TimeProcess>(1)
         this.def = {
@@ -2609,6 +2899,7 @@ class BXRestNavvyTasksTask {
                 'TAGS', 'ALLOW_TIME_TRACKING'
             ]
         };
+        this.Navvy = new Navvy(this.BXRestTasksTask, this.BXRestMapTasksTask);
         //  this.storeTask$ = this.store.select('tasks')
         //  this.nowLoad$.next({
         //    total: 0,
@@ -2616,12 +2907,7 @@ class BXRestNavvyTasksTask {
         //  })
     }
     add(param) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestTasksTask.add(param), 'Не удалось получить задачу').pipe(map(v => {
-            if (v && v.task) {
-                return this.taskMap.add(v.task);
-            }
-            return undefined;
-        }));
+        return this.Navvy.simpleWithArg(this.BXRestTasksTask.add, param, 'Не удалось добавить задачу', this.BXRestMapTasksTask.add);
         // return this.http.post<{ task: TaskBXHttp }>(this.url.add, {fields: param}).pipe(
         //   map(v => {
         //       if (v && v.result && v.result.task) {
@@ -2661,21 +2947,17 @@ class BXRestNavvyTasksTask {
       return of(undefined)
     }
     */
-    get(requestArray) {
-        if (!requestArray.select) {
-            requestArray.select = this.def.select;
+    get(param) {
+        if (!param.select) {
+            param.select = this.def.select;
         }
-        return this.Navvy.mapAndSnackBarError(this.BXRestTasksTask.get(requestArray), 'Не удалось получить задачу').pipe(map(v => (v && v.task) ? v.task : undefined), map(v => (v) ? this.taskMap.get(v) : undefined));
+        return this.Navvy.simpleWithArg(this.BXRestTasksTask.get, param, 'Не удалось получить задачу', this.BXRestMapTasksTask.get);
     }
     list(param = {}) {
         if (!param.select) {
             param.select = this.def.select;
         }
-        return this.Navvy.mapAndSnackBarError(this.BXRestTasksTask.list(param), 'Не удалось получить задачи').pipe(map(v => (v && v.tasks) ? v.tasks : undefined), map(v => (v) ? this.taskMap.list(v) : undefined), tap(v => {
-            if (v) {
-                SessionStorage.setItem(this.constructor.name + this.list.name, v);
-            }
-        }));
+        return this.Navvy.simpleWithArg(this.BXRestTasksTask.list, param, 'Не удалось получить список задач', this.BXRestMapTasksTask.list);
     }
     /*
     listArray(requestArray: RequestApiTaskListBX = {}) {
@@ -2798,40 +3080,62 @@ class BXRestNavvyTasksTask {
     }
      */
     getaccess(param) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestTasksTask.getaccess(param), 'Не удалось получить права на указанных пользователей').pipe(map(v => (v && v.allowedActions) ? v.allowedActions : undefined));
+        return this.Navvy.simpleWithArg(this.BXRestTasksTask.getaccess, param, 'Не удалось получить права на указанных пользователей', this.BXRestMapTasksTask.getaccess);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasksTask, deps: [{ token: BXRestTasksTask }, { token: BXRestMapTasksTask }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasksTask, providedIn: 'root' }); }
 }
-BXRestNavvyTasksTask.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTasksTask, deps: [{ token: BXRestTasksTask }, { token: SnackBarService }, { token: BXRestTaskMap }, { token: Navvy }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyTasksTask.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTasksTask, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTasksTask, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasksTask, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestTasksTask }, { type: SnackBarService }, { type: BXRestTaskMap }, { type: Navvy }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestTasksTask }, { type: BXRestMapTasksTask }]; } });
 
 class BXRestNavvyTasks {
     constructor(task) {
         this.task = task;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasks, deps: [{ token: BXRestNavvyTasksTask }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasks, providedIn: 'root' }); }
 }
-BXRestNavvyTasks.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTasks, deps: [{ token: BXRestNavvyTasksTask }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyTasks.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTasks, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTasks, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasks, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
         }], ctorParameters: function () { return [{ type: BXRestNavvyTasksTask }]; } });
 
+class BXRestMapTaskElapseditem {
+    update(p) {
+        return (p == null);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskElapseditem, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskElapseditem, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskElapseditem, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
 class BXRestNavvyElapseditem {
-    constructor(BXRestElapseditem, BXRestNavvyUser, BXRestNavvyTasks, Navvy, snackBar) {
+    constructor(BXRestElapseditem, BXRestNavvyUser, BXRestNavvyTasks, BXRestMapElapseditem) {
         this.BXRestElapseditem = BXRestElapseditem;
         this.BXRestNavvyUser = BXRestNavvyUser;
         this.BXRestNavvyTasks = BXRestNavvyTasks;
-        this.Navvy = Navvy;
-        this.snackBar = snackBar;
+        this.BXRestMapElapseditem = BXRestMapElapseditem;
+        this.Navvy = new Navvy(this.BXRestElapseditem, this.BXRestMapElapseditem);
     }
+    /*
+    call(methodName: string, ...args: any[]){
+      if (typeof this[methodName] === 'function') {
+        return this[methodName](...args);
+      }
+      return this[methodName](...args);
+    }
+     */
     getList(param = undefined) {
         if (param) {
             if (!param.TASKID && !param.SELECT) {
@@ -2846,45 +3150,41 @@ class BXRestNavvyElapseditem {
                 };
             }
         }
-        return this.Navvy.mapAndSnackBarError(this.BXRestElapseditem.getList(param), 'не удалось получить время по задачам');
+        return this.Navvy.alterPagNav(this.BXRestElapseditem.getList, param);
     }
     add(param) {
         return this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
             if (allowedReadTask) {
-                return this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowed => {
+                return this.checkPermissionAddTask(param.TASKID).pipe(mergeMap(allowed => {
                     if (allowed) {
-                        return this.Navvy.mapAndSnackBarError(this.BXRestElapseditem.add(param), 'Не удалось добавить запись о времени');
+                        return this.BXRestElapseditem.add(param);
                     }
                     else {
-                        this.snackBar.error('Отсутствуют права добавление записи затраченного времени');
-                        return of(false);
+                        return throwError(() => new Error('Отсутствуют права добавление записи затраченного времени'));
                     }
                 }));
             }
             else {
-                this.snackBar.error('Отсутствуют права на чтение задачи');
-                return of(false);
+                return throwError(() => new Error('Отсутствуют права на чтение задачи'));
             }
         }));
     }
     update(param) {
-        return this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
+        return this.Navvy.simple(() => this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
             if (allowedReadTask) {
                 return this.isAllowedModify(param.TASKID, param.ITEMID).pipe(mergeMap(allowed => {
                     if (allowed) {
-                        return this.Navvy.mapAndSnackBarError(this.BXRestElapseditem.update(param), 'Не удалось обновить запись о времени');
+                        return this.BXRestElapseditem.update(param);
                     }
                     else {
-                        this.snackBar.error('Отсутствуют права на изменение записи затраченного времени');
-                        return of(false);
+                        return throwError(() => new Error('Отсутствуют права на изменение записи затраченного времени'));
                     }
                 }));
             }
             else {
-                this.snackBar.error('Отсутствуют права на чтение задачи');
-                return of(false);
+                return throwError(() => new Error('Отсутствуют права на чтение задачи'));
             }
-        }));
+        })), 'Не удалось обновить элемент списка', this.BXRestMapElapseditem.update);
     }
     /*
     getAll(
@@ -2921,8 +3221,22 @@ class BXRestNavvyElapseditem {
     }
      */
     /*
-    getByInterval(idsUsers: number[], dateStart: Date, dateEnd: Date, cache = false) {
-      return this.getAll({
+    getByInterval(idsUsers: number[], dateStart: Date, dateEnd: Date) {
+      return new Navvy(
+        this.BXRestElapseditem.getList(
+          {
+            ORDER: {
+              ID: 'DESC'
+            },
+            FILTER: {
+              USER_ID: idsUsers,
+              '>=CREATED_DATE': dateStart.toLocaleString('ru-Ru'),
+              '<=CREATED_DATE': dateEnd.toLocaleString('ru-Ru'),
+            }
+          }
+        ))
+      /*
+      return this.BXRestElapseditem.getList({
           ORDER: {
             ID: 'DESC'
           },
@@ -2931,39 +3245,39 @@ class BXRestNavvyElapseditem {
             '>=CREATED_DATE': dateStart.toLocaleString('ru-Ru'),
             '<=CREATED_DATE': dateEnd.toLocaleString('ru-Ru'),
           }
-        },
-        cache
-      ).pipe(
-        map(v => this.http.mapResult(v))
+        }
       )
-    }
      */
     /*
-    getCacheOff(params: RequestParamsElapsedGetList | undefined = undefined) {
-      return this.http.post<iHttpAnswerBX<BXRestElapsedHttp[]> | undefined>
-      (this.url.getlist, params, 'не удалось получить время по задачам')
-        .pipe(
-          map(v => {
-            if (v && v.result) {
-              const newResult: BXRestElapsed[] = []
-              for (let task of v.result) {
-                newResult.push(this.elapsedBXMap.AnswerElapsedGetHttpToAnswerElapsedGet(task))
+      }
+    
+    
+      /*
+      getCacheOff(params: RequestParamsElapsedGetList | undefined = undefined) {
+        return this.http.post<iHttpAnswerBX<BXRestElapsedHttp[]> | undefined>
+        (this.url.getlist, params, 'не удалось получить время по задачам')
+          .pipe(
+            map(v => {
+              if (v && v.result) {
+                const newResult: BXRestElapsed[] = []
+                for (let task of v.result) {
+                  newResult.push(this.elapsedBXMap.AnswerElapsedGetHttpToAnswerElapsedGet(task))
+                }
+                return extend(v, {result: newResult}) as iHttpAnswerBX<BXRestElapsed[]>
               }
-              return extend(v, {result: newResult}) as iHttpAnswerBX<BXRestElapsed[]>
-            }
-            return undefined
-          }),
-          tap(v => {
-            if (v && params) {
-              this.store.dispatch(saveHttpTaskTime({
-                filter: clone(params),
-                time: v
-              }))
-            }
-          })
-        )
-    }
-    */
+              return undefined
+            }),
+            tap(v => {
+              if (v && params) {
+                this.store.dispatch(saveHttpTaskTime({
+                  filter: clone(params),
+                  time: v
+                }))
+              }
+            })
+          )
+      }
+      */
     isAllowedModify(idTask, idItem) {
         let permission = Permission.get();
         if (permission?.tasks?.length) {
@@ -2979,7 +3293,7 @@ class BXRestNavvyElapseditem {
             TASKID: idTask,
             ITEMID: 2,
             ACTIONID: idItem
-        }).pipe(tap(v => {
+        }).result().pipe(tap(v => {
             if (v !== undefined) {
                 Permission.setTaskElapsedItem(idTask, {
                     id: idItem,
@@ -2998,7 +3312,7 @@ class BXRestNavvyElapseditem {
             TASKID: idTask,
             ITEMID: 3,
             ACTIONID: idItem
-        });
+        }).result();
     }
     /**
      * idAction:
@@ -3008,15 +3322,39 @@ class BXRestNavvyElapseditem {
      * @param param
      */
     isActionAllowed(param) {
-        return this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(canRead => {
+        return this.Navvy.simple(() => this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(canRead => {
             if (canRead) {
-                this.Navvy.mapAndSnackBarError(this.BXRestElapseditem.isActionAllowed(param), '').pipe(catchError(v => {
-                    console.error(v);
-                    return of(false);
-                }));
+                return this.BXRestElapseditem.isActionAllowed(param);
             }
-            return of(false);
-        }));
+            return throwError(() => new Error('Отсутствуют права на чтение задачи'));
+        })));
+    }
+    checkPermissionAddTask(idTask) {
+        let permission = Permission.get();
+        if (permission?.tasks?.length) {
+            let findTask = permission.tasks.find(i => i.id === idTask);
+            if (findTask?.permission) {
+                return of(findTask.permission['ELAPSEDTIME.ADD']);
+            }
+            return this.BXRestNavvyUser.current().result().pipe(mergeMap(self => {
+                if (self) {
+                    return this.BXRestNavvyTasks.task.getaccess({
+                        id: idTask,
+                        users: [self.ID]
+                    }).result().pipe(tap(v => {
+                        if (v && v[self.ID]) {
+                            Permission.set({
+                                tasks: [{ id: idTask, permission: v[self.ID], elapsedItem: [] }]
+                            });
+                        }
+                    }), map(v => {
+                        return (v && v[self.ID]) ? v[self.ID]['ELAPSEDTIME.ADD'] : false;
+                    }));
+                }
+                return of(undefined);
+            }));
+        }
+        return of(undefined);
     }
     checkPermissionReadTask(idTask) {
         let permission = Permission.get();
@@ -3025,12 +3363,12 @@ class BXRestNavvyElapseditem {
             if (findTask?.permission) {
                 return of(findTask.permission.ACCEPT);
             }
-            return this.BXRestNavvyUser.current().pipe(mergeMap(self => {
+            return this.BXRestNavvyUser.current().result().pipe(mergeMap(self => {
                 if (self) {
                     return this.BXRestNavvyTasks.task.getaccess({
                         id: idTask,
                         users: [self.ID]
-                    }).pipe(tap(v => {
+                    }).result().pipe(tap(v => {
                         if (v && v[self.ID]) {
                             Permission.set({
                                 tasks: [{ id: idTask, permission: v[self.ID], elapsedItem: [] }]
@@ -3046,43 +3384,40 @@ class BXRestNavvyElapseditem {
         return of(undefined);
     }
     del(param) {
-        return this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
+        return this.Navvy.simple(() => this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
             if (allowedReadTask) {
                 return this.isAllowedRemove(param.TASKID, param.ITEMID).pipe(mergeMap(allowed => {
                     if (allowed) {
-                        return this.Navvy.mapAndSnackBarError(this.BXRestElapseditem.del(param), 'Не удалось удалить запись')
-                            .pipe(map(v => (v === null)));
+                        return this.BXRestElapseditem.del(param);
                     }
                     else {
-                        this.snackBar.error('Отсутствуют права на удаление записи затраченного времени');
-                        return of(false);
+                        return throwError(() => new Error('Отсутствуют права на удаление записи затраченного времени'));
                     }
                 }));
             }
             else {
-                this.snackBar.error('Отсутствуют права на чтение задачи');
-                return of(false);
+                return throwError(() => new Error('Отсутствуют права на чтение задачи'));
             }
-        }));
+        })), 'Не удалось удалить элемент списка', 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.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyElapseditem, providedIn: 'root' }); }
 }
-BXRestNavvyElapseditem.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyElapseditem, deps: [{ token: BXRestElapseditem }, { token: BXRestNavvyUser }, { token: BXRestNavvyTasks }, { token: Navvy }, { token: SnackBarService }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyElapseditem.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyElapseditem, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyElapseditem, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyElapseditem, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestElapseditem }, { type: BXRestNavvyUser }, { type: BXRestNavvyTasks }, { type: Navvy }, { type: SnackBarService }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestElapseditem }, { type: BXRestNavvyUser }, { type: BXRestNavvyTasks }, { type: BXRestMapTaskElapseditem }]; } });
 
 class BXRestNavvyTask {
     constructor(elapseditem) {
         this.elapseditem = elapseditem;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTask, deps: [{ token: BXRestNavvyElapseditem }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTask, providedIn: 'root' }); }
 }
-BXRestNavvyTask.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTask, deps: [{ token: BXRestNavvyElapseditem }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyTask.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTask, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyTask, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTask, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3133,10 +3468,10 @@ class BXRestMapDiskBase extends BaseMapServices {
     instanceOfiFolder(object) {
         return object && object.TYPE && object.TYPE === 'folder';
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskBase, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskBase, providedIn: 'root' }); }
 }
-BXRestMapDiskBase.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskBase, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BXRestMapDiskBase.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskBase, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskBase, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskBase, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3145,12 +3480,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
 
 class BXRestMapDiskFolder extends BXRestMapDiskBase {
     getContent(arr) {
-        return this.separationFoldersAndFiles(arr);
+        return (arr) ? this.separationFoldersAndFiles(arr) : { file: [], folder: [] };
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskFolder, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskFolder, providedIn: 'root' }); }
 }
-BXRestMapDiskFolder.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskFolder, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BXRestMapDiskFolder.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskFolder, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskFolder, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskFolder, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3158,10 +3493,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }] });
 
 class BXRestNavvyDiskFolder {
-    constructor(BXRestDiskFolder, BXRestMapDiskFolder, Navvy) {
+    constructor(BXRestDiskFolder, BXRestMapDiskFolder) {
         this.BXRestDiskFolder = BXRestDiskFolder;
         this.BXRestMapDiskFolder = BXRestMapDiskFolder;
-        this.Navvy = Navvy;
+        this.Navvy = new Navvy(this.BXRestDiskFolder, this.BXRestMapDiskFolder);
     }
     // uploadfile(id: number, fileContent: string[]) {
     //   return this.httpPost(
@@ -3178,64 +3513,65 @@ class BXRestNavvyDiskFolder {
     //   )
     // }
     getchildren(id) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestDiskFolder.getchildren(id), 'get folders and files').pipe(map(v => {
-            if (v) {
-                return this.BXRestMapDiskFolder.getContent(v);
-            }
-            return { file: [], folder: [] };
-        }));
+        return this.Navvy.simpleWithArg(this.BXRestDiskFolder.getchildren, id, 'get folders and files', this.BXRestMapDiskFolder.getContent);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskFolder, deps: [{ token: BXRestDiskFolder }, { token: BXRestMapDiskFolder }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskFolder, providedIn: 'root' }); }
 }
-BXRestNavvyDiskFolder.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskFolder, deps: [{ token: BXRestDiskFolder }, { token: BXRestMapDiskFolder }, { token: Navvy }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyDiskFolder.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskFolder, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskFolder, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskFolder, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestDiskFolder }, { type: BXRestMapDiskFolder }, { type: Navvy }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestDiskFolder }, { type: BXRestMapDiskFolder }]; } });
 
-class BXRestNavvyDiskFile extends BaseServices {
-    constructor(BXRestDiskFile, Navvy) {
-        super();
+class BXRestMapDiskFile extends BaseMapServices {
+    get(v) {
+        return (v) ? Object.assign(v, { SIZE: this.toNum(v.SIZE) }) : undefined;
+    }
+    markdeleted(v) {
+        return (v) ? Object.assign(v, { SIZE: this.toNum(v.SIZE) }) : undefined;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskFile, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskFile, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskFile, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestNavvyDiskFile {
+    constructor(BXRestDiskFile, BXRestMapDiskFile) {
         this.BXRestDiskFile = BXRestDiskFile;
-        this.Navvy = Navvy;
+        this.BXRestMapDiskFile = BXRestMapDiskFile;
+        this.Navvy = new Navvy(this.BXRestDiskFile, this.BXRestMapDiskFile);
     }
     get(id) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestDiskFile.get(id), 'Не удалось получить файл').pipe(map(v => {
-            if (v) {
-                return Object.assign(v, { SIZE: this.toNum(v.SIZE) });
-            }
-            return undefined;
-        }));
+        return this.Navvy.simpleWithArg(this.BXRestDiskFile.get, id, 'Не удалось получить файл', this.BXRestMapDiskFile.get);
     }
-    markDel(id) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestDiskFile.markDel(id), 'Не удалось переместить файл в корзину')
-            .pipe(map(v => {
-            if (v) {
-                return Object.assign(v, { SIZE: this.toNum(v.SIZE) });
-            }
-            return undefined;
-        }));
+    markdeleted(id) {
+        return this.Navvy.simpleWithArg(this.BXRestDiskFile.markdeleted, id, 'Не удалось переместить файл в корзину', this.BXRestMapDiskFile.markdeleted);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskFile, deps: [{ token: BXRestDiskFile }, { token: BXRestMapDiskFile }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskFile, providedIn: 'root' }); }
 }
-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: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskFile, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestDiskFile }, { type: Navvy }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestDiskFile }, { type: BXRestMapDiskFile }]; } });
 
 class BXRestMapDiskStorage extends BXRestMapDiskBase {
     getchildren(arr) {
-        return this.separationFoldersAndFiles(arr);
+        return (arr) ? this.separationFoldersAndFiles(arr) : { file: [], folder: [] };
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskStorage, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskStorage, providedIn: 'root' }); }
 }
-BXRestMapDiskStorage.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskStorage, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BXRestMapDiskStorage.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskStorage, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskStorage, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskStorage, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3263,7 +3599,6 @@ class BXRestDiskStorage {
     getforapp() {
         return this.http.post(this.url.getforapp, {});
     }
-    // TODO: разобраться с фильтром
     getchildren(param) {
         return this.http.post(this.url.getchildren, param);
     }
@@ -3274,23 +3609,19 @@ class BXRestDiskStorage {
     uploadfile(param) {
         return this.http.post(this.url.uploadfile, param);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDiskStorage, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDiskStorage, providedIn: 'root' }); }
 }
-BXRestDiskStorage.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskStorage, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestDiskStorage.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskStorage, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestDiskStorage, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestDiskStorage, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
         }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
 
-class BXRestNavvyDiskStorage {
-    // BXDiskFolder$ = new Observable<BXDiskFolderStore>()
-    constructor(BXRestDiskStorage, BXRestMapDiskStorage, Navvy) {
+class BXRestNavvyInterlayerDiskStorage {
+    constructor(BXRestDiskStorage) {
         this.BXRestDiskStorage = BXRestDiskStorage;
-        this.BXRestMapDiskStorage = BXRestMapDiskStorage;
-        this.Navvy = Navvy;
-        // this.BXDiskFolder$ = this.store.select('BXDiskFolder')
     }
     getforapp() {
         let res = SessionStorage.getItem(this.constructor.name + this.getforapp.name);
@@ -3298,38 +3629,99 @@ class BXRestNavvyDiskStorage {
             return of(res);
         }
         else {
-            return this.Navvy.mapAndSnackBarError(this.BXRestDiskStorage.getforapp(), 'get root app folder').pipe(tap(v => {
+            return this.BXRestDiskStorage.getforapp().pipe(tap(v => {
                 if (v) {
                     SessionStorage.setItem(this.constructor.name + this.getforapp.name, v);
                 }
-            }));
+            }), shareReplay(1));
         }
     }
-    // TODO: разобраться с фильтром позже
-    getchildren(param) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestDiskStorage.getchildren(param), 'get root app folders and files').pipe(map(v => {
-            if (v && v.length) {
-                return this.BXRestMapDiskStorage.getchildren(v);
+    /*
+    private getforappEnd(){
+      console.log('this.BXRestDiskStorage.getforapp()', this.BXRestDiskStorage.getforapp())
+      let res = SessionStorage.getItem<iBXRestFolderInfo>(this.constructor.name + this.getforapp.name)
+      if(res){
+        return of({result: res})
+      } else {
+        console.log('this.BXRestDiskStorage.getforapp()', this.BXRestDiskStorage, this.BXRestDiskStorage.getforapp())
+        return this.BXRestDiskStorage.getforapp().pipe(
+          tap(v => {
+            if(v){
+              SessionStorage.setItem(this.constructor.name + this.getforapp.name, v)
             }
-            return { file: [], folder: [] };
-        }));
+          })
+        )
+      }
+    }
+     */
+    getchildren(param) {
+        return this.BXRestDiskStorage.getchildren(param);
     }
     // TODO: разобраться что возвращает и что вставлять
     addfolder(param) {
-        return this.BXRestDiskStorage.addfolder(param).pipe(map(v => BXRestMapResult(v)));
+        return this.BXRestDiskStorage.addfolder(param);
     }
     uploadfile(param) {
         return this.BXRestDiskStorage.uploadfile(param);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyInterlayerDiskStorage, deps: [{ token: BXRestDiskStorage }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyInterlayerDiskStorage, providedIn: 'root' }); }
 }
-BXRestNavvyDiskStorage.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskStorage, deps: [{ token: BXRestDiskStorage }, { token: BXRestMapDiskStorage }, { token: Navvy }], 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: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyInterlayerDiskStorage, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestDiskStorage }, { type: BXRestMapDiskStorage }, { type: Navvy }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestDiskStorage }]; } });
+
+class BXRestNavvyDiskStorage {
+    constructor(BXRestNavvyInterlayerDiskStorage, BXRestMapDiskStorage) {
+        this.BXRestNavvyInterlayerDiskStorage = BXRestNavvyInterlayerDiskStorage;
+        this.BXRestMapDiskStorage = BXRestMapDiskStorage;
+        this.Navvy = new Navvy(this.BXRestNavvyInterlayerDiskStorage, this.BXRestMapDiskStorage);
+        // this.BXDiskFolder$ = this.store.select('BXDiskFolder')
+    }
+    getforapp() {
+        // console.log('this.getforappEnd', this.getforappEnd)
+        return this.Navvy.simple(this.BXRestNavvyInterlayerDiskStorage.getforapp, 'get root app folder');
+    }
+    /*
+    private getforappEnd(){
+      console.log('this.BXRestDiskStorage.getforapp()', this.BXRestDiskStorage.getforapp())
+      let res = SessionStorage.getItem<iBXRestFolderInfo>(this.constructor.name + this.getforapp.name)
+      if(res){
+        return of({result: res})
+      } else {
+        console.log('this.BXRestDiskStorage.getforapp()', this.BXRestDiskStorage, this.BXRestDiskStorage.getforapp())
+        return this.BXRestDiskStorage.getforapp().pipe(
+          tap(v => {
+            if(v){
+              SessionStorage.setItem(this.constructor.name + this.getforapp.name, v)
+            }
+          })
+        )
+      }
+    }
+     */
+    getchildren(param) {
+        return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.getchildren, param, 'get root app folders and files', this.BXRestMapDiskStorage.getchildren);
+    }
+    // TODO: разобраться что возвращает и что вставлять
+    addfolder(param) {
+        return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.addfolder, param);
+    }
+    uploadfile(param) {
+        return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.uploadfile, param);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskStorage, deps: [{ token: BXRestNavvyInterlayerDiskStorage }, { token: BXRestMapDiskStorage }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskStorage, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskStorage, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestNavvyInterlayerDiskStorage }, { type: BXRestMapDiskStorage }]; } });
 
 class BXRestNavvyDiskOperation {
     constructor(folder, disk, storage) {
@@ -3339,7 +3731,7 @@ class BXRestNavvyDiskOperation {
     }
     // данные файла в base64
     loadFileInAppFolder(file) {
-        return this.storage.getforapp().pipe(take(1), mergeMap$1(infoFolder => {
+        return this.storage.getforapp().result().pipe(mergeMap$1(infoFolder => {
             if (infoFolder) {
                 return this.storage.uploadfile({
                     id: infoFolder.ID,
@@ -3348,15 +3740,15 @@ class BXRestNavvyDiskOperation {
                         NAME: file.name
                     },
                     generateUniqueName: true
-                }).pipe(map(v => BXRestMapResult(v)));
+                }).result();
             }
-            return of(undefined);
+            return throwError(() => new Error('Отсутствует общее хранилище для приложения'));
         }));
     }
     getOfCreateRootContentFolderApp(folderName) {
         return this.getOfCreateRootFolderApp(folderName).pipe(mergeMap$1(v => {
             if (v) {
-                return this.folder.getchildren(v.ID);
+                return this.folder.getchildren(v.ID).mapForVanilla();
             }
             return of(undefined);
         }));
@@ -3369,16 +3761,9 @@ class BXRestNavvyDiskOperation {
         //       if (saveData.content.root.app) {
         //         return of(saveData.content.root.app)
         //       }
-        return this.storage.getforapp().pipe(mergeMap$1(v => {
+        return this.storage.getforapp().result().pipe(mergeMap$1(v => {
             if (v && v.ID) {
-                return this.storage.getchildren({ id: v.ID });
-                //   .pipe(
-                //   tap(v => {
-                //     if (v) {
-                //       this.store.dispatch(saveContentRootAppInfo({value: v}))
-                //     }
-                //   })
-                // )
+                return this.storage.getchildren({ id: v.ID }).result();
             }
             return of(undefined);
         }));
@@ -3396,22 +3781,22 @@ class BXRestNavvyDiskOperation {
                 if (v.folder.length) {
                     let find = v.folder.find(i => i.NAME === folderName);
                     if (find) {
-                        return of(find);
+                        return of({ result: find });
                     }
                 }
             }
-            return this.storage.getforapp().pipe(mergeMap$1(v => {
+            return this.storage.getforapp().result().pipe(mergeMap$1(v => {
                 if (v && v.ID) {
-                    return this.storage.addfolder({ id: v.ID, data: { NAME: folderName } });
+                    return this.storage.addfolder({ id: v.ID, data: { NAME: folderName } }).result();
                 }
-                return of(undefined);
+                return throwError(() => new Error('Отсутствуют права добавление записи затраченного времени'));
             }));
         }));
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskOperation, deps: [{ token: BXRestNavvyDiskFolder }, { token: BXRestNavvyDiskFile }, { token: BXRestNavvyDiskStorage }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskOperation, providedIn: 'root' }); }
 }
-BXRestNavvyDiskOperation.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskOperation, deps: [{ token: BXRestNavvyDiskFolder }, { token: BXRestNavvyDiskFile }, { token: BXRestNavvyDiskStorage }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyDiskOperation.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskOperation, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskOperation, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskOperation, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3432,10 +3817,10 @@ class BXRestMapDiskAttachedObject extends BXRestMapDiskBase {
             SIZE: this.toNum(v.SIZE)
         });
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskAttachedObject, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskAttachedObject, providedIn: 'root' }); }
 }
-BXRestMapDiskAttachedObject.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskAttachedObject, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BXRestMapDiskAttachedObject.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskAttachedObject, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapDiskAttachedObject, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapDiskAttachedObject, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3443,23 +3828,23 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }] });
 
 class BXRestNavvyDiskAttachedObject {
-    constructor(BXRestDiskAttachedObject, mapAttachedObject, Navvy) {
+    constructor(BXRestDiskAttachedObject, mapAttachedObject) {
         this.BXRestDiskAttachedObject = BXRestDiskAttachedObject;
         this.mapAttachedObject = mapAttachedObject;
-        this.Navvy = Navvy;
+        this.Navvy = new Navvy(this.BXRestDiskAttachedObject, this.mapAttachedObject);
     }
     get(id) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestDiskAttachedObject.get(id), 'Не удалось получить прикреплённый файл').pipe(map(v => this.mapAttachedObject.get(v)));
+        return this.Navvy.simpleWithArg(this.BXRestDiskAttachedObject.get, id, 'Не удалось получить прикрепленные файлы', this.mapAttachedObject.get);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskAttachedObject, deps: [{ token: BXRestDiskAttachedObject }, { token: BXRestMapDiskAttachedObject }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskAttachedObject, providedIn: 'root' }); }
 }
-BXRestNavvyDiskAttachedObject.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskAttachedObject, deps: [{ token: BXRestDiskAttachedObject }, { token: BXRestMapDiskAttachedObject }, { token: Navvy }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyDiskAttachedObject.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskAttachedObject, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDiskAttachedObject, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDiskAttachedObject, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestDiskAttachedObject }, { type: BXRestMapDiskAttachedObject }, { type: Navvy }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestDiskAttachedObject }, { type: BXRestMapDiskAttachedObject }]; } });
 
 class BXRestNavvyDisk {
     constructor(operation, file, folder, attachedObject) {
@@ -3468,10 +3853,10 @@ class BXRestNavvyDisk {
         this.folder = folder;
         this.attachedObject = attachedObject;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDisk, deps: [{ token: BXRestNavvyDiskOperation }, { token: BXRestNavvyDiskFile }, { token: BXRestNavvyDiskFolder }, { token: BXRestNavvyDiskAttachedObject }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDisk, providedIn: 'root' }); }
 }
-BXRestNavvyDisk.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDisk, deps: [{ token: BXRestNavvyDiskOperation }, { token: BXRestNavvyDiskFile }, { token: BXRestNavvyDiskFolder }, { token: BXRestNavvyDiskAttachedObject }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyDisk.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDisk, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyDisk, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDisk, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3479,22 +3864,22 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }], ctorParameters: function () { return [{ type: BXRestNavvyDiskOperation }, { type: BXRestNavvyDiskFile }, { type: BXRestNavvyDiskFolder }, { type: BXRestNavvyDiskAttachedObject }]; } });
 
 class BXRestNavvyBizprocWorkflow {
-    constructor(BXRestBizprocWorkflow, Navvy) {
+    constructor(BXRestBizprocWorkflow) {
         this.BXRestBizprocWorkflow = BXRestBizprocWorkflow;
-        this.Navvy = Navvy;
+        this.Navvy = new Navvy(this.BXRestBizprocWorkflow, undefined);
     }
     start(param) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestBizprocWorkflow.start(param), 'Не удалось запустить бизнес процесс');
+        return this.Navvy.simpleWithArg(this.BXRestBizprocWorkflow.start, param, 'Не удалось запустить бизнес процесс');
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyBizprocWorkflow, deps: [{ token: BXRestBizprocWorkflow }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyBizprocWorkflow, providedIn: 'root' }); }
 }
-BXRestNavvyBizprocWorkflow.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyBizprocWorkflow, deps: [{ token: BXRestBizprocWorkflow }, { token: Navvy }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyBizprocWorkflow.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyBizprocWorkflow, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyBizprocWorkflow, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyBizprocWorkflow, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestBizprocWorkflow }, { type: Navvy }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestBizprocWorkflow }]; } });
 
 class BXRestNavvyBizproc {
     constructor(workflow, BXRestNavvyLists) {
@@ -3503,6 +3888,7 @@ class BXRestNavvyBizproc {
     }
     /**
      * Метод по запуску бизнес процессов из ленты
+     * TODO: продумать работу с такими методами-исключениями
      *
      * @param id
      * @param parametersElement
@@ -3521,7 +3907,7 @@ class BXRestNavvyBizproc {
                 NAME: parametersElement['NAME'],
                 ...parametersElement
             }
-        }).pipe(mergeMap(v => {
+        }).result().pipe(mergeMap(v => {
             if (v) {
                 if (Object.keys(parametersBizproc).length) {
                     let reques = [];
@@ -3530,7 +3916,7 @@ class BXRestNavvyBizproc {
                             TEMPLATE_ID: templateID,
                             DOCUMENT_ID: ['lists', 'BizprocDocument', String(v)],
                             PARAMETERS: parametersBizproc
-                        }));
+                        }).result());
                     }
                     return forkJoin(reques);
                 }
@@ -3538,13 +3924,13 @@ class BXRestNavvyBizproc {
                     return of(true);
                 }
             }
-            return of(false);
+            return throwError(() => new Error('Не удалось запустить бизнес процесс'));
         }));
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyBizproc, deps: [{ token: BXRestNavvyBizprocWorkflow }, { token: BXRestNavvyLists }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyBizproc, providedIn: 'root' }); }
 }
-BXRestNavvyBizproc.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyBizproc, deps: [{ token: BXRestNavvyBizprocWorkflow }, { token: BXRestNavvyLists }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyBizproc.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyBizproc, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyBizproc, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyBizproc, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3552,9 +3938,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }], ctorParameters: function () { return [{ type: BXRestNavvyBizprocWorkflow }, { type: BXRestNavvyLists }]; } });
 
 class BXRestNavvyLogBlogPost {
-    constructor(BXRestLogBlogPost, Navvy) {
+    constructor(BXRestLogBlogPost) {
         this.BXRestLogBlogPost = BXRestLogBlogPost;
-        this.Navvy = Navvy;
         this.url = {
             add: [$log, $blogpost, $add],
             // getusers: {
@@ -3565,22 +3950,23 @@ class BXRestNavvyLogBlogPost {
             share: [$log, $blogpost, $share],
             update: [$log, $blogpost, $update], // Изменяет сообщение Живой Ленты
         };
+        this.Navvy = new Navvy(this.BXRestLogBlogPost, undefined);
     }
     add(param) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestLogBlogPost.add(param), 'При добавлении поста');
+        return this.Navvy.simpleWithArg(this.BXRestLogBlogPost.add, param);
     }
     get(param = {}) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestLogBlogPost.get(param), 'Не удалось получить почты');
+        return this.Navvy.simpleWithArg(this.BXRestLogBlogPost.get, param);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyLogBlogPost, deps: [{ token: BXRestLogBlogPost }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyLogBlogPost, providedIn: 'root' }); }
 }
-BXRestNavvyLogBlogPost.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLogBlogPost, deps: [{ token: BXRestLogBlogPost }, { token: Navvy }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyLogBlogPost.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLogBlogPost, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLogBlogPost, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyLogBlogPost, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestLogBlogPost }, { type: Navvy }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestLogBlogPost }]; } });
 
 class BXRestNavvyLogBlogComment {
     constructor() {
@@ -3588,10 +3974,10 @@ class BXRestNavvyLogBlogComment {
             add: [$log, $blogcomment, $add], //	Добавляет комментарий к сообщению Живой ленты
         };
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyLogBlogComment, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyLogBlogComment, providedIn: 'root' }); }
 }
-BXRestNavvyLogBlogComment.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLogBlogComment, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyLogBlogComment.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLogBlogComment, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLogBlogComment, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyLogBlogComment, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3603,10 +3989,10 @@ class BXRestNavvyLog {
         this.blogPost = blogPost;
         this.blogComment = blogComment;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyLog, deps: [{ token: BXRestNavvyLogBlogPost }, { token: BXRestNavvyLogBlogComment }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyLog, providedIn: 'root' }); }
 }
-BXRestNavvyLog.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLog, deps: [{ token: BXRestNavvyLogBlogPost }, { token: BXRestNavvyLogBlogComment }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyLog.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLog, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyLog, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyLog, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3654,10 +4040,10 @@ class BXRestMapCalendarEvent extends BaseMapServices {
             }) : []
         };
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapCalendarEvent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapCalendarEvent, providedIn: 'root' }); }
 }
-BXRestMapCalendarEvent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapCalendarEvent, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BXRestMapCalendarEvent.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapCalendarEvent, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapCalendarEvent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapCalendarEvent, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3665,23 +4051,23 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }] });
 
 class BXRestRestCalendarEvent {
-    constructor(BXRestCalendarEvent, Navvy, eventMap) {
+    constructor(BXRestCalendarEvent, eventMap) {
         this.BXRestCalendarEvent = BXRestCalendarEvent;
-        this.Navvy = Navvy;
         this.eventMap = eventMap;
+        this.Navvy = new Navvy(this.eventMap, undefined);
     }
     get(param) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestCalendarEvent.get(param), 'Не удалось получить информацию о событии из календаря').pipe(map(v => this.eventMap.get(v)));
+        return this.Navvy.simpleWithArg(this.BXRestCalendarEvent.get, param, 'Не удалось получить календарь', this.eventMap.get);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestRestCalendarEvent, deps: [{ token: BXRestCalendarEvent }, { token: BXRestMapCalendarEvent }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestRestCalendarEvent, providedIn: 'root' }); }
 }
-BXRestRestCalendarEvent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestRestCalendarEvent, deps: [{ token: BXRestCalendarEvent }, { token: Navvy }, { token: BXRestMapCalendarEvent }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestRestCalendarEvent.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestRestCalendarEvent, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestRestCalendarEvent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestRestCalendarEvent, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestCalendarEvent }, { type: Navvy }, { type: BXRestMapCalendarEvent }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestCalendarEvent }, { type: BXRestMapCalendarEvent }]; } });
 
 class BXRestNavvyCalendar {
     // TODO: эту дичь расформировать потом по классам
@@ -3722,10 +4108,10 @@ class BXRestNavvyCalendar {
     constructor(event) {
         this.event = event;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyCalendar, deps: [{ token: BXRestRestCalendarEvent }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyCalendar, providedIn: 'root' }); }
 }
-BXRestNavvyCalendar.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyCalendar, deps: [{ token: BXRestRestCalendarEvent }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvyCalendar.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyCalendar, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvyCalendar, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyCalendar, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3753,10 +4139,10 @@ class BXRestMapSonetGroup extends BaseMapServices {
             IS_EXTRANET: items.OPENED == 'Y',
         });
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapSonetGroup, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapSonetGroup, providedIn: 'root' }); }
 }
-BXRestMapSonetGroup.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapSonetGroup, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BXRestMapSonetGroup.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapSonetGroup, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMapSonetGroup, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapSonetGroup, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3764,26 +4150,26 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         }] });
 
 class BXRestNavvySonetGroup {
-    constructor(BXRestSonetGroup, mapSonetGroup, Navvy) {
+    constructor(BXRestSonetGroup, mapSonetGroup) {
         this.BXRestSonetGroup = BXRestSonetGroup;
         this.mapSonetGroup = mapSonetGroup;
-        this.Navvy = Navvy;
+        this.Navvy = new Navvy(this.BXRestSonetGroup, this.mapSonetGroup);
     }
     get(param = {
         filter: {},
         order: {}
     }) {
-        return this.Navvy.mapAndSnackBarError(this.BXRestSonetGroup.get(param), 'Не удалось список групп').pipe(map(v => this.mapSonetGroup.get(v)));
+        return this.Navvy.simpleWithArg(this.BXRestSonetGroup.get, param, 'Не удалось получить рабочую группу', this.mapSonetGroup.get);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvySonetGroup, deps: [{ token: BXRestSonetGroup }, { token: BXRestMapSonetGroup }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvySonetGroup, providedIn: 'root' }); }
 }
-BXRestNavvySonetGroup.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvySonetGroup, deps: [{ token: BXRestSonetGroup }, { token: BXRestMapSonetGroup }, { token: Navvy }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestNavvySonetGroup.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvySonetGroup, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvySonetGroup, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvySonetGroup, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestSonetGroup }, { type: BXRestMapSonetGroup }, { type: Navvy }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestSonetGroup }, { type: BXRestMapSonetGroup }]; } });
 
 class BXRest {
     constructor(user, lists, task, tasks, disk, bizproc, log, calendar, sonet_group) {
@@ -3797,10 +4183,10 @@ class BXRest {
         this.calendar = calendar;
         this.sonet_group = sonet_group;
     }
+    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.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRest, providedIn: 'root' }); }
 }
-BXRest.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", 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 });
-BXRest.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRest, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRest, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRest, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3818,10 +4204,10 @@ class BXRestNavvy {
         this.calendar = calendar;
         this.sonet_group = sonet_group;
     }
+    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.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvy, providedIn: 'root' }); }
 }
-BXRestNavvy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", 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 });
-BXRestNavvy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvy, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestNavvy, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvy, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3831,10 +4217,10 @@ class BXRestMap {
     constructor(lists) {
         this.lists = lists;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMap, deps: [{ token: BXRestMapLists }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMap, providedIn: 'root' }); }
 }
-BXRestMap.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMap, deps: [{ token: BXRestMapLists }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestMap.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMap, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestMap, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMap, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3849,5 +4235,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { BXRest, BXRestMap, BXRestMapResult, BXRestNavvy, BX_REST_SETTINGS };
+export { BXRest, BXRestMap, BXRestMapResult, BXRestNavvy, BX_REST_SETTINGS, Navvy };
 //# sourceMappingURL=bx-rest.mjs.map