From 3ad30f972bb5d12edd3500e2d3357a5c787c32bd Mon Sep 17 00:00:00 2001
From: Ilkay Ilknur <ilkay@ilkayilknur.com>
Date: Thu, 10 Dec 2020 13:46:03 +0300
Subject: [PATCH] lookup property fix.

---
 .../TagHelpers/Form/AbpSelectTagHelperService.cs      | 11 ++++++-----
 .../Modularity/EntityExtensionConfiguration.cs        |  1 -
 .../Pages/Identity/Roles/CreateModal.cshtml           |  8 +++++---
 .../Pages/Identity/Roles/EditModal.cshtml             |  7 ++++---
 .../Pages/Identity/Users/CreateModal.cshtml           |  8 +++++---
 .../Pages/Identity/Users/EditModal.cshtml             | 10 +++++-----
 .../Pages/TenantManagement/Tenants/CreateModal.cshtml |  7 ++++---
 .../Pages/TenantManagement/Tenants/EditModal.cshtml   |  7 ++++---
 8 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
index 10208aa5e9..e24aa6d37b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
@@ -86,12 +86,13 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             {
                 selectTagHelper.Items = GetSelectItems(context, output);
             }
-            else
+            else if(!TagHelper.AutocompleteSelectedItemName.IsNullOrEmpty())
             {
-                selectTagHelper.Items = new SelectListItem[]
-                    {
-                        new SelectListItem(TagHelper.AutocompleteSelectedItemName,TagHelper.AutocompleteSelectedItemValue,true)
-                    };
+                selectTagHelper.Items = new[]
+                {
+                    new SelectListItem(TagHelper.AutocompleteSelectedItemName,
+                        TagHelper.AutocompleteSelectedItemValue, false)
+                };
             }
 
             var selectTagHelperOutput = await selectTagHelper.ProcessAndGetOutputAsync(GetInputAttributes(context, output), context, "select", TagMode.StartTagAndEndTag);
diff --git a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfiguration.cs b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfiguration.cs
index 33dd44fbb0..6733688a91 100644
--- a/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfiguration.cs
+++ b/framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfiguration.cs
@@ -56,7 +56,6 @@ namespace Volo.Abp.ObjectExtending.Modularity
             {
                 AddLookupTextProperty(propertyInfo);
                 propertyInfo.UI.OnTable.IsVisible = false;
-                propertyInfo.Api.OnGet.IsAvailable = false;
             }
             return this;
         }
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 902b984ede..a281b96fbd 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
@@ -1,11 +1,13 @@
 @page
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Microsoft.Extensions.Localization
+@using Microsoft.Extensions.Logging
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
 @using Volo.Abp.Identity.Localization
 @using Volo.Abp.Identity.Web.Pages.Identity.Roles
 @using Volo.Abp.Localization
 @using Volo.Abp.ObjectExtending
+@using Volo.Abp.Data
 @model CreateModalModel
 @inject IHtmlLocalizer<IdentityResource> L
 @inject IStringLocalizerFactory StringLocalizerFactory
@@ -31,8 +33,8 @@
                         <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
                                     label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                     autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                    autocomplete-selected-item-name="@Model.Role.ExtraProperties[propertyInfo.Name+"_Text"]"
-                                    autocomplete-selected-item-value="@Model.Role.ExtraProperties[propertyInfo.Name]"
+                                    autocomplete-selected-item-name="@Model.Role.GetProperty(propertyInfo.Name+"_Text")"
+                                    autocomplete-selected-item-value="@Model.Role.GetProperty(propertyInfo.Name)"
                                     autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
                                     autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
                                     autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
@@ -44,7 +46,7 @@
                                    asp-for="Role.ExtraProperties[propertyInfo.Name]"
                                    label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                    asp-format="@propertyInfo.GetInputFormatOrNull()"
-                                   value="@propertyInfo.GetInputValueOrNull(Model.Role.ExtraProperties[propertyInfo.Name])" />
+                                   value="@Model.Role.GetProperty(propertyInfo.Name)" />
                     }
                 }
             }
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 0e60b15733..b861c4b880 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
@@ -6,6 +6,7 @@
 @using Volo.Abp.Identity.Web.Pages.Identity.Roles
 @using Volo.Abp.Localization
 @using Volo.Abp.ObjectExtending
+@using Volo.Abp.Data
 @model EditModalModel
 @inject IHtmlLocalizer<IdentityResource> L
 @inject IStringLocalizerFactory StringLocalizerFactory
@@ -42,8 +43,8 @@
                         <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
                                     label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                     autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                    autocomplete-selected-item-name="@Model.Role.ExtraProperties[propertyInfo.Name+"_Text"]"
-                                    autocomplete-selected-item-value="@Model.Role.ExtraProperties[propertyInfo.Name]"
+                                    autocomplete-selected-item-name="@Model.Role.GetProperty(propertyInfo.Name+"_Text")"
+                                    autocomplete-selected-item-value="@Model.Role.GetProperty(propertyInfo.Name)"
                                     autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
                                     autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
                                     autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
@@ -55,7 +56,7 @@
                                    asp-for="Role.ExtraProperties[propertyInfo.Name]"
                                    label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                    asp-format="@propertyInfo.GetInputFormatOrNull()"
-                                   value="@propertyInfo.GetInputValueOrNull(Model.Role.ExtraProperties[propertyInfo.Name])" />
+                                   value="@Model.Role.GetProperty(propertyInfo.Name)" />
                     }
                 }
             }
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 0f4eab328b..917da3a181 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
@@ -6,9 +6,11 @@
 @using Volo.Abp.Identity.Web.Pages.Identity.Users
 @using Volo.Abp.Localization
 @using Volo.Abp.ObjectExtending
+@using Volo.Abp.Data
 @model CreateModalModel
 @inject IHtmlLocalizer<IdentityResource> L
 @inject IStringLocalizerFactory StringLocalizerFactory
+
 @{
     Layout = null;
 }
@@ -36,8 +38,8 @@
                                 <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
                                             label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                             autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                            autocomplete-selected-item-name="@Model.UserInfo.ExtraProperties[propertyInfo.Name+"_Text"]"
-                                            autocomplete-selected-item-value="@Model.UserInfo.ExtraProperties[propertyInfo.Name]"
+                                            autocomplete-selected-item-name="@Model.UserInfo.GetProperty(propertyInfo.Name+"_Text")"
+                                            autocomplete-selected-item-value="@Model.UserInfo.GetProperty(propertyInfo.Name)"
                                             autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
                                             autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
                                             autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
@@ -49,7 +51,7 @@
                                            asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
                                            label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                            asp-format="@propertyInfo.GetInputFormatOrNull()"
-                                           value="@propertyInfo.GetInputValueOrNull(Model.UserInfo.ExtraProperties[propertyInfo.Name])" />
+                                           value="@Model.UserInfo.GetProperty(propertyInfo.Name)" />
                             }
                         }
                     }
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 3a0bda16d2..a8de62bfdf 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
@@ -6,6 +6,7 @@
 @using Volo.Abp.Identity.Web.Pages.Identity.Users
 @using Volo.Abp.Localization
 @using Volo.Abp.ObjectExtending
+@using Volo.Abp.Data
 @model EditModalModel
 @inject IHtmlLocalizer<IdentityResource> L
 @inject IStringLocalizerFactory StringLocalizerFactory
@@ -17,8 +18,7 @@
         <abp-modal-header title="@L["Edit"].Value"></abp-modal-header>
         <abp-modal-body>
             <abp-tabs name="create-user-modal-tabs">
-                <abp-tab title="@L["UserInformations"].Value">
-                    @* TODO: Can we use dynamic form? *@
+                <abp-tab title="@L["UserInformations"].Value">                   
                     <input asp-for="UserInfo.Id" />
                     <input asp-for="UserInfo.ConcurrencyStamp" />
                     <abp-input asp-for="UserInfo.UserName" />
@@ -38,8 +38,8 @@
                                 <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
                                             label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                             autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                            autocomplete-selected-item-name="@Model.UserInfo.ExtraProperties[propertyInfo.Name+"_Text"]"
-                                            autocomplete-selected-item-value="@Model.UserInfo.ExtraProperties[propertyInfo.Name]"
+                                            autocomplete-selected-item-name="@Model.UserInfo.GetProperty(propertyInfo.Name+"_Text")"
+                                            autocomplete-selected-item-value="@Model.UserInfo.GetProperty(propertyInfo.Name)"
                                             autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
                                             autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
                                             autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
@@ -51,7 +51,7 @@
                                            asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
                                            label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                            asp-format="@propertyInfo.GetInputFormatOrNull()"
-                                           value="@propertyInfo.GetInputValueOrNull(Model.UserInfo.ExtraProperties[propertyInfo.Name])" />
+                                           value="@Model.UserInfo.GetProperty(propertyInfo.Name)" />
                             }
                         }
                     }
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 99bd1f5cc4..6d5a6adf42 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
@@ -6,6 +6,7 @@
 @using Volo.Abp.ObjectExtending
 @using Volo.Abp.TenantManagement.Localization
 @using Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
+@using Volo.Abp.Data
 @model CreateModalModel
 @inject IHtmlLocalizer<AbpTenantManagementResource> L
 @inject IStringLocalizerFactory StringLocalizerFactory
@@ -31,8 +32,8 @@
                         <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
                                     label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                     autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                    autocomplete-selected-item-name="@Model.Tenant.ExtraProperties[propertyInfo.Name+"_Text"]"
-                                    autocomplete-selected-item-value="@Model.Tenant.ExtraProperties[propertyInfo.Name]"
+                                    autocomplete-selected-item-name="@Model.Tenant.GetProperty(propertyInfo.Name+"_Text")"
+                                    autocomplete-selected-item-value="@Model.Tenant.GetProperty(propertyInfo.Name)"
                                     autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
                                     autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
                                     autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
@@ -44,7 +45,7 @@
                                    asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
                                    label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                    asp-format="@propertyInfo.GetInputFormatOrNull()"
-                                   value="@propertyInfo.GetInputValueOrNull(Model.Tenant.ExtraProperties[propertyInfo.Name])" />
+                                   value="@Model.Tenant.GetProperty(propertyInfo.Name)" />
                     }
                 }
             }
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 06103d6d9f..510d2d7afd 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
@@ -6,6 +6,7 @@
 @using Volo.Abp.ObjectExtending
 @using Volo.Abp.TenantManagement.Localization
 @using Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
+@using Volo.Abp.Data
 @model EditModalModel
 @inject IHtmlLocalizer<AbpTenantManagementResource> L
 @inject IStringLocalizerFactory StringLocalizerFactory
@@ -27,8 +28,8 @@
                         <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
                                     label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                     autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                    autocomplete-selected-item-name="@Model.Tenant.ExtraProperties[propertyInfo.Name+"_Text"]"
-                                    autocomplete-selected-item-value="@Model.Tenant.ExtraProperties[propertyInfo.Name]"
+                                    autocomplete-selected-item-name="@Model.Tenant.GetProperty(propertyInfo.Name+"_Text")"
+                                    autocomplete-selected-item-value="@Model.Tenant.GetProperty(propertyInfo.Name)"
                                     autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
                                     autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
                                     autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
@@ -40,7 +41,7 @@
                                    asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
                                    label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
                                    asp-format="@propertyInfo.GetInputFormatOrNull()"
-                                   value="@propertyInfo.GetInputValueOrNull(Model.Tenant.ExtraProperties[propertyInfo.Name])" />
+                                   value="@Model.Tenant.GetProperty(propertyInfo.Name)" />
                     }
                 }
             }