From 6073143ef9684576ff2b36aa62370a1ae65fdc00 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Thu, 15 Sep 2022 18:19:29 +0300 Subject: [PATCH 1/4] When all child permissions is unchecked, parent should be unchecked --- .../components/permission-management.component.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts index 496b3bb989..53779cd867 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts @@ -153,15 +153,21 @@ export class PermissionManagementComponent this.permissions = this.permissions.map(per => { if (clickedPermission.name === per.name) { return { ...per, isGranted: !per.isGranted }; - } else if (clickedPermission.name === per.parentName && clickedPermission.isGranted) { - return { ...per, isGranted: false }; + } else if (clickedPermission.name === per.parentName) { + return { ...per, isGranted: !clickedPermission.isGranted }; } else if (clickedPermission.parentName === per.name && !clickedPermission.isGranted) { return { ...per, isGranted: true }; } return per; + }).map((per,index,permissions) => { + const childrens = permissions + .filter(p => p.parentName === per.name); + if(childrens.length > 0 && childrens.every(x => !x.isGranted)){ + return { ...per, isGranted: false }; + } + return per }); - this.setTabCheckboxState(); this.setGrantCheckboxState(); }, 0); From 80772ac2c20d685981d3404006932aa2ad2d6e05 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Thu, 15 Sep 2022 19:02:58 +0300 Subject: [PATCH 2/4] add asterix for required fields on email-settins-group --- .../email-setting-group/email-setting-group.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html index 21d3ee1dee..2219cc4bd8 100644 --- a/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html +++ b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html @@ -6,13 +6,13 @@
+ }}*
+ }}*
@@ -20,7 +20,7 @@
- +
From da893fe39139ae8cd6f0aab55a3f422d4058251d Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Fri, 16 Sep 2022 15:31:29 +0300 Subject: [PATCH 3/4] Update permission-management.component.ts --- .../src/lib/components/permission-management.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts index 53779cd867..34c12bc99c 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts @@ -153,8 +153,8 @@ export class PermissionManagementComponent this.permissions = this.permissions.map(per => { if (clickedPermission.name === per.name) { return { ...per, isGranted: !per.isGranted }; - } else if (clickedPermission.name === per.parentName) { - return { ...per, isGranted: !clickedPermission.isGranted }; + } else if (clickedPermission.name === per.parentName && clickedPermission.isGranted) { + return { ...per, isGranted: false }; } else if (clickedPermission.parentName === per.name && !clickedPermission.isGranted) { return { ...per, isGranted: true }; } @@ -166,7 +166,7 @@ export class PermissionManagementComponent if(childrens.length > 0 && childrens.every(x => !x.isGranted)){ return { ...per, isGranted: false }; } - return per + return per }); this.setTabCheckboxState(); this.setGrantCheckboxState(); From 7307b1af17a2fc75f6e972dd9d72ad98e297b530 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Fri, 16 Sep 2022 16:59:35 +0300 Subject: [PATCH 4/4] Remove UserNameRegex Validalitor --- .../identity/src/lib/defaults/default-users-form-props.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 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 28c73b4320..232785249d 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,9 +1,7 @@ import { IdentityUserDto } from '@abp/ng.identity/proxy'; import { getPasswordValidators } from '@abp/ng.theme.shared'; import { ePropType, FormProp } from '@abp/ng.theme.shared/extensions'; -import { Validators } from '@angular/forms' -import { AbpValidators } from '@abp/ng.core'; - +import { Validators } from '@angular/forms'; export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany([ { @@ -11,7 +9,7 @@ export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany [Validators.required, Validators.maxLength(256), AbpValidators.username()], + validators: () => [Validators.required, Validators.maxLength(256)], }, { type: ePropType.Password,