[release/9.4] Add option to console logs to wrap log lines (#10314)

Author: github-actions[bot]

src/Aspire.Dashboard/Components/Controls/LogViewer.razor

@@ -10,7 +10,7 @@
 @implements IAsyncDisposable
 
 <div class="log-overflow console-overflow continuous-scroll-overflow">
-    <div class="log-container console-container" id="logContainer">
+    <div class="@GetLogContainerClass()" id="logContainer">
         @if (LogEntries is { } logEntries)
         {
             <Virtualize Items="@logEntries.GetEntries()" ItemSize="20" OverscanCount="200" TItem="LogEntry">

src/Aspire.Dashboard/Components/Controls/LogViewer.razor.cs

@@ -39,6 +39,9 @@ public sealed partial class LogViewer
     [Parameter]
     public bool IsTimestampUtc { get; set; }
 
+    [Parameter]
+    public bool NoWrapLogs { get; set; }
+
     [Parameter]
     public string? ApplicationName { get; set; }
 
@@ -87,6 +90,11 @@ private string GetDisplayTimestamp(DateTimeOffset timestamp)
             : TimeProvider.ToLocal(timestamp).ToString(KnownFormats.ConsoleLogsUITimestampLocalFormat, CultureInfo.InvariantCulture);
     }
 
+    private string GetLogContainerClass()
+    {
+        return $"log-container console-container {(NoWrapLogs ? "wrap-log-container" : null)}";
+    }
+
     public ValueTask DisposeAsync()
     {
         Logger.LogDebug("Disposing log viewer.");

src/Aspire.Dashboard/Components/Pages/ConsoleLogs.razor

@@ -96,6 +96,7 @@
                 LogEntries="@_logEntries"
                 ShowTimestamp="@_showTimestamp"
                 IsTimestampUtc="@_isTimestampUtc"
+                NoWrapLogs="@_noWrapLogs"
                 ApplicationName="@PageViewModel.SelectedResource?.Name"/>
         </MainSection>
     </AspirePageContentLayout>

src/Aspire.Dashboard/Components/Pages/ConsoleLogs.razor.cs

@@ -118,6 +118,7 @@ private sealed class ConsoleLogsSubscription
     private bool _showHiddenResources;
     private bool _showTimestamp;
     private bool _isTimestampUtc;
+    private bool _noWrapLogs;
     public ConsoleLogsViewModel PageViewModel { get; set; } = null!;
     private IDisposable? _consoleLogsFiltersChangedSubscription;
     private ConsoleLogsFilters _consoleLogFilters = new();
@@ -149,6 +150,7 @@ protected override async Task OnInitializedAsync()
         {
             _showTimestamp = consoleSettings.ShowTimestamp;
             _isTimestampUtc = consoleSettings.IsTimestampUtc;
+            _noWrapLogs = consoleSettings.NoWrapLogs;
         }
 
         var showHiddenResources = await SessionStorage.GetAsync<bool>(BrowserStorageKeys.ResourcesShowHiddenResources);
@@ -370,6 +372,13 @@ private void UpdateMenuButtons()
             IsDisabled = !_showTimestamp
         });
 
+        _logsMenuItems.Add(new()
+        {
+            OnClick = () => ToggleWrapLogsAsync(noWrapLogs: !_noWrapLogs),
+            Text = _noWrapLogs ? Loc[nameof(Dashboard.Resources.ConsoleLogs.ConsoleLogsWrapLogs)] : Loc[nameof(Dashboard.Resources.ConsoleLogs.ConsoleLogsNoWrapLogs)],
+            Icon = _noWrapLogs ? new Icons.Regular.Size16.TextWrap() : new Icons.Regular.Size16.TextWrapOff()
+        });
+
         if (PageViewModel.SelectedResource != null)
         {
             if (ViewportInformation.IsDesktop)
@@ -400,10 +409,20 @@ private void UpdateMenuButtons()
 
     private async Task ToggleTimestampAsync(bool showTimestamp, bool isTimestampUtc)
     {
-        await LocalStorage.SetUnprotectedAsync(BrowserStorageKeys.ConsoleLogConsoleSettings, new ConsoleLogConsoleSettings(showTimestamp, isTimestampUtc));
         _showTimestamp = showTimestamp;
         _isTimestampUtc = isTimestampUtc;
+        await UpdateConsoleLogSettingsAsync();
+    }
 
+    private async Task ToggleWrapLogsAsync(bool noWrapLogs)
+    {
+        _noWrapLogs = noWrapLogs;
+        await UpdateConsoleLogSettingsAsync();
+    }
+
+    private async Task UpdateConsoleLogSettingsAsync()
+    {
+        await LocalStorage.SetUnprotectedAsync(BrowserStorageKeys.ConsoleLogConsoleSettings, new ConsoleLogConsoleSettings(_showTimestamp, _isTimestampUtc, _noWrapLogs));
         UpdateMenuButtons();
         StateHasChanged();
     }
@@ -749,7 +768,7 @@ public class ConsoleLogsViewModel
 
     public record ConsoleLogsPageState(string? SelectedResource);
 
-    public record ConsoleLogConsoleSettings(bool ShowTimestamp, bool IsTimestampUtc);
+    public record ConsoleLogConsoleSettings(bool ShowTimestamp, bool IsTimestampUtc, bool NoWrapLogs);
 
     public Task UpdateViewModelFromQueryAsync(ConsoleLogsViewModel viewModel)
     {