Browse Source

add fixes

pull/14022/head
Maksym Tsymbarov 1 year ago
parent
commit
02c30aa00a
  1. 2
      ui-ngx/src/app/core/services/utils.service.ts
  2. 2
      ui-ngx/src/app/modules/home/pages/security/authentication-dialog/email-auth-dialog.component.ts
  3. 4
      ui-ngx/src/app/modules/login/pages/login/login.component.ts
  4. 3
      ui-ngx/src/app/shared/components/contact.component.ts

2
ui-ngx/src/app/core/services/utils.service.ts

@ -50,7 +50,6 @@ import { entityTypeTranslations } from '@shared/models/entity-type.models';
import cssjs from '@core/css/css'; import cssjs from '@core/css/css';
import { isNotEmptyTbFunction } from '@shared/models/js-function.models'; import { isNotEmptyTbFunction } from '@shared/models/js-function.models';
import { defaultFormProperties, FormProperty } from '@shared/models/dynamic-form.models'; import { defaultFormProperties, FormProperty } from '@shared/models/dynamic-form.models';
import { AbstractControl, ValidationErrors, Validators } from "@angular/forms";
const i18nRegExp = new RegExp(`{${i18nPrefix}:([^{}]+)}`, 'g'); const i18nRegExp = new RegExp(`{${i18nPrefix}:([^{}]+)}`, 'g');
@ -477,4 +476,5 @@ export class UtilsService {
el.parentNode.removeChild(el); el.parentNode.removeChild(el);
} }
} }
} }

2
ui-ngx/src/app/modules/home/pages/security/authentication-dialog/email-auth-dialog.component.ts

@ -58,7 +58,7 @@ export class EmailAuthDialogComponent extends DialogComponent<EmailAuthDialogCom
super(store, router, dialogRef); super(store, router, dialogRef);
this.emailConfigForm = this.fb.group({ this.emailConfigForm = this.fb.group({
email: [this.data.email, [Validators.required, validateEmail]] email: [this.data.email, [Validators.required, validateEmail]]
}); });
this.emailVerificationForm = this.fb.group({ this.emailVerificationForm = this.fb.group({

4
ui-ngx/src/app/modules/login/pages/login/login.component.ts

@ -36,8 +36,8 @@ export class LoginComponent extends PageComponent implements OnInit {
passwordViolation = false; passwordViolation = false;
loginFormGroup = this.fb.group({ loginFormGroup = this.fb.group({
username: ['', [Validators.required, validateEmail]], username: ['', [Validators.required, validateEmail]],
password: [''] password: ['']
}); });
oauth2Clients: Array<OAuth2ClientLoginInfo> = null; oauth2Clients: Array<OAuth2ClientLoginInfo> = null;

3
ui-ngx/src/app/shared/components/contact.component.ts

@ -30,6 +30,9 @@ export class ContactComponent {
phoneInputDefaultCountry = 'US'; phoneInputDefaultCountry = 'US';
constructor() {
}
changeCountry(countryCode: string) { changeCountry(countryCode: string) {
this.phoneInputDefaultCountry = countryCode ?? 'US'; this.phoneInputDefaultCountry = countryCode ?? 'US';
setTimeout(() => { setTimeout(() => {

Loading…
Cancel
Save