Refactor SignalR, pallet editing, and error handling
- Refactored SignalRMessageToClientWithText<T> to use explicit constructors and properties. - Added Shipping.Comment column to GridShippingDocument.razor. - Updated PalletItemComponent: renamed audit callback, added pre-save/audit callback, improved UI refresh logic. - MeasuringOut now uses new callbacks and _enablePalletItems flag to control editability during save/audit. - Wrapped SignalR message handling and logout logic in try/catch for better error logging. - MainLayout and MeasuringOut now implement IDisposable to unsubscribe SignalR events. - UI editability and state updates improved for thread safety and responsiveness.
This commit is contained in:
parent
f5915f7f72
commit
a73b72f831
|
|
@ -2,8 +2,16 @@
|
|||
|
||||
namespace FruitBank.Common.Models.SignalRs;
|
||||
|
||||
public class SignalRMessageToClientWithText<T>(string? message, T? content)
|
||||
public class SignalRMessageToClientWithText<T>
|
||||
{
|
||||
public string? Message { get; set; } = message;
|
||||
public T? Content { get; set; } = content;
|
||||
public SignalRMessageToClientWithText()
|
||||
{}
|
||||
public SignalRMessageToClientWithText(string? message, T? content) : this()
|
||||
{
|
||||
Message = message;
|
||||
Content = content;
|
||||
}
|
||||
|
||||
public string? Message { get; set; }
|
||||
public T? Content { get; set; }
|
||||
}
|
||||
|
|
@ -57,6 +57,7 @@
|
|||
<DxListEditorColumn FieldName="@nameof(Shipping.Id)" />
|
||||
<DxListEditorColumn FieldName="@nameof(Shipping.ShippingDate)" />
|
||||
<DxListEditorColumn FieldName="@nameof(Shipping.LicencePlate)" />
|
||||
<DxListEditorColumn FieldName="@nameof(Shipping.Comment)" />
|
||||
</Columns>
|
||||
</DxComboBoxSettings>
|
||||
</EditSettings>
|
||||
|
|
|
|||
|
|
@ -75,10 +75,14 @@
|
|||
[Parameter] public int? MaxTrayQuantity { get; set; } = null;
|
||||
[Parameter] public bool Editable { get; set; } = true;
|
||||
|
||||
//[Parameter] public EventCallback OnPalletItemSaveClick { get; set; }
|
||||
[Parameter] public Func<TPalletItem?, Task>? OnPalletItemSaved { get; set; }
|
||||
[Parameter] public Func<TPalletItem, Task>? OnPalletItemValueChanged { get; set; }
|
||||
[Parameter] public Func<TPalletItem?, Task>? OnPalletItemAuditedClick { get; set; }
|
||||
[Parameter] public Func<TPalletItem?, Task>? OnPalletItemAudited { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Before Save or Audit
|
||||
/// </summary>
|
||||
[Parameter] public Func<TPalletItem?, Task>? OnPalletItemSaveOrAuditClick { get; set; }
|
||||
|
||||
//public bool LoadingPanelVisible { get; set; } = false;
|
||||
//public bool Editable => !HasAuditButton || (OrderItemPallet.IsAudited);
|
||||
|
|
@ -119,6 +123,8 @@
|
|||
|
||||
PalletItem.ModifierId = LoggedInModel.CustomerDto?.Id;
|
||||
|
||||
if (OnPalletItemSaveOrAuditClick != null) await OnPalletItemSaveOrAuditClick.Invoke(PalletItem);
|
||||
|
||||
var responseShippingItemPallet = await FruitBankSignalRClient.PostDataAsync(AddOrUpdateSignalRTag!.Value, PalletItem);
|
||||
if (responseShippingItemPallet != null) PalletItem.Id = responseShippingItemPallet.Id; //Az UpdateCollection miatt kell, hogy megtalálja mit kell kicserélni! - J.
|
||||
//else _logger.Error($"Sikertelen volt a raklap adatainak mentése!");
|
||||
|
|
@ -126,7 +132,7 @@
|
|||
if (OnPalletItemSaved != null) await OnPalletItemSaved.Invoke(responseShippingItemPallet);
|
||||
//LoadingPanelVisible = false;
|
||||
|
||||
StateHasChanged();
|
||||
await InvokeAsync(StateHasChanged);
|
||||
}
|
||||
|
||||
protected async Task OnItemUpdating(string fieldName, object newValue, TPalletItem palletItem)
|
||||
|
|
@ -172,15 +178,17 @@
|
|||
|
||||
private async Task PalletItemAuditedClick()
|
||||
{
|
||||
if (OnPalletItemAuditedClick != null)
|
||||
if (OnPalletItemAudited != null)
|
||||
{
|
||||
if (OrderItemPallet == null) throw new Exception($"PalletItemComponent->PalletItemAuditedClick(); OrderItemPallet == null");
|
||||
|
||||
if (await DialogService.ShowConfirmBoxAsync("Megerősítés", "Biztoan jóváhagyja a mérést? Jóváhagyás után a mérés nem módosítható!", MessageBoxRenderStyle.Info))
|
||||
{
|
||||
if (OnPalletItemSaveOrAuditClick != null) await OnPalletItemSaveOrAuditClick.Invoke(PalletItem);
|
||||
|
||||
OrderItemPallet.RevisorId = LoggedInModel.CustomerDto!.Id;
|
||||
|
||||
StateHasChanged(); //Az Audit button miatt kell a StateHasChanged(), most már van RevisorId és emiatt disabled lesz...
|
||||
await InvokeAsync(StateHasChanged); //Az Audit button miatt kell a StateHasChanged(), most már van RevisorId és emiatt disabled lesz...
|
||||
|
||||
PalletItem.SetParentPropToNull();
|
||||
|
||||
|
|
@ -191,7 +199,7 @@
|
|||
await DialogService.ShowMessageBoxAsync("Hiba", "Adatok mentése sikertelen volt, ellenőrizze a mérés adatait!", MessageBoxRenderStyle.Danger);
|
||||
}
|
||||
|
||||
if (OnPalletItemAuditedClick != null) await OnPalletItemAuditedClick.Invoke(responseShippingItemPallet);
|
||||
await OnPalletItemAudited.Invoke(responseShippingItemPallet);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Components;
|
|||
|
||||
namespace FruitBankHybrid.Shared.Layout;
|
||||
|
||||
public partial class MainLayout : LayoutComponentBase
|
||||
public partial class MainLayout : LayoutComponentBase, IDisposable
|
||||
{
|
||||
[Inject] public required IEnumerable<IAcLogWriterClientBase> LogWriters { get; set; }
|
||||
[Inject] public required NavigationManager NavManager { get; set; }
|
||||
|
|
@ -70,10 +70,12 @@ public partial class MainLayout : LayoutComponentBase
|
|||
{
|
||||
if (messageTag != SignalRTags.NotificationReceived || !LoggedInModel.IsLoggedIn) return;
|
||||
|
||||
try
|
||||
{
|
||||
var notificationMessage = responseDataMessage?.GetResponseData<SignalRMessageToClientWithText<OrderDto>>();
|
||||
if (notificationMessage == null)
|
||||
{
|
||||
_logger.Error($"notificationMessage == null");
|
||||
_logger.Error($"MainLayout.SignalRClientOnMessageReceived; notificationMessage == null; messageTag: {messageTag}");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -93,7 +95,7 @@ public partial class MainLayout : LayoutComponentBase
|
|||
|
||||
if (!hasPermission) return;
|
||||
|
||||
_logger.Debug($"NotificationMessage received. {toastMessage}");
|
||||
_logger.Debug($"MainLayout.SignalRClientOnMessageReceived; NotificationMessage received. {toastMessage}");
|
||||
|
||||
await InvokeAsync(() =>
|
||||
{
|
||||
|
|
@ -101,13 +103,25 @@ public partial class MainLayout : LayoutComponentBase
|
|||
StateHasChanged();
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.Error($"MainLayout.SignalRClientOnMessageReceived ERROR; messageTag: {messageTag}", ex);
|
||||
}
|
||||
}
|
||||
|
||||
private async void OnLogoutClick()
|
||||
{
|
||||
try
|
||||
{
|
||||
await LoggedInModel.LogOutAsync();
|
||||
RefreshMainLayout();
|
||||
NavManager.NavigateTo("/Login");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_logger.Error($"OnLogoutClick error");
|
||||
}
|
||||
}
|
||||
|
||||
public void RefreshMainLayout()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -176,7 +176,8 @@
|
|||
{
|
||||
var selectedOrderItem = (OrderItemDto)(context.DataItem);
|
||||
|
||||
<DxFormLayout Context="ctxFormLayout" Data="@selectedOrderItem" CaptionPosition="CaptionPosition.Vertical" CssClass="w-100">
|
||||
<DxFormLayout Context="ctxFormLayout" Data="@selectedOrderItem" CaptionPosition="CaptionPosition.Vertical"
|
||||
CssClass="w-100">
|
||||
<DxFormLayoutItem Context="ctxFormLayoutItem" ColSpanMd="12">
|
||||
@for (var index = 0; index < (selectedOrderItem?.OrderItemPallets?.Count ?? 0); index++)
|
||||
{
|
||||
|
|
@ -185,14 +186,15 @@
|
|||
|
||||
<PalletItemComponent IsMeasurable="@selectedOrderItem.IsMeasurable"
|
||||
MeasuringIndex="@localI"
|
||||
Editable="@(!currentOrderItemPallet.IsAudited && !(SelectedOrder?.IsComplete ?? false))"
|
||||
Editable="@(_enablePalletItems && !currentOrderItemPallet.IsAudited && !(SelectedOrder?.IsComplete ?? false))"
|
||||
PalletItem="@currentOrderItemPallet"
|
||||
ProductId="@selectedOrderItem.ProductId"
|
||||
MaxTrayQuantity="@selectedOrderItem.Quantity"
|
||||
AddOrUpdateSignalRTag="SignalRTags.AddOrUpdateMeasuredOrderItemPallet"
|
||||
OnPalletItemSaveOrAuditClick="pallet => OnOrderItemSaveOrAuditClick(pallet, selectedOrderItem)"
|
||||
OnPalletItemSaved="pallet => OnOrderItemPalletSaved(pallet, selectedOrderItem)"
|
||||
OnPalletItemValueChanged="pallet => OnOrderItemPalletValueChanged(pallet, selectedOrderItem)"
|
||||
OnPalletItemAuditedClick="pallet => OnPalletItemAuditedClick(pallet, selectedOrderItem)">
|
||||
OnPalletItemAudited="pallet => OnOrderItemAudited(pallet, selectedOrderItem)">
|
||||
</PalletItemComponent>
|
||||
}
|
||||
</DxFormLayoutItem>
|
||||
|
|
|
|||
|
|
@ -17,9 +17,10 @@ using Nop.Core.Domain.Orders;
|
|||
|
||||
namespace FruitBankHybrid.Shared.Pages
|
||||
{
|
||||
public partial class MeasuringOut : ComponentBase
|
||||
public partial class MeasuringOut : ComponentBase, IDisposable
|
||||
{
|
||||
private readonly Lock _lock = new Lock();
|
||||
|
||||
[Inject] public required IEnumerable<IAcLogWriterClientBase> LogWriters { get; set; }
|
||||
[Inject] public required FruitBankSignalRClient FruitBankSignalRClient { get; set; }
|
||||
[Inject] public required NavigationManager NavManager{ get; set; }
|
||||
|
|
@ -29,6 +30,7 @@ namespace FruitBankHybrid.Shared.Pages
|
|||
private LoggerClient _logger = null!;
|
||||
private string _errorText;
|
||||
|
||||
private bool _enablePalletItems = true;
|
||||
private int _lastDaysCount = 1;
|
||||
public bool HasMeasuringAccess;
|
||||
public bool LoadingPanelVisible { get; set; } = true;
|
||||
|
|
@ -59,8 +61,10 @@ namespace FruitBankHybrid.Shared.Pages
|
|||
if (messageTag != SignalRTags.SendOrderItemDeleted && messageTag != SignalRTags.SendOrderChanged && messageTag != SignalRTags.SendOrderItemChanged &&
|
||||
messageTag != SignalRTags.SendOrderItemPalletChanged && messageTag != SignalRTags.SendProductChanged) return;
|
||||
|
||||
_logger.DebugConditional($"SignalRClientOnMessageReceived received. {responseDataMessage}");
|
||||
_logger.DebugConditional($"MeasuringOut.SignalRClientOnMessageReceived received. {responseDataMessage}");
|
||||
|
||||
try
|
||||
{
|
||||
OrderDto? orderDto;
|
||||
OrderItem? orderItem;
|
||||
OrderItemDto? orderItemDto;
|
||||
|
|
@ -151,7 +155,12 @@ namespace FruitBankHybrid.Shared.Pages
|
|||
return;
|
||||
}
|
||||
|
||||
_logger.Error($"SignalRClientOnMessageReceived message == null");
|
||||
_logger.Error($"MeasuringOut.SignalRClientOnMessageReceived message == null; messageTag: {messageTag}");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.Error($"MeasuringOut.SignalRClientOnMessageReceived ERROR; messageTag: {messageTag}", ex);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task RefreshOrdersFromDb(DateTime dateTime, int lastDaysCount)
|
||||
|
|
@ -241,12 +250,25 @@ namespace FruitBankHybrid.Shared.Pages
|
|||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private async Task OnPalletItemAuditedClick(OrderItemPallet? orderItemPallet, OrderItemDto selectedOrderItemDto)
|
||||
private async Task OnOrderItemAudited(OrderItemPallet? orderItemPallet, OrderItemDto selectedOrderItemDto)
|
||||
{
|
||||
if (orderItemPallet == null) return;
|
||||
|
||||
_enablePalletItems = false;
|
||||
|
||||
await InvokeAsync(StateHasChanged);
|
||||
await OnOrderItemPalletSaved(orderItemPallet, selectedOrderItemDto);
|
||||
}
|
||||
|
||||
private async Task OnOrderItemSaveOrAuditClick(OrderItemPallet? orderItemPallet, OrderItemDto selectedOrderItemDto)
|
||||
{
|
||||
if (orderItemPallet != null)
|
||||
{
|
||||
_enablePalletItems = false;
|
||||
await InvokeAsync(StateHasChanged);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task OnOrderItemPalletSaved(OrderItemPallet? orderItemPallet, OrderItemDto selectedOrderItemDto)
|
||||
{
|
||||
if (orderItemPallet != null)
|
||||
|
|
@ -258,7 +280,8 @@ namespace FruitBankHybrid.Shared.Pages
|
|||
}
|
||||
else await DialogService.ShowMessageBoxAsync("Hiba", "Adatok mentése sikertelen volt, ellenőrizze a mérés adatait!", MessageBoxRenderStyle.Danger);
|
||||
|
||||
StateHasChanged();
|
||||
_enablePalletItems = true;
|
||||
await InvokeAsync(StateHasChanged);
|
||||
}
|
||||
|
||||
private Task AddNewPalletItemClick(OrderItemDto selectedOrderItemDto)
|
||||
|
|
@ -359,5 +382,10 @@ namespace FruitBankHybrid.Shared.Pages
|
|||
orderDto.GenericAttributes.UpdateBaseEntityCollection(genericAttributes, false);
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
FruitBankSignalRClient.OnMessageReceived -= SignalRClientOnMessageReceived;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue