From 6a24a0de3004c3eae1c2d38b37397702235afc97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 14 Aug 2020 14:26:19 +0300 Subject: [PATCH] Make GlobalFeature abstract. --- .../{GlobalFeatureConfigurator.cs => GlobalFeature.cs} | 10 ++++------ .../GlobalFeatureManagerModuleConfigurator.cs | 5 ----- .../Volo/CmsKit/CmsKitDomainSharedModule.cs | 4 +++- .../Volo/CmsKit/GlobalFeatures/CommentsFeature.cs | 2 +- .../Volo/CmsKit/GlobalFeatures/ReactionsFeature.cs | 2 +- 5 files changed, 9 insertions(+), 14 deletions(-) rename modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/Abp/GlobalFeatures/{GlobalFeatureConfigurator.cs => GlobalFeature.cs} (77%) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/Abp/GlobalFeatures/GlobalFeatureConfigurator.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/Abp/GlobalFeatures/GlobalFeature.cs similarity index 77% rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/Abp/GlobalFeatures/GlobalFeatureConfigurator.cs rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/Abp/GlobalFeatures/GlobalFeature.cs index fb259d7df6..f0c113b1bf 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/Abp/GlobalFeatures/GlobalFeatureConfigurator.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/Abp/GlobalFeatures/GlobalFeature.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.GlobalFeatures { - public class GlobalFeature + public abstract class GlobalFeature { [NotNull] public GlobalModuleFeatures Module { get; } @@ -18,13 +18,11 @@ namespace Volo.Abp.GlobalFeatures set => FeatureManager.SetEnabled(FeatureName, value); } - public GlobalFeature( - [NotNull] GlobalModuleFeatures module, - [NotNull] string name) + protected GlobalFeature([NotNull] GlobalModuleFeatures module) { Module = Check.NotNull(module, nameof(module)); - FeatureName = Check.NotNullOrWhiteSpace(name, nameof(name)); FeatureManager = Module.FeatureManager; + FeatureName = GlobalFeatureNameAttribute.GetName(GetType()); } public virtual void Enable() @@ -39,7 +37,7 @@ namespace Volo.Abp.GlobalFeatures public virtual void SetEnabled(bool isEnabled) { - + FeatureManager.SetEnabled(FeatureName, isEnabled); } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/Abp/GlobalFeatures/GlobalFeatureManagerModuleConfigurator.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/Abp/GlobalFeatures/GlobalFeatureManagerModuleConfigurator.cs index edd1c7f0aa..64692071e0 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/Abp/GlobalFeatures/GlobalFeatureManagerModuleConfigurator.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/Abp/GlobalFeatures/GlobalFeatureManagerModuleConfigurator.cs @@ -33,11 +33,6 @@ namespace Volo.Abp.GlobalFeatures } } - protected void AddFeature(string featureName) - { - AddFeature(new GlobalFeature(this, featureName)); - } - protected void AddFeature(GlobalFeature feature) { AllFeatures[feature.FeatureName] = feature; diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitDomainSharedModule.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitDomainSharedModule.cs index 0afe98f7c9..f624f65957 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitDomainSharedModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitDomainSharedModule.cs @@ -6,6 +6,7 @@ using Volo.Abp.Localization.ExceptionHandling; using Volo.Abp.Validation; using Volo.Abp.Validation.Localization; using Volo.Abp.VirtualFileSystem; +using Volo.CmsKit.GlobalFeatures; namespace Volo.CmsKit { @@ -26,7 +27,8 @@ namespace Volo.CmsKit cmsKit.Comments.Enable(); }); - GlobalFeatureManager.Instance.IsEnabled("asd"); + GlobalFeatureManager.Instance.IsEnabled("qweasd"); + GlobalFeatureManager.Instance.IsEnabled(); Configure(options => { diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/CommentsFeature.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/CommentsFeature.cs index 63cafd6744..fb1c3fa9cb 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/CommentsFeature.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/CommentsFeature.cs @@ -10,7 +10,7 @@ namespace Volo.CmsKit.GlobalFeatures public CommentsFeature( [NotNull] GlobalCmsKitFeatures cmsKit - ) : base(cmsKit, Name) + ) : base(cmsKit) { } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/ReactionsFeature.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/ReactionsFeature.cs index ec658fd8ca..6c978e88e6 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/ReactionsFeature.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/ReactionsFeature.cs @@ -10,7 +10,7 @@ namespace Volo.CmsKit.GlobalFeatures public ReactionsFeature( [NotNull] GlobalCmsKitFeatures cmsKit - ) : base(cmsKit, Name) + ) : base(cmsKit) { } }