Add viewer for long strings in GridValue #5018
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| @using Aspire.Dashboard.Model | ||
| @using Aspire.Dashboard.Resources | ||
|
|
||
| @inject IStringLocalizer<Dialogs> Loc | ||
| @implements IDialogContentComponent<Aspire.Dashboard.Model.TextVisualizerDialogViewModel> | ||
|
|
||
| <FluentDialogHeader ShowDismiss="true"> | ||
| <FluentStack VerticalAlignment="VerticalAlignment.Center"> | ||
| <FluentIcon Value="@(new Icons.Regular.Size24.SlideSearch())" /> | ||
| <FluentLabel Typo="Typography.PaneHeader"> | ||
| @Content.Description | ||
| </FluentLabel> | ||
|
|
||
| <FluentButton id="@_openSelectFormatButtonId" slot="end" | ||
| Style="margin-left: auto" | ||
| Appearance="Appearance.Accent" | ||
| IconEnd="@(new Icons.Regular.Size24.Filter())" | ||
| @onclick="() => _isSelectFormatPopupOpen = !_isSelectFormatPopupOpen" | ||
| Title="@Loc[nameof(Dialogs.TextVisualizerSelectFormatType)]" | ||
| aria-label="@Loc[nameof(Dialogs.TextVisualizerSelectFormatType)]"/> | ||
|
|
||
| <FluentPopover AnchorId="@_openSelectFormatButtonId" | ||
| @bind-Open="@_isSelectFormatPopupOpen" | ||
| AutoFocus="true"> | ||
| <Body> | ||
| <FluentRadioGroup aria-labelledby="@_openSelectFormatButtonId" | ||
| @bind-Value="_selectedOption" | ||
| @bind-Value:after="@OnFormatOptionChanged" | ||
| Orientation="Orientation.Vertical"> | ||
| @foreach (var option in _options) | ||
| { | ||
| <FluentRadio Value="@option.Id">@option.Name</FluentRadio> | ||
| } | ||
| </FluentRadioGroup> | ||
| </Body> | ||
| </FluentPopover> | ||
| </FluentStack> | ||
| </FluentDialogHeader> | ||
|
|
||
| <FluentDialogBody> | ||
| <pre style="white-space: pre-wrap; overflow-wrap: break-word"> | ||
| @_formattedText | ||
| </pre> | ||
| </FluentDialogBody> | ||
|
|
||
| <FluentDialogFooter Visible="false" /> | ||
|
|
||
| @code { | ||
| [Parameter, EditorRequired] | ||
| public required TextVisualizerDialogViewModel Content { get; set; } | ||
adamint marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Text; | ||
| using System.Text.Json; | ||
| using System.Xml; | ||
| using System.Xml.Linq; | ||
| using Aspire.Dashboard.Model.Otlp; | ||
| using Microsoft.AspNetCore.Components; | ||
|
|
||
| namespace Aspire.Dashboard.Components.Dialogs; | ||
|
|
||
| public partial class TextVisualizerDialog : ComponentBase | ||
| { | ||
| private const string XmlFormat = "xml"; | ||
| private const string JsonFormat = "json"; | ||
| private const string PlaintextFormat = "text"; | ||
|
|
||
| private List<SelectViewModel<string>> _options = null!; | ||
| private string _selectedOption = null!; | ||
|
|
||
| private string _formattedText = string.Empty; | ||
|
|
||
| private readonly string _openSelectFormatButtonId = $"select-format-{Guid.NewGuid():N}"; | ||
| private bool _isSelectFormatPopupOpen; | ||
|
|
||
| protected override void OnInitialized() | ||
| { | ||
| _options = | ||
| [ | ||
| new SelectViewModel<string> { Id = PlaintextFormat, Name = Loc[nameof(Resources.Dialogs.TextVisualizerDialogPlaintextFormat)] }, | ||
adamint marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| new SelectViewModel<string> { Id = JsonFormat, Name = Loc[nameof(Resources.Dialogs.TextVisualizerDialogJsonFormat)] }, | ||
| new SelectViewModel<string> { Id = XmlFormat, Name = Loc[nameof(Resources.Dialogs.TextVisualizerDialogXmlFormat)] }, | ||
| ]; | ||
| } | ||
|
|
||
| protected override void OnParametersSet() | ||
| { | ||
| // We don't know what format the string is in, but we can guess | ||
| if (TryFormatXml()) | ||
| { | ||
| _selectedOption = XmlFormat; | ||
| return; | ||
| } | ||
|
|
||
| if (TryFormatJson()) | ||
| { | ||
| _selectedOption = JsonFormat; | ||
| return; | ||
| } | ||
|
|
||
| _selectedOption = PlaintextFormat; | ||
| _formattedText = Content.Text; | ||
| } | ||
|
|
||
| private bool TryFormatXml() | ||
| { | ||
| try | ||
| { | ||
| _formattedText = XElement.Parse(Content.Text).ToString(); | ||
adamint marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return true; | ||
| } | ||
| catch (XmlException) | ||
| { | ||
| // If the XML is invalid, just show the original text | ||
| _formattedText = Content.Text; | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| private bool TryFormatJson() | ||
| { | ||
| try | ||
| { | ||
| using var doc = JsonDocument.Parse( | ||
| Content.Text, | ||
| new JsonDocumentOptions | ||
| { | ||
| AllowTrailingCommas = true, | ||
| CommentHandling = JsonCommentHandling.Skip | ||
adamint marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
| ); | ||
|
|
||
| var memoryStream = new MemoryStream(); | ||
| using var utf8JsonWriter = new Utf8JsonWriter(memoryStream, new JsonWriterOptions { Indented = true }); | ||
| doc.WriteTo(utf8JsonWriter); | ||
| utf8JsonWriter.Flush(); | ||
|
|
||
| _formattedText = Encoding.Default.GetString(memoryStream.ToArray()); | ||
|
||
| return true; | ||
| } | ||
| catch (JsonException) | ||
| { | ||
| // If the JSON is invalid, just show the original text | ||
| _formattedText = Content.Text; | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| private void OnFormatOptionChanged() | ||
| { | ||
| if (_selectedOption == XmlFormat) | ||
| { | ||
| TryFormatXml(); | ||
| } | ||
| else if (_selectedOption == JsonFormat) | ||
| { | ||
| TryFormatJson(); | ||
|
Member
There was a problem hiding this comment. If these "try" operations fail, should we set
Member
Author
There was a problem hiding this comment. I don't think so. The 'JSON' view for a non-JSON string is just the same as the unformatted view.
Contributor
There was a problem hiding this comment. What happens if you have invalid JSON or xml? Is it only going to format if its valid? I almost want the errors if the user explicitly selects json, but it's not valid json. |
||
| } | ||
| else | ||
| { | ||
| _formattedText = Content.Text; | ||
| } | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.