From 70faba18553c76210343d193a431849daa689061 Mon Sep 17 00:00:00 2001 From: Loretta Date: Sat, 24 Aug 2024 15:04:38 +0200 Subject: [PATCH] fixes, etc... --- TIAM.Models/SiteViewModel.cs | 6 ++--- TIAMSharedUI/Pages/AppLaunchComponent.razor | 22 +++++++++++-------- .../Pages/Components/AuthComponent.razor.cs | 2 +- TIAMSharedUI/Pages/Login.razor.cs | 4 ++-- TIAMSharedUI/Shared/Components/Navbar.razor | 2 +- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/TIAM.Models/SiteViewModel.cs b/TIAM.Models/SiteViewModel.cs index 902163ac..7d4edb52 100644 --- a/TIAM.Models/SiteViewModel.cs +++ b/TIAM.Models/SiteViewModel.cs @@ -8,7 +8,7 @@ public class SiteViewModel : AcSiteViewModel { private readonly object _forLock = new(); - public int UnreadMessagesCount { get; private set; } = 0; + public int UnreadMessagesCount => UnreadMessages.Count; public List UnreadMessages { get; } = []; public DriverManageTransfersPageModel DriverManageTransfersPageModel { get; } = new(); @@ -38,7 +38,7 @@ public class SiteViewModel : AcSiteViewModel UnreadMessages.Clear(); UnreadMessages.AddRange(unreadMessages); - UnreadMessagesCount = UnreadMessages.Count; + //UnreadMessagesCount = UnreadMessages.Count; } } @@ -46,7 +46,7 @@ public class SiteViewModel : AcSiteViewModel { lock (_forLock) { - UnreadMessagesCount = 0; + //UnreadMessagesCount = 0; UnreadMessages.Clear(); DriverManageTransfersPageModel.ClearAll(); diff --git a/TIAMSharedUI/Pages/AppLaunchComponent.razor b/TIAMSharedUI/Pages/AppLaunchComponent.razor index a917c6b8..4a346a59 100644 --- a/TIAMSharedUI/Pages/AppLaunchComponent.razor +++ b/TIAMSharedUI/Pages/AppLaunchComponent.razor @@ -17,6 +17,7 @@ @using TIAM.Core.Loggers @using TIAM.Models @using TIAM.Services +@using TIAMSharedUI.Shared.Components @using TIAMWebApp.Shared.Application.Services @inject NavigationManager NavManager @inject IJSRuntime JSRuntime @@ -118,21 +119,21 @@ isSuccess = true; } - string _userId = jsontoken.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.NameId).Value; - string _email = jsontoken.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.Email).Value; - var user = await UserDataService.IsLoggedInAsync(Guid.Parse(_userId)); - if (isSuccess) { - await SaveToSessionInfo(user); + var userId = jsontoken.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.NameId).Value; + //var email = jsontoken.Claims.First(claim => claim.Type == JwtRegisteredClaimNames.Email).Value; + var user = await UserDataService.IsLoggedInAsync(Guid.Parse(userId)); + + SaveToSessionInfo(user); _logger.Info($"Saved user in db is: {user.DisplayName}, setting autenthicated state"); _adminSignalRClient.GetByIdAsync(SignalRTags.GetSiteViewModelByUserId, signalResponseMessage => { _siteViewModel.Initialize(signalResponseMessage.ResponseData!); - _logger.Debug($"UnreadMessages: {_siteViewModel.UnreadMessages.Count}"); + _logger.Debug($"UnreadMessages: {_siteViewModel.UnreadMessagesCount}"); - ComponentUpdateService.CallRequestRefreshAll(); + ComponentUpdateService.CallRequestRefresh(); return Task.CompletedTask; }, user.UserId).Forget(); } @@ -145,15 +146,17 @@ //NavManager.NavigateTo("/"); } - //ComponentUpdateService.CallRequestRefresh(); + ComponentUpdateService.CallRequestRefreshAll(); } - protected async Task SaveToSessionInfo(UserSessionModel user) + protected void SaveToSessionInfo(UserSessionModel user) { sessionService.User = user; sessionService.IsAuthenticated = true; sessionService.HasCompany = user.UserModelDto.UserProductMappings.Count > 0; + _logger.Debug($"Checking driver for: {user.UserModelDto.UserProductMappings.Count} mapping"); + sessionService.IsDriver = CheckIfDriver(user.UserModelDto.UserProductMappings); if (user.UserModelDto.Id == TiamConstClient.DevAdminIds[0] || user.UserModelDto.Id == TiamConstClient.DevAdminIds[1]) { @@ -166,6 +169,7 @@ sessionService.IsSysAdmin = true; } } + _logger.Debug($"Saved to session: IsAuthenticated: {sessionService.IsAuthenticated}, HasCompany: {sessionService.HasCompany}, IsDriver: {sessionService.IsDriver}, IsDevAdmin: {sessionService.IsDevAdmin}, IsSysAdmin: {sessionService.IsSysAdmin}"); } diff --git a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs index 4f9ec305..3054a159 100644 --- a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs +++ b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs @@ -29,7 +29,7 @@ namespace TIAMSharedUI.Pages.Components public bool IsVisible = false; private ILogger _logger; - protected override async Task OnInitializedAsync() + protected override void OnInitialized() { _logger = new LoggerClient(LogWriters.ToArray()); _logger.Debug("OnInitializedAsync"); diff --git a/TIAMSharedUI/Pages/Login.razor.cs b/TIAMSharedUI/Pages/Login.razor.cs index 67bb9660..8dbfc736 100644 --- a/TIAMSharedUI/Pages/Login.razor.cs +++ b/TIAMSharedUI/Pages/Login.razor.cs @@ -131,14 +131,14 @@ namespace TIAMSharedUI.Pages componentUpdateService.CallRequestRefreshAll(); return Task.CompletedTask; }, user.UserId).Forget(); + messageClass = "text-success"; resultMessage = "Successful login"; + SaveToSessionInfo(user).Forget(); navManager.NavigateTo("/"); } - } - } else { diff --git a/TIAMSharedUI/Shared/Components/Navbar.razor b/TIAMSharedUI/Shared/Components/Navbar.razor index 5c4c43a2..f106075b 100644 --- a/TIAMSharedUI/Shared/Components/Navbar.razor +++ b/TIAMSharedUI/Shared/Components/Navbar.razor @@ -80,7 +80,7 @@ @{ string url3 = $"user/messages/{userId}"; - @(" (" + SiteViewModel.UnreadMessages.Count + ")") + @(" (" + SiteViewModel.UnreadMessagesCount + ")") }