From ad271bef28a1399f441a47209e9da8e8bdd7f50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20KILI=C3=87?= Date: Mon, 22 Aug 2022 14:28:59 +0300 Subject: [PATCH 1/2] Deleted required validator in user-edit-props. --- .../lib/defaults/default-users-form-props.ts | 60 ++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts index c61f83857c..bc4247971c 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts +++ b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts @@ -65,4 +65,62 @@ export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany([ + { + type: ePropType.String, + name: 'userName', + displayName: 'AbpIdentity::UserName', + id: 'user-name', + validators: () => [Validators.required, Validators.maxLength(256)], + }, + { + type: ePropType.Password, + name: 'edit-password', + displayName: 'AbpIdentity::Password', + id: 'edit-password', + autocomplete: 'new-password', + validators: data => [...getPasswordValidators({ get: data.getInjected })], + }, + { + type: ePropType.String, + name: 'name', + displayName: 'AbpIdentity::DisplayName:Name', + id: 'name', + validators: () => [Validators.maxLength(64)], + }, + { + type: ePropType.String, + name: 'surname', + displayName: 'AbpIdentity::DisplayName:Surname', + id: 'surname', + validators: () => [Validators.maxLength(64)], + }, + { + type: ePropType.Email, + name: 'email', + displayName: 'AbpIdentity::EmailAddress', + id: 'email', + validators: () => [Validators.required, Validators.maxLength(256), Validators.email], + }, + { + type: ePropType.String, + name: 'phoneNumber', + displayName: 'AbpIdentity::PhoneNumber', + id: 'phone-number', + validators: () => [Validators.maxLength(16)], + }, + { + type: ePropType.Boolean, + name: 'isActive', + displayName: 'AbpIdentity::DisplayName:IsActive', + id: 'active-checkbox', + defaultValue: true, + }, + { + type: ePropType.Boolean, + name: 'lockoutEnabled', + displayName: 'AbpIdentity::DisplayName:LockoutEnabled', + id: 'lockout-checkbox', + defaultValue: true, + }, +]); From af8e7292e7b31c8e7d6ee5008a8a0212b6786a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20KILI=C3=87?= Date: Mon, 22 Aug 2022 14:54:11 +0300 Subject: [PATCH 2/2] Changed edit form props. --- .../lib/defaults/default-users-form-props.ts | 68 +++---------------- 1 file changed, 9 insertions(+), 59 deletions(-) diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts index bc4247971c..f42c761498 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts +++ b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts @@ -65,62 +65,12 @@ export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany([ - { - type: ePropType.String, - name: 'userName', - displayName: 'AbpIdentity::UserName', - id: 'user-name', - validators: () => [Validators.required, Validators.maxLength(256)], - }, - { - type: ePropType.Password, - name: 'edit-password', - displayName: 'AbpIdentity::Password', - id: 'edit-password', - autocomplete: 'new-password', - validators: data => [...getPasswordValidators({ get: data.getInjected })], - }, - { - type: ePropType.String, - name: 'name', - displayName: 'AbpIdentity::DisplayName:Name', - id: 'name', - validators: () => [Validators.maxLength(64)], - }, - { - type: ePropType.String, - name: 'surname', - displayName: 'AbpIdentity::DisplayName:Surname', - id: 'surname', - validators: () => [Validators.maxLength(64)], - }, - { - type: ePropType.Email, - name: 'email', - displayName: 'AbpIdentity::EmailAddress', - id: 'email', - validators: () => [Validators.required, Validators.maxLength(256), Validators.email], - }, - { - type: ePropType.String, - name: 'phoneNumber', - displayName: 'AbpIdentity::PhoneNumber', - id: 'phone-number', - validators: () => [Validators.maxLength(16)], - }, - { - type: ePropType.Boolean, - name: 'isActive', - displayName: 'AbpIdentity::DisplayName:IsActive', - id: 'active-checkbox', - defaultValue: true, - }, - { - type: ePropType.Boolean, - name: 'lockoutEnabled', - displayName: 'AbpIdentity::DisplayName:LockoutEnabled', - id: 'lockout-checkbox', - defaultValue: true, - }, -]); +export const DEFAULT_USERS_EDIT_FORM_PROPS = DEFAULT_USERS_CREATE_FORM_PROPS.map(prop => { + if (prop.name === 'password') { + return { + ...prop, + validators: data => [...getPasswordValidators({ get: data.getInjected })], + }; + } + return prop; +});