Skip to content

Address Log Viewer first render issues #6

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

Merged
Tim Mulholland (tlmii) merged 1 commit into from
Oct 2, 2023
Merged

Address Log Viewer first render issues #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 34 additions & 2 deletions src/Aspire.Dashboard/Components/Controls/LogViewer.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,18 @@
[Parameter]
public string InitialText { get; set; } = "";

private List<IEnumerable<LogEntry>> _preRenderQueue = new();

bool initialMessageCleared = false;
bool renderComplete = false;

private IJSObjectReference? _jsModule;

internal async Task ClearLogsAsync()
{
if (_jsModule is not null)
{
initialMessageCleared = true;
await _jsModule.InvokeVoidAsync("clearLogs");
}
}
Expand All @@ -32,25 +36,53 @@
internal Task AddLogEntriesAsync(IEnumerable<LogEntry> logEntries)
=> WriteLogsAsync(logEntries);

private ValueTask WriteLogsToDom(IEnumerable<LogEntry> logs)
=> _jsModule is null ? ValueTask.CompletedTask : _jsModule.InvokeVoidAsync("addLogEntries", logs);

protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
{
_jsModule ??= await JS.InvokeAsync<IJSObjectReference>("import", "/_content/Aspire.Dashboard/Components/Controls/LogViewer.razor.js");

if (_preRenderQueue.Count > 0)
{
await WritePreRenderQueue();
}
renderComplete = true;
}

async Task WritePreRenderQueue()
{
if (!initialMessageCleared)
{
initialMessageCleared = true;
await ClearLogsAsync();
}

foreach (var logs in _preRenderQueue)
{
await WriteLogsToDom(logs);
}
_preRenderQueue.Clear();
}
}

private async Task WriteLogsAsync(IEnumerable<LogEntry> logs)
{
if (_jsModule is not null)
if (renderComplete)
{
if (!initialMessageCleared)
{
initialMessageCleared = true;
await ClearLogsAsync();
}

await _jsModule.InvokeVoidAsync("addLogEntries", logs);
await WriteLogsToDom(logs);
}
else
{
_preRenderQueue.Add(logs);
}
}

Expand Down