@snabcentr/client-ui 0.30.1 → 0.30.2

package/fesm2020/snabcentr-client-ui.mjs

@@ -3774,6 +3774,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImpor
                 }]
         }] });
 
+/* eslint-disable @typescript-eslint/unbound-method,lodash/prefer-lodash-method */
 /**
  * Компонент добавления адреса доставки.
  *
@@ -3810,17 +3811,21 @@ class ScAddDeliveryAddressDialogComponent {
          */
         this.request$ = this.onSubmit$.pipe(tap(() => {
             tuiMarkControlAsTouchedAndValidate(this.form);
-        }), filter(() => this.form.valid), map(() => this.form.value), switchMap((value) => this.deliveryAddressService.createDeliveryAddress$(this.convertersService.removeNullRecursive(value)).pipe(catchError((error) => {
-            const errorResponse = error.error;
-            for (const key in errorResponse.errors) {
-                this.form.get(key)?.setErrors({ serverResponse: errorResponse.errors[key] });
-            }
-            if (!errorResponse.errors && errorResponse.message) {
-                this.form.setErrors({ serverResponse: [errorResponse.message] });
-            }
-            return of();
-        }), tap(() => {
+        }), filter(() => this.form.valid), map(() => this.form.value), switchMap((value) => this.deliveryAddressService.createDeliveryAddress$(this.convertersService.removeNullRecursive(value)).pipe(tap(() => {
             this.context.completeWith();
+        }), catchError((error) => {
+            if (error instanceof HttpErrorResponse) {
+                const { errors, message } = error.error;
+                if (errors) {
+                    Object.keys(errors).forEach((key) => {
+                        this.form.get(key)?.setErrors({ serverResponse: errors[key] });
+                    });
+                }
+                else if (message) {
+                    this.form.setErrors({ serverResponse: [message] });
+                }
+            }
+            return of({});
         }), startWith(null))), share());
         /**
          * {@link Observable} изменения состояния загрузки данных.