Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

load flowpart and bagpart resources by name #15954

Merged
merged 9 commits into from
May 3, 2024
Merged

load flowpart and bagpart resources by name #15954

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
af59ce1
load resources by name
giannik May 2, 2024
52e8ef7
Merge branch 'main' into flowpart-resources-by-name
hishamco May 2, 2024
36ec36b
Update src/OrchardCore.Modules/OrchardCore.Flows/Startup.cs
giannik May 2, 2024
8d2b062
Update src/OrchardCore.Modules/OrchardCore.Widgets/ResourceManifest.cs
giannik May 2, 2024
380ca81
Update src/OrchardCore.Modules/OrchardCore.Flows/ResourceManifest.cs
giannik May 2, 2024
21f9fbd
file scoped namespace
giannik May 2, 2024
922c50c
Merge remote-tracking branch 'origin/flowpart-resources-by-name' into…
giannik May 2, 2024
8489c5d
file scoped namespaces
giannik May 2, 2024
22d88c9
fix formatting
MikeAlhayek May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/OrchardCore.Modules/OrchardCore.Flows/ResourceManifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using Microsoft.Extensions.Options;
using OrchardCore.ResourceManagement;

namespace OrchardCore.Flows
giannik marked this conversation as resolved.
Show resolved Hide resolved
{
public class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well now you need to remove the extra indentation in the file.

{
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);
}
}


giannik marked this conversation as resolved.
Show resolved Hide resolved
}
5 changes: 5 additions & 0 deletions src/OrchardCore.Modules/OrchardCore.Flows/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -12,6 +13,7 @@
using OrchardCore.Flows.ViewModels;
using OrchardCore.Indexing;
using OrchardCore.Modules;
using OrchardCore.ResourceManagement;

namespace OrchardCore.Flows
{
Expand Down Expand Up @@ -45,6 +47,9 @@ public override void ConfigureServices(IServiceCollection services)
services.AddContentPart<FlowMetadata>();

services.AddDataMigration<Migrations>();

services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();

giannik marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
9 changes: 3 additions & 6 deletions src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 *@
Expand Down
11 changes: 4 additions & 7 deletions src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowPart.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
30 changes: 30 additions & 0 deletions src/OrchardCore.Modules/OrchardCore.Widgets/ResourceManifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using Microsoft.Extensions.Options;
using OrchardCore.ResourceManagement;

namespace OrchardCore.Widgets
giannik marked this conversation as resolved.
Show resolved Hide resolved
{
public class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too. every line have extra 4 spaces that should be removed

{
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);
}
}


giannik marked this conversation as resolved.
Show resolved Hide resolved
}
3 changes: 3 additions & 0 deletions src/OrchardCore.Modules/OrchardCore.Widgets/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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>();
}
}
}
8 changes: 3 additions & 5 deletions src/OrchardCore.Modules/OrchardCore.Widgets/Views/WidgetsListPart.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>