SignalRDataSource, TiamGrid imrpovements, fixes...
This commit is contained in:
parent
b454c51c7b
commit
96ccf6d86f
|
|
@ -82,7 +82,8 @@
|
||||||
</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>
|
<DetailRowTemplate>
|
||||||
@{
|
@{
|
||||||
|
|
@ -147,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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,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"
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,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
|
||||||
|
|
@ -89,10 +91,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"
|
||||||
|
|
@ -163,7 +165,18 @@
|
||||||
<DxGridDataColumn FieldName="ContextId" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
|
<DxGridDataColumn FieldName="ContextId" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
|
||||||
<DxGridDataColumn FieldName="EmailAddress" />
|
<DxGridDataColumn FieldName="EmailAddress" />
|
||||||
<DxGridDataColumn FieldName="Subject" />
|
<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" />
|
<DxGridDataColumn FieldName="Created" DisplayFormat="g" Width="140" />
|
||||||
</Columns>
|
</Columns>
|
||||||
</MessageDetailGrid>
|
</MessageDetailGrid>
|
||||||
|
|
|
||||||
|
|
@ -21,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"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
|
using System.Data.Common;
|
||||||
using AyCode.Core;
|
using AyCode.Core;
|
||||||
using AyCode.Core.Enums;
|
using AyCode.Core.Enums;
|
||||||
using AyCode.Core.Extensions;
|
using AyCode.Core.Extensions;
|
||||||
|
|
@ -8,8 +9,10 @@ using AyCode.Interfaces.Entities;
|
||||||
using AyCode.Services.SignalRs;
|
using AyCode.Services.SignalRs;
|
||||||
using AyCode.Utils.Extensions;
|
using AyCode.Utils.Extensions;
|
||||||
using DevExpress.Blazor;
|
using DevExpress.Blazor;
|
||||||
|
using DevExpress.Blazor.Internal;
|
||||||
using Microsoft.AspNetCore.Components;
|
using Microsoft.AspNetCore.Components;
|
||||||
using Microsoft.AspNetCore.Components.Web;
|
using Microsoft.AspNetCore.Components.Web;
|
||||||
|
using TIAM.Services;
|
||||||
using TIAMWebApp.Shared.Application.Services;
|
using TIAMWebApp.Shared.Application.Services;
|
||||||
using TIAMWebApp.Shared.Application.Utility;
|
using TIAMWebApp.Shared.Application.Utility;
|
||||||
|
|
||||||
|
|
@ -41,7 +44,8 @@ namespace TIAMSharedUI.Shared.Components.Grids
|
||||||
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()
|
||||||
|
|
@ -60,14 +64,17 @@ 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 server response!
|
||||||
|
/// </summary>
|
||||||
|
[Parameter] public EventCallback<GridDataItemChangedEventArgs<TDataItem>> OnGridItemChanged { get; set; }
|
||||||
|
|
||||||
[Parameter]
|
[Parameter]
|
||||||
[DefaultValue(null)]
|
[DefaultValue(null)]
|
||||||
|
|
@ -86,26 +93,65 @@ namespace TIAMSharedUI.Shared.Components.Grids
|
||||||
}
|
}
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if (value == null) throw new ArgumentNullException(nameof(value));
|
if (value == null) return;
|
||||||
|
_dataSourceParam = value;
|
||||||
|
|
||||||
var equals = Equals(_dataSource, value);
|
//bool equals;
|
||||||
|
|
||||||
_dataSource = value;
|
//if ((equals = Equals(_dataSource, value)) == false)
|
||||||
Data = _dataSource;
|
//{
|
||||||
|
// 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)
|
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 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)
|
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||||
|
|
@ -114,9 +160,8 @@ 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();
|
||||||
//AutoFitColumnWidths();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -131,21 +176,29 @@ namespace TIAMSharedUI.Shared.Components.Grids
|
||||||
|
|
||||||
public Task RemoveDataItem(Guid id) => RemoveDataItem(id, RemoveMessageTag);
|
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);
|
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)
|
private async Task OnItemSaving(GridEditModelSavingEventArgs e)
|
||||||
{
|
{
|
||||||
var dataItem = (e.EditModel as TDataItem)!;
|
var dataItem = (e.EditModel as TDataItem)!;
|
||||||
|
|
||||||
|
if (e.IsNew && dataItem.Id.IsNullOrEmpty()) dataItem.Id = Guid.NewGuid();
|
||||||
|
|
||||||
var logText = e.IsNew ? "add" : "update";
|
var logText = e.IsNew ? "add" : "update";
|
||||||
Logger.Info($"{_gridLogName} OnItemSaving {logText}; Id: {dataItem.Id}");
|
Logger.Info($"{_gridLogName} OnItemSaving {logText}; Id: {dataItem.Id}");
|
||||||
|
|
||||||
await OnEditModelSaving.InvokeAsync(e);
|
await OnGridEditModelSaving.InvokeAsync(e);
|
||||||
|
|
||||||
if (e.Cancel)
|
if (e.Cancel)
|
||||||
{
|
{
|
||||||
|
|
@ -153,15 +206,31 @@ namespace TIAMSharedUI.Shared.Components.Grids
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e.IsNew) await AddDataItem(dataItem);
|
if (!e.IsNew) _dataSource.SetTrackingStateToUpdate(dataItem);
|
||||||
else await UpdateDataItem(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)
|
private async Task OnItemDeleting(GridDataItemDeletingEventArgs e)
|
||||||
{
|
{
|
||||||
Logger.Info($"{_gridLogName} OnItemDeleting");
|
Logger.Info($"{_gridLogName} OnItemDeleting");
|
||||||
|
|
||||||
await OnDataItemDeleting.InvokeAsync(e);
|
await OnGridItemDeleting.InvokeAsync(e);
|
||||||
|
|
||||||
if (e.Cancel)
|
if (e.Cancel)
|
||||||
{
|
{
|
||||||
|
|
@ -170,32 +239,19 @@ namespace TIAMSharedUI.Shared.Components.Grids
|
||||||
}
|
}
|
||||||
|
|
||||||
var dataItem = (e.DataItem as TDataItem)!;
|
var dataItem = (e.DataItem as TDataItem)!;
|
||||||
await RemoveDataItem(dataItem);
|
_dataSource.Remove(dataItem);
|
||||||
}
|
|
||||||
|
|
||||||
public virtual Task RefreshDataSourceAsync()
|
var unsavedItems = await _dataSource.SaveChanges();
|
||||||
{
|
if (unsavedItems.Count > 0)
|
||||||
if (GetAllMessageTag == 0) return Task.CompletedTask;
|
Logger.Error($"OnItemDeleting->TrySaveChanges error! unsavedCount: {unsavedItems.Count}");
|
||||||
|
|
||||||
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, TrackingState trackingState)
|
protected virtual async Task PostDataToServerAsync(TDataItem dataItem, int messageTag, TrackingState trackingState)
|
||||||
{
|
{
|
||||||
|
return;
|
||||||
|
|
||||||
var changingEventArgs = new GridDataItemChangingEventArgs<TDataItem>(this, dataItem, trackingState);
|
var changingEventArgs = new GridDataItemChangingEventArgs<TDataItem>(this, dataItem, trackingState);
|
||||||
await OnDataItemChanging.InvokeAsync(changingEventArgs);
|
await OnGridItemChanging.InvokeAsync(changingEventArgs);
|
||||||
|
|
||||||
if (changingEventArgs.IsCanceled)
|
if (changingEventArgs.IsCanceled)
|
||||||
{
|
{
|
||||||
|
|
@ -211,21 +267,21 @@ namespace TIAMSharedUI.Shared.Components.Grids
|
||||||
|
|
||||||
_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.
|
_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 =>
|
//SignalRClient.PostDataAsync(messageTag, dataItem, async response =>
|
||||||
{
|
//{
|
||||||
if (response.Status != SignalResponseStatus.Success || response.ResponseData == null)
|
// if (response.Status != SignalResponseStatus.Success || response.ResponseData == null)
|
||||||
{
|
// {
|
||||||
RefreshDataSourceAsync().Forget();
|
// RefreshDataSourceAsync().Forget();
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
|
|
||||||
_dataSource.UpdateCollection(response.ResponseData, trackingState == TrackingState.Remove);
|
// _dataSource.UpdateCollection(response.ResponseData, trackingState == TrackingState.Remove);
|
||||||
|
|
||||||
var changedEventArgs = new GridDataItemChangedEventArgs<TDataItem>(this, response.ResponseData, trackingState);
|
// var changedEventArgs = new GridDataItemChangedEventArgs<TDataItem>(this, response.ResponseData, trackingState);
|
||||||
await OnDataItemChanged.InvokeAsync(changedEventArgs);
|
// await OnDataItemChanged.InvokeAsync(changedEventArgs);
|
||||||
|
|
||||||
InvokeAsync(StateHasChanged).Forget();
|
// InvokeAsync(StateHasChanged).Forget();
|
||||||
}).Forget();
|
//}).Forget();
|
||||||
|
|
||||||
//transfer = await devAdminSignalClient.PostDataAsync(SignalRTags.UpdateTransferAsync, transfer);
|
//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.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;
|
CustomizeElement += OnCustomizeElement;
|
||||||
|
|
||||||
//ShowFilterRow = true;
|
//ShowFilterRow = true;
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ using System.Runtime.Serialization;
|
||||||
using System.Runtime.Serialization.Formatters.Binary;
|
using System.Runtime.Serialization.Formatters.Binary;
|
||||||
using AyCode.Core.Enums;
|
using AyCode.Core.Enums;
|
||||||
using AyCode.Core.Extensions;
|
using AyCode.Core.Extensions;
|
||||||
|
using AyCode.Core.Helpers;
|
||||||
using AyCode.Core.Interfaces;
|
using AyCode.Core.Interfaces;
|
||||||
using AyCode.Services.SignalRs;
|
using AyCode.Services.SignalRs;
|
||||||
using TIAM.Services;
|
using TIAM.Services;
|
||||||
|
|
@ -18,7 +19,7 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
{
|
{
|
||||||
public TrackingState TrackingState { get; internal set; } = trackingState;
|
public TrackingState TrackingState { get; internal set; } = trackingState;
|
||||||
public T CurrentValue { get; internal set; } = currentValue;
|
public T CurrentValue { get; internal set; } = currentValue;
|
||||||
public T? OriginalValue { get; init; } = originalValue; //originalValue == null ? null : TrackingItemHelpers.Clone(originalValue);
|
public T? OriginalValue { get; init; } = originalValue;
|
||||||
|
|
||||||
internal TrackingItem<T> UpdateItem(TrackingState trackingState, T newValue)
|
internal TrackingItem<T> UpdateItem(TrackingState trackingState, T newValue)
|
||||||
{
|
{
|
||||||
|
|
@ -32,7 +33,7 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public class ChangeTracking<T> where T : class, IId<Guid>
|
public class ChangeTracking<T> /*: IEnumerable<TrackingItem<T>>*/ where T : class, IId<Guid>
|
||||||
{
|
{
|
||||||
private readonly List<TrackingItem<T>> _trackingItems = []; //TODO: Dictionary... - J.
|
private readonly List<TrackingItem<T>> _trackingItems = []; //TODO: Dictionary... - J.
|
||||||
|
|
||||||
|
|
@ -58,7 +59,7 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
}
|
}
|
||||||
|
|
||||||
if (originalValue != null && Equals(newValue, originalValue))
|
if (originalValue != null && Equals(newValue, originalValue))
|
||||||
originalValue = TrackingItemHelpers.ReflectionClone(originalValue);
|
originalValue = TrackingItemHelpers.JsonClone(originalValue);
|
||||||
|
|
||||||
trackingItem = new TrackingItem<T>(trackingState, newValue, originalValue);
|
trackingItem = new TrackingItem<T>(trackingState, newValue, originalValue);
|
||||||
_trackingItems.Add(trackingItem);
|
_trackingItems.Add(trackingItem);
|
||||||
|
|
@ -77,6 +78,16 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void Remove(TrackingItem<T> trackingItem) => _trackingItems.Remove(trackingItem);
|
internal void Remove(TrackingItem<T> trackingItem) => _trackingItems.Remove(trackingItem);
|
||||||
|
|
||||||
|
//public IEnumerator<TrackingItem<T>> GetEnumerator()
|
||||||
|
//{
|
||||||
|
// return _trackingItems.GetEnumerator();
|
||||||
|
//}
|
||||||
|
|
||||||
|
//IEnumerator IEnumerable.GetEnumerator()
|
||||||
|
//{
|
||||||
|
// return GetEnumerator();
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -91,17 +102,18 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
protected readonly ChangeTracking<T> TrackingItems = new();
|
protected readonly ChangeTracking<T> TrackingItems = new();
|
||||||
|
|
||||||
protected readonly Guid? ContextId;
|
protected readonly Guid? ContextId;
|
||||||
protected readonly AcSignalRClientBase SignalRClient;
|
public AcSignalRClientBase SignalRClient;
|
||||||
protected readonly SignalRCrudTags SignalRCrudTags;
|
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;
|
ContextId = contextId;
|
||||||
|
|
||||||
SignalRCrudTags = signalRCrudTags;
|
SignalRCrudTags = signalRCrudTags;
|
||||||
SignalRClient = signalRClient;
|
SignalRClient = signalRClient;
|
||||||
|
|
||||||
if (autoLoadDataSource) LoadDataSource(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsSynchronized => true;
|
public bool IsSynchronized => true;
|
||||||
|
|
@ -113,38 +125,79 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <exception cref="ArgumentException"></exception>
|
/// <exception cref="ArgumentException"></exception>
|
||||||
/// <exception cref="NullReferenceException"></exception>
|
/// <exception cref="NullReferenceException"></exception>
|
||||||
public void LoadDataSource(bool clearChangeTracking = true)
|
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();
|
||||||
{
|
|
||||||
var resultList = SignalRClient.GetAllAsync<List<T>>(SignalRCrudTags.GetAllMessageTag, ContextId).GetAwaiter().GetResult() ?? throw new NullReferenceException();
|
|
||||||
|
|
||||||
Clear(clearChangeTracking);
|
LoadDataSource(resultList);
|
||||||
InnerList.AddRange(resultList);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public T? LoadItem(Guid id)
|
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=>
|
||||||
|
{
|
||||||
|
if (result.Status != SignalResponseStatus.Success || result.ResponseData == null)
|
||||||
|
throw new NullReferenceException($"result.Status != SignalResponseStatus.Success || result.ResponseData == null; Status: {SignalResponseStatus.Success}");
|
||||||
|
|
||||||
|
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");
|
if (SignalRCrudTags.GetItemMessageTag == SignalRTags.None) throw new ArgumentException($"SignalRCrudTags.GetItemMessageTag == SignalRTags.None");
|
||||||
|
|
||||||
T? resultitem = null;
|
T? resultitem = null;
|
||||||
|
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
resultitem = SignalRClient.GetByIdAsync<T>(SignalRCrudTags.GetItemMessageTag, id).GetAwaiter().GetResult();
|
resultitem = await SignalRClient.GetByIdAsync<T>(SignalRCrudTags.GetItemMessageTag, id);
|
||||||
if (resultitem == null) return null;
|
if (resultitem == null) return null;
|
||||||
|
|
||||||
if (TryGetIndex(id, out var index)) InnerList[index] = resultitem;
|
if (TryGetIndex(id, out var index)) InnerList[index] = resultitem;
|
||||||
else InnerList.Add(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;
|
return resultitem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// set: UpdateMessageTag
|
/// set: UpdateMessageTag
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
@ -157,17 +210,28 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
{
|
{
|
||||||
if ((uint)index >= (uint)Count) throw new ArgumentOutOfRangeException(nameof(index));
|
if ((uint)index >= (uint)Count) throw new ArgumentOutOfRangeException(nameof(index));
|
||||||
|
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
try
|
||||||
{
|
{
|
||||||
return InnerList[index];
|
return InnerList[index];
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
try
|
||||||
{
|
{
|
||||||
Update(index, value);
|
Update(index, value);
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -180,13 +244,20 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
{
|
{
|
||||||
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"Add->newValue.Id.IsNullOrEmpty()");
|
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"Add->newValue.Id.IsNullOrEmpty()");
|
||||||
|
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (Contains(newValue))
|
if (Contains(newValue))
|
||||||
throw new ArgumentException($@"It already contains this Id! Id: {newValue.Id}", nameof(newValue));
|
throw new ArgumentException($@"It already contains this Id! Id: {newValue.Id}", nameof(newValue));
|
||||||
|
|
||||||
UnsafeAdd(newValue);
|
UnsafeAdd(newValue);
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -198,12 +269,19 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
{
|
{
|
||||||
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"AddOrUpdate->newValue.Id.IsNullOrEmpty()");
|
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"AddOrUpdate->newValue.Id.IsNullOrEmpty()");
|
||||||
|
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var index = IndexOf(newValue);
|
var index = IndexOf(newValue);
|
||||||
|
|
||||||
return index > -1 ? Update(index, newValue) : UnsafeAdd(newValue);
|
return index > -1 ? Update(index, newValue) : UnsafeAdd(newValue);
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//public void AddRange(IEnumerable<T> collection)
|
//public void AddRange(IEnumerable<T> collection)
|
||||||
|
|
@ -233,7 +311,9 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
{
|
{
|
||||||
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"Insert->newValue.Id.IsNullOrEmpty()");
|
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"Insert->newValue.Id.IsNullOrEmpty()");
|
||||||
|
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (Contains(newValue))
|
if (Contains(newValue))
|
||||||
throw new ArgumentException($@"It already contains this Id! Id: {newValue.Id}", nameof(newValue));
|
throw new ArgumentException($@"It already contains this Id! Id: {newValue.Id}", nameof(newValue));
|
||||||
|
|
@ -241,6 +321,11 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
TrackingItems.AddTrackingItem(TrackingState.Add, newValue);
|
TrackingItems.AddTrackingItem(TrackingState.Add, newValue);
|
||||||
InnerList.Insert(index, newValue);
|
InnerList.Insert(index, newValue);
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -264,7 +349,9 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"Update->newValue.Id.IsNullOrEmpty()");
|
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"Update->newValue.Id.IsNullOrEmpty()");
|
||||||
if ((uint)index >= (uint)Count) throw new ArgumentOutOfRangeException(nameof(index));
|
if ((uint)index >= (uint)Count) throw new ArgumentOutOfRangeException(nameof(index));
|
||||||
|
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var currentItem = InnerList[index];
|
var currentItem = InnerList[index];
|
||||||
|
|
||||||
|
|
@ -276,6 +363,11 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
|
|
||||||
return newValue;
|
return newValue;
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -285,7 +377,9 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public bool Remove(T item)
|
public bool Remove(T item)
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var index = IndexOf(item);
|
var index = IndexOf(item);
|
||||||
|
|
||||||
|
|
@ -294,6 +388,11 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
RemoveAt(index);
|
RemoveAt(index);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -304,10 +403,17 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public bool TryRemove(Guid id, out T? item)
|
public bool TryRemove(Guid id, out T? item)
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
return TryGetValue(id, out item) && Remove(item);
|
return TryGetValue(id, out item) && Remove(item);
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -319,7 +425,9 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
/// <exception cref="NullReferenceException"></exception>
|
/// <exception cref="NullReferenceException"></exception>
|
||||||
public void RemoveAt(int index)
|
public void RemoveAt(int index)
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var currentItem = InnerList[index];
|
var currentItem = InnerList[index];
|
||||||
if (currentItem.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(currentItem), $@"RemoveAt->item.Id.IsNullOrEmpty(); index: {index}");
|
if (currentItem.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(currentItem), $@"RemoveAt->item.Id.IsNullOrEmpty(); index: {index}");
|
||||||
|
|
@ -327,6 +435,11 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
TrackingItems.AddTrackingItem(TrackingState.Remove, currentItem, currentItem);
|
TrackingItems.AddTrackingItem(TrackingState.Remove, currentItem, currentItem);
|
||||||
InnerList.RemoveAt(index);
|
InnerList.RemoveAt(index);
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -335,21 +448,39 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public List<TrackingItem<T>> GetTrackingItems()
|
public List<TrackingItem<T>> GetTrackingItems()
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
return TrackingItems.ToList();
|
return TrackingItems.ToList();
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetTrackingStateToUpdate(T item)
|
public void SetTrackingStateToUpdate(T item)
|
||||||
{
|
{
|
||||||
if (TrackingItems.TryGetTrackingItem(item.Id, out var trackingItem))
|
Monitor.Enter(_syncRoot);
|
||||||
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (trackingItem.TrackingState != TrackingState.Add)
|
if (TrackingItems.TryGetTrackingItem(item.Id, out var trackingItem))
|
||||||
trackingItem.TrackingState = TrackingState.Update;
|
{
|
||||||
|
if (trackingItem.TrackingState != TrackingState.Add)
|
||||||
|
trackingItem.TrackingState = TrackingState.Update;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!TryGetValue(item.Id, out var originalItem)) return;
|
||||||
|
TrackingItems.AddTrackingItem(TrackingState.Update, item, originalItem);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
}
|
}
|
||||||
|
|
||||||
TrackingItems.AddTrackingItem(TrackingState.Update, item, item);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -360,33 +491,49 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public bool TryGetTrackingItem(Guid id, [NotNullWhen(true)] out TrackingItem<T>? trackingItem)
|
public bool TryGetTrackingItem(Guid id, [NotNullWhen(true)] out TrackingItem<T>? trackingItem)
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
return TrackingItems.TryGetTrackingItem(id, out trackingItem);
|
return TrackingItems.TryGetTrackingItem(id, out trackingItem);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>Unsaved items</returns>
|
/// <returns>Unsaved items</returns>
|
||||||
public bool SaveChanges(out List<TrackingItem<T>> unsavedItems)
|
public async Task<List<TrackingItem<T>>> SaveChanges()
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
|
||||||
|
try
|
||||||
{
|
{
|
||||||
foreach (var trackingItem in TrackingItems.ToList())
|
foreach (var trackingItem in TrackingItems.ToList())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
SaveTrackingItemUnsafe(trackingItem);
|
//throw new Exception();
|
||||||
|
await SaveTrackingItemUnsafe(trackingItem);
|
||||||
}
|
}
|
||||||
catch
|
catch(Exception ex)
|
||||||
{
|
{
|
||||||
// ignored
|
TryRollbackItem(trackingItem.CurrentValue.Id, out _);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
unsavedItems = TrackingItems.ToList();
|
return TrackingItems.ToList();
|
||||||
return unsavedItems.Count == 0;
|
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -395,34 +542,55 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
/// <param name="id"></param>
|
/// <param name="id"></param>
|
||||||
/// <param name="resultItem"></param>
|
/// <param name="resultItem"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public bool TrySaveItem(Guid id, [NotNullWhen(true)] out T? resultItem)
|
public async Task<T?> SaveItem(Guid id)
|
||||||
{
|
{
|
||||||
resultItem = null;
|
Monitor.Enter(_syncRoot);
|
||||||
|
|
||||||
if (TryGetTrackingItem(id, out var trackingItem))
|
try
|
||||||
resultItem = SaveTrackingItemUnsafe(trackingItem);
|
{
|
||||||
|
T? resultItem = null;
|
||||||
|
|
||||||
return resultItem != null;
|
if (TryGetTrackingItem(id, out var trackingItem))
|
||||||
|
resultItem = await SaveTrackingItemUnsafe(trackingItem);
|
||||||
|
|
||||||
|
return resultItem;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool TrySaveItem(Guid id, TrackingState trackingState, [NotNullWhen(true)] out T? resultItem)
|
public async Task<T?> SaveItem(Guid id, TrackingState trackingState)
|
||||||
=> TryGetValue(id, out resultItem) && TrySaveItem(resultItem, trackingState, out resultItem);
|
|
||||||
|
|
||||||
public bool TrySaveItem(T item, TrackingState trackingState, [NotNullWhen(true)] out T? resultItem)
|
|
||||||
{
|
{
|
||||||
resultItem = SaveItemUnsafe(item, trackingState);
|
Monitor.Enter(_syncRoot);
|
||||||
return resultItem != null;
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
T? resultItem = null;
|
||||||
|
|
||||||
|
if (TryGetValue(id, out var item))
|
||||||
|
resultItem = await SaveItem(item, trackingState);
|
||||||
|
|
||||||
|
return resultItem;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected T? SaveTrackingItemUnsafe(TrackingItem<T> trackingItem)
|
public Task<T?> SaveItem(T item, TrackingState trackingState) => SaveItemUnsafe(item, trackingState);
|
||||||
|
|
||||||
|
protected Task<T?> SaveTrackingItemUnsafe(TrackingItem<T> trackingItem)
|
||||||
=> SaveItemUnsafe(trackingItem.CurrentValue, trackingItem.TrackingState);
|
=> SaveItemUnsafe(trackingItem.CurrentValue, trackingItem.TrackingState);
|
||||||
|
|
||||||
protected T? SaveItemUnsafe(T item, TrackingState trackingState)
|
protected async Task<T?> SaveItemUnsafe(T item, TrackingState trackingState)
|
||||||
{
|
{
|
||||||
var messageTag = SignalRCrudTags.GetMessageTagByTrackingState(trackingState);
|
var messageTag = SignalRCrudTags.GetMessageTagByTrackingState(trackingState);
|
||||||
if (messageTag == SignalRTags.None) return null; //throw new ArgumentException($"messageTag == SignalRTags.None");
|
if (messageTag == SignalRTags.None) return null; //throw new ArgumentException($"messageTag == SignalRTags.None");
|
||||||
|
|
||||||
var result = SignalRClient.PostDataAsync(messageTag, item).GetAwaiter().GetResult();
|
var result = await SignalRClient.PostDataAsync(messageTag, item);
|
||||||
if (result == null) return null; //throw new NullReferenceException($"result == null");
|
if (result == null) return null; //throw new NullReferenceException($"result == null");
|
||||||
|
|
||||||
if (TryGetTrackingItem(item.Id, out var trackingItem))
|
if (TryGetTrackingItem(item.Id, out var trackingItem))
|
||||||
|
|
@ -431,6 +599,9 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
if (TryGetIndex(result.Id, out var index))
|
if (TryGetIndex(result.Id, out var index))
|
||||||
InnerList[index] = result;
|
InnerList[index] = result;
|
||||||
|
|
||||||
|
var eventArgs = new ItemChangedEventArgs<T>(result, trackingState);
|
||||||
|
if (OnDataSourceItemChanged != null) await OnDataSourceItemChanged.Invoke(eventArgs);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -449,7 +620,8 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
|
|
||||||
public bool TryRollbackItem(Guid id, out T? originalValue)
|
public bool TryRollbackItem(Guid id, out T? originalValue)
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (TryGetTrackingItem(id, out var trackingItem))
|
if (TryGetTrackingItem(id, out var trackingItem))
|
||||||
{
|
{
|
||||||
|
|
@ -462,22 +634,40 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
originalValue = null;
|
originalValue = null;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Rollback()
|
public void Rollback()
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
try
|
||||||
{
|
{
|
||||||
foreach (var trackingItem in TrackingItems.ToList())
|
foreach (var trackingItem in TrackingItems.ToList())
|
||||||
RollbackItemUnsafe(trackingItem);
|
RollbackItemUnsafe(trackingItem);
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public int Count
|
public int Count
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
lock (_syncRoot) return InnerList.Count;
|
Monitor.Enter(_syncRoot);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return InnerList.Count;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -485,17 +675,30 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
|
|
||||||
public void Clear(bool clearChangeTracking)
|
public void Clear(bool clearChangeTracking)
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (clearChangeTracking) TrackingItems.Clear();
|
if (clearChangeTracking) TrackingItems.Clear();
|
||||||
InnerList.Clear();
|
InnerList.Clear();
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public int IndexOf(Guid id)
|
public int IndexOf(Guid id)
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
try
|
||||||
|
{
|
||||||
return InnerList.FindIndex(x => x.Id == id);
|
return InnerList.FindIndex(x => x.Id == id);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public int IndexOf(T item) => IndexOf(item.Id);
|
public int IndexOf(T item) => IndexOf(item.Id);
|
||||||
|
|
@ -505,22 +708,37 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
|
|
||||||
public bool TryGetValue(Guid id, [NotNullWhen(true)] out T? item)
|
public bool TryGetValue(Guid id, [NotNullWhen(true)] out T? item)
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
try
|
||||||
{
|
{
|
||||||
item = InnerList.FirstOrDefault(x => x.Id == id);
|
item = InnerList.FirstOrDefault(x => x.Id == id);
|
||||||
return item != null;
|
return item != null;
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void CopyTo(T[] array) => CopyTo(array, 0);
|
public void CopyTo(T[] array) => CopyTo(array, 0);
|
||||||
|
|
||||||
public void CopyTo(T[] array, int arrayIndex)
|
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)
|
public int BinarySearch(int index, int count, T item, IComparer<T>? comparer)
|
||||||
{
|
{
|
||||||
|
throw new NotImplementedException($"BinarySearch");
|
||||||
if (index < 0)
|
if (index < 0)
|
||||||
throw new ArgumentOutOfRangeException(nameof(index));
|
throw new ArgumentOutOfRangeException(nameof(index));
|
||||||
if (count < 0)
|
if (count < 0)
|
||||||
|
|
@ -528,8 +746,15 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
if (Count - index < count)
|
if (Count - index < count)
|
||||||
throw new ArgumentException("Invalid length");
|
throw new ArgumentException("Invalid length");
|
||||||
|
|
||||||
lock (_syncRoot)
|
//Monitor.Enter(_syncRoot);
|
||||||
return InnerList.BinarySearch(index, count, item, comparer);
|
//try
|
||||||
|
//{
|
||||||
|
// return InnerList.BinarySearch(index, count, item, comparer);
|
||||||
|
//}
|
||||||
|
//finally
|
||||||
|
//{
|
||||||
|
// Monitor.Exit(_syncRoot);
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
public int BinarySearch(T item) => BinarySearch(0, Count, item, null);
|
public int BinarySearch(T item) => BinarySearch(0, Count, item, null);
|
||||||
|
|
@ -537,8 +762,17 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
|
|
||||||
public IEnumerator<T> GetEnumerator()
|
public IEnumerator<T> GetEnumerator()
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
return InnerList.ToList().GetEnumerator();
|
try
|
||||||
|
{
|
||||||
|
//return InnerList.ToList().GetEnumerator();
|
||||||
|
return InnerList.GetEnumerator();
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ReadOnlyCollection<T> AsReadOnly() => new(this);
|
public ReadOnlyCollection<T> AsReadOnly() => new(this);
|
||||||
|
|
@ -618,11 +852,17 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
lock (_syncRoot)
|
Monitor.Enter(_syncRoot);
|
||||||
|
try
|
||||||
{
|
{
|
||||||
//TODO: _list.ToArray() - ez nem az igazi... - J.
|
//TODO: _list.ToArray() - ez nem az igazi... - J.
|
||||||
Array.Copy(InnerList.ToArray(), 0, array!, arrayIndex, InnerList.Count);
|
Array.Copy(InnerList.ToArray(), 0, array!, arrayIndex, InnerList.Count);
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
Monitor.Exit(_syncRoot);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
catch (ArrayTypeMismatchException)
|
catch (ArrayTypeMismatchException)
|
||||||
{
|
{
|
||||||
|
|
@ -638,4 +878,16 @@ namespace TIAMWebApp.Shared.Application.Utility
|
||||||
|
|
||||||
#endregion IList, ICollection
|
#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; }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ public class SignalRDataSourceAsync<T> : SignalRDataSource<T> where T : class, I
|
||||||
public Action<SignalRDataSourceAsync<T>>? OnDataSourceLoaded;
|
public Action<SignalRDataSourceAsync<T>>? OnDataSourceLoaded;
|
||||||
|
|
||||||
public SignalRDataSourceAsync(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, Guid? contextId = null, Action<SignalRDataSourceAsync<T>>? onDataSourceLoaded = null, bool autoLoadDataSource = false)
|
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;
|
OnDataSourceLoaded = onDataSourceLoaded;
|
||||||
|
|
||||||
|
|
@ -27,34 +27,34 @@ public class SignalRDataSourceAsync<T> : SignalRDataSource<T> where T : class, I
|
||||||
{
|
{
|
||||||
if (SignalRCrudTags.GetAllMessageTag == SignalRTags.None) throw new ArgumentException($"_signalRCrudTags.GetAllMessageTag == SignalRTags.None;");
|
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);
|
//Monitor.Enter(SyncRoot);
|
||||||
try
|
//try
|
||||||
{
|
//{
|
||||||
SignalRClient.GetAllAsync<List<T>>(SignalRCrudTags.GetAllMessageTag, ContextId, response =>
|
// SignalRClient.GetAllAsync<List<T>>(SignalRCrudTags.GetAllMessageTag, ContextId, response =>
|
||||||
{
|
// {
|
||||||
try
|
// try
|
||||||
{
|
// {
|
||||||
if (response.Status == SignalResponseStatus.Error) throw new Exception($"LoadDataSourceAsync; response.Status == SignalResponseStatus.Error");
|
// if (response.Status == SignalResponseStatus.Error) throw new Exception($"LoadDataSourceAsync; response.Status == SignalResponseStatus.Error");
|
||||||
if (response.ResponseData == null) throw new NullReferenceException($"response.ResponseData == null");
|
// if (response.ResponseData == null) throw new NullReferenceException($"response.ResponseData == null");
|
||||||
|
|
||||||
Clear(clearChangeTracking);
|
// Clear(clearChangeTracking);
|
||||||
InnerList.AddRange(response.ResponseData);
|
// InnerList.AddRange(response.ResponseData);
|
||||||
}
|
// }
|
||||||
finally
|
// finally
|
||||||
{
|
// {
|
||||||
Monitor.Exit(SyncRoot);
|
// Monitor.Exit(SyncRoot);
|
||||||
}
|
// }
|
||||||
|
|
||||||
OnDataSourceLoaded?.Invoke(this);
|
// OnDataSourceLoaded?.Invoke(this);
|
||||||
}).Forget();
|
// }).Forget();
|
||||||
}
|
//}
|
||||||
catch (Exception)
|
//catch (Exception)
|
||||||
{
|
//{
|
||||||
Monitor.Exit(SyncRoot);
|
// Monitor.Exit(SyncRoot);
|
||||||
throw;
|
// throw;
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -101,17 +101,4 @@ public class SignalRDataSourceAsync<T> : SignalRDataSource<T> where T : class, I
|
||||||
|
|
||||||
// return Task.CompletedTask;
|
// return Task.CompletedTask;
|
||||||
//}
|
//}
|
||||||
|
|
||||||
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; }
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue