diff --git a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor index 3b8bcc2..599b07f 100644 --- a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor +++ b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor @@ -37,6 +37,12 @@ + + @{ + var contextIds = new[] { (object)productDto.Id }; + + } + @{ //GetOrderDtosFromDbAsync(productId).Forget(); diff --git a/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs b/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs index 178d594..812df12 100644 --- a/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs +++ b/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs @@ -65,11 +65,11 @@ public partial class MainLayout : LayoutComponentBase } } - private async Task SignalRClientOnMessageReceived(int messageTag, string? jsonMessage) + private async Task SignalRClientOnMessageReceived(int messageTag, SignalResponseDataMessage? responseDataMessage) { if (messageTag != SignalRTags.NotificationReceived || !LoggedInModel.IsLoggedIn) return; - var notificationMessage = jsonMessage?.JsonTo>(); + var notificationMessage = responseDataMessage?.GetResponseData>(); if (notificationMessage == null) { _logger.Error($"notificationMessage == null"); diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs index e6827a9..116dbd5 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs +++ b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs @@ -1,5 +1,6 @@ using AyCode.Core.Extensions; using AyCode.Core.Loggers; +using AyCode.Services.SignalRs; using DevExpress.Blazor; using FruitBank.Common.Dtos; using FruitBank.Common.Entities; @@ -51,14 +52,14 @@ namespace FruitBankHybrid.Shared.Pages await base.OnInitializedAsync(); } - private async Task SignalRClientOnMessageReceived(int messageTag, string? jsonMessage) + private async Task SignalRClientOnMessageReceived(int messageTag, SignalResponseDataMessage? responseDataMessage) { if (!LoggedInModel.IsLoggedIn) return; if (messageTag != SignalRTags.SendOrderItemDeleted && messageTag != SignalRTags.SendOrderChanged && messageTag != SignalRTags.SendOrderItemChanged && messageTag != SignalRTags.SendOrderItemPalletChanged && messageTag != SignalRTags.SendProductChanged) return; - _logger.DebugConditional($"SignalRClientOnMessageReceived received. {jsonMessage}"); + _logger.DebugConditional($"SignalRClientOnMessageReceived received. {responseDataMessage}"); OrderDto? orderDto; OrderItem? orderItem; @@ -67,7 +68,7 @@ namespace FruitBankHybrid.Shared.Pages switch (messageTag) { case SignalRTags.SendOrderItemDeleted: - orderItem = jsonMessage?.JsonTo(); + orderItem = responseDataMessage?.GetResponseData(); if (orderItem == null) break; lock (_lock) @@ -79,7 +80,7 @@ namespace FruitBankHybrid.Shared.Pages await InvokeAsync(StateHasChanged); return; case SignalRTags.SendOrderChanged: - orderDto = jsonMessage?.JsonTo(); + orderDto = responseDataMessage?.GetResponseData(); if (orderDto == null) break; if (orderDto.DateOfReceipt == null) return; @@ -104,7 +105,7 @@ namespace FruitBankHybrid.Shared.Pages await InvokeAsync(StateHasChanged); return; case SignalRTags.SendOrderItemChanged: - orderItemDto = jsonMessage?.JsonTo(); + orderItemDto = responseDataMessage?.GetResponseData(); if (orderItemDto == null) break; lock (_lock) @@ -123,7 +124,7 @@ namespace FruitBankHybrid.Shared.Pages await InvokeAsync(StateHasChanged); return; case SignalRTags.SendOrderItemPalletChanged: - var orderItemPallet = jsonMessage?.JsonTo(); + var orderItemPallet = responseDataMessage?.GetResponseData(); if (orderItemPallet == null) break; lock (_lock) @@ -143,7 +144,7 @@ namespace FruitBankHybrid.Shared.Pages await InvokeAsync(StateHasChanged); return; case SignalRTags.SendProductChanged: - var productDto = jsonMessage?.JsonTo(); + var productDto = responseDataMessage?.GetResponseData(); if (productDto == null) break; await InvokeAsync(StateHasChanged); diff --git a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs index 11711f6..a39f9c6 100644 --- a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs +++ b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs @@ -40,13 +40,13 @@ namespace FruitBankHybrid.Shared.Services.SignalRs /// /// MessageTag, JSON /// - public event Func OnMessageReceived = null!; + public event Func OnMessageReceived = null!; protected override async Task MessageReceived(int messageTag, byte[] messageBytes) { - var jsonMessage = messageBytes.MessagePackTo(ContractlessStandardResolver.Options); + var responseDataMessage = messageBytes.BinaryTo(); - await OnMessageReceived(messageTag, jsonMessage.ResponseData); + await OnMessageReceived(messageTag, responseDataMessage); } private void SendMessageToAllClients(int messageTag, string message) diff --git a/FruitBankHybrid/FruitBankHybrid.csproj b/FruitBankHybrid/FruitBankHybrid.csproj index 12b3d17..0db0fbc 100644 --- a/FruitBankHybrid/FruitBankHybrid.csproj +++ b/FruitBankHybrid/FruitBankHybrid.csproj @@ -90,6 +90,7 @@ +