feat(templates):fix http response handling related issues #6066 (#6067)

bitfoundation · Nov 16, 2023 · d019505 · d019505
1 parent 2649201
commit d019505
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 18 deletions.
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/BlazorWeb.Client.csproj b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/BlazorWeb.Client.csproj
@@ -62,6 +62,13 @@
         <Watch Remove="*.scss" />
     </ItemGroup>
 
+    <!--/+:msbuild-conditional:noEmit -->
+    <ItemGroup Condition=" '$(sample)' == 'AdminPanel' or '$(sample)' == ''">
+        <BlazorWebAssemblyLazyLoad Include="Newtonsoft.Json.wasm" />
+        <BlazorWebAssemblyLazyLoad Include="System.Private.Xml.wasm" />
+        <BlazorWebAssemblyLazyLoad Include="System.Data.Common.wasm" />
+    </ItemGroup>
+    <!--/-:msbuild-conditional:noEmit -->
     <ItemGroup>
         <ProjectReference Include="..\BlazorWeb.Shared\BlazorWeb.Shared.csproj" />
     </ItemGroup>

diff --git a/...tes/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Categories/CategoriesPage.razor.cs b/...tes/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Categories/CategoriesPage.razor.cs
@@ -62,8 +62,9 @@ private void PrepareGridDataProvider()
 
                 return BitDataGridItemsProviderResult.From(data.Items!, (int)data.TotalCount);
             }
-            catch
+            catch (Exception exp)
             {
+                ExceptionHandler.Handle(exp);
                 return BitDataGridItemsProviderResult.From(new List<CategoryDto> { }, 0);
             }
             finally

diff --git a/...mplates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/ProductsPage.razor.cs b/...mplates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/ProductsPage.razor.cs
@@ -63,7 +63,7 @@ private void PrepareGridDataProvider()
 
                 return BitDataGridItemsProviderResult.From(data!.Items!, (int)data!.TotalCount);
             }
-            catch
+            catch (Exception exp)
             {
                 return BitDataGridItemsProviderResult.From(new List<ProductDto> { }, 0);
             }

diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Components/App.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Components/App.razor
@@ -31,8 +31,8 @@
     @if (HttpContext.Request.IsCrawlerClient() is false)
     {
         <script src="_framework/blazor.web.js"></script>
-        <script src="scripts/app.js"></script>
         <script src="_content/Bit.BlazorUI/scripts/bit.blazorui.js"></script>
+        <script src="scripts/app.js"></script>
         @*#if (sample == "AdminPanel")*@
         <script src="_content/Bit.BlazorUI.Extras/scripts/bit.blazorui.extras.js"></script>
         @*#endif*@

diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Startup/Middlewares.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Server/Startup/Middlewares.cs
@@ -32,11 +32,11 @@ public static void Use(WebApplication app, IHostEnvironment env, IConfiguration
 
                 if (httpContext.Response.StatusCode is 404)
                 {
-                    httpContext.Response.Redirect($"not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
+                    httpContext.Response.Redirect($"/not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
                 }
                 else if (httpContext.Response.StatusCode is 401)
                 {
-                    httpContext.Response.Redirect($"not-authorized?redirectUrl={httpContext.Request.GetEncodedPathAndQuery()}");
+                    httpContext.Response.Redirect($"/not-authorized?redirectUrl={httpContext.Request.GetEncodedPathAndQuery()}");
                 }
             }
         });

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/Boilerplate.Client.App.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/Boilerplate.Client.App.csproj
@@ -41,7 +41,7 @@
         <MtouchEnableSGenConc>true</MtouchEnableSGenConc>
         <EnableSGenConc>True</EnableSGenConc>
         <!--/+:msbuild-conditional:noEmit -->
-        <MtouchInterpreter Condition=" '$(sample)' == 'AdminPanel'">all</MtouchInterpreter>
+        <MtouchInterpreter Condition=" '$(sample)' == 'AdminPanel' or '$(sample)' == ''">all</MtouchInterpreter>
         <!--/-:msbuild-conditional:noEmit -->
     </PropertyGroup>
 

diff --git a/...ates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Categories/CategoriesPage.razor.cs b/...ates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Categories/CategoriesPage.razor.cs
@@ -62,8 +62,9 @@ private void PrepareGridDataProvider()
 
                 return BitDataGridItemsProviderResult.From(data.Items!, (int)data.TotalCount);
             }
-            catch
+            catch (Exception exp)
             {
+                ExceptionHandler.Handle(exp);
                 return BitDataGridItemsProviderResult.From(new List<CategoryDto> { }, 0);
             }
             finally

diff --git a/...emplates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Products/ProductsPage.razor.cs b/...emplates/Boilerplate/Bit.Boilerplate/src/Client/Core/Pages/Products/ProductsPage.razor.cs
@@ -63,8 +63,9 @@ private void PrepareGridDataProvider()
 
                 return BitDataGridItemsProviderResult.From(data!.Items!, (int)data!.TotalCount);
             }
-            catch
+            catch (Exception exp)
             {
+                ExceptionHandler.Handle(exp);
                 return BitDataGridItemsProviderResult.From(new List<ProductDto> { }, 0);
             }
             finally

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Boilerplate.Client.Web.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Boilerplate.Client.Web.csproj
@@ -65,7 +65,7 @@
     </ItemGroup>
 
     <!--/+:msbuild-conditional:noEmit -->
-    <ItemGroup Condition=" '$(sample)' == 'AdminPanel'">
+    <ItemGroup Condition=" '$(sample)' == 'AdminPanel'  or '$(sample)' == ''">
         <BlazorWebAssemblyLazyLoad Include="Newtonsoft.Json.wasm" />
         <BlazorWebAssemblyLazyLoad Include="System.Private.Xml.wasm" />
         <BlazorWebAssemblyLazyLoad Include="System.Data.Common.wasm" />

diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Components/App.razor.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Components/App.razor.cs
@@ -13,7 +13,7 @@ protected override void OnInitialized()
         {
             HttpContext.Response.GetTypedHeaders().CacheControl = new()
             {
-                MaxAge = TimeSpan.FromDays(7),
+                MaxAge = TimeSpan.FromDays(1),
                 Public = true
             };
         }, null!);

diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs
@@ -31,11 +31,11 @@ public static void Use(WebApplication app, IHostEnvironment env, IConfiguration
 
                 if (httpContext.Response.StatusCode is 404)
                 {
-                    httpContext.Response.Redirect($"not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
+                    httpContext.Response.Redirect($"/not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
                 }
                 else if (httpContext.Response.StatusCode is 401)
                 {
-                    httpContext.Response.Redirect($"not-authorized?redirectUrl={httpContext.Request.GetEncodedPathAndQuery()}");
+                    httpContext.Response.Redirect($"/not-authorized?redirectUrl={httpContext.Request.GetEncodedPathAndQuery()}");
                 }
             }
         });

diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Components/App.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Components/App.razor.cs
@@ -13,7 +13,7 @@ protected override void OnInitialized()
         {
             HttpContext.Response.GetTypedHeaders().CacheControl = new()
             {
-                MaxAge = TimeSpan.FromDays(7),
+                MaxAge = TimeSpan.FromDays(1),
                 Public = true
             };
         }, null!);

diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs
@@ -31,11 +31,11 @@ public static void Use(WebApplication app, IHostEnvironment env, IConfiguration
 
                 if (httpContext.Response.StatusCode is 404)
                 {
-                    httpContext.Response.Redirect($"not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
+                    httpContext.Response.Redirect($"/not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
                 }
                 else if (httpContext.Response.StatusCode is 401)
                 {
-                    httpContext.Response.Redirect($"not-authorized?redirectUrl={httpContext.Request.GetEncodedPathAndQuery()}");
+                    httpContext.Response.Redirect($"/not-authorized?redirectUrl={httpContext.Request.GetEncodedPathAndQuery()}");
                 }
             }
         });

diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Components/App.razor.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Components/App.razor.cs
@@ -13,7 +13,7 @@ protected override void OnInitialized()
         {
             HttpContext.Response.GetTypedHeaders().CacheControl = new()
             {
-                MaxAge = TimeSpan.FromDays(7),
+                MaxAge = TimeSpan.FromDays(1),
                 Public = true
             };
         }, null!);

diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs
@@ -31,11 +31,11 @@ public static void Use(WebApplication app, IHostEnvironment env, IConfiguration
 
                 if (httpContext.Response.StatusCode is 404)
                 {
-                    httpContext.Response.Redirect($"not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
+                    httpContext.Response.Redirect($"/not-found?url={httpContext.Request.GetEncodedPathAndQuery()}");
                 }
                 else if (httpContext.Response.StatusCode is 401)
                 {
-                    httpContext.Response.Redirect($"not-authorized?redirectUrl={httpContext.Request.GetEncodedPathAndQuery()}");
+                    httpContext.Response.Redirect($"/not-authorized?redirectUrl={httpContext.Request.GetEncodedPathAndQuery()}");
                 }
             }
         });
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,7 @@ private void PrepareGridDataProvider() @@
                     return BitDataGridItemsProviderResult.From(data!.Items!, (int)data!.TotalCount);
                 }
-                catch
+                catch (Exception exp)
                 {
                     return BitDataGridItemsProviderResult.From(new List<ProductDto> { }, 0);
                 }
@@ Expand Down @@