From d9cbdc4e48845eef362692debf1f4c231d3d8200 Mon Sep 17 00:00:00 2001 From: enisn Date: Mon, 18 Apr 2022 16:43:11 +0300 Subject: [PATCH 1/7] Update FeatureManagementModal.razor.cs --- .../Components/FeatureManagementModal.razor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs index a35d529725..e2cb9c160c 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs @@ -25,7 +25,7 @@ public partial class FeatureManagementModal [Inject] protected IOptions LocalizationOptions { get; set; } - [Inject] private ICurrentApplicationConfigurationCacheResetService CurrentApplicationConfigurationCacheResetService { get; set; } + [Inject] protected ICurrentApplicationConfigurationCacheResetService CurrentApplicationConfigurationCacheResetService { get; set; } protected Modal Modal; From 649719738de8185e1f12351b86e258cf2b5371af Mon Sep 17 00:00:00 2001 From: enisn Date: Mon, 18 Apr 2022 16:43:38 +0300 Subject: [PATCH 2/7] Make members are protected and overridable in PermissionManagementModal.razor.cs --- .../PermissionManagementModal.razor.cs | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs index 2a908140b5..e74b3d8212 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs @@ -11,25 +11,25 @@ namespace Volo.Abp.PermissionManagement.Blazor.Components; public partial class PermissionManagementModal { - [Inject] private IPermissionAppService PermissionAppService { get; set; } - [Inject] private ICurrentApplicationConfigurationCacheResetService CurrentApplicationConfigurationCacheResetService { get; set; } + [Inject] protected IPermissionAppService PermissionAppService { get; set; } + [Inject] protected ICurrentApplicationConfigurationCacheResetService CurrentApplicationConfigurationCacheResetService { get; set; } - private Modal _modal; + protected Modal _modal; - private string _providerName; - private string _providerKey; + protected string _providerName; + protected string _providerKey; - private string _entityDisplayName; - private List _groups; + protected string _entityDisplayName; + protected List _groups; - private List _disabledPermissions = new List(); + protected List _disabledPermissions = new List(); - private string _selectedTabName; + protected string _selectedTabName; - private int _grantedPermissionCount = 0; - private int _notGrantedPermissionCount = 0; + protected int _grantedPermissionCount = 0; + protected int _notGrantedPermissionCount = 0; - private bool GrantAll { + protected bool GrantAll { get { if (_notGrantedPermissionCount == 0) { @@ -113,12 +113,12 @@ public partial class PermissionManagementModal } } - private Task CloseModal() + protected Task CloseModal() { return InvokeAsync(_modal.Hide); } - private async Task SaveAsync() + protected virtual async Task SaveAsync() { try { @@ -142,12 +142,12 @@ public partial class PermissionManagementModal } } - private string GetNormalizedGroupName(string name) + protected virtual string GetNormalizedGroupName(string name) { return "PermissionGroup_" + name.Replace(".", "_"); } - private void GroupGrantAllChanged(bool value, PermissionGroupDto permissionGroup) + protected virtual void GroupGrantAllChanged(bool value, PermissionGroupDto permissionGroup) { foreach (var permission in permissionGroup.Permissions) { @@ -158,7 +158,7 @@ public partial class PermissionManagementModal } } - private void PermissionChanged(bool value, PermissionGroupDto permissionGroup, PermissionGrantInfoDto permission) + protected virtual void PermissionChanged(bool value, PermissionGroupDto permissionGroup, PermissionGrantInfoDto permission) { SetPermissionGrant(permission, value); @@ -200,22 +200,22 @@ public partial class PermissionManagementModal permission.IsGranted = value; } - private PermissionGrantInfoDto GetParentPermission(PermissionGroupDto permissionGroup, PermissionGrantInfoDto permission) + protected PermissionGrantInfoDto GetParentPermission(PermissionGroupDto permissionGroup, PermissionGrantInfoDto permission) { return permissionGroup.Permissions.First(x => x.Name == permission.ParentName); } - private List GetChildPermissions(PermissionGroupDto permissionGroup, PermissionGrantInfoDto permission) + protected List GetChildPermissions(PermissionGroupDto permissionGroup, PermissionGrantInfoDto permission) { return permissionGroup.Permissions.Where(x => x.Name.StartsWith(permission.Name)).ToList(); } - private bool IsDisabledPermission(PermissionGrantInfoDto permissionGrantInfo) + protected bool IsDisabledPermission(PermissionGrantInfoDto permissionGrantInfo) { return _disabledPermissions.Any(x => x == permissionGrantInfo); } - private string GetShownName(PermissionGrantInfoDto permissionGrantInfo) + protected virtual string GetShownName(PermissionGrantInfoDto permissionGrantInfo) { if (!IsDisabledPermission(permissionGrantInfo)) { From c2fbd7e2a4070d6a2417c913cf4501a1cb18716c Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Mon, 18 Apr 2022 19:24:18 +0300 Subject: [PATCH 3/7] Add proper title to Abp-permission-manager.component #9581 --- .../identity/src/lib/components/roles/roles.component.html | 1 + .../identity/src/lib/components/users/users.component.html | 1 + .../identity/src/lib/components/users/users.component.ts | 4 +++- .../identity/src/lib/defaults/default-users-entity-actions.ts | 2 +- .../src/lib/components/permission-management.component.html | 4 ++-- .../src/lib/components/permission-management.component.ts | 3 +++ 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html index 09dcdb1be3..20d5509d15 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html @@ -55,6 +55,7 @@ }; let init = initTemplate " + [title]="providerKey" (abpInit)="init(abpPermissionManagement)" > diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html index 6f42485364..a481b9d697 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html @@ -95,6 +95,7 @@ }; let init = initTemplate " + [title]="userName" (abpInit)="init(abpPermissionManagement)" > diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts index 6f458a781b..1c9f6f0f17 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts @@ -64,6 +64,7 @@ export class UsersComponent implements OnInit { onVisiblePermissionChange = event => { this.visiblePermissions = event; }; + userName: string; get roleGroups(): FormGroup[] { return ((this.form.get('roleNames') as FormArray)?.controls as FormGroup[]) || []; @@ -176,8 +177,9 @@ export class UsersComponent implements OnInit { this.list.hookToQuery(query => this.service.getList(query)).subscribe(res => (this.data = res)); } - openPermissionsModal(providerKey: string) { + openPermissionsModal(providerKey: string, userName:string) { this.providerKey = providerKey; + this.userName = userName; setTimeout(() => { this.visiblePermissions = true; }, 0); diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts index 13f058dd37..0bd21c571b 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts +++ b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts @@ -15,7 +15,7 @@ export const DEFAULT_USERS_ENTITY_ACTIONS = EntityAction.createMany { const component = data.getInjected(UsersComponent); - component.openPermissionsModal(data.record.id); + component.openPermissionsModal(data.record.id, data.record.userName); }, permission: 'AbpIdentity.Users.ManagePermissions', }, diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html index a28607bb59..d2d14035ca 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html @@ -2,8 +2,8 @@

- {{ 'AbpPermissionManagement::Permissions' | abpLocalization }} - - {{ data.entityDisplayName }} + {{ 'AbpPermissionManagement::Permissions' | abpLocalization }} + - {{ title }}

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 e43acdd605..bc07bb6583 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 @@ -64,6 +64,9 @@ export class PermissionManagementComponent return this._visible; } + @Input() + title = ''; + set visible(value: boolean) { if (value === this._visible) return; From 8744d1953bca2eb0ab9ae2b673e5d63f77a95547 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Wed, 20 Apr 2022 16:39:21 +0300 Subject: [PATCH 4/7] Change permisson title input name to entityDisplayName --- .../identity/src/lib/components/roles/roles.component.html | 1 - .../identity/src/lib/components/users/users.component.html | 2 +- .../identity/src/lib/components/users/users.component.ts | 6 +++--- .../src/lib/components/permission-management.component.html | 6 +++--- .../src/lib/components/permission-management.component.ts | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html index 20d5509d15..09dcdb1be3 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html @@ -55,7 +55,6 @@ }; let init = initTemplate " - [title]="providerKey" (abpInit)="init(abpPermissionManagement)" > diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html index a481b9d697..7873adf6ea 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html @@ -95,7 +95,7 @@ }; let init = initTemplate " - [title]="userName" + [entityDisplayName]="entityDisplayName" (abpInit)="init(abpPermissionManagement)" > diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts index 1c9f6f0f17..90a453e5c9 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts @@ -64,7 +64,7 @@ export class UsersComponent implements OnInit { onVisiblePermissionChange = event => { this.visiblePermissions = event; }; - userName: string; + entityDisplayName: string; get roleGroups(): FormGroup[] { return ((this.form.get('roleNames') as FormArray)?.controls as FormGroup[]) || []; @@ -177,9 +177,9 @@ export class UsersComponent implements OnInit { this.list.hookToQuery(query => this.service.getList(query)).subscribe(res => (this.data = res)); } - openPermissionsModal(providerKey: string, userName:string) { + openPermissionsModal(providerKey: string, entityDisplayName?: string) { this.providerKey = providerKey; - this.userName = userName; + this.entityDisplayName = entityDisplayName; setTimeout(() => { this.visiblePermissions = true; }, 0); diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html index d2d14035ca..34396b97b4 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html @@ -1,9 +1,9 @@ - +

- {{ 'AbpPermissionManagement::Permissions' | abpLocalization }} - - {{ title }} + {{ 'AbpPermissionManagement::Permissions' | abpLocalization }} - + {{ entityDisplayName || data.data.entityDisplayName }}

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 bc07bb6583..4b53350208 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 @@ -65,7 +65,7 @@ export class PermissionManagementComponent } @Input() - title = ''; + entityDisplayName: string | undefined; set visible(value: boolean) { if (value === this._visible) return; From 909b62566c8c91a9aaf2c3d467165d02a5c44602 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Wed, 20 Apr 2022 16:40:29 +0300 Subject: [PATCH 5/7] Update permission-management.component.html --- .../src/lib/components/permission-management.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html index 34396b97b4..5a9fa0dd5a 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html @@ -3,7 +3,7 @@

{{ 'AbpPermissionManagement::Permissions' | abpLocalization }} - - {{ entityDisplayName || data.data.entityDisplayName }} + {{ entityDisplayName || data.entityDisplayName }}

From 0f0f4e0d504cfb349e008c88ac22a768e6232a33 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Wed, 20 Apr 2022 16:59:36 +0300 Subject: [PATCH 6/7] Fix lint error on PermissonManagement --- .../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 4b53350208..496b3bb989 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 @@ -59,14 +59,14 @@ export class PermissionManagementComponent protected _visible = false; + @Input() + entityDisplayName: string | undefined; + @Input() get visible(): boolean { return this._visible; } - @Input() - entityDisplayName: string | undefined; - set visible(value: boolean) { if (value === this._visible) return; From 44ad5168a204b3e965fbf71b5662effb35443ff6 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Wed, 20 Apr 2022 17:07:42 +0300 Subject: [PATCH 7/7] fix lint error on user component --- .../identity/src/lib/components/users/users.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts index 90a453e5c9..b8fadc81a1 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts @@ -59,12 +59,13 @@ export class UsersComponent implements OnInit { permissionManagementKey = ePermissionManagementComponents.PermissionManagement; + entityDisplayName: string; + trackByFn: TrackByFunction = (index, item) => Object.keys(item)[0] || index; onVisiblePermissionChange = event => { this.visiblePermissions = event; }; - entityDisplayName: string; get roleGroups(): FormGroup[] { return ((this.form.get('roleNames') as FormArray)?.controls as FormGroup[]) || [];