Skip to content

Commit 9d7bcc4

Browse files
committed
fix phone number pattern error
1 parent c533f98 commit 9d7bcc4

2 files changed

Lines changed: 17 additions & 6 deletions

File tree

projects/social_platform/src/app/auth/register/register.component.html

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,24 @@
104104
<app-input
105105
size="big"
106106
id="phoneNumber"
107+
[error]="phoneNumber | controlError"
107108
mask="0-000-000-00-00"
108-
[error]="!!(phoneNumber | controlError)"
109109
type="text"
110110
placeholder="+79999999999"
111111
formControlName="phoneNumber"
112112
style="flex-grow: 1"
113113
></app-input>
114114

115-
@if ((phoneNumber | controlError) && registerIsSubmitting) {
116-
<div class="text-body-10 error">
117-
{{ errorMessage.VALIDATION_REQUIRED }}
118-
</div>
115+
@if (phoneNumber | controlError) {
116+
<ng-container>
117+
@if (phoneNumber | controlError: "required") {
118+
<div class="text-body-10 error">
119+
{{ errorMessage.VALIDATION_REQUIRED }}
120+
</div>
121+
} @if (phoneNumber | controlError: "pattern") {
122+
<div class="text-body-10 error">Неверный формат телефона</div>
123+
}
124+
</ng-container>
119125
}
120126
</fieldset>
121127
} @if (registerForm.get("email"); as email) {

projects/social_platform/src/app/auth/register/register.component.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export class RegisterComponent implements OnInit {
7575
],
7676
password: ["", [Validators.required, this.validationService.usePasswordValidator(8)]],
7777
repeatedPassword: ["", [Validators.required]],
78-
phoneNumber: ["", [Validators.maxLength(12)]],
78+
phoneNumber: ["", [Validators.maxLength(15)]],
7979
},
8080
{ validators: [validationService.useMatchValidator("password", "repeatedPassword")] }
8181
);
@@ -117,7 +117,12 @@ export class RegisterComponent implements OnInit {
117117
birthday: this.registerForm.value.birthday
118118
? dayjs(this.registerForm.value.birthday, "DD.MM.YYYY").format("YYYY-MM-DD")
119119
: undefined,
120+
phoneNumber:
121+
typeof this.registerForm.value.phoneNumber === "string"
122+
? this.registerForm.value.phoneNumber.replace(/^([87])/, "+7")
123+
: this.registerForm.value.phoneNumber,
120124
};
125+
121126
delete payload.repeatedPassword;
122127

123128
this.registerIsSubmitting = true;

0 commit comments

Comments
 (0)