Merge pull request #14547 from abpframework/fix-featuremanagement-delete

Change ResetToDefaultAsync to DeleteAsync

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/IFeatureAppService.cs

@@ -10,5 +10,5 @@ public interface IFeatureAppService : IApplicationService
 
     Task UpdateAsync([NotNull] string providerName, string providerKey, UpdateFeaturesDto input);
 
-    Task ResetToDefaultAsync([NotNull] string providerName, string providerKey);
+    Task DeleteAsync([NotNull] string providerName, string providerKey);
 }

modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs

@@ -138,7 +138,7 @@ public class FeatureAppService : FeatureManagementAppServiceBase, IFeatureAppSer
         await AuthorizationService.CheckAsync(policyName);
     }
 
-    public virtual async Task ResetToDefaultAsync([NotNull] string providerName, string providerKey)
+    public virtual async Task DeleteAsync([NotNull] string providerName, string providerKey)
     {
         await FeatureValueRepository.DeleteAsync(providerName, providerKey);
     }

modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor

@@ -97,7 +97,7 @@
             }
         </ModalBody>
         <ModalFooter>
-            <Button Color="Color.Primary" Clicked="@(async () => await ResetToDefaultAsync(ProviderName,ProviderKey))">@L["ResetToDefault"]</Button>
+            <Button Color="Color.Primary" Clicked="@(async () => await DeleteAsync(ProviderName,ProviderKey))">@L["ResetToDefault"]</Button>
             <Button Color="Color.Secondary" Clicked="CloseModal">@L["Cancel"]</Button>
             <Button Color="Color.Primary" Clicked="SaveAsync">@L["Save"]</Button>
         </ModalFooter>

modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs

@@ -114,13 +114,13 @@ public partial class FeatureManagementModal
         }
     }
 
-    public virtual async Task ResetToDefaultAsync([NotNull] string providerName, string providerKey = null)
+    public virtual async Task DeleteAsync([NotNull] string providerName, string providerKey = null)
     {
         if (!await Message.Confirm(L["AreYouSureToResetToDefault"]))
         {
             return;
         }
-        await FeatureAppService.ResetToDefaultAsync(ProviderName, ProviderKey);
+        await FeatureAppService.DeleteAsync(ProviderName, ProviderKey);
         await Message.Success(L["ResetedToDefault"]);
     }
 

modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/ClientProxies/FeaturesClientProxy.Generated.cs

@@ -34,9 +34,9 @@ public partial class FeaturesClientProxy : ClientProxyBase<IFeatureAppService>,
         });
     }
 
-    public virtual async Task ResetToDefaultAsync(string providerName, string providerKey)
+    public virtual async Task DeleteAsync(string providerName, string providerKey)
     {
-        await RequestAsync(nameof(ResetToDefaultAsync), new ClientProxyRequestTypeValue
+        await RequestAsync(nameof(DeleteAsync), new ClientProxyRequestTypeValue
         {
             { typeof(string), providerName },
             { typeof(string), providerKey }

modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/ClientProxies/featureManagement-generate-proxy.json

@@ -150,10 +150,10 @@
               "allowAnonymous": null,
               "implementFrom": "Volo.Abp.FeatureManagement.IFeatureAppService"
             },
-            "ResetToDefaultAsyncByProviderNameAndProviderKey": {
+            "DeleteAsyncByProviderNameAndProviderKey": {
-              "uniqueName": "ResetToDefaultAsyncByProviderNameAndProviderKey",
+              "uniqueName": "DeleteAsyncByProviderNameAndProviderKey",
-              "name": "ResetToDefaultAsync",
+              "name": "DeleteAsync",
-              "httpMethod": null,
+              "httpMethod": "DELETE",
               "url": "api/feature-management/features",
               "supportedVersions": [],
               "parametersOnMethod": [

modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeaturesController.cs

@@ -28,9 +28,9 @@ public class FeaturesController : AbpControllerBase, IFeatureAppService
         return FeatureAppService.UpdateAsync(providerName, providerKey, input);
     }
 
-    [HttpPost]
+    [HttpDelete]
-    public Task ResetToDefaultAsync(string providerName, string providerKey)
+    public virtual Task DeleteAsync(string providerName, string providerKey)
     {
-        return FeatureAppService.ResetToDefaultAsync(providerName, providerKey);
+        return FeatureAppService.DeleteAsync(providerName, providerKey);
     }
 }

modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js

@@ -13,7 +13,7 @@ var abp = abp || {};
                     if (confirmed) {
                         let providerName = $('#ProviderName').val();
                         let prodiverKey = $('#ProviderKey').val();
-                        volo.abp.featureManagement.features.resetToDefault(providerName, prodiverKey).then(function () {
+                        volo.abp.featureManagement.features.delete(providerName, prodiverKey).then(function () {
                             abp.notify.success(l('ResetedToDefault'));
                         });
                     }

modules/feature-management/src/Volo.Abp.FeatureManagement.Web/wwwroot/client-proxies/featureManagement-proxy.js

@@ -27,10 +27,10 @@
       }, ajaxParams));
     };
 
-    volo.abp.featureManagement.features.resetToDefault = function(providerName, providerKey, ajaxParams) {
+    volo.abp.featureManagement.features['delete'] = function(providerName, providerKey, ajaxParams) {
       return abp.ajax($.extend(true, {
         url: abp.appPath + 'api/feature-management/features' + abp.utils.buildQueryString([{ name: 'providerName', value: providerName }, { name: 'providerKey', value: providerKey }]) + '',
-        type: 'POST',
+        type: 'DELETE',
         dataType: null
       }, ajaxParams));
     };

modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo/Abp/FeatureManagement/FeatureAppService_Tests.cs

@@ -73,7 +73,7 @@ public class FeatureAppService_Tests : FeatureManagementApplicationTestBase
     {
         Login(_testData.User1Id);
         var exception = await Record.ExceptionAsync(async () =>
-            await _featureAppService.ResetToDefaultAsync("test", "test"));
+            await _featureAppService.DeleteAsync("test", "test"));
         Assert.Null(exception);
     }