From 5e02e92e033fc36b4a780526d840ee89825fec34 Mon Sep 17 00:00:00 2001
From: malik masis <malik.masis@gmail.com>
Date: Mon, 21 Nov 2022 11:47:46 +0300
Subject: [PATCH] Made features depend on the related global features

---
 .../Menus/CmsKitAdminMenuContributor.cs       |  5 +-
 .../CmsKitFeatureDefinitionProvider.cs        | 47 +++++++++++++++----
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs
index 8762373383..3621e5d564 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs
@@ -27,7 +27,7 @@ public class CmsKitAdminMenuContributor : IMenuContributor
         await AddCmsMenuAsync(context);
     }
 
-    private async Task AddCmsMenuAsync(MenuConfigurationContext context)
+    private Task AddCmsMenuAsync(MenuConfigurationContext context)
     {
         var l = context.GetLocalizer<CmsKitResource>();
 
@@ -121,7 +121,8 @@ public class CmsKitAdminMenuContributor : IMenuContributor
             {
                 cmsMenu.AddItem(menu);
             }
-            
+
         }
+        return Task.CompletedTask;
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatureDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatureDefinitionProvider.cs
index 597e5240e8..b4ac1ed9d6 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatureDefinitionProvider.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatureDefinitionProvider.cs
@@ -1,6 +1,8 @@
 using Volo.Abp.Features;
+using Volo.Abp.GlobalFeatures;
 using Volo.Abp.Localization;
 using Volo.Abp.Validation.StringValues;
+using Volo.CmsKit.GlobalFeatures;
 using Volo.CmsKit.Localization;
 
 namespace Volo.CmsKit.Features;
@@ -11,59 +13,86 @@ public class CmsKitFeatureDefinitionProvider : FeatureDefinitionProvider
         var group = context.AddGroup(CmsKitFeatures.GroupName,
             L("Feature:CmsKitGroup"));
 
-        group.AddFeature(CmsKitFeatures.BlogEnable,
+        if (GlobalFeatureManager.Instance.IsEnabled<BlogsFeature>())
+        {
+            group.AddFeature(CmsKitFeatures.BlogEnable,
             "true",
             L("Feature:BlogEnable"),
             L("Feature:BlogEnableDescription"),
             new ToggleStringValueType());
+        }
 
-        group.AddFeature(CmsKitFeatures.CommentEnable,
+        if (GlobalFeatureManager.Instance.IsEnabled<CommentsFeature>())
+        {
+            group.AddFeature(CmsKitFeatures.CommentEnable,
             "true",
             L("Feature:CommentEnable"),
             L("Feature:CommentEnableDescription"),
             new ToggleStringValueType());
+        }
 
-        group.AddFeature(CmsKitFeatures.GlobalResourceEnable,
+        if (GlobalFeatureManager.Instance.IsEnabled<GlobalResourcesFeature>())
+        {
+            group.AddFeature(CmsKitFeatures.GlobalResourceEnable,
             "true",
             L("Feature:GlobalResourceEnable"),
             L("Feature:GlobalResourceEnableDescription"),
             new ToggleStringValueType());
+        }
 
-        group.AddFeature(CmsKitFeatures.MediaEnable,
+        if (GlobalFeatureManager.Instance.IsEnabled<MediaFeature>())
+        {
+            group.AddFeature(CmsKitFeatures.MediaEnable,
             "true",
             L("Feature:MediaEnable"),
             L("Feature:MediaEnableDescription"),
             new ToggleStringValueType());
+        }
 
-        group.AddFeature(CmsKitFeatures.MenuEnable,
+        if (GlobalFeatureManager.Instance.IsEnabled<MenuFeature>())
+        {
+            group.AddFeature(CmsKitFeatures.MenuEnable,
             "true",
             L("Feature:MenuEnable"),
             L("Feature:MenuEnableDescription"),
             new ToggleStringValueType());
+        }
 
-        group.AddFeature(CmsKitFeatures.PageEnable,
+        if (GlobalFeatureManager.Instance.IsEnabled<PagesFeature>())
+        {
+            group.AddFeature(CmsKitFeatures.PageEnable,
             "true",
             L("Feature:PageEnable"),
             L("Feature:PageEnableDescription"),
             new ToggleStringValueType());
+        }
 
-        group.AddFeature(CmsKitFeatures.RatingEnable,
+        if (GlobalFeatureManager.Instance.IsEnabled<RatingsFeature>())
+        {
+            group.AddFeature(CmsKitFeatures.RatingEnable,
             "true",
             L("Feature:RatingEnable"),
             L("Feature:RatingEnableDescription"),
             new ToggleStringValueType());
+        }
 
-        group.AddFeature(CmsKitFeatures.ReactionEnable,
+        if (GlobalFeatureManager.Instance.IsEnabled<ReactionsFeature>())
+        {
+            group.AddFeature(CmsKitFeatures.ReactionEnable,
             "true",
             L("Feature:ReactionEnable"),
             L("Feature:ReactionEnableDescription"),
             new ToggleStringValueType());
+        }
 
-        group.AddFeature(CmsKitFeatures.TagEnable,
+        if (GlobalFeatureManager.Instance.IsEnabled<TagsFeature>())
+        {
+            group.AddFeature(CmsKitFeatures.TagEnable,
             "true",
             L("Feature:TagEnable"),
             L("Feature:TagEnableDescription"),
             new ToggleStringValueType());
+        }
     }
 
     private static LocalizableString L(string name)