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

Compare commits

base: Adam:4f97dcec4cee8bfcc402f2eedcdf8da50031f6e9
Branches Tags
Adam:master
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:Fullepi_Sandbox
...
compare: Adam:96ccf6d86f5748c6e11efcf0767ca3c39e19033b
Branches Tags
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:master
Adam:Fullepi_Sandbox

2 Commits
4f97dcec4c ... 96ccf6d86f

Author SHA1 Message Date
Loretta 96ccf6d86f SignalRDataSource, TiamGrid imrpovements, fixes... 2024-06-09 11:13:55 +02:00
Loretta b454c51c7b Improvements SignalRDataSource; Clone obejct; etc... 2024-06-07 06:08:49 +02:00
10 changed files with 862 additions and 252 deletions
Show Stats Expand all files Collapse all files

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

@ -82,7 +82,8 @@
</DxGridDataColumn>
<DxGridDataColumn FieldName="Name" MinWidth="80" />
<DxGridDataColumn FieldName="OwnerId" MinWidth="80" />
<DxGridDataColumn FieldName="Created" DisplayFormat="g" Width="140" />
<DxGridDataColumn FieldName="Modified" DisplayFormat="g" Width="140" />
</Columns>
<DetailRowTemplate>
@{
@ -147,19 +148,13 @@
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
await _gridCompany.StartEditRowAsync(0);
}
void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)
{
if (e.IsNew)
{
var newEmployee = (Company)e.EditModel;
newEmployee.Name = "John";
newEmployee.OwnerId = Guid.NewGuid();
newEmployee.AffiliateId = Guid.NewGuid();
}
}

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

@ -26,9 +26,9 @@
DataSource="DataSource"
Logger="_logger"
SignalRClient="AdminSignalRClient"
OnEditModelSaving="DataItemSaving"
OnDataItemDeleting="DataItemDeleting"
OnDataItemChanged="DataItemChanged"
OnGridEditModelSaving="DataItemSaving"
OnGridItemDeleting="DataItemDeleting"
OnGridItemChanged="DataItemChanged"
PageSize="5"
AutoExpandAllGroupRows="true"
KeyboardNavigationEnabled="KeyboardNavigationEnabled"

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

@ -17,6 +17,8 @@
@using AyCode.Core.Extensions
@using AyCode.Core.Consts
@using AyCode.Core
@using AyCode.Core.Helpers
@using TIAM.Entities.Emails
@layout AdminLayout
@inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject IStringLocalizer<TIAMResources> localizer
@ -89,10 +91,10 @@
Logger="_logger"
SignalRClient="AdminSignalRClient"
OnDataSourceChanged="DataSourceChanged"
OnDataItemChanging="DataSourceItemChanging"
OnDataItemChanged="DataSourceItemChanged"
OnDataItemDeleting="DataItemDeleting"
OnEditModelSaving="DataItemSaving"
OnGridItemChanging="DataSourceItemChanging"
OnGridItemChanged="DataSourceItemChanged"
OnGridItemDeleting="DataItemDeleting"
OnGridEditModelSaving="DataItemSaving"
CustomizeElement="Grid_CustomizeElement"
CustomizeEditModel="Grid_CustomizeEditModel"
@ -163,7 +165,18 @@
<DxGridDataColumn FieldName="ContextId" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
<DxGridDataColumn FieldName="EmailAddress" />
<DxGridDataColumn FieldName="Subject" />
<DxGridDataColumn FieldName="Text" />
<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>
@ -396,7 +409,7 @@
{
_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)

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

@ -21,9 +21,9 @@
DataSource="ParentData.TransferToDrivers"
Logger="_logger"
SignalRClient="AdminSignalRClient"
OnEditModelSaving="DataItemSaving"
OnDataItemDeleting="DataItemDeleting"
OnDataItemChanged="DataItemChanged"
OnGridEditModelSaving="DataItemSaving"
OnGridItemDeleting="DataItemDeleting"
OnGridItemChanged="DataItemChanged"
PageSize="5"
AutoExpandAllGroupRows="true"
KeyboardNavigationEnabled="KeyboardNavigationEnabled"
@ -59,7 +59,7 @@
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);
}

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

@ -1,4 +1,5 @@
using System.ComponentModel;
using System.Data.Common;
using AyCode.Core;
using AyCode.Core.Enums;
using AyCode.Core.Extensions;
@ -8,8 +9,10 @@ using AyCode.Interfaces.Entities;
using AyCode.Services.SignalRs;
using AyCode.Utils.Extensions;
using DevExpress.Blazor;
using DevExpress.Blazor.Internal;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using TIAM.Services;
using TIAMWebApp.Shared.Application.Services;
using TIAMWebApp.Shared.Application.Utility;
@ -17,7 +20,7 @@ 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)
internal GridDataItemChangingEventArgs(TiamGrid<TDataItem> grid, TDataItem dataItem, TrackingState trackingState) : base(grid, dataItem, trackingState)
{
}
@ -26,22 +29,23 @@ namespace TIAMSharedUI.Shared.Components.Grids
public class GridDataItemChangedEventArgs<TDataItem> where TDataItem : class, IId<Guid>
{
internal GridDataItemChangedEventArgs(TiamGrid<TDataItem> grid, TDataItem dataItem, DataChangeMode dataChangeMode)
internal GridDataItemChangedEventArgs(TiamGrid<TDataItem> grid, TDataItem dataItem, TrackingState trackingState)
{
Grid = grid;
DataItem = dataItem;
DataChangeMode = dataChangeMode;
TrackingState = trackingState;
}
public TiamGrid<TDataItem> Grid { get; }
public TDataItem DataItem { get; }
public DataChangeMode DataChangeMode { get; }
public TrackingState TrackingState { get; }
}
public class TiamGrid<TDataItem> : DxGrid where TDataItem : class, IId<Guid>
{
protected bool IsFirstInitializeParameters;
private IList<TDataItem> _dataSource = null!;
private SignalRDataSource<TDataItem> _dataSource = null!;
private IList<TDataItem> _dataSourceParam = [];
private string _gridLogName;
public TiamGrid() : base()
@ -60,14 +64,17 @@ namespace TIAMSharedUI.Shared.Components.Grids
[Parameter] public int RemoveMessageTag { 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; }
[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<GridDataItemChangingEventArgs<TDataItem>> OnDataItemChanging { get; set; }
[Parameter] public EventCallback<GridDataItemChangedEventArgs<TDataItem>> OnDataItemChanged { get; set; }
[Parameter] public EventCallback<GridDataItemChangingEventArgs<TDataItem>> OnGridItemChanging { get; set; }
/// <summary>
/// After server response!
/// </summary>
[Parameter] public EventCallback<GridDataItemChangedEventArgs<TDataItem>> OnGridItemChanged { get; set; }
[Parameter]
[DefaultValue(null)]
@ -86,26 +93,65 @@ namespace TIAMSharedUI.Shared.Components.Grids
}
set
{
if (value == null) throw new ArgumentNullException(nameof(value));
if (value == null) return;
_dataSourceParam = value;
var equals = Equals(_dataSource, value);
//bool equals;
_dataSource = value;
Data = _dataSource;
//if ((equals = Equals(_dataSource, value)) == false)
//{
// if (value is SignalRDataSource<TDataItem> dataSource)
// _dataSource = dataSource;
// else
// {
// var crudTags = new SignalRCrudTags(GetAllMessageTag, SignalRTags.None, AddMessageTag, UpdateMessageTag, RemoveMessageTag);
// _dataSource = new SignalRDataSource<TDataItem>(value, SignalRClient, crudTags, ContextId);
// }
//}
if (!equals) OnDataSourceChanged.InvokeAsync(_dataSource);
//Data = _dataSource;
//if (!equals) OnDataSourceChanged.InvokeAsync(_dataSource);
}
}
protected override void OnInitialized()
protected override async Task OnInitializedAsync()
{
if (Logger == null)
throw new NullReferenceException($"[{GetType().Name}] Logger == null");
if (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 Task OnDataSourceItemChanged(ItemChangedEventArgs<TDataItem> args)
{
if (args.TrackingState is TrackingState.GetAll or TrackingState.None) return Task.CompletedTask;
Logger.Info($"{_gridLogName} OnItemLoaded; trackingState: {args.TrackingState}");
var changedEventArgs = new GridDataItemChangedEventArgs<TDataItem>(this, args.Item, args.TrackingState);
return OnGridItemChanged.InvokeAsync(changedEventArgs);
}
private Task OnDataSourceLoaded()
{
Logger.Info($"{_gridLogName} OnDataSourceLoaded");
Reload();
return OnDataSourceChanged.InvokeAsync(_dataSource);
}
protected override async Task OnAfterRenderAsync(bool firstRender)
@ -114,38 +160,45 @@ namespace TIAMSharedUI.Shared.Components.Grids
if (firstRender)
{
if (_dataSource == null || _dataSource.Count == 0) RefreshDataSourceAsync().Forget();
//AutoFitColumnWidths();
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, int messageTag) => PostDataToServerAsync(dataItem, messageTag, DataChangeMode.Add);
public Task AddDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, TrackingState.Add);
public Task UpdateDataItem(TDataItem dataItem) => UpdateDataItem(dataItem, UpdateMessageTag);
public Task UpdateDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, DataChangeMode.Update);
public Task UpdateDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, TrackingState.Update);
public Task RemoveDataItem(TDataItem dataItem) => RemoveDataItem(dataItem, RemoveMessageTag);
public Task RemoveDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, DataChangeMode.Remove);
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)
public async Task RemoveDataItem(Guid id, int messageTag)
{
var dataItem = _dataSource.FirstOrDefault(x => x.Id == id);
if (dataItem != null)
{
_dataSource.Remove(dataItem);
await _dataSource.SaveChanges();
//await RemoveDataItem(dataItem);
}
return dataItem == null ? Task.CompletedTask : RemoveDataItem(dataItem);
await InvokeAsync(StateHasChanged);
}
private async Task OnItemSaving(GridEditModelSavingEventArgs e)
{
var dataItem = (e.EditModel as TDataItem)!;
if (e.IsNew && dataItem.Id.IsNullOrEmpty()) dataItem.Id = Guid.NewGuid();
var logText = e.IsNew ? "add" : "update";
Logger.Info($"{_gridLogName} OnItemSaving {logText}; Id: {dataItem.Id}");
await OnEditModelSaving.InvokeAsync(e);
await OnGridEditModelSaving.InvokeAsync(e);
if (e.Cancel)
{
@ -153,15 +206,31 @@ namespace TIAMSharedUI.Shared.Components.Grids
return;
}
if (e.IsNew) await AddDataItem(dataItem);
else await UpdateDataItem(dataItem);
if (!e.IsNew) _dataSource.SetTrackingStateToUpdate(dataItem);
else
{
if (dataItem.Id.IsNullOrEmpty()) dataItem.Id = Guid.NewGuid();
_dataSource.Add(dataItem);
}
try
{
var unsavedItems = await _dataSource.SaveChanges();
if (unsavedItems.Count > 0)
Logger.Error($"OnItemSaving->TrySaveChanges error! unsavedCount: {unsavedItems.Count}");
}
catch (Exception ex)
{
Logger.Error($"{_gridLogName} OnItemSaving", ex);
}
}
private async Task OnItemDeleting(GridDataItemDeletingEventArgs e)
{
Logger.Info($"{_gridLogName} OnItemDeleting");
await OnDataItemDeleting.InvokeAsync(e);
await OnGridItemDeleting.InvokeAsync(e);
if (e.Cancel)
{
@ -170,32 +239,19 @@ namespace TIAMSharedUI.Shared.Components.Grids
}
var dataItem = (e.DataItem as TDataItem)!;
await RemoveDataItem(dataItem);
_dataSource.Remove(dataItem);
var unsavedItems = await _dataSource.SaveChanges();
if (unsavedItems.Count > 0)
Logger.Error($"OnItemDeleting->TrySaveChanges error! unsavedCount: {unsavedItems.Count}");
}
public virtual Task RefreshDataSourceAsync()
protected virtual async Task PostDataToServerAsync(TDataItem dataItem, int messageTag, TrackingState trackingState)
{
if (GetAllMessageTag == 0) return Task.CompletedTask;
return;
Logger.Info($"{_gridLogName} RefreshDataSourceAsync called");
return SignalRClient.GetAllAsync<IList<TDataItem>>(GetAllMessageTag, ContextId, response =>
{
if (response.Status == SignalResponseStatus.Error)
return;
BeginUpdate();
DataSource = response.ResponseData ?? [];
EndUpdate();
InvokeAsync(StateHasChanged).Forget();
});
}
protected virtual async Task PostDataToServerAsync(TDataItem dataItem, int messageTag, DataChangeMode dataChangeMode)
{
var changingEventArgs = new GridDataItemChangingEventArgs<TDataItem>(this, dataItem, dataChangeMode);
await OnDataItemChanging.InvokeAsync(changingEventArgs);
var changingEventArgs = new GridDataItemChangingEventArgs<TDataItem>(this, dataItem, trackingState);
await OnGridItemChanging.InvokeAsync(changingEventArgs);
if (changingEventArgs.IsCanceled)
{
@ -209,23 +265,23 @@ namespace TIAMSharedUI.Shared.Components.Grids
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.
_dataSource.UpdateCollection(dataItem, 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.
SignalRClient.PostDataAsync(messageTag, dataItem, async response =>
{
if (response.Status != SignalResponseStatus.Success || response.ResponseData == null)
{
RefreshDataSourceAsync().Forget();
return;
}
//SignalRClient.PostDataAsync(messageTag, dataItem, async response =>
//{
// if (response.Status != SignalResponseStatus.Success || response.ResponseData == null)
// {
// RefreshDataSourceAsync().Forget();
// return;
// }
_dataSource.UpdateCollection(response.ResponseData, dataChangeMode == DataChangeMode.Remove);
// _dataSource.UpdateCollection(response.ResponseData, trackingState == TrackingState.Remove);
var changedEventArgs = new GridDataItemChangedEventArgs<TDataItem>(this, response.ResponseData, dataChangeMode);
await OnDataItemChanged.InvokeAsync(changedEventArgs);
// var changedEventArgs = new GridDataItemChangedEventArgs<TDataItem>(this, response.ResponseData, trackingState);
// await OnDataItemChanged.InvokeAsync(changedEventArgs);
InvokeAsync(StateHasChanged).Forget();
}).Forget();
// InvokeAsync(StateHasChanged).Forget();
//}).Forget();
//transfer = await devAdminSignalClient.PostDataAsync(SignalRTags.UpdateTransferAsync, transfer);
}
@ -250,6 +306,7 @@ namespace TIAMSharedUI.Shared.Components.Grids
{
base.DataItemDeleting = EventCallback.Factory.Create<GridDataItemDeletingEventArgs>(this, OnItemDeleting);
base.EditModelSaving = EventCallback.Factory.Create<GridEditModelSavingEventArgs>(this, OnItemSaving);
CustomizeElement += OnCustomizeElement;
//ShowFilterRow = true;

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

@ -30,9 +30,9 @@ namespace TIAMWebApp.Server.Controllers
[NonAction]
[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())
{
@ -42,9 +42,9 @@ namespace TIAMWebApp.Server.Controllers
_logger.Info(logText);
switch (dataChangeMode)
switch (trackingState)
{
case DataChangeMode.Add:
case TrackingState.Add:
if (company.Id.IsNullOrEmpty()) company.Id = Guid.NewGuid();
//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);
case DataChangeMode.Update:
case TrackingState.Update:
return await adminDal.UpdateCompanyAsync(company);
case DataChangeMode.Remove:
case TrackingState.Remove:
return await adminDal.RemoveCompanyAsync(company);
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)]
[SignalR(SignalRTags.AddCompany)]
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]
[HttpPost]
[Route(APIUrls.UpdateServiceProviderRouteName)]
[SignalR(SignalRTags.UpdateCompany)]
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]
[HttpPost]
[Route(APIUrls.RemoveServiceProviderRouteName)]
[SignalR(SignalRTags.RemoveCompany)]
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.
[AllowAnonymous]
@ -220,9 +220,9 @@ namespace TIAMWebApp.Server.Controllers
[NonAction]
[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())
{
@ -232,19 +232,19 @@ namespace TIAMWebApp.Server.Controllers
_logger.Info(logText);
switch (dataChangeMode)
switch (trackingState)
{
case DataChangeMode.Add:
case TrackingState.Add:
if (car.Id.IsNullOrEmpty()) car.Id = Guid.NewGuid();
return await adminDal.AddCarAsync(car);
case DataChangeMode.Update:
case TrackingState.Update:
return await adminDal.UpdateCarAsync(car);
case DataChangeMode.Remove:
case TrackingState.Remove:
return await adminDal.RemoveCarAsync(car);
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")]
[SignalR(SignalRTags.CreateCar)]
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]
[HttpPost]
@ -264,7 +264,7 @@ namespace TIAMWebApp.Server.Controllers
[EndpointSummary("Update car")]
[SignalR(SignalRTags.UpdateCar)]
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]
[HttpPost]
@ -273,7 +273,7 @@ namespace TIAMWebApp.Server.Controllers
[EndpointSummary("Delete car")]
[SignalR(SignalRTags.DeleteCar)]
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]
[Route(APIUrls.AddProductRouteName)]

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

@ -2,6 +2,7 @@
using AyCode.Core;
using AyCode.Core.Extensions;
using AyCode.Core.Helpers;
using AyCode.Core.Interfaces;
using AyCode.Services.Loggers;
using AyCode.Services.SignalRs;
using MessagePack.Resolvers;
@ -75,9 +76,6 @@ namespace TIAMWebApp.Shared.Application.Services
public virtual Task SendMessageToServerAsync(int messageTag)
=> 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)
{
Logger.DebugConditional($"Client SendMessageToServerAsync; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};");
@ -89,8 +87,8 @@ namespace TIAMWebApp.Shared.Application.Services
}
#region CRUD
public virtual Task<TResponse?> GetByIdAsync<TResponse>(int messageTag, Guid id) where TResponse : class
=> SendMessageToServerAsync<TResponse>(messageTag, new SignalPostJsonDataMessage<IdMessage>(new IdMessage(id)), AcDomain.NextUniqueInt32);
public virtual Task<TResponseData?> GetByIdAsync<TResponseData>(int messageTag, Guid id) where TResponseData : class
=> SendMessageToServerAsync<TResponseData>(messageTag, new SignalPostJsonDataMessage<IdMessage>(new IdMessage(id)), AcDomain.NextUniqueInt32);
public virtual Task GetByIdAsync<TResponseData>(int messageTag, Guid id, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
=> SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage<IdMessage>(new IdMessage(id)), responseCallback);
@ -117,7 +115,7 @@ namespace TIAMWebApp.Shared.Application.Services
public virtual Task<TResponse?> SendMessageToServerAsync<TResponse>(int messageTag, ISignalRMessage? message) where TResponse : class
=> 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};");

701
TIAMWebApp/Shared/Utility/SignalRDataSource.cs
View File

@ -1,8 +1,13 @@
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using AyCode.Core.Enums;
using AyCode.Core.Extensions;
using AyCode.Core.Helpers;
using AyCode.Core.Interfaces;
using AyCode.Services.SignalRs;
using TIAM.Services;
@ -10,32 +15,105 @@ using TIAMWebApp.Shared.Application.Services;
namespace TIAMWebApp.Shared.Application.Utility
{
public class ChangeTracking<T>(DataChangeMode dataChangeMode, T newItem, T originalItem = default(T))where T: class, IId<Guid>
public class TrackingItem<T>(TrackingState trackingState, T currentValue, T? originalValue = null) where T : class, IId<Guid>
{
public DataChangeMode DataChangeMode { get; init; } = dataChangeMode;
public T NewItem { get; init; } = newItem;
public T OriginalItem { get; init; } = originalItem;
public TrackingState TrackingState { get; internal set; } = trackingState;
public T CurrentValue { get; internal set; } = currentValue;
public T? OriginalValue { get; init; } = originalValue;
internal TrackingItem<T> UpdateItem(TrackingState trackingState, T newValue)
{
CurrentValue = newValue;
if (TrackingState != TrackingState.Add)
TrackingState = trackingState;
return this;
}
}
public class ChangeTracking<T> /*: IEnumerable<TrackingItem<T>>*/ where T : class, IId<Guid>
{
private readonly List<TrackingItem<T>> _trackingItems = []; //TODO: Dictionary... - J.
internal TrackingItem<T>? AddTrackingItem(TrackingState trackingState, T newValue, T? originalValue = null)
{
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), $@"currentValue.Id.IsNullOrEmpty()");
var itemIndex = _trackingItems.FindIndex(x => x.CurrentValue.Id == newValue.Id);
TrackingItem<T>? trackingItem = null;
if (itemIndex > -1)
{
trackingItem = _trackingItems[itemIndex];
if (trackingState == TrackingState.Remove && trackingItem.TrackingState == TrackingState.Add)
{
_trackingItems.RemoveAt(itemIndex);
return null;
}
return trackingItem.UpdateItem(trackingState, newValue);
}
if (originalValue != null && Equals(newValue, originalValue))
originalValue = TrackingItemHelpers.JsonClone(originalValue);
trackingItem = new TrackingItem<T>(trackingState, newValue, originalValue);
_trackingItems.Add(trackingItem);
return trackingItem;
}
public int Count => _trackingItems.Count;
internal void Clear() => _trackingItems.Clear();
public List<TrackingItem<T>> ToList() => _trackingItems.ToList();
public bool TryGetTrackingItem(Guid id, [NotNullWhen(true)] out TrackingItem<T>? trackingItem)
{
trackingItem = _trackingItems.FirstOrDefault(x => x.CurrentValue.Id == id);
return trackingItem != null;
}
internal void Remove(TrackingItem<T> trackingItem) => _trackingItems.Remove(trackingItem);
//public IEnumerator<TrackingItem<T>> GetEnumerator()
//{
// return _trackingItems.GetEnumerator();
//}
//IEnumerator IEnumerable.GetEnumerator()
//{
// return GetEnumerator();
//}
}
[Serializable]
[DebuggerDisplay("Count = {Count}")]
public class SignalRDataSource<T> : IList<T>, IList, IReadOnlyList<T> where T: class, IId<Guid>
public class SignalRDataSource<T> : IList<T>, IList, IReadOnlyList<T> where T : class, IId<Guid>
{
protected readonly List<T> InnerList = [];
private readonly object _syncRoot = new();
protected Guid? ContextId;
protected AcSignalRClientBase SignalRClient;
protected readonly List<T> InnerList = []; //TODO: Dictionary??? - J.
protected readonly ChangeTracking<T> TrackingItems = new();
protected readonly Guid? ContextId;
public AcSignalRClientBase SignalRClient;
protected readonly SignalRCrudTags SignalRCrudTags;
public SignalRDataSource(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, Guid? contextId = null, bool autoLoadDataSource = true)
public Func<ItemChangedEventArgs<T>, Task>? OnDataSourceItemChanged;
public Func<Task>? OnDataSourceLoaded;
public SignalRDataSource(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, Guid? contextId = null)
{
ContextId = contextId;
SignalRCrudTags = signalRCrudTags;
SignalRClient = signalRClient;
if (autoLoadDataSource) LoadDataSource();
}
public bool IsSynchronized => true;
@ -47,17 +125,77 @@ namespace TIAMWebApp.Shared.Application.Utility
/// </summary>
/// <exception cref="ArgumentException"></exception>
/// <exception cref="NullReferenceException"></exception>
public void LoadDataSource()
public async Task LoadDataSource(bool clearChangeTracking = true)
{
if (SignalRCrudTags.GetAllMessageTag == SignalRTags.None) throw new ArgumentException($"_signalRCrudTags.GetAllMessageTag == SignalRTags.None;");
if (SignalRCrudTags.GetAllMessageTag == SignalRTags.None) throw new ArgumentException($"SignalRCrudTags.GetAllMessageTag == SignalRTags.None");
lock (_syncRoot)
var resultList = (await SignalRClient.GetAllAsync<List<T>>(SignalRCrudTags.GetAllMessageTag, ContextId)) ?? throw new NullReferenceException();
LoadDataSource(resultList);
}
public Task LoadDataSourceAsync(bool clearChangeTracking = true)
{
if (SignalRCrudTags.GetAllMessageTag == SignalRTags.None) throw new ArgumentException($"SignalRCrudTags.GetAllMessageTag == SignalRTags.None");
return SignalRClient.GetAllAsync<List<T>>(SignalRCrudTags.GetAllMessageTag, ContextId, result=>
{
var resultList = SignalRClient.GetAllAsync<List<T>>(SignalRCrudTags.GetAllMessageTag, ContextId).GetAwaiter().GetResult() ?? throw new NullReferenceException();
if (result.Status != SignalResponseStatus.Success || result.ResponseData == null)
throw new NullReferenceException($"result.Status != SignalResponseStatus.Success || result.ResponseData == null; Status: {SignalResponseStatus.Success}");
Clear();
InnerList.AddRange(resultList);
LoadDataSource(result.ResponseData);
});
}
public async Task LoadDataSource(IList<T> fromSource, bool clearChangeTracking = true)
{
Monitor.Enter(_syncRoot);
try
{
Clear(clearChangeTracking);
foreach (var item in fromSource)
{
InnerList.Add(item);
var eventArgs = new ItemChangedEventArgs<T>(item, TrackingState.GetAll);
if (OnDataSourceItemChanged != null) await OnDataSourceItemChanged.Invoke(eventArgs);
}
}
finally
{
Monitor.Exit(_syncRoot);
}
if (OnDataSourceLoaded != null) await OnDataSourceLoaded.Invoke();
}
public async Task<T?> LoadItem(Guid id)
{
if (SignalRCrudTags.GetItemMessageTag == SignalRTags.None) throw new ArgumentException($"SignalRCrudTags.GetItemMessageTag == SignalRTags.None");
T? resultitem = null;
Monitor.Enter(_syncRoot);
try
{
resultitem = await SignalRClient.GetByIdAsync<T>(SignalRCrudTags.GetItemMessageTag, id);
if (resultitem == null) return null;
if (TryGetIndex(id, out var index)) InnerList[index] = resultitem;
else InnerList.Add(resultitem);
var eventArgs = new ItemChangedEventArgs<T>(resultitem, TrackingState.Get);
if (OnDataSourceItemChanged != null) await OnDataSourceItemChanged.Invoke(eventArgs);
}
finally
{
Monitor.Exit(_syncRoot);
}
return resultitem;
}
/// <summary>
@ -72,57 +210,78 @@ namespace TIAMWebApp.Shared.Application.Utility
{
if ((uint)index >= (uint)Count) throw new ArgumentOutOfRangeException(nameof(index));
lock (_syncRoot)
Monitor.Enter(_syncRoot);
try
{
return InnerList[index];
}
finally
{
Monitor.Exit(_syncRoot);
}
}
set
{
lock (_syncRoot)
Monitor.Enter(_syncRoot);
try
{
Update(index, value);
}
}
}
finally
{
Monitor.Exit(_syncRoot);
}
public int Count
{
get
{
lock (_syncRoot) return InnerList.Count;
}
}
/// <summary>
/// AddMessageTag
/// </summary>
/// <param name="item"></param>
/// <param name="newValue"></param>
/// <exception cref="ArgumentException"></exception>
public void Add(T item)
public void Add(T newValue)
{
lock (_syncRoot)
{
if (Contains(item))
throw new ArgumentException($@"It already contains this Id! Id: {item.Id}", nameof(item));
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"Add->newValue.Id.IsNullOrEmpty()");
UnsafeAdd(item);
Monitor.Enter(_syncRoot);
try
{
if (Contains(newValue))
throw new ArgumentException($@"It already contains this Id! Id: {newValue.Id}", nameof(newValue));
UnsafeAdd(newValue);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
/// AddMessageTag or UpdateMessageTag
/// </summary>
/// <param name="item"></param>
/// <param name="newValue"></param>
/// <returns></returns>
public T AddOrUpdate(T item)
public T AddOrUpdate(T newValue)
{
lock (_syncRoot)
{
var index = IndexOf(item);
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"AddOrUpdate->newValue.Id.IsNullOrEmpty()");
return index > -1 ? Update(index, item) : UnsafeAdd(item);
Monitor.Enter(_syncRoot);
try
{
var index = IndexOf(newValue);
return index > -1 ? Update(index, newValue) : UnsafeAdd(newValue);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
//public void AddRange(IEnumerable<T> collection)
@ -133,70 +292,82 @@ namespace TIAMWebApp.Shared.Application.Utility
// }
//}
private T UnsafeAdd(T item)
protected T UnsafeAdd(T newValue)
{
if (SignalRCrudTags.AddMessageTag == SignalRTags.None) throw new ArgumentException($"_signalRCrudTags.AddMessageTag == SignalRTags.None;");
TrackingItems.AddTrackingItem(TrackingState.Add, newValue);
InnerList.Add(newValue);
var result = SignalRClient.PostDataAsync(SignalRCrudTags.AddMessageTag, item).GetAwaiter().GetResult() ?? throw new NullReferenceException();
InnerList.Add(result);
return result;
return newValue;
}
/// <summary>
/// AddMessageTag
/// </summary>
/// <param name="index"></param>
/// <param name="item"></param>
/// <param name="newValue"></param>
/// <exception cref="ArgumentException"></exception>
/// <exception cref="NullReferenceException"></exception>
public void Insert(int index, T item)
public void Insert(int index, T newValue)
{
if (SignalRCrudTags.AddMessageTag == SignalRTags.None) throw new ArgumentException($"_signalRCrudTags.AddMessageTag == SignalRTags.None;");
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"Insert->newValue.Id.IsNullOrEmpty()");
lock (_syncRoot)
Monitor.Enter(_syncRoot);
try
{
if (Contains(item))
throw new ArgumentException($@"It already contains this Id! Id: {item.Id}", nameof(item));
if (Contains(newValue))
throw new ArgumentException($@"It already contains this Id! Id: {newValue.Id}", nameof(newValue));
var result = SignalRClient.PostDataAsync(SignalRCrudTags.AddMessageTag, item).GetAwaiter().GetResult() ?? throw new NullReferenceException();
InnerList.Insert(index, result);
TrackingItems.AddTrackingItem(TrackingState.Add, newValue);
InnerList.Insert(index, newValue);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
/// UpdateMessageTag
/// </summary>
/// <param name="item"></param>
public T Update(T item) => Update(IndexOf(item), item);
/// <param name="newItem"></param>
public T Update(T newItem) => Update(IndexOf(newItem), newItem);
/// <summary>
/// UpdateMessageTag
/// </summary>
/// <param name="index"></param>
/// <param name="item"></param>
/// <param name="newValue"></param>
/// /// <exception cref="ArgumentException"></exception>
/// /// <exception cref="NullReferenceException"></exception>
/// <exception cref="ArgumentNullException"></exception>
/// <exception cref="ArgumentOutOfRangeException"></exception>
public T Update(int index, T item)
public T Update(int index, T newValue)
{
if (SignalRCrudTags.UpdateMessageTag == SignalRTags.None) throw new ArgumentException($"_signalRCrudTags.UpdateMessageTag == SignalRTags.None;");
if (default(T) != null && item == null) throw new NullReferenceException(nameof(item));
if (item.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(item), "Update->item.Id.IsNullOrEmpty()");
if (default(T) != null && newValue == null) throw new NullReferenceException(nameof(newValue));
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"Update->newValue.Id.IsNullOrEmpty()");
if ((uint)index >= (uint)Count) throw new ArgumentOutOfRangeException(nameof(index));
lock (_syncRoot)
{
if (InnerList[index].Id != item.Id)
throw new ArgumentException($@"_list[index].Id != item.Id! Id: {item.Id}", nameof(item));
Monitor.Enter(_syncRoot);
var result = SignalRClient.PostDataAsync(SignalRCrudTags.UpdateMessageTag, item).GetAwaiter().GetResult() ?? throw new NullReferenceException();
InnerList[index] = result;
return result;
try
{
var currentItem = InnerList[index];
if (currentItem.Id != newValue.Id)
throw new ArgumentException($@"currentItem.Id != item.Id! Id: {newValue.Id}", nameof(newValue));
TrackingItems.AddTrackingItem(TrackingState.Update, newValue, currentItem);
InnerList[index] = newValue;
return newValue;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
@ -206,7 +377,9 @@ namespace TIAMWebApp.Shared.Application.Utility
/// <returns></returns>
public bool Remove(T item)
{
lock (_syncRoot)
Monitor.Enter(_syncRoot);
try
{
var index = IndexOf(item);
@ -215,6 +388,32 @@ namespace TIAMWebApp.Shared.Application.Utility
RemoveAt(index);
return true;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
///
/// </summary>
/// <param name="id"></param>
/// <param name="item"></param>
/// <returns></returns>
public bool TryRemove(Guid id, out T? item)
{
Monitor.Enter(_syncRoot);
try
{
return TryGetValue(id, out item) && Remove(item);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
@ -226,45 +425,320 @@ namespace TIAMWebApp.Shared.Application.Utility
/// <exception cref="NullReferenceException"></exception>
public void RemoveAt(int index)
{
if (SignalRCrudTags.RemoveMessageTag == SignalRTags.None) throw new ArgumentException($"_signalRCrudTags.RemoveMessageTag == SignalRTags.None;");
Monitor.Enter(_syncRoot);
lock (_syncRoot)
try
{
var item = InnerList[index];
if (item.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(item), $@"RemoveAt->item.Id.IsNullOrEmpty(); index: {index}");
var result = SignalRClient.PostDataAsync(SignalRCrudTags.RemoveMessageTag, item).GetAwaiter().GetResult() ?? throw new NullReferenceException();
var currentItem = InnerList[index];
if (currentItem.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(currentItem), $@"RemoveAt->item.Id.IsNullOrEmpty(); index: {index}");
TrackingItems.AddTrackingItem(TrackingState.Remove, currentItem, currentItem);
InnerList.RemoveAt(index);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
///
/// </summary>
/// <returns></returns>
public List<TrackingItem<T>> GetTrackingItems()
{
Monitor.Enter(_syncRoot);
try
{
return TrackingItems.ToList();
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public void Clear()
public void SetTrackingStateToUpdate(T item)
{
lock (_syncRoot) InnerList.Clear();
Monitor.Enter(_syncRoot);
try
{
if (TrackingItems.TryGetTrackingItem(item.Id, out var trackingItem))
{
if (trackingItem.TrackingState != TrackingState.Add)
trackingItem.TrackingState = TrackingState.Update;
return;
}
if (!TryGetValue(item.Id, out var originalItem)) return;
TrackingItems.AddTrackingItem(TrackingState.Update, item, originalItem);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public int IndexOf(T item)
/// <summary>
///
/// </summary>
/// <param name="id"></param>
/// <param name="trackingItem"></param>
/// <returns></returns>
public bool TryGetTrackingItem(Guid id, [NotNullWhen(true)] out TrackingItem<T>? trackingItem)
{
lock (_syncRoot)
return InnerList.FindIndex(x => x.Id == item.Id);
Monitor.Enter(_syncRoot);
try
{
return TrackingItems.TryGetTrackingItem(id, out trackingItem);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public bool Contains(T item)
/// <summary>
///
/// </summary>
/// <returns>Unsaved items</returns>
public async Task<List<TrackingItem<T>>> SaveChanges()
{
lock (_syncRoot)
return IndexOf(item) > -1;
Monitor.Enter(_syncRoot);
try
{
foreach (var trackingItem in TrackingItems.ToList())
{
try
{
//throw new Exception();
await SaveTrackingItemUnsafe(trackingItem);
}
catch(Exception ex)
{
TryRollbackItem(trackingItem.CurrentValue.Id, out _);
}
}
return TrackingItems.ToList();
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
///
/// </summary>
/// <param name="id"></param>
/// <param name="resultItem"></param>
/// <returns></returns>
public async Task<T?> SaveItem(Guid id)
{
Monitor.Enter(_syncRoot);
try
{
T? resultItem = null;
if (TryGetTrackingItem(id, out var trackingItem))
resultItem = await SaveTrackingItemUnsafe(trackingItem);
return resultItem;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public async Task<T?> SaveItem(Guid id, TrackingState trackingState)
{
Monitor.Enter(_syncRoot);
try
{
T? resultItem = null;
if (TryGetValue(id, out var item))
resultItem = await SaveItem(item, trackingState);
return resultItem;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public Task<T?> SaveItem(T item, TrackingState trackingState) => SaveItemUnsafe(item, trackingState);
protected Task<T?> SaveTrackingItemUnsafe(TrackingItem<T> trackingItem)
=> SaveItemUnsafe(trackingItem.CurrentValue, trackingItem.TrackingState);
protected async Task<T?> SaveItemUnsafe(T item, TrackingState trackingState)
{
var messageTag = SignalRCrudTags.GetMessageTagByTrackingState(trackingState);
if (messageTag == SignalRTags.None) return null; //throw new ArgumentException($"messageTag == SignalRTags.None");
var result = await SignalRClient.PostDataAsync(messageTag, item);
if (result == null) return null; //throw new NullReferenceException($"result == null");
if (TryGetTrackingItem(item.Id, out var trackingItem))
TrackingItems.Remove(trackingItem);
if (TryGetIndex(result.Id, out var index))
InnerList[index] = result;
var eventArgs = new ItemChangedEventArgs<T>(result, trackingState);
if (OnDataSourceItemChanged != null) await OnDataSourceItemChanged.Invoke(eventArgs);
return result;
}
protected void RollbackItemUnsafe(TrackingItem<T> trackingItem)
{
if (TryGetIndex(trackingItem.CurrentValue.Id, out var index))
{
if (trackingItem.TrackingState == TrackingState.Add) InnerList.RemoveAt(index);
else InnerList[index] = trackingItem.OriginalValue!;
}
else if (trackingItem.TrackingState != TrackingState.Add)
InnerList.Add(trackingItem.OriginalValue!);
TrackingItems.Remove(trackingItem);
}
public bool TryRollbackItem(Guid id, out T? originalValue)
{
Monitor.Enter(_syncRoot);
try
{
if (TryGetTrackingItem(id, out var trackingItem))
{
originalValue = trackingItem.OriginalValue;
RollbackItemUnsafe(trackingItem);
return true;
}
originalValue = null;
return false;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public void Rollback()
{
Monitor.Enter(_syncRoot);
try
{
foreach (var trackingItem in TrackingItems.ToList())
RollbackItemUnsafe(trackingItem);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public int Count
{
get
{
Monitor.Enter(_syncRoot);
try
{
return InnerList.Count;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
}
public void Clear() => Clear(true);
public void Clear(bool clearChangeTracking)
{
Monitor.Enter(_syncRoot);
try
{
if (clearChangeTracking) TrackingItems.Clear();
InnerList.Clear();
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public int IndexOf(Guid id)
{
Monitor.Enter(_syncRoot);
try
{
return InnerList.FindIndex(x => x.Id == id);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public int IndexOf(T item) => IndexOf(item.Id);
public bool TryGetIndex(Guid id, out int index) => (index = IndexOf(id)) > -1;
public bool Contains(T item) => IndexOf(item) > -1;
public bool TryGetValue(Guid id, [NotNullWhen(true)] out T? item)
{
Monitor.Enter(_syncRoot);
try
{
item = InnerList.FirstOrDefault(x => x.Id == id);
return item != null;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public void CopyTo(T[] array) => CopyTo(array, 0);
public void CopyTo(T[] array, int arrayIndex)
{
lock (_syncRoot) InnerList.CopyTo(array, arrayIndex);
Monitor.Enter(_syncRoot);
try
{
InnerList.CopyTo(array, arrayIndex);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public int BinarySearch(int index, int count, T item, IComparer<T>? comparer)
{
throw new NotImplementedException($"BinarySearch");
if (index < 0)
throw new ArgumentOutOfRangeException(nameof(index));
if (count < 0)
@ -272,8 +746,15 @@ namespace TIAMWebApp.Shared.Application.Utility
if (Count - index < count)
throw new ArgumentException("Invalid length");
lock (_syncRoot)
return InnerList.BinarySearch(index, count, item, comparer);
//Monitor.Enter(_syncRoot);
//try
//{
// return InnerList.BinarySearch(index, count, item, comparer);
//}
//finally
//{
// Monitor.Exit(_syncRoot);
//}
}
public int BinarySearch(T item) => BinarySearch(0, Count, item, null);
@ -281,8 +762,17 @@ namespace TIAMWebApp.Shared.Application.Utility
public IEnumerator<T> GetEnumerator()
{
lock (_syncRoot)
return InnerList.ToList().GetEnumerator();
Monitor.Enter(_syncRoot);
try
{
//return InnerList.ToList().GetEnumerator();
return InnerList.GetEnumerator();
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public ReadOnlyCollection<T> AsReadOnly() => new(this);
@ -290,6 +780,7 @@ namespace TIAMWebApp.Shared.Application.Utility
#region IList, ICollection
bool IList.IsReadOnly => false;
object? IList.this[int index]
@ -326,11 +817,11 @@ namespace TIAMWebApp.Shared.Application.Utility
return Count - 1;
}
void IList.Clear() => Clear();
void IList.Clear() => Clear(true);
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
bool IList.Contains(object? item) => IsCompatibleObject(item) && Contains((T)item!);
int IList.IndexOf(object? item) => (IsCompatibleObject(item)) ? IndexOf((T)item!) : -1;
void IList.Insert(int index, object? item)
{
if (default(T) != null && item == null) throw new NullReferenceException(nameof(item));
@ -350,7 +841,7 @@ namespace TIAMWebApp.Shared.Application.Utility
if (IsCompatibleObject(item)) Remove((T)item!);
}
void ICollection<T>.Clear() => Clear();
void ICollection<T>.Clear() => Clear(true);
void ICollection.CopyTo(Array array, int arrayIndex)
{
@ -361,8 +852,17 @@ namespace TIAMWebApp.Shared.Application.Utility
try
{
//TODO: _list.ToArray() - ez nem az igazi... - J.
Array.Copy(InnerList.ToArray(), 0, array!, arrayIndex, InnerList.Count);
Monitor.Enter(_syncRoot);
try
{
//TODO: _list.ToArray() - ez nem az igazi... - J.
Array.Copy(InnerList.ToArray(), 0, array!, arrayIndex, InnerList.Count);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
catch (ArrayTypeMismatchException)
{
@ -375,6 +875,19 @@ namespace TIAMWebApp.Shared.Application.Utility
bool ICollection<T>.IsReadOnly => false;
void IList<T>.RemoveAt(int index) => RemoveAt(index);
int IReadOnlyCollection<T>.Count => Count;
#endregion IList, ICollection
}
public class ItemChangedEventArgs<T> where T : IId<Guid>
{
internal ItemChangedEventArgs(T item, TrackingState trackingState)
{
Item = item;
TrackingState = trackingState;
}
public T Item { get; }
public TrackingState TrackingState { get; }
}
}

83
TIAMWebApp/Shared/Utility/SignalRDataSourceAsync.cs
View File

@ -16,55 +16,55 @@ public class SignalRDataSourceAsync<T> : SignalRDataSource<T> where T : class, I
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, false)
: base(signalRClient, signalRCrudTags, contextId)
{
OnDataSourceLoaded = onDataSourceLoaded;
if (autoLoadDataSource) LoadDataSourceAsync();
}
public void 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.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");
//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();
InnerList.AddRange(response.ResponseData);
}
finally
{
Monitor.Exit(SyncRoot);
}
// Clear(clearChangeTracking);
// InnerList.AddRange(response.ResponseData);
// }
// finally
// {
// Monitor.Exit(SyncRoot);
// }
OnDataSourceLoaded?.Invoke(this);
}).Forget();
}
catch (Exception)
{
Monitor.Exit(SyncRoot);
throw;
}
// OnDataSourceLoaded?.Invoke(this);
// }).Forget();
//}
//catch (Exception)
//{
// Monitor.Exit(SyncRoot);
// throw;
//}
}
//public T Add(T item, int messageTag) => PostDataToServerAsync(item, messageTag, DataChangeMode.Add).GetAwaiter().GetResult();
//public Task AddAsync(T item, int messageTag) => PostDataToServerAsync(item, messageTag, DataChangeMode.Add);
//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, DataChangeMode.Update);
//public Task UpdateAsync(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Update);
//public Task RemoveAsync(T item, int messageTag) => PostDataToServerAsync(item, messageTag, DataChangeMode.Remove);
//public Task RemoveAsync(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Remove);
//public Task RemoveAsync(Guid id, int messageTag)
//{
@ -73,7 +73,7 @@ public class SignalRDataSourceAsync<T> : SignalRDataSource<T> where T : class, I
// return item == null ? Task.CompletedTask : RemoveAsync(item, messageTag);
//}
//protected virtual Task PostDataToServerAsync(T item, int messageTag, DataChangeMode dataChangeMode)
//protected virtual Task PostDataToServerAsync(T item, int messageTag, TrackingState trackingState)
//{
// if (messageTag == 0) return Task.CompletedTask;
@ -81,7 +81,7 @@ public class SignalRDataSourceAsync<T> : SignalRDataSource<T> where T : class, I
// if (item.Id.IsNullOrEmpty()) item.Id = Guid.NewGuid();
// _list.UpdateCollection(item, 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.
// _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 =>
// {
@ -91,9 +91,9 @@ public class SignalRDataSourceAsync<T> : SignalRDataSource<T> where T : class, I
// return;
// }
// _list.UpdateCollection(repsonse.ResponseData, dataChangeMode == DataChangeMode.Remove);
// _list.UpdateCollection(repsonse.ResponseData, trackingState == TrackingState.Remove);
// var eventArgs = new ItemChangedEventArgs<T>(repsonse.ResponseData, dataChangeMode);
// var eventArgs = new ItemChangedEventArgs<T>(repsonse.ResponseData, trackingState);
// OnItemChanged.Invoke(eventArgs);
// });
@ -101,17 +101,4 @@ public class SignalRDataSourceAsync<T> : SignalRDataSource<T> where T : class, I
// return Task.CompletedTask;
//}
public class ItemChangedEventArgs<T> where T : IId<Guid>
{
internal ItemChangedEventArgs(T item, DataChangeMode dataChangeMode)
{
Item = item;
DataChangeMode = dataChangeMode;
}
public T Item { get; }
public DataChangeMode DataChangeMode { get; }
}
}

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!;
}
}