Replace Radzen with MudBlazor (#51)

* DO PACKAGE UPGRADE * migrate person view to MudBlazor * migrate edit and listing person * fix residence selector * migrate person listing * add contract page * show tax calculation results * remove Radzen completely --------- Co-authored-by: Dieter Niggeler <dieter.niggeler@swisslife.ch>
dniggeler · Jul 2, 2023 · 35493e2 · 35493e2
1 parent b04b54a
commit 35493e2
Show file tree

Hide file tree

Showing 131 changed files with 4,253 additions and 23,230 deletions.
diff --git a/src/BlazorApp.Components.Tests/BlazorApp.Components.Tests.csproj b/src/BlazorApp.Components.Tests/BlazorApp.Components.Tests.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Blazored.LocalStorage.TestExtensions" Version="4.3.0" />
+        <PackageReference Include="bunit" Version="1.20.8" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+        <PackageReference Include="xunit" Version="2.4.2" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="3.2.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\BlazorApp\BlazorApp.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/BlazorApp.Components.Tests/BrowserStorageTests.cs b/src/BlazorApp.Components.Tests/BrowserStorageTests.cs
@@ -0,0 +1,31 @@
+using Blazored.LocalStorage;
+using Bunit;
+
+namespace BlazorApp.Components.Tests
+{
+    public class BrowserStorageTests : TestContext
+    {
+        private readonly ILocalStorageService localStorageService;
+
+        public BrowserStorageTests()
+        {
+            localStorageService = this.AddBlazoredLocalStorage();
+        }
+
+        [Fact]
+        public async Task Successfully_Use_LocalStorage()
+        {
+            // given
+            string key = "name";
+            Guid expectedValue = Guid.NewGuid();
+
+            // when
+            await localStorageService.ClearAsync();
+            await localStorageService.SetItemAsync(key, expectedValue);
+            Guid result = await localStorageService.GetItemAsync<Guid>(key);
+
+            // then
+            Assert.True(result == expectedValue);
+        }
+    }
+}
diff --git a/src/BlazorApp.Components.Tests/PersonServiceMockTests.cs b/src/BlazorApp.Components.Tests/PersonServiceMockTests.cs
@@ -0,0 +1,98 @@
+using BlazorApp.Services;
+using BlazorApp.ViewModels;
+using Bunit;
+using PensionCoach.Tools.CommonTypes;
+
+namespace BlazorApp.Components.Tests;
+
+public class PersonServiceMockTests : TestContext
+{
+    public PersonServiceMockTests()
+    {
+        this.AddBlazoredLocalStorage();
+        Services.AddMockServices();
+    }
+
+    [Fact(DisplayName = "Add New Person")]
+    public async Task Add_New_Person()
+    {
+        // given
+        Guid newId = Guid.NewGuid();
+
+        // when
+        IPersonService personService = Services.GetService<IPersonService>();
+
+        PersonViewModel result = await AddNewPersonAsync(personService, newId);
+
+        // then
+        Assert.True(result is not null);
+    }
+
+    [Fact(DisplayName = "Delete Person")]
+    public async Task Delete_Person()
+    {
+        // given
+        Guid newId = Guid.NewGuid();
+
+        // when
+        IPersonService personService = Services.GetService<IPersonService>();
+
+        await AddNewPersonAsync(personService, newId);
+
+        await personService.DeletePersonAsync(newId);
+
+        var result = await personService.GetAsync(newId);
+
+        // then
+        Assert.True(result is null);
+    }
+
+    [Fact(DisplayName = "Edit and Save Person")]
+    public async Task Edit_And_Save_Person()
+    {
+        // given
+        Guid newId = Guid.NewGuid();
+        DateTime birthday = new DateTime(1966, 2, 10);
+
+        // when
+        IPersonService personService = Services.GetService<IPersonService>();
+
+        PersonViewModel newPerson = await AddNewPersonAsync(personService, newId);
+        newPerson.DateOfBirth = birthday;
+        await personService.UpdateAsync(newPerson);
+
+        PersonViewModel result = await personService.GetAsync(newId);
+
+        // then
+        Assert.True(result.DateOfBirth == birthday);
+    }
+
+    private async Task<PersonViewModel> AddNewPersonAsync(IPersonService personService, Guid id)
+    {
+        PersonViewModel newPerson = CreatePerson(id);
+        await personService.AddAsync(newPerson);
+
+        return await personService.GetAsync(id);
+    }
+
+    private PersonViewModel CreatePerson(Guid id)
+    {
+        return new PersonViewModel
+        {
+            Id = id,
+            Name = "Tester 1",
+            DateOfBirth = new DateTime(1990, 11, 11),
+            Gender = Gender.Male,
+            CivilStatus = CivilStatus.Single,
+            BfsMunicipalityId = 136,
+            Canton = Canton.ZH,
+            MunicipalityName = "Langnau aA",
+            NumberOfChildren = 0,
+            ReligiousGroupType = ReligiousGroupType.Protestant,
+            TaxableIncome = 100_000,
+            TaxableWealth = 500_000,
+            FinalCapital3a = 150_000,
+            FinalRetirementCapital = 500_000
+        };
+    }
+}
diff --git a/src/BlazorApp.Components.Tests/PersonServiceWithBrowserStorageTests.cs b/src/BlazorApp.Components.Tests/PersonServiceWithBrowserStorageTests.cs
@@ -0,0 +1,98 @@
+using BlazorApp.Services;
+using BlazorApp.ViewModels;
+using Bunit;
+using PensionCoach.Tools.CommonTypes;
+
+namespace BlazorApp.Components.Tests;
+
+public class PersonServiceWithBrowserStorageTests : TestContext
+{
+    public PersonServiceWithBrowserStorageTests()
+    {
+        this.AddBlazoredLocalStorage(null);
+        Services.AddServices();
+    }
+
+    [Fact(DisplayName = "Add New Person")]
+    public async Task Add_New_Person()
+    {
+        // given
+        Guid newId = Guid.NewGuid();
+
+        // when
+        IPersonService personService = Services.GetService<IPersonService>();
+
+        PersonViewModel result = await AddNewPersonAsync(personService, newId);
+
+        // then
+        Assert.True(result is not null);
+    }
+
+    [Fact(DisplayName = "Delete Person")]
+    public async Task Delete_Person()
+    {
+        // given
+        Guid newId = Guid.NewGuid();
+
+        // when
+        IPersonService personService = Services.GetService<IPersonService>();
+
+        await AddNewPersonAsync(personService, newId);
+
+        await personService.DeletePersonAsync(newId);
+
+        var result = await personService.GetAsync(newId);
+
+        // then
+        Assert.True(result is null);
+    }
+
+    [Fact(DisplayName = "Edit and Save Person")]
+    public async Task Edit_And_Save_Person()
+    {
+        // given
+        Guid newId = Guid.NewGuid();
+        DateTime birthday = new DateTime(1966, 2, 10);
+
+        // when
+        IPersonService personService = Services.GetService<IPersonService>();
+
+        PersonViewModel newPerson = await AddNewPersonAsync(personService, newId);
+        newPerson.DateOfBirth = birthday;
+        await personService.UpdateAsync(newPerson);
+
+        PersonViewModel result = await personService.GetAsync(newId);
+
+        // then
+        Assert.True(result.DateOfBirth == birthday);
+    }
+
+    private async Task<PersonViewModel> AddNewPersonAsync(IPersonService personService, Guid id)
+    {
+        PersonViewModel newPerson = CreatePerson(id);
+        await personService.AddAsync(newPerson);
+
+        return await personService.GetAsync(id);
+    }
+
+    private PersonViewModel CreatePerson(Guid id)
+    {
+        return new PersonViewModel
+        {
+            Id = id,
+            Name = "Tester 1",
+            DateOfBirth = new DateTime(1990, 11, 11),
+            Gender = Gender.Male,
+            CivilStatus = CivilStatus.Single,
+            BfsMunicipalityId = 136,
+            Canton = Canton.ZH,
+            MunicipalityName = "Langnau aA",
+            NumberOfChildren = 0,
+            ReligiousGroupType = ReligiousGroupType.Protestant,
+            TaxableIncome = 100_000,
+            TaxableWealth = 500_000,
+            FinalCapital3a = 150_000,
+            FinalRetirementCapital = 500_000
+        };
+    }
+}
diff --git a/src/BlazorApp.Components.Tests/Usings.cs b/src/BlazorApp.Components.Tests/Usings.cs
@@ -0,0 +1 @@
+global using Xunit;
diff --git a/src/BlazorApp.Services.Tests/BlazorApp.Services.Tests.csproj b/src/BlazorApp.Services.Tests/BlazorApp.Services.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
@@ -8,14 +8,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="Snapshooter.Xunit" Version="0.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Snapshooter.Xunit" Version="0.13.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/BlazorApp/App.razor b/src/BlazorApp/App.razor
@@ -1,9 +1,9 @@
 <Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
     <Found Context="routeData">
-        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayoutRadzen)" />
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainPensionToolsLayout)" />
     </Found>
     <NotFound>
-        <LayoutView Layout="@typeof(MainLayoutRadzen)">
+        <LayoutView Layout="@typeof(MainPensionToolsLayout)">
             <p>Sorry, there's nothing at this address.</p>
         </LayoutView>
     </NotFound>

diff --git a/src/BlazorApp/BlazorApp.csproj b/src/BlazorApp/BlazorApp.csproj
@@ -10,14 +10,15 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Blazor-ApexCharts" Version="0.9.21-beta" />
     <PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.8" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.8" />
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0" />
-    <PackageReference Include="Radzen.Blazor" Version="4.3.6" />
-    <PackageReference Include="System.Net.Http.Json" Version="7.0.0" />
+    <PackageReference Include="MudBlazor" Version="6.6.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -59,4 +60,12 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <UpToDateCheckInput Remove="MyComponents\JsonPrettyFormat.razor" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <_ContentIncludedByDefault Remove="MyComponents\JsonPrettyFormat.razor" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/BlazorApp/MyComponents/CantonSelector.razor b/src/BlazorApp/MyComponents/CantonSelector.razor
@@ -0,0 +1,48 @@
+@using PensionCoach.Tools.CommonTypes
+@using PensionCoach.Tools.CommonTypes.Tax
+
+<MudSelect T="Canton" Label="@Label" ReadOnly="@IsReadOnly" Value="@CantonCode" ValueChanged="HandleCantonChange">
+    @foreach (var m in cantons)
+    {
+        <MudSelectItem Value="m.Canton">@m.Name</MudSelectItem>
+    }
+</MudSelect>
+
+
+@code {
+
+    internal record CantonHolder
+    {
+        public Canton Canton { get; init; }
+        public string Name { get; init; }
+    }
+
+    [Parameter]
+    public bool IsReadOnly { get; set; }
+
+    [Parameter]
+    public string Label { get; set; }
+
+    [Parameter]
+    public Canton CantonCode { get; set; }
+
+    [Parameter]
+    public EventCallback<Canton> OnSelected { get; set; }
+
+    private List<CantonHolder> cantons = new();
+
+    protected override void OnInitialized()
+    {
+        cantons = Enum.GetValues(typeof(Canton))
+            .Cast<Canton>()
+            .Select(c => new CantonHolder { Canton = c, Name = c.ToString() })
+            .ToList();
+            }
+
+    private async Task HandleCantonChange(Canton value)
+    {
+        CantonCode = value;
+
+        await OnSelected.InvokeAsync(CantonCode);
+    }
+}