dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Fixed first loading and validation

Browse Source
This commit is contained in:
fe-dev 2022-07-14 18:13:47 +03:00
parent 1c6c0e1f74
commit fcb15bf99c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/shared/components/phone-input.component.ts
View File

@ -92,6 +92,7 @@ export class PhoneInputComponent implements OnInit, ControlValueAccessor, Valida
this.isLoading = value; this.isLoading = value;
if (this.phoneFormGroup) { if (this.phoneFormGroup) {
this.defineCountryFromNumber(this.phoneFormGroup.get('phoneNumber').value); this.defineCountryFromNumber(this.phoneFormGroup.get('phoneNumber').value);
this.getFlagAndPhoneNumberData(this.phoneFormGroup.get('country').value);
} }
} }
} }
@ -183,7 +184,7 @@ export class PhoneInputComponent implements OnInit, ControlValueAccessor, Valida
validatePhoneNumber(): ValidatorFn { validatePhoneNumber(): ValidatorFn {
return (c: FormControl) => { return (c: FormControl) => {
const phoneNumber = c.value; const phoneNumber = c.value;
if (phoneNumber && this.countryCallingCode !== phoneNumber && this.parsePhoneNumberFromString) { if (phoneNumber && this.parsePhoneNumberFromString) {
const parsedPhoneNumber = this.parsePhoneNumberFromString(phoneNumber); const parsedPhoneNumber = this.parsePhoneNumberFromString(phoneNumber);
if (!parsedPhoneNumber?.isValid() || !parsedPhoneNumber?.isPossible()) { if (!parsedPhoneNumber?.isValid() || !parsedPhoneNumber?.isPossible()) {
return { return {
@ -213,7 +214,7 @@ export class PhoneInputComponent implements OnInit, ControlValueAccessor, Valida
validate(): ValidationErrors | null { validate(): ValidationErrors | null {
const phoneNumber = this.phoneFormGroup.get('phoneNumber'); const phoneNumber = this.phoneFormGroup.get('phoneNumber');
return phoneNumber.valid || phoneNumber.untouched || this.countryCallingCode === phoneNumber.value ? null : { return phoneNumber.valid ? null : {
phoneFormGroup: false phoneFormGroup: false
}; };
} }