From ea9dff32875fcaddfa3272560d8f0bd1fcc98b67 Mon Sep 17 00:00:00 2001
From: Mike Alhayek <mike@crestapps.com>
Date: Thu, 26 Oct 2023 08:00:12 -0700
Subject: [PATCH] Add extensions for IDisplayManager (#14579)

---
 .../Views/NavbarUserMenu.cshtml               |  2 +-
 .../LoginWithTwoFactorAuthentication.cshtml   |  2 +-
 .../TheAdmin/Views/Layout.cshtml              |  2 +-
 .../TheTheme/Views/Layout.cshtml              |  2 +-
 .../Extensions/DisplayManagerExtensions.cs    | 13 ++++++++++++
 src/docs/releases/1.8.0.md                    | 20 +++++++++++++++++++
 6 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 src/OrchardCore/OrchardCore.DisplayManagement/Extensions/DisplayManagerExtensions.cs

diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavbarUserMenu.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavbarUserMenu.cshtml
index c312352bf84..baeae2fd23c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavbarUserMenu.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavbarUserMenu.cshtml
@@ -5,5 +5,5 @@
 @inject IUpdateModelAccessor UpdateModelAccessor
 
 <li class="nav-item">
-    @await DisplayAsync(await DisplayManager.BuildDisplayAsync(new UserMenu(), UpdateModelAccessor.ModelUpdater, Model.Metadata.DisplayType))
+    @await DisplayAsync(await DisplayManager.BuildDisplayAsync<UserMenu>(UpdateModelAccessor.ModelUpdater, (string)Model.Metadata.DisplayType))
 </li>
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/TwoFactorAuthentication/LoginWithTwoFactorAuthentication.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/TwoFactorAuthentication/LoginWithTwoFactorAuthentication.cshtml
index c8341dd7a58..f81d1c2cca5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Views/TwoFactorAuthentication/LoginWithTwoFactorAuthentication.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/TwoFactorAuthentication/LoginWithTwoFactorAuthentication.cshtml
@@ -28,7 +28,7 @@
 
         @if (!string.IsNullOrEmpty(Model.CurrentProvider))
         {
-            var shape = await DisplayManager.BuildEditorAsync(new TwoFactorMethod(), UpdateModelAccessor.ModelUpdater, false, Model.CurrentProvider, string.Empty);
+            var shape = await DisplayManager.BuildEditorAsync<TwoFactorMethod>(UpdateModelAccessor.ModelUpdater, false, Model.CurrentProvider);
 
             @await DisplayAsync(shape)
         }
diff --git a/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml b/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml
index 22cf70aca23..80381739a72 100644
--- a/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml
+++ b/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml
@@ -60,7 +60,7 @@
                             }
                         </div>
                     </div>
-                    @await DisplayAsync(await DisplayManager.BuildDisplayAsync(new Navbar(), UpdateModelAccessor.ModelUpdater, "DetailAdmin"))
+                    @await DisplayAsync(await DisplayManager.BuildDisplayAsync<Navbar>(UpdateModelAccessor.ModelUpdater, "DetailAdmin"))
                 </div>
             </div>
         </nav>
diff --git a/src/OrchardCore.Themes/TheTheme/Views/Layout.cshtml b/src/OrchardCore.Themes/TheTheme/Views/Layout.cshtml
index 956afd37c5b..4acac82ddf6 100644
--- a/src/OrchardCore.Themes/TheTheme/Views/Layout.cshtml
+++ b/src/OrchardCore.Themes/TheTheme/Views/Layout.cshtml
@@ -49,7 +49,7 @@
             <div class="collapse navbar-collapse" id="navbar">
                 <div class="d-flex w-100 align-items-end justify-content-end justify-content-md-between flex-column flex-md-row">
                     <menu alias="alias:main-menu" cache-id="main-menu" cache-fixed-duration="00:05:00" cache-tag="alias:main-menu" />
-                    @await DisplayAsync(await DisplayManager.BuildDisplayAsync(new Navbar(), UpdateModelAccessor.ModelUpdater))
+                    @await DisplayAsync(await DisplayManager.BuildDisplayAsync<Navbar>(UpdateModelAccessor.ModelUpdater))
                 </div>
             </div>
         </div>
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/DisplayManagerExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/DisplayManagerExtensions.cs
new file mode 100644
index 00000000000..5b4199e0708
--- /dev/null
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Extensions/DisplayManagerExtensions.cs
@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+using OrchardCore.DisplayManagement.ModelBinding;
+
+namespace OrchardCore.DisplayManagement;
+
+public static class DisplayManagerExtensions
+{
+    public static Task<IShape> BuildDisplayAsync<TModel>(this IDisplayManager<TModel> displayManager, IUpdateModel updater, string displayType = "", string groupId = "") where TModel : new()
+        => displayManager.BuildDisplayAsync(new TModel(), updater, displayType, groupId);
+
+    public static Task<IShape> BuildEditorAsync<TModel>(this IDisplayManager<TModel> displayManager, IUpdateModel updater, bool isNew, string groupId = "", string htmlPrefix = "") where TModel : new()
+        => displayManager.BuildEditorAsync(new TModel(), updater, isNew, groupId, htmlPrefix);
+}
diff --git a/src/docs/releases/1.8.0.md b/src/docs/releases/1.8.0.md
index 2e5eaa0fd5d..fea359a8af4 100644
--- a/src/docs/releases/1.8.0.md
+++ b/src/docs/releases/1.8.0.md
@@ -59,3 +59,23 @@ public class ToggleThemeNavbarDisplayDriver : DisplayDriver<Navbar>
  Additionally, the follow shapes have been removed
  - `ContentCulturePickerContainer`
  - `AdminCulturePickerContainer`
+
+#### `Navbar` Shape for Custom Theme
+
+To add the `Navbar` shape into your own front-end theme, add the following code into your layout.
+
+```
+@inject IDisplayManager<Navbar> DisplayManager
+@inject IUpdateModelAccessor UpdateModelAccessor
+
+@await DisplayAsync(await DisplayManager.BuildDisplayAsync<Navbar>(UpdateModelAccessor.ModelUpdater))
+```
+
+To add the `Navbar` shape into your own back-end theme, add the following code into your layout.
+
+```
+@inject IDisplayManager<Navbar> DisplayManager
+@inject IUpdateModelAccessor UpdateModelAccessor
+
+@await DisplayAsync(await DisplayManager.BuildDisplayAsync<Navbar>(UpdateModelAccessor.ModelUpdater, "DetailAdmin"))
+```