@morozeckiy/dd-lib 0.1.7 → 0.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,7 +2,6 @@ import { HttpHeaders, HttpParams } from '@angular/common/http';
2
2
  import { Inject, Injectable } from '@angular/core';
3
3
  import { of } from 'rxjs';
4
4
  import { switchMap } from 'rxjs/operators';
5
- import { isArray } from "@angular/compiler-cli/src/ngtsc/annotations/common";
6
5
  import * as i0 from "@angular/core";
7
6
  import * as i1 from "@angular/common/http";
8
7
  export class FetcherService {
@@ -18,7 +17,7 @@ export class FetcherService {
18
17
  let params = new HttpParams();
19
18
  for (const key of Object.keys(options)) {
20
19
  if (options[key] != null) {
21
- if (options[key].length && isArray(options[key])) {
20
+ if (options[key]?.length) {
22
21
  options[key].forEach((f) => {
23
22
  params = params.append(key, f);
24
23
  });
@@ -89,4 +88,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.2.2", ngImpor
89
88
  type: Inject,
90
89
  args: ['apiUrl']
91
90
  }] }] });
92
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fetcher.service.js","sourceRoot":"","sources":["../../../../../../projects/dd-lib/src/lib/core/services/fetcher.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';\r\nimport {Inject, Injectable} from '@angular/core';\r\n\r\nimport {Observable, of} from 'rxjs';\r\nimport {switchMap} from 'rxjs/operators';\r\nimport {isArray} from \"@angular/compiler-cli/src/ngtsc/annotations/common\";\r\n\r\nexport interface HttpIResponse<T> {\r\n  error: string;\r\n  errorCode: string;\r\n  message: null | string;\r\n  redirect: null | string;\r\n  systemMessage: null | string;\r\n  result: 'OK' | 'ERROR' | 'FAIL';\r\n  value: T;\r\n}\r\n\r\ntype PayloadMethod = 'post' | 'put' | 'get' | 'delete';\r\n\r\n@Injectable({providedIn: 'root'}) /** сервис обработки запросов к api */\r\nexport class FetcherService {\r\n  // private apiUrl = 'api';\r\n  private readonly payloadMethods: string[] = ['post', 'put'];\r\n\r\n  constructor(private http: HttpClient, @Inject('apiUrl') private apiUrl: string = 'api') {\r\n  }\r\n\r\n  public get<R>(urlParts: string, options: any = {}, urlId?: string | number): Observable<R> {\r\n    urlParts = urlId ? urlParts.replace(/{[^}]+}/g, urlId.toString()) : urlParts;\r\n    const url: string = urlParts ? [this.apiUrl].concat(urlParts).join('/') : this.apiUrl;\r\n    let params = new HttpParams();\r\n    for (const key of Object.keys(options)) {\r\n      if (options[key] != null) {\r\n        if (options[key].length && isArray(options[key])) {\r\n          options[key].forEach((f: string | number | boolean) => {\r\n            params = params.append(key, f);\r\n          });\r\n        } else {\r\n          params = params.append(key, options[key]);\r\n        }\r\n      }\r\n    }\r\n    return this.request('get', url, {params});\r\n  }\r\n\r\n  public post<R>(urlParts: string[] | string, data?: any, options: any = {}): Observable<R> {\r\n    const url: string = [this.apiUrl].concat(urlParts).join('/');\r\n    if (options?.params) {\r\n      let params = new HttpParams();\r\n      for (const key of Object.keys(options.params)) {\r\n        if (options.params[key] != null) {\r\n          params = params.append(key, options.params[key]);\r\n        }\r\n      }\r\n      options.params = params;\r\n    }\r\n    return this.request('post', url, options, data);\r\n  }\r\n\r\n  public put<R>(urlParts: string[] | string, options: any = {}, data: any): Observable<any> {\r\n    const url: string = [this.apiUrl].concat(urlParts).join('/');\r\n    return this.request('put', url, options, data);\r\n  }\r\n\r\n  public delete<R>(urlParts: string[] | string, options: any = {}): Observable<R> {\r\n    const url: string = [this.apiUrl].concat(urlParts).join('/');\r\n    return this.request('delete', url, options);\r\n  }\r\n\r\n  /** перегоняем объкты в форм дату*/\r\n  public createFormData(form: { [x: string]: any }) {\r\n    const formData: FormData = new FormData();\r\n    Object.keys(form).forEach((item: string) => {\r\n      formData.append(item, form[item]);\r\n    });\r\n    return formData;\r\n  }\r\n\r\n  private request<R>(method: PayloadMethod, url: string, options: any, data?: any): Observable<R> {\r\n    if (options.headers) {\r\n      options.headers = new HttpHeaders(options.headers);\r\n    }\r\n    let request: Observable<any>;\r\n    options.withCredentials = true;\r\n\r\n    if (this.payloadMethods.includes(method)) {\r\n      request = this.http[method as 'post' | 'put'](url, data, options);\r\n    } else {\r\n      request = (this.http as any)[method](url, options);\r\n    }\r\n\r\n    return request.pipe(\r\n      switchMap((response: any) => {\r\n        if (response && response.error) {\r\n          console.error(`API error with status: ${response.status}`);\r\n          console.error(response.error);\r\n        }\r\n        return of(response);\r\n      }),\r\n      // catchError((error: any) => {\r\n      // console.timeEnd('Время выполнения - ' + url);\r\n      // if (error.status !== 403) {\r\n      // console.log(error);\r\n      // }\r\n      // return of(error);\r\n      // }),\r\n    );\r\n  }\r\n}\r\n"]}
91
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fetcher.service.js","sourceRoot":"","sources":["../../../../../../projects/dd-lib/src/lib/core/services/fetcher.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';\r\nimport {Inject, Injectable} from '@angular/core';\r\n\r\nimport {Observable, of} from 'rxjs';\r\nimport {switchMap} from 'rxjs/operators';\r\n\r\nexport interface HttpIResponse<T> {\r\n  error: string;\r\n  errorCode: string;\r\n  message: null | string;\r\n  redirect: null | string;\r\n  systemMessage: null | string;\r\n  result: 'OK' | 'ERROR' | 'FAIL';\r\n  value: T;\r\n}\r\n\r\ntype PayloadMethod = 'post' | 'put' | 'get' | 'delete';\r\n\r\n@Injectable({providedIn: 'root'}) /** сервис обработки запросов к api */\r\nexport class FetcherService {\r\n  // private apiUrl = 'api';\r\n  private readonly payloadMethods: string[] = ['post', 'put'];\r\n\r\n  constructor(private http: HttpClient, @Inject('apiUrl') private apiUrl: string = 'api') {\r\n  }\r\n\r\n  public get<R>(urlParts: string, options: any = {}, urlId?: string | number): Observable<R> {\r\n    urlParts = urlId ? urlParts.replace(/{[^}]+}/g, urlId.toString()) : urlParts;\r\n    const url: string = urlParts ? [this.apiUrl].concat(urlParts).join('/') : this.apiUrl;\r\n    let params = new HttpParams();\r\n    for (const key of Object.keys(options)) {\r\n      if (options[key] != null) {\r\n        if (options[key]?.length) {\r\n          options[key].forEach((f: string | number | boolean) => {\r\n            params = params.append(key, f);\r\n          });\r\n        } else {\r\n          params = params.append(key, options[key]);\r\n        }\r\n      }\r\n    }\r\n    return this.request('get', url, {params});\r\n  }\r\n\r\n  public post<R>(urlParts: string[] | string, data?: any, options: any = {}): Observable<R> {\r\n    const url: string = [this.apiUrl].concat(urlParts).join('/');\r\n    if (options?.params) {\r\n      let params = new HttpParams();\r\n      for (const key of Object.keys(options.params)) {\r\n        if (options.params[key] != null) {\r\n          params = params.append(key, options.params[key]);\r\n        }\r\n      }\r\n      options.params = params;\r\n    }\r\n    return this.request('post', url, options, data);\r\n  }\r\n\r\n  public put<R>(urlParts: string[] | string, options: any = {}, data: any): Observable<any> {\r\n    const url: string = [this.apiUrl].concat(urlParts).join('/');\r\n    return this.request('put', url, options, data);\r\n  }\r\n\r\n  public delete<R>(urlParts: string[] | string, options: any = {}): Observable<R> {\r\n    const url: string = [this.apiUrl].concat(urlParts).join('/');\r\n    return this.request('delete', url, options);\r\n  }\r\n\r\n  /** перегоняем объкты в форм дату*/\r\n  public createFormData(form: { [x: string]: any }) {\r\n    const formData: FormData = new FormData();\r\n    Object.keys(form).forEach((item: string) => {\r\n      formData.append(item, form[item]);\r\n    });\r\n    return formData;\r\n  }\r\n\r\n  private request<R>(method: PayloadMethod, url: string, options: any, data?: any): Observable<R> {\r\n    if (options.headers) {\r\n      options.headers = new HttpHeaders(options.headers);\r\n    }\r\n    let request: Observable<any>;\r\n    options.withCredentials = true;\r\n\r\n    if (this.payloadMethods.includes(method)) {\r\n      request = this.http[method as 'post' | 'put'](url, data, options);\r\n    } else {\r\n      request = (this.http as any)[method](url, options);\r\n    }\r\n\r\n    return request.pipe(\r\n      switchMap((response: any) => {\r\n        if (response && response.error) {\r\n          console.error(`API error with status: ${response.status}`);\r\n          console.error(response.error);\r\n        }\r\n        return of(response);\r\n      }),\r\n      // catchError((error: any) => {\r\n      // console.timeEnd('Время выполнения - ' + url);\r\n      // if (error.status !== 403) {\r\n      // console.log(error);\r\n      // }\r\n      // return of(error);\r\n      // }),\r\n    );\r\n  }\r\n}\r\n"]}
@@ -5,15 +5,16 @@ import * as i0 from "@angular/core";
5
5
  export class ValidatorsService {
6
6
  constructor() { }
7
7
  /** валидатор совпадения пароллей. При использовании указывать поля pswd & confPswd*/
8
- static passEqual(el) {
9
- if (!el.get('pswd') || !el.get('oldPswd')) {
10
- return null;
11
- }
12
- if (!(el.dirty || el.touched) || el.get('pswd')?.value === el.get('confPswd')?.value) {
13
- return null;
14
- }
15
- return {
16
- passEqual: 'Пароли не совпадают',
8
+ static passEqual(passwordKey, passwordConfirmationKey) {
9
+ return (group) => {
10
+ const passwordInput = group.controls[passwordKey];
11
+ const passwordConfirmationInput = group.controls[passwordConfirmationKey];
12
+ if (passwordInput.value !== passwordConfirmationInput.value) {
13
+ return passwordConfirmationInput.setErrors({ notEquivalent: true });
14
+ }
15
+ else {
16
+ return passwordConfirmationInput.setErrors(null);
17
+ }
17
18
  };
18
19
  }
19
20
  static passNotEqual(el) {
@@ -70,4 +71,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.2.2", ngImpor
70
71
  type: Injectable,
71
72
  args: [{ providedIn: 'root' }]
72
73
  }], ctorParameters: () => [] });
73
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvZGQtbGliL3NyYy9saWIvY29yZS9zZXJ2aWNlcy92YWxpZGF0b3JzLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQXFDLFVBQVUsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQy9FLE9BQU8sRUFBYyxFQUFFLEVBQUUsTUFBTSxNQUFNLENBQUM7O0FBR3RDLE1BQU0sT0FBTyxpQkFBaUI7SUFDNUIsZ0JBQWUsQ0FBQztJQUVoQixxRkFBcUY7SUFDOUUsTUFBTSxDQUFDLFNBQVMsQ0FBQyxFQUFtQjtRQUN6QyxJQUFJLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQztZQUMxQyxPQUFPLElBQUksQ0FBQztRQUNkLENBQUM7UUFDRCxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLEtBQUssS0FBSyxFQUFFLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDO1lBQ3JGLE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQztRQUNELE9BQU87WUFDTCxTQUFTLEVBQUUscUJBQXFCO1NBQ2pDLENBQUM7SUFDSixDQUFDO0lBRU0sTUFBTSxDQUFDLFlBQVksQ0FBQyxFQUFtQjtRQUM1QyxJQUFJLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQztZQUMxQyxPQUFPLElBQUksQ0FBQztRQUNkLENBQUM7UUFDRCxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLEtBQUssS0FBSyxFQUFFLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDO1lBQ3BGLE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQztRQUNELE9BQU87WUFDTCxZQUFZLEVBQUUsMkNBQTJDO1NBQzFELENBQUM7SUFDSixDQUFDO0lBRU0sTUFBTSxDQUFDLFVBQVU7UUFDdEIsT0FBTztZQUNMLFNBQVMsRUFBRSxpQkFBaUI7U0FDN0IsQ0FBQztJQUNKLENBQUM7SUFFTSxNQUFNLENBQUMsZ0JBQWdCO1FBQzVCLE9BQU87WUFDTCxVQUFVLEVBQUUsNEJBQTRCO1NBQ3pDLENBQUM7SUFDSixDQUFDO0lBRU0sTUFBTSxDQUFDLFVBQVU7UUFDdEIsT0FBTztZQUNMLE9BQU8sRUFBRSxtREFBbUQ7U0FDN0QsQ0FBQztJQUNKLENBQUM7SUFFRCxxQkFBcUI7SUFDZCxNQUFNLENBQUMsWUFBWTtRQUN4QixPQUFPLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsT0FBTyxDQUFDLDJCQUEyQixDQUFDLEVBQUUsVUFBVSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzFHLENBQUM7SUFFRCxxQkFBcUI7SUFDZCxNQUFNLENBQUMsWUFBWSxDQUFDLEVBQW9CO1FBQzdDLE1BQU0sT0FBTyxHQUNYLDBGQUEwRixDQUFDO1FBQzdGLElBQUksQ0FBQyxFQUFFLEVBQUUsS0FBSyxFQUFFLENBQUM7WUFDZixPQUFPLEVBQUUsQ0FBQztnQkFDUixRQUFRLEVBQUUscUNBQXFDO2FBQ2hELENBQUMsQ0FBQztRQUNMLENBQUM7YUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxDQUFDLEtBQUssS0FBSyxZQUFZLElBQUksRUFBRSxDQUFDLEtBQUssS0FBSyxPQUFPLEVBQUUsQ0FBQztZQUN4RixPQUFPLEVBQUUsQ0FBQztnQkFDUixLQUFLLEVBQUUsNEJBQTRCO2FBQ3BDLENBQUMsQ0FBQztRQUNMLENBQUM7YUFBTSxDQUFDO1lBQ04sT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbEIsQ0FBQztJQUNILENBQUM7OEdBbEVVLGlCQUFpQjtrSEFBakIsaUJBQWlCLGNBREosTUFBTTs7MkZBQ25CLGlCQUFpQjtrQkFEN0IsVUFBVTttQkFBQyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7IEFic3RyYWN0Q29udHJvbCwgVmFsaWRhdGlvbkVycm9ycywgVmFsaWRhdG9ycyB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgb2YgfSBmcm9tICdyeGpzJztcclxuXHJcbkBJbmplY3RhYmxlKHsgcHJvdmlkZWRJbjogJ3Jvb3QnIH0pXHJcbmV4cG9ydCBjbGFzcyBWYWxpZGF0b3JzU2VydmljZSB7XHJcbiAgY29uc3RydWN0b3IoKSB7fVxyXG5cclxuICAvKiog0LLQsNC70LjQtNCw0YLQvtGAINGB0L7QstC/0LDQtNC10L3QuNGPINC/0LDRgNC+0LvQu9C10LkuINCf0YDQuCDQuNGB0L/QvtC70YzQt9C+0LLQsNC90LjQuCDRg9C60LDQt9GL0LLQsNGC0Ywg0L/QvtC70Y8gcHN3ZCAmIGNvbmZQc3dkKi9cclxuICBwdWJsaWMgc3RhdGljIHBhc3NFcXVhbChlbDogQWJzdHJhY3RDb250cm9sKTogVmFsaWRhdGlvbkVycm9ycyB8IG51bGwge1xyXG4gICAgaWYgKCFlbC5nZXQoJ3Bzd2QnKSB8fCAhZWwuZ2V0KCdvbGRQc3dkJykpIHtcclxuICAgICAgcmV0dXJuIG51bGw7XHJcbiAgICB9XHJcbiAgICBpZiAoIShlbC5kaXJ0eSB8fCBlbC50b3VjaGVkKSB8fCBlbC5nZXQoJ3Bzd2QnKT8udmFsdWUgPT09IGVsLmdldCgnY29uZlBzd2QnKT8udmFsdWUpIHtcclxuICAgICAgcmV0dXJuIG51bGw7XHJcbiAgICB9XHJcbiAgICByZXR1cm4ge1xyXG4gICAgICBwYXNzRXF1YWw6ICfQn9Cw0YDQvtC70Lgg0L3QtSDRgdC+0LLQv9Cw0LTQsNGO0YInLFxyXG4gICAgfTtcclxuICB9XHJcblxyXG4gIHB1YmxpYyBzdGF0aWMgcGFzc05vdEVxdWFsKGVsOiBBYnN0cmFjdENvbnRyb2wpOiBWYWxpZGF0aW9uRXJyb3JzIHwgbnVsbCB7XHJcbiAgICBpZiAoIWVsLmdldCgncHN3ZCcpIHx8ICFlbC5nZXQoJ29sZFBzd2QnKSkge1xyXG4gICAgICByZXR1cm4gbnVsbDtcclxuICAgIH1cclxuICAgIGlmICghKGVsLmRpcnR5IHx8IGVsLnRvdWNoZWQpIHx8IGVsLmdldCgncHN3ZCcpPy52YWx1ZSAhPT0gZWwuZ2V0KCdvbGRQc3dkJyk/LnZhbHVlKSB7XHJcbiAgICAgIHJldHVybiBudWxsO1xyXG4gICAgfVxyXG4gICAgcmV0dXJuIHtcclxuICAgICAgcGFzc05vdEVxdWFsOiAn0KHRgtCw0YDRi9C5INC4INC90L7QstGL0Lkg0L/QsNGA0L7Qu9C4INC90LUg0LTQvtC70LbQvdGLINGB0L7QstC/0LDQtNCw0YLRjCcsXHJcbiAgICB9O1xyXG4gIH1cclxuXHJcbiAgcHVibGljIHN0YXRpYyB3cm9uZ0xvZ2luKCk6IFZhbGlkYXRpb25FcnJvcnMge1xyXG4gICAgcmV0dXJuIHtcclxuICAgICAgd3JvbmdNYWlsOiAn0J3QtdCy0LXRgNC90YvQuSDQu9C+0LPQuNC9IScsXHJcbiAgICB9O1xyXG4gIH1cclxuXHJcbiAgcHVibGljIHN0YXRpYyB3cm9uZ0xvZ2luT3JQc3dkKCk6IFZhbGlkYXRpb25FcnJvcnMge1xyXG4gICAgcmV0dXJuIHtcclxuICAgICAgd3JvbmdMb2dpbjogJ9Cd0LXQstC10YDQvdGL0Lkg0LvQvtCz0LjQvSDQuNC70Lgg0L/QsNGA0L7Qu9GMIScsXHJcbiAgICB9O1xyXG4gIH1cclxuXHJcbiAgcHVibGljIHN0YXRpYyBleGlzdExvZ2luKCk6IFZhbGlkYXRpb25FcnJvcnMge1xyXG4gICAgcmV0dXJuIHtcclxuICAgICAgbWFpbEVycjogJ9Cf0L7Qu9GM0LfQvtCy0LDRgtC10LvRjCDRgSDRgtCw0LrQuNC8INCw0LTRgNC10YHQvtC8INGD0LbQtSDQt9Cw0YDQtdCz0LjRgdGC0YDQuNGA0L7QstCw0L0uJyxcclxuICAgIH07XHJcbiAgfVxyXG5cclxuICAvKiog0LLQsNC70LjQtNCw0YLQvtGAINC40LzQtdC90LgqL1xyXG4gIHB1YmxpYyBzdGF0aWMgZ2V0TmFtZVZhbGlkKCkge1xyXG4gICAgcmV0dXJuIFtWYWxpZGF0b3JzLnJlcXVpcmVkLCBWYWxpZGF0b3JzLnBhdHRlcm4oL15bQS1a0JAt0K9hLXrQsC3Rj9CB0ZEwLTktIC5dKyQvKSwgVmFsaWRhdG9ycy5tYXhMZW5ndGgoMzUpXTtcclxuICB9XHJcblxyXG4gIC8qKiDQstCw0LvQuNC00LDRgtC+0YAgZW1haWwqL1xyXG4gIHB1YmxpYyBzdGF0aWMgZ2V0TWFpbFZhbGlkKGVsPzogQWJzdHJhY3RDb250cm9sKTogT2JzZXJ2YWJsZTxWYWxpZGF0aW9uRXJyb3JzIHwgbnVsbD4ge1xyXG4gICAgY29uc3QgcGF0dGVybiA9XHJcbiAgICAgIC9eKFtBLVphLXowLTkrXy1dK1xcLikqW0EtWmEtejAtOStfLV0rQFtBLVphLXowLTkrXy1dKyhcXC5bQS1aYS16MC05K18tXSspKlxcLltBLVphLXpdezIsNn0kLztcclxuICAgIGlmICghZWw/LnZhbHVlKSB7XHJcbiAgICAgIHJldHVybiBvZih7XHJcbiAgICAgICAgcmVxdWlyZWQ6ICfQrdGC0L4g0L/QvtC70LUg0L7QsdGP0LfQsNGC0LXQu9GM0L3QviDQtNC70Y8g0LfQsNC/0L7Qu9C90LXQvdC40Y8nLFxyXG4gICAgICB9KTtcclxuICAgIH0gZWxzZSBpZiAoIXBhdHRlcm4udGVzdChlbC52YWx1ZSkgJiYgZWwudmFsdWUgIT09ICd0ZXN0X2FkbWluJyAmJiBlbC52YWx1ZSAhPT0gJ2FkbWluJykge1xyXG4gICAgICByZXR1cm4gb2Yoe1xyXG4gICAgICAgIGVtYWlsOiAn0J3QtdC60L7RgNGA0LXQutGC0L3QviDQstCy0LXQtNC10L3RiyDQtNCw0L3QvdGL0LUnLFxyXG4gICAgICB9KTtcclxuICAgIH0gZWxzZSB7XHJcbiAgICAgIHJldHVybiBvZihudWxsKTtcclxuICAgIH1cclxuICB9XHJcbn1cclxuIl19
74
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvZGQtbGliL3NyYy9saWIvY29yZS9zZXJ2aWNlcy92YWxpZGF0b3JzLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQStDLFVBQVUsRUFBQyxNQUFNLGdCQUFnQixDQUFDO0FBQ3hGLE9BQU8sRUFBYyxFQUFFLEVBQUUsTUFBTSxNQUFNLENBQUM7O0FBR3RDLE1BQU0sT0FBTyxpQkFBaUI7SUFDNUIsZ0JBQWUsQ0FBQztJQUVoQixxRkFBcUY7SUFDOUUsTUFBTSxDQUFDLFNBQVMsQ0FBQyxXQUFtQixFQUFFLHVCQUErQjtRQUMxRSxPQUFPLENBQUMsS0FBZ0IsRUFBRSxFQUFFO1lBQzFCLE1BQU0sYUFBYSxHQUFHLEtBQUssQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDbEQsTUFBTSx5QkFBeUIsR0FBRyxLQUFLLENBQUMsUUFBUSxDQUFDLHVCQUF1QixDQUFDLENBQUM7WUFDMUUsSUFBSSxhQUFhLENBQUMsS0FBSyxLQUFLLHlCQUF5QixDQUFDLEtBQUssRUFBRSxDQUFDO2dCQUM1RCxPQUFPLHlCQUF5QixDQUFDLFNBQVMsQ0FBQyxFQUFFLGFBQWEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQ3RFLENBQUM7aUJBQU0sQ0FBQztnQkFDTixPQUFPLHlCQUF5QixDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNuRCxDQUFDO1FBQ0gsQ0FBQyxDQUFDO0lBQ0osQ0FBQztJQUVNLE1BQU0sQ0FBQyxZQUFZLENBQUMsRUFBbUI7UUFDNUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUM7WUFDMUMsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDO1FBQ0QsSUFBSSxDQUFDLENBQUMsRUFBRSxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxLQUFLLEtBQUssRUFBRSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQztZQUNwRixPQUFPLElBQUksQ0FBQztRQUNkLENBQUM7UUFDRCxPQUFPO1lBQ0wsWUFBWSxFQUFFLDJDQUEyQztTQUMxRCxDQUFDO0lBQ0osQ0FBQztJQUVNLE1BQU0sQ0FBQyxVQUFVO1FBQ3RCLE9BQU87WUFDTCxTQUFTLEVBQUUsaUJBQWlCO1NBQzdCLENBQUM7SUFDSixDQUFDO0lBRU0sTUFBTSxDQUFDLGdCQUFnQjtRQUM1QixPQUFPO1lBQ0wsVUFBVSxFQUFFLDRCQUE0QjtTQUN6QyxDQUFDO0lBQ0osQ0FBQztJQUVNLE1BQU0sQ0FBQyxVQUFVO1FBQ3RCLE9BQU87WUFDTCxPQUFPLEVBQUUsbURBQW1EO1NBQzdELENBQUM7SUFDSixDQUFDO0lBRUQscUJBQXFCO0lBQ2QsTUFBTSxDQUFDLFlBQVk7UUFDeEIsT0FBTyxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLE9BQU8sQ0FBQywyQkFBMkIsQ0FBQyxFQUFFLFVBQVUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUMxRyxDQUFDO0lBRUQscUJBQXFCO0lBQ2QsTUFBTSxDQUFDLFlBQVksQ0FBQyxFQUFvQjtRQUM3QyxNQUFNLE9BQU8sR0FDWCwwRkFBMEYsQ0FBQztRQUM3RixJQUFJLENBQUMsRUFBRSxFQUFFLEtBQUssRUFBRSxDQUFDO1lBQ2YsT0FBTyxFQUFFLENBQUM7Z0JBQ1IsUUFBUSxFQUFFLHFDQUFxQzthQUNoRCxDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxLQUFLLEtBQUssWUFBWSxJQUFJLEVBQUUsQ0FBQyxLQUFLLEtBQUssT0FBTyxFQUFFLENBQUM7WUFDeEYsT0FBTyxFQUFFLENBQUM7Z0JBQ1IsS0FBSyxFQUFFLDRCQUE0QjthQUNwQyxDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sQ0FBQztZQUNOLE9BQU8sRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2xCLENBQUM7SUFDSCxDQUFDOzhHQWxFVSxpQkFBaUI7a0hBQWpCLGlCQUFpQixjQURKLE1BQU07OzJGQUNuQixpQkFBaUI7a0JBRDdCLFVBQVU7bUJBQUMsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQge0Fic3RyYWN0Q29udHJvbCwgRm9ybUdyb3VwLCBWYWxpZGF0aW9uRXJyb3JzLCBWYWxpZGF0b3JzfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XHJcbmltcG9ydCB7IE9ic2VydmFibGUsIG9mIH0gZnJvbSAncnhqcyc7XHJcblxyXG5ASW5qZWN0YWJsZSh7IHByb3ZpZGVkSW46ICdyb290JyB9KVxyXG5leHBvcnQgY2xhc3MgVmFsaWRhdG9yc1NlcnZpY2Uge1xyXG4gIGNvbnN0cnVjdG9yKCkge31cclxuXHJcbiAgLyoqINCy0LDQu9C40LTQsNGC0L7RgCDRgdC+0LLQv9Cw0LTQtdC90LjRjyDQv9Cw0YDQvtC70LvQtdC5LiDQn9GA0Lgg0LjRgdC/0L7Qu9GM0LfQvtCy0LDQvdC40Lgg0YPQutCw0LfRi9Cy0LDRgtGMINC/0L7Qu9GPIHBzd2QgJiBjb25mUHN3ZCovXHJcbiAgcHVibGljIHN0YXRpYyBwYXNzRXF1YWwocGFzc3dvcmRLZXk6IHN0cmluZywgcGFzc3dvcmRDb25maXJtYXRpb25LZXk6IHN0cmluZyk6IFZhbGlkYXRpb25FcnJvcnMge1xyXG4gICAgcmV0dXJuIChncm91cDogRm9ybUdyb3VwKSA9PiB7XHJcbiAgICAgIGNvbnN0IHBhc3N3b3JkSW5wdXQgPSBncm91cC5jb250cm9sc1twYXNzd29yZEtleV07XHJcbiAgICAgIGNvbnN0IHBhc3N3b3JkQ29uZmlybWF0aW9uSW5wdXQgPSBncm91cC5jb250cm9sc1twYXNzd29yZENvbmZpcm1hdGlvbktleV07XHJcbiAgICAgIGlmIChwYXNzd29yZElucHV0LnZhbHVlICE9PSBwYXNzd29yZENvbmZpcm1hdGlvbklucHV0LnZhbHVlKSB7XHJcbiAgICAgICAgcmV0dXJuIHBhc3N3b3JkQ29uZmlybWF0aW9uSW5wdXQuc2V0RXJyb3JzKHsgbm90RXF1aXZhbGVudDogdHJ1ZSB9KTtcclxuICAgICAgfSBlbHNlIHtcclxuICAgICAgICByZXR1cm4gcGFzc3dvcmRDb25maXJtYXRpb25JbnB1dC5zZXRFcnJvcnMobnVsbCk7XHJcbiAgICAgIH1cclxuICAgIH07XHJcbiAgfVxyXG5cclxuICBwdWJsaWMgc3RhdGljIHBhc3NOb3RFcXVhbChlbDogQWJzdHJhY3RDb250cm9sKTogVmFsaWRhdGlvbkVycm9ycyB8IG51bGwge1xyXG4gICAgaWYgKCFlbC5nZXQoJ3Bzd2QnKSB8fCAhZWwuZ2V0KCdvbGRQc3dkJykpIHtcclxuICAgICAgcmV0dXJuIG51bGw7XHJcbiAgICB9XHJcbiAgICBpZiAoIShlbC5kaXJ0eSB8fCBlbC50b3VjaGVkKSB8fCBlbC5nZXQoJ3Bzd2QnKT8udmFsdWUgIT09IGVsLmdldCgnb2xkUHN3ZCcpPy52YWx1ZSkge1xyXG4gICAgICByZXR1cm4gbnVsbDtcclxuICAgIH1cclxuICAgIHJldHVybiB7XHJcbiAgICAgIHBhc3NOb3RFcXVhbDogJ9Ch0YLQsNGA0YvQuSDQuCDQvdC+0LLRi9C5INC/0LDRgNC+0LvQuCDQvdC1INC00L7Qu9C20L3RiyDRgdC+0LLQv9Cw0LTQsNGC0YwnLFxyXG4gICAgfTtcclxuICB9XHJcblxyXG4gIHB1YmxpYyBzdGF0aWMgd3JvbmdMb2dpbigpOiBWYWxpZGF0aW9uRXJyb3JzIHtcclxuICAgIHJldHVybiB7XHJcbiAgICAgIHdyb25nTWFpbDogJ9Cd0LXQstC10YDQvdGL0Lkg0LvQvtCz0LjQvSEnLFxyXG4gICAgfTtcclxuICB9XHJcblxyXG4gIHB1YmxpYyBzdGF0aWMgd3JvbmdMb2dpbk9yUHN3ZCgpOiBWYWxpZGF0aW9uRXJyb3JzIHtcclxuICAgIHJldHVybiB7XHJcbiAgICAgIHdyb25nTG9naW46ICfQndC10LLQtdGA0L3Ri9C5INC70L7Qs9C40L0g0LjQu9C4INC/0LDRgNC+0LvRjCEnLFxyXG4gICAgfTtcclxuICB9XHJcblxyXG4gIHB1YmxpYyBzdGF0aWMgZXhpc3RMb2dpbigpOiBWYWxpZGF0aW9uRXJyb3JzIHtcclxuICAgIHJldHVybiB7XHJcbiAgICAgIG1haWxFcnI6ICfQn9C+0LvRjNC30L7QstCw0YLQtdC70Ywg0YEg0YLQsNC60LjQvCDQsNC00YDQtdGB0L7QvCDRg9C20LUg0LfQsNGA0LXQs9C40YHRgtGA0LjRgNC+0LLQsNC9LicsXHJcbiAgICB9O1xyXG4gIH1cclxuXHJcbiAgLyoqINCy0LDQu9C40LTQsNGC0L7RgCDQuNC80LXQvdC4Ki9cclxuICBwdWJsaWMgc3RhdGljIGdldE5hbWVWYWxpZCgpIHtcclxuICAgIHJldHVybiBbVmFsaWRhdG9ycy5yZXF1aXJlZCwgVmFsaWRhdG9ycy5wYXR0ZXJuKC9eW0EtWtCQLdCvYS160LAt0Y/QgdGRMC05LSAuXSskLyksIFZhbGlkYXRvcnMubWF4TGVuZ3RoKDM1KV07XHJcbiAgfVxyXG5cclxuICAvKiog0LLQsNC70LjQtNCw0YLQvtGAIGVtYWlsKi9cclxuICBwdWJsaWMgc3RhdGljIGdldE1haWxWYWxpZChlbD86IEFic3RyYWN0Q29udHJvbCk6IE9ic2VydmFibGU8VmFsaWRhdGlvbkVycm9ycyB8IG51bGw+IHtcclxuICAgIGNvbnN0IHBhdHRlcm4gPVxyXG4gICAgICAvXihbQS1aYS16MC05K18tXStcXC4pKltBLVphLXowLTkrXy1dK0BbQS1aYS16MC05K18tXSsoXFwuW0EtWmEtejAtOStfLV0rKSpcXC5bQS1aYS16XXsyLDZ9JC87XHJcbiAgICBpZiAoIWVsPy52YWx1ZSkge1xyXG4gICAgICByZXR1cm4gb2Yoe1xyXG4gICAgICAgIHJlcXVpcmVkOiAn0K3RgtC+INC/0L7Qu9C1INC+0LHRj9C30LDRgtC10LvRjNC90L4g0LTQu9GPINC30LDQv9C+0LvQvdC10L3QuNGPJyxcclxuICAgICAgfSk7XHJcbiAgICB9IGVsc2UgaWYgKCFwYXR0ZXJuLnRlc3QoZWwudmFsdWUpICYmIGVsLnZhbHVlICE9PSAndGVzdF9hZG1pbicgJiYgZWwudmFsdWUgIT09ICdhZG1pbicpIHtcclxuICAgICAgcmV0dXJuIG9mKHtcclxuICAgICAgICBlbWFpbDogJ9Cd0LXQutC+0YDRgNC10LrRgtC90L4g0LLQstC10LTQtdC90Ysg0LTQsNC90L3Ri9C1JyxcclxuICAgICAgfSk7XHJcbiAgICB9IGVsc2Uge1xyXG4gICAgICByZXR1cm4gb2YobnVsbCk7XHJcbiAgICB9XHJcbiAgfVxyXG59XHJcbiJdfQ==
@@ -10,7 +10,6 @@ import * as i1$2 from '@angular/common/http';
10
10
  import { HttpErrorResponse, HttpParams, HttpHeaders } from '@angular/common/http';
11
11
  import { catchError, switchMap, filter, takeUntil, map, debounceTime, mergeMap, delay } from 'rxjs/operators';
12
12
  import * as i1$1 from '@angular/router';
13
- import { isArray } from '@angular/compiler-cli/src/ngtsc/annotations/common';
14
13
  import * as i1$3 from '@angular/platform-browser';
15
14
  import { ComponentPortal, CdkPortalOutlet, PortalInjector, TemplatePortal } from '@angular/cdk/portal';
16
15
  import * as i1$4 from '@angular/cdk/overlay';
@@ -515,15 +514,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.2.2", ngImpor
515
514
  class ValidatorsService {
516
515
  constructor() { }
517
516
  /** валидатор совпадения пароллей. При использовании указывать поля pswd & confPswd*/
518
- static passEqual(el) {
519
- if (!el.get('pswd') || !el.get('oldPswd')) {
520
- return null;
521
- }
522
- if (!(el.dirty || el.touched) || el.get('pswd')?.value === el.get('confPswd')?.value) {
523
- return null;
524
- }
525
- return {
526
- passEqual: 'Пароли не совпадают',
517
+ static passEqual(passwordKey, passwordConfirmationKey) {
518
+ return (group) => {
519
+ const passwordInput = group.controls[passwordKey];
520
+ const passwordConfirmationInput = group.controls[passwordConfirmationKey];
521
+ if (passwordInput.value !== passwordConfirmationInput.value) {
522
+ return passwordConfirmationInput.setErrors({ notEquivalent: true });
523
+ }
524
+ else {
525
+ return passwordConfirmationInput.setErrors(null);
526
+ }
527
527
  };
528
528
  }
529
529
  static passNotEqual(el) {
@@ -594,7 +594,7 @@ class FetcherService {
594
594
  let params = new HttpParams();
595
595
  for (const key of Object.keys(options)) {
596
596
  if (options[key] != null) {
597
- if (options[key].length && isArray(options[key])) {
597
+ if (options[key]?.length) {
598
598
  options[key].forEach((f) => {
599
599
  params = params.append(key, f);
600
600
  });