TIAMSharedUI/Pages/User/MyServiceProviders.razor

@@ -9,7 +9,6 @@
 @using AyCode.Core.Loggers
 @using AyCode.Services.Loggers
 @using TIAMWebApp.Shared.Application.Services
-@using AyCode.Core.Helpers
 @layout AdminLayout
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 @inject IStringLocalizer<TIAMResources> localizer
@@ -195,7 +194,7 @@
         ServiceProviderDataService.GetPropertiesByOwnerIdAsync(myId, companyPropertiesByOwner =>
         {
             _logger.DetailConditional($"companyPropertiesByOwner count: {companyPropertiesByOwner?.Count.ToString() ?? "NULL"}");
-        }).Forget();
+        });
 
         return base.OnInitializedAsync();
     }

TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor

@@ -352,8 +352,8 @@
         {
             _logger.Info("orderData updated at id " + ((Transfer)e.EditModel).Id);
 
-            transfer = await devAdminSignalClient.UpdateAsync(SignalRTags.UpdateTransferAsync, (Transfer)e.EditModel);
+            //transfer = await devAdminSignalClient.UpdateAsync(SignalRTags.UpdateTransferAsync, (Transfer)e.EditModel);
-            //transfer = await transferDataService.UpdateTransferAsync((Transfer)e.EditModel);
+            transfer = await transferDataService.UpdateTransferAsync((Transfer)e.EditModel);
 
         }
         //get transfer from TransferData by Id
@@ -375,7 +375,9 @@
 
             //e.Reload = true;
         }
-        else UpdateAllDataAsync().Forget();
+        else await UpdateAllDataAsync();
+
+        //StateHasChanged();
     }
 
     private void UpdateDataSources(Transfer transfer)
@@ -403,14 +405,23 @@
     {
         _logger.Info("UpdateAllDataAsync called");
 
-        return devAdminSignalClient.GetAllAsync<List<Transfer>>(SignalRTags.GetTransfersAsync, response =>
+        devAdminSignalClient.GetAllAsync<List<Transfer>>(SignalRTags.GetTransfersAsync, response =>
         {
             if (response.Status == SignalResponseStatus.Error)
                 return;
 
             InitializeDataSources(response.ResponseData ?? []);
             StateHasChanged();
-        });
+        }).Forget();
+
+
+        //var transfers = await devAdminSignalClient.GetAllAsync<List<Transfer>>(SignalRTags.GetTransfersAsync);
+        //InitializeDataSources(transfers ?? []);
+
+
+        //InitializeDataSources(await transferDataService.GetTransfersAsync());
+
+        return Task.CompletedTask;
     }
 
     protected override Task OnInitializedAsync()
@@ -419,12 +430,6 @@
 
         UpdateAllDataAsync().Forget();
 
-        //var transfers = await devAdminSignalClient.GetAllAsync<List<Transfer>>(SignalRTags.GetTransfersAsync);
-        //InitializeDataSources(transfers ?? []);
-
-
-        //InitializeDataSources(await transferDataService.GetTransfersAsync());
-
         return base.OnInitializedAsync();
     }
 

TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs

@@ -14,8 +14,7 @@ namespace TIAMWebApp.Shared.Application.Interfaces
     public interface IServiceProviderDataService
     {
         //17. (IServiceProviderDataService) get service providers by ownerId
-        public Task<Dictionary<Guid, string>?> GetPropertiesByOwnerIdAsync(Guid id);
+        public Task<Dictionary<Guid, string>?> GetPropertiesByOwnerIdAsync(Guid id, Action<Dictionary<Guid, string>?>? callback = null);
-        public Task GetPropertiesByOwnerIdAsync(Guid id, Action<Dictionary<Guid, string>?> callback);
 
         //13. delete service provider
         public Task DeleteServiceProviderAsync(Guid serviceProviderId);

TIAMWebApp/Shared/Services/AcSignalRClientBase.cs

@@ -130,7 +130,7 @@ namespace TIAMWebApp.Shared.Application.Services
                 {
                     if (responseMessage.Status == SignalResponseStatus.Error || responseMessage.ResponseData == null)
                     {
-                        Logger.Error($"Client SendMessageToServerAsync<TResponseData> response error; await; tag: {messageTag}; Status: {responseMessage.Status}");
+                        Logger.Error($"Client SendMessageToServerAsync<TResponseData>; tag: {messageTag}; Status: {responseMessage.Status}");
                         return default;
                     }
 
@@ -161,7 +161,7 @@ namespace TIAMWebApp.Shared.Application.Services
                 {
                     responseData = string.IsNullOrEmpty(responseMessage.ResponseData) ? default : responseMessage.ResponseData.JsonTo<TResponseData?>();
                 }
-                else Logger.Error($"Client SendMessageToServerAsync<TResponseData> response error; callback; tag: {messageTag}; Status: {responseMessage.Status}");
+                else Logger.Error($"Client SendMessageToServerAsync<TResponseData> callback; tag: {messageTag}; Status: {responseMessage.Status}");
 
                 responseCallback(new SignalResponseMessage<TResponseData?>(responseMessage.Status, responseData));
             });

TIAMWebApp/Shared/Services/ServiceProviderDataService.cs

@@ -75,9 +75,11 @@ namespace TIAMWebApp.Shared.Application.Services
         }
 
         //17.
-        public Task GetPropertiesByOwnerIdAsync(Guid id, Action<Dictionary<Guid, string>?> callback)
+        public async Task<Dictionary<Guid, string>?> GetPropertiesByOwnerIdAsync(Guid id, Action<Dictionary<Guid, string>?>? callback = null)
         {
-            return _devAdminSignalClient.GetByIdAsync<Dictionary<Guid, string>>(SignalRTags.GetPropertiesByOwnerIdAsync, id, response =>
+            if (callback != null)
+            {
+                _devAdminSignalClient.GetByIdAsync<Dictionary<Guid, string>>(SignalRTags.GetPropertiesByOwnerIdAsync, id, response =>
                 {
                     if (response.Status == SignalResponseStatus.Error)
                         callback.Invoke(null);
@@ -85,12 +87,11 @@ namespace TIAMWebApp.Shared.Application.Services
                     _logger.DetailConditional($"companyPropertiesByOwner async: {string.Join("; ", response.ResponseData!.Values)}");
 
                     callback.Invoke(response.ResponseData);
-            });
+                }).Forget();
+
+                return null;
             }
 
-        //17.
-        public async Task<Dictionary<Guid, string>?> GetPropertiesByOwnerIdAsync(Guid id)
-        {
             var companyPropertiesByOwner = await _devAdminSignalClient.GetByIdAsync<Dictionary<Guid, string>>(SignalRTags.GetPropertiesByOwnerIdAsync, id);
             if (companyPropertiesByOwner != null) _logger.DetailConditional($"companyPropertiesByOwner: {string.Join("; ", companyPropertiesByOwner.Values)}");