feat: Use the abp style bundling

Directory.Packages.props

@@ -42,6 +42,7 @@
 		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.Client.Common" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.Contracts" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.NewtonsoftJson" Version="$(VoloAbpPackageVersion)" />
+		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="$(VoloAbpPackageVersion)" />

aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Blazor/AbpElsaNextStudioBlazorModule.cs

@@ -15,6 +15,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor;
 using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
@@ -28,7 +29,8 @@ namespace LINGYUN.Abp.ElsaNext.Studio.Blazor;
     typeof(AbpLocalizationModule),
     typeof(AbpUiNavigationModule),
     typeof(AbpVirtualFileSystemModule),
-    typeof(AbpAspNetCoreComponentsWebThemingMudBlazorModule))]
+    typeof(AbpAspNetCoreComponentsWebThemingMudBlazorModule),
+    typeof(AbpAspNetCoreMvcUiBundlingAbstractionsModule))]
 public class AbpElsaNextStudioBlazorModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)

aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Blazor/LINGYUN.Abp.ElsaNext.Studio.Blazor.csproj

@@ -16,6 +16,7 @@
 		<PackageReference Include="Volo.Abp.UI.Navigation" />
 		<PackageReference Include="Volo.Abp.VirtualFileSystem" />
 		<PackageReference Include="Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor" />
+		<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions" />
 	</ItemGroup>
 
 	<ItemGroup>

aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule.cs

@@ -4,6 +4,7 @@ using Elsa.Features.Services;
 using Elsa.Studio.Diagnostics.StructuredLogs.Dashboard.Extensions;
 using Elsa.Studio.Diagnostics.StructuredLogs.Extensions;
 using LINGYUN.Abp.ElsaNext.Studio.Blazor;
+using LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.Bundling;
 using LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.Extensions;
 using LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.Navigation;
 using LINGYUN.Abp.ElsaNext.Studio.Translations.Localization;
@@ -11,6 +12,7 @@ using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore;
 using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
@@ -28,6 +30,7 @@ public class AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule : AbpModule
         PreConfigure<IModule>(elsa =>
         {
             elsa.UseStructuredLogs();
+            elsa.UseStructuredLogsDashboard();
         });
     }
 
@@ -35,6 +38,16 @@ public class AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule : AbpModule
     {
         var configuration = context.Configuration.GetSection("Elsa:Studio");
 
+        Configure<AbpBundlingOptions>(options =>
+        {
+            options
+                .StyleBundles
+                .Add(typeof(Elsa.Studio.Diagnostics.StructuredLogs.UI.Pages.StructuredLogs).FullName!, bundle =>
+                {
+                    bundle.AddContributors(typeof(StructuredLogsStyleContributor));
+                });
+        });
+
         Configure<AbpRouterOptions>(options =>
         {
             // options.AdditionalAssemblies.Add(typeof(Elsa.Studio.Diagnostics.StructuredLogs.Feature).Assembly);
@@ -50,6 +63,7 @@ public class AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule : AbpModule
         {
             options.FileSets.AddEmbedded<AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule>("LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor");
         });
+
         Configure<AbpLocalizationOptions>(options =>
         {
             options.Resources

aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/Bundling/StructuredLogsStyleContributor.cs

@@ -0,0 +1,12 @@
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.Bundling;
+
+public class StructuredLogsStyleContributor : BundleContributor
+{
+    public override void ConfigureBundle(BundleConfigurationContext context)
+    {
+        context.Files.AddIfNotContains("/_content/Elsa.Studio.Diagnostics.StructuredLogs/structuredLogs.css");
+        context.Files.AddIfNotContains("/_content/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/structuredLogs-overrides.css");
+    }
+}

aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.csproj

@@ -19,6 +19,7 @@
 		<!-- Official Elsa Studio structured-logs module (rc2): services, SignalR observer, API client
 		     and the viewer page component reused by this module's ABP page (see Pages/). -->
 		<PackageReference Include="Elsa.Diagnostics.StructuredLogs" />
+		<PackageReference Include="Elsa.Diagnostics.StructuredLogs.Dashboard" />
 		<PackageReference Include="Elsa.Studio.Diagnostics.StructuredLogs.Dashboard" />
 	</ItemGroup>
 
@@ -27,7 +28,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<Content Include="Remove\**\*.json" />
 		<EmbeddedResource Include="Localization\**\*.json" />
 	</ItemGroup>
-
 </Project>

aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/Pages/Logs.razor

@@ -4,10 +4,12 @@
 @inject ILocalizer Localizer
 
 @using Elsa.Studio.Diagnostics.StructuredLogs.UI.Pages
+@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Bundling
 
 <HeadContent>
-    <link rel="stylesheet" href="_content/Elsa.Studio.Diagnostics.StructuredLogs/structuredLogs.css" />
+@*     <link rel="stylesheet" href="_content/Elsa.Studio.Diagnostics.StructuredLogs/structuredLogs.css" />
-    <link rel="stylesheet" href="_content/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/structuredLogs-overrides.css" />
+    <link rel="stylesheet" href="_content/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/structuredLogs-overrides.css" /> *@
+    <AbpStyles BundleName="@typeof(StructuredLogs).FullName" />
 </HeadContent>
 
 <PageTitle>@Localizer["Logs"]</PageTitle>

aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/_Imports.razor

@@ -3,3 +3,4 @@
 @using Elsa.Studio.Components
 @using Elsa.Studio.Localization
 @using MudBlazor
+@using Volo.Abp.AspNetCore.Components.Web.Theming