From 4c6cee1f36bf09be26c971c410b7c374f67aa9f0 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Tue, 29 Jun 2021 18:43:50 +0800
Subject: [PATCH] Convert property to enum if necessary.

---
 .../Data/ExtraPropertyDictionaryExtensions.cs | 30 +++++++++++++++++++
 .../Pages/Identity/Roles/CreateModal.cshtml   |  4 +++
 .../Pages/Identity/Roles/EditModal.cshtml     |  4 +++
 .../Pages/Identity/Users/CreateModal.cshtml   |  4 +++
 .../Pages/Identity/Users/EditModal.cshtml     |  4 +++
 .../Tenants/CreateModal.cshtml                |  4 +++
 .../TenantManagement/Tenants/EditModal.cshtml |  4 +++
 7 files changed, 54 insertions(+)
 create mode 100644 framework/src/Volo.Abp.ObjectExtending/Volo/Abp/Data/ExtraPropertyDictionaryExtensions.cs

diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/Data/ExtraPropertyDictionaryExtensions.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/Data/ExtraPropertyDictionaryExtensions.cs
new file mode 100644
index 0000000000..0c6b9dff67
--- /dev/null
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/Data/ExtraPropertyDictionaryExtensions.cs
@@ -0,0 +1,30 @@
+using System;
+
+namespace Volo.Abp.Data
+{
+    public static class ExtraPropertyDictionaryExtensions
+    {
+        public static T ToEnum<T>(this ExtraPropertyDictionary extraPropertyDictionary, string key)
+            where T : Enum
+        {
+            if (extraPropertyDictionary[key].GetType() == typeof(T))
+            {
+                return (T)extraPropertyDictionary[key];
+            }
+
+            extraPropertyDictionary[key] = Enum.Parse(typeof(T), extraPropertyDictionary[key].ToString(), ignoreCase: true);
+            return (T)extraPropertyDictionary[key];
+        }
+
+        public static object ToEnum(this ExtraPropertyDictionary extraPropertyDictionary, string key, Type enumType)
+        {
+            if (!enumType.IsEnum || extraPropertyDictionary[key].GetType() == enumType)
+            {
+                return extraPropertyDictionary[key];
+            }
+
+            extraPropertyDictionary[key] = Enum.Parse(enumType, extraPropertyDictionary[key].ToString(), ignoreCase: true);
+            return extraPropertyDictionary[key];
+        }
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml
index 02a24b4084..4ebac325fb 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml
@@ -30,6 +30,10 @@
                 {
                     if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
                     {
+                        if (propertyInfo.Type.IsEnum)
+                        {
+                            Model.Role.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type);
+                        }
                         <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
                                     label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                     autocomplete-api-url="@propertyInfo.Lookup.Url"
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml
index a9a305cce2..bb83b865e2 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml
@@ -40,6 +40,10 @@
                 {
                     if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
                     {
+                        if (propertyInfo.Type.IsEnum)
+                        {
+                            Model.Role.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type);
+                        }
                         <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
                                     label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                     autocomplete-api-url="@propertyInfo.Lookup.Url"
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
index 3fbe633cd4..1aa5669b0c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
@@ -35,6 +35,10 @@
                         {
                             if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
                             {
+                                if (propertyInfo.Type.IsEnum)
+                                {
+                                    Model.UserInfo.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type);
+                                }
                                 <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
                                             label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                             autocomplete-api-url="@propertyInfo.Lookup.Url"
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
index d570a0f794..5bac90712e 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
@@ -35,6 +35,10 @@
                         {
                             if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
                             {
+                                if (propertyInfo.Type.IsEnum)
+                                {
+                                    Model.UserInfo.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type);
+                                }
                                 <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
                                             label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                             autocomplete-api-url="@propertyInfo.Lookup.Url"
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml
index de604da44d..03f6f6d70c 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml
@@ -29,6 +29,10 @@
                 {
                     if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
                     {
+                        if (propertyInfo.Type.IsEnum)
+                        {
+                            Model.Tenant.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type);
+                        }
                         <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
                                     label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                     autocomplete-api-url="@propertyInfo.Lookup.Url"
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml
index 8c5eb3b7e0..98e99c0603 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml
@@ -25,6 +25,10 @@
                 {
                     if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
                     {
+                        if (propertyInfo.Type.IsEnum)
+                        {
+                            Model.Tenant.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type);
+                        }
                         <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
                                     label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                     autocomplete-api-url="@propertyInfo.Lookup.Url"