From 472485317f341a342bae8c417d6041c079120a25 Mon Sep 17 00:00:00 2001 From: Masum ULU Date: Thu, 31 Aug 2023 10:37:06 +0300 Subject: [PATCH 1/2] Fix user self disable issue --- .../src/lib/defaults/default-users-form-props.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 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 ccdf06df24..b8830b0c63 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 @@ -1,7 +1,8 @@ -import { IdentityUserDto } from '@abp/ng.identity/proxy'; +import { Validators } from '@angular/forms'; +import { ConfigStateService, CurrentUserDto } from '@abp/ng.core'; import { getPasswordValidators } from '@abp/ng.theme.shared'; import { ePropType, FormProp } from '@abp/ng.theme.shared/extensions'; -import { Validators } from '@angular/forms'; +import { IdentityUserDto } from '@abp/ng.identity/proxy'; export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany([ { @@ -70,5 +71,15 @@ export const DEFAULT_USERS_EDIT_FORM_PROPS = DEFAULT_USERS_CREATE_FORM_PROPS.map validators: (data: any) => [...getPasswordValidators({ get: data.getInjected })], }; } + if (prop.name === 'isActive') { + return { + ...prop, + visible: data => { + const configState = data.getInjected(ConfigStateService); + const currentUser = configState.getOne('currentUser') as CurrentUserDto; + return currentUser.id !== data.record.id; + }, + }; + } return prop; }); From 9523b2dadeb37a8a9190dd25adb28ee1461a2af3 Mon Sep 17 00:00:00 2001 From: Masum ULU <49063256+masumulu28@users.noreply.github.com> Date: Fri, 1 Sep 2023 08:36:03 +0300 Subject: [PATCH 2/2] Update default-users-form-props.ts --- .../identity/src/lib/defaults/default-users-form-props.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 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 b8830b0c63..3c1a3e4c82 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 @@ -76,8 +76,8 @@ export const DEFAULT_USERS_EDIT_FORM_PROPS = DEFAULT_USERS_CREATE_FORM_PROPS.map ...prop, visible: data => { const configState = data.getInjected(ConfigStateService); - const currentUser = configState.getOne('currentUser') as CurrentUserDto; - return currentUser.id !== data.record.id; + const currentUserId = configState.getDeep('currentUser.id'); + return currentUserId !== data.record.id; }, }; }