From bba47d445005468aeab6d7cf59b213fa38094660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 27 Oct 2020 15:15:59 +0300
Subject: [PATCH] #5961 Apply AbpComponentBase usage for the startup template
 and the identity module.

---
 .../Pages/Identity/RoleManagement.razor             |  3 ---
 .../Pages/Identity/RoleManagement.razor.cs          |  2 ++
 .../Pages/Identity/UserManagement.razor             |  5 +----
 .../Pages/Identity/UserManagement.razor.cs          |  2 ++
 .../MyProjectNameComponentBase.cs                   | 13 +++++++++++++
 .../Pages/Index.razor                               |  8 ++------
 6 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameComponentBase.cs

diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
index 781756dd71..67e7e9290c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
@@ -2,11 +2,8 @@
 @attribute [Authorize(IdentityPermissions.Roles.Default)]
 @using Volo.Abp.Identity
 @using Microsoft.AspNetCore.Authorization
-@using Microsoft.Extensions.Localization
-@using Volo.Abp.Identity.Localization
 @using Volo.Abp.PermissionManagement.Blazor.Components
 @inherits RoleManagementBase
-@inject IStringLocalizer<IdentityResource> L
 
 @* ************************* PAGE HEADER ************************* *@
 <Row>
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
index 434a2604d2..2a77f22a92 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Volo.Abp.BlazoriseUI;
+using Volo.Abp.Identity.Localization;
 using Volo.Abp.PermissionManagement.Blazor.Components;
 
 namespace Volo.Abp.Identity.Blazor.Pages.Identity
@@ -19,6 +20,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
         public RoleManagementBase()
         {
             ObjectMapperContext = typeof(AbpIdentityBlazorModule);
+            LocalizationResource = typeof(IdentityResource);
 
             CreatePolicyName = IdentityPermissions.Roles.Create;
             UpdatePolicyName = IdentityPermissions.Roles.Update;
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
index bfbd2150c6..991b8d1606 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
@@ -1,11 +1,8 @@
 @page "/identity/users"
 @attribute [Authorize(IdentityPermissions.Users.Default)]
 @using Microsoft.AspNetCore.Authorization
-@using Microsoft.Extensions.Localization
-@using Volo.Abp.Identity.Localization
 @using Volo.Abp.PermissionManagement.Blazor.Components
 @inherits UserManagementBase
-@inject IStringLocalizer<IdentityResource> L
 
 @* ************************* PAGE HEADER ************************* *@
 <Row>
@@ -219,4 +216,4 @@
     </Modal>
 }
 
-<PermissionManagementModal @ref="PermissionManagementModal"/>
\ No newline at end of file
+<PermissionManagementModal @ref="PermissionManagementModal"/>
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
index a488cbd358..423f452cd8 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Volo.Abp.BlazoriseUI;
+using Volo.Abp.Identity.Localization;
 using Volo.Abp.PermissionManagement.Blazor.Components;
 
 namespace Volo.Abp.Identity.Blazor.Pages.Identity
@@ -32,6 +33,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
         public UserManagementBase()
         {
             ObjectMapperContext = typeof(AbpIdentityBlazorModule);
+            LocalizationResource = typeof(IdentityResource);
 
             CreatePolicyName = IdentityPermissions.Users.Create;
             UpdatePolicyName = IdentityPermissions.Users.Update;
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameComponentBase.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameComponentBase.cs
new file mode 100644
index 0000000000..91384e47c3
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameComponentBase.cs
@@ -0,0 +1,13 @@
+using MyCompanyName.MyProjectName.Localization;
+using Volo.Abp.AspNetCore.Components;
+
+namespace MyCompanyName.MyProjectName.Blazor
+{
+    public class MyProjectNameComponentBase : AbpComponentBase
+    {
+        public MyProjectNameComponentBase()
+        {
+            LocalizationResource = typeof(MyProjectNameResource);
+        }
+    }
+}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
index 8ae9643f63..0b7e52b0f0 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
@@ -1,12 +1,8 @@
 @page "/"
-@using Volo.Abp.Users
 @using Volo.Abp.MultiTenancy
-@using Microsoft.Extensions.Localization
-@using MyCompanyName.MyProjectName.Localization
-@inject ICurrentUser CurrentUser
+@inherits MyProjectNameComponentBase
 @inject ICurrentTenant CurrentTenant
 @inject AuthenticationStateProvider AuthenticationStateProvider
-@inject IStringLocalizer<MyProjectNameResource> L
 <div class="container">
     <div class="p-5 text-center">
         <Badge Color="Color.Success" class="mb-4">
@@ -156,4 +152,4 @@
             <a href="https://github.com/abpframework/abp" target="_blank" class="mx-2"><i class="fab fa-github"></i><span class="text-secondary"> abpframework</span></a>
         </p>
     </div>
-</div>
\ No newline at end of file
+</div>