From 8ac5e85549442016a635fbac6eae020f12dc700b Mon Sep 17 00:00:00 2001
From: Ilkay Ilknur <ilkay@ilkayilknur.com>
Date: Mon, 16 Nov 2020 16:51:44 +0300
Subject: [PATCH] extra properties autocomplete text field added.

---
 .../Pages/Identity/Roles/CreateModal.cshtml   | 37 +++++++++++--------
 .../Pages/Identity/Roles/EditModal.cshtml     | 37 +++++++++++--------
 .../Pages/Identity/Users/CreateModal.cshtml   | 37 +++++++++++--------
 .../Pages/Identity/Users/EditModal.cshtml     | 37 +++++++++++--------
 .../Tenants/CreateModal.cshtml                | 37 +++++++++++--------
 .../TenantManagement/Tenants/EditModal.cshtml | 37 +++++++++++--------
 6 files changed, 126 insertions(+), 96 deletions(-)

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 25857a407f..902b984ede 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
@@ -24,23 +24,28 @@
 
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.RoleInfoModel>())
             {
-                if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                if (!propertyInfo.Name.EndsWith("_Text"))
                 {
-                    <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                }
-                else
-                {
-                    <abp-input type="@propertyInfo.GetInputType()"
-                               asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                               label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                               asp-format="@propertyInfo.GetInputFormatOrNull()"
-                               value="@propertyInfo.GetInputValueOrNull(Model.Role.ExtraProperties[propertyInfo.Name])" />
+                    if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                    {
+                        <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-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                    autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                    autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                    autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                    }
+                    else
+                    {
+                        <abp-input type="@propertyInfo.GetInputType()"
+                                   asp-for="Role.ExtraProperties[propertyInfo.Name]"
+                                   label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                   asp-format="@propertyInfo.GetInputFormatOrNull()"
+                                   value="@propertyInfo.GetInputValueOrNull(Model.Role.ExtraProperties[propertyInfo.Name])" />
+                    }
                 }
             }
         </abp-modal-body>
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 41b7ee2693..0e60b15733 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
@@ -35,23 +35,28 @@
 
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.RoleInfoModel>())
             {
-                if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                if (!propertyInfo.Name.EndsWith("_Text"))
                 {
-                    <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                }
-                else
-                {
-                    <abp-input type="@propertyInfo.GetInputType()"
-                               asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                               label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                               asp-format="@propertyInfo.GetInputFormatOrNull()"
-                               value="@propertyInfo.GetInputValueOrNull(Model.Role.ExtraProperties[propertyInfo.Name])" />
+                    if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                    {
+                        <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-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                    autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                    autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                    autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                    }
+                    else
+                    {
+                        <abp-input type="@propertyInfo.GetInputType()"
+                                   asp-for="Role.ExtraProperties[propertyInfo.Name]"
+                                   label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                   asp-format="@propertyInfo.GetInputFormatOrNull()"
+                                   value="@propertyInfo.GetInputValueOrNull(Model.Role.ExtraProperties[propertyInfo.Name])" />
+                    }
                 }
             }
         </abp-modal-body>
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 1f3f8c3244..0f4eab328b 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
@@ -29,23 +29,28 @@
 
                     @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.UserInfoViewModel>())
                     {
-                        if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                        if (!propertyInfo.Name.EndsWith("_Text"))
                         {
-                            <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
-                                        label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                        autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                        autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                        autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                        autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                        autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                        }
-                        else
-                        {
-                            <abp-input type="@propertyInfo.GetInputType()"
-                                       asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
-                                       label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                       asp-format="@propertyInfo.GetInputFormatOrNull()"
-                                       value="@propertyInfo.GetInputValueOrNull(Model.UserInfo.ExtraProperties[propertyInfo.Name])" />
+                            if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                            {
+                                <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-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                            autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                            autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                            autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                            }
+                            else
+                            {
+                                <abp-input type="@propertyInfo.GetInputType()"
+                                           asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
+                                           label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                           asp-format="@propertyInfo.GetInputFormatOrNull()"
+                                           value="@propertyInfo.GetInputValueOrNull(Model.UserInfo.ExtraProperties[propertyInfo.Name])" />
+                            }
                         }
                     }
                 </abp-tab>
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 34fc0547be..3a0bda16d2 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
@@ -31,23 +31,28 @@
 
                     @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<EditModalModel.UserInfoViewModel>())
                     {
-                        if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                        if (!propertyInfo.Name.EndsWith("_Text"))
                         {
-                            <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
-                                        label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                        autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                        autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                        autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                        autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                        autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                        }
-                        else
-                        {
-                            <abp-input type="@propertyInfo.GetInputType()"
-                                       asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
-                                       label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                       asp-format="@propertyInfo.GetInputFormatOrNull()"
-                                       value="@propertyInfo.GetInputValueOrNull(Model.UserInfo.ExtraProperties[propertyInfo.Name])" />
+                            if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                            {
+                                <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-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                            autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                            autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                            autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                            }
+                            else
+                            {
+                                <abp-input type="@propertyInfo.GetInputType()"
+                                           asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
+                                           label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                           asp-format="@propertyInfo.GetInputFormatOrNull()"
+                                           value="@propertyInfo.GetInputValueOrNull(Model.UserInfo.ExtraProperties[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 305aec2f34..99bd1f5cc4 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
@@ -24,23 +24,28 @@
 
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.TenantInfoModel>())
             {
-                if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                if (!propertyInfo.Name.EndsWith("_Text"))
                 {
-                    <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
-                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                }
-                else
-                {
-                    <abp-input type="@propertyInfo.GetInputType()"
-                               asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
-                               label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                               asp-format="@propertyInfo.GetInputFormatOrNull()"
-                               value="@propertyInfo.GetInputValueOrNull(Model.Tenant.ExtraProperties[propertyInfo.Name])" />
+                    if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                    {
+                        <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-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                    autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                    autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                    autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                    }
+                    else
+                    {
+                        <abp-input type="@propertyInfo.GetInputType()"
+                                   asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
+                                   label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                   asp-format="@propertyInfo.GetInputFormatOrNull()"
+                                   value="@propertyInfo.GetInputValueOrNull(Model.Tenant.ExtraProperties[propertyInfo.Name])" />
+                    }
                 }
             }
         </abp-modal-body>
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 50b434b3f7..06103d6d9f 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
@@ -20,23 +20,28 @@
             <abp-input asp-for="Tenant.Name" label="@L["TenantName"].Value" />
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<EditModalModel.TenantInfoModel>())
             {
-                if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                if (!propertyInfo.Name.EndsWith("_Text"))
                 {
-                    <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
-                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                }
-                else
-                {
-                    <abp-input type="@propertyInfo.GetInputType()"
-                               asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
-                               label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                               asp-format="@propertyInfo.GetInputFormatOrNull()"
-                               value="@propertyInfo.GetInputValueOrNull(Model.Tenant.ExtraProperties[propertyInfo.Name])" />
+                    if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                    {
+                        <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-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                    autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                    autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                    autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                    }
+                    else
+                    {
+                        <abp-input type="@propertyInfo.GetInputType()"
+                                   asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
+                                   label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                   asp-format="@propertyInfo.GetInputFormatOrNull()"
+                                   value="@propertyInfo.GetInputValueOrNull(Model.Tenant.ExtraProperties[propertyInfo.Name])" />
+                    }
                 }
             }
         </abp-modal-body>