From 1402c99429b7981bf6bce85f4642a099a5036f97 Mon Sep 17 00:00:00 2001 From: "Amir.H Khademi" Date: Sat, 24 Feb 2024 19:34:55 +0330 Subject: [PATCH] feat : add validators for commands , add filters in products query , add version 0.9.16.23 --- .../Dialogs/BlogActionDialogBox.razor.cs | 16 ++++----------- .../Dialogs/BlogCategoryActionDialogBox.razor | 8 ++------ .../Dialogs/BrandActionDialogBox.razor | 8 ++------ .../Dialogs/DiscountActionDialogBox.razor.cs | 20 +++++-------------- .../Dialogs/OrderActionDialogBox.razor.cs | 8 ++------ .../Dialogs/ProductActionDialogBox.razor.cs | 12 +++-------- .../ProductCategoryActionDialogBox.razor.cs | 12 +++-------- .../Dialogs/RoleActionDialogBox.razor.cs | 8 ++------ .../Dialogs/ShippingActionDialogBox.razor.cs | 8 ++------ .../NetinaShop.AdminPanel.PWA.csproj | 4 ++-- 10 files changed, 27 insertions(+), 77 deletions(-) diff --git a/NetinaShop.AdminPanel.PWA/Dialogs/BlogActionDialogBox.razor.cs b/NetinaShop.AdminPanel.PWA/Dialogs/BlogActionDialogBox.razor.cs index 131d981..f1b1a1b 100644 --- a/NetinaShop.AdminPanel.PWA/Dialogs/BlogActionDialogBox.razor.cs +++ b/NetinaShop.AdminPanel.PWA/Dialogs/BlogActionDialogBox.razor.cs @@ -85,9 +85,7 @@ public class BlogActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) @@ -137,9 +135,7 @@ public class BlogActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) @@ -180,9 +176,7 @@ public class BlogActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) @@ -213,9 +207,7 @@ public class BlogActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); return _blogCategories; } catch (Exception e) diff --git a/NetinaShop.AdminPanel.PWA/Dialogs/BlogCategoryActionDialogBox.razor b/NetinaShop.AdminPanel.PWA/Dialogs/BlogCategoryActionDialogBox.razor index b9701d9..f607d8a 100644 --- a/NetinaShop.AdminPanel.PWA/Dialogs/BlogCategoryActionDialogBox.razor +++ b/NetinaShop.AdminPanel.PWA/Dialogs/BlogCategoryActionDialogBox.razor @@ -84,9 +84,7 @@ catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - Snackbar.Add(exe.Message, Severity.Error); - Snackbar.Add(ex.Content, Severity.Error); + Snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); } catch (Exception e) { @@ -117,9 +115,7 @@ catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - Snackbar.Add(exe.Message, Severity.Error); - Snackbar.Add(ex.Content, Severity.Error); + Snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); MudDialog.Cancel(); } catch (Exception e) diff --git a/NetinaShop.AdminPanel.PWA/Dialogs/BrandActionDialogBox.razor b/NetinaShop.AdminPanel.PWA/Dialogs/BrandActionDialogBox.razor index 4965115..cd057ac 100644 --- a/NetinaShop.AdminPanel.PWA/Dialogs/BrandActionDialogBox.razor +++ b/NetinaShop.AdminPanel.PWA/Dialogs/BrandActionDialogBox.razor @@ -103,9 +103,7 @@ catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - Snackbar.Add(exe.Message, Severity.Error); - Snackbar.Add(ex.Content, Severity.Error); + Snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); } catch (Exception e) { @@ -136,9 +134,7 @@ catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - Snackbar.Add(exe.Message, Severity.Error); - Snackbar.Add(ex.Content, Severity.Error); + Snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); MudDialog.Cancel(); } catch (Exception e) diff --git a/NetinaShop.AdminPanel.PWA/Dialogs/DiscountActionDialogBox.razor.cs b/NetinaShop.AdminPanel.PWA/Dialogs/DiscountActionDialogBox.razor.cs index b00650b..591a638 100644 --- a/NetinaShop.AdminPanel.PWA/Dialogs/DiscountActionDialogBox.razor.cs +++ b/NetinaShop.AdminPanel.PWA/Dialogs/DiscountActionDialogBox.razor.cs @@ -136,9 +136,7 @@ public class DiscountActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) @@ -209,9 +207,7 @@ public class DiscountActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) @@ -264,9 +260,7 @@ public class DiscountActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) @@ -297,9 +291,7 @@ public class DiscountActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); return _productCategories; } catch (Exception e) @@ -328,9 +320,7 @@ public class DiscountActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); return _products; } catch (Exception e) diff --git a/NetinaShop.AdminPanel.PWA/Dialogs/OrderActionDialogBox.razor.cs b/NetinaShop.AdminPanel.PWA/Dialogs/OrderActionDialogBox.razor.cs index d03ebbd..79964ac 100644 --- a/NetinaShop.AdminPanel.PWA/Dialogs/OrderActionDialogBox.razor.cs +++ b/NetinaShop.AdminPanel.PWA/Dialogs/OrderActionDialogBox.razor.cs @@ -58,9 +58,7 @@ public class OrderActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) @@ -87,9 +85,7 @@ public class OrderActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) diff --git a/NetinaShop.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor.cs b/NetinaShop.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor.cs index 3a9dcff..de7081d 100644 --- a/NetinaShop.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor.cs +++ b/NetinaShop.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor.cs @@ -174,9 +174,7 @@ public class ProductActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); } catch (Exception e) { @@ -221,9 +219,7 @@ public class ProductActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); } catch (Exception e) { @@ -298,9 +294,7 @@ public class ProductActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); return _brands; } catch (Exception e) diff --git a/NetinaShop.AdminPanel.PWA/Dialogs/ProductCategoryActionDialogBox.razor.cs b/NetinaShop.AdminPanel.PWA/Dialogs/ProductCategoryActionDialogBox.razor.cs index 6bcabbe..d1bff31 100644 --- a/NetinaShop.AdminPanel.PWA/Dialogs/ProductCategoryActionDialogBox.razor.cs +++ b/NetinaShop.AdminPanel.PWA/Dialogs/ProductCategoryActionDialogBox.razor.cs @@ -62,9 +62,7 @@ public class ProductCategoryActionDialogBoxViewModel:BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) @@ -97,9 +95,7 @@ public class ProductCategoryActionDialogBoxViewModel:BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) @@ -131,9 +127,7 @@ public class ProductCategoryActionDialogBoxViewModel:BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); return _productCategories; } catch (Exception e) diff --git a/NetinaShop.AdminPanel.PWA/Dialogs/RoleActionDialogBox.razor.cs b/NetinaShop.AdminPanel.PWA/Dialogs/RoleActionDialogBox.razor.cs index 1a9d3fe..93d9605 100644 --- a/NetinaShop.AdminPanel.PWA/Dialogs/RoleActionDialogBox.razor.cs +++ b/NetinaShop.AdminPanel.PWA/Dialogs/RoleActionDialogBox.razor.cs @@ -127,9 +127,7 @@ public class RoleActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) @@ -169,9 +167,7 @@ public class RoleActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) diff --git a/NetinaShop.AdminPanel.PWA/Dialogs/ShippingActionDialogBox.razor.cs b/NetinaShop.AdminPanel.PWA/Dialogs/ShippingActionDialogBox.razor.cs index 7609899..75b5e35 100644 --- a/NetinaShop.AdminPanel.PWA/Dialogs/ShippingActionDialogBox.razor.cs +++ b/NetinaShop.AdminPanel.PWA/Dialogs/ShippingActionDialogBox.razor.cs @@ -72,9 +72,7 @@ public class ShippingActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) @@ -111,9 +109,7 @@ public class ShippingActionDialogBoxViewModel : BaseViewModel catch (ApiException ex) { var exe = await ex.GetContentAsAsync(); - if (exe != null) - _snackbar.Add(exe.Message, Severity.Error); - _snackbar.Add(ex.Content, Severity.Error); + _snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error); _mudDialog.Cancel(); } catch (Exception e) diff --git a/NetinaShop.AdminPanel.PWA/NetinaShop.AdminPanel.PWA.csproj b/NetinaShop.AdminPanel.PWA/NetinaShop.AdminPanel.PWA.csproj index 19186e1..bc3b639 100644 --- a/NetinaShop.AdminPanel.PWA/NetinaShop.AdminPanel.PWA.csproj +++ b/NetinaShop.AdminPanel.PWA/NetinaShop.AdminPanel.PWA.csproj @@ -5,8 +5,8 @@ enable enable service-worker-assets.js - 0.8.15.22 - 0.8.15.22 + 0.9.16.23 + 0.9.16.23 $(MSBuildProjectName)