Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

merge

This commit is contained in:
Adam 2024-06-20 14:08:56 +02:00
parent b2711064b4 c349c3c432
commit 40c061f8f2
17 changed files with 1476 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TIAM.Services/SignalRTags.cs
View File

@ -4,6 +4,8 @@ namespace TIAM.Services;
public class SignalRTags : AcSignalRTags public class SignalRTags : AcSignalRTags
{ {
public const int None = 0;
public const int GetTransfer = 3; public const int GetTransfer = 3;
public const int GetTransfers = 4; public const int GetTransfers = 4;
public const int GetTransfersByContextId = 5; public const int GetTransfersByContextId = 5;

19
TIAMSharedUI/Pages/User/MyServiceProviders.razor
View File

@ -68,7 +68,8 @@
PageSize="12" PageSize="12"
KeyFieldName="Id" KeyFieldName="Id"
ValidationEnabled="false" ValidationEnabled="false"
DetailRowDisplayMode="GridDetailRowDisplayMode.Always"
CustomizeEditModel="Grid_CustomizeEditModel" CustomizeEditModel="Grid_CustomizeEditModel"
EditMode="GridEditMode.EditRow" EditMode="GridEditMode.EditRow"
KeyboardNavigationEnabled="true"> KeyboardNavigationEnabled="true">
@ -81,8 +82,14 @@
</DxGridDataColumn> </DxGridDataColumn>
<DxGridDataColumn FieldName="Name" MinWidth="80" /> <DxGridDataColumn FieldName="Name" MinWidth="80" />
<DxGridDataColumn FieldName="OwnerId" MinWidth="80" /> <DxGridDataColumn FieldName="OwnerId" MinWidth="80" />
<DxGridDataColumn FieldName="Created" DisplayFormat="g" Width="140" />
<DxGridDataColumn FieldName="Modified" DisplayFormat="g" Width="140" />
</Columns> </Columns>
<DetailRowTemplate>
@{
<text>@(((Company)context.DataItem).Profile.Address.AddressText)</text>
}
</DetailRowTemplate>
</CompanyGrid> </CompanyGrid>
@ -141,19 +148,13 @@
} }
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
await _gridCompany.StartEditRowAsync(0);
}
void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e) void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)
{ {
if (e.IsNew) if (e.IsNew)
{ {
var newEmployee = (Company)e.EditModel; var newEmployee = (Company)e.EditModel;
newEmployee.Name = "John"; newEmployee.Name = "John";
newEmployee.OwnerId = Guid.NewGuid(); newEmployee.AffiliateId = Guid.NewGuid();
} }
} }

18
TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor
View File

@ -13,6 +13,7 @@
@using TIAMSharedUI.Pages.Components.EditComponents @using TIAMSharedUI.Pages.Components.EditComponents
@using TIAMWebApp.Shared.Application.Services @using TIAMWebApp.Shared.Application.Services
@using AyCode.Interfaces.Addresses @using AyCode.Interfaces.Addresses
@using AyCode.Core
@inject IServiceProviderDataService serviceProviderDataService @inject IServiceProviderDataService serviceProviderDataService
@inject IUserDataService userDataService @inject IUserDataService userDataService
@inject ITransferDataService transferDataService @inject ITransferDataService transferDataService
@ -25,9 +26,9 @@
DataSource="DataSource" DataSource="DataSource"
Logger="_logger" Logger="_logger"
SignalRClient="AdminSignalRClient" SignalRClient="AdminSignalRClient"
OnEditModelSaving="DataItemSaving" OnGridEditModelSaving="DataItemSaving"
OnDataItemDeleting="DataItemDeleting" OnGridItemDeleting="DataItemDeleting"
OnDataItemChanged="DataItemChanged" OnGridItemChanged="DataItemChanged"
PageSize="5" PageSize="5"
AutoExpandAllGroupRows="true" AutoExpandAllGroupRows="true"
KeyboardNavigationEnabled="KeyboardNavigationEnabled" KeyboardNavigationEnabled="KeyboardNavigationEnabled"
@ -37,15 +38,14 @@
ColumnResizeMode="GridColumnResizeMode.NextColumn" ColumnResizeMode="GridColumnResizeMode.NextColumn"
ShowFilterRow="false"> ShowFilterRow="false">
<Columns> <Columns>
<DxGridCommandColumn NewButtonVisible="false" Width="8%" FixedPosition="GridColumnFixedPosition.Left" /> <DxGridCommandColumn NewButtonVisible="false" DeleteButtonVisible="false" Width="70" MinWidth="70" FixedPosition="GridColumnFixedPosition.Left" />
<DxGridDataColumn FieldName="Id" GroupIndex="0" /> <DxGridDataColumn FieldName="Id" GroupIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
<DxGridDataColumn FieldName="AddressText" /> <DxGridDataColumn FieldName="AddressText" />
<DxGridDataColumn FieldName="IsValid" Width="40" /> <DxGridDataColumn FieldName="IsValid" Width="40" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
<DxGridDataColumn FieldName="IsHelper" Width="40"/> <DxGridDataColumn FieldName="IsHelper" Width="40" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
<DxGridDataColumn FieldName="Latitude" Width="40"/> <DxGridDataColumn FieldName="Latitude" Width="40"/>
<DxGridDataColumn FieldName="Longitude" Width="40"/> <DxGridDataColumn FieldName="Longitude" Width="40"/>
<DxGridDataColumn FieldName="Created" Width="40"/> <DxGridDataColumn FieldName="Modified" DisplayFormat="g" Width="140" />
<DxGridDataColumn FieldName="Modified" Width="40"/>
</Columns> </Columns>
<EditFormTemplate> <EditFormTemplate>
@{ @{

9
TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
View File

@ -11,6 +11,7 @@
@using TIAM.Entities.Addresses @using TIAM.Entities.Addresses
@using TIAMSharedUI.Shared.Components.Grids @using TIAMSharedUI.Shared.Components.Grids
@using TIAMSharedUI.Pages.Components.EditComponents @using TIAMSharedUI.Pages.Components.EditComponents
@using AyCode.Core
@inject IServiceProviderDataService serviceProviderDataService @inject IServiceProviderDataService serviceProviderDataService
@inject IUserDataService userDataService @inject IUserDataService userDataService
@inject ITransferDataService transferDataService @inject ITransferDataService transferDataService
@ -30,11 +31,11 @@
ColumnResizeMode="GridColumnResizeMode.NextColumn" ColumnResizeMode="GridColumnResizeMode.NextColumn"
ShowFilterRow="true"> ShowFilterRow="true">
<Columns> <Columns>
<DxGridCommandColumn NewButtonVisible="true" Width="8%" FixedPosition="GridColumnFixedPosition.Left" /> <DxGridCommandColumn NewButtonVisible="false" DeleteButtonVisible="false" Width="70" MinWidth="70" FixedPosition="GridColumnFixedPosition.Left" />
<DxGridDataColumn FieldName="Id" GroupIndex="0" /> <DxGridDataColumn FieldName="Id" GroupIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
<DxGridDataColumn FieldName="AddressText" /> <DxGridDataColumn FieldName="AddressText" />
<DxGridDataColumn FieldName="IsValid" Width="40" /> <DxGridDataColumn FieldName="IsValid" Width="40" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
<DxGridDataColumn FieldName="IsHelper" Width="40"/> <DxGridDataColumn FieldName="IsHelper" Width="40" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
<DxGridDataColumn FieldName="Latitude" Width="40"/> <DxGridDataColumn FieldName="Latitude" Width="40"/>
<DxGridDataColumn FieldName="Longitude" Width="40"/> <DxGridDataColumn FieldName="Longitude" Width="40"/>
<DxGridDataColumn FieldName="Created" Width="40"/> <DxGridDataColumn FieldName="Created" Width="40"/>

17
TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
View File

@ -12,6 +12,7 @@
@using AyCode.Core.Extensions; @using AyCode.Core.Extensions;
@using TIAM.Entities.Addresses @using TIAM.Entities.Addresses
@using TIAMSharedUI.Shared.Components.Grids @using TIAMSharedUI.Shared.Components.Grids
@using AyCode.Core
@layout AdminLayout @layout AdminLayout
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject IStringLocalizer<TIAMResources> localizer @inject IStringLocalizer<TIAMResources> localizer
@ -92,29 +93,29 @@
KeyFieldName="Id"> KeyFieldName="Id">
<Columns> <Columns>
<DxGridCommandColumn NewButtonVisible="true" Width="8%" FixedPosition="GridColumnFixedPosition.Left" /> <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
<DxGridDataColumn FieldName="Id" ShowInColumnChooser="false" SortIndex="0" Visible="false" /> <DxGridDataColumn FieldName="Id" SortIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
<DxGridDataColumn FieldName="Name" /> <DxGridDataColumn FieldName="Name" />
<DxGridDataColumn FieldName="OwnerId"> <DxGridDataColumn FieldName="OwnerId" DisplayFormat="N">
<CellDisplayTemplate> <CellDisplayTemplate>
@{ @{
var keyField = context.Value as Guid?; var keyField = context.Value as Guid?;
var keyItem = (Company)context.DataItem;
if (keyField.IsNullOrEmpty()) if (keyField.IsNullOrEmpty())
{ {
<DxButton Click="() => SetOwnerPopup(keyItem)" Text="Set owner" RenderStyle="ButtonRenderStyle.Primary" /> <DxButton Click="() => SetOwnerPopup((Company)context.DataItem)" Text="Set owner" RenderStyle="ButtonRenderStyle.Primary" />
} }
else else
{ {
<span>@keyField</span> <text>@keyField.Value.ToString("N")</text>
} }
} }
</CellDisplayTemplate> </CellDisplayTemplate>
</DxGridDataColumn> </DxGridDataColumn>
<DxGridDataColumn FieldName="AffiliateId" /> <DxGridDataColumn FieldName="AffiliateId" DisplayFormat="N" />
<DxGridDataColumn FieldName="CommissionPercent" /> <DxGridDataColumn FieldName="CommissionPercent" />
<DxGridDataColumn FieldName="Created" /> <DxGridDataColumn FieldName="Created" DisplayFormat="g" Width="140" />
<DxGridDataColumn FieldName="Modified" DisplayFormat="g" Width="140" />
@* <DxGridDataColumn FieldName="ContactEmail"> @* <DxGridDataColumn FieldName="ContactEmail">
</DxGridDataColumn> *@ </DxGridDataColumn> *@

53
TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
View File

@ -18,6 +18,8 @@
@using AyCode.Core.Extensions @using AyCode.Core.Extensions
@using AyCode.Core.Consts @using AyCode.Core.Consts
@using AyCode.Core @using AyCode.Core
@using AyCode.Core.Helpers
@using TIAM.Entities.Emails
@layout AdminLayout @layout AdminLayout
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject IStringLocalizer<TIAMResources> localizer @inject IStringLocalizer<TIAMResources> localizer
@ -90,10 +92,10 @@
Logger="_logger" Logger="_logger"
SignalRClient="AdminSignalRClient" SignalRClient="AdminSignalRClient"
OnDataSourceChanged="DataSourceChanged" OnDataSourceChanged="DataSourceChanged"
OnDataItemChanging="DataSourceItemChanging" OnGridItemChanging="DataSourceItemChanging"
OnDataItemChanged="DataSourceItemChanged" OnGridItemChanged="DataSourceItemChanged"
OnDataItemDeleting="DataItemDeleting" OnGridItemDeleting="DataItemDeleting"
OnEditModelSaving="DataItemSaving" OnGridEditModelSaving="DataItemSaving"
CustomizeElement="Grid_CustomizeElement" CustomizeElement="Grid_CustomizeElement"
CustomizeEditModel="Grid_CustomizeEditModel" CustomizeEditModel="Grid_CustomizeEditModel"
@ -105,22 +107,22 @@
KeyFieldName="Id"> KeyFieldName="Id">
<Columns> <Columns>
<DxGridCommandColumn NewButtonVisible="false" Width="8%" FixedPosition="GridColumnFixedPosition.Left" /> <DxGridCommandColumn NewButtonVisible="false" DeleteButtonVisible="AcDomain.IsDeveloperVersion" Width="70" MinWidth="70" FixedPosition="GridColumnFixedPosition.Left" />
<DxGridDataColumn FieldName="Id" SortIndex="0" /> <DxGridDataColumn FieldName="Id" SortIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
<DxGridDataColumn FieldName="OrderId"> <DxGridDataColumn FieldName="OrderId">
<CellDisplayTemplate> <CellDisplayTemplate>
@{ @{
var idKeyField = ((Transfer)context.DataItem).Id as Guid?; var idKeyField = ((Transfer)context.DataItem).Id;
var editUri = $"mytransfers/{idKeyField}"; var editUri = $"mytransfers/{idKeyField:N}";
<NavLink href="@editUri"> <NavLink href="@editUri">
<span>@context.Value</span> <text>@context.Value</text>
</NavLink> } </NavLink> }
</CellDisplayTemplate> </CellDisplayTemplate>
</DxGridDataColumn> </DxGridDataColumn>
<DxGridDataColumn FieldName="PaymentId" /> <DxGridDataColumn FieldName="PaymentId" DisplayFormat="N" />
<DxGridDataColumn FieldName="FromAddress" /> <DxGridDataColumn FieldName="FromAddress" />
<DxGridDataColumn FieldName="ToAddress" /> <DxGridDataColumn FieldName="ToAddress" />
<DxGridDataColumn FieldName="Appointment" DisplayFormat="f" /> <DxGridDataColumn FieldName="Appointment" DisplayFormat="g" Width="140" />
<DxGridDataColumn FieldName="FullName" /> <DxGridDataColumn FieldName="FullName" />
<DxGridDataColumn FieldName="ContactPhone" /> <DxGridDataColumn FieldName="ContactPhone" />
<DxGridDataColumn FieldName="ContactEmail"> <DxGridDataColumn FieldName="ContactEmail">
@ -140,7 +142,7 @@
TransferStatusModel keyField = Statuses.FirstOrDefault(x => x.StatusValue == Convert.ToInt16(context.Value)); TransferStatusModel keyField = Statuses.FirstOrDefault(x => x.StatusValue == Convert.ToInt16(context.Value));
string transferStatusText = keyField.StatusName; string transferStatusText = keyField.StatusName;
<p>@transferStatusText</p> <text>@transferStatusText</text>
} }
</CellDisplayTemplate> </CellDisplayTemplate>
</DxGridDataColumn> </DxGridDataColumn>
@ -152,6 +154,31 @@
<TransferToDriverGridComponent ParentData="(Transfer)context.DataItem" KeyboardNavigationEnabled="true" /> <TransferToDriverGridComponent ParentData="(Transfer)context.DataItem" KeyboardNavigationEnabled="true" />
</DxTabPage> </DxTabPage>
<DxTabPage Text="Messages"> <DxTabPage Text="Messages">
<MessageDetailGrid
Logger="_logger"
SignalRClient="AdminSignalRClient"
ContextId="((Transfer)context.DataItem).Id">
<Columns>
<DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
<DxGridDataColumn FieldName="ContextId" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
<DxGridDataColumn FieldName="EmailAddress" />
<DxGridDataColumn FieldName="Subject" />
<DxGridDataColumn FieldName="Text">
<CellDisplayTemplate Context="displayTextContext">
<text>@System.Text.RegularExpressions.Regex.Replace((displayTextContext.Value as string)!, "<(.|\n)*?>", string.Empty)</text>
</CellDisplayTemplate>
<CellEditTemplate Context="editTextContext">
@{
var value = ((EmailMessage)editTextContext.EditModel).Text;
<textarea>@value</textarea>
}
</CellEditTemplate>
</DxGridDataColumn>
<DxGridDataColumn FieldName="Created" DisplayFormat="g" Width="140" />
</Columns>
</MessageDetailGrid>
<MessageDetailGridComponent ContextId="((Transfer)context.DataItem).Id" KeyboardNavigationEnabled="true" /> <MessageDetailGridComponent ContextId="((Transfer)context.DataItem).Id" KeyboardNavigationEnabled="true" />
</DxTabPage> </DxTabPage>
</DxTabs> </DxTabs>
@ -383,7 +410,7 @@
{ {
_logger.Info("DataSourceItemChanged called"); _logger.Info("DataSourceItemChanged called");
AppointmentModels.UpdateCollection(CreateAppointmentModel(args.DataItem), args.DataChangeMode == DataChangeMode.Remove); AppointmentModels.UpdateCollection(CreateAppointmentModel(args.DataItem), args.TrackingState == TrackingState.Remove);
} }
private void DataItemSaving(GridEditModelSavingEventArgs e) private void DataItemSaving(GridEditModelSavingEventArgs e)

3
TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
View File

@ -5,6 +5,7 @@
@using TIAMWebApp.Shared.Application.Utility @using TIAMWebApp.Shared.Application.Utility
@using AyCode.Services.Loggers @using AyCode.Services.Loggers
@using TIAM.Core.Loggers @using TIAM.Core.Loggers
@using AyCode.Core
@inject IServiceProviderDataService serviceProviderDataService @inject IServiceProviderDataService serviceProviderDataService
@inject IUserDataService userDataService @inject IUserDataService userDataService
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
@ -26,7 +27,7 @@
ShowFilterRow="true"> ShowFilterRow="true">
<Columns> <Columns>
<DxGridCommandColumn NewButtonVisible="true" Width="8%" FixedPosition="GridColumnFixedPosition.Left" /> <DxGridCommandColumn NewButtonVisible="true" Width="8%" FixedPosition="GridColumnFixedPosition.Left" />
<DxGridDataColumn FieldName="Id" GroupIndex="0" /> <DxGridDataColumn FieldName="Id" GroupIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
<DxGridDataColumn FieldName="UserId" /> <DxGridDataColumn FieldName="UserId" />
<DxGridDataColumn FieldName="ProductId" Width="40%" /> <DxGridDataColumn FieldName="ProductId" Width="40%" />
<DxGridDataColumn FieldName="Permissions" /> <DxGridDataColumn FieldName="Permissions" />

5
TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor
View File

@ -8,6 +8,7 @@
@using TIAMWebApp.Shared.Application.Utility @using TIAMWebApp.Shared.Application.Utility
@using AyCode.Services.Loggers @using AyCode.Services.Loggers
@using TIAM.Core.Loggers @using TIAM.Core.Loggers
@using AyCode.Core
@inject IServiceProviderDataService ServiceProviderDataService @inject IServiceProviderDataService ServiceProviderDataService
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
@ -27,8 +28,8 @@
ColumnResizeMode="GridColumnResizeMode.NextColumn" ColumnResizeMode="GridColumnResizeMode.NextColumn"
ShowFilterRow="true"> ShowFilterRow="true">
<Columns> <Columns>
<DxGridCommandColumn NewButtonVisible="true" Width="8%" FixedPosition="GridColumnFixedPosition.Left" /> <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
<DxGridDataColumn FieldName="Id" GroupIndex="0" /> <DxGridDataColumn FieldName="Id" GroupIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
<DxGridDataColumn FieldName="UserId" /> <DxGridDataColumn FieldName="UserId" />
<DxGridDataColumn FieldName="ProductId" Width="40%" /> <DxGridDataColumn FieldName="ProductId" Width="40%" />
<DxGridDataColumn FieldName="Permissions" /> <DxGridDataColumn FieldName="Permissions" />

11
TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
View File

@ -10,6 +10,7 @@
@using TIAMWebApp.Shared.Application.Services @using TIAMWebApp.Shared.Application.Services
@using AyCode.Core.Enums @using AyCode.Core.Enums
@using AyCode.Core.Extensions @using AyCode.Core.Extensions
@using AyCode.Core
@inject IUserDataService UserDataService @inject IUserDataService UserDataService
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject AdminSignalRClient AdminSignalRClient; @inject AdminSignalRClient AdminSignalRClient;
@ -20,9 +21,9 @@
DataSource="ParentData.TransferToDrivers" DataSource="ParentData.TransferToDrivers"
Logger="_logger" Logger="_logger"
SignalRClient="AdminSignalRClient" SignalRClient="AdminSignalRClient"
OnEditModelSaving="DataItemSaving" OnGridEditModelSaving="DataItemSaving"
OnDataItemDeleting="DataItemDeleting" OnGridItemDeleting="DataItemDeleting"
OnDataItemChanged="DataItemChanged" OnGridItemChanged="DataItemChanged"
PageSize="5" PageSize="5"
AutoExpandAllGroupRows="true" AutoExpandAllGroupRows="true"
KeyboardNavigationEnabled="KeyboardNavigationEnabled" KeyboardNavigationEnabled="KeyboardNavigationEnabled"
@ -34,7 +35,7 @@
ShowFilterRow="false"> ShowFilterRow="false">
<Columns> <Columns>
<DxGridCommandColumn NewButtonVisible="true" Width="8%" FixedPosition="GridColumnFixedPosition.Left" /> <DxGridCommandColumn NewButtonVisible="true" Width="8%" FixedPosition="GridColumnFixedPosition.Left" />
<DxGridDataColumn FieldName="Id" GroupIndex="0" /> <DxGridDataColumn FieldName="Id" GroupIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
<DxGridDataColumn FieldName="CarId" Width="40%" /> <DxGridDataColumn FieldName="CarId" Width="40%" />
<DxGridDataColumn FieldName="LicencePlate" /> <DxGridDataColumn FieldName="LicencePlate" />
</Columns> </Columns>
@ -58,7 +59,7 @@
private void DataItemChanged(GridDataItemChangedEventArgs<TransferToDriver> args) private void DataItemChanged(GridDataItemChangedEventArgs<TransferToDriver> args)
{ {
ParentData.TransferToDrivers.UpdateCollection(args.DataItem, args.DataChangeMode == DataChangeMode.Remove); ParentData.TransferToDrivers.UpdateCollection(args.DataItem, args.TrackingState == TrackingState.Remove);
OnTransferToDriverChanged.InvokeAsync(args.DataItem); OnTransferToDriverChanged.InvokeAsync(args.DataItem);
} }

3
TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
View File

@ -8,6 +8,7 @@
@using TIAM.Core.Loggers @using TIAM.Core.Loggers
@using AyCode.Core.Loggers @using AyCode.Core.Loggers
@using AyCode.Services.Loggers @using AyCode.Services.Loggers
@using AyCode.Core
@inject IServiceProviderDataService ServiceProviderDataService @inject IServiceProviderDataService ServiceProviderDataService
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
@ -26,7 +27,7 @@
ShowFilterRow="true"> ShowFilterRow="true">
<Columns> <Columns>
<DxGridCommandColumn NewButtonVisible="true" Width="8%" FixedPosition="GridColumnFixedPosition.Left" /> <DxGridCommandColumn NewButtonVisible="true" Width="8%" FixedPosition="GridColumnFixedPosition.Left" />
<DxGridDataColumn FieldName="Id" GroupIndex="0" /> <DxGridDataColumn FieldName="Id" GroupIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
<DxGridDataColumn FieldName="UserId" /> <DxGridDataColumn FieldName="UserId" />
<DxGridDataColumn FieldName="ProductId" Width="40%" /> <DxGridDataColumn FieldName="ProductId" Width="40%" />
<DxGridDataColumn FieldName="Permissions" /> <DxGridDataColumn FieldName="Permissions" />

277
TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
View File

@ -8,41 +8,22 @@ using AyCode.Services.SignalRs;
using AyCode.Utils.Extensions; using AyCode.Utils.Extensions;
using DevExpress.Blazor; using DevExpress.Blazor;
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using TIAM.Services;
using TIAMWebApp.Shared.Application.Services; using TIAMWebApp.Shared.Application.Services;
using TIAMWebApp.Shared.Application.Utility; using TIAMWebApp.Shared.Application.Utility;
namespace TIAMSharedUI.Shared.Components.Grids namespace TIAMSharedUI.Shared.Components.Grids
{ {
public class GridDataItemChangingEventArgs<TDataItem> : GridDataItemChangedEventArgs<TDataItem> where TDataItem : class, IId<Guid>
{
internal GridDataItemChangingEventArgs(TiamGrid<TDataItem> grid, TDataItem dataItem, DataChangeMode dataChangeMode) : base(grid, dataItem, dataChangeMode)
{ }
public bool IsCanceled { get; set; }
}
public class GridDataItemChangedEventArgs<TDataItem> where TDataItem : class, IId<Guid>
{
internal GridDataItemChangedEventArgs(TiamGrid<TDataItem> grid, TDataItem dataItem, DataChangeMode dataChangeMode)
{
Grid = grid;
DataItem = dataItem;
DataChangeMode = dataChangeMode;
}
public TiamGrid<TDataItem> Grid { get; }
public TDataItem DataItem { get; }
public DataChangeMode DataChangeMode { get; }
}
public class TiamGrid<TDataItem> : DxGrid where TDataItem : class, IId<Guid> public class TiamGrid<TDataItem> : DxGrid where TDataItem : class, IId<Guid>
{ {
protected bool IsFirstInitializeParameters; protected bool IsFirstInitializeParameters;
private IList<TDataItem> _dataSource = null!; private SignalRDataSource<TDataItem> _dataSource = null!;
private IList<TDataItem> _dataSourceParam = [];
private string _gridLogName; private string _gridLogName;
public TiamGrid() : base() public TiamGrid() : base()
{ } {
}
[Parameter] public LoggerClient Logger { get; set; } [Parameter] public LoggerClient Logger { get; set; }
[Parameter] public string GridName { get; set; } [Parameter] public string GridName { get; set; }
@ -56,14 +37,19 @@ namespace TIAMSharedUI.Shared.Components.Grids
[Parameter] public int RemoveMessageTag { get; set; } [Parameter] public int RemoveMessageTag { get; set; }
protected new EventCallback<GridDataItemDeletingEventArgs> DataItemDeleting { get; set; } protected new EventCallback<GridDataItemDeletingEventArgs> DataItemDeleting { get; set; }
[Parameter] public EventCallback<GridDataItemDeletingEventArgs> OnDataItemDeleting{ get; set; } [Parameter] public EventCallback<GridDataItemDeletingEventArgs> OnGridItemDeleting { get; set; }
protected new EventCallback<GridEditModelSavingEventArgs> EditModelSaving { get; set; } protected new EventCallback<GridEditModelSavingEventArgs> EditModelSaving { get; set; }
[Parameter] public EventCallback<GridEditModelSavingEventArgs> OnEditModelSaving { get; set; } [Parameter] public EventCallback<GridEditModelSavingEventArgs> OnGridEditModelSaving { get; set; }
[Parameter] public EventCallback<IList<TDataItem>> OnDataSourceChanged { get; set; } [Parameter] public EventCallback<IList<TDataItem>> OnDataSourceChanged { get; set; }
[Parameter] public EventCallback<GridDataItemChangingEventArgs<TDataItem>> OnDataItemChanging { get; set; } [Parameter] public EventCallback<GridDataItemChangingEventArgs<TDataItem>> OnGridItemChanging { get; set; }
[Parameter] public EventCallback<GridDataItemChangedEventArgs<TDataItem>> OnDataItemChanged { get; set; }
/// <summary>
/// After the server has responded!
/// </summary>
[Parameter]
public EventCallback<GridDataItemChangedEventArgs<TDataItem>> OnGridItemChanged { get; set; }
[Parameter] [Parameter]
[DefaultValue(null)] [DefaultValue(null)]
@ -80,28 +66,49 @@ namespace TIAMSharedUI.Shared.Components.Grids
return _dataSource!; return _dataSource!;
} }
set set => _dataSourceParam = value;
{
if (value == null) throw new ArgumentNullException(nameof(value));
var equals = Equals(_dataSource, value);
_dataSource = value;
Data = _dataSource;
if (!equals) OnDataSourceChanged.InvokeAsync(_dataSource);
}
} }
protected override void OnInitialized() protected override async Task OnInitializedAsync()
{ {
if (Logger == null) if (Logger == null)
throw new NullReferenceException($"[{GetType().Name}] Logger == null"); throw new NullReferenceException($"[{GetType().Name}] Logger == null");
if (SignalRClient == null) if (SignalRClient == null)
{
Logger.Error($"[{GetType().Name}] SignalRClient == null"); Logger.Error($"[{GetType().Name}] SignalRClient == null");
throw new NullReferenceException($"[{GetType().Name}] SignalRClient == null");
}
base.OnInitialized(); var crudTags = new SignalRCrudTags(GetAllMessageTag, SignalRTags.None, AddMessageTag, UpdateMessageTag, RemoveMessageTag);
_dataSource = new SignalRDataSource<TDataItem>(SignalRClient, crudTags, ContextId);
Data = _dataSource;
_dataSource.OnDataSourceLoaded += OnDataSourceLoaded;
_dataSource.OnDataSourceItemChanged += OnDataSourceItemChanged;
await base.OnInitializedAsync();
}
private async Task OnDataSourceItemChanged(ItemChangedEventArgs<TDataItem> args)
{
if (args.TrackingState is TrackingState.GetAll or TrackingState.None) return;
Logger.Debug($"{_gridLogName} OnDataSourceItemChanged; trackingState: {args.TrackingState}");
var changedEventArgs = new GridDataItemChangedEventArgs<TDataItem>(this, args.Item, args.TrackingState);
await OnGridItemChanged.InvokeAsync(changedEventArgs);
await InvokeAsync(StateHasChanged);
}
private Task OnDataSourceLoaded()
{
Logger.Debug($"{_gridLogName} OnDataSourceLoaded");
Reload();
return OnDataSourceChanged.InvokeAsync(_dataSource);
} }
protected override async Task OnAfterRenderAsync(bool firstRender) protected override async Task OnAfterRenderAsync(bool firstRender)
@ -110,35 +117,35 @@ namespace TIAMSharedUI.Shared.Components.Grids
if (firstRender) if (firstRender)
{ {
if (_dataSource == null || _dataSource.Count == 0) RefreshDataSourceAsync().Forget(); if (_dataSourceParam.Count > 0) await _dataSource.LoadDataSource(_dataSourceParam);
else _dataSource.LoadDataSourceAsync(true).Forget();
} }
} }
public Task AddDataItem(TDataItem dataItem) => AddDataItem(dataItem, AddMessageTag); public Task AddDataItem(TDataItem dataItem)
public Task AddDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, DataChangeMode.Add);
public Task UpdateDataItem(TDataItem dataItem) => UpdateDataItem(dataItem, UpdateMessageTag);
public Task UpdateDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, DataChangeMode.Update);
public Task RemoveDataItem(TDataItem dataItem) => RemoveDataItem(dataItem, RemoveMessageTag);
public Task RemoveDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, DataChangeMode.Remove);
public Task RemoveDataItem(Guid id) => RemoveDataItem(id, RemoveMessageTag);
public Task RemoveDataItem(Guid id, int messageTag)
{ {
var dataItem = _dataSource.FirstOrDefault(x => x.Id == id); if (dataItem.Id.IsNullOrEmpty()) dataItem.Id = Guid.NewGuid();
return _dataSource.Add(dataItem, true);
}
return dataItem == null ? Task.CompletedTask : RemoveDataItem(dataItem); public Task AddDataItemAsync(TDataItem dataItem)
{
if (dataItem.Id.IsNullOrEmpty()) dataItem.Id = Guid.NewGuid();
_dataSource.Add(dataItem);
return SaveChangesToServerAsync();
} }
private async Task OnItemSaving(GridEditModelSavingEventArgs e) private async Task OnItemSaving(GridEditModelSavingEventArgs e)
{ {
var dataItem = (e.EditModel as TDataItem)!; var dataItem = (e.EditModel as TDataItem)!;
var logText = e.IsNew ? "add" : "update"; if (e.IsNew && dataItem.Id.IsNullOrEmpty()) dataItem.Id = Guid.NewGuid();
Logger.Info($"{_gridLogName} OnItemSaving {logText}; Id: {dataItem.Id}");
await OnEditModelSaving.InvokeAsync(e); var logText = e.IsNew ? "add" : "update";
Logger.Debug($"{_gridLogName} OnItemSaving {logText}; Id: {dataItem.Id}");
await OnGridEditModelSaving.InvokeAsync(e);
if (e.Cancel) if (e.Cancel)
{ {
@ -146,79 +153,70 @@ namespace TIAMSharedUI.Shared.Components.Grids
return; return;
} }
if (e.IsNew) await AddDataItem(dataItem); if (e.IsNew) await AddDataItemAsync(dataItem);
else await UpdateDataItem(dataItem); else await UpdateDataItemAsync(dataItem);
}
private Task SaveChangesToServerAsync()
{
try
{
return _dataSource.SaveChangesAsync();
}
catch (Exception ex)
{
Logger.Error($"{_gridLogName} SaveChangesToServerAsync->SaveChangesAsync error!", ex);
}
return Task.CompletedTask;
}
private async Task<bool> SaveChangesToServer()
{
var result = false;
try
{
var unsavedItems = await _dataSource.SaveChanges();
if ((result = unsavedItems.Count == 0) == false)
Logger.Error($"{_gridLogName} SaveChangesToServer->SaveChanges error! unsavedCount: {unsavedItems.Count}");
}
catch (Exception ex)
{
Logger.Error($"{_gridLogName} OnItemSaving", ex);
}
return result;
} }
private async Task OnItemDeleting(GridDataItemDeletingEventArgs e) private async Task OnItemDeleting(GridDataItemDeletingEventArgs e)
{ {
Logger.Info($"{_gridLogName} OnItemDeleting"); Logger.Debug($"{_gridLogName} OnItemDeleting");
await OnDataItemDeleting.InvokeAsync(e); await OnGridItemDeleting.InvokeAsync(e);
if (e.Cancel) if (e.Cancel)
{ {
Logger.Debug($"{_gridLogName} OnItemDeleting canceled"); Logger.Debug($"{_gridLogName} OnItemDeleting canceled");
return; return;
} }
var dataItem = (e.DataItem as TDataItem)!; var dataItem = (e.DataItem as TDataItem)!;
await RemoveDataItem(dataItem); await RemoveDataItem(dataItem);
} }
public virtual Task RefreshDataSourceAsync() private void OnCustomizeElement(GridCustomizeElementEventArgs e)
{ {
if (GetAllMessageTag == 0) return Task.CompletedTask; if (e.ElementType == GridElementType.DetailCell)
Logger.Info($"{_gridLogName} RefreshDataSourceAsync called");
return SignalRClient.GetAllAsync<IList<TDataItem>>(GetAllMessageTag, ContextId, response =>
{ {
if (response.Status == SignalResponseStatus.Error) e.Style = "padding: 0.5rem; opacity: 0.75";
return;
BeginUpdate();
DataSource = response.ResponseData ?? [];
EndUpdate();
InvokeAsync(StateHasChanged).Forget();
});
}
protected virtual async Task PostDataToServerAsync(TDataItem dataItem, int messageTag, DataChangeMode dataChangeMode)
{
var eventArgs = new GridDataItemChangingEventArgs<TDataItem>(this, dataItem, dataChangeMode);
await OnDataItemChanging.InvokeAsync(eventArgs);
if (eventArgs.IsCanceled)
{
Logger.Debug($"{_gridLogName} OnDataItemChanging canceled");
return;
} }
else if (false && e.ElementType == GridElementType.DataCell && e.Column.Name == nameof(IId<Guid>.Id))
if (messageTag == 0) return;
Logger.Info($"{_gridLogName} PostDataToServerAsync called; transferId " + dataItem.Id);
if (dataItem.Id.IsNullOrEmpty()) dataItem.Id = Guid.NewGuid();
_dataSource.UpdateCollection(dataItem, dataChangeMode == DataChangeMode.Remove); //egyből látszódik a változás a grid-ben, nem csak a callback lefutásakor! felhasználóbarátabb... - J.
SignalRClient.PostDataAsync(messageTag, dataItem, async repsonse =>
{ {
if (repsonse.Status != SignalResponseStatus.Success || repsonse.ResponseData == null) e.Column.Visible = AcDomain.IsDeveloperVersion;
{ e.Column.ShowInColumnChooser = AcDomain.IsDeveloperVersion;
RefreshDataSourceAsync().Forget(); }
return;
}
_dataSource.UpdateCollection(repsonse.ResponseData, dataChangeMode == DataChangeMode.Remove);
await OnDataItemChanged.InvokeAsync(eventArgs);
InvokeAsync(StateHasChanged).Forget();
}).Forget();
//transfer = await devAdminSignalClient.PostDataAsync(SignalRTags.UpdateTransferAsync, transfer);
} }
protected override Task SetParametersAsyncCore(ParameterView parameters) protected override Task SetParametersAsyncCore(ParameterView parameters)
@ -227,7 +225,9 @@ namespace TIAMSharedUI.Shared.Components.Grids
{ {
base.DataItemDeleting = EventCallback.Factory.Create<GridDataItemDeletingEventArgs>(this, OnItemDeleting); base.DataItemDeleting = EventCallback.Factory.Create<GridDataItemDeletingEventArgs>(this, OnItemDeleting);
base.EditModelSaving = EventCallback.Factory.Create<GridEditModelSavingEventArgs>(this, OnItemSaving); base.EditModelSaving = EventCallback.Factory.Create<GridEditModelSavingEventArgs>(this, OnItemSaving);
CustomizeElement += OnCustomizeElement;
//ShowFilterRow = true; //ShowFilterRow = true;
//PageSize = 4; //PageSize = 4;
//ShowGroupPanel = true; //ShowGroupPanel = true;
@ -235,7 +235,6 @@ namespace TIAMSharedUI.Shared.Components.Grids
TextWrapEnabled = false; TextWrapEnabled = false;
//var columns = GetColumns();
//var dataColumns = GetDataColumns(); //var dataColumns = GetDataColumns();
//var idColumn = dataColumns.FirstOrDefault(x => x.FieldName == nameof(IId<Guid>.Id)); //var idColumn = dataColumns.FirstOrDefault(x => x.FieldName == nameof(IId<Guid>.Id));
@ -251,6 +250,7 @@ namespace TIAMSharedUI.Shared.Components.Grids
return base.SetParametersAsyncCore(parameters); return base.SetParametersAsyncCore(parameters);
} }
protected override void OnParametersSet() protected override void OnParametersSet()
{ {
base.OnParametersSet(); base.OnParametersSet();
@ -260,5 +260,54 @@ namespace TIAMSharedUI.Shared.Components.Grids
_gridLogName = $"[{GridName}]"; _gridLogName = $"[{GridName}]";
} }
//public Task AddDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, TrackingState.Add);
public Task UpdateDataItem(TDataItem dataItem) => _dataSource.Update(dataItem, true);
public Task UpdateDataItemAsync(TDataItem dataItem)
{
_dataSource.Update(dataItem, false);
return SaveChangesToServerAsync();
}
//public Task UpdateDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, TrackingState.Update);
public Task AddOrUpdateDataItem(TDataItem dataItem) => _dataSource.AddOrUpdate(dataItem, true);
public Task RemoveDataItem(TDataItem dataItem) => _dataSource.Remove(dataItem, true);
//public Task RemoveDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, TrackingState.Remove);
public Task RemoveDataItem(Guid id) => RemoveDataItem(id, RemoveMessageTag);
public Task RemoveDataItem(Guid id, int messageTag)
{
var dataItem = _dataSource.FirstOrDefault(x => x.Id == id);
if (dataItem == null) return Task.CompletedTask;
return _dataSource.Remove(dataItem, true);
}
}
public class GridDataItemChangingEventArgs<TDataItem> : GridDataItemChangedEventArgs<TDataItem> where TDataItem : class, IId<Guid>
{
internal GridDataItemChangingEventArgs(TiamGrid<TDataItem> grid, TDataItem dataItem, TrackingState trackingState) : base(grid, dataItem, trackingState)
{
}
public bool IsCanceled { get; set; }
}
public class GridDataItemChangedEventArgs<TDataItem> where TDataItem : class, IId<Guid>
{
internal GridDataItemChangedEventArgs(TiamGrid<TDataItem> grid, TDataItem dataItem, TrackingState trackingState)
{
Grid = grid;
DataItem = dataItem;
TrackingState = trackingState;
}
public TiamGrid<TDataItem> Grid { get; }
public TDataItem DataItem { get; }
public TrackingState TrackingState { get; }
} }
} }

40
TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs
View File

@ -30,9 +30,9 @@ namespace TIAMWebApp.Server.Controllers
[NonAction] [NonAction]
[ApiExplorerSettings(IgnoreApi = true)] [ApiExplorerSettings(IgnoreApi = true)]
private async Task<bool> CompanyDataChanging(Company company, DataChangeMode dataChangeMode) private async Task<bool> CompanyDataChanging(Company company, TrackingState trackingState)
{ {
var logText = $"[{dataChangeMode.ToString().ToUpper()}] CompanyDataChanging called; Id: {company.Id}; OwnerId: {company.OwnerId}; Name: {company.Name}"; var logText = $"[{trackingState.ToString().ToUpper()}] CompanyDataChanging called; Id: {company.Id}; OwnerId: {company.OwnerId}; Name: {company.Name}";
if (company.Name.IsNullOrEmpty()) if (company.Name.IsNullOrEmpty())
{ {
@ -42,9 +42,9 @@ namespace TIAMWebApp.Server.Controllers
_logger.Info(logText); _logger.Info(logText);
switch (dataChangeMode) switch (trackingState)
{ {
case DataChangeMode.Add: case TrackingState.Add:
if (company.Id.IsNullOrEmpty()) company.Id = Guid.NewGuid(); if (company.Id.IsNullOrEmpty()) company.Id = Guid.NewGuid();
//if (company.OwnerId.IsNullOrEmpty()) company.OwnerId = Guid.Parse("540271F6-C604-4C16-8160-D5A7CAFEDF00"); //TESZT - J. //if (company.OwnerId.IsNullOrEmpty()) company.OwnerId = Guid.Parse("540271F6-C604-4C16-8160-D5A7CAFEDF00"); //TESZT - J.
@ -54,13 +54,13 @@ namespace TIAMWebApp.Server.Controllers
return await adminDal.CreateServiceProviderAsync(company); return await adminDal.CreateServiceProviderAsync(company);
case DataChangeMode.Update: case TrackingState.Update:
return await adminDal.UpdateCompanyAsync(company); return await adminDal.UpdateCompanyAsync(company);
case DataChangeMode.Remove: case TrackingState.Remove:
return await adminDal.RemoveCompanyAsync(company); return await adminDal.RemoveCompanyAsync(company);
default: default:
throw new ArgumentOutOfRangeException(nameof(dataChangeMode), dataChangeMode, null); throw new ArgumentOutOfRangeException(nameof(trackingState), trackingState, null);
} }
} }
@ -68,21 +68,21 @@ namespace TIAMWebApp.Server.Controllers
[ApiExplorerSettings(IgnoreApi = true)] [ApiExplorerSettings(IgnoreApi = true)]
[SignalR(SignalRTags.AddCompany)] [SignalR(SignalRTags.AddCompany)]
public async Task<string> AddCompanyAsync(Company company) public async Task<string> AddCompanyAsync(Company company)
=> await CompanyDataChanging(company, DataChangeMode.Add) ? company.ToJson() : string.Empty; => await CompanyDataChanging(company, TrackingState.Add) ? company.ToJson() : string.Empty;
[AllowAnonymous] [AllowAnonymous]
[HttpPost] [HttpPost]
[Route(APIUrls.UpdateServiceProviderRouteName)] [Route(APIUrls.UpdateServiceProviderRouteName)]
[SignalR(SignalRTags.UpdateCompany)] [SignalR(SignalRTags.UpdateCompany)]
public async Task<string> UpdateServiceProvider(Company company) public async Task<string> UpdateServiceProvider(Company company)
=> await CompanyDataChanging(company, DataChangeMode.Update) ? company.ToJson() : string.Empty; => await CompanyDataChanging(company, TrackingState.Update) ? company.ToJson() : string.Empty;
[AllowAnonymous] [AllowAnonymous]
[HttpPost] [HttpPost]
[Route(APIUrls.RemoveServiceProviderRouteName)] [Route(APIUrls.RemoveServiceProviderRouteName)]
[SignalR(SignalRTags.RemoveCompany)] [SignalR(SignalRTags.RemoveCompany)]
public async Task<string> RemoveServiceProvider(Company company) public async Task<string> RemoveServiceProvider(Company company)
=> await CompanyDataChanging(company, DataChangeMode.Remove) ? company.ToJson() : string.Empty; => await CompanyDataChanging(company, TrackingState.Remove) ? company.ToJson() : string.Empty;
//15. //15.
[AllowAnonymous] [AllowAnonymous]
@ -220,9 +220,9 @@ namespace TIAMWebApp.Server.Controllers
[NonAction] [NonAction]
[ApiExplorerSettings(IgnoreApi = true)] [ApiExplorerSettings(IgnoreApi = true)]
private async Task<bool> CarDataChanging(Car car, DataChangeMode dataChangeMode) private async Task<bool> CarDataChanging(Car car, TrackingState trackingState)
{ {
var logText = $"[{dataChangeMode.ToString().ToUpper()}] CarDataChanging called; Id: {car.Id}; OwnerId: {car.UserProductMappingId}; LicensePlate: {car.LicencePlate}"; var logText = $"[{trackingState.ToString().ToUpper()}] CarDataChanging called; Id: {car.Id}; OwnerId: {car.UserProductMappingId}; LicensePlate: {car.LicencePlate}";
if (car.UserProductMappingId.IsNullOrEmpty() || car.LicencePlate.IsNullOrWhiteSpace()) if (car.UserProductMappingId.IsNullOrEmpty() || car.LicencePlate.IsNullOrWhiteSpace())
{ {
@ -232,19 +232,19 @@ namespace TIAMWebApp.Server.Controllers
_logger.Info(logText); _logger.Info(logText);
switch (dataChangeMode) switch (trackingState)
{ {
case DataChangeMode.Add: case TrackingState.Add:
if (car.Id.IsNullOrEmpty()) car.Id = Guid.NewGuid(); if (car.Id.IsNullOrEmpty()) car.Id = Guid.NewGuid();
return await adminDal.AddCarAsync(car); return await adminDal.AddCarAsync(car);
case DataChangeMode.Update: case TrackingState.Update:
return await adminDal.UpdateCarAsync(car); return await adminDal.UpdateCarAsync(car);
case DataChangeMode.Remove: case TrackingState.Remove:
return await adminDal.RemoveCarAsync(car); return await adminDal.RemoveCarAsync(car);
default: default:
throw new ArgumentOutOfRangeException(nameof(dataChangeMode), dataChangeMode, null); throw new ArgumentOutOfRangeException(nameof(trackingState), trackingState, null);
} }
} }
@ -255,7 +255,7 @@ namespace TIAMWebApp.Server.Controllers
[EndpointSummary("Create car")] [EndpointSummary("Create car")]
[SignalR(SignalRTags.CreateCar)] [SignalR(SignalRTags.CreateCar)]
public async Task<IActionResult> CreateCar(Car car) public async Task<IActionResult> CreateCar(Car car)
=> await CarDataChanging(car, DataChangeMode.Add) ? Ok(car) : BadRequest("Invalid request"); => await CarDataChanging(car, TrackingState.Add) ? Ok(car) : BadRequest("Invalid request");
[AllowAnonymous] [AllowAnonymous]
[HttpPost] [HttpPost]
@ -264,7 +264,7 @@ namespace TIAMWebApp.Server.Controllers
[EndpointSummary("Update car")] [EndpointSummary("Update car")]
[SignalR(SignalRTags.UpdateCar)] [SignalR(SignalRTags.UpdateCar)]
public async Task<IActionResult> UpdateCar(Car car) public async Task<IActionResult> UpdateCar(Car car)
=> await CarDataChanging(car, DataChangeMode.Update) ? Ok(car) : BadRequest("Invalid request"); => await CarDataChanging(car, TrackingState.Update) ? Ok(car) : BadRequest("Invalid request");
[AllowAnonymous] [AllowAnonymous]
[HttpPost] [HttpPost]
@ -273,7 +273,7 @@ namespace TIAMWebApp.Server.Controllers
[EndpointSummary("Delete car")] [EndpointSummary("Delete car")]
[SignalR(SignalRTags.DeleteCar)] [SignalR(SignalRTags.DeleteCar)]
public async Task<IActionResult> DeleteCar(Car car) public async Task<IActionResult> DeleteCar(Car car)
=> await CarDataChanging(car, DataChangeMode.Remove) ? Ok(car) : BadRequest("Invalid request"); => await CarDataChanging(car, TrackingState.Remove) ? Ok(car) : BadRequest("Invalid request");
[HttpPost] [HttpPost]
[Route(APIUrls.AddProductRouteName)] [Route(APIUrls.AddProductRouteName)]

13
TIAMWebApp/Server/Services/DevAdminSignalRhub.cs
View File

@ -14,6 +14,10 @@ using System.Runtime.CompilerServices;
using MessagePack; using MessagePack;
using TIAM.Entities.Addresses; using TIAM.Entities.Addresses;
using TIAM.Entities.Profiles; using TIAM.Entities.Profiles;
using Microsoft.AspNetCore.Hosting;
using System.Collections.Generic;
using TIAM.Entities.Emails;
using TIAM.Services.Server;
namespace TIAMWebApp.Server.Services; namespace TIAMWebApp.Server.Services;
@ -57,7 +61,11 @@ public class DynamicMethodCallModel<TAttribute> where TAttribute : TagAttribute
public object InstanceObject { get; init; } public object InstanceObject { get; init; }
public ConcurrentDictionary<int, MethodInfoModel<TAttribute>> MethodsByMessageTag { get; init; } = new(); public ConcurrentDictionary<int, MethodInfoModel<TAttribute>> MethodsByMessageTag { get; init; } = new();
public DynamicMethodCallModel(Type instanceObjectType) : this(Activator.CreateInstance(instanceObjectType)!)
public DynamicMethodCallModel(Type instanceObjectType) : this(instanceObjectType, null!)
{ }
public DynamicMethodCallModel(Type instanceObjectType, params object[] constructorParams) : this(Activator.CreateInstance(instanceObjectType, constructorParams)!)
{ } { }
public DynamicMethodCallModel(object instanceObject) public DynamicMethodCallModel(object instanceObject)
@ -75,7 +83,7 @@ public class DynamicMethodCallModel<TAttribute> where TAttribute : TagAttribute
public class DevAdminSignalRHub : Hub<ISignalRHubItemServer>, IAcSignalRHubServer public class DevAdminSignalRHub : Hub<ISignalRHubItemServer>, IAcSignalRHubServer
{ {
private readonly List<DynamicMethodCallModel<SignalRAttribute>> _dynamicMethodCallModels = new(); private readonly List<DynamicMethodCallModel<SignalRAttribute>> _dynamicMethodCallModels = [];
private readonly TIAM.Core.Loggers.Logger<DevAdminSignalRHub> _logger; private readonly TIAM.Core.Loggers.Logger<DevAdminSignalRHub> _logger;
private readonly AdminDal _adminDal; private readonly AdminDal _adminDal;
@ -93,6 +101,7 @@ public class DevAdminSignalRHub : Hub<ISignalRHubItemServer>, IAcSignalRHubServe
_dynamicMethodCallModels.Add(new DynamicMethodCallModel<SignalRAttribute>(serviceProviderApiController)); _dynamicMethodCallModels.Add(new DynamicMethodCallModel<SignalRAttribute>(serviceProviderApiController));
_dynamicMethodCallModels.Add(new DynamicMethodCallModel<SignalRAttribute>(transferDataApiController)); _dynamicMethodCallModels.Add(new DynamicMethodCallModel<SignalRAttribute>(transferDataApiController));
_dynamicMethodCallModels.Add(new DynamicMethodCallModel<SignalRAttribute>(messageApiController)); _dynamicMethodCallModels.Add(new DynamicMethodCallModel<SignalRAttribute>(messageApiController));
//_dynamicMethodCallModels.Add(new DynamicMethodCallModel<SignalRAttribute>(typeof(AdminDal)));
} }

17
TIAMWebApp/Shared/Services/AcSignalRClientBase.cs
View File

@ -2,6 +2,7 @@
using AyCode.Core; using AyCode.Core;
using AyCode.Core.Extensions; using AyCode.Core.Extensions;
using AyCode.Core.Helpers; using AyCode.Core.Helpers;
using AyCode.Core.Interfaces;
using AyCode.Services.Loggers; using AyCode.Services.Loggers;
using AyCode.Services.SignalRs; using AyCode.Services.SignalRs;
using MessagePack.Resolvers; using MessagePack.Resolvers;
@ -75,9 +76,6 @@ namespace TIAMWebApp.Shared.Application.Services
public virtual Task SendMessageToServerAsync(int messageTag) public virtual Task SendMessageToServerAsync(int messageTag)
=> SendMessageToServerAsync(messageTag, null, AcDomain.NextUniqueInt32); => SendMessageToServerAsync(messageTag, null, AcDomain.NextUniqueInt32);
public virtual Task SendMessageToServerAsync(int messageTag, int requestId)
=> SendMessageToServerAsync(messageTag, null, requestId);
public virtual async Task SendMessageToServerAsync(int messageTag, ISignalRMessage? message, int? requestId) public virtual async Task SendMessageToServerAsync(int messageTag, ISignalRMessage? message, int? requestId)
{ {
Logger.DebugConditional($"Client SendMessageToServerAsync; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};"); Logger.DebugConditional($"Client SendMessageToServerAsync; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};");
@ -89,18 +87,21 @@ namespace TIAMWebApp.Shared.Application.Services
} }
#region CRUD #region CRUD
public virtual Task<TResponse?> GetByIdAsync<TResponse>(int messageTag, Guid id) where TResponse : class public virtual Task<TResponseData?> GetByIdAsync<TResponseData>(int messageTag, Guid id) where TResponseData : class
=> SendMessageToServerAsync<TResponse>(messageTag, new SignalPostJsonDataMessage<IdMessage>(new IdMessage(id)), AcDomain.NextUniqueInt32); => SendMessageToServerAsync<TResponseData>(messageTag, new SignalPostJsonDataMessage<IdMessage>(new IdMessage(id)), AcDomain.NextUniqueInt32);
public virtual Task GetByIdAsync<TResponseData>(int messageTag, Guid id, Action<ISignalResponseMessage<TResponseData?>> responseCallback) public virtual Task GetByIdAsync<TResponseData>(int messageTag, Guid id, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
=> SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage<IdMessage>(new IdMessage(id)), responseCallback); => SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage<IdMessage>(new IdMessage(id)), responseCallback);
public virtual Task<TResponse?> GetAllAsync<TResponse>(int messageTag) where TResponse : class public virtual Task<TResponseData?> GetAllAsync<TResponseData>(int messageTag) where TResponseData : class
=> SendMessageToServerAsync<TResponse>(messageTag); => SendMessageToServerAsync<TResponseData>(messageTag);
public virtual Task GetAllAsync<TResponseData>(int messageTag, Action<ISignalResponseMessage<TResponseData?>> responseCallback) public virtual Task GetAllAsync<TResponseData>(int messageTag, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
=> SendMessageToServerAsync(messageTag, null, responseCallback); => SendMessageToServerAsync(messageTag, null, responseCallback);
public virtual Task GetAllAsync<TResponseData>(int messageTag, Guid? contextId, Action<ISignalResponseMessage<TResponseData?>> responseCallback) public virtual Task GetAllAsync<TResponseData>(int messageTag, Guid? contextId, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
=> SendMessageToServerAsync(messageTag, (contextId.IsNullOrEmpty() ? null : new SignalPostJsonDataMessage<IdMessage>(new IdMessage(contextId.Value))), responseCallback); => SendMessageToServerAsync(messageTag, (contextId.IsNullOrEmpty() ? null : new SignalPostJsonDataMessage<IdMessage>(new IdMessage(contextId.Value))), responseCallback);
public virtual Task<TResponseData?> GetAllAsync<TResponseData>(int messageTag, Guid? contextId) where TResponseData : class
=> SendMessageToServerAsync<TResponseData>(messageTag, contextId.IsNullOrEmpty() ? null : new SignalPostJsonDataMessage<IdMessage>(new IdMessage(contextId.Value)), AcDomain.NextUniqueInt32);
public virtual Task<TPostData?> PostDataAsync<TPostData>(int messageTag, TPostData postData) where TPostData : class public virtual Task<TPostData?> PostDataAsync<TPostData>(int messageTag, TPostData postData) where TPostData : class
=> SendMessageToServerAsync<TPostData>(messageTag, new SignalPostJsonDataMessage<TPostData>(postData), AcDomain.NextUniqueInt32); => SendMessageToServerAsync<TPostData>(messageTag, new SignalPostJsonDataMessage<TPostData>(postData), AcDomain.NextUniqueInt32);
public virtual Task PostDataAsync<TPostData>(int messageTag, TPostData postData, Action<ISignalResponseMessage<TPostData?>> responseCallback) where TPostData : class public virtual Task PostDataAsync<TPostData>(int messageTag, TPostData postData, Action<ISignalResponseMessage<TPostData?>> responseCallback) where TPostData : class
@ -114,7 +115,7 @@ namespace TIAMWebApp.Shared.Application.Services
public virtual Task<TResponse?> SendMessageToServerAsync<TResponse>(int messageTag, ISignalRMessage? message) where TResponse : class public virtual Task<TResponse?> SendMessageToServerAsync<TResponse>(int messageTag, ISignalRMessage? message) where TResponse : class
=> SendMessageToServerAsync<TResponse>(messageTag, message, AcDomain.NextUniqueInt32); => SendMessageToServerAsync<TResponse>(messageTag, message, AcDomain.NextUniqueInt32);
public virtual async Task<TResponse?> SendMessageToServerAsync<TResponse>(int messageTag, ISignalRMessage? message, int requestId) where TResponse : class protected virtual async Task<TResponse?> SendMessageToServerAsync<TResponse>(int messageTag, ISignalRMessage? message, int requestId) where TResponse : class
{ {
Logger.DebugConditional($"Client SendMessageToServerAsync<TResult>; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};"); Logger.DebugConditional($"Client SendMessageToServerAsync<TResult>; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};");

1034
TIAMWebApp/Shared/Utility/SignalRDataSource.cs Normal file
View File

File diff suppressed because it is too large Load Diff

104
TIAMWebApp/Shared/Utility/SignalRDataSourceAsync.cs Normal file
View File

@ -0,0 +1,104 @@
using System.Diagnostics;
using AyCode.Core.Enums;
using AyCode.Core.Helpers;
using AyCode.Core.Interfaces;
using AyCode.Services.SignalRs;
using TIAM.Services;
using TIAMWebApp.Shared.Application.Services;
namespace TIAMWebApp.Shared.Application.Utility;
[Serializable]
[DebuggerDisplay("Count = {Count}")]
public class SignalRDataSourceAsync<T> : SignalRDataSource<T> where T : class, IId<Guid>
{
public Action<ItemChangedEventArgs<T>>? OnItemChanged;
public Action<SignalRDataSourceAsync<T>>? OnDataSourceLoaded;
public SignalRDataSourceAsync(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, Guid? contextId = null, Action<SignalRDataSourceAsync<T>>? onDataSourceLoaded = null, bool autoLoadDataSource = false)
: base(signalRClient, signalRCrudTags, contextId)
{
OnDataSourceLoaded = onDataSourceLoaded;
if (autoLoadDataSource) LoadDataSourceAsync();
}
public void LoadDataSourceAsync(bool clearChangeTracking = true)
{
if (SignalRCrudTags.GetAllMessageTag == SignalRTags.None) throw new ArgumentException($"_signalRCrudTags.GetAllMessageTag == SignalRTags.None;");
//Monitor.Exit(SyncRoot); //Exception test - J.
//Monitor.Enter(SyncRoot);
//try
//{
// SignalRClient.GetAllAsync<List<T>>(SignalRCrudTags.GetAllMessageTag, ContextId, response =>
// {
// try
// {
// if (response.Status == SignalResponseStatus.Error) throw new Exception($"LoadDataSourceAsync; response.Status == SignalResponseStatus.Error");
// if (response.ResponseData == null) throw new NullReferenceException($"response.ResponseData == null");
// Clear(clearChangeTracking);
// InnerList.AddRange(response.ResponseData);
// }
// finally
// {
// Monitor.Exit(SyncRoot);
// }
// OnDataSourceLoaded?.Invoke(this);
// }).Forget();
//}
//catch (Exception)
//{
// Monitor.Exit(SyncRoot);
// throw;
//}
}
//public T Add(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Add).GetAwaiter().GetResult();
//public Task AddAsync(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Add);
//public Task UpdateAsync(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Update);
//public Task RemoveAsync(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Remove);
//public Task RemoveAsync(Guid id, int messageTag)
//{
// var item = _list.FirstOrDefault(x => x.Id == id);
// return item == null ? Task.CompletedTask : RemoveAsync(item, messageTag);
//}
//protected virtual Task PostDataToServerAsync(T item, int messageTag, TrackingState trackingState)
//{
// if (messageTag == 0) return Task.CompletedTask;
// logger.Info($"{_listLogName} PostDataToServerAsync called; transferId " + item.Id);
// if (item.Id.IsNullOrEmpty()) item.Id = Guid.NewGuid();
// _list.UpdateCollection(item, trackingState == TrackingState.Remove); //egyből látszódik a változás a grid-ben, nem csak a callback lefutásakor! felhasználóbarátabb... - J.
// await _signalRClient.PostDataAsync(messageTag, item, async repsonse =>
// {
// if (repsonse.Status != SignalResponseStatus.Success || repsonse.ResponseData == null)
// {
// RefreshDataSourceAsync().Forget();
// return;
// }
// _list.UpdateCollection(repsonse.ResponseData, trackingState == TrackingState.Remove);
// var eventArgs = new ItemChangedEventArgs<T>(repsonse.ResponseData, trackingState);
// OnItemChanged.Invoke(eventArgs);
// });
// //transfer = await devAdminSignalClient.PostDataAsync(SignalRTags.UpdateTransferAsync, transfer);
// return Task.CompletedTask;
//}
}

47
TIAMWebApp/Shared/Utility/TrackingItemHelpers.cs Normal file
View File

@ -0,0 +1,47 @@
using System.Reflection;
using System.Text.Json;
using AyCode.Core.Extensions;
namespace TIAMWebApp.Shared.Application.Utility;
public static class TrackingItemHelpers
{
public static T JsonClone<T>(T source) => source.ToJson().JsonTo<T>()!;
public static T ReflectionClone<T>(T source)
{
var type = source!.GetType();
if (type.IsPrimitive || typeof(string) == type)
return source;
if (type.IsArray)
{
var elementType = Type.GetType(type.FullName!.Replace("[]", string.Empty))!;
var array = (source as Array)!;
var cloned = Array.CreateInstance(elementType, array.Length);
for (var i = 0; i < array.Length; i++)
cloned.SetValue(ReflectionClone(array.GetValue(i)), i);
return (T)Convert.ChangeType(cloned, type);
}
var clone = Activator.CreateInstance(type);
while (type != null && type != typeof(object))
{
foreach (var field in type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance))
{
var fieldValue = field.GetValue(source);
if (fieldValue == null) continue;
field.SetValue(clone, ReflectionClone(fieldValue));
}
type = type.BaseType;
}
return (T)clone!;
}
}