Use RequiredPermissionName for all ApplicationMenuItem & ToolbarItem.

Resolve #7883

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs

@@ -52,7 +52,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars
             if (requiredPermissionItems.Any())
             {
                 var permissionChecker = serviceProvider.GetRequiredService<IPermissionChecker>();
-                var grantResult = await permissionChecker.IsGrantedAsync(requiredPermissionItems.Select(x => x.RequiredPermissionName).ToArray());
+                var grantResult = await permissionChecker.IsGrantedAsync(requiredPermissionItems.Select(x => x.RequiredPermissionName).Distinct().ToArray());
 
                 var toBeDeleted = new HashSet<ToolbarItem>();
                 foreach (var item in requiredPermissionItems)

framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs

@@ -51,7 +51,7 @@ namespace Volo.Abp.UI.Navigation
             if (requiredPermissionItems.Any())
             {
                 var permissionChecker = serviceProvider.GetRequiredService<IPermissionChecker>();
-                var grantResult = await permissionChecker.IsGrantedAsync(requiredPermissionItems.Select(x => x.RequiredPermissionName).ToArray());
+                var grantResult = await permissionChecker.IsGrantedAsync(requiredPermissionItems.Select(x => x.RequiredPermissionName).Distinct().ToArray());
 
                 var toBeDeleted = new HashSet<ApplicationMenuItem>();
                 foreach (var menu in requiredPermissionItems)

modules/blogging/src/Volo.Blogging.Admin.Web/BloggingAdminMenuContributor.cs

@@ -18,18 +18,11 @@ namespace Volo.Blogging.Admin
         {
             var l = context.GetLocalizer<BloggingResource>();
 
-            if (await context.IsGrantedAsync(BloggingPermissions.Blogs.Management))
-            {
-                var managementRootMenuItem = new ApplicationMenuItem("BlogManagement", l["Menu:BlogManagement"]);
+            var managementRootMenuItem = new ApplicationMenuItem("BlogManagement", l["Menu:BlogManagement"], requiredPermissionName: BloggingPermissions.Blogs.Management);
 
-                //TODO: Using the same permission. Reconsider.
-                if (await context.IsGrantedAsync(BloggingPermissions.Blogs.Management))
-                {
-                    managementRootMenuItem.AddItem(new ApplicationMenuItem("BlogManagement.Blogs", l["Menu:Blogs"], "~/Blogging/Admin/Blogs"));
-                }
+            managementRootMenuItem.AddItem(new ApplicationMenuItem("BlogManagement.Blogs", l["Menu:Blogs"], "~/Blogging/Admin/Blogs", requiredPermissionName: BloggingPermissions.Blogs.Management));
 
-                context.Menu.GetAdministration().AddItem(managementRootMenuItem);
-            }
+            context.Menu.GetAdministration().AddItem(managementRootMenuItem);
         }
     }
 }

modules/docs/src/Volo.Docs.Admin.Web/Navigation/DocsMenuContributor.cs

@@ -27,15 +27,8 @@ namespace Volo.Docs.Admin.Navigation
 
             administrationMenu.AddItem(rootMenuItem);
 
-            if (await context.IsGrantedAsync(DocsAdminPermissions.Projects.Default))
-            {
-                rootMenuItem.AddItem(new ApplicationMenuItem(DocsMenuNames.Projects, l["Menu:ProjectManagement"], "~/Docs/Admin/Projects"));
-            }
-
-            if (await context.IsGrantedAsync(DocsAdminPermissions.Documents.Default))
-            {
-                rootMenuItem.AddItem(new ApplicationMenuItem(DocsMenuNames.Documents, l["Menu:DocumentManagement"], "~/Docs/Admin/Documents"));
-            }
+            rootMenuItem.AddItem(new ApplicationMenuItem(DocsMenuNames.Projects, l["Menu:ProjectManagement"], "~/Docs/Admin/Projects", requiredPermissionName: DocsAdminPermissions.Projects.Default));
+            rootMenuItem.AddItem(new ApplicationMenuItem(DocsMenuNames.Documents, l["Menu:DocumentManagement"], "~/Docs/Admin/Documents", requiredPermissionName: DocsAdminPermissions.Documents.Default));
         }
     }
 }

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/AbpTenantManagementWebMainMenuContributor.cs

@@ -23,10 +23,7 @@ namespace Volo.Abp.TenantManagement.Web.Navigation
             var tenantManagementMenuItem = new ApplicationMenuItem(TenantManagementMenuNames.GroupName, l["Menu:TenantManagement"], icon: "fa fa-users");
             administrationMenu.AddItem(tenantManagementMenuItem);
 
-            if (await context.IsGrantedAsync(TenantManagementPermissions.Tenants.Default))
-            {
-                tenantManagementMenuItem.AddItem(new ApplicationMenuItem(TenantManagementMenuNames.Tenants, l["Tenants"], url: "~/TenantManagement/Tenants"));
-            }
+            tenantManagementMenuItem.AddItem(new ApplicationMenuItem(TenantManagementMenuNames.Tenants, l["Tenants"], url: "~/TenantManagement/Tenants", requiredPermissionName: TenantManagementPermissions.Tenants.Default));
         }
     }
 }