From 968e7a1c41ff9420b91de3b7b8d1568c1f5800cd Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Sat, 1 Jun 2024 16:09:54 +0200 Subject: [PATCH] fixes --- .../Shared/Components/Grids/TiamGrid.cs | 1 - .../Server/Services/DevAdminSignalRhub.cs | 29 +++---------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs index 3f560224..1618ce2a 100644 --- a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs @@ -100,7 +100,6 @@ namespace TIAMSharedUI.Shared.Components.Grids var dataItem = (e.EditModel as TDataItem)!; var logText = e.IsNew ? "add" : "update"; - Logger.Info($"{_gridLogName} OnItemSaving {logText}; Id: {dataItem.Id}"); await OnDataItemSaving.InvokeAsync(e); diff --git a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs index 0fe29ee0..e19b1a63 100644 --- a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs +++ b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs @@ -25,7 +25,7 @@ public static class ExtensionMethods { public static object? InvokeMethod(this MethodInfo methodInfo, object obj, params object[]? parameters) { - if (methodInfo.GetCustomAttribute(typeof(AsyncStateMachineAttribute)) is AsyncStateMachineAttribute isTaks) + if (methodInfo.GetCustomAttribute(typeof(AsyncStateMachineAttribute)) is AsyncStateMachineAttribute isAsyncTask) { dynamic awaitable = methodInfo.Invoke(obj, parameters)!; return awaitable.GetAwaiter().GetResult(); @@ -116,14 +116,6 @@ public class DevAdminSignalRHub : Hub, IAcSignalRHubServe await base.OnDisconnectedAsync(exception); } - //public async Task OnRequestMessage(int messageTag, int requestId) - //{ - // _logger.Info($"Server OnRequestMessage; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId}; ConnectionId: {Context.ConnectionId}; UserIdentifier: {Context.UserIdentifier}"); - - // if (messageTag == SignalRTags.GetTransfersAsync) - // await ResponseToCaller(SignalRTags.PostTransfersAsync, await adminDal.GetTransfersJsonAsync(), requestId); - //} - public async Task OnReceiveMessage(int messageTag, byte[]? message, int? requestId) { var logText = $"Server OnReceiveMessage; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId}; ConnectionId: {Context.ConnectionId}; UserIdentifier: {Context.UserIdentifier}"; @@ -146,15 +138,9 @@ public class DevAdminSignalRHub : Hub, IAcSignalRHubServe _logger.Debug($"{logText}({methodInfoModel.ParameterType.Name})"); paramValues = new object[1]; - if (methodInfoModel.ParameterType == typeof(Guid) || methodInfoModel.ParameterType == typeof(Guid?)) - { - paramValues[0] = message!.MessagePackTo().Id; - } - else - { - var msg = message!.MessagePackTo>(MessagePackSerializerOptions.Standard); - paramValues[0] = msg.PostDataJson.JsonTo(methodInfoModel.ParameterType)!; - } + + if (methodInfoModel.ParameterType == typeof(Guid) || methodInfoModel.ParameterType == typeof(Guid?)) paramValues[0] = message!.MessagePackTo().Id; + else paramValues[0] = message!.MessagePackTo>(MessagePackSerializerOptions.Standard).PostDataJson.JsonTo(methodInfoModel.ParameterType)!; } else _logger.Debug($"{logText}()"); @@ -231,13 +217,6 @@ public class DevAdminSignalRHub : Hub, IAcSignalRHubServe await sendTo.OnReceiveMessage(messageTag, message.ToMessagePack(ContractlessStandardResolver.Options), requestId); } - //protected void SendRequestToClient(ISignalRHubItemServer sendTo, int messageTag, int requestId) - //{ - // _logger.Info($"Server SendRequestToClient; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId}; ConnectionId: {Context.ConnectionId}; UserIdentifier: {Context.UserIdentifier}"); - - // sendTo.OnRequestMessage(messageTag, requestId).Forget(); - //} - public async Task SendMessageToGroup(string groupId, int messageTag, string message) { //await Clients.Group(groupId).Post("", messageTag, message);