From e4dbabbbd7767bb808ca6f46000264f8cb8d18ec Mon Sep 17 00:00:00 2001
From: GuillaumeM <86654731+GuillaumeM-2ISA@users.noreply.github.com>
Date: Mon, 6 Feb 2023 17:24:43 +0100
Subject: [PATCH] Feature: remove blazored modal references (#1738)

* remove blazored modal references

* Fix remove blazored modal references

* remove CascadingBlazoredModal
---
 src/AzureIoTHub.Portal.Client/App.razor       | 47 +++++++++----------
 .../AzureIoTHub.Portal.Client.csproj          |  3 +-
 src/AzureIoTHub.Portal.Client/Program.cs      |  2 -
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/AzureIoTHub.Portal.Client/App.razor b/src/AzureIoTHub.Portal.Client/App.razor
index fba280a04..87a059950 100644
--- a/src/AzureIoTHub.Portal.Client/App.razor
+++ b/src/AzureIoTHub.Portal.Client/App.razor
@@ -1,32 +1,29 @@
 
-@using Blazored.Modal
 @using Microsoft.AspNetCore.Authorization
 
 @attribute [Authorize]
 
 <Error>
-    <CascadingBlazoredModal>
-        <Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
-            <Found Context="routeData">
-                <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
-                    <NotAuthorized>
-                        @if (!context.User.Identity.IsAuthenticated)
-                        {
-                            <RedirectToLogin />
-                        }
-                        else
-                        {
-                            <p>You are not authorized to access this resource.</p>
-                        }
-                    </NotAuthorized>
-                </AuthorizeRouteView>
-            </Found>
-            <NotFound>
-                <PageTitle>Not found</PageTitle>
-                <LayoutView Layout="@typeof(MainLayout)">
-                    <p>Sorry, there's nothing at this address.</p>
-                </LayoutView>
-            </NotFound>
-        </Router>
-    </CascadingBlazoredModal>   
+    <Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
+        <Found Context="routeData">
+            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
+                <NotAuthorized>
+                    @if (!context.User.Identity.IsAuthenticated)
+                    {
+                        <RedirectToLogin />
+                    }
+                    else
+                    {
+                        <p>You are not authorized to access this resource.</p>
+                    }
+                </NotAuthorized>
+            </AuthorizeRouteView>
+        </Found>
+        <NotFound>
+            <PageTitle>Not found</PageTitle>
+            <LayoutView Layout="@typeof(MainLayout)">
+                <p>Sorry, there's nothing at this address.</p>
+            </LayoutView>
+        </NotFound>
+    </Router>
 </Error>
diff --git a/src/AzureIoTHub.Portal.Client/AzureIoTHub.Portal.Client.csproj b/src/AzureIoTHub.Portal.Client/AzureIoTHub.Portal.Client.csproj
index c762532ed..b53616234 100644
--- a/src/AzureIoTHub.Portal.Client/AzureIoTHub.Portal.Client.csproj
+++ b/src/AzureIoTHub.Portal.Client/AzureIoTHub.Portal.Client.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
@@ -9,7 +9,6 @@
   <ItemGroup>
     <PackageReference Include="ChartJs.Blazor.Fork" Version="2.0.2" />
     <PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
-    <PackageReference Include="Blazored.Modal" Version="7.1.0" />
     <PackageReference Include="FluentValidation" Version="11.4.0" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web.Extensions" Version="5.0.0-preview9.20513.1" />
diff --git a/src/AzureIoTHub.Portal.Client/Program.cs b/src/AzureIoTHub.Portal.Client/Program.cs
index 1d99c4214..f4cd8a767 100644
--- a/src/AzureIoTHub.Portal.Client/Program.cs
+++ b/src/AzureIoTHub.Portal.Client/Program.cs
@@ -8,7 +8,6 @@
 using AzureIoTHub.Portal.Models.v10;
 using AzureIoTHub.Portal.Settings;
 using Blazored.LocalStorage;
-using Blazored.Modal;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
@@ -60,7 +59,6 @@
 _ = builder.Services.AddFileReaderService(o => o.UseWasmSharedBuffer = true);
 
 _ = builder.Services.AddBlazoredLocalStorage();
-_ = builder.Services.AddBlazoredModal();
 _ = builder.Services.AddMudServices(config =>
 {
     config.SnackbarConfiguration.PositionClass = Defaults.Classes.Position.BottomLeft;