From 522493427f6b542c744d80cbe2670043ad2b4e5d Mon Sep 17 00:00:00 2001
From: ns8482e <23270244+ns8482e@users.noreply.github.com>
Date: Mon, 23 May 2022 12:18:49 -0500
Subject: [PATCH] Auto register IDisplayManager<T> for T on AddTheming Fixes:
 #11547

---
 src/OrchardCore.Modules/OrchardCore.AdminMenu/Startup.cs      | 2 --
 src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs     | 4 +---
 src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs       | 1 -
 src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs     | 1 -
 src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs         | 2 --
 src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs        | 1 -
 src/OrchardCore.Modules/OrchardCore.Rules/Startup.cs          | 3 +--
 src/OrchardCore.Modules/OrchardCore.Settings/Startup.cs       | 1 -
 src/OrchardCore.Modules/OrchardCore.Shortcodes/Startup.cs     | 1 -
 src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs       | 1 -
 src/OrchardCore.Modules/OrchardCore.Users/Startup.cs          | 2 --
 .../OrchardCoreBuilderExtensions.cs                           | 1 +
 12 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Startup.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Startup.cs
index 1e87e805590..9fbf2c48664 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Startup.cs
@@ -38,8 +38,6 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<IAdminMenuService, AdminMenuService>();
             services.AddScoped<AdminMenuNavigationProvidersCoordinator, AdminMenuNavigationProvidersCoordinator>();
 
-            services.AddScoped<IDisplayManager<MenuItem>, DisplayManager<MenuItem>>();
-
             services.AddRecipeExecutionStep<AdminMenuStep>();
 
             services.AddTransient<IDeploymentSource, AdminMenuDeploymentSource>();
diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs
index 8b4df9bfc08..cdafba2d486 100644
--- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs
@@ -49,7 +49,6 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<IAuditTrailManager, AuditTrailManager>();
 
             services
-                .AddScoped<IDisplayManager<AuditTrailEvent>, DisplayManager<AuditTrailEvent>>()
                 .AddScoped<IDisplayDriver<AuditTrailEvent>, AuditTrailEventDisplayDriver>();
 
             services.AddSingleton<IAuditTrailIdGenerator, AuditTrailIdGenerator>();
@@ -67,8 +66,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<IDisplayDriver<ISite>, AuditTrailSettingsDisplayDriver>();
             services.AddScoped<IDisplayDriver<ISite>, AuditTrailTrimmingSettingsDisplayDriver>();
 
-            services.AddScoped<IDisplayManager<AuditTrailIndexOptions>, DisplayManager<AuditTrailIndexOptions>>()
-                .AddScoped<IDisplayDriver<AuditTrailIndexOptions>, AuditTrailOptionsDisplayDriver>();
+            services.AddScoped<IDisplayDriver<AuditTrailIndexOptions>, AuditTrailOptionsDisplayDriver>();
 
             services.AddScoped<IAuditTrailAdminListQueryService, DefaultAuditTrailAdminListQueryService>();
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs
index 7d9f0c337a8..987d3e401bc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs
@@ -199,7 +199,6 @@ async Task<FluidValue> GetContentByHandleAsync(LiquidTemplateContext context, st
 
             services.AddScoped<IContentsAdminListQueryService, DefaultContentsAdminListQueryService>();
 
-            services.AddScoped<IDisplayManager<ContentOptionsViewModel>, DisplayManager<ContentOptionsViewModel>>();
             services.AddScoped<IDisplayDriver<ContentOptionsViewModel>, ContentOptionsDisplayDriver>();
 
             services.AddScoped(typeof(IContentItemRecursionHelper<>), typeof(ContentItemRecursionHelper<>));
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs
index 6d06e265cdf..5eb9f5809ed 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs
@@ -38,7 +38,6 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<INavigationProvider, AdminMenu>();
             services.AddScoped<IPermissionProvider, Permissions>();
 
-            services.AddScoped<IDisplayManager<DeploymentStep>, DisplayManager<DeploymentStep>>();
             services.AddSingleton<IDeploymentTargetProvider, FileDownloadDeploymentTargetProvider>();
 
             // Custom File deployment step
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs
index 9ea40d53832..20b96f083f4 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs
@@ -175,7 +175,6 @@ public override void ConfigureServices(IServiceCollection services)
             {
                 ServiceDescriptor.Scoped<IRoleRemovedEventHandler, OpenIdApplicationRoleRemovedEventHandler>(),
                 ServiceDescriptor.Scoped<IDisplayDriver<OpenIdServerSettings>, OpenIdServerSettingsDisplayDriver>(),
-                ServiceDescriptor.Scoped<IDisplayManager<OpenIdServerSettings>, DisplayManager<OpenIdServerSettings>>(),
                 ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdServerSettingsStep>(),
                 ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdApplicationStep>(),
                 ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdScopeStep>(),
@@ -303,7 +302,6 @@ public override void ConfigureServices(IServiceCollection services)
             services.TryAddEnumerable(new[]
             {
                 ServiceDescriptor.Scoped<IDisplayDriver<OpenIdValidationSettings>, OpenIdValidationSettingsDisplayDriver>(),
-                ServiceDescriptor.Scoped<IDisplayManager<OpenIdValidationSettings>, DisplayManager<OpenIdValidationSettings>>(),
                 ServiceDescriptor.Scoped<IRecipeStepHandler, OpenIdValidationSettingsStep>()
             });
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs
index ea0e291c917..327957b65b9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs
@@ -41,7 +41,6 @@ public override void ConfigureServices(IServiceCollection services)
         {
             services.AddScoped<INavigationProvider, AdminMenu>();
             services.AddScoped<IQueryManager, QueryManager>();
-            services.AddScoped<IDisplayManager<Query>, DisplayManager<Query>>();
 
             services.AddScoped<IDisplayDriver<Query>, QueryDisplayDriver>();
             services.AddRecipeExecutionStep<QueryStep>();
diff --git a/src/OrchardCore.Modules/OrchardCore.Rules/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Rules/Startup.cs
index 55123641543..32130d80391 100644
--- a/src/OrchardCore.Modules/OrchardCore.Rules/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Rules/Startup.cs
@@ -17,8 +17,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddOptions<ConditionOptions>();
 
             // Rule services.
-            services.AddScoped<IDisplayManager<Condition>, DisplayManager<Condition>>()
-                .AddScoped<IDisplayManager<Rule>, DisplayManager<Rule>>()
+            services
                 .AddScoped<IDisplayDriver<Rule>, RuleDisplayDriver>()
                 .AddSingleton<IConditionIdGenerator, ConditionIdGenerator>()
                 .AddTransient<IConfigureOptions<ConditionOperatorOptions>, ConditionOperatorConfigureOptions>()
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Startup.cs
index 20e33c736e3..1bdd6da0ec4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/Startup.cs
@@ -82,7 +82,6 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddSingleton<ISiteService, SiteService>();
 
             // Site Settings editor
-            services.AddScoped<IDisplayManager<ISite>, DisplayManager<ISite>>();
             services.AddScoped<IDisplayDriver<ISite>, DefaultSiteSettingsDisplayDriver>();
             services.AddScoped<IDisplayDriver<ISite>, ButtonsSettingsDisplayDriver>();
             services.AddScoped<INavigationProvider, AdminMenu>();
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Startup.cs
index 4f4ee72043a..0161485664c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Startup.cs
@@ -58,7 +58,6 @@ public override void ConfigureServices(IServiceCollection services)
 
             services.AddOptions<ShortcodeOptions>();
             services.AddScoped<IShortcodeProvider, OptionsShortcodeProvider>();
-            services.AddScoped<IDisplayManager<ShortcodeDescriptor>, DisplayManager<ShortcodeDescriptor>>();
             services.AddScoped<IDisplayDriver<ShortcodeDescriptor>, ShortcodeDescriptorDisplayDriver>();
         }
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs
index 9d7a8b67ca7..0fc4c1c0b0f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Startup.cs
@@ -67,7 +67,6 @@ public override void ConfigureServices(IServiceCollection services)
 
             services.AddScoped<ISitemapIdGenerator, SitemapIdGenerator>();
             services.AddScoped<ISitemapHelperService, SitemapHelperService>();
-            services.AddScoped<IDisplayManager<SitemapSource>, DisplayManager<SitemapSource>>();
             services.AddScoped<ISitemapBuilder, DefaultSitemapBuilder>();
             services.AddScoped<ISitemapTypeBuilder, SitemapTypeBuilder>();
             services.AddScoped<ISitemapCacheProvider, DefaultSitemapCacheProvider>();
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs
index 2b0140fe6b3..eeed0ea2ca6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Startup.cs
@@ -215,7 +215,6 @@ public override void ConfigureServices(IServiceCollection services)
 
             services.AddScoped<IDisplayDriver<ISite>, LoginSettingsDisplayDriver>();
 
-            services.AddScoped<IDisplayManager<User>, DisplayManager<User>>();
             services.AddScoped<IDisplayDriver<User>, UserDisplayDriver>();
             services.AddScoped<IDisplayDriver<User>, UserRoleDisplayDriver>();
             services.AddScoped<IDisplayDriver<User>, UserInformationDisplayDriver>();
@@ -227,7 +226,6 @@ public override void ConfigureServices(IServiceCollection services)
 
             services.AddScoped<IUsersAdminListQueryService, DefaultUsersAdminListQueryService>();
 
-            services.AddScoped<IDisplayManager<UserIndexOptions>, DisplayManager<UserIndexOptions>>();
             services.AddScoped<IDisplayDriver<UserIndexOptions>, UserOptionsDisplayDriver>();
 
             services.AddSingleton<IUsersAdminListFilterParser>(sp =>
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/OrchardCoreBuilderExtensions.cs
index 5e61e127fe6..3d62c5418d7 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/OrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/OrchardCoreBuilderExtensions.cs
@@ -75,6 +75,7 @@ public static OrchardCoreBuilder AddTheming(this OrchardCoreBuilder builder)
                     services.AddScoped<IShapeTableProvider, ZoneShapeAlternates>();
                     services.AddShapeAttributes<GroupShapes>();
 
+                    services.AddScoped(typeof(IDisplayManager<>), typeof(DisplayManager<>));
                     services.AddScoped<IHtmlDisplay, DefaultHtmlDisplay>();
                     services.AddScoped<ILayoutAccessor, LayoutAccessor>();
                     services.AddScoped<IThemeManager, ThemeManager>();