Split composers that add views if people only use the core package (#224

)
patrickdemooij9 · Aug 20, 2023 · 8d99c92 · 8d99c92
1 parent d8d9c11
commit 8d99c92
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 21 deletions.
diff --git a/src/SeoToolkit.Umbraco.Common.Core/ContentApps/SeoSettingsContentAppFactory.cs b/src/SeoToolkit.Umbraco.Common.Core/ContentApps/SeoSettingsContentAppFactory.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using SeoToolkit.Umbraco.Common.Core.Collections;
+using System.Collections.Generic;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Models.Membership;
@@ -7,11 +9,23 @@ namespace SeoToolkit.Umbraco.Common.Core.ContentApps
 {
     public class SeoSettingsContentAppFactory : IContentAppFactory
     {
+        private readonly IServiceScopeFactory _serviceScopeFactory;
+
+        public SeoSettingsContentAppFactory(IServiceScopeFactory serviceScopeFactory)
+        {
+            _serviceScopeFactory = serviceScopeFactory;
+        }
+
         public ContentApp GetContentAppFor(object source, IEnumerable<IReadOnlyUserGroup> userGroups)
         {
             if (source is not IContentType)
                 return null;
 
+            using var scope = _serviceScopeFactory.CreateScope();
+
+            var displayProviders = scope.ServiceProvider.GetService<DisplayCollection>();
+            if (displayProviders is null || displayProviders.Count == 0) return null;
+
             return new ContentApp
             {
                 Name = "SEO",

diff --git a/src/SeoToolkit.Umbraco.MetaFields.Core/Composers/MetaFieldsComposer.cs b/src/SeoToolkit.Umbraco.MetaFields.Core/Composers/MetaFieldsComposer.cs
@@ -88,20 +88,6 @@ public void Compose(IUmbracoBuilder builder)
             builder.WithCollectionBuilder<FieldProviderCollectionBuilder>()
                 .Add<InheritedValueFieldProvider>()
                 .Add<PageNameFieldProvider>();
-
-            if (!disabledModules.Contains(DisabledModuleConstant.DocumentTypeContextApp))
-            {
-                builder.WithCollectionBuilder<DisplayCollectionBuilder>()
-                    .Add<MetaFieldsDocumentSettingsDisplayProvider>();
-
-                builder.WithCollectionBuilder<SeoDisplayCollectionBuilder>()
-                    .Add<MetaFieldsContentDisplayProvider>();
-
-                builder.WithCollectionBuilder<SeoGroupCollectionBuilder>()
-                    .Append<MetaFieldsGroup>()
-                    .Append<OpenGraphFieldsGroup>()
-                    .Append<OthersFieldGroup>();
-            }
         }
     }
 }
diff --git a/src/SeoToolkit.Umbraco.MetaFields/Composer.cs b/src/SeoToolkit.Umbraco.MetaFields/Composer.cs
@@ -0,0 +1,38 @@
+using Microsoft.Extensions.Configuration;
+using SeoToolkit.Umbraco.Common.Core.Collections;
+using SeoToolkit.Umbraco.Common.Core.Constants;
+using SeoToolkit.Umbraco.MetaFields.Core.Collections;
+using SeoToolkit.Umbraco.MetaFields.Core.Common.DisplayProviders;
+using SeoToolkit.Umbraco.MetaFields.Core.Common.SeoFieldGroups;
+using SeoToolkit.Umbraco.MetaFields.Core.Config.Models;
+using System;
+using System.Linq;
+using Umbraco.Cms.Core.Composing;
+using Umbraco.Cms.Core.DependencyInjection;
+
+namespace SeoToolkit.Umbraco.MetaFields
+{
+    internal class Composer : IComposer
+    {
+        public void Compose(IUmbracoBuilder builder)
+        {
+            var section = builder.Config.GetSection("SeoToolkit:MetaFields");
+            var settings = section?.Get<MetaFieldsAppSettingsModel>();
+            var disabledModules = settings?.DisabledModules ?? Array.Empty<string>();
+
+            if (!disabledModules.Contains(DisabledModuleConstant.DocumentTypeContextApp))
+            {
+                builder.WithCollectionBuilder<DisplayCollectionBuilder>()
+                    .Add<MetaFieldsDocumentSettingsDisplayProvider>();
+
+                builder.WithCollectionBuilder<SeoDisplayCollectionBuilder>()
+                    .Add<MetaFieldsContentDisplayProvider>();
+
+                builder.WithCollectionBuilder<SeoGroupCollectionBuilder>()
+                    .Append<MetaFieldsGroup>()
+                    .Append<OpenGraphFieldsGroup>()
+                    .Append<OthersFieldGroup>();
+            }
+        }
+    }
+}
diff --git a/src/SeoToolkit.Umbraco.Sitemap.Core/Composers/SitemapComposer.cs b/src/SeoToolkit.Umbraco.Sitemap.Core/Composers/SitemapComposer.cs
@@ -41,12 +41,6 @@ public void Compose(IUmbracoBuilder builder)
 
             builder.Components().Append<EnableModuleComponent>();
 
-            if (!disabledModules.Contains(DisabledModuleConstant.DocumentTypeContextApp))
-            {
-                builder.WithCollectionBuilder<DisplayCollectionBuilder>()
-                    .Add<SitemapDocumentTypeDisplayProvider>();
-            }
-
             builder.Services.AddScoped<ISitemapGenerator, SitemapGenerator>();
             builder.Services.AddScoped<ISitemapIndexGenerator, SitemapIndexGenerator>();
             builder.Services.AddUnique<ISitemapService, SitemapService>();

diff --git a/src/SeoToolkit.Umbraco.Sitemap/Composer.cs b/src/SeoToolkit.Umbraco.Sitemap/Composer.cs
@@ -0,0 +1,27 @@
+using Microsoft.Extensions.Configuration;
+using SeoToolkit.Umbraco.Common.Core.Collections;
+using SeoToolkit.Umbraco.Common.Core.Constants;
+using SeoToolkit.Umbraco.Sitemap.Core.Common.DisplayProviders;
+using SeoToolkit.Umbraco.Sitemap.Core.Config.Models;
+using System;
+using System.Linq;
+using Umbraco.Cms.Core.Composing;
+using Umbraco.Cms.Core.DependencyInjection;
+
+namespace SeoToolkit.Umbraco.Sitemap
+{
+    internal class Composer : IComposer
+    {
+        public void Compose(IUmbracoBuilder builder)
+        {
+            var section = builder.Config.GetSection("SeoToolkit:Sitemap");
+            var disabledModules = section?.Get<SitemapAppSettingsModel>()?.DisabledModules ?? Array.Empty<string>();
+
+            if (!disabledModules.Contains(DisabledModuleConstant.DocumentTypeContextApp))
+            {
+                builder.WithCollectionBuilder<DisplayCollectionBuilder>()
+                    .Add<SitemapDocumentTypeDisplayProvider>();
+            }
+        }
+    }
+}