NetinaShop
/
AdminPanel
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(SearchProductByName)

subProduct
Amir Hossein Khademi 2024-08-10 20:35:38 +03:30
parent 8b4c9934b3
commit 4f68a139de
7 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Netina.AdminPanel.PWA/Dialogs/DiscountActionDialogBox.razor.cs
View File

@ -311,9 +311,9 @@ public class DiscountActionDialogBoxViewModel : BaseViewModel<DiscountLDto>
if (token == null) if (token == null)
throw new Exception("Token is null"); throw new Exception("Token is null");
if (product.IsNullOrEmpty()) if (product.IsNullOrEmpty())
response = await _restWrapper.ProductRestApi.ReadAll(0,null,null,null); response = await _restWrapper.ProductRestApi.ReadAll(0,null,null,null,token);
else else
response = await _restWrapper.ProductRestApi.ReadAll(product); response = await _restWrapper.ProductRestApi.ReadAll(product,token);
_products = response.Products; _products = response.Products;
return _products; return _products;
} }

4
Netina.AdminPanel.PWA/Netina.AdminPanel.PWA.csproj
View File

@ -5,8 +5,8 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest> <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
<AssemblyVersion>1.1.10.15</AssemblyVersion> <AssemblyVersion>1.3.12.16</AssemblyVersion>
<FileVersion>1.1.10.15</FileVersion> <FileVersion>1.3.12.16</FileVersion>
<AssemblyName>$(MSBuildProjectName)</AssemblyName> <AssemblyName>$(MSBuildProjectName)</AssemblyName>
</PropertyGroup> </PropertyGroup>

2
Netina.AdminPanel.PWA/Pages/Personalization/ManageNavMenuPage.razor.cs
View File

@ -133,7 +133,7 @@ public class ManageNavMenuPageViewModel : BaseViewModel<NavMenuSetting>
var token = await _userUtility.GetBearerTokenAsync(); var token = await _userUtility.GetBearerTokenAsync();
if (token == null) if (token == null)
throw new Exception("Token is null"); throw new Exception("Token is null");
var response = await _restWrapper.ProductRestApi.ReadAll(0,product,null,null); var response = await _restWrapper.ProductRestApi.ReadAll(0,product,null,null,token);
var categories = response.Products; var categories = response.Products;
if (product.IsNullOrEmpty()) if (product.IsNullOrEmpty())
return categories; return categories;

10
Netina.AdminPanel.PWA/Pages/ProductsPage.razor
View File

@ -45,9 +45,10 @@
<MudGrid class="mb-3" Row="true"> <MudGrid class="mb-3" Row="true">
<MudItem xs="12" sm="6"> <MudItem xs="12" sm="6">
<MudTextField T="string" Placeholder="جست جو بر اساس نام" Adornment="Adornment.Start" Immediate="true" <MudTextField T="string" Placeholder="جست جو بر اساس نام" Adornment="Adornment.Start"
Immediate="true"
Clearable="true" Clearable="true"
ValueChanged="@ViewModel.SearchChanged" @bind-Value="@ViewModel.Search"
AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" class="my-auto" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" class="my-auto"
OnAdornmentClick="@ViewModel.GetEntitiesAsync"></MudTextField> OnAdornmentClick="@ViewModel.GetEntitiesAsync"></MudTextField>
</MudItem> </MudItem>
@ -87,9 +88,10 @@
<MudGrid class="collapse md:visible"> <MudGrid class="collapse md:visible">
<MudItem xs="12" sm="4"> <MudItem xs="12" sm="4">
<MudTextField T="string" Placeholder="جست جو بر اساس نام" Adornment="Adornment.Start" Immediate="true" <MudTextField T="string" Placeholder="جست جو بر اساس نام" Adornment="Adornment.Start"
Immediate="true"
Clearable="true" Clearable="true"
ValueChanged="@ViewModel.SearchChanged" @bind-Value="@ViewModel.Search"
AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" class="my-auto" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" class="my-auto"
OnAdornmentClick="@ViewModel.GetEntitiesAsync"></MudTextField> OnAdornmentClick="@ViewModel.GetEntitiesAsync"></MudTextField>
</MudItem> </MudItem>

7
Netina.AdminPanel.PWA/Pages/ProductsPage.razor.cs
View File

@ -38,7 +38,7 @@ public class ProductsPageViewModel(
IsProcessing = true; IsProcessing = true;
PageDto.Clear(); PageDto.Clear();
var search = Search.IsNullOrEmpty() ? null : Search; var search = Search.IsNullOrEmpty() ? null : Search;
var dto = await restWrapper.ProductRestApi.ReadAll(CurrentPage, search, SelectedCategory?.Id, IsEnable); var dto = await restWrapper.ProductRestApi.ReadAll(CurrentPage, search, SelectedCategory?.Id, IsEnable,token);
dto.Products.ForEach(d => PageDto.Add(d)); dto.Products.ForEach(d => PageDto.Add(d));
if (PageDto.Count % 20 == 0) if (PageDto.Count % 20 == 0)
PageCount = CurrentPage + 2; PageCount = CurrentPage + 2;
@ -158,11 +158,10 @@ public class ProductsPageViewModel(
} }
} }
public async Task SearchChanged(string search) public async Task SearchChanged()
{ {
if (search.IsNullOrEmpty() && !Search.IsNullOrEmpty()) if (Search!=null && !Search.IsNullOrEmpty())
await InitializeAsync(); await InitializeAsync();
Search = search;
} }

4
Netina.AdminPanel.PWA/Services/RestServices/IProductRestApi.cs
View File

@ -13,10 +13,10 @@ public interface IProductRestApi
Task<GetProductResponseDto> ReadOne(Guid productId); Task<GetProductResponseDto> ReadOne(Guid productId);
[Get("")] [Get("")]
Task<GetProductsResponseDto> ReadAll([Query] string productName); Task<GetProductsResponseDto> ReadAll([Query] string productName, [Header("Authorization")] string authorization);
[Get("")] [Get("")]
Task<GetProductsResponseDto> ReadAll([Query] int page, [Query] string? productName, [Query] Guid? categoryId, [Query] bool? isActive); Task<GetProductsResponseDto> ReadAll([Query] int page, [Query] string? productName, [Query] Guid? categoryId, [Query] bool? isActive, [Header("Authorization")] string authorization);
[Get("")] [Get("")]
Task<GetProductsResponseDto> ReadAll([Query] string productName, [Query] Guid categoryId, [Header("Authorization")] string authorization); Task<GetProductsResponseDto> ReadAll([Query] string productName, [Query] Guid categoryId, [Header("Authorization")] string authorization);

4
Netina.AdminPanel.PWA/wwwroot/css/app.min.css vendored
View File

@ -1096,10 +1096,6 @@ input:checked + .toggle-bg {
margin-left: 1rem; margin-left: 1rem;
margin-right: 1rem; margin-right: 1rem;
} }
.mx-5 {
margin-left: 1.25rem;
margin-right: 1.25rem;
}
.mx-auto { .mx-auto {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;