From e8504af0f9167c8ff5b1b10fd2d3135c507bebc7 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Wed, 26 Aug 2020 15:38:21 +0800
Subject: [PATCH] Add FeatureProviderDto.

---
 .../Volo/Abp/FeatureManagement/FeatureDto.cs             | 3 +--
 .../Volo/Abp/FeatureManagement/FeatureProviderDto.cs     | 9 +++++++++
 .../Volo/Abp/FeatureManagement/FeatureAppService.cs      | 6 +++++-
 .../FeatureManagement/FeatureManagementModal.cshtml      | 6 +++---
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureProviderDto.cs

diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureDto.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureDto.cs
index 26b41dbc8f..11e1c6c005 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureDto.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureDto.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using Volo.Abp.Validation.StringValues;
 
 namespace Volo.Abp.FeatureManagement
@@ -11,7 +10,7 @@ namespace Volo.Abp.FeatureManagement
 
         public string Value { get; set; }
 
-        public string ProviderName { get; set; }
+        public FeatureProviderDto Provider { get; set; }
 
         public string Description { get; set; }
 
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureProviderDto.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureProviderDto.cs
new file mode 100644
index 0000000000..59c9dcb2ef
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureProviderDto.cs
@@ -0,0 +1,9 @@
+namespace Volo.Abp.FeatureManagement
+{
+    public class FeatureProviderDto
+    {
+        public string Name { get; set; }
+
+        public string Key { get; set; }
+    }
+}
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
index c63336ded1..f0c310650d 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
@@ -42,7 +42,11 @@ namespace Volo.Abp.FeatureManagement
                     Description = featureDefinition.Description?.Localize(StringLocalizerFactory),
                     ParentName = featureDefinition.Parent?.Name,
                     Value = feature.Value,
-                    ProviderName = feature.Provider?.Name
+                    Provider = new FeatureProviderDto
+                    {
+                        Name = feature.Provider?.Name,
+                        Key = feature.Provider?.Key
+                    }
                 });
             }
 
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
index 90659844ac..f5adbf79d4 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
@@ -21,12 +21,12 @@
                 @for (var i = 0; i < Model.FeatureListDto.Features.Count; i++)
                 {
                     var feature = Model.FeatureListDto.Features[i];
-                    var disabled = Model.IsDisabled((feature.ProviderName));
+                    var disabled = Model.IsDisabled(feature.Provider.Name);
                     <div class="mt-2" style="padding-left: @(feature.Depth * 20)px">
 
-                        <spam class="mr-2">@feature.DisplayName @(disabled ? $"({feature.ProviderName})" : "")</spam>
+                        <spam class="mr-2">@feature.DisplayName @(disabled ? $"({feature.Provider.Name})" : "")</spam>
 
-                        <input type="text" name="Features[@i].ProviderName" value="@feature.ProviderName" hidden />
+                        <input type="text" name="Features[@i].ProviderName" value="@feature.Provider.Name" hidden />
                         <input type="text" name="Features[@i].Type" value="@feature.ValueType?.Name" hidden />
                         @if (feature.ValueType is FreeTextStringValueType)
                         {