Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
<!-- This repo version -->
<MajorVersion>9</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<PatchVersion>1</PatchVersion>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<PreReleaseVersionLabel>preview.5</PreReleaseVersionLabel>
<!-- Aspire.Npgsql.EntityFrameworkCore.PostgreSQL will ship right after our November release, but it has already shipped as rc.1 so
we can't 'downgrade' it to preview.5. We will ship it as rc.2 in November and will mark it stable once EF Npgsql dependency ships stable. -->
<PrereleaseVersionLabel Condition="'$(MSBuildProjectName)' == 'Aspire.Npgsql.EntityFrameworkCore.PostgreSQL'">rc.2</PrereleaseVersionLabel>
<PreReleaseVersionLabel>preview.1</PreReleaseVersionLabel>
<!--
When running package validation as part of the build, we want to ensure we didn't break the API against the previous
version of each package. The following property points to the package version that should be used as baseline.
Expand Down
68 changes: 34 additions & 34 deletions src/Aspire.Dashboard/Components/Controls/ResourceActions.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,44 +81,44 @@ protected override void OnParametersSet()

// Show telemetry menu items if there is telemetry for the resource.
var hasTelemetryApplication = TelemetryRepository.GetApplicationByCompositeName(Resource.Name) != null;
var telemetryTooltip = !hasTelemetryApplication ? Loc[nameof(Resources.Resources.ResourceActionTelemetryTooltip)] : string.Empty;
_menuItems.Add(new MenuButtonItem { IsDivider = true });
_menuItems.Add(new MenuButtonItem
if (hasTelemetryApplication)
{
Text = Loc[nameof(Resources.Resources.ResourceActionStructuredLogsText)],
Icon = s_structuredLogsIcon,
OnClick = () =>
var telemetryTooltip = !hasTelemetryApplication ? Loc[nameof(Resources.Resources.ResourceActionTelemetryTooltip)] : string.Empty;
_menuItems.Add(new MenuButtonItem { IsDivider = true });
_menuItems.Add(new MenuButtonItem
{
NavigationManager.NavigateTo(DashboardUrls.StructuredLogsUrl(resource: GetResourceName(Resource)));
return Task.CompletedTask;
},
Tooltip = telemetryTooltip,
IsDisabled = !hasTelemetryApplication
});
_menuItems.Add(new MenuButtonItem
{
Text = Loc[nameof(Resources.Resources.ResourceActionTracesText)],
Icon = s_tracesIcon,
OnClick = () =>
Text = Loc[nameof(Resources.Resources.ResourceActionStructuredLogsText)],
Icon = s_structuredLogsIcon,
OnClick = () =>
{
NavigationManager.NavigateTo(DashboardUrls.StructuredLogsUrl(resource: GetResourceName(Resource)));
return Task.CompletedTask;
},
Tooltip = telemetryTooltip
});
_menuItems.Add(new MenuButtonItem
{
NavigationManager.NavigateTo(DashboardUrls.TracesUrl(resource: GetResourceName(Resource)));
return Task.CompletedTask;
},
Tooltip = telemetryTooltip,
IsDisabled = !hasTelemetryApplication
});
_menuItems.Add(new MenuButtonItem
{
Text = Loc[nameof(Resources.Resources.ResourceActionMetricsText)],
Icon = s_metricsIcon,
OnClick = () =>
Text = Loc[nameof(Resources.Resources.ResourceActionTracesText)],
Icon = s_tracesIcon,
OnClick = () =>
{
NavigationManager.NavigateTo(DashboardUrls.TracesUrl(resource: GetResourceName(Resource)));
return Task.CompletedTask;
},
Tooltip = telemetryTooltip
});
_menuItems.Add(new MenuButtonItem
{
NavigationManager.NavigateTo(DashboardUrls.MetricsUrl(resource: GetResourceName(Resource)));
return Task.CompletedTask;
},
Tooltip = telemetryTooltip,
IsDisabled = !hasTelemetryApplication
});
Text = Loc[nameof(Resources.Resources.ResourceActionMetricsText)],
Icon = s_metricsIcon,
OnClick = () =>
{
NavigationManager.NavigateTo(DashboardUrls.MetricsUrl(resource: GetResourceName(Resource)));
return Task.CompletedTask;
},
Tooltip = telemetryTooltip
});
}

// If display is desktop then we display highlighted commands next to the ... button.
if (ViewportInformation.IsDesktop)
Expand Down
Loading