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; 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 6683690002..e81eed859d 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 { @@ -151,12 +151,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) { @@ -167,7 +167,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); @@ -209,22 +209,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)) { 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..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,6 +95,7 @@ }; let init = initTemplate " + [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 6f458a781b..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,6 +59,8 @@ export class UsersComponent implements OnInit { permissionManagementKey = ePermissionManagementComponents.PermissionManagement; + entityDisplayName: string; + trackByFn: TrackByFunction = (index, item) => Object.keys(item)[0] || index; onVisiblePermissionChange = event => { @@ -176,8 +178,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, entityDisplayName?: string) { this.providerKey = providerKey; + this.entityDisplayName = entityDisplayName; 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..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 @@ -1,9 +1,9 @@ - +

{{ 'AbpPermissionManagement::Permissions' | abpLocalization }} - - {{ data.entityDisplayName }} + {{ entityDisplayName || 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 e43acdd605..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,6 +59,9 @@ export class PermissionManagementComponent protected _visible = false; + @Input() + entityDisplayName: string | undefined; + @Input() get visible(): boolean { return this._visible;