load flowpart and bagpart resources by name (#15954)

--------- Co-authored-by: Hisham Bin Ateya <[email protected]> Co-authored-by: Mike Alhayek <[email protected]>
OrchardCMS · May 3, 2024 · 17019c4 · 17019c4
1 parent 2954956
commit 17019c4
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 18 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/ResourceManifest.cs b/src/OrchardCore.Modules/OrchardCore.Flows/ResourceManifest.cs
@@ -0,0 +1,28 @@
+using Microsoft.Extensions.Options;
+using OrchardCore.ResourceManagement;
+
+namespace OrchardCore.Flows;
+
+public class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
+{
+    private static ResourceManifest _manifest;
+
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
+
+        _manifest
+            .DefineStyle("flowpart-edit")
+            .SetUrl( "~/OrchardCore.Flows/Styles/flows.edit.min.css", "~/OrchardCore.Flows/Styles/flows.edit.css");
+
+        _manifest
+            .DefineScript("flowpart-edit")
+            .SetDependencies("jQuery")
+            .SetUrl("~/OrchardCore.Flows/Scripts/flows.edit.min.js","~/OrchardCore.Flows/Scripts/flows.edit.js");
+    }
+
+    public void Configure(ResourceManagementOptions options)
+    {
+        options.ResourceManifests.Add(_manifest);
+    }
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Flows/Startup.cs
@@ -1,5 +1,6 @@
 using Fluid;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Display.ContentDisplay;
 using OrchardCore.ContentTypes.Editors;
@@ -12,6 +13,7 @@
 using OrchardCore.Flows.ViewModels;
 using OrchardCore.Indexing;
 using OrchardCore.Modules;
+using OrchardCore.ResourceManagement;
 
 namespace OrchardCore.Flows
 {
@@ -45,6 +47,8 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddContentPart<FlowMetadata>();
 
             services.AddDataMigration<Migrations>();
+
+            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml
@@ -97,12 +97,9 @@
     @if (Context.Items["BagPart.Edit"] == null)
     {
         Context.Items["BagPart.Edit"] = new object();
-        <script asp-src="~/OrchardCore.Flows/Scripts/flows.edit.min.js"
-            debug-src="~/OrchardCore.Flows/Scripts/flows.edit.js" at="Foot" depends-on="jQuery"></script>
-        <style asp-src="~/OrchardCore.Widgets/Styles/widgetslist.edit.min.css"
-           debug-src="~/OrchardCore.Widgets/Styles/widgetslist.edit.css"></style>
-        <style asp-src="~/OrchardCore.Flows/Styles/flows.edit.min.css"
-           debug-src="~/OrchardCore.Flows/Styles/flows.edit.css"></style>
+        <script asp-name="flowpart-edit" at="Foot"></script>
+        <script asp-name="widgetslist-edit" at="Foot"></script>
+        <style asp-name="flowpart-edit" at="Head"></style>
     }
 
     @* Rendered only once per type to initialize the scripts its editor will need *@

diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowPart.Edit.cshtml
@@ -101,13 +101,10 @@
             var contentItem = await ContentManager.NewAsync(type.Name);
             await DisplayAsync(await ContentItemDisplayManager.BuildEditorAsync(contentItem, Model.Updater, true, "", Guid.NewGuid().ToString("n")));
         }
-
-        <script asp-src="~/OrchardCore.Flows/Scripts/flows.edit.min.js"
-            debug-src="~/OrchardCore.Flows/Scripts/flows.edit.js" at="Foot" depends-on="jQuery"></script>
-        <style asp-src="~/OrchardCore.Widgets/Styles/widgetslist.edit.min.css"
-           debug-src="~/OrchardCore.Widgets/Styles/widgetslist.edit.css"></style>
-        <style asp-src="~/OrchardCore.Flows/Styles/flows.edit.css"
-           debug-src="~/OrchardCore.Flows/Styles/flows.edit.min.css"></style>
+
+        <script asp-name="flowpart-edit" at="Foot"></script>
+        <script asp-name="widgetslist-edit" at="Foot"></script>
+        <style asp-name="flowpart-edit" at="Head"></style>
     }
 
     <script at="Foot">

diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/ResourceManifest.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/ResourceManifest.cs
@@ -0,0 +1,28 @@
+using Microsoft.Extensions.Options;
+using OrchardCore.ResourceManagement;
+
+namespace OrchardCore.Widgets;
+
+public class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
+{
+    private static ResourceManifest _manifest;
+
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
+
+        _manifest
+            .DefineStyle("widgetslist-edit")
+            .SetUrl( "~/OrchardCore.Widgets/Styles/widgetslist.edit.min.css", "~/OrchardCore.Widgets/Styles/widgetslist.edit.css");
+
+        _manifest
+            .DefineScript("widgetslist-edit")
+            .SetDependencies("jQuery")
+            .SetUrl("~/OrchardCore.Widgets/Scripts/widgetslist.edit.min.js","~/OrchardCore.Widgets/Scripts/widgetslist.edit.js");
+    }
+
+    public void Configure(ResourceManagementOptions options)
+    {
+        options.ResourceManifests.Add(_manifest);
+    }
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Widgets/Startup.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Display.ContentDisplay;
 using OrchardCore.ContentTypes.Editors;
 using OrchardCore.Data.Migration;
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.Modules;
+using OrchardCore.ResourceManagement;
 using OrchardCore.Widgets.Drivers;
 using OrchardCore.Widgets.Models;
 using OrchardCore.Widgets.Settings;
@@ -24,6 +26,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<IContentTypePartDefinitionDisplayDriver, WidgetsListPartSettingsDisplayDriver>();
             services.AddContentPart<WidgetMetadata>();
             services.AddDataMigration<Migrations>();
+            services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
         }
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/WidgetsListPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/WidgetsListPart.Edit.cshtml
@@ -168,10 +168,8 @@
             var contentItem = await ContentManager.NewAsync(type.Name);
             await DisplayAsync(await ContentItemDisplayManager.BuildEditorAsync(contentItem, Model.Updater, true, "", Guid.NewGuid().ToString("n")));
         }
-
-        <script asp-src="~/OrchardCore.Widgets/Scripts/widgetslist.edit.min.js"
-            debug-src="~/OrchardCore.Widgets/Scripts/widgetslist.edit.js" at="Foot" depends-on="jQuery"></script>
-        <style asp-src="~/OrchardCore.Widgets/Styles/widgetslist.edit.min.css"
-           debug-src="~/OrchardCore.Widgets/Styles/widgetslist.edit.css"></style>
+
+        <script asp-name="widgetslist-edit" at="Foot"></script>
+        <style asp-name="widgetslist-edit" at="Head"></style>
     }
 </div>