Skip to content

Commit 2cf951a

Browse files
vnbaaijeerhardtJamesNK
authored
Update Fluent UI Blazor to v4.11.3 (#6840)
Co-authored-by: Eric Erhardt <[email protected]> Co-authored-by: James Newton-King <[email protected]>
1 parent c0f59f4 commit 2cf951a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+225
-257
lines changed

Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
<PackageVersion Include="KubernetesClient" Version="15.0.1" />
8989
<PackageVersion Include="JsonPatch.Net" Version="3.2.3" />
9090
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
91-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.10.3" />
92-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.10.3" />
91+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.3" />
92+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.11.3" />
9393
<PackageVersion Include="Milvus.Client" Version="2.3.0-preview.1" />
9494
<PackageVersion Include="MongoDB.Driver" Version="[2.30.0,3.0.0)" />
9595
<PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.5.0" />

NuGet.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
</packageSource>
2525
<packageSource key="dotnet-public">
2626
<package pattern="*" />
27+
<!-- FluentUI is present on both public an internal dotnet feeds. Prefer public feed -->
28+
<package pattern="Microsoft.FluentUI.AspNetCore.Components" />
29+
<package pattern="Microsoft.FluentUI.AspNetCore.Components.Icons" />
2730
</packageSource>
2831
<packageSource key="dotnet9">
2932
<package pattern="*" />

src/Aspire.Dashboard/Aspire.Dashboard.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<!-- This list of runtimes needs to match the set of runtimes specified in eng/workloads/workloads.csproj -->

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Microsoft.AspNetCore.Components;
66
using Microsoft.AspNetCore.Components.Web;
77
using Microsoft.FluentUI.AspNetCore.Components;
8+
using Icons = Microsoft.FluentUI.AspNetCore.Components.Icons;
89

910
namespace Aspire.Dashboard.Components;
1011

src/Aspire.Dashboard/Components/Controls/Chart/ChartFilters.razor

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@
1111
{
1212
<div class="metrics-filters-section">
1313
<h5>@Loc[nameof(ControlsStrings.ChartContainerFiltersHeader)]</h5>
14-
<FluentDataGrid ResizeLabel="@AspireFluentDataGridHeaderCell.GetResizeLabel(Loc)"
15-
ResizeType="DataGridResizeType.Discrete"
16-
Items="@Queryable.AsQueryable(DimensionFilters)"
14+
<FluentDataGrid Items="@Queryable.AsQueryable(DimensionFilters)"
1715
GridTemplateColumns="200px 1fr auto"
18-
GenerateHeader="GenerateHeaderOption.None">
16+
GenerateHeader="GenerateHeaderOption.None"
17+
RowSize="DataGridRowSize.Medium">
1918
<ChildContent>
2019
<AspirePropertyColumn Tooltip="true" TooltipText="@(c => c.Name)" Property="@(c => c.Name)"/>
2120
<AspireTemplateColumn Tooltip="true" TooltipText="@(c => c.SelectedValues.Count == 0 ? Loc[nameof(ControlsStrings.LabelNone)] : string.Join(", ", c.SelectedValues.OrderBy(v => v.Text).Select(v => v.Text)))">

src/Aspire.Dashboard/Components/Controls/Chart/MetricTable.razor.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using Aspire.Dashboard.Utils;
1212
using Microsoft.AspNetCore.Components;
1313
using Microsoft.FluentUI.AspNetCore.Components;
14+
using Icons = Microsoft.FluentUI.AspNetCore.Components.Icons;
1415
using Microsoft.JSInterop;
1516

1617
namespace Aspire.Dashboard.Components.Controls;

src/Aspire.Dashboard/Components/Controls/Chart/MetricTable.razor.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ function getRowText(dataGridContainerId, index) {
3434
return null;
3535
}
3636
const dataGrid = container.children[0];
37-
const row = dataGrid.getElementsByTagName("fluent-data-grid-row")[index + 1];
37+
const row = dataGrid.getElementsByClassName("fluent-data-grid-row")[index + 1];
3838

3939
if (!row) {
4040
return null;
4141
}
4242

43-
const cells = row.getElementsByTagName("fluent-data-grid-cell");
43+
const cells = row.getElementsByTagName("td");
4444
let texts = [];
4545
for (let i = 0; i < cells.length; i++) {
4646
texts.push(cells[i].textContent);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Microsoft.AspNetCore.Components;
1010
using Microsoft.Extensions.Localization;
1111
using Microsoft.FluentUI.AspNetCore.Components;
12+
using Icons = Microsoft.FluentUI.AspNetCore.Components.Icons;
1213

1314
namespace Aspire.Dashboard.Components.Controls;
1415

src/Aspire.Dashboard/Components/Controls/Grid/AspireFluentDataGridHeaderCell.razor

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/Aspire.Dashboard/Components/Controls/Grid/AspireFluentDataGridHeaderCell.razor.cs

Lines changed: 0 additions & 92 deletions
This file was deleted.

0 commit comments

Comments
 (0)