Merge branch 'resource-based-auth' into resource-based-auth-blazor

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json

@@ -62,6 +62,6 @@
     "Theme": "سمة",
     "NotAssigned": "غيرمعتمد",
     "EntityActionsDisabledTooltip": "ليس لديك إذن لتنفيذ أي إجراء.",
-    "ResourcePermissions": "أذونات المورد"
+    "ResourcePermissions": "أذونات"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json

@@ -62,6 +62,6 @@
     "Theme": "Téma",
     "NotAssigned": "Nepřiřazena",
     "EntityActionsDisabledTooltip": "Nemáte oprávnění provést žádnou akci.",
-    "ResourcePermissions": "Oprávnění ke zdrojům"
+    "ResourcePermissions": "Oprávnění"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/de.json

@@ -62,6 +62,6 @@
     "Theme": "Thema",
     "NotAssigned": "Nicht zugeordnet",
     "EntityActionsDisabledTooltip": "Sie haben keine Berechtigung, Aktionen auszuführen.",
-    "ResourcePermissions": "Ressourcenberechtigungen"
+    "ResourcePermissions": "Berechtigungen"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/el.json

@@ -56,6 +56,6 @@
     "Today": "Σήμερα",
     "Apply": "Ισχύουν",
     "EntityActionsDisabledTooltip": "Δεν έχετε δικαίωμα να εκτελέσετε καμία ενέργεια.",
-    "ResourcePermissions": "Δικαιώματα Πόρων",
+    "ResourcePermissions": "Δικαιώματα",
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en-GB.json

@@ -57,6 +57,6 @@
     "Today": "Today",
     "Apply": "Apply",
     "EntityActionsDisabledTooltip": "You do not have permission to perform any action.",
-    "ResourcePermissions": "Resource permissions"
+    "ResourcePermissions": "Permissions"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json

@@ -62,6 +62,6 @@
     "Theme": "Theme",
     "NotAssigned": "Not Assigned",
     "EntityActionsDisabledTooltip": "You do not have permission to perform any action.",
-    "ResourcePermissions": "Resource permissions"
+    "ResourcePermissions": "Permissions"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json

@@ -62,6 +62,6 @@
     "Theme": "Tema",
     "NotAssigned": "No asignado",
     "EntityActionsDisabledTooltip": "No tienes permisos para realizar ninguna acción.",
-    "ResourcePermissions": "Permisos de recurso"
+    "ResourcePermissions": "Permisos"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fa.json

@@ -56,6 +56,6 @@
     "Today": "امروز",
     "Apply": "درخواست دادن",
     "EntityActionsDisabledTooltip": "شما دسترسی به انجام هر گونه عملیات ندارید.",
-    "ResourcePermissions": "مجوزهای منبع"
+    "ResourcePermissions": "مجوزها"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fi.json

@@ -62,6 +62,6 @@
     "Theme": "Teema",
     "NotAssigned": "Ei määritetty",
     "EntityActionsDisabledTooltip": "Sinulla ei ole oikeutta suorittaa mitään toimintoa.",
-    "ResourcePermissions": "Resurssin käyttöoikeudet"
+    "ResourcePermissions": "Käyttöoikeudet"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/fr.json

@@ -62,6 +62,6 @@
     "Theme": "Thème",
     "NotAssigned": "Non attribué",
     "EntityActionsDisabledTooltip": "Vous n'avez pas les permissions pour effectuer une action.",
-    "ResourcePermissions": "Autorisations de ressources"
+    "ResourcePermissions": "Autorisations"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hi.json

@@ -62,6 +62,6 @@
     "Theme": "विषय",
     "NotAssigned": "सौंपा नहीं गया है",
     "EntityActionsDisabledTooltip": "आपके पास कोई कार्रवाई नहीं है जो करने के लिए है।",
-    "ResourcePermissions": "संसाधन अनुमतियाँ"
+    "ResourcePermissions": "अनुमतियाँ"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hr.json

@@ -62,6 +62,6 @@
     "Theme": "Tema",
     "NotAssigned": "Nije dodijeljeno",
     "EntityActionsDisabledTooltip": "Nemate dozvolu za izvođenje bilo kakve akcije.",
-    "ResourcePermissions": "Dozvole resursa"
+    "ResourcePermissions": "Dozvole"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/hu.json

@@ -62,6 +62,6 @@
     "Theme": "Téma",
     "NotAssigned": "Nem kijelölt",
     "EntityActionsDisabledTooltip": "Nincs jogosultsága bármely művelethez.",
-    "ResourcePermissions": "Erőforrás engedélyek"
+    "ResourcePermissions": "Engedélyek"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/is.json

@@ -62,6 +62,6 @@
     "Theme": "Þema",
     "NotAssigned": "Ekki skráður",
     "EntityActionsDisabledTooltip": "Þú hefur ekki aðgang að þessum aðgerðum.",
-    "ResourcePermissions": "Aðgangsheimildir auðlinda"
+    "ResourcePermissions": "Aðgangsheimildir"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/it.json

@@ -62,6 +62,6 @@
     "Theme": "Tema",
     "NotAssigned": "Non assegnato",
     "EntityActionsDisabledTooltip": "Non hai i permessi per eseguire alcuna azione.",
-    "ResourcePermissions": "Autorizzazioni risorse"
+    "ResourcePermissions": "Autorizzazioni"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/nl.json

@@ -62,6 +62,6 @@
     "Theme": "Thema",
     "NotAssigned": "Niet toegekend",
     "EntityActionsDisabledTooltip": "U hebt geen toegang tot deze acties.",
-    "ResourcePermissions": "Bronmachtigingen"
+    "ResourcePermissions": "Machtigingen"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pl-PL.json

@@ -62,6 +62,6 @@
     "Theme": "Temat",
     "NotAssigned": "Nie przypisano",
     "EntityActionsDisabledTooltip": "Nie masz uprawnień do wykonania żadnej akcji.",
-    "ResourcePermissions": "Uprawnienia zasobów"
+    "ResourcePermissions": "Uprawnienia"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json

@@ -62,6 +62,6 @@
     "Theme": "Tema",
     "NotAssigned": "Não atribuído",
     "EntityActionsDisabledTooltip": "Você não tem permissão para executar qualquer ação.",
-    "ResourcePermissions": "Permissões de recurso"
+    "ResourcePermissions": "Permissões"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ro-RO.json

@@ -62,6 +62,6 @@
     "Theme": "Temă",
     "NotAssigned": "Nealocat",
     "EntityActionsDisabledTooltip": "Nu aveți permisiune să efectuați nicio acțiune.",
-    "ResourcePermissions": "Permisiuni resurse"
+    "ResourcePermissions": "Permisiuni"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ru.json

@@ -62,6 +62,6 @@
     "Theme": "Тема",
     "NotAssigned": "Не назначен",
     "EntityActionsDisabledTooltip": "У вас нет прав на выполнение каких-либо действий.",
-    "ResourcePermissions": "Разрешения ресурса"
+    "ResourcePermissions": "Разрешения"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sk.json

@@ -62,6 +62,6 @@
     "Theme": "Téma",
     "NotAssigned": "Nepridelené",
     "EntityActionsDisabledTooltip": "Nemáte oprávnenie vykonávať žiadnu akciu.",
-    "ResourcePermissions": "Oprávnenia zdrojov"
+    "ResourcePermissions": "Oprávnenia"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json

@@ -62,6 +62,6 @@
     "Theme": "Tema",
     "NotAssigned": "Ni dodeljena",
     "EntityActionsDisabledTooltip": "Nimate pravic za izvajanje kakršne koli dejanje.",
-    "ResourcePermissions": "Dovoljenja virov"
+    "ResourcePermissions": "Dovoljenja"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sv.json

@@ -61,6 +61,6 @@
     "Theme": "Tema",
     "NotAssigned": "Ej tilldelad",
     "EntityActionsDisabledTooltip": "Du har inte tillgång till dessa åtgärder.",
-    "ResourcePermissions": "Resurstillstånd"
+    "ResourcePermissions": "Behörigheter"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json

@@ -62,6 +62,6 @@
     "Theme": "Tema",
     "NotAssigned": "Atanmadı",
     "EntityActionsDisabledTooltip": "Bu işlemi gerçekleştirmek için yeterli yetkiniz yok.",
-    "ResourcePermissions": "Kaynak izinleri"
+    "ResourcePermissions": "İzinler"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/vi.json

@@ -62,6 +62,6 @@
     "Theme": "chủ đề",
     "NotAssigned": "Không được chỉ định",
     "EntityActionsDisabledTooltip": "Bạn không có quyền thực hiện bất kỳ hành động nào.",
-    "ResourcePermissions": "Quyền tài nguyên"
+    "ResourcePermissions": "Quyền"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json

@@ -62,6 +62,6 @@
     "Theme": "主题",
     "NotAssigned": "未分配",
     "EntityActionsDisabledTooltip": "您没有权限执行任何操作。",
-    "ResourcePermissions": "资源权限"
+    "ResourcePermissions": "权限"
   }
 }

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json

@@ -62,6 +62,6 @@
     "Theme": "主題",
     "NotAssigned": "未分配",
     "EntityActionsDisabledTooltip": "您沒有權限執行任何操作。",
-    "ResourcePermissions": "資源權限"
+    "ResourcePermissions": "權限"
   }
 }

modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/Integration/IIdentityUserIntegrationService.cs

@@ -23,7 +23,7 @@ public interface IIdentityUserIntegrationService : IApplicationService
 
     Task<ListResultDto<RoleData>> SearchRoleAsync(RoleLookupSearchInputDto input);
 
-    Task<ListResultDto<RoleData>> SearchRoleByIdsAsync(Guid[] ids);
+    Task<ListResultDto<RoleData>> SearchRoleByNamesAsync(string[] ids);
 
     Task<long> GetRoleCountAsync(RoleLookupCountInputDto input);
 }

modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/Integration/IdentityUserIntegrationService.cs

@@ -105,11 +105,11 @@ public class IdentityUserIntegrationService : IdentityAppServiceBase, IIdentityU
         }
     }
 
-    public virtual async Task<ListResultDto<RoleData>> SearchRoleByIdsAsync(Guid[] ids)
+    public virtual async Task<ListResultDto<RoleData>> SearchRoleByNamesAsync(string[] names)
     {
         using (RoleRepository.DisableTracking())
         {
-            var roles = await RoleRepository.GetListAsync(ids);
+            var roles = await RoleRepository.GetListAsync(names);
             return new ListResultDto<RoleData>(roles.Select(r => new RoleData(r.Id, r.Name, r.IsDefault, r.IsStatic, r.IsPublic, r.TenantId, r.ExtraProperties)).ToList());
         }
     }

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IUserRoleFinder.cs

@@ -18,5 +18,5 @@ public interface IUserRoleFinder
 
     Task<List<UserFinderResult>> SearchUserByIdsAsync(Guid[] ids);
 
-    Task<List<RoleFinderResult>> SearchRoleByIdsAsync(Guid[] ids);
+    Task<List<RoleFinderResult>> SearchRoleByNamesAsync(string[] names);
 }

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs

@@ -31,11 +31,17 @@ public interface IIdentityRoleRepository : IBasicRepository<IdentityRole, Guid>
         bool includeDetails = false,
         CancellationToken cancellationToken = default
     );
+
     Task<List<IdentityRole>> GetListAsync(
         IEnumerable<Guid> ids,
         CancellationToken cancellationToken = default
     );
 
+    Task<List<IdentityRole>> GetListAsync(
+        IEnumerable<string> names,
+        CancellationToken cancellationToken = default
+    );
+
     Task<List<IdentityRole>> GetDefaultOnesAsync(
         bool includeDetails = false,
         CancellationToken cancellationToken = default

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserRoleFinder.cs

@@ -70,11 +70,11 @@ public class UserRoleFinder : IUserRoleFinder, ITransientDependency
         }
     }
 
-    public virtual async Task<List<RoleFinderResult>> SearchRoleByIdsAsync(Guid[] ids)
+    public virtual async Task<List<RoleFinderResult>> SearchRoleByNamesAsync(string[] names)
     {
         using (IdentityUserRepository.DisableTracking())
         {
-            var roles = await IdentityRoleRepository.GetListAsync(ids);
+            var roles = await IdentityRoleRepository.GetListAsync(names);
             return roles.Select(user => new RoleFinderResult
             {
                 Id = user.Id,

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityRoleRepository.cs

@@ -72,6 +72,13 @@ public class EfCoreIdentityRoleRepository : EfCoreRepository<IIdentityDbContext,
             .ToListAsync(GetCancellationToken(cancellationToken));
     }
 
+    public virtual async Task<List<IdentityRole>> GetListAsync(IEnumerable<string> names, CancellationToken cancellationToken = default)
+    {
+        return await (await GetDbSetAsync())
+            .Where(t => names.Contains(t.Name))
+            .ToListAsync(GetCancellationToken(cancellationToken));
+    }
+
     public virtual async Task<List<IdentityRole>> GetDefaultOnesAsync(
         bool includeDetails = false, CancellationToken cancellationToken = default)
     {

modules/identity/src/Volo.Abp.Identity.HttpApi.Client/ClientProxies/Volo/Abp/Identity/Integration/IdentityUserIntegrationClientProxy.Generated.cs

@@ -76,11 +76,11 @@ public partial class IdentityUserIntegrationClientProxy : ClientProxyBase<IIdent
         });
     }
 
-    public virtual async Task<ListResultDto<RoleData>> SearchRoleByIdsAsync(Guid[] ids)
+    public virtual async Task<ListResultDto<RoleData>> SearchRoleByNamesAsync(String[] names)
     {
-        return await RequestAsync<ListResultDto<RoleData>>(nameof(SearchRoleByIdsAsync), new ClientProxyRequestTypeValue
+        return await RequestAsync<ListResultDto<RoleData>>(nameof(SearchRoleByNamesAsync), new ClientProxyRequestTypeValue
         {
-            { typeof(Guid[]), ids }
+            { typeof(String[]), names }
         });
     }
 

modules/identity/src/Volo.Abp.Identity.HttpApi.Client/ClientProxies/identity-generate-proxy.json

@@ -1436,12 +1436,12 @@
                   }
                 },
                 {
-                  "name": "SearchRoleByIdsAsync",
+                  "name": "SearchRoleByNamesAsync",
                   "parametersOnMethod": [
                     {
                       "name": "ids",
-                      "typeAsString": "System.Guid[], System.Private.CoreLib",
+                      "typeAsString": "System.String[], System.Private.CoreLib",
-                      "type": "System.Guid[]",
+                      "type": "System.String[]",
                       "typeSimple": "[string]",
                       "isOptional": false,
                       "defaultValue": null
@@ -1828,17 +1828,17 @@
               "allowAnonymous": null,
               "implementFrom": "Volo.Abp.Identity.Integration.IIdentityUserIntegrationService"
             },
-            "SearchRoleByIdsAsyncByIds": {
+            "SearchRoleByNamesAsyncByNames": {
-              "uniqueName": "SearchRoleByIdsAsyncByIds",
+              "uniqueName": "SearchRoleByNamesAsyncByNames",
-              "name": "SearchRoleByIdsAsync",
+              "name": "SearchRoleByNamesAsync",
               "httpMethod": "GET",
-              "url": "integration-api/identity/users/search/roles/by-ids",
+              "url": "integration-api/identity/users/search/roles/by-names",
               "supportedVersions": [],
               "parametersOnMethod": [
                 {
-                  "name": "ids",
+                  "name": "names",
-                  "typeAsString": "System.Guid[], System.Private.CoreLib",
+                  "typeAsString": "System.String[], System.Private.CoreLib",
-                  "type": "System.Guid[]",
+                  "type": "System.String[]",
                   "typeSimple": "[string]",
                   "isOptional": false,
                   "defaultValue": null
@@ -1846,10 +1846,10 @@
               ],
               "parameters": [
                 {
-                  "nameOnMethod": "ids",
+                  "nameOnMethod": "names",
-                  "name": "ids",
+                  "name": "names",
                   "jsonName": null,
-                  "type": "System.Guid[]",
+                  "type": "System.String[]",
                   "typeSimple": "[string]",
                   "isOptional": false,
                   "defaultValue": null,

modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpClientUserRoleFinder.cs

@@ -72,9 +72,9 @@ public class HttpClientUserRoleFinder : IUserRoleFinder, ITransientDependency
         }).ToList();
     }
 
-    public virtual async Task<List<RoleFinderResult>> SearchRoleByIdsAsync(Guid[] ids)
+    public virtual async Task<List<RoleFinderResult>> SearchRoleByNamesAsync(string[] names)
     {
-        var roles = await _userIntegrationService.SearchRoleByIdsAsync(ids);
+        var roles = await _userIntegrationService.SearchRoleByNamesAsync(names);
         return roles.Items.Select(r => new RoleFinderResult
         {
             Id = r.Id,

modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/Integration/IdentityUserIntegrationController.cs

@@ -71,10 +71,10 @@ public class IdentityUserIntegrationController : AbpControllerBase, IIdentityUse
     }
 
     [HttpGet]
-    [Route("search/roles/by-ids")]
+    [Route("search/roles/by-names")]
-    public virtual Task<ListResultDto<RoleData>> SearchRoleByIdsAsync(Guid[] ids)
+    public virtual Task<ListResultDto<RoleData>> SearchRoleByNamesAsync(string[] names)
     {
-        return UserIntegrationService.SearchRoleByIdsAsync(ids);
+        return UserIntegrationService.SearchRoleByNamesAsync(names);
     }
 
     [HttpGet]

modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs

@@ -78,6 +78,13 @@ public class MongoIdentityRoleRepository : MongoDbRepository<IAbpIdentityMongoDb
             .ToListAsync(GetCancellationToken(cancellationToken));
     }
 
+    public virtual async Task<List<IdentityRole>> GetListAsync(IEnumerable<string> names, CancellationToken cancellationToken = default)
+    {
+        return await (await GetQueryableAsync(cancellationToken))
+            .Where(x => names.Contains(x.Name))
+            .ToListAsync(GetCancellationToken(cancellationToken));
+    }
+
     public virtual async Task<List<IdentityRole>> GetDefaultOnesAsync(
         bool includeDetails = false,
         CancellationToken cancellationToken = default)

modules/identity/src/Volo.Abp.Identity.Web/wwwroot/client-proxies/identity-proxy.js

@@ -20,7 +20,7 @@
 
     volo.abp.identity.identityRole.getList = function(input, ajaxParams) {
       return abp.ajax($.extend(true, {
-        url: abp.appPath + 'api/identity/roles' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '',
+        url: abp.appPath + 'api/identity/roles' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }, { name: 'extraProperties', value: input.extraProperties }]) + '',
         type: 'GET'
       }, ajaxParams));
     };
@@ -73,7 +73,7 @@
 
     volo.abp.identity.identityUser.getList = function(input, ajaxParams) {
       return abp.ajax($.extend(true, {
-        url: abp.appPath + 'api/identity/users' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '',
+        url: abp.appPath + 'api/identity/users' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }, { name: 'extraProperties', value: input.extraProperties }]) + '',
         type: 'GET'
       }, ajaxParams));
     };
@@ -163,7 +163,7 @@
 
     volo.abp.identity.identityUserLookup.search = function(input, ajaxParams) {
       return abp.ajax($.extend(true, {
-        url: abp.appPath + 'api/identity/users/lookup/search' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '',
+        url: abp.appPath + 'api/identity/users/lookup/search' + abp.utils.buildQueryString([{ name: 'filter', value: input.filter }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }, { name: 'extraProperties', value: input.extraProperties }]) + '',
         type: 'GET'
       }, ajaxParams));
     };

modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RoleResourcePermissionProviderKeyLookupService.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -33,12 +32,7 @@ public class RoleResourcePermissionProviderKeyLookupService : IResourcePermissio
 
     public virtual async Task<List<ResourcePermissionProviderKeyInfo>> SearchAsync(string[] keys, CancellationToken cancellationToken = default)
     {
-        var ids = keys
+        var roles = await UserRoleFinder.SearchRoleByNamesAsync(keys.Distinct().ToArray());
-            .Select(key => Guid.TryParse(key, out var id) ? (Guid?)id : null)
-            .Where(id => id.HasValue)
-            .Select(id => id.Value)
-            .ToArray();
-        var roles = await UserRoleFinder.SearchRoleByIdsAsync(ids.ToArray());
         return roles.Select(r => new ResourcePermissionProviderKeyInfo(r.RoleName, r.RoleName)).ToList();
     }
 }

modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/UserResourcePermissionProviderKeyLookupService.cs

@@ -37,6 +37,7 @@ public class UserResourcePermissionProviderKeyLookupService : IResourcePermissio
             .Select(key => Guid.TryParse(key, out var id) ? (Guid?)id : null)
             .Where(id => id.HasValue)
             .Select(id => id.Value)
+            .Distinct()
             .ToArray();
         var users = await UserRoleFinder.SearchUserByIdsAsync(ids.ToArray());
         return users.Select(u => new ResourcePermissionProviderKeyInfo(u.Id.ToString(), u.UserName)).ToList();

modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/UserRoleFinder_Tests.cs

@@ -51,9 +51,9 @@ public class UserRoleFinder_Tests : AbpIdentityDomainTestBase
     }
 
     [Fact]
-    public async Task SearchRoleByIdsAsync()
+    public async Task SearchRoleByNamesAsync()
     {
-        var roleResults = await _userRoleFinder.SearchRoleByIdsAsync(new[] { _testData.RoleModeratorId, _testData.RoleManagerId });
+        var roleResults = await _userRoleFinder.SearchRoleByNamesAsync(new[] { "moderator", "manager" });
         roleResults.ShouldNotBeEmpty();
         roleResults.Count.ShouldBe(2);
         roleResults.ShouldContain(x => x.RoleName == "moderator");

modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo/Abp/PermissionManagement/ResourcePermissionGrantInfoDto.cs

@@ -10,5 +10,7 @@ public class ResourcePermissionGrantInfoDto
 
     public string ProviderDisplayName { get; set; }
 
+    public string ProviderNameDisplayName { get; set; }
+
     public List<GrantedResourcePermissionDto> Permissions { get; set; }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs

@@ -262,6 +262,7 @@ public class PermissionAppService : ApplicationService, IPermissionAppService
                 ProviderName = resourcePermissionGrant.ProviderName,
                 ProviderKey = resourcePermissionGrant.ProviderKey,
                 ProviderDisplayName = resourcePermissionGrant.ProviderDisplayName,
+                ProviderNameDisplayName  = resourcePermissionGrant.ProviderNameDisplayName?.Localize(StringLocalizerFactory),
                 Permissions = new List<GrantedResourcePermissionDto>()
             };
             foreach (var permission in resourcePermissionGrant.Permissions)

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ar.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "هل أنت متأكد أنك تريد الحفظ بدون أي أذونات؟",
     "PermissionGroup": "مجموعة الأذونات",
     "Filter": "تصفية",
-    "ResourcePermissions": "أذونات الموارد",
+    "ResourcePermissions": "الأذونات",
     "ResourcePermissionTarget": "الهدف",
     "ResourcePermissionPermissions": "الأذونات",
-    "AddResourcePermission": "إضافة أذونات الموارد",
+    "AddResourcePermission": "إضافة إذن",
-    "ResourcePermissionDeletionConfirmationMessage": "هل أنت متأكد أنك تريد حذف أذونات الموارد هذه؟",
+    "ResourcePermissionDeletionConfirmationMessage": "هل أنت متأكد أنك تريد حذف جميع الأذونات؟",
-    "AddResourcePermissions": "إضافة أذونات الموارد",
+    "AddResourcePermissions": "إضافة الأذونات",
-    "UpdateResourcePermissions": "تحديث أذونات الموارد",
+    "UpdateResourcePermissions": "تحديث الأذونات",
-    "Resource": "المورد",
-    "ResourceName": "اسم المورد",
-    "ResourceKey": "مفتاح المورد",
-    "ProviderName": "اسم الموفر",
-    "ProviderKey": "مفتاح الموفر",
     "GrantAllResourcePermissions": "منح الكل",
-    "NoResourceProviderKeyLookupServiceFound": "لم يتم العثور على خدمة البحث عن مفتاح مزود المورد",
+    "NoResourceProviderKeyLookupServiceFound": "لم يتم العثور على خدمة البحث عن مفتاح المزود",
-    "NoResourcePermissionFound": "لا يوجد إذن مورد معرف للموارد الحالية."
+    "NoResourcePermissionFound": "لا توجد أي أذونات محددة."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/cs.json

@@ -9,18 +9,13 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Opravdu chcete ukládat bez jakýchkoli oprávnění?",
     "PermissionGroup": "Skupina oprávnění",
     "Filter": "Filtr",
-    "ResourcePermissions": "Oprávnění zdrojů",
+    "ResourcePermissions": "Oprávnění",
     "ResourcePermissionTarget": "Cíl",
     "ResourcePermissionPermissions": "Oprávnění",
-    "AddResourcePermission": "Přidat oprávnění zdrojů",
+    "AddResourcePermission": "Přidat oprávnění",
-    "ResourcePermissionDeletionConfirmationMessage": "Opravdu chcete smazat tato oprávnění zdrojů?",
+    "ResourcePermissionDeletionConfirmationMessage": "Opravdu chcete smazat všechna oprávnění?",
-    "AddResourcePermissions": "Přidat oprávnění zdrojů",
+    "AddResourcePermissions": "Přidat oprávnění",
-    "UpdateResourcePermissions": "Aktualizovat oprávnění zdrojů",
+    "UpdateResourcePermissions": "Aktualizovat oprávnění",
-    "Resource": "Zdroj",
-    "ResourceName": "Název zdroje",
-    "ResourceKey": "Klíč zdroje",
-    "ProviderName": "Název poskytovatele",
-    "ProviderKey": "Klíč poskytovatele",
     "GrantAllResourcePermissions": "Udělit vše",
     "NoResourceProviderKeyLookupServiceFound": "Nebyla nalezena služba pro vyhledávání klíče poskytovatele zdrojů",
     "NoResourcePermissionFound": "Pro aktuální prostředek není definováno žádné oprávnění."

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/de.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Sind Sie sicher, dass Sie ohne Berechtigungen speichern möchten?",
     "PermissionGroup": "Berechtigungsgruppe",
     "Filter": "Filtern",
-    "ResourcePermissions": "Ressourcenberechtigungen",
+    "ResourcePermissions": "Berechtigungen",
     "ResourcePermissionTarget": "Ziel",
     "ResourcePermissionPermissions": "Berechtigungen",
-    "AddResourcePermission": "Ressourcenberechtigungen hinzufügen",
+    "AddResourcePermission": "Berechtigung hinzufügen",
-    "ResourcePermissionDeletionConfirmationMessage": "Sind Sie sicher, dass Sie diese Ressourcenberechtigungen löschen möchten?",
+    "ResourcePermissionDeletionConfirmationMessage": "Sind Sie sicher, dass Sie alle Berechtigungen löschen möchten?",
-    "AddResourcePermissions": "Ressourcenberechtigungen hinzufügen",
+    "AddResourcePermissions": "Berechtigungen hinzufügen",
-    "UpdateResourcePermissions": "Ressourcenberechtigungen aktualisieren",
+    "UpdateResourcePermissions": "Berechtigungen aktualisieren",
-    "Resource": "Ressource",
-    "ResourceName": "Ressourcenname",
-    "ResourceKey": "Ressourcenschlüssel",
-    "ProviderName": "Anbietername",
-    "ProviderKey": "Anbieterschlüssel",
     "GrantAllResourcePermissions": "Alle gewähren",
-    "NoResourceProviderKeyLookupServiceFound": "Es wurde kein Dienst zum Nachschlagen des Ressourcenschlüsselanbieters gefunden",
+    "NoResourceProviderKeyLookupServiceFound": "Es wurde kein Dienst zum Nachschlagen des Anbieterschlüssels gefunden",
-    "NoResourcePermissionFound": "Es ist keine Ressourcenberechtigung für die aktuelle Ressource definiert."
+    "NoResourcePermissionFound": "Es ist keine Berechtigung definiert."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/el.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Είστε βέβαιοι ότι θέλετε να αποθηκεύσετε χωρίς δικαιώματα;",
     "PermissionGroup": "Ομάδα δικαιωμάτων",
     "Filter": "Φίλτρο",
-    "ResourcePermissions": "Δικαιώματα πόρων",
+    "ResourcePermissions": "Δικαιώματα",
     "ResourcePermissionTarget": "Στόχος",
     "ResourcePermissionPermissions": "Δικαιώματα",
-    "AddResourcePermission": "Προσθήκη δικαιωμάτων πόρων",
+    "AddResourcePermission": "Προσθήκη δικαιώματος",
-    "ResourcePermissionDeletionConfirmationMessage": "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτά τα δικαιώματα πόρων;",
+    "ResourcePermissionDeletionConfirmationMessage": "Είστε βέβαιοι ότι θέλετε να διαγράψετε όλα τα δικαιώματα;",
-    "AddResourcePermissions": "Προσθήκη δικαιωμάτων πόρων",
+    "AddResourcePermissions": "Προσθήκη δικαιωμάτων",
-    "UpdateResourcePermissions": "Ενημέρωση δικαιωμάτων πόρων",
+    "UpdateResourcePermissions": "Ενημέρωση δικαιωμάτων",
-    "Resource": "Πόρος",
-    "ResourceName": "Όνομα πόρου",
-    "ResourceKey": "Κλειδί πόρου",
-    "ProviderName": "Όνομα παρόχου",
-    "ProviderKey": "Κλειδί παρόχου",
     "GrantAllResourcePermissions": "Παραχώρηση όλων",
-    "NoResourceProviderKeyLookupServiceFound": "Δεν βρέθηκε υπηρεσία αναζήτησης κλειδιού παρόχου πόρων",
+    "NoResourceProviderKeyLookupServiceFound": "Δεν βρέθηκε υπηρεσία αναζήτησης κλειδιού παρόχου",
-    "NoResourcePermissionFound": "Δεν έχει οριστεί καμία άδεια πόρου για τον τρέχοντα πόρο."
+    "NoResourcePermissionFound": "Δεν έχει οριστεί καμία άδεια."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/en-GB.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Are you sure you want to save without any permissions?",
     "PermissionGroup": "Permission Group",
     "Filter": "Filter",
-    "ResourcePermissions": "Resource permissions",
+    "ResourcePermissions": "Permissions",
     "ResourcePermissionTarget": "Target",
     "ResourcePermissionPermissions": "Permissions",
-    "AddResourcePermission": "Add resource permissions",
+    "AddResourcePermission": "Add permission",
-    "ResourcePermissionDeletionConfirmationMessage": "Are you sure you want to delete this resource permissions?",
+    "ResourcePermissionDeletionConfirmationMessage": "Are you sure you want to delete all permissions?",
-    "AddResourcePermissions": "Add resource permissions",
+    "AddResourcePermissions": "Add permissions",
-    "UpdateResourcePermissions": "Update resource permissions",
+    "UpdateResourcePermissions": "Update permissions",
-    "Resource": "Resource",
-    "ResourceName": "Resource name",
-    "ResourceKey": "Resource key",
-    "ProviderName": "Provider name",
-    "ProviderKey": "Provider key",
     "GrantAllResourcePermissions": "Grant all",
-    "NoResourceProviderKeyLookupServiceFound": "There is no resource provider key lookup service was found",
+    "NoResourceProviderKeyLookupServiceFound": "There is no provider key lookup service was found",
-    "NoResourcePermissionFound": "There is no resource permission defined for the current resource."
+    "NoResourcePermissionFound": "There is no permission defined."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/en.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Are you sure you want to save without any permissions?",
     "PermissionGroup": "Permission Group",
     "Filter": "Filter",
-    "ResourcePermissions": "Resource permissions",
+    "ResourcePermissions": "Permissions",
     "ResourcePermissionTarget": "Target",
     "ResourcePermissionPermissions": "Permissions",
-    "AddResourcePermission": "Add resource permissions",
+    "AddResourcePermission": "Add permission",
-    "ResourcePermissionDeletionConfirmationMessage": "Are you sure you want to delete this resource permissions?",
+    "ResourcePermissionDeletionConfirmationMessage": "Are you sure you want to delete all permissions?",
-    "AddResourcePermissions": "Add resource permissions",
+    "AddResourcePermissions": "Add permissions",
-    "UpdateResourcePermissions": "Update resource permissions",
+    "UpdateResourcePermissions": "Update permissions",
-    "Resource": "Resource",
-    "ResourceName": "Resource name",
-    "ResourceKey": "Resource key",
-    "ProviderName": "Provider name",
-    "ProviderKey": "Provider key",
     "GrantAllResourcePermissions": "Grant all",
-    "NoResourceProviderKeyLookupServiceFound": "There is no resource provider key lookup service was found",
+    "NoResourceProviderKeyLookupServiceFound": "There is no provider key lookup service was found",
-    "NoResourcePermissionFound": "There is no resource permission defined for the current resource."
+    "NoResourcePermissionFound": "There is no permission defined."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/es.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "¿Estás seguro de que quieres guardar sin ningún permiso?",
     "PermissionGroup": "Grupo de permisos",
     "Filter": "Filtrar",
-    "ResourcePermissions": "Permisos de recursos",
+    "ResourcePermissions": "Permisos",
     "ResourcePermissionTarget": "Objetivo",
     "ResourcePermissionPermissions": "Permisos",
-    "AddResourcePermission": "Agregar permisos de recursos",
+    "AddResourcePermission": "Agregar permiso",
-    "ResourcePermissionDeletionConfirmationMessage": "¿Está seguro de que desea eliminar estos permisos de recursos?",
+    "ResourcePermissionDeletionConfirmationMessage": "¿Está seguro de que desea eliminar todos los permisos?",
-    "AddResourcePermissions": "Agregar permisos de recursos",
+    "AddResourcePermissions": "Agregar permisos",
-    "UpdateResourcePermissions": "Actualizar permisos de recursos",
+    "UpdateResourcePermissions": "Actualizar permisos",
-    "Resource": "Recurso",
-    "ResourceName": "Nombre del recurso",
-    "ResourceKey": "Clave del recurso",
-    "ProviderName": "Nombre del proveedor",
-    "ProviderKey": "Clave del proveedor",
     "GrantAllResourcePermissions": "Conceder todos",
-    "NoResourceProviderKeyLookupServiceFound": "No se encontró ningún servicio de búsqueda de clave de proveedor de recursos",
+    "NoResourceProviderKeyLookupServiceFound": "No se encontró ningún servicio de búsqueda de clave de proveedor",
-    "NoResourcePermissionFound": "No hay ningún permiso de recurso definido para el recurso actual."
+    "NoResourcePermissionFound": "No hay ningún permiso definido."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fa.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "آیا مطمئن هستید که می خواهید بدون هیچ دسترسی ذخیره کنید؟",
     "PermissionGroup": "گروه دسترسی",
     "Filter": "فیلتر",
-    "ResourcePermissions": "دسترسی‌های منابع",
+    "ResourcePermissions": "دسترسی‌ها",
     "ResourcePermissionTarget": "هدف",
     "ResourcePermissionPermissions": "دسترسی‌ها",
-    "AddResourcePermission": "افزودن دسترسی‌های منابع",
+    "AddResourcePermission": "افزودن مجوز",
-    "ResourcePermissionDeletionConfirmationMessage": "آیا مطمئن هستید که می‌خواهید این دسترسی‌های منابع را حذف کنید؟",
+    "ResourcePermissionDeletionConfirmationMessage": "آیا مطمئن هستید که می‌خواهید همه مجوزها را حذف کنید؟",
-    "AddResourcePermissions": "افزودن دسترسی‌های منابع",
+    "AddResourcePermissions": "افزودن مجوزها",
-    "UpdateResourcePermissions": "به‌روزرسانی دسترسی‌های منابع",
+    "UpdateResourcePermissions": "به‌روزرسانی مجوزها",
-    "Resource": "منبع",
-    "ResourceName": "نام منبع",
-    "ResourceKey": "کلید منبع",
-    "ProviderName": "نام ارائه‌دهنده",
-    "ProviderKey": "کلید ارائه‌دهنده",
     "GrantAllResourcePermissions": "اعطای همه",
-    "NoResourceProviderKeyLookupServiceFound": "هیچ سرویس جستجوی کلید ارائه‌دهنده منبع یافت نشد",
+    "NoResourceProviderKeyLookupServiceFound": "هیچ سرویس جستجوی کلید ارائه‌دهنده یافت نشد",
-    "NoResourcePermissionFound": "هیچ مجوز منبعی برای منبع فعلی تعریف نشده است."
+    "NoResourcePermissionFound": "هیچ مجوزی تعریف نشده است."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fi.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Haluatko varmasti tallentaa ilman käyttöoikeuksia?",
     "PermissionGroup": "Käyttöoikeus",
     "Filter": "Suodatus",
-    "ResourcePermissions": "Resurssien käyttöoikeudet",
+    "ResourcePermissions": "Käyttöoikeudet",
     "ResourcePermissionTarget": "Kohde",
     "ResourcePermissionPermissions": "Käyttöoikeudet",
-    "AddResourcePermission": "Lisää resurssien käyttöoikeudet",
+    "AddResourcePermission": "Lisää käyttöoikeus",
-    "ResourcePermissionDeletionConfirmationMessage": "Oletko varma, että haluat poistaa nämä resurssien käyttöoikeudet?",
+    "ResourcePermissionDeletionConfirmationMessage": "Haluatko varmasti poistaa kaikki käyttöoikeudet?",
-    "AddResourcePermissions": "Lisää resurssien käyttöoikeudet",
+    "AddResourcePermissions": "Lisää käyttöoikeudet",
-    "UpdateResourcePermissions": "Päivitä resurssien käyttöoikeudet",
+    "UpdateResourcePermissions": "Päivitä käyttöoikeudet",
-    "Resource": "Resurssi",
-    "ResourceName": "Resurssin nimi",
-    "ResourceKey": "Resurssiavain",
-    "ProviderName": "Palveluntarjoajan nimi",
-    "ProviderKey": "Palveluntarjoajan avain",
     "GrantAllResourcePermissions": "Myönnä kaikki",
-    "NoResourceProviderKeyLookupServiceFound": "Resurssin tarjoajan avaimen hakupalvelua ei löytynyt",
+    "NoResourceProviderKeyLookupServiceFound": "Palveluntarjoajan avaimen hakupalvelua ei löytynyt",
-    "NoResourcePermissionFound": "Nykyiselle resurssille ei ole määritetty käyttöoikeutta."
+    "NoResourcePermissionFound": "Ei käyttöoikeuksia määritetty."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fr.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Êtes-vous sûr de vouloir enregistrer sans aucune autorisation ?",
     "PermissionGroup": "Groupe d'autorisations",
     "Filter": "Filtrer",
-    "ResourcePermissions": "Autorisations des ressources",
+    "ResourcePermissions": "Autorisations",
     "ResourcePermissionTarget": "Cible",
     "ResourcePermissionPermissions": "Autorisations",
-    "AddResourcePermission": "Ajouter des autorisations de ressources",
+    "AddResourcePermission": "Ajouter une autorisation",
-    "ResourcePermissionDeletionConfirmationMessage": "Êtes-vous sûr de vouloir supprimer ces autorisations de ressources ?",
+    "ResourcePermissionDeletionConfirmationMessage": "Êtes-vous sûr de vouloir supprimer toutes les autorisations ?",
-    "AddResourcePermissions": "Ajouter des autorisations de ressources",
+    "AddResourcePermissions": "Ajouter des autorisations",
-    "UpdateResourcePermissions": "Mettre à jour les autorisations de ressources",
+    "UpdateResourcePermissions": "Mettre à jour les autorisations",
-    "Resource": "Ressource",
-    "ResourceName": "Nom de la ressource",
-    "ResourceKey": "Clé de la ressource",
-    "ProviderName": "Nom du fournisseur",
-    "ProviderKey": "Clé du fournisseur",
     "GrantAllResourcePermissions": "Accorder tout",
-    "NoResourceProviderKeyLookupServiceFound": "Aucun service de recherche de clé de fournisseur de ressources n'a été trouvé",
+    "NoResourceProviderKeyLookupServiceFound": "Aucun service de recherche de clé de fournisseur n'a été trouvé",
-    "NoResourcePermissionFound": "Aucune autorisation de ressource n'est définie pour la ressource actuelle."
+    "NoResourcePermissionFound": "Aucune autorisation n'est définie."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hi.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "क्या आप वाकई बिना किसी अनुमति के सहेजना चाहते हैं?",
     "PermissionGroup": "अनुमति समूह",
     "Filter": "फ़िल्टर",
-    "ResourcePermissions": "संसाधन अनुमतियाँ",
+    "ResourcePermissions": "अनुमतियाँ",
     "ResourcePermissionTarget": "लक्ष्य",
     "ResourcePermissionPermissions": "अनुमतियाँ",
-    "AddResourcePermission": "संसाधन अनुमतियाँ जोड़ें",
+    "AddResourcePermission": "अनुमति जोड़ें",
-    "ResourcePermissionDeletionConfirmationMessage": "क्या आप वाकई इन संसाधन अनुमतियों को हटाना चाहते हैं?",
+    "ResourcePermissionDeletionConfirmationMessage": "क्या आप वाकई सभी अनुमतियां हटाना चाहते हैं?",
-    "AddResourcePermissions": "संसाधन अनुमतियाँ जोड़ें",
+    "AddResourcePermissions": "अनुमतियां जोड़ें",
-    "UpdateResourcePermissions": "संसाधन अनुमतियों को अपडेट करें",
+    "UpdateResourcePermissions": "अनुमतियां अपडेट करें",
-    "Resource": "संसाधन",
-    "ResourceName": "संसाधन का नाम",
-    "ResourceKey": "संसाधन कुंजी",
-    "ProviderName": "प्रदाता का नाम",
-    "ProviderKey": "प्रदाता कुंजी",
     "GrantAllResourcePermissions": "सभी प्रदान करें",
-    "NoResourceProviderKeyLookupServiceFound": "कोई संसाधन प्रदाता कुंजी खोज सेवा नहीं मिली",
+    "NoResourceProviderKeyLookupServiceFound": "कोई प्रदाता कुंजी खोज सेवा नहीं मिली",
-    "NoResourcePermissionFound": "वर्तमान संसाधन के लिए कोई संसाधन अनुमति परिभाषित नहीं है।"
+    "NoResourcePermissionFound": "कोई अनुमति परिभाषित नहीं है।"
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hr.json

@@ -9,20 +9,15 @@
         "SaveWithoutAnyPermissionsWarningMessage": "Jeste li sigurni da želite spremiti bez ikakvih dopuštenja?",
         "PermissionGroup": "Grupa dozvola",
         "Filter": "Filtriraj",
-        "ResourcePermissions": "Dozvole resursa",
+        "ResourcePermissions": "Dozvole",
         "ResourcePermissionTarget": "Cilj",
         "ResourcePermissionPermissions": "Dozvole",
-        "AddResourcePermission": "Dodaj dozvole resursa",
+        "AddResourcePermission": "Dodaj dozvolu",
-        "ResourcePermissionDeletionConfirmationMessage": "Jeste li sigurni da želite izbrisati ove dozvole resursa?",
+        "ResourcePermissionDeletionConfirmationMessage": "Jeste li sigurni da želite izbrisati sve dozvole?",
-        "AddResourcePermissions": "Dodaj dozvole resursa",
+        "AddResourcePermissions": "Dodaj dozvole",
-        "UpdateResourcePermissions": "Ažuriraj dozvole resursa",
+        "UpdateResourcePermissions": "Ažuriraj dozvole",
-        "Resource": "Resurs",
-        "ResourceName": "Naziv resursa",
-        "ResourceKey": "Ključ resursa",
-        "ProviderName": "Naziv pružatelja usluga",
-        "ProviderKey": "Ključ pružatelja usluga",
         "GrantAllResourcePermissions": "Dodijeli sve",
-        "NoResourceProviderKeyLookupServiceFound": "Nije pronađena usluga za pronalaženje ključa davatelja resursa",
+        "NoResourceProviderKeyLookupServiceFound": "Nije pronađena usluga za pronalaženje ključa pružatelja",
-        "NoResourcePermissionFound": "Za trenutni resurs nije definirano nijedno dopuštenje resursa."
+        "NoResourcePermissionFound": "Nijedna dozvola nije definirana."
     }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hu.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Biztos, hogy engedélyek nélkül akar menteni?",
     "PermissionGroup": "Engedélycsoport",
     "Filter": "Szűrő",
-    "ResourcePermissions": "Erőforrás-engedélyek",
+    "ResourcePermissions": "Engedélyek",
     "ResourcePermissionTarget": "Cél",
     "ResourcePermissionPermissions": "Engedélyek",
-    "AddResourcePermission": "Erőforrás-engedélyek hozzáadása",
+    "AddResourcePermission": "Engedély hozzáadása",
-    "ResourcePermissionDeletionConfirmationMessage": "Biztosan törölni szeretné ezeket az erőforrás-engedélyeket?",
+    "ResourcePermissionDeletionConfirmationMessage": "Biztosan törölni szeretné az összes engedélyt?",
-    "AddResourcePermissions": "Erőforrás-engedélyek hozzáadása",
+    "AddResourcePermissions": "Engedélyek hozzáadása",
-    "UpdateResourcePermissions": "Erőforrás-engedélyek frissítése",
+    "UpdateResourcePermissions": "Engedélyek frissítése",
-    "Resource": "Erőforrás",
-    "ResourceName": "Erőforrás neve",
-    "ResourceKey": "Erőforrás kulcs",
-    "ProviderName": "Szolgáltató neve",
-    "ProviderKey": "Szolgáltató kulcs",
     "GrantAllResourcePermissions": "Összes engedély megadása",
-    "NoResourceProviderKeyLookupServiceFound": "Nem található erőforrás-szolgáltató kulcs kereső szolgáltatás",
+    "NoResourceProviderKeyLookupServiceFound": "Nem található szolgáltató kulcs kereső szolgáltatás",
-    "NoResourcePermissionFound": "Az aktuális erőforráshoz nincs meghatározva erőforrás-engedély."
+    "NoResourcePermissionFound": "Nincs meghatározva engedély."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/is.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Ertu viss um að þú viljir vista án nokkurra heimilda?",
     "PermissionGroup": "Heimildahópur",
     "Filter": "Sía",
-    "ResourcePermissions": "Heimildir auðlinda",
+    "ResourcePermissions": "Heimildir",
     "ResourcePermissionTarget": "Markmið",
     "ResourcePermissionPermissions": "Heimildir",
-    "AddResourcePermission": "Bæta við heimildum auðlinda",
+    "AddResourcePermission": "Bæta við heimild",
-    "ResourcePermissionDeletionConfirmationMessage": "Ertu viss um að þú viljir eyða þessum heimildum auðlinda?",
+    "ResourcePermissionDeletionConfirmationMessage": "Ertu viss um að þú viljir eyða öllum heimildum?",
-    "AddResourcePermissions": "Bæta við heimildum auðlinda",
+    "AddResourcePermissions": "Bæta við heimildum",
-    "UpdateResourcePermissions": "Uppfæra heimildir auðlinda",
+    "UpdateResourcePermissions": "Uppfæra heimildir",
-    "Resource": "Auðlind",
-    "ResourceName": "Nafn auðlindar",
-    "ResourceKey": "Lykill auðlindar",
-    "ProviderName": "Nafn veitanda",
-    "ProviderKey": "Lykill veitanda",
     "GrantAllResourcePermissions": "Veita allt",
-    "NoResourceProviderKeyLookupServiceFound": "Engin þjónusta fannst til að leita að lykli auðlindaveitanda",
+    "NoResourceProviderKeyLookupServiceFound": "Engin þjónusta fannst til að leita að lykli veitanda",
-    "NoResourcePermissionFound": "Engin heimild er skilgreind fyrir núverandi auðlind."
+    "NoResourcePermissionFound": "Engin heimild er skilgreind."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/it.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Sei sicuro di voler salvare senza alcuna autorizzazione?",
     "PermissionGroup": "Gruppo di autorizzazioni",
     "Filter": "Filtro",
-    "ResourcePermissions": "Autorizzazioni delle risorse",
+    "ResourcePermissions": "Autorizzazioni",
     "ResourcePermissionTarget": "Obiettivo",
     "ResourcePermissionPermissions": "Autorizzazioni",
-    "AddResourcePermission": "Aggiungi autorizzazioni delle risorse",
+    "AddResourcePermission": "Aggiungi autorizzazione",
-    "ResourcePermissionDeletionConfirmationMessage": "Sei sicuro di voler eliminare queste autorizzazioni delle risorse?",
+    "ResourcePermissionDeletionConfirmationMessage": "Sei sicuro di voler eliminare tutte le autorizzazioni?",
-    "AddResourcePermissions": "Aggiungi autorizzazioni delle risorse",
+    "AddResourcePermissions": "Aggiungi autorizzazioni",
-    "UpdateResourcePermissions": "Aggiorna autorizzazioni delle risorse",
+    "UpdateResourcePermissions": "Aggiorna autorizzazioni",
-    "Resource": "Risorsa",
-    "ResourceName": "Nome della risorsa",
-    "ResourceKey": "Chiave della risorsa",
-    "ProviderName": "Nome del provider",
-    "ProviderKey": "Chiave del provider",
     "GrantAllResourcePermissions": "Concedi tutto",
-    "NoResourceProviderKeyLookupServiceFound": "Non è stato trovato alcun servizio di ricerca chiave provider risorse",
+    "NoResourceProviderKeyLookupServiceFound": "Non è stato trovato alcun servizio di ricerca chiave del provider",
-    "NoResourcePermissionFound": "Non è definita alcuna autorizzazione per la risorsa corrente."
+    "NoResourcePermissionFound": "Non è definita alcuna autorizzazione."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/nl.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Weet u zeker dat u zonder rechten wilt opslaan?",
     "PermissionGroup": "Rechtengroep",
     "Filter": "Filter",
-    "ResourcePermissions": "Bronrechten",
+    "ResourcePermissions": "Rechten",
     "ResourcePermissionTarget": "Doel",
     "ResourcePermissionPermissions": "Rechten",
-    "AddResourcePermission": "Bronrechten toevoegen",
+    "AddResourcePermission": "Recht toevoegen",
-    "ResourcePermissionDeletionConfirmationMessage": "Weet u zeker dat u deze bronrechten wilt verwijderen?",
+    "ResourcePermissionDeletionConfirmationMessage": "Weet u zeker dat u alle rechten wilt verwijderen?",
-    "AddResourcePermissions": "Bronrechten toevoegen",
+    "AddResourcePermissions": "Rechten toevoegen",
-    "UpdateResourcePermissions": "Bronrechten bijwerken",
+    "UpdateResourcePermissions": "Rechten bijwerken",
-    "Resource": "Bron",
-    "ResourceName": "Bronnaam",
-    "ResourceKey": "Bronsleutel",
-    "ProviderName": "Naam van provider",
-    "ProviderKey": "Providersleutel",
     "GrantAllResourcePermissions": "Alles toekennen",
-    "NoResourceProviderKeyLookupServiceFound": "Er is geen service gevonden voor het opzoeken van de sleutel van de bronprovider",
+    "NoResourceProviderKeyLookupServiceFound": "Er is geen service gevonden voor het opzoeken van de sleutel van de provider",
-    "NoResourcePermissionFound": "Er is geen bronmachtiging gedefinieerd voor de huidige bron."
+    "NoResourcePermissionFound": "Er is geen machtiging gedefinieerd."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pl-PL.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Czy na pewno chcesz zapisać bez żadnych uprawnień?",
     "PermissionGroup": "Grupa uprawnień",
     "Filter": "Filtr",
-    "ResourcePermissions": "Uprawnienia zasobów",
+    "ResourcePermissions": "Uprawnienia",
     "ResourcePermissionTarget": "Cel",
     "ResourcePermissionPermissions": "Uprawnienia",
-    "AddResourcePermission": "Dodaj uprawnienia zasobów",
+    "AddResourcePermission": "Dodaj uprawnienie",
-    "ResourcePermissionDeletionConfirmationMessage": "Czy na pewno chcesz usunąć te uprawnienia zasobów?",
+    "ResourcePermissionDeletionConfirmationMessage": "Czy na pewno chcesz usunąć wszystkie uprawnienia?",
-    "AddResourcePermissions": "Dodaj uprawnienia zasobów",
+    "AddResourcePermissions": "Dodaj uprawnienia",
-    "UpdateResourcePermissions": "Zaktualizuj uprawnienia zasobów",
+    "UpdateResourcePermissions": "Zaktualizuj uprawnienia",
-    "Resource": "Zasób",
-    "ResourceName": "Nazwa zasobu",
-    "ResourceKey": "Klucz zasobu",
-    "ProviderName": "Nazwa dostawcy",
-    "ProviderKey": "Klucz dostawcy",
     "GrantAllResourcePermissions": "Przyznaj wszystko",
-    "NoResourceProviderKeyLookupServiceFound": "Nie znaleziono usługi wyszukiwania klucza dostawcy zasobów",
+    "NoResourceProviderKeyLookupServiceFound": "Nie znaleziono usługi wyszukiwania klucza dostawcy",
-    "NoResourcePermissionFound": "Nie zdefiniowano żadnych uprawnień do zasobów dla bieżącego zasobu."
+    "NoResourcePermissionFound": "Nie zdefiniowano żadnych uprawnień."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pt-BR.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Tem certeza que deseja salvar sem nenhuma permissão?",
     "PermissionGroup": "Grupo de permissão",
     "Filter": "Filtrar",
-    "ResourcePermissions": "Permissões de recursos",
+    "ResourcePermissions": "Permissões",
     "ResourcePermissionTarget": "Alvo",
     "ResourcePermissionPermissions": "Permissões",
-    "AddResourcePermission": "Adicionar permissões de recursos",
+    "AddResourcePermission": "Adicionar permissão",
-    "ResourcePermissionDeletionConfirmationMessage": "Tem certeza de que deseja excluir essas permissões de recursos?",
+    "ResourcePermissionDeletionConfirmationMessage": "Tem certeza de que deseja excluir todas as permissões?",
-    "AddResourcePermissions": "Adicionar permissões de recursos",
+    "AddResourcePermissions": "Adicionar permissões",
-    "UpdateResourcePermissions": "Atualizar permissões de recursos",
+    "UpdateResourcePermissions": "Atualizar permissões",
-    "Resource": "Recurso",
-    "ResourceName": "Nome do recurso",
-    "ResourceKey": "Chave do recurso",
-    "ProviderName": "Nome do provedor",
-    "ProviderKey": "Chave do provedor",
     "GrantAllResourcePermissions": "Conceder tudo",
-    "NoResourceProviderKeyLookupServiceFound": "Nenhum serviço de pesquisa de chave de provedor de recursos foi encontrado",
+    "NoResourceProviderKeyLookupServiceFound": "Nenhum serviço de pesquisa de chave do provedor foi encontrado",
-    "NoResourcePermissionFound": "Não há permissão de recurso definida para o recurso atual."
+    "NoResourcePermissionFound": "Nenhuma permissão foi definida."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ro-RO.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Sigur doriți să salvați fără nicio permisiune?",
     "PermissionGroup": "Grup de permisiuni",
     "Filter": "Filtru",
-    "ResourcePermissions": "Permisiuni pentru resurse",
+    "ResourcePermissions": "Permisiuni",
     "ResourcePermissionTarget": "Țintă",
     "ResourcePermissionPermissions": "Permisiuni",
-    "AddResourcePermission": "Adăugați permisiuni pentru resurse",
+    "AddResourcePermission": "Adăugați permisiune",
-    "ResourcePermissionDeletionConfirmationMessage": "Sigur doriți să ștergeți aceste permisiuni pentru resurse?",
+    "ResourcePermissionDeletionConfirmationMessage": "Sigur doriți să ștergeți toate permisiunile?",
-    "AddResourcePermissions": "Adăugați permisiuni pentru resurse",
+    "AddResourcePermissions": "Adăugați permisiuni",
-    "UpdateResourcePermissions": "Actualizați permisiunile pentru resurse",
+    "UpdateResourcePermissions": "Actualizați permisiunile",
-    "Resource": "Resursă",
-    "ResourceName": "Numele resursei",
-    "ResourceKey": "Cheia resursei",
-    "ProviderName": "Numele furnizorului",
-    "ProviderKey": "Cheia furnizorului",
     "GrantAllResourcePermissions": "Acordați toate",
-    "NoResourceProviderKeyLookupServiceFound": "Nu a fost găsit niciun serviciu de căutare a cheii furnizorului de resurse",
+    "NoResourceProviderKeyLookupServiceFound": "Nu a fost găsit niciun serviciu de căutare a cheii furnizorului",
-    "NoResourcePermissionFound": "Nu există nicio permisiune de resursă definită pentru resursa curentă."
+    "NoResourcePermissionFound": "Nu există nicio permisiune definită."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ru.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Вы уверены, что хотите сохранить без каких-либо разрешений?",
     "PermissionGroup": "Группа разрешений",
     "Filter": "Фильтр",
-    "ResourcePermissions": "Разрешения ресурсов",
+    "ResourcePermissions": "Разрешения",
     "ResourcePermissionTarget": "Цель",
     "ResourcePermissionPermissions": "Разрешения",
-    "AddResourcePermission": "Добавить разрешения ресурсов",
+    "AddResourcePermission": "Добавить разрешение",
-    "ResourcePermissionDeletionConfirmationMessage": "Вы уверены, что хотите удалить эти разрешения ресурсов?",
+    "ResourcePermissionDeletionConfirmationMessage": "Вы уверены, что хотите удалить все разрешения?",
-    "AddResourcePermissions": "Добавить разрешения ресурсов",
+    "AddResourcePermissions": "Добавить разрешения",
-    "UpdateResourcePermissions": "Обновить разрешения ресурсов",
+    "UpdateResourcePermissions": "Обновить разрешения",
-    "Resource": "Ресурс",
-    "ResourceName": "Имя ресурса",
-    "ResourceKey": "Ключ ресурса",
-    "ProviderName": "Имя поставщика",
-    "ProviderKey": "Ключ поставщика",
     "GrantAllResourcePermissions": "Предоставить все",
-    "NoResourceProviderKeyLookupServiceFound": "Служба поиска ключа поставщика ресурсов не найдена",
+    "NoResourceProviderKeyLookupServiceFound": "Служба поиска ключа поставщика не найдена",
-    "NoResourcePermissionFound": "Для текущего ресурса не определено ни одного разрешения."
+    "NoResourcePermissionFound": "Не определено ни одного разрешения."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sk.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Naozaj chcete ukladať bez akýchkoľvek povolení?",
     "PermissionGroup": "Skupina oprávnení",
     "Filter": "Filtrovať",
-    "ResourcePermissions": "Oprávnenia zdrojov",
+    "ResourcePermissions": "Oprávnenia",
     "ResourcePermissionTarget": "Cieľ",
     "ResourcePermissionPermissions": "Oprávnenia",
-    "AddResourcePermission": "Pridať oprávnenia zdrojov",
+    "AddResourcePermission": "Pridať oprávnenie",
-    "ResourcePermissionDeletionConfirmationMessage": "Naozaj chcete odstrániť tieto oprávnenia zdrojov?",
+    "ResourcePermissionDeletionConfirmationMessage": "Naozaj chcete odstrániť všetky oprávnenia?",
-    "AddResourcePermissions": "Pridať oprávnenia zdrojov",
+    "AddResourcePermissions": "Pridať oprávnenia",
-    "UpdateResourcePermissions": "Aktualizovať oprávnenia zdrojov",
+    "UpdateResourcePermissions": "Aktualizovať oprávnenia",
-    "Resource": "Zdroj",
-    "ResourceName": "Názov zdroja",
-    "ResourceKey": "Kľúč zdroja",
-    "ProviderName": "Názov poskytovateľa",
-    "ProviderKey": "Kľúč poskytovateľa",
     "GrantAllResourcePermissions": "Udeľ všetko",
-    "NoResourceProviderKeyLookupServiceFound": "Nebola nájdená služba na vyhľadávanie kľúča poskytovateľa zdrojov",
+    "NoResourceProviderKeyLookupServiceFound": "Nebola nájdená služba na vyhľadávanie kľúča poskytovateľa",
-    "NoResourcePermissionFound": "Pre aktuálny zdroj nie je definované žiadne povolenie."
+    "NoResourcePermissionFound": "Nie je definované žiadne povolenie."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sl.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Ali ste prepričani, da želite shraniti brez kakršnih koli dovoljenj?",
     "PermissionGroup": "Skupina dovoljenj",
     "Filter": "Filtriraj",
-    "ResourcePermissions": "Dovoljenja virov",
+    "ResourcePermissions": "Dovoljenja",
     "ResourcePermissionTarget": "Cilj",
     "ResourcePermissionPermissions": "Dovoljenja",
-    "AddResourcePermission": "Dodaj dovoljenja virov",
+    "AddResourcePermission": "Dodaj dovoljenje",
-    "ResourcePermissionDeletionConfirmationMessage": "Ali ste prepričani, da želite izbrisati ta dovoljenja virov?",
+    "ResourcePermissionDeletionConfirmationMessage": "Ali ste prepričani, da želite izbrisati vsa dovoljenja?",
-    "AddResourcePermissions": "Dodaj dovoljenja virov",
+    "AddResourcePermissions": "Dodaj dovoljenja",
-    "UpdateResourcePermissions": "Posodobi dovoljenja virov",
+    "UpdateResourcePermissions": "Posodobi dovoljenja",
-    "Resource": "Vir",
-    "ResourceName": "Ime vira",
-    "ResourceKey": "Ključ vira",
-    "ProviderName": "Ime ponudnika",
-    "ProviderKey": "Ključ ponudnika",
     "GrantAllResourcePermissions": "Dodeli vse",
-    "NoResourceProviderKeyLookupServiceFound": "Ni bilo mogoče najti storitve za iskanje ključa ponudnika virov",
+    "NoResourceProviderKeyLookupServiceFound": "Ni bilo mogoče najti storitve za iskanje ključa ponudnika",
-    "NoResourcePermissionFound": "Za trenutni vir ni določeno nobeno dovoljenje."
+    "NoResourcePermissionFound": "Nobeno dovoljenje ni določeno."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sv.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Är du säker på att du vill spara utan några behörigheter?",
     "PermissionGroup": "Behörighetsgrupp",
     "Filter": "Filtrera",
-    "ResourcePermissions": "Resursbehörigheter",
+    "ResourcePermissions": "Behörigheter",
     "ResourcePermissionTarget": "Mål",
     "ResourcePermissionPermissions": "Behörigheter",
-    "AddResourcePermission": "Lägg till resursbehörigheter",
+    "AddResourcePermission": "Lägg till behörighet",
-    "ResourcePermissionDeletionConfirmationMessage": "Är du säker på att du vill ta bort dessa resursbehörigheter?",
+    "ResourcePermissionDeletionConfirmationMessage": "Är du säker på att du vill ta bort alla behörigheter?",
-    "AddResourcePermissions": "Lägg till resursbehörigheter",
+    "AddResourcePermissions": "Lägg till behörigheter",
-    "UpdateResourcePermissions": "Uppdatera resursbehörigheter",
+    "UpdateResourcePermissions": "Uppdatera behörigheter",
-    "Resource": "Resurs",
-    "ResourceName": "Resursnamn",
-    "ResourceKey": "Resursnyckel",
-    "ProviderName": "Leverantörsnamn",
-    "ProviderKey": "Leverantörsnyckel",
     "GrantAllResourcePermissions": "Bevilja alla",
-    "NoResourceProviderKeyLookupServiceFound": "Ingen tjänst för att söka efter nyckel till resursleverantör hittades",
+    "NoResourceProviderKeyLookupServiceFound": "Ingen tjänst för att söka efter leverantörsnyckel hittades",
-    "NoResourcePermissionFound": "Det finns ingen resursbehörighet definierad för den aktuella resursen."
+    "NoResourcePermissionFound": "Ingen behörighet är definierad."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/tr.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Hiçbir izin olmadan kaydetmek istediğinize emin misiniz?",
     "PermissionGroup": "İzin Grubu",
     "Filter": "Filtre",
-    "ResourcePermissions": "Kaynak izinleri",
+    "ResourcePermissions": "İzinler",
     "ResourcePermissionTarget": "Hedef",
     "ResourcePermissionPermissions": "İzinler",
-    "AddResourcePermission": "Kaynak izinleri ekle",
+    "AddResourcePermission": "İzin ekle",
-    "ResourcePermissionDeletionConfirmationMessage": "Bu kaynak izinlerini silmek istediğinizden emin misiniz?",
+    "ResourcePermissionDeletionConfirmationMessage": "Tüm izinleri silmek istediğinizden emin misiniz?",
-    "AddResourcePermissions": "Kaynak izinleri ekle",
+    "AddResourcePermissions": "İzinler ekle",
-    "UpdateResourcePermissions": "Kaynak izinlerini güncelle",
+    "UpdateResourcePermissions": "İzinleri güncelle",
-    "Resource": "Kaynak",
-    "ResourceName": "Kaynak adı",
-    "ResourceKey": "Kaynak anahtarı",
-    "ProviderName": "Sağlayıcı adı",
-    "ProviderKey": "Sağlayıcı anahtarı",
     "GrantAllResourcePermissions": "Tümünü ver",
-    "NoResourceProviderKeyLookupServiceFound": "Herhangi bir kaynak sağlayıcı anahtar arama hizmeti bulunamadı",
+    "NoResourceProviderKeyLookupServiceFound": "Herhangi bir sağlayıcı anahtar arama hizmeti bulunamadı",
-    "NoResourcePermissionFound": "Geçerli kaynak için tanımlı bir kaynak izni yok."
+    "NoResourcePermissionFound": "Herhangi bir izin tanımlı değil."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/vi.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "Bạn có chắc chắn muốn lưu mà không có bất kỳ quyền nào không?",
     "PermissionGroup": "Nhóm quyền",
     "Filter": "Lọc",
-    "ResourcePermissions": "Quyền tài nguyên",
+    "ResourcePermissions": "Quyền",
     "ResourcePermissionTarget": "Mục tiêu",
     "ResourcePermissionPermissions": "Quyền",
-    "AddResourcePermission": "Thêm quyền tài nguyên",
+    "AddResourcePermission": "Thêm quyền",
-    "ResourcePermissionDeletionConfirmationMessage": "Bạn có chắc chắn muốn xóa các quyền tài nguyên này không?",
+    "ResourcePermissionDeletionConfirmationMessage": "Bạn có chắc chắn muốn xóa tất cả quyền không?",
-    "AddResourcePermissions": "Thêm quyền tài nguyên",
+    "AddResourcePermissions": "Thêm các quyền",
-    "UpdateResourcePermissions": "Cập nhật quyền tài nguyên",
+    "UpdateResourcePermissions": "Cập nhật các quyền",
-    "Resource": "Tài nguyên",
-    "ResourceName": "Tên tài nguyên",
-    "ResourceKey": "Khóa tài nguyên",
-    "ProviderName": "Tên nhà cung cấp",
-    "ProviderKey": "Khóa nhà cung cấp",
     "GrantAllResourcePermissions": "Cấp tất cả",
-    "NoResourceProviderKeyLookupServiceFound": "Không tìm thấy dịch vụ tra cứu khóa nhà cung cấp tài nguyên",
+    "NoResourceProviderKeyLookupServiceFound": "Không tìm thấy dịch vụ tra cứu khóa nhà cung cấp",
-    "NoResourcePermissionFound": "Không có quyền tài nguyên nào được định nghĩa cho tài nguyên hiện tại."
+    "NoResourcePermissionFound": "Không có quyền nào được định nghĩa."
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hans.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "您确定要在没有任何权限的情况下保存吗？",
     "PermissionGroup": "权限组",
     "Filter": "过滤",
-    "ResourcePermissions": "资源权限",
+    "ResourcePermissions": "权限",
     "ResourcePermissionTarget": "目标",
     "ResourcePermissionPermissions": "权限",
-    "AddResourcePermission": "添加资源权限",
+    "AddResourcePermission": "添加权限",
-    "ResourcePermissionDeletionConfirmationMessage": "您确定要删除这些资源权限吗？",
+    "ResourcePermissionDeletionConfirmationMessage": "您确定要删除所有权限吗？",
-    "AddResourcePermissions": "添加资源权限",
+    "AddResourcePermissions": "添加权限",
-    "UpdateResourcePermissions": "更新资源权限",
+    "UpdateResourcePermissions": "更新权限",
-    "Resource": "资源",
-    "ResourceName": "资源名称",
-    "ResourceKey": "资源键",
-    "ProviderName": "提供者名称",
-    "ProviderKey": "提供者键",
     "GrantAllResourcePermissions": "授予所有",
-    "NoResourceProviderKeyLookupServiceFound": "未找到资源提供者键查找服务",
+    "NoResourceProviderKeyLookupServiceFound": "未找到提供者键查找服务",
-    "NoResourcePermissionFound": "当前资源未定义任何资源权限。"
+    "NoResourcePermissionFound": "未定义任何权限。"
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hant.json

@@ -9,20 +9,15 @@
     "SaveWithoutAnyPermissionsWarningMessage": "您確定要在沒有任何權限的情況下保存嗎？",
     "PermissionGroup": "權限組",
     "Filter": "過濾",
-    "ResourcePermissions": "資源權限",
+    "ResourcePermissions": "權限",
     "ResourcePermissionTarget": "目標",
     "ResourcePermissionPermissions": "權限",
-    "AddResourcePermission": "添加資源權限",
+    "AddResourcePermission": "添加權限",
-    "ResourcePermissionDeletionConfirmationMessage": "您確定要刪除這些資源權限嗎？",
+    "ResourcePermissionDeletionConfirmationMessage": "您確定要刪除所有權限嗎？",
-    "AddResourcePermissions": "添加資源權限",
+    "AddResourcePermissions": "添加權限",
-    "UpdateResourcePermissions": "更新資源權限",
+    "UpdateResourcePermissions": "更新權限",
-    "Resource": "資源",
-    "ResourceName": "資源名稱",
-    "ResourceKey": "資源鍵",
-    "ProviderName": "提供者名稱",
-    "ProviderKey": "提供者鍵",
     "GrantAllResourcePermissions": "授予所有",
-    "NoResourceProviderKeyLookupServiceFound": "未找到資源提供者鍵查找服務",
+    "NoResourceProviderKeyLookupServiceFound": "未找到提供者鍵查找服務",
-    "NoResourcePermissionFound": "當前資源未定義任何資源權限。"
+    "NoResourcePermissionFound": "未定義任何權限。"
   }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionProviderWithPermissions.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Volo.Abp.Localization;
 
 namespace Volo.Abp.PermissionManagement;
 
@@ -10,6 +11,8 @@ public class PermissionProviderWithPermissions
 
     public string ProviderDisplayName { get; set; }
 
+    public ILocalizableString ProviderNameDisplayName { get; set; }
+
     public List<string> Permissions { get; set; }
 
     public PermissionProviderWithPermissions(string providerName, string providerKey, string providerDisplayName)

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/ResourcePermissionManager.cs

@@ -217,7 +217,7 @@ public class ResourcePermissionManager : IResourcePermissionManager, ISingletonD
                 {
                     continue;
                 }
-                var keys = resourcePermissionProvider.Select(rp => rp.ProviderKey).ToList();
+                var keys = resourcePermissionProvider.Select(rp => rp.ProviderKey).Distinct().ToList();
                 providerKeyInfos.Add(resourcePermissionProvider.Key, await providerKeyLookupService.SearchAsync(keys.ToArray()));
             }
 
@@ -232,6 +232,8 @@ public class ResourcePermissionManager : IResourcePermissionManager, ISingletonD
                 if (providerKeyInfo != null)
                 {
                     item.ProviderDisplayName = providerKeyInfo.ProviderDisplayName;
+                    item.ProviderNameDisplayName = providerKeyLookupServices
+                        .FirstOrDefault(s => s.Name == item.ProviderName)?.DisplayName;
                 }
             }
         }
@@ -374,7 +376,7 @@ public class ResourcePermissionManager : IResourcePermissionManager, ISingletonD
             return multiplePermissionWithGrantedProviders;
         }
 
-        foreach (var provider in ManagementProviders)
+        foreach (var provider in ManagementProviders.Where(x => x.Name == providerName))
         {
             permissionNames = resourcePermissions.Select(x => x.Name).ToArray();
             var multiplePermissionValueProviderGrantInfo = await provider.CheckAsync(permissionNames, resourceName, resourceKey, providerName, providerKey);

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/AddResourcePermissionManagementModal.cshtml

@@ -16,45 +16,35 @@
 
 <form method="post" asp-page="/AbpPermissionManagement/AddResourcePermissionManagementModal" id="addResourcePermissionManagementForm">
     <abp-modal id="addResourcePermissionManagementModal">
-        <abp-modal-header title="@(L["AddResourcePermissions"].Value)"></abp-modal-header>
+        <abp-modal-header title="@(L["AddResourcePermission"].Value)"></abp-modal-header>
         <input asp-for="@Model.ResourceName" />
         <input asp-for="@Model.ResourceKey" />
         <input asp-for="@Model.ResourceDisplayName" />
         <abp-modal-body>
             <div class="mb-3">
-                <label class="form-label">@L["Resource"]:</label>
-                <p>@Model.ResourceDisplayName</p>
-            </div>
-            <div class="mb-3">
-                <label class="form-label">@L["ProviderName"]:</label>
                 <div class="mb-1">
                     @foreach (var provider in Model.ResourceProviders.Providers.Select((value, i) => new { i, value }))
                     {
                         <div class="form-check form-check-inline">
-                            <input class="form-check-input" type="radio" checked="@(provider.i == 0)" name="AddModel.ProviderName" id="@provider.value.Name" value="@provider.value.Name">
+                            <input class="form-check-input" type="radio" checked="@(provider.i == 0)" name="AddModel.ProviderName" id="@provider.value.Name.Replace(".", "")" value="@provider.value.Name">
-                            <label class="form-check-label" for="@provider.value">@provider.value.DisplayName</label>
+                            <label class="form-check-label" for="@provider.value.Name.Replace(".", "-")">@provider.value.DisplayName</label>
                         </div>
                     }
                 </div>
-            </div>
+                <select asp-for="@Model.AddModel.ProviderKey" data-val="true" data-val-required="@L["ThisFieldIsRequired."].Value" id="AddModel_ProviderKey" name="AddModel.ProviderKey" value="" class="form-control"></select>
-            <div class="mb-3">
-                <label class="form-label" for="AddModel_ProviderKey">@L["ProviderKey"]:<span> * </span></label>
-                <select asp-for="@Model.AddModel.ProviderKey" data-val="true" data-val-required="The ProviderKey field is required." id="AddModel_ProviderKey" name="AddModel.ProviderKey" value="" class="form-control"></select>
                 <span class="text-danger field-validation-valid" data-valmsg-for="AddModel.ProviderKey" data-valmsg-replace="true"></span>
             </div>
-            <div class="mb-3" id="permissionList">
+            <div class="position-relative mb-3" id="permissionList">
-                <div class="mb-1 d-flex align-items-center justify-content-between">
+                <h4>@L["ResourcePermissionPermissions"]</h4>
-                    <label class="form-labe">@L["ResourcePermissionPermissions"]:</label>
+                <div class="form-check form-switch mb-2">
-                    <div class="form-check form-switch">
+                    <input class="form-check-input" id="grantAllresourcePermissions" type="checkbox">
-                        <input class="form-check-input" id="grantAllresourcePermissions" type="checkbox">
+                    <label class="form-check-label" for="grantAllresourcePermissions">@L["GrantAllResourcePermissions"]</label>
-                        <label class="form-check-label" for="grantAllresourcePermissions">@L["GrantAllResourcePermissions"]</label>
-                    </div>
                 </div>
                 @foreach (var permission in Model.ResourcePermissionDefinitions.Permissions)
                 {
                     <div class="form-check">
-                        <input class="form-check-input" type="checkbox" name="AddModel.Permissions[]" id="@permission.Name" value="@permission.Name">
+                        <input class="form-check-input" type="checkbox" name="AddModel.Permissions[]" id="@permission.Name.Replace(".", "")" value="@permission.Name">
-                        <label class="form-check-label" for="@permission.Name">@permission.DisplayName</label>
+                        <label class="form-check-label" for="@permission.Name.Replace(".", "")">@permission.DisplayName</label>
                     </div>
                 }
             </div>

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/ResourcePermissionManagementModal.cshtml

@@ -18,10 +18,9 @@
 
     <form method="post" asp-page="/AbpPermissionManagement/ResourcePermissionManagementModal">
         <abp-modal size="ExtraLarge">
-            <abp-modal-header title="@(L["ResourcePermissions"].Value) - @Model.ResourceDisplayName"></abp-modal-header>
+            <abp-modal-header title="@(L["ResourcePermissions"].Value)"></abp-modal-header>
             <input asp-for="@Model.ResourceName" />
             <input asp-for="@Model.ResourceKey" />
-            <input asp-for="@Model.ResourceDisplayName" />
             <abp-modal-body>
                 <div class="d-grid gap-2 mb-2 d-md-flex justify-content-md-end">
                     <button class="btn btn-sm btn-primary" id="addPermission" type="button">@L["AddResourcePermission"]</button>

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/ResourcePermissionManagementModal.cshtml.cs

@@ -18,10 +18,6 @@ public class ResourcePermissionManagementModal : AbpPageModel
     [BindProperty(SupportsGet = true)]
     public string ResourceKey { get; set; }
 
-    [HiddenInput]
-    [BindProperty(SupportsGet = true)]
-    public string ResourceDisplayName { get; set; }
-
     public bool HasAnyResourcePermission { get; set; }
     public bool HasAnyResourceProviderKeyLookupService { get; set; }
 

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/UpdateResourcePermissionManagementModal.cshtml

@@ -22,23 +22,17 @@
         <input asp-for="@Model.ProviderName" />
         <input asp-for="@Model.ProviderKey" />
         <abp-modal-body>
-            <div class="mb-3">
-                <label class="form-label">@L["Resource"]:</label>
-                <p>@Model.ResourceDisplayName</p>
-            </div>
             <div class="mb-3" id="permissionList">
-                <div class="mb-1 d-flex align-items-center justify-content-between">
+                <h4>@L["ResourcePermissionPermissions"]</h4>
-                    <label class="form-labe">@L["ResourcePermissionPermissions"]:</label>
+                <div class="form-check form-switch mb-2">
-                    <div class="form-check form-switch">
+                    <input class="form-check-input" id="grantAllresourcePermissions" type="checkbox" checked="@Model.ResourcePermissions.Permissions.All(x => x.IsGranted)">
-                        <input class="form-check-input" id="grantAllresourcePermissions" type="checkbox" checked="@Model.ResourcePermissions.Permissions.All(x => x.IsGranted)">
+                    <label class="form-check-label" for="grantAllresourcePermissions">@L["GrantAllResourcePermissions"]</label>
-                        <label class="form-check-label" for="grantAllresourcePermissions">Grant all</label>
-                    </div>
                 </div>
                 @foreach (var permission in Model.ResourcePermissions.Permissions)
                 {
                     <div class="form-check">
-                        <input class="form-check-input" type="checkbox" name="UpdateModel.Permissions[]" id="@permission.Name" value="@permission.Name" checked="@permission.IsGranted">
+                        <input class="form-check-input" type="checkbox" name="UpdateModel.Permissions[]" id="@permission.Name.Replace(".", "")" value="@permission.Name" checked="@permission.IsGranted">
-                        <label class="form-check-label" for="@permission.Name">@permission.DisplayName</label>
+                        <label class="form-check-label" for="@permission.Name.Replace(".", "")">@permission.DisplayName</label>
                     </div>
                 }
             </div>

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/add-resource-permission-management-modal.js

@@ -54,10 +54,38 @@ var abp = abp || {};
         if ($providerKey.val()) {
             $permissionManagementForm.valid();
         }
+        var providerKey = $providerKey.val();
+        if (!providerKey) {
+            $items.prop('checked', false);
+            $all.prop("checked", false);
+            return;
+        }
+
+        abp.ui.setBusy('#permissionList');
+        var resourceName = $("#ResourceName").val();
+        var resourceKey = $("#ResourceKey").val();
+        var providerName = $('input[name="AddModel.ProviderName"]:checked').val();
+        volo.abp.permissionManagement.permissions.getResourceByProvider(resourceName, resourceKey, providerName, providerKey).then(function (result) {
+            abp.ui.clearBusy();
+            var grantedPermissionNames = result.permissions.filter(function (p) {
+                return p.isGranted === true;
+            }).map(function (p) {
+                return p.name;
+            });
+            $items.each(function () {
+                var $checkbox = $(this);
+                if (grantedPermissionNames.indexOf($checkbox.val()) >= 0) {
+                    $checkbox.prop('checked', true);
+                } else {
+                    $checkbox.prop('checked', false);
+                }
+            });
+            $all.prop("checked", $items.length === $items.filter(":checked").length);
+        });
     });
 
     $permissionManagementForm.submit(function () {
-         $(this).valid();
+        $(this).valid();
     });
 
 })(jQuery);

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/resource-permission-management-modal.js

@@ -60,7 +60,7 @@ var abp = abp || {};
                         title: l("ResourcePermissionTarget"),
                         data: 'providerName',
                         render: function (data, type, row) {
-                            return '<span class="d-inline-block bg-light rounded-pill px-2 me-1 ms-1 mb-1">' + row.providerName + '</span>' + row.providerDisplayName;
+                            return '<span class="d-inline-block bg-light rounded-pill px-2 me-1 ms-1 mb-1" data-bs-toggle="tooltip" data-bs-placement="right" data-bs-title="' + row.providerNameDisplayName + '">' + row.providerName + '</span>' + row.providerDisplayName;
                         },
                     },
                     {