From c37f77f88247f72f929b3a48636cab99493a2f42 Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Mon, 27 May 2024 08:51:25 +0200 Subject: [PATCH] improvements --- .../Pages/User/MyServiceProviders.razor | 3 +- .../User/SysAdmins/ManageTransfers.razor | 27 +++++++--------- .../Interfaces/IServiceProviderDataService.cs | 3 +- .../Services/ServiceProviderDataService.cs | 31 +++++++++---------- 4 files changed, 30 insertions(+), 34 deletions(-) diff --git a/TIAMSharedUI/Pages/User/MyServiceProviders.razor b/TIAMSharedUI/Pages/User/MyServiceProviders.razor index 664b6a0f..65ec8a5b 100644 --- a/TIAMSharedUI/Pages/User/MyServiceProviders.razor +++ b/TIAMSharedUI/Pages/User/MyServiceProviders.razor @@ -9,6 +9,7 @@ @using AyCode.Core.Loggers @using AyCode.Services.Loggers @using TIAMWebApp.Shared.Application.Services +@using AyCode.Core.Helpers @layout AdminLayout @inject IEnumerable LogWriters @inject IStringLocalizer localizer @@ -194,7 +195,7 @@ ServiceProviderDataService.GetPropertiesByOwnerIdAsync(myId, companyPropertiesByOwner => { _logger.DetailConditional($"companyPropertiesByOwner count: {companyPropertiesByOwner?.Count.ToString() ?? "NULL"}"); - }); + }).Forget(); return base.OnInitializedAsync(); } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index a195117c..37c9b3a8 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/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 transferDataService.UpdateTransferAsync((Transfer)e.EditModel); + transfer = await devAdminSignalClient.UpdateAsync(SignalRTags.UpdateTransferAsync, (Transfer)e.EditModel); + //transfer = await transferDataService.UpdateTransferAsync((Transfer)e.EditModel); } //get transfer from TransferData by Id @@ -375,9 +375,7 @@ //e.Reload = true; } - else await UpdateAllDataAsync(); - - //StateHasChanged(); + else UpdateAllDataAsync().Forget(); } private void UpdateDataSources(Transfer transfer) @@ -405,23 +403,14 @@ { _logger.Info("UpdateAllDataAsync called"); - devAdminSignalClient.GetAllAsync>(SignalRTags.GetTransfersAsync, response => + return devAdminSignalClient.GetAllAsync>(SignalRTags.GetTransfersAsync, response => { if (response.Status == SignalResponseStatus.Error) return; InitializeDataSources(response.ResponseData ?? []); StateHasChanged(); - }).Forget(); - - - //var transfers = await devAdminSignalClient.GetAllAsync>(SignalRTags.GetTransfersAsync); - //InitializeDataSources(transfers ?? []); - - - //InitializeDataSources(await transferDataService.GetTransfersAsync()); - - return Task.CompletedTask; + }); } protected override Task OnInitializedAsync() @@ -430,6 +419,12 @@ UpdateAllDataAsync().Forget(); + //var transfers = await devAdminSignalClient.GetAllAsync>(SignalRTags.GetTransfersAsync); + //InitializeDataSources(transfers ?? []); + + + //InitializeDataSources(await transferDataService.GetTransfersAsync()); + return base.OnInitializedAsync(); } diff --git a/TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs b/TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs index 5b94fceb..734566d0 100644 --- a/TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs +++ b/TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs @@ -14,7 +14,8 @@ namespace TIAMWebApp.Shared.Application.Interfaces public interface IServiceProviderDataService { //17. (IServiceProviderDataService) get service providers by ownerId - public Task?> GetPropertiesByOwnerIdAsync(Guid id, Action?>? callback = null); + public Task?> GetPropertiesByOwnerIdAsync(Guid id); + public Task GetPropertiesByOwnerIdAsync(Guid id, Action?> callback); //13. delete service provider public Task DeleteServiceProviderAsync(Guid serviceProviderId); diff --git a/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs b/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs index 48ca2d3c..85b9a239 100644 --- a/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs +++ b/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs @@ -73,25 +73,24 @@ namespace TIAMWebApp.Shared.Application.Services { throw new NotImplementedException(); } + + //17. + public Task GetPropertiesByOwnerIdAsync(Guid id, Action?> callback) + { + return _devAdminSignalClient.GetByIdAsync>(SignalRTags.GetPropertiesByOwnerIdAsync, id, response => + { + if (response.Status == SignalResponseStatus.Error) + callback.Invoke(null); + + _logger.DetailConditional($"companyPropertiesByOwner async: {string.Join("; ", response.ResponseData!.Values)}"); + + callback.Invoke(response.ResponseData); + }); + } //17. - public async Task?> GetPropertiesByOwnerIdAsync(Guid id, Action?>? callback = null) + public async Task?> GetPropertiesByOwnerIdAsync(Guid id) { - if (callback != null) - { - _devAdminSignalClient.GetByIdAsync>(SignalRTags.GetPropertiesByOwnerIdAsync, id, response => - { - if (response.Status == SignalResponseStatus.Error) - callback.Invoke(null); - - _logger.DetailConditional($"companyPropertiesByOwner async: {string.Join("; ", response.ResponseData!.Values)}"); - - callback.Invoke(response.ResponseData); - }).Forget(); - - return null; - } - var companyPropertiesByOwner = await _devAdminSignalClient.GetByIdAsync>(SignalRTags.GetPropertiesByOwnerIdAsync, id); if (companyPropertiesByOwner != null) _logger.DetailConditional($"companyPropertiesByOwner: {string.Join("; ", companyPropertiesByOwner.Values)}");