Skip to content

Commit e71f3a4

Browse files
mckaragozmckaragoz
authored
Update Dependent Components v 9.0.0-preview.1 (#581)
* Update Dependent Components v 9.0.0-preview.1 * Add Csv Helper Test * Add More Tests
1 parent d29b204 commit e71f3a4

File tree

8 files changed

+432
-69
lines changed

8 files changed

+432
-69
lines changed

‎docs/CodeBeam.MudBlazor.Extensions.Docs.Wasm/App.razor‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,17 @@
2424
{
2525
try
2626
{
27-
//Route to the component that contains the QR
28-
if (args.Path == "mudbarcode" || args.Path == "api")
29-
{
30-
var assemblies = await AssemblyLoader
31-
.LoadAssembliesAsync(new[]
32-
{
33-
"zxing.dll",
34-
});
35-
_lazyLoadedAssemblies.AddRange(assemblies);
36-
}
27+
//Route to the component that contains the lazy load components
28+
// if (args.Path == "mudbarcode" || args.Path == "api")
29+
// {
30+
// var assemblies = await AssemblyLoader
31+
// .LoadAssembliesAsync(new[]
32+
// {
33+
// "CodeBeam.MudBlazor.Extensions.Qr.dll",
34+
// "CodeBeam.MudBlazor.Extensions.CsvMapper.dll"
35+
// });
36+
// _lazyLoadedAssemblies.AddRange(assemblies);
37+
// }
3738
}
3839
catch (Exception ex)
3940
{

‎docs/CodeBeam.MudBlazor.Extensions.Docs.Wasm/CodeBeam.MudBlazor.Extensions.Docs.Wasm.csproj‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

3-
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<RootNamespace>MudExtensions.Docs.Wasm</RootNamespace>
8-
</PropertyGroup>
9-
10-
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.*" />
12-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.*" PrivateAssets="all" />
13-
</ItemGroup>
14-
15-
<!--<ItemGroup>
16-
<BlazorWebAssemblyLazyLoad Include="zxing.dll" />
17-
</ItemGroup>-->
18-
19-
<ItemGroup>
20-
<ProjectReference Include="..\..\src\CodeBeam.MudBlazor.Extensions\CodeBeam.MudBlazor.Extensions.csproj" />
21-
<ProjectReference Include="..\..\docs\CodeBeam.MudBlazor.Extensions.Docs\CodeBeam.MudBlazor.Extensions.Docs.csproj" />
22-
</ItemGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net10.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<RootNamespace>MudExtensions.Docs.Wasm</RootNamespace>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.*" />
12+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.*" PrivateAssets="all" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<ProjectReference Include="..\..\src\CodeBeam.MudBlazor.Extensions\CodeBeam.MudBlazor.Extensions.csproj" />
17+
<ProjectReference Include="..\..\docs\CodeBeam.MudBlazor.Extensions.Docs\CodeBeam.MudBlazor.Extensions.Docs.csproj" />
18+
</ItemGroup>
2319

2420
<Target Name="CopyXmlDocToWwwRoot" AfterTargets="Build">
2521
<ItemGroup>
@@ -35,10 +31,10 @@
3531

3632

3733
<ItemGroup>
38-
<Content Update="wwwroot\favicon.ico">
39-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
40-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
41-
</Content>
42-
</ItemGroup>
34+
<Content Update="wwwroot\favicon.ico">
35+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
36+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
37+
</Content>
38+
</ItemGroup>
4339

4440
</Project>

‎docs/CodeBeam.MudBlazor.Extensions.Docs.Wasm/wwwroot/CodeBeam.MudBlazor.Extensions.Qr.xml‎

Lines changed: 146 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/CodeBeam.MudBlazor.Extensions.Docs/Components/DocsApiTable.razor‎

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<MudText Typo="Typo.body2">@value</MudText>
2323
</MudTd>
2424
<MudTd DataLabel="Description">
25-
@(_docReader?.GetSummary(context) ?? "—")
25+
@(GetDocReaderFor(context.DeclaringType!)?.GetSummary(context) ?? "—")
2626
</MudTd>
2727
</RowTemplate>
2828
<NoRecordsContent>
@@ -40,7 +40,7 @@
4040
<RowTemplate>
4141
<MudTd DataLabel="Name">@context.Name</MudTd>
4242
<MudTd DataLabel="Type">@DocUtilities.GetFriendlyTypeName(context.PropertyType)</MudTd>
43-
<MudTd DataLabel="Description">@(_docReader?.GetSummary(context) ?? "—")</MudTd>
43+
<MudTd DataLabel="Description">@(GetDocReaderFor(context.DeclaringType!)?.GetSummary(context) ?? "—")</MudTd>
4444
</RowTemplate>
4545
<NoRecordsContent>
4646
No specific items.
@@ -57,7 +57,7 @@
5757
<RowTemplate>
5858
<MudTd DataLabel="Name">@context.Name</MudTd>
5959
<MudTd DataLabel="Return Type">@DocUtilities.GetFriendlyTypeName(context.ReturnType)</MudTd>
60-
<MudTd DataLabel="Description">@(_docReader?.GetSummary(context) ?? "—")</MudTd>
60+
<MudTd DataLabel="Description">@(GetDocReaderFor(context.DeclaringType!)?.GetSummary(context) ?? "—")</MudTd>
6161
</RowTemplate>
6262
<NoRecordsContent>
6363
No specific items.
@@ -79,7 +79,8 @@
7979
[Parameter] public Type? Type { get; set; }
8080
[Parameter] public MudExtensionComponentInfo? Component { get; set; }
8181

82-
private SimpleXmlDocReader? _docReader;
82+
// private SimpleXmlDocReader? _docReader;
83+
private readonly Dictionary<string, SimpleXmlDocReader> _docReaders = new();
8384

8485
private List<string> _excludedMethods = new()
8586
{
@@ -122,24 +123,55 @@
122123
}
123124
}
124125

125-
protected override async Task OnInitializedAsync()
126+
private SimpleXmlDocReader? GetDocReaderFor(Type memberType)
126127
{
127-
string? xmlContent = null;
128+
var asmName = memberType.Assembly.GetName().Name;
128129

129-
if (OperatingSystem.IsBrowser())
130+
return asmName switch
130131
{
131-
xmlContent = await Http.GetStringAsync("CodeBeam.MudBlazor.Extensions.xml");
132-
}
133-
else
132+
"CodeBeam.MudBlazor.Extensions" => _docReaders.GetValueOrDefault("CodeBeam.MudBlazor.Extensions.xml"),
133+
"CodeBeam.MudBlazor.Extensions.Qr" => _docReaders.GetValueOrDefault("CodeBeam.MudBlazor.Extensions.Qr.xml"),
134+
"CodeBeam.MudBlazor.Extensions.CsvMapper" => _docReaders.GetValueOrDefault("CodeBeam.MudBlazor.Extensions.CsvMapper.xml"),
135+
_ => null
136+
};
137+
}
138+
139+
protected override async Task OnInitializedAsync()
140+
{
141+
var xmlFiles = new[]
134142
{
135-
var xmlPath = Path.Combine(AppContext.BaseDirectory, "CodeBeam.MudBlazor.Extensions.xml");
136-
if (File.Exists(xmlPath))
137-
xmlContent = await File.ReadAllTextAsync(xmlPath);
138-
}
143+
"CodeBeam.MudBlazor.Extensions.xml",
144+
"CodeBeam.MudBlazor.Extensions.Qr.xml",
145+
"CodeBeam.MudBlazor.Extensions.CsvMapper.xml"
146+
};
139147

140-
if (!string.IsNullOrEmpty(xmlContent))
148+
foreach (var file in xmlFiles)
141149
{
142-
_docReader = new SimpleXmlDocReader(xmlContent);
150+
string? xmlContent = null;
151+
152+
try
153+
{
154+
if (OperatingSystem.IsBrowser())
155+
{
156+
xmlContent = await Http.GetStringAsync(file);
157+
}
158+
else
159+
{
160+
var xmlPath = Path.Combine(AppContext.BaseDirectory, file);
161+
if (File.Exists(xmlPath))
162+
xmlContent = await File.ReadAllTextAsync(xmlPath);
163+
}
164+
165+
if (!string.IsNullOrWhiteSpace(xmlContent))
166+
{
167+
_docReaders[file] = new SimpleXmlDocReader(xmlContent);
168+
}
169+
}
170+
catch
171+
{
172+
173+
}
143174
}
144175
}
176+
145177
}

‎src/CodeBeam.MudBlazor.Extensions.CsvMapper/CodeBeam.MudBlazor.Extensions.CsvMapper.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<PackageLicenseExpression>MIT</PackageLicenseExpression>
8-
<Version>1.0.0</Version>
8+
<Version>9.0.0-preview.1</Version>
99
<Title>CodeBeam.MudBlazor.Extensions.Csv</Title>
1010
<Authors>CodeBeam</Authors>
1111
<Company>CodeBeam</Company>
@@ -20,10 +20,11 @@
2020
<RepositoryUrl>https://github.com/CodeBeamOrg/CodeBeam.MudBlazor.Extensions</RepositoryUrl>
2121
<PackageTags>Blazor; MudBlazor; Component; Extension; Csv; Mapper;</PackageTags>
2222
<RootNamespace>MudExtensions</RootNamespace>
23+
<GenerateDocumentationFile>True</GenerateDocumentationFile>
2324
</PropertyGroup>
2425

2526
<ItemGroup>
26-
<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="8.3.0" />
27+
<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="9.0.0-preview.1" />
2728
<PackageReference Include="CsvHelper" Version="33.1.0" />
2829
</ItemGroup>
2930

‎src/CodeBeam.MudBlazor.Extensions.CsvMapper/Components/CsvMapper/MudCsvMapper.razor.cs‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System.ComponentModel;
2-
using CsvHelper;
1+
using CsvHelper;
32
using Microsoft.AspNetCore.Components;
43
using Microsoft.AspNetCore.Components.Forms;
54
using MudBlazor;
@@ -11,9 +10,19 @@
1110

1211
namespace MudExtensions
1312
{
14-
internal class ConfirmedDefaultValue
13+
/// <summary>
14+
///
15+
/// </summary>
16+
public class ConfirmedDefaultValue
1517
{
18+
/// <summary>
19+
///
20+
/// </summary>
1621
public string? DefaultValue { get; set; }
22+
23+
/// <summary>
24+
///
25+
/// </summary>
1726
public bool Confirmed { get; set; }
1827
}
1928

@@ -315,7 +324,7 @@ private async Task OnImport()
315324
await using (var csv = new CsvWriter(writer, config))
316325
{
317326
var dynamicContent = CsvContent?.Cast<dynamic>();
318-
await csv.WriteRecordsAsync(dynamicContent);
327+
await csv.WriteRecordsAsync(dynamicContent ?? Enumerable.Empty<dynamic>());
319328

320329
var str = writer.ToString();
321330
FileContentByte = Encoding.UTF8.GetBytes(str);

0 commit comments

Comments
 (0)