admin/BackOffice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: Update Protobuf references to CMSMicroservice across User, UserAddress, UserOrder, UserRole, and related services
Build and Deploy to Kubernetes / build-and-deploy (push) Failing after 3m9s
Details

Browse Source 
- Changed Protobuf imports from BackOffice.BFF to CMSMicroservice for User, UserAddress, UserOrder, UserRole components and services.
- Updated appsettings for direct connection to CMS, removing BFF references.
- Adjusted logic in services to accommodate new Protobuf structure and fields.
- Moved documentation to totalDoc directory.
This commit is contained in:
masoodafar-web
2026-02-10 22:05:13 +03:30
parent 7a27347142
commit 8d9942ddc2
139 changed files with 374 additions and 4293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BackOffice/BackOffice.csproj
+14 -6
View File
@@ -132,13 +132,21 @@
</ItemGroup>
<!-- ============================================================ -->
<!-- Proto References: Uses libs/ DLLs if available (CI/CD mode) -->
<!-- Falls back to ProjectReference if libs/ missing (dev mode) -->
<!-- Run ./build-deps.sh to populate libs/ folder -->
<!-- Proto References: Direct reference to CMS Protobuf project -->
<!-- This enables direct communication with CMS (no BFF needed) -->
<!-- ============================================================ -->
<!-- Direct reference to CMS Protobuf project -->
<ItemGroup>
<ProjectReference Include="../../../CMS/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj" />
</ItemGroup>
<!-- ============================================================ -->
<!-- OLD BFF Proto References (DEPRECATED - kept for reference) -->
<!-- ============================================================ -->
<!-- CI/CD Mode: Use pre-built DLLs from libs/ folder -->
<ItemGroup Condition="Exists('../../libs/BackOffice.BFF.Common.Protobuf.dll')">
<ItemGroup Condition="false AND Exists('../../libs/BackOffice.BFF.Common.Protobuf.dll')">
<Reference Include="BackOffice.BFF.Common.Protobuf">
<HintPath>../../libs/BackOffice.BFF.Common.Protobuf.dll</HintPath>
</Reference>
@@ -213,8 +221,8 @@
</Reference>
</ItemGroup>
<!-- Dev Mode: Use ProjectReference when libs/ doesn't exist -->
<ItemGroup Condition="!Exists('../../libs/BackOffice.BFF.Common.Protobuf.dll')">
<!-- Dev Mode: OLD BFF ProjectReference (DEPRECATED) -->
<ItemGroup Condition="false AND !Exists('../../libs/BackOffice.BFF.Common.Protobuf.dll')">
<ProjectReference Include="../../../BackOffice.BFF/src/Protobufs/BackOffice.BFF.Common.Protobuf/BackOffice.BFF.Common.Protobuf.csproj" />
<ProjectReference Include="../../../BackOffice.BFF/src/Protobufs/BackOffice.BFF.Category.Protobuf/BackOffice.BFF.Category.Protobuf.csproj" />
<ProjectReference Include="../../../BackOffice.BFF/src/Protobufs/BackOffice.BFF.ClubMembership.Protobuf/BackOffice.BFF.ClubMembership.Protobuf.csproj" />
src/BackOffice/Common/Configure/ConfigureService.cs
+25 -25
View File
@@ -1,28 +1,28 @@
using BackOffice.BFF.Otp.Protobuf.Protos.Otp;
using BackOffice.BFF.Package.Protobuf.Protos.Package;
using BackOffice.BFF.Role.Protobuf.Protos.Role;
using BackOffice.BFF.Products.Protobuf.Protos.Products;
using BackOffice.BFF.User.Protobuf.Protos.User;
using BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress;
using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
using BackOffice.BFF.UserRole.Protobuf.Protos.UserRole;
using BackOffice.BFF.Category.Protobuf.Protos.Category;
using Foursat.BackOffice.BFF.Commission.Protos;
using Foursat.BackOffice.BFF.ClubMembership.Protos;
using Foursat.BackOffice.BFF.Configuration.Protos;
using Foursat.BackOffice.BFF.NetworkMembership.Protos;
using Foursat.BackOffice.BFF.Health.Protobuf;
using BackOffice.BFF.Configuration.Protobuf.Protos.AppVersion;
using CMSMicroservice.Protobuf.Protos.OtpToken;
using CMSMicroservice.Protobuf.Protos.Package;
using CMSMicroservice.Protobuf.Protos.Role;
using CMSMicroservice.Protobuf.Protos.Products;
using CMSMicroservice.Protobuf.Protos.User;
using CMSMicroservice.Protobuf.Protos.UserAddress;
using CMSMicroservice.Protobuf.Protos.UserOrder;
using CMSMicroservice.Protobuf.Protos.UserRole;
using CMSMicroservice.Protobuf.Protos.Category;
using CMSMicroservice.Protobuf.Protos.Commission;
using CMSMicroservice.Protobuf.Protos.ClubMembership;
using CMSMicroservice.Protobuf.Protos.Configuration;
using CMSMicroservice.Protobuf.Protos.NetworkMembership;
using CMSMicroservice.Protobuf.Protos.Health;
using CMSMicroservice.Protobuf.Protos.AppVersion;
// Discount Shop Proto Clients
using BackOffice.BFF.DiscountProduct.Protobuf.Protos.DiscountProduct;
using BackOffice.BFF.DiscountCategory.Protobuf.Protos.DiscountCategory;
using BackOffice.BFF.DiscountOrder.Protobuf.Protos.DiscountOrder;
using BackOffice.BFF.Tag.Protobuf.Protos.Tag;
using BackOffice.BFF.ProductTag.Protobuf.Protos.ProductTag;
using BackOffice.BFF.ManualPayment.Protobuf;
using Foursat.BackOffice.BFF.PublicMessage.Protobuf;
using Foursat.BackOffice.BFF.Inventory.Protos;
using CMSMicroservice.Protobuf.Protos.DiscountProduct;
using CMSMicroservice.Protobuf.Protos.DiscountCategory;
using CMSMicroservice.Protobuf.Protos.DiscountOrder;
using CMSMicroservice.Protobuf.Protos.Tag;
using CMSMicroservice.Protobuf.Protos.ProductTag;
using CMSMicroservice.Protobuf.Protos.ManualPayment;
using CMSMicroservice.Protobuf.Protos;
using CMSMicroservice.Protobuf.Protos.Inventory;
using BackOffice.Common.Utilities;
using BackOffice.Services.DiscountProduct;
using BackOffice.Services.DiscountCategory;
@@ -102,7 +102,7 @@ public static class ConfigureServices
return CreateAuthenticatedChannel(baseUri, httpClient, sp);
});
services.AddTransient(sp => new OtpContract.OtpContractClient(sp.GetRequiredService<CallInvoker>()));
services.AddTransient(sp => new OtpTokenContract.OtpTokenContractClient(sp.GetRequiredService<CallInvoker>()));
services.AddTransient(sp => new PackageContract.PackageContractClient(sp.GetRequiredService<CallInvoker>()));
services.AddTransient(sp => new ProductsContract.ProductsContractClient(sp.GetRequiredService<CallInvoker>()));
services.AddTransient(sp => new RoleContract.RoleContractClient(sp.GetRequiredService<CallInvoker>()));
@@ -136,7 +136,7 @@ public static class ConfigureServices
services.AddTransient(sp => new ManualPaymentContract.ManualPaymentContractClient(sp.GetRequiredService<CallInvoker>()));
// Inventory Management Service
services.AddTransient(sp => new InventoryBFFContract.InventoryBFFContractClient(sp.GetRequiredService<CallInvoker>()));
services.AddTransient(sp => new InventoryContract.InventoryContractClient(sp.GetRequiredService<CallInvoker>()));
return services;
}
src/BackOffice/Pages/AutoComplete/CategoryAutoComplete.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Category.Protobuf.Protos.Category
@using CMSMicroservice.Protobuf.Protos.Category
<MudAutocomplete T="GetAllCategoryByFilterResponseModel"
Label="@Label"
src/BackOffice/Pages/AutoComplete/CategoryAutoComplete.razor.cs
+2 -1
View File
@@ -1,4 +1,5 @@
using BackOffice.BFF.Category.Protobuf.Protos.Category;
using CMSMicroservice.Protobuf.Protos;
using CMSMicroservice.Protobuf.Protos.Category;
using Microsoft.AspNetCore.Components;
namespace BackOffice.Pages.AutoComplete;
src/BackOffice/Pages/AutoComplete/CategoryMultiSelectAutoComplete.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Category.Protobuf.Protos.Category
@using CMSMicroservice.Protobuf.Protos.Category
<MudAutocomplete T="GetAllCategoryByFilterResponseModel"
Label="@Label"
src/BackOffice/Pages/AutoComplete/CategoryMultiSelectAutoComplete.razor.cs
+2 -1
View File
@@ -1,4 +1,5 @@
using BackOffice.BFF.Category.Protobuf.Protos.Category;
using CMSMicroservice.Protobuf.Protos;
using CMSMicroservice.Protobuf.Protos.Category;
using Microsoft.AspNetCore.Components;
namespace BackOffice.Pages.AutoComplete;
src/BackOffice/Pages/AutoComplete/CategoryMultiSelectCombo.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Category.Protobuf.Protos.Category
@using CMSMicroservice.Protobuf.Protos.Category
<MudSelect T="long"
@ref="_selectRef"
src/BackOffice/Pages/AutoComplete/CategoryMultiSelectCombo.razor.cs
+2 -1
View File
@@ -1,7 +1,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BackOffice.BFF.Category.Protobuf.Protos.Category;
using CMSMicroservice.Protobuf.Protos;
using CMSMicroservice.Protobuf.Protos.Category;
using Microsoft.AspNetCore.Components;
namespace BackOffice.Pages.AutoComplete;
src/BackOffice/Pages/AutoComplete/ProductsAutoComplete.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Products.Protobuf.Protos.Products
@using CMSMicroservice.Protobuf.Protos.Products
<MudAutocomplete T="GetAllProductsByFilterResponseModel"
Label="@Label"
src/BackOffice/Pages/AutoComplete/ProductsAutoComplete.razor.cs
+2 -2
View File
@@ -1,5 +1,5 @@
using BackOffice.BFF.Products.Protobuf.Protos.Products;
using BackOffice.BFF.Protobuf.Common;
using CMSMicroservice.Protobuf.Protos.Products;
using CMSMicroservice.Protobuf.Protos;
using Microsoft.AspNetCore.Components;
namespace BackOffice.Pages.AutoComplete;
src/BackOffice/Pages/AutoComplete/RoleAutoComplete.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Role.Protobuf.Protos.Role
@using CMSMicroservice.Protobuf.Protos.Role
<MudAutocomplete T="GetAllRoleByFilterResponseModel"
Label="@Label"
src/BackOffice/Pages/AutoComplete/RoleAutoComplete.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.Role.Protobuf.Protos.Role;
using CMSMicroservice.Protobuf.Protos.Role;
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
src/BackOffice/Pages/AutoComplete/UserAutoComplete.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.User.Protobuf.Protos.User
@using CMSMicroservice.Protobuf.Protos.User
<MudAutocomplete T="GetAllUserByFilterResponseModel"
Label="@Label"
src/BackOffice/Pages/AutoComplete/UserAutoComplete.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.User.Protobuf.Protos.User;
using CMSMicroservice.Protobuf.Protos.User;
using Grpc.Core;
using Microsoft.AspNetCore.Components;
src/BackOffice/Pages/AutoComplete/WeekNumberPicker.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using Foursat.BackOffice.BFF.Commission.Protos
@using CMSMicroservice.Protobuf.Protos.Commission
<MudAutocomplete T="WeekInfo"
Label="@Label"
src/BackOffice/Pages/AutoComplete/WeekNumberPicker.razor.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using BackOffice.Services;
using Foursat.BackOffice.BFF.Commission.Protos;
using CMSMicroservice.Protobuf.Protos.Commission;
using Grpc.Core;
using Microsoft.AspNetCore.Components;
src/BackOffice/Pages/Category/CategoryMainPage.razor
+2 -2
View File
@@ -1,9 +1,9 @@
@attribute [Route(RouteConstance.Category)]
@using BackOffice.BFF.Category.Protobuf.Protos.Category
@using CMSMicroservice.Protobuf.Protos.Category
@using BackOffice.Common.BaseComponents
@using BackOffice.Pages.AutoComplete
@using DataModel = BackOffice.BFF.Category.Protobuf.Protos.Category.GetAllCategoryByFilterResponseModel
@using DataModel = CMSMicroservice.Protobuf.Protos.Category.GetAllCategoryByFilterResponseModel
<BasePageComponent @ref="_basePage" OnClearFilterClick="OnFilterCleared" OnSubmitClick="OnFilterSubmit">
<Filters>
src/BackOffice/Pages/Category/CategoryMainPage.razor.cs
+3 -2
View File
@@ -1,11 +1,12 @@
using System.Text.Json;
using BackOffice.BFF.Category.Protobuf.Protos.Category;
using CMSMicroservice.Protobuf.Protos;
using CMSMicroservice.Protobuf.Protos.Category;
using BackOffice.Common.BaseComponents;
using BackOffice.Common.Utilities;
using Mapster;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using DataModel = BackOffice.BFF.Category.Protobuf.Protos.Category.GetAllCategoryByFilterResponseModel;
using DataModel = CMSMicroservice.Protobuf.Protos.Category.GetAllCategoryByFilterResponseModel;
namespace BackOffice.Pages.Category;
src/BackOffice/Pages/Category/CategoryProductsDragDropPage.razor
+1 -1
View File
@@ -1,6 +1,6 @@
@attribute [Route(RouteConstance.CategoryProducts + "{CategoryId:long?}")]
@using BackOffice.BFF.Products.Protobuf.Protos.Products
@using CMSMicroservice.Protobuf.Protos.Products
@using BackOffice.Common.BaseComponents
@using BackOffice.Pages.AutoComplete
src/BackOffice/Pages/Category/CategoryProductsDragDropPage.razor.cs
+2 -2
View File
@@ -1,5 +1,5 @@
using BackOffice.BFF.Products.Protobuf.Protos.Products;
using BackOffice.BFF.Category.Protobuf.Protos.Category;
using CMSMicroservice.Protobuf.Protos.Products;
using CMSMicroservice.Protobuf.Protos.Category;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using MudBlazor;
src/BackOffice/Pages/Category/CreateOrUpdateCategoryDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Category.Protobuf.Protos.Category
@using CMSMicroservice.Protobuf.Protos.Category
@using Microsoft.AspNetCore.Components.Forms
@using BackOffice.Pages.AutoComplete
src/BackOffice/Pages/Category/CreateOrUpdateCategoryDialog.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.Category.Protobuf.Protos.Category;
using CMSMicroservice.Protobuf.Protos.Category;
using Microsoft.AspNetCore.Components;
using MudBlazor;
src/BackOffice/Pages/Club/ClubMembers.razor
+1 -1
View File
@@ -3,7 +3,7 @@
@using Google.Protobuf.WellKnownTypes
@using BackOffice.Pages.Club.Components
@using Foursat.BackOffice.BFF.ClubMembership.Protos
@using CMSMicroservice.Protobuf.Protos.ClubMembership
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mt-4">
<MudText Typo="Typo.h4" Class="mb-4">مدیریت اعضای باشگاه</MudText>
src/BackOffice/Pages/Club/ClubMembers.razor.cs
+1 -1
View File
@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Components;
using MudBlazor;
using Google.Protobuf.WellKnownTypes;
using BackOffice.Pages.Club.Components;
using Foursat.BackOffice.BFF.ClubMembership.Protos;
using CMSMicroservice.Protobuf.Protos.ClubMembership;
namespace BackOffice.Pages.Club;
src/BackOffice/Pages/Club/Components/ActivateClubDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using Foursat.BackOffice.BFF.ClubMembership.Protos
@using CMSMicroservice.Protobuf.Protos.ClubMembership
<MudDialog>
<DialogContent>
src/BackOffice/Pages/Club/Components/DeactivateClubDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using Foursat.BackOffice.BFF.ClubMembership.Protos
@using CMSMicroservice.Protobuf.Protos.ClubMembership
<MudDialog>
<DialogContent>
src/BackOffice/Pages/Club/Components/MemberDetailsDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using Foursat.BackOffice.BFF.ClubMembership.Protos
@using CMSMicroservice.Protobuf.Protos.ClubMembership
<MudDialog>
<DialogContent>
src/BackOffice/Pages/Club/Statistics.razor
+1 -1
View File
@@ -1,7 +1,7 @@
@page "/club/statistics"
@using MudBlazor
@using Foursat.BackOffice.BFF.ClubMembership.Protos
@using CMSMicroservice.Protobuf.Protos.ClubMembership
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mt-4">
<MudText Typo="Typo.h4" GutterBottom="true">آمار باشگاه</MudText>
src/BackOffice/Pages/Commission/Components/PayoutDetailsDialog.razor
+3 -2
View File
@@ -1,4 +1,4 @@
@using Foursat.BackOffice.BFF.Commission.Protos
@using CMSMicroservice.Protobuf.Protos.Commission
<MudDialog>
<DialogContent>
@@ -93,7 +93,8 @@
</tr>
<tr>
<td><strong>آخرین ویرایش:</strong></td>
<td>@Payout.LastModified.ToDateTime().ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss")</td>
@* CMS UserCommissionPayoutModel does not have LastModified - using Created as fallback *@
<td>@Payout.Created.ToDateTime().ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss")</td>
</tr>
</tbody>
</MudSimpleTable>
src/BackOffice/Pages/Commission/Dashboard.razor
+1 -1
View File
@@ -1,7 +1,7 @@
@page "/commission/dashboard"
@attribute [Authorize]
@using Foursat.BackOffice.BFF.Commission.Protos
@using CMSMicroservice.Protobuf.Protos.Commission
@using MudBlazor
@using BackOffice.Pages.AutoComplete
src/BackOffice/Pages/Commission/Dashboard.razor.cs
+3 -3
View File
@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Components;
using MudBlazor;
using System.Globalization;
using System.Text.Json;
using Foursat.BackOffice.BFF.Commission.Protos;
using CMSMicroservice.Protobuf.Protos.Commission;
using BackOffice.Services;
namespace BackOffice.Pages.Commission;
@@ -24,8 +24,8 @@ public partial class Dashboard
private GetWeeklyCommissionPoolResponse? _poolData;
// Available weeks data
private Foursat.BackOffice.BFF.Commission.Protos.GetAvailableWeeksResponse? _availableWeeks;
private List<Foursat.BackOffice.BFF.Commission.Protos.WeekInfo> _allWeeks = new();
private CMSMicroservice.Protobuf.Protos.Commission.GetAvailableWeeksResponse? _availableWeeks;
private List<CMSMicroservice.Protobuf.Protos.Commission.WeekInfo> _allWeeks = new();
protected override async Task OnInitializedAsync()
{
src/BackOffice/Pages/Commission/UserPayouts.razor
+1 -1
View File
@@ -1,7 +1,7 @@
@page "/commission/payouts"
@attribute [Authorize]
@using Foursat.BackOffice.BFF.Commission.Protos
@using CMSMicroservice.Protobuf.Protos.Commission
@using Google.Protobuf.WellKnownTypes
@using MudBlazor
@using BackOffice.Pages.AutoComplete
src/BackOffice/Pages/Commission/UserPayouts.razor.cs
+8 -11
View File
@@ -1,5 +1,5 @@
using BackOffice.BFF.Protobuf.Common;
using Foursat.BackOffice.BFF.Commission.Protos;
using CMSMicroservice.Protobuf.Protos;
using CMSMicroservice.Protobuf.Protos.Commission;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using Google.Protobuf.WellKnownTypes;
@@ -22,29 +22,26 @@ public partial class UserPayouts
{
try
{
// CMS proto uses flat fields instead of nested PaginationState/Filter
var request = new GetUserCommissionPayoutsRequest
{
PaginationState = new PaginationState()
{
PageNumber = state.Page + 1,
PageSize = state.PageSize
},
Filter = new GetUserPayoutsFilter()
PageIndex = state.Page + 1,
PageSize = state.PageSize
};
if (_filterUserId.HasValue && _filterUserId.Value > 0)
{
request.Filter.UserId = _filterUserId.Value;
request.UserId = _filterUserId.Value;
}
if (_filterWeekDefinitionId.HasValue && _filterWeekDefinitionId.Value > 0)
{
request.Filter.WeekDefinitionId = _filterWeekDefinitionId.Value;
request.WeekDefinitionId = _filterWeekDefinitionId.Value;
}
if (_filterStatus.HasValue)
{
request.Filter.Status = _filterStatus.Value;
request.Status = _filterStatus.Value;
}
var result = await CommissionContract.GetUserCommissionPayoutsAsync(request);
src/BackOffice/Pages/Commission/WeeklyReports.razor
+1 -1
View File
@@ -1,7 +1,7 @@
@page "/commission/reports"
@using MudBlazor
@using Foursat.BackOffice.BFF.Commission.Protos
@using CMSMicroservice.Protobuf.Protos.Commission
@using Google.Protobuf.WellKnownTypes
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mt-4">
src/BackOffice/Pages/Commission/WithdrawalReports.razor
+1 -1
View File
@@ -2,7 +2,7 @@
@attribute [Authorize]
@using MudBlazor
@using Foursat.BackOffice.BFF.Commission.Protos
@using CMSMicroservice.Protobuf.Protos.Commission
@using Google.Protobuf.WellKnownTypes
@using Microsoft.JSInterop
@using System.Text
src/BackOffice/Pages/Commission/WithdrawalRequests.razor
+1 -1
View File
@@ -1,7 +1,7 @@
@page "/commission/withdrawals"
@attribute [Authorize]
@using Foursat.BackOffice.BFF.Commission.Protos
@using CMSMicroservice.Protobuf.Protos.Commission
@using BackOffice.Pages.AutoComplete
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mt-4">
src/BackOffice/Pages/Commission/WithdrawalRequests.razor.cs
+3 -3
View File
@@ -1,9 +1,9 @@
using Foursat.BackOffice.BFF.Commission.Protos;
using CMSMicroservice.Protobuf.Protos.Commission;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using Google.Protobuf.WellKnownTypes;
using GrpcWithdrawalRequestModel = Foursat.BackOffice.BFF.Commission.Protos.WithdrawalRequestModel;
using GrpcGetWithdrawalRequestsRequest = Foursat.BackOffice.BFF.Commission.Protos.GetWithdrawalRequestsRequest;
using GrpcWithdrawalRequestModel = CMSMicroservice.Protobuf.Protos.Commission.WithdrawalRequestModel;
using GrpcGetWithdrawalRequestsRequest = CMSMicroservice.Protobuf.Protos.Commission.GetWithdrawalRequestsRequest;
namespace BackOffice.Pages.Commission;
src/BackOffice/Pages/Dashboard/SystemOverview.razor
+2 -2
View File
@@ -1,8 +1,8 @@
@page "/dashboard/overview"
@attribute [Authorize]
@using Foursat.BackOffice.BFF.Commission.Protos
@using Foursat.BackOffice.BFF.ClubMembership.Protos
@using CMSMicroservice.Protobuf.Protos.Commission
@using CMSMicroservice.Protobuf.Protos.ClubMembership
@using Google.Protobuf.WellKnownTypes
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mt-4">
src/BackOffice/Pages/Index.razor
+6 -5
View File
@@ -1,10 +1,11 @@
@attribute [Route(RouteConstance.HomePage)]
@using BackOffice.BFF.User.Protobuf.Protos.User
@using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder
@using BackOffice.BFF.Products.Protobuf.Protos.Products
@using BackOffice.BFF.Package.Protobuf.Protos.Package
@using BackOffice.BFF.Category.Protobuf.Protos.Category
@using CMSMicroservice.Protobuf.Protos.User
@using CMSMicroservice.Protobuf.Protos.UserOrder
@using CMSMicroservice.Protobuf.Protos
@using CMSMicroservice.Protobuf.Protos.Products
@using CMSMicroservice.Protobuf.Protos.Package
@using CMSMicroservice.Protobuf.Protos.Category
@inject UserContract.UserContractClient UserContract
@inject UserOrderContract.UserOrderContractClient UserOrderContract
@inject ProductsContract.ProductsContractClient ProductsContract
src/BackOffice/Pages/Inventory/Components/AddStockDialog.razor
+3 -3
View File
@@ -1,6 +1,6 @@
@using Foursat.BackOffice.BFF.Inventory.Protos
@using CMSMicroservice.Protobuf.Protos.Inventory
@using Google.Protobuf.WellKnownTypes
@using InventoryProductType = Foursat.BackOffice.BFF.Inventory.Protos.ProductType
@using InventoryProductType = CMSMicroservice.Protobuf.Protos.Inventory.ProductType
<MudDialog>
<DialogContent>
@@ -90,7 +90,7 @@
@code {
[CascadingParameter] IMudDialogInstance MudDialog { get; set; } = default!;
[Inject] public InventoryBFFContract.InventoryBFFContractClient InventoryContract { get; set; } = default!;
[Inject] public InventoryContract.InventoryContractClient InventoryContract { get; set; } = default!;
[Parameter] public List<WarehouseDto> Warehouses { get; set; } = new();
[Parameter] public long? ProductIdParam { get; set; }
src/BackOffice/Pages/Inventory/Components/AdjustStockDialog.razor
+2 -2
View File
@@ -1,4 +1,4 @@
@using Foursat.BackOffice.BFF.Inventory.Protos
@using CMSMicroservice.Protobuf.Protos.Inventory
<MudDialog>
<DialogContent>
@@ -54,7 +54,7 @@
@code {
[CascadingParameter] IMudDialogInstance MudDialog { get; set; } = default!;
[Inject] public InventoryBFFContract.InventoryBFFContractClient InventoryContract { get; set; } = default!;
[Inject] public InventoryContract.InventoryContractClient InventoryContract { get; set; } = default!;
[Parameter] public InventoryItemDto Item { get; set; } = default!;
src/BackOffice/Pages/Inventory/Components/CreateWarehouseDialog.razor
+2 -2
View File
@@ -1,4 +1,4 @@
@using Foursat.BackOffice.BFF.Inventory.Protos
@using CMSMicroservice.Protobuf.Protos.Inventory
<MudDialog>
<DialogContent>
@@ -56,7 +56,7 @@
@code {
[CascadingParameter] IMudDialogInstance MudDialog { get; set; } = default!;
[Inject] public InventoryBFFContract.InventoryBFFContractClient InventoryContract { get; set; } = default!;
[Inject] public InventoryContract.InventoryContractClient InventoryContract { get; set; } = default!;
private MudForm? _form;
private bool _formValid;
src/BackOffice/Pages/Inventory/Components/InventorySettingsDialog.razor
+2 -2
View File
@@ -1,4 +1,4 @@
@using Foursat.BackOffice.BFF.Inventory.Protos
@using CMSMicroservice.Protobuf.Protos.Inventory
<MudDialog>
<DialogContent>
@@ -63,7 +63,7 @@
@code {
[CascadingParameter] IMudDialogInstance MudDialog { get; set; } = default!;
[Inject] public InventoryBFFContract.InventoryBFFContractClient InventoryContract { get; set; } = default!;
[Inject] public InventoryContract.InventoryContractClient InventoryContract { get; set; } = default!;
[Parameter] public InventoryItemDto Item { get; set; } = default!;
src/BackOffice/Pages/Inventory/Components/RecordLossDialog.razor
+2 -2
View File
@@ -1,4 +1,4 @@
@using Foursat.BackOffice.BFF.Inventory.Protos
@using CMSMicroservice.Protobuf.Protos.Inventory
<MudDialog>
<DialogContent>
@@ -72,7 +72,7 @@
@code {
[CascadingParameter] IMudDialogInstance MudDialog { get; set; } = default!;
[Inject] public InventoryBFFContract.InventoryBFFContractClient InventoryContract { get; set; } = default!;
[Inject] public InventoryContract.InventoryContractClient InventoryContract { get; set; } = default!;
[Parameter] public InventoryItemDto Item { get; set; } = default!;
src/BackOffice/Pages/Inventory/InventoryMainPage.razor
+1 -1
View File
@@ -1,7 +1,7 @@
@attribute [Route(RouteConstance.Inventory)]
@attribute [Authorize]
@using Foursat.BackOffice.BFF.Inventory.Protos
@using CMSMicroservice.Protobuf.Protos.Inventory
@using BackOffice.Pages.Inventory.Components
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mt-4">
src/BackOffice/Pages/Inventory/InventoryMainPage.razor.cs
+2 -2
View File
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Components;
using MudBlazor;
using Google.Protobuf.WellKnownTypes;
using Foursat.BackOffice.BFF.Inventory.Protos;
using CMSMicroservice.Protobuf.Protos.Inventory;
using BackOffice.Pages.Inventory.Components;
using BackOffice.Common.Utilities;
@@ -9,7 +9,7 @@ namespace BackOffice.Pages.Inventory;
public partial class InventoryMainPage
{
[Inject] public InventoryBFFContract.InventoryBFFContractClient InventoryContract { get; set; } = default!;
[Inject] public InventoryContract.InventoryContractClient InventoryContract { get; set; } = default!;
private MudDataGrid<InventoryItemDto>? _gridData;
private List<WarehouseDto> _warehouses = new();
src/BackOffice/Pages/Inventory/LowStockPage.razor
+1 -1
View File
@@ -1,7 +1,7 @@
@attribute [Route(RouteConstance.InventoryLowStock)]
@attribute [Authorize]
@using Foursat.BackOffice.BFF.Inventory.Protos
@using CMSMicroservice.Protobuf.Protos.Inventory
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mt-4">
<MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center" Class="mb-4">
src/BackOffice/Pages/Inventory/LowStockPage.razor.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Components;
using MudBlazor;
using Foursat.BackOffice.BFF.Inventory.Protos;
using CMSMicroservice.Protobuf.Protos.Inventory;
using BackOffice.Pages.Inventory.Components;
using BackOffice.Common.Utilities;
@@ -8,7 +8,7 @@ namespace BackOffice.Pages.Inventory;
public partial class LowStockPage
{
[Inject] public InventoryBFFContract.InventoryBFFContractClient InventoryContract { get; set; } = default!;
[Inject] public InventoryContract.InventoryContractClient InventoryContract { get; set; } = default!;
private List<InventoryItemDto> _items = new();
private List<WarehouseDto> _warehouses = new();
src/BackOffice/Pages/Inventory/MovementsPage.razor
+1 -1
View File
@@ -1,7 +1,7 @@
@attribute [Route(RouteConstance.InventoryMovements)]
@attribute [Authorize]
@using Foursat.BackOffice.BFF.Inventory.Protos
@using CMSMicroservice.Protobuf.Protos.Inventory
@using Google.Protobuf.WellKnownTypes
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mt-4">
src/BackOffice/Pages/Inventory/MovementsPage.razor.cs
+2 -2
View File
@@ -1,14 +1,14 @@
using Microsoft.AspNetCore.Components;
using MudBlazor;
using Google.Protobuf.WellKnownTypes;
using Foursat.BackOffice.BFF.Inventory.Protos;
using CMSMicroservice.Protobuf.Protos.Inventory;
using BackOffice.Common.Utilities;
namespace BackOffice.Pages.Inventory;
public partial class MovementsPage
{
[Inject] public InventoryBFFContract.InventoryBFFContractClient InventoryContract { get; set; } = default!;
[Inject] public InventoryContract.InventoryContractClient InventoryContract { get; set; } = default!;
[SupplyParameterFromQuery(Name = "itemId")]
public long? ItemId { get; set; }
src/BackOffice/Pages/Inventory/WarehousesPage.razor
+1 -1
View File
@@ -1,7 +1,7 @@
@attribute [Route(RouteConstance.InventoryWarehouses)]
@attribute [Authorize]
@using Foursat.BackOffice.BFF.Inventory.Protos
@using CMSMicroservice.Protobuf.Protos.Inventory
@using BackOffice.Pages.Inventory.Components
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mt-4">
src/BackOffice/Pages/Inventory/WarehousesPage.razor.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Components;
using MudBlazor;
using Foursat.BackOffice.BFF.Inventory.Protos;
using CMSMicroservice.Protobuf.Protos.Inventory;
using BackOffice.Pages.Inventory.Components;
using BackOffice.Common.Utilities;
@@ -8,7 +8,7 @@ namespace BackOffice.Pages.Inventory;
public partial class WarehousesPage
{
[Inject] public InventoryBFFContract.InventoryBFFContractClient InventoryContract { get; set; } = default!;
[Inject] public InventoryContract.InventoryContractClient InventoryContract { get; set; } = default!;
private List<WarehouseDto> _warehouses = new();
private bool _isLoading = true;
src/BackOffice/Pages/Login/LoginPage.razor.cs
+6 -6
View File
@@ -1,5 +1,5 @@
using BackOffice.BFF.Otp.Protobuf.Protos.Otp;
using BackOffice.BFF.Otp.Protobuf.Validator;
using CMSMicroservice.Protobuf.Protos.OtpToken;
using CMSMicroservice.Protobuf.Validator.OtpToken;
using BackOffice.Common.Utilities;
using Microsoft.AspNetCore.Components;
using MudBlazor;
@@ -8,11 +8,11 @@ namespace BackOffice.Pages.Login;
public partial class LoginPage
{
private bool _isLoading;
private SendOtpRequest _request = new();
private SendOtpRequestValidator _requestValidator = new();
private CreateNewOtpTokenRequest _request = new() { Purpose = "login" };
private CreateNewOtpTokenRequestValidator _requestValidator = new();
private MudForm _form;
[Inject] public OtpContract.OtpContractClient OtpContract { get; set; }
[Inject] public OtpTokenContract.OtpTokenContractClient OtpContract { get; set; }
private async Task OnSubmitClick()
{
await _form.Validate();
@@ -25,7 +25,7 @@ public partial class LoginPage
_request.Mobile = _request.Mobile.PersianToEnglish();
try
{
await OtpContract.SendOtpAsync(_request);
await OtpContract.CreateNewOtpTokenAsync(_request);
Navigation.NavigateTo(RouteConstance.VerifyCodePage + _request.Mobile);
}
catch (Exception ex)
src/BackOffice/Pages/Login/VerifyCodePage.razor.cs
+25 -10
View File
@@ -1,9 +1,13 @@
using BackOffice.BFF.Otp.Protobuf.Protos.Otp;
using BackOffice.BFF.Otp.Protobuf.Validator;
using CMSMicroservice.Protobuf.Protos.OtpToken;
using CMSMicroservice.Protobuf.Protos.User;
using CMSMicroservice.Protobuf.Validator.User;
using BackOffice.Common.Utilities;
using Blazored.LocalStorage;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using VerifyOtpTokenRequest = CMSMicroservice.Protobuf.Protos.User.VerifyOtpTokenRequest;
using CreateNewOtpTokenRequest = CMSMicroservice.Protobuf.Protos.OtpToken.CreateNewOtpTokenRequest;
using VerifyOtpTokenRequestValidator = CMSMicroservice.Protobuf.Validator.User.VerifyOtpTokenRequestValidator;
namespace BackOffice.Pages.Login;
public partial class VerifyCodePage
@@ -12,14 +16,17 @@ public partial class VerifyCodePage
public string Mobile { get; set; }
private bool _isLoading;
private VerifyOtpCodeRequest _request = new();
private VerifyOtpCodeRequestValidator _requestValidator = new();
private VerifyOtpTokenRequest _request = new() { Purpose = "login" };
private VerifyOtpTokenRequestValidator _requestValidator = new();
private MudForm _form;
private Timer _timer;
private int _currentCount = 120;
[Inject]
public OtpContract.OtpContractClient OtpContract { get; set; }
public UserContract.UserContractClient UserClient { get; set; }
[Inject]
public OtpTokenContract.OtpTokenContractClient OtpTokenClient { get; set; }
protected override void OnInitialized()
{
@@ -39,9 +46,16 @@ public partial class VerifyCodePage
try
{
var token = await OtpContract.VerifyOtpCodeAsync(_request);
await LocalStorageService.SetItemAsync(GlobalConstants.JwtTokenKey, token.Token);
Navigation.NavigateTo(RouteConstance.HomePage, forceLoad: true);
var result = await UserClient.VerifyOtpTokenAsync(_request);
if (result.Success && result.Token != null)
{
await LocalStorageService.SetItemAsync(GlobalConstants.JwtTokenKey, result.Token);
Navigation.NavigateTo(RouteConstance.HomePage, forceLoad: true);
}
else
{
Snackbar.Add(message: result.Message, severity: Severity.Error);
}
}
catch (Exception ex)
{
@@ -61,9 +75,10 @@ public partial class VerifyCodePage
try
{
await OtpContract.SendOtpAsync(request: new()
await OtpTokenClient.CreateNewOtpTokenAsync(new CreateNewOtpTokenRequest
{
Mobile = Mobile
Mobile = Mobile,
Purpose = "login"
});
StartTimer();
}
src/BackOffice/Pages/Network/BalancesReport.razor
+1 -1
View File
@@ -2,7 +2,7 @@
@using BackOffice.Pages.AutoComplete
@using MudBlazor
@using Foursat.BackOffice.BFF.Commission.Protos
@using CMSMicroservice.Protobuf.Protos.Commission
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mt-4">
<MudText Typo="Typo.h4" GutterBottom="true">گزارش موجودی‌های هفتگی</MudText>
src/BackOffice/Pages/Network/NetworkTreeViewer.razor
+3 -3
View File
@@ -3,7 +3,7 @@
@implements IAsyncDisposable
@inject IJSRuntime JS
@using Foursat.BackOffice.BFF.NetworkMembership.Protos
@using CMSMicroservice.Protobuf.Protos.NetworkMembership
@using BackOffice.Pages.AutoComplete
<MudContainer MaxWidth="MaxWidth.ExtraExtraLarge" Class="mt-4">
@@ -252,7 +252,7 @@
UserId = _searchUserId.Value,
MaxDepth = _selectedDepth,
IsClubActive = _clubActiveFilter,
ActivationWeekDefinitionId = _activationWeekFilter
ActivationWeekDefinitionId = _activationWeekFilter?.ToString()
};
_treeData = await NetworkContract.GetNetworkTreeAsync(request);
@@ -288,7 +288,7 @@
UserId = userId,
MaxDepth = _selectedDepth,
IsClubActive = _clubActiveFilter,
ActivationWeekDefinitionId = _activationWeekFilter
ActivationWeekDefinitionId = _activationWeekFilter?.ToString()
};
_treeData = await NetworkContract.GetNetworkTreeAsync(request);
src/BackOffice/Pages/Network/Statistics.razor
+1 -1
View File
@@ -1,6 +1,6 @@
@page "/network/statistics"
@using Foursat.BackOffice.BFF.NetworkMembership.Protos
@using CMSMicroservice.Protobuf.Protos.NetworkMembership
@using MudBlazor
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mt-4">
src/BackOffice/Pages/Network/UserNetworkInfo.razor
+1 -1
View File
@@ -1,5 +1,5 @@
@page "/network/user-info/{UserId:long}"
@using Foursat.BackOffice.BFF.NetworkMembership.Protos
@using CMSMicroservice.Protobuf.Protos.NetworkMembership
@attribute [Authorize]
src/BackOffice/Pages/Package/Components/CreateDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Package.Protobuf.Protos.Package
@using CMSMicroservice.Protobuf.Protos.Package
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
src/BackOffice/Pages/Package/Components/CreateDialog.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.Package.Protobuf.Protos.Package;
using CMSMicroservice.Protobuf.Protos.Package;
using Google.Protobuf;
using Grpc.Core;
using Microsoft.AspNetCore.Components;
src/BackOffice/Pages/Package/Components/UpdateDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Package.Protobuf.Protos.Package
@using CMSMicroservice.Protobuf.Protos.Package
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
src/BackOffice/Pages/Package/Components/UpdateDialog.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.Package.Protobuf.Protos.Package;
using CMSMicroservice.Protobuf.Protos.Package;
using Google.Protobuf;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
src/BackOffice/Pages/Package/PackageMainPage.razor
+2 -2
View File
@@ -1,9 +1,9 @@
@attribute [Route(RouteConstance.Package)]
@using BackOffice.BFF.Package.Protobuf.Protos.Package
@using CMSMicroservice.Protobuf.Protos.Package
@using BackOffice.Pages.Package.Components
@using BackOffice.Common.BaseComponents
@using DataModel = BackOffice.BFF.Package.Protobuf.Protos.Package.GetAllPackageByFilterResponseModel
@using DataModel = CMSMicroservice.Protobuf.Protos.Package.GetAllPackageByFilterResponseModel
<BackOffice.Common.BaseComponents.BasePageComponent @ref="_basePage" OnClearFilterClick="OnFilterCleared" OnSubmitClick="OnFilterSubmit">
<Filters>
src/BackOffice/Pages/Package/PackageMainPage.razor.cs
+2 -2
View File
@@ -1,10 +1,10 @@
using BackOffice.BFF.Package.Protobuf.Protos.Package;
using CMSMicroservice.Protobuf.Protos.Package;
using BackOffice.Common.BaseComponents;
using BackOffice.Pages.Package.Components;
using Mapster;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using DataModel = BackOffice.BFF.Package.Protobuf.Protos.Package.GetAllPackageByFilterResponseModel;
using DataModel = CMSMicroservice.Protobuf.Protos.Package.GetAllPackageByFilterResponseModel;
namespace BackOffice.Pages.Package;
public partial class PackageMainPage
src/BackOffice/Pages/Payment/Components/ManualPaymentDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.ManualPayment.Protobuf
@using CMSMicroservice.Protobuf.Protos.ManualPayment
@using BackOffice.Pages.Payment.Components
@using BackOffice.Pages.AutoComplete
@using Microsoft.AspNetCore.Components.Forms
src/BackOffice/Pages/Payment/Components/ManualPaymentDialog.razor.cs
+2 -2
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.ManualPayment.Protobuf;
using CMSMicroservice.Protobuf.Protos.ManualPayment;
using Google.Protobuf;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
@@ -102,7 +102,7 @@ public partial class ManualPaymentDialog
{
UserId = _selectedUserId.Value,
Amount = _createModel.Amount,
Type = _selectedType,
Type = (ManualPaymentType)_selectedType,
Description = _description
};
src/BackOffice/Pages/Payment/ManualPayments.razor
+7 -12
View File
@@ -1,5 +1,5 @@
@page "/payment/manual-payments"
@using BackOffice.BFF.ManualPayment.Protobuf
@using CMSMicroservice.Protobuf.Protos.ManualPayment
@using BackOffice.Pages.Payment.Components
@using BackOffice.Common.BaseComponents
@using BackOffice.Pages.AutoComplete
@@ -69,15 +69,15 @@
</PropertyColumn>
<TemplateColumn Title="نوع">
<CellTemplate>
@GetTypeText(context.Item.Type)
@GetTypeText((int)context.Item.Type)
</CellTemplate>
</TemplateColumn>
<TemplateColumn Title="وضعیت">
<CellTemplate>
<MudChip T="string"
Size="Size.Small"
Color="@GetStatusColor(context.Item.Status)">
@GetStatusText(context.Item.Status)
Color="@GetStatusColor((int)context.Item.Status)">
@GetStatusText((int)context.Item.Status)
</MudChip>
</CellTemplate>
</TemplateColumn>
@@ -103,7 +103,7 @@
</BasePageComponent>
@code {
[Inject] public BackOffice.BFF.ManualPayment.Protobuf.ManualPaymentContract.ManualPaymentContractClient ManualPaymentClient { get; set; } = default!;
[Inject] public CMSMicroservice.Protobuf.Protos.ManualPayment.ManualPaymentContract.ManualPaymentContractClient ManualPaymentClient { get; set; } = default!;
// DialogService is injected via _Imports.razor
private BasePageComponent? _basePage;
@@ -118,7 +118,7 @@
var pageNumber = state.Page + 1;
var pageSize = state.PageSize;
var request = new GetManualPaymentsRequest
var request = new GetAllManualPaymentsRequest
{
PageNumber = pageNumber,
PageSize = pageSize
@@ -139,12 +139,7 @@
request.Type = _typeFilter.Value;
}
if (!string.IsNullOrWhiteSpace(_referenceFilter))
{
request.ReferenceNumber = _referenceFilter;
}
var response = await ManualPaymentClient.GetManualPaymentsAsync(request);
var response = await ManualPaymentClient.GetAllManualPaymentsAsync(request);
return new GridData<ManualPaymentModel>
{
src/BackOffice/Pages/Products/BulkEdit.razor
+2 -2
View File
@@ -1,8 +1,8 @@
@attribute [Route(RouteConstance.ProductsBulkEdit)]
@using BackOffice.BFF.Products.Protobuf.Protos.Products
@using CMSMicroservice.Protobuf.Protos.Products
@using BackOffice.Common.BaseComponents
@using DataModel = BackOffice.BFF.Products.Protobuf.Protos.Products.GetAllProductsByFilterResponseModel
@using DataModel = CMSMicroservice.Protobuf.Protos.Products.GetAllProductsByFilterResponseModel
<BasePageComponent @ref="_basePage"
OnClearFilterClick="OnFilterCleared"
src/BackOffice/Pages/Products/BulkEdit.razor.cs
+4 -4
View File
@@ -1,9 +1,9 @@
using BackOffice.BFF.Products.Protobuf.Protos;
using BackOffice.BFF.Products.Protobuf.Protos.Products;
using CMSMicroservice.Protobuf.Protos.Products;
using CMSMicroservice.Protobuf.Protos.Products;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using DataModel = BackOffice.BFF.Products.Protobuf.Protos.Products.GetAllProductsByFilterResponseModel;
using PaginationState = BackOffice.BFF.Protobuf.Common.PaginationState;
using DataModel = CMSMicroservice.Protobuf.Protos.Products.GetAllProductsByFilterResponseModel;
using PaginationState = CMSMicroservice.Protobuf.Protos.PaginationState;
namespace BackOffice.Pages.Products;
src/BackOffice/Pages/Products/Components/CreateDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Products.Protobuf.Protos.Products
@using CMSMicroservice.Protobuf.Protos.Products
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
@using BackOffice.Common.BaseComponents
src/BackOffice/Pages/Products/Components/CreateDialog.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.Products.Protobuf.Protos.Products;
using CMSMicroservice.Protobuf.Protos.Products;
using Google.Protobuf;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
src/BackOffice/Pages/Products/Components/GalleryDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Products.Protobuf.Protos.Products
@using CMSMicroservice.Protobuf.Protos.Products
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms
src/BackOffice/Pages/Products/Components/GalleryDialog.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.Products.Protobuf.Protos.Products;
using CMSMicroservice.Protobuf.Protos.Products;
using Google.Protobuf;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
src/BackOffice/Pages/Products/Components/UpdateDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Products.Protobuf.Protos.Products
@using CMSMicroservice.Protobuf.Protos.Products
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
@using BackOffice.Common.BaseComponents
src/BackOffice/Pages/Products/Components/UpdateDialog.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.Products.Protobuf.Protos.Products;
using CMSMicroservice.Protobuf.Protos.Products;
using Google.Protobuf;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
src/BackOffice/Pages/Products/ProductCategoriesDragDropPage.razor
+1 -1
View File
@@ -1,6 +1,6 @@
@attribute [Route(RouteConstance.ProductCategories + "{ProductId:long?}")]
@using BackOffice.BFF.Products.Protobuf.Protos.Products
@using CMSMicroservice.Protobuf.Protos.Products
@using BackOffice.Common.BaseComponents
@using BackOffice.Pages.AutoComplete
src/BackOffice/Pages/Products/ProductCategoriesDragDropPage.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.Products.Protobuf.Protos.Products;
using CMSMicroservice.Protobuf.Protos.Products;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using MudBlazor;
src/BackOffice/Pages/Products/ProductsMainPage.razor
+2 -2
View File
@@ -1,9 +1,9 @@
@attribute [Route(RouteConstance.Products)]
@using BackOffice.BFF.Products.Protobuf.Protos.Products
@using CMSMicroservice.Protobuf.Protos.Products
@using BackOffice.Common.BaseComponents
@using BackOffice.Pages.Products.Components
@using DataModel = BackOffice.BFF.Products.Protobuf.Protos.Products.GetAllProductsByFilterResponseModel
@using DataModel = CMSMicroservice.Protobuf.Protos.Products.GetAllProductsByFilterResponseModel
<BasePageComponent @ref="_basePage" OnClearFilterClick="OnFilterCleared" OnSubmitClick="OnFilterSubmit">
<Filters>
src/BackOffice/Pages/Products/ProductsMainPage.razor.cs
+3 -3
View File
@@ -1,5 +1,5 @@
using BackOffice.BFF.Products.Protobuf.Protos.Products;
using BackOffice.BFF.Protobuf.Common;
using CMSMicroservice.Protobuf.Protos.Products;
using CMSMicroservice.Protobuf.Protos;
using BackOffice.Common.BaseComponents;
using BackOffice.Common.Utilities;
using BackOffice.Pages.Tag.Components;
@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using MudBlazor;
using System.Text;
using DataModel = BackOffice.BFF.Products.Protobuf.Protos.Products.GetAllProductsByFilterResponseModel;
using DataModel = CMSMicroservice.Protobuf.Protos.Products.GetAllProductsByFilterResponseModel;
namespace BackOffice.Pages.Products;
src/BackOffice/Pages/Role/Components/CreateDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Package.Protobuf.Protos.Package
@using CMSMicroservice.Protobuf.Protos.Package
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
src/BackOffice/Pages/Role/Components/CreateDialog.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.Role.Protobuf.Protos.Role;
using CMSMicroservice.Protobuf.Protos.Role;
using Google.Protobuf;
using Grpc.Core;
using Microsoft.AspNetCore.Components;
src/BackOffice/Pages/Role/Components/UpdateDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Package.Protobuf.Protos.Package
@using CMSMicroservice.Protobuf.Protos.Package
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
src/BackOffice/Pages/Role/Components/UpdateDialog.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.Role.Protobuf.Protos.Role;
using CMSMicroservice.Protobuf.Protos.Role;
using Google.Protobuf;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
src/BackOffice/Pages/Role/RoleMainPage.razor
+2 -2
View File
@@ -1,9 +1,9 @@
@attribute [Route(RouteConstance.Role)]
@using BackOffice.BFF.Role.Protobuf.Protos.Role
@using CMSMicroservice.Protobuf.Protos.Role
@using BackOffice.Pages.Role.Components
@using BackOffice.Common.BaseComponents
@using DataModel = BackOffice.BFF.Role.Protobuf.Protos.Role.GetAllRoleByFilterResponseModel
@using DataModel = CMSMicroservice.Protobuf.Protos.Role.GetAllRoleByFilterResponseModel
<BackOffice.Common.BaseComponents.BasePageComponent @ref="_basePage" OnClearFilterClick="OnFilterCleared" OnSubmitClick="OnFilterSubmit">
<Filters>
src/BackOffice/Pages/Role/RoleMainPage.razor.cs
+2 -2
View File
@@ -1,10 +1,10 @@
using BackOffice.BFF.Role.Protobuf.Protos.Role;
using CMSMicroservice.Protobuf.Protos.Role;
using BackOffice.Common.BaseComponents;
using BackOffice.Pages.Role.Components;
using Mapster;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using DataModel = BackOffice.BFF.Role.Protobuf.Protos.Role.GetAllRoleByFilterResponseModel;
using DataModel = CMSMicroservice.Protobuf.Protos.Role.GetAllRoleByFilterResponseModel;
namespace BackOffice.Pages.Role;
public partial class RoleMainPage
src/BackOffice/Pages/SystemManagement/Configuration.razor
+7 -3
View File
@@ -1,7 +1,8 @@
@page "/system/configuration"
@attribute [Authorize(Roles = "Administrator")]
@using Foursat.BackOffice.BFF.Configuration.Protos
@using CMSMicroservice.Protobuf.Protos.Configuration
@using CMSMicroservice.Protobuf.Protos
@using MudBlazor
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mt-4">
@@ -431,8 +432,11 @@
{
var request = new GetAllConfigurationsRequest
{
PageIndex = 1,
PageSize = 100
PaginationState = new PaginationState
{
PageNumber = 1,
PageSize = 100
}
};
var response = await ConfigurationClient.GetAllConfigurationsAsync(request);
src/BackOffice/Pages/SystemManagement/HealthDashboard.razor
+6 -5
View File
@@ -1,7 +1,8 @@
@page "/system/health"
@attribute [Authorize]
@using Foursat.BackOffice.BFF.Health.Protobuf
@using CMSMicroservice.Protobuf.Protos.Health
@using Google.Protobuf.WellKnownTypes
@using MudBlazor
@inject HealthContract.HealthContractClient HealthClient
@@ -234,8 +235,8 @@
{
try
{
var request = new GetSystemHealthRequest();
var response = await HealthClient.GetSystemHealthAsync(request);
// CMS proto uses google.protobuf.Empty instead of GetSystemHealthRequest
var response = await HealthClient.GetSystemHealthAsync(new Empty());
_overallStatus = response.OverallHealthy ? "Healthy" : "Unhealthy";
_lastUpdated = DateTime.Now;
@@ -245,11 +246,11 @@
{
Name = s.ServiceName,
Type = GetServiceType(s.ServiceName),
Status = s.Status,
Status = s.Status.ToString(),
Uptime = "99.9%", // Mock - not in API
ResponseTime = (int)s.ResponseTimeMs,
Version = "1.0.0", // Mock - not in API
LastError = s.Status != "Healthy" ? s.Description : null
LastError = s.Status != HealthStatus.Healthy ? s.Description : null
}).ToList();
// Keep mock events for now
src/BackOffice/Pages/SystemManagement/WorkerControl.razor
+4 -4
View File
@@ -177,7 +177,7 @@
</MudContainer>
@code {
[Inject] public Foursat.BackOffice.BFF.Commission.Protos.CommissionContract.CommissionContractClient CommissionClient { get; set; }
[Inject] public CMSMicroservice.Protobuf.Protos.Commission.CommissionContract.CommissionContractClient CommissionClient { get; set; }
[Inject] public BackOffice.Services.IPersianDateTimeService PersianDateTime { get; set; }
private WorkerStatus _workerStatus = WorkerStatus.Running;
@@ -194,7 +194,7 @@
{
try
{
var statusResponse = await CommissionClient.GetWorkerStatusAsync(new Foursat.BackOffice.BFF.Commission.Protos.GetWorkerStatusRequest());
var statusResponse = await CommissionClient.GetWorkerStatusAsync(new CMSMicroservice.Protobuf.Protos.Commission.GetWorkerStatusRequest());
_workerStatus = statusResponse.IsRunning ? WorkerStatus.Running : WorkerStatus.Paused;
_lastRunTime = statusResponse.LastRunAt?.ToDateTime() ?? DateTime.MinValue;
_nextRunTime = statusResponse.NextScheduledRun?.ToDateTime() ?? DateTime.MinValue;
@@ -228,7 +228,7 @@
_isProcessing = true;
try
{
var request = new Foursat.BackOffice.BFF.Commission.Protos.TriggerWeeklyCalculationRequest
var request = new CMSMicroservice.Protobuf.Protos.Commission.TriggerWeeklyCalculationRequest
{
WeekDefinitionId = _manualWeekDefinitionId.Value
};
@@ -275,7 +275,7 @@
{
try
{
var request = new Foursat.BackOffice.BFF.Commission.Protos.GetWorkerExecutionLogsRequest
var request = new CMSMicroservice.Protobuf.Protos.Commission.GetWorkerExecutionLogsRequest
{
PageIndex = 1,
PageSize = 20
src/BackOffice/Pages/User/Components/UserRoleDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.Role.Protobuf.Protos.Role
@using CMSMicroservice.Protobuf.Protos.Role
<MudDialog>
<DialogContent>
@if (_isFirstLoad)
src/BackOffice/Pages/User/Components/UserRoleDialog.razor.cs
+3 -3
View File
@@ -1,8 +1,8 @@
using BackOffice.BFF.Role.Protobuf.Protos.Role;
using CMSMicroservice.Protobuf.Protos.Role;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using BackOffice.BFF.User.Protobuf.Protos.User;
using BackOffice.BFF.UserRole.Protobuf.Protos.UserRole;
using CMSMicroservice.Protobuf.Protos.User;
using CMSMicroservice.Protobuf.Protos.UserRole;
namespace BackOffice.Pages.User.Components;
public partial class UserRoleDialog
src/BackOffice/Pages/User/UserMainPage.razor
+2 -2
View File
@@ -1,9 +1,9 @@
@attribute [Route(RouteConstance.UserPage)]
@using BackOffice.BFF.User.Protobuf.Protos.User
@using CMSMicroservice.Protobuf.Protos.User
@using BackOffice.Pages.User.Components
@using BackOffice.Common.BaseComponents
@using DataModel = BackOffice.BFF.User.Protobuf.Protos.User.GetAllUserByFilterResponseModel
@using DataModel = CMSMicroservice.Protobuf.Protos.User.GetAllUserByFilterResponseModel
<BackOffice.Common.BaseComponents.BasePageComponent @ref="_basePage" OnClearFilterClick="OnFilterCleared" OnSubmitClick="OnFilterSubmit">
<Filters>
src/BackOffice/Pages/User/UserMainPage.razor.cs
+2 -2
View File
@@ -1,9 +1,9 @@
using BackOffice.BFF.User.Protobuf.Protos.User;
using CMSMicroservice.Protobuf.Protos.User;
using BackOffice.Common.BaseComponents;
using BackOffice.Pages.User.Components;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using DataModel = BackOffice.BFF.User.Protobuf.Protos.User.GetAllUserByFilterResponseModel;
using DataModel = CMSMicroservice.Protobuf.Protos.User.GetAllUserByFilterResponseModel;
namespace BackOffice.Pages.User;
public partial class UserMainPage
src/BackOffice/Pages/UserAddress/Components/CreateDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress
@using CMSMicroservice.Protobuf.Protos.UserAddress
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
src/BackOffice/Pages/UserAddress/Components/CreateDialog.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress;
using CMSMicroservice.Protobuf.Protos.UserAddress;
using Google.Protobuf;
using Grpc.Core;
using Microsoft.AspNetCore.Components;
src/BackOffice/Pages/UserAddress/Components/UpdateDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress
@using CMSMicroservice.Protobuf.Protos.UserAddress
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
src/BackOffice/Pages/UserAddress/Components/UpdateDialog.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress;
using CMSMicroservice.Protobuf.Protos.UserAddress;
using Google.Protobuf;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
src/BackOffice/Pages/UserAddress/UserAddressMainPage.razor
+2 -2
View File
@@ -1,9 +1,9 @@
@attribute [Route(RouteConstance.UserAddress + "{UserId:long}")]
@using BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress
@using CMSMicroservice.Protobuf.Protos.UserAddress
@using BackOffice.Pages.UserAddress.Components
@using BackOffice.Common.BaseComponents
@using DataModel = BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress.GetAllUserAddressByFilterResponseModel
@using DataModel = CMSMicroservice.Protobuf.Protos.UserAddress.GetAllUserAddressByFilterResponseModel
<BackOffice.Common.BaseComponents.BasePageComponent @ref="_basePage" OnClearFilterClick="OnFilterCleared" OnSubmitClick="OnFilterSubmit">
<Filters>
src/BackOffice/Pages/UserAddress/UserAddressMainPage.razor.cs
+2 -2
View File
@@ -1,10 +1,10 @@
using BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress;
using CMSMicroservice.Protobuf.Protos.UserAddress;
using BackOffice.Common.BaseComponents;
using BackOffice.Pages.UserAddress.Components;
using Mapster;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using DataModel = BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress.GetAllUserAddressByFilterResponseModel;
using DataModel = CMSMicroservice.Protobuf.Protos.UserAddress.GetAllUserAddressByFilterResponseModel;
namespace BackOffice.Pages.UserAddress;
public partial class UserAddressMainPage
src/BackOffice/Pages/UserOrder/Components/ApplyDiscountDialog.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder
@using CMSMicroservice.Protobuf.Protos.UserOrder
<MudDialog>
<DialogContent>
src/BackOffice/Pages/UserOrder/Components/ApplyDiscountDialog.razor.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
using CMSMicroservice.Protobuf.Protos.UserOrder;
using Microsoft.AspNetCore.Components;
using MudBlazor;

Some files were not shown because too many files have changed in this diff Show More