@abp/ng.theme.shared 7.2.1 → 7.2.3

package/fesm2015/abp-ng.theme.shared.mjs

@@ -1254,14 +1254,13 @@ class FormInputComponent extends AbstractNgModelComponent {
         this.label = '';
         this.labelClass = 'form-label';
         this.inputPlaceholder = '';
-        this.inputType = 'text';
         this.inputClass = 'form-control';
         this.formBlur = new EventEmitter();
         this.formFocus = new EventEmitter();
     }
 }
 FormInputComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: FormInputComponent, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.Component });
-FormInputComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.0.4", type: FormInputComponent, selector: "abp-form-input", inputs: { inputId: "inputId", inputReadonly: "inputReadonly", label: "label", labelClass: "labelClass", inputPlaceholder: "inputPlaceholder", inputType: "inputType", inputStyle: "inputStyle", inputClass: "inputClass" }, outputs: { formBlur: "formBlur", formFocus: "formFocus" }, providers: [
+FormInputComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.0.4", type: FormInputComponent, selector: "abp-form-input", inputs: { inputId: "inputId", inputReadonly: "inputReadonly", label: "label", labelClass: "labelClass", inputPlaceholder: "inputPlaceholder", inputStyle: "inputStyle", inputClass: "inputClass" }, outputs: { formBlur: "formBlur", formFocus: "formFocus" }, providers: [
         {
             provide: NG_VALUE_ACCESSOR,
             useExisting: forwardRef(() => FormInputComponent),
@@ -1325,8 +1324,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.4", ngImpor
                 type: Input
             }], inputPlaceholder: [{
                 type: Input
-            }], inputType: [{
-                type: Input
             }], inputStyle: [{
                 type: Input
             }], inputClass: [{
@@ -1819,8 +1816,10 @@ class ErrorHandler {
         this.componentRef = null;
         this.httpErrorHandler = this.injector.get(HTTP_ERROR_HANDLER, (_, err) => throwError(err));
         this.executeErrorHandler = (error) => {
-            const returnValue = this.httpErrorHandler(this.injector, error);
-            return (returnValue instanceof Observable ? returnValue : of(null)).pipe(catchError(err => {
+            const errHandler = this.httpErrorHandler(this.injector, error);
+            const isObservable = errHandler instanceof Observable;
+            const response = isObservable ? errHandler : of(null);
+            return response.pipe(catchError(err => {
                 this.handleError(err);
                 return of(null);
             }));
@@ -1875,6 +1874,10 @@ class ErrorHandler {
             key: DEFAULT_ERROR_LOCALIZATIONS.defaultError.title,
             defaultValue: DEFAULT_ERROR_MESSAGES.defaultError.title,
         };
+        if (err instanceof HttpErrorResponse && err.headers.get('Abp-Tenant-Resolve-Error')) {
+            this.authService.logout().subscribe();
+            return;
+        }
         if (err instanceof HttpErrorResponse && err.headers.get('_AbpErrorFormat')) {
             const confirmation$ = this.showErrorWithRequestBody(body);
             if (err.status === 401) {
@@ -1883,9 +1886,6 @@ class ErrorHandler {
                 });
             }
         }
-        if (err instanceof HttpErrorResponse && err.headers.get('Abp-Tenant-Resolve-Error')) {
-            this.authService.logout().subscribe();
-        }
         else {
             switch (err.status) {
                 case 401:
@@ -1912,7 +1912,7 @@ class ErrorHandler {
                         status: 403,
                     });
                     break;
-                case 404: {
+                case 404:
                     this.canCreateCustomError(404)
                         ? this.show404Page()
                         : this.showError({
@@ -1923,7 +1923,6 @@ class ErrorHandler {
                             defaultValue: DEFAULT_ERROR_MESSAGES.defaultError404.title,
                         });
                     break;
-                }
                 case 500:
                     this.createErrorComponent({
                         title: {