From 0f1d0d09b6892529c961d109b8bdce3524779706 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Thu, 9 Oct 2025 15:31:29 +0800 Subject: [PATCH] Move SelectViewModel out of Otlp namespace --- .../Components/Controls/ClearSignalsButton.razor.cs | 1 - .../Components/Controls/LogLevelSelect.razor.cs | 4 ++-- .../Components/Controls/ResourceSelect.razor.cs | 1 - .../Components/Controls/SignalsActionsDisplay.razor.cs | 1 - .../Components/Controls/SpanTypeSelect.razor.cs | 1 - .../Components/Dialogs/InteractionsInputDialog.razor.cs | 2 +- .../Components/Dialogs/TextVisualizerDialog.razor.cs | 1 - src/Aspire.Dashboard/Model/Interaction/InputViewModel.cs | 1 - src/Aspire.Dashboard/Model/{Otlp => }/SelectViewModel.cs | 2 +- .../ConsoleLogsTests/CreateResourceSelectModelsTests.cs | 1 - 10 files changed, 4 insertions(+), 11 deletions(-) rename src/Aspire.Dashboard/Model/{Otlp => }/SelectViewModel.cs (97%) diff --git a/src/Aspire.Dashboard/Components/Controls/ClearSignalsButton.razor.cs b/src/Aspire.Dashboard/Components/Controls/ClearSignalsButton.razor.cs index 043c7d01379..b9c10c7530a 100644 --- a/src/Aspire.Dashboard/Components/Controls/ClearSignalsButton.razor.cs +++ b/src/Aspire.Dashboard/Components/Controls/ClearSignalsButton.razor.cs @@ -3,7 +3,6 @@ using System.Globalization; using Aspire.Dashboard.Model; -using Aspire.Dashboard.Model.Otlp; using Aspire.Dashboard.Otlp.Storage; using Aspire.Dashboard.Resources; using Microsoft.AspNetCore.Components; diff --git a/src/Aspire.Dashboard/Components/Controls/LogLevelSelect.razor.cs b/src/Aspire.Dashboard/Components/Controls/LogLevelSelect.razor.cs index 965a4fad063..57964691d9d 100644 --- a/src/Aspire.Dashboard/Components/Controls/LogLevelSelect.razor.cs +++ b/src/Aspire.Dashboard/Components/Controls/LogLevelSelect.razor.cs @@ -1,7 +1,7 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Aspire.Dashboard.Model.Otlp; +using Aspire.Dashboard.Model; using Microsoft.AspNetCore.Components; namespace Aspire.Dashboard.Components.Controls; diff --git a/src/Aspire.Dashboard/Components/Controls/ResourceSelect.razor.cs b/src/Aspire.Dashboard/Components/Controls/ResourceSelect.razor.cs index be8c5160c99..95557b08484 100644 --- a/src/Aspire.Dashboard/Components/Controls/ResourceSelect.razor.cs +++ b/src/Aspire.Dashboard/Components/Controls/ResourceSelect.razor.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Aspire.Dashboard.Model; -using Aspire.Dashboard.Model.Otlp; using Aspire.Dashboard.Resources; using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Localization; diff --git a/src/Aspire.Dashboard/Components/Controls/SignalsActionsDisplay.razor.cs b/src/Aspire.Dashboard/Components/Controls/SignalsActionsDisplay.razor.cs index 45a41a2fd78..85066133574 100644 --- a/src/Aspire.Dashboard/Components/Controls/SignalsActionsDisplay.razor.cs +++ b/src/Aspire.Dashboard/Components/Controls/SignalsActionsDisplay.razor.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Aspire.Dashboard.Model; -using Aspire.Dashboard.Model.Otlp; using Aspire.Dashboard.Otlp.Storage; using Microsoft.AspNetCore.Components; diff --git a/src/Aspire.Dashboard/Components/Controls/SpanTypeSelect.razor.cs b/src/Aspire.Dashboard/Components/Controls/SpanTypeSelect.razor.cs index b718f06e9d7..cd2b91e31b7 100644 --- a/src/Aspire.Dashboard/Components/Controls/SpanTypeSelect.razor.cs +++ b/src/Aspire.Dashboard/Components/Controls/SpanTypeSelect.razor.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Aspire.Dashboard.Model; -using Aspire.Dashboard.Model.Otlp; using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Localization; diff --git a/src/Aspire.Dashboard/Components/Dialogs/InteractionsInputDialog.razor.cs b/src/Aspire.Dashboard/Components/Dialogs/InteractionsInputDialog.razor.cs index 42909b8e9a1..2e01eaa49a1 100644 --- a/src/Aspire.Dashboard/Components/Dialogs/InteractionsInputDialog.razor.cs +++ b/src/Aspire.Dashboard/Components/Dialogs/InteractionsInputDialog.razor.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Aspire.Dashboard.Model; using Aspire.Dashboard.Model.Interaction; using Aspire.Dashboard.Model.Markdown; -using Aspire.Dashboard.Model.Otlp; using Aspire.Dashboard.Resources; using Aspire.DashboardService.Proto.V1; using Microsoft.AspNetCore.Components; diff --git a/src/Aspire.Dashboard/Components/Dialogs/TextVisualizerDialog.razor.cs b/src/Aspire.Dashboard/Components/Dialogs/TextVisualizerDialog.razor.cs index 805a61735a0..e97f9993f48 100644 --- a/src/Aspire.Dashboard/Components/Dialogs/TextVisualizerDialog.razor.cs +++ b/src/Aspire.Dashboard/Components/Dialogs/TextVisualizerDialog.razor.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Aspire.Dashboard.Model; -using Aspire.Dashboard.Model.Otlp; using Aspire.Dashboard.Utils; using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Localization; diff --git a/src/Aspire.Dashboard/Model/Interaction/InputViewModel.cs b/src/Aspire.Dashboard/Model/Interaction/InputViewModel.cs index 2afc3913a2b..15106444b8c 100644 --- a/src/Aspire.Dashboard/Model/Interaction/InputViewModel.cs +++ b/src/Aspire.Dashboard/Model/Interaction/InputViewModel.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Globalization; -using Aspire.Dashboard.Model.Otlp; using Aspire.DashboardService.Proto.V1; namespace Aspire.Dashboard.Model.Interaction; diff --git a/src/Aspire.Dashboard/Model/Otlp/SelectViewModel.cs b/src/Aspire.Dashboard/Model/SelectViewModel.cs similarity index 97% rename from src/Aspire.Dashboard/Model/Otlp/SelectViewModel.cs rename to src/Aspire.Dashboard/Model/SelectViewModel.cs index c3285dc5d87..9e97cd67e3d 100644 --- a/src/Aspire.Dashboard/Model/Otlp/SelectViewModel.cs +++ b/src/Aspire.Dashboard/Model/SelectViewModel.cs @@ -3,7 +3,7 @@ using System.Diagnostics; -namespace Aspire.Dashboard.Model.Otlp; +namespace Aspire.Dashboard.Model; [DebuggerDisplay(@"Name = {Name}, Id = \{{Id}\}")] public class SelectViewModel : IEquatable> diff --git a/tests/Aspire.Dashboard.Tests/ConsoleLogsTests/CreateResourceSelectModelsTests.cs b/tests/Aspire.Dashboard.Tests/ConsoleLogsTests/CreateResourceSelectModelsTests.cs index 4760d8f759b..8501b5addcc 100644 --- a/tests/Aspire.Dashboard.Tests/ConsoleLogsTests/CreateResourceSelectModelsTests.cs +++ b/tests/Aspire.Dashboard.Tests/ConsoleLogsTests/CreateResourceSelectModelsTests.cs @@ -3,7 +3,6 @@ using System.Collections.Concurrent; using Aspire.Dashboard.Model; -using Aspire.Dashboard.Model.Otlp; using Aspire.Dashboard.Otlp.Model; using Aspire.Tests.Shared.DashboardModel; using Xunit;