diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/IFeatureAppService.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/IFeatureAppService.cs index a2fa93cfd2..3598efe77c 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/IFeatureAppService.cs +++ b/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); } 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 9d2c3b04a1..bce61c679b 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 @@ -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); } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor index 4d2c1eed74..70bff838c7 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor @@ -97,7 +97,7 @@ } - + diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs index 6dbdd282fe..54823f89e8 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs +++ b/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"]); } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/ClientProxies/FeaturesClientProxy.Generated.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/ClientProxies/FeaturesClientProxy.Generated.cs index 37d30b7c4d..fc1ef481f0 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/ClientProxies/FeaturesClientProxy.Generated.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/ClientProxies/FeaturesClientProxy.Generated.cs @@ -34,9 +34,9 @@ public partial class FeaturesClientProxy : ClientProxyBase, }); } - 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 } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/ClientProxies/featureManagement-generate-proxy.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/ClientProxies/featureManagement-generate-proxy.json index df5f6c0def..20c621eb69 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi.Client/ClientProxies/featureManagement-generate-proxy.json +++ b/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": { - "uniqueName": "ResetToDefaultAsyncByProviderNameAndProviderKey", - "name": "ResetToDefaultAsync", - "httpMethod": null, + "DeleteAsyncByProviderNameAndProviderKey": { + "uniqueName": "DeleteAsyncByProviderNameAndProviderKey", + "name": "DeleteAsync", + "httpMethod": "DELETE", "url": "api/feature-management/features", "supportedVersions": [], "parametersOnMethod": [ diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeaturesController.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeaturesController.cs index cb40b46465..0e00b86844 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeaturesController.cs +++ b/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] - public Task ResetToDefaultAsync(string providerName, string providerKey) + [HttpDelete] + public virtual Task DeleteAsync(string providerName, string providerKey) { - return FeatureAppService.ResetToDefaultAsync(providerName, providerKey); + return FeatureAppService.DeleteAsync(providerName, providerKey); } } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js index 25739b8a2d..e6efe2e63d 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js +++ b/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')); }); } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/wwwroot/client-proxies/featureManagement-proxy.js b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/wwwroot/client-proxies/featureManagement-proxy.js index 78d1fe7917..242589e538 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/wwwroot/client-proxies/featureManagement-proxy.js +++ b/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)); }; diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo/Abp/FeatureManagement/FeatureAppService_Tests.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo/Abp/FeatureManagement/FeatureAppService_Tests.cs index 7f11e297a3..0bea533bc7 100644 --- a/modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo/Abp/FeatureManagement/FeatureAppService_Tests.cs +++ b/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); }