From 39eb54fbdad50d905cc3aa3dc99a839adad98e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sat, 23 May 2020 22:33:44 +0300
Subject: [PATCH] #4017 Added some other useful methods to the contexts.

---
 .../Toolbars/IToolbarConfigurationContext.cs  | 13 ++++++++++
 .../Toolbars/ToolbarConfigurationContext.cs   | 25 +++++++++++++++++++
 .../Ui/Navigation/DefaultMenuContributor.cs   |  8 ++----
 .../Ui/Navigation/MenuConfigurationContext.cs | 25 +++++++++++++++++++
 4 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/IToolbarConfigurationContext.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/IToolbarConfigurationContext.cs
index 7e66da1a72..83fe1c1182 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/IToolbarConfigurationContext.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/IToolbarConfigurationContext.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theming;
@@ -15,5 +17,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars
         IAuthorizationService AuthorizationService { get; }
 
         IStringLocalizerFactory StringLocalizerFactory { get; }
+
+        Task<bool> IsGrantedAsync(string policyName);
+
+        [CanBeNull]
+        IStringLocalizer GetDefaultLocalizer();
+
+        [NotNull]
+        public IStringLocalizer GetLocalizer<T>();
+
+        [NotNull]
+        public IStringLocalizer GetLocalizer(Type resourceType);
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarConfigurationContext.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarConfigurationContext.cs
index 76808f79fb..37f3308198 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarConfigurationContext.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarConfigurationContext.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
@@ -43,5 +45,28 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars
             Toolbar = toolbar;
             ServiceProvider = serviceProvider;
         }
+        
+        public Task<bool> IsGrantedAsync(string policyName)
+        {
+            return AuthorizationService.IsGrantedAsync(policyName);
+        }
+
+        [CanBeNull]
+        public IStringLocalizer GetDefaultLocalizer()
+        {
+            return StringLocalizerFactory.CreateDefaultOrNull();
+        }
+
+        [NotNull]
+        public IStringLocalizer GetLocalizer<T>()
+        {
+            return StringLocalizerFactory.Create<T>();
+        }
+        
+        [NotNull]
+        public IStringLocalizer GetLocalizer(Type resourceType)
+        {
+            return StringLocalizerFactory.Create(resourceType);
+        }
     }
 }
diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/DefaultMenuContributor.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/DefaultMenuContributor.cs
index 9956133584..8e2558a3b7 100644
--- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/DefaultMenuContributor.cs
+++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/DefaultMenuContributor.cs
@@ -1,8 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Localization;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Volo.Abp.UI.Navigation.Localization.Resource;
-using Volo.Abp.UI.Navigation;
 
 namespace Volo.Abp.UI.Navigation
 {
@@ -16,8 +13,7 @@ namespace Volo.Abp.UI.Navigation
 
         protected virtual void Configure(MenuConfigurationContext context)
         {
-            var l = context.ServiceProvider
-                .GetRequiredService<IStringLocalizer<AbpUiNavigationResource>>();
+            var l = context.GetLocalizer<AbpUiNavigationResource>();
 
             if (context.Menu.Name == StandardMenus.Main)
             {
diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs
index f4e59cab0c..e5550d2d09 100644
--- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs
+++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
@@ -39,5 +41,28 @@ namespace Volo.Abp.UI.Navigation
             Menu = menu;
             ServiceProvider = serviceProvider;
         }
+
+        public Task<bool> IsGrantedAsync(string policyName)
+        {
+            return AuthorizationService.IsGrantedAsync(policyName);
+        }
+
+        [CanBeNull]
+        public IStringLocalizer GetDefaultLocalizer()
+        {
+            return StringLocalizerFactory.CreateDefaultOrNull();
+        }
+
+        [NotNull]
+        public IStringLocalizer GetLocalizer<T>()
+        {
+            return StringLocalizerFactory.Create<T>();
+        }
+        
+        [NotNull]
+        public IStringLocalizer GetLocalizer(Type resourceType)
+        {
+            return StringLocalizerFactory.Create(resourceType);
+        }
     }
 }