Browse Source

feat: remove structuredlogs bundle

pull/1568/head
colin 3 weeks ago
parent
commit
e9f677e4d3
  1. 12
      aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule.cs
  2. 12
      aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/Bundling/StructuredLogsStyleContributor.cs
  3. 2
      aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.csproj
  4. 28
      aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/Pages/Logs.razor

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

@ -4,7 +4,6 @@ using Elsa.Features.Services;
using Elsa.Studio.Diagnostics.StructuredLogs.Dashboard.Extensions; using Elsa.Studio.Diagnostics.StructuredLogs.Dashboard.Extensions;
using Elsa.Studio.Diagnostics.StructuredLogs.Extensions; using Elsa.Studio.Diagnostics.StructuredLogs.Extensions;
using LINGYUN.Abp.ElsaNext.Studio.Blazor; 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.Extensions;
using LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.Navigation; using LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.Navigation;
using LINGYUN.Abp.ElsaNext.Studio.Translations.Localization; using LINGYUN.Abp.ElsaNext.Studio.Translations.Localization;
@ -12,7 +11,6 @@ using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AspNetCore; using Volo.Abp.AspNetCore;
using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing; using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing;
using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
using Volo.Abp.Localization; using Volo.Abp.Localization;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Volo.Abp.UI.Navigation; using Volo.Abp.UI.Navigation;
@ -38,16 +36,6 @@ public class AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule : AbpModule
{ {
var configuration = context.Configuration.GetSection("Elsa:Studio"); 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 => Configure<AbpRouterOptions>(options =>
{ {
// options.AdditionalAssemblies.Add(typeof(Elsa.Studio.Diagnostics.StructuredLogs.Feature).Assembly); // options.AdditionalAssemblies.Add(typeof(Elsa.Studio.Diagnostics.StructuredLogs.Feature).Assembly);

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

@ -1,12 +0,0 @@
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");
}
}

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

@ -28,7 +28,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Remove\**\*.json" /> <Content Remove="Localization\**\*.json" />
<EmbeddedResource Include="Localization\**\*.json" /> <EmbeddedResource Include="Localization\**\*.json" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@ -4,33 +4,11 @@
@inject ILocalizer Localizer @inject ILocalizer Localizer
@using Elsa.Studio.Diagnostics.StructuredLogs.UI.Pages @using Elsa.Studio.Diagnostics.StructuredLogs.UI.Pages
@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Bundling
<HeadContent> <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> </HeadContent>
<PageTitle>@Localizer["Logs"]</PageTitle> <StructuredLogs />
@if (_interactive)
{
<StructuredLogs />
}
@code {
private bool _interactive;
protected override void OnAfterRender(bool firstRender)
{
if (!firstRender || _interactive)
return;
// The official viewer subscribes to the SignalR live hub on init; mounting it only after
// the circuit is interactive keeps the static SSR prerender from hanging on that first
// frame (same approach as the workflow instance viewer).
_interactive = true;
StateHasChanged();
}
}

Loading…
Cancel
Save