diff --git a/TIAM.Database/DbLogWriter.cs b/TIAM.Database/DbLogWriter.cs index 23185e6a..fa582351 100644 --- a/TIAM.Database/DbLogWriter.cs +++ b/TIAM.Database/DbLogWriter.cs @@ -3,6 +3,7 @@ using AyCode.Core.Loggers; using AyCode.Database; using AyCode.Database.DbContexts.Loggers; using AyCode.Entities.LogItems; +using AyCode.Entities.Server.LogItems; namespace TIAM.Database; diff --git a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs index c544707f..ea9ae3c9 100644 --- a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs +++ b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs @@ -19,6 +19,7 @@ using DevExpress.Pdf.Native.BouncyCastle.Asn1.Cms; using System.Text.RegularExpressions; using AyCode.Core.Consts; using AyCode.Core.Loggers; +using TIAM.Core.Loggers; namespace TIAMSharedUI.Pages.Components @@ -26,7 +27,7 @@ namespace TIAMSharedUI.Pages.Components public partial class InputWizard : ComponentBase { [Inject] - public required IAcLogWriterBase BrowserConsoleLogWriter { get; set; } + public required IEnumerable LogWriters { get; set; } [Inject] IStringLocalizer localizer { get; set; } @@ -61,11 +62,16 @@ namespace TIAMSharedUI.Pages.Components [Parameter] public string CssClass { get; set; } = ""; - + private ILogger _logger; string _formSubmitResult = ""; private string _spinnerClass = ""; + protected override async Task OnInitializedAsync() + { + _logger = new LoggerClient(LogWriters.ToArray()); + } + async Task HandleValidSubmit() { _spinnerClass = "spinner-border spinner-border-sm"; @@ -97,13 +103,13 @@ namespace TIAMSharedUI.Pages.Components public void OnNext(MouseEventArgs args) { - BrowserConsoleLogWriter.Info("OnNext called"); + _logger.Info("OnNext called"); CurrentStep++; } public void OnPrevious(MouseEventArgs args) { - BrowserConsoleLogWriter.Info("OnPrev called"); + _logger.Info("OnPrev called"); CurrentStep--; } @@ -111,7 +117,7 @@ namespace TIAMSharedUI.Pages.Components { var _type = Data.GetType(); - BrowserConsoleLogWriter.Info("Hellooooo " + _type.AssemblyQualifiedName); + _logger.Info("Hellooooo " + _type.AssemblyQualifiedName); var propertyList = _type.GetProperties(); var _length = propertyList.Length - IgnoreReflection.Count; @@ -137,7 +143,7 @@ namespace TIAMSharedUI.Pages.Components if (!FormSteps.ContainsKey(k)) { _stepID = Guid.NewGuid(); - BrowserConsoleLogWriter.Info($"Adding step {k}, {_stepID}, for {property.Name}"); + _logger.Detail($"Adding step {k}, {_stepID}, for {property.Name}"); FormSteps.Add(k, _stepID); } else @@ -151,6 +157,7 @@ namespace TIAMSharedUI.Pages.Components var lambda = Expression.Lambda(typeof(Func<>).MakeGenericType(property.PropertyType), access); BrowserConsoleLogWriter.Info($"{property.Name}, {property.GetType().FullName}"); + _logger.Detail(lambda.ToString()); layoutItemBuilder.OpenElement(i++, "div");//open div layoutItemBuilder.AddAttribute(i++, "id", _stepID.ToString()); @@ -163,7 +170,8 @@ namespace TIAMSharedUI.Pages.Components else { //this input should be focused, so we set a flag - BrowserConsoleLogWriter.Info($"Setting focus to {property.Name}"); + _logger.Detail($"Setting focus to {property.Name}"); + } DataTypeAttribute attrList = (DataTypeAttribute)property.GetCustomAttributes(typeof(DataTypeAttribute), false).First(); @@ -183,7 +191,7 @@ namespace TIAMSharedUI.Pages.Components case DataType.Text: { editor.OpenComponent(j++); - BrowserConsoleLogWriter.Info($"{property.Name}, {property.PropertyType}"); + _logger.Detail($"{property.Name}, {property.PropertyType}"); editor.AddAttribute(j++, "Text", property.GetValue(Data)); editor.AddAttribute(j++, "TextExpression", lambda); editor.AddAttribute(j++, "CssClass", "form-field"); @@ -358,9 +366,9 @@ namespace TIAMSharedUI.Pages.Components //editor.AddAttribute(j++, "TExpression", lambda); editor.AddAttribute(j++, "OnSliderChanged", EventCallback.Factory.Create(this, result => { - BrowserConsoleLogWriter.Info($"Slider changed to {result}"); + _logger.Detail($"Slider changed to {result}"); property.SetValue(Data, result); - BrowserConsoleLogWriter.Info($"bleh: {property.Name} = {property.GetValue(Data)}"); + _logger.Detail($"bleh: {property.Name} = {property.GetValue(Data)}"); StateHasChanged(); // Add this line to refresh the UI })); @@ -374,7 +382,7 @@ namespace TIAMSharedUI.Pages.Components editor.AddAttribute(j++, "TextChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); - BrowserConsoleLogWriter.Info($"bleh: {property.Name} = {property.GetValue(Data)}"); + _logger.Detail($"bleh: {property.Name} = {property.GetValue(Data)}"); })); editor.CloseComponent(); @@ -387,7 +395,7 @@ namespace TIAMSharedUI.Pages.Components editor.AddAttribute(j++, "NullText", "Please tell us your name."); editor.AddAttribute(j++, "FirstNameChanged", EventCallback.Factory.Create(this, result => { - BrowserConsoleLogWriter.Info($"FirstName changed to {result}"); + _logger.Detail($"FirstName changed to {result}"); //find property with name FirstName PropertyInfo firstNameProperty = propertyList.FirstOrDefault(p => p.Name == "FirstName"); @@ -406,7 +414,7 @@ namespace TIAMSharedUI.Pages.Components editor.AddAttribute(j++, "LastNameChanged", EventCallback.Factory.Create(this, result => { - BrowserConsoleLogWriter.Info($"LastName changed to {result}"); + _logger.Detail($"LastName changed to {result}"); //find property with name FirstName PropertyInfo firstNameProperty = propertyList.FirstOrDefault(p => p.Name == "FirstName"); @@ -421,7 +429,7 @@ namespace TIAMSharedUI.Pages.Components string fullName = $"{firstName} {lastName}"; property.SetValue(Data, fullName); } - BrowserConsoleLogWriter.Info($"bleh: {property.Name} = {property.GetValue(Data)}"); + _logger.Detail($"bleh: {property.Name} = {property.GetValue(Data)}"); StateHasChanged(); // Add this line to refresh the UI })); @@ -435,7 +443,7 @@ namespace TIAMSharedUI.Pages.Components editor.AddAttribute(j++, "TextChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); - BrowserConsoleLogWriter.Info($"bleh: {property.Name} = {property.GetValue(Data)}"); + _logger.Detail($"bleh: {property.Name} = {property.GetValue(Data)}"); })); editor.CloseComponent(); @@ -501,7 +509,7 @@ namespace TIAMSharedUI.Pages.Components layoutItemBuilder.CloseElement(); - BrowserConsoleLogWriter.Info($"loop {k}, length: {_length}, formSteps: {FormSteps.Count} "); + _logger.Detail($"loop {k}, length: {_length}, formSteps: {FormSteps.Count} "); k++; } @@ -510,7 +518,7 @@ namespace TIAMSharedUI.Pages.Components layoutItemBuilder.AddAttribute(i++, "CssClass", "full-width justify-content-center"); layoutItemBuilder.AddAttribute(i++, "Template", (RenderFragment)((context) => ((editor) => { - BrowserConsoleLogWriter.Info($"Submit button {CurrentStep}, {FormSteps.Count}"); + _logger.Detail($"Submit button {CurrentStep}, {FormSteps.Count}"); editor.OpenElement(i++, "button"); editor.AddAttribute(i++, "type", "submit"); @@ -553,7 +561,7 @@ namespace TIAMSharedUI.Pages.Components private void SetPhoneNumber(PropertyInfo property, object Data, string str) { - BrowserConsoleLogWriter.Info($"SetPhoneNumber called with {str}"); + _logger.Info($"SetPhoneNumber called with {str}"); property.SetValue(Data, str); } } diff --git a/TIAMSharedUI/Pages/LaunchAdmin.razor b/TIAMSharedUI/Pages/LaunchAdmin.razor index fb4ee41b..bb53aa56 100644 --- a/TIAMSharedUI/Pages/LaunchAdmin.razor +++ b/TIAMSharedUI/Pages/LaunchAdmin.razor @@ -7,28 +7,29 @@ @using AyCode.Core.Loggers @using TIAMWebApp.Shared.Application.Models.ClientSide @using AyCode.Interfaces.StorageHandlers; +@using TIAM.Core.Loggers @inject NavigationManager NavManager @inject IJSRuntime JSRuntime -@inject IAcLogWriterBase BrowserConsoleLogWriter @inject IUserDataService UserDataService @inject ISecureStorageHandler SecureStorageHandler @inject HttpClient http; +@inject IEnumerable LogWriters

AppLaunch

Loading.... @code { - + private ILogger _logger; - protected async override Task OnInitializedAsync() + protected override async Task OnInitializedAsync() { - - BrowserConsoleLogWriter = new BrowserConsoleLogWriter(JSRuntime); + _logger = new LoggerClient(LogWriters.ToArray()); + //wait for 5 seconds - await Task.Delay(5000); + //await Task.Delay(5000); string userDetailsStr = await SecureStorageHandler.GetFromSecureStorageAsync(nameof(Setting.UserBasicDetails)); - BrowserConsoleLogWriter.Info(userDetailsStr); + _logger.Info(userDetailsStr); if (!string.IsNullOrWhiteSpace(userDetailsStr)) { var userBasicDetail = JsonConvert.DeserializeObject(userDetailsStr); @@ -41,30 +42,30 @@ Loading.... if (jsontoken?.ValidTo < DateTime.UtcNow) { - BrowserConsoleLogWriter.Info("Token needs to be refreshed"); + _logger.Info("Token needs to be refreshed"); bool isTokenRefreshed = await UserDataService.RefreshToken(); if (isTokenRefreshed) { - BrowserConsoleLogWriter.Info("Token refreshed"); + _logger.Info("Token refreshed"); NavManager.NavigateTo("/home"); } else { - BrowserConsoleLogWriter.Info("Couldn't refresh token"); + _logger.Info("Couldn't refresh token"); NavManager.NavigateTo("/login"); } } else { - BrowserConsoleLogWriter.Info("Valid token found"); + _logger.Info("Valid token found"); NavManager.NavigateTo("/home"); } } else { - BrowserConsoleLogWriter.Info("No token stored yet"); + _logger.Info("No token stored yet"); NavManager.NavigateTo("/login"); } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor b/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor index e19203fa..d0e93ed9 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor @@ -3,8 +3,11 @@ @using TIAM.Models.Dtos.Users @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Utility +@using TIAM.Core.Loggers +@using AyCode.Core.Loggers @inject IUserDataService NwindDataService -@inject BrowserConsoleLogWriter BrowserConsoleLogWriter +@inject IEnumerable LogWriters +
Contact Phone: @PhoneNumber @@ -38,6 +41,7 @@ [Parameter] public Transfer Customer { get; set; } + private ILogger _logger; List DetailGridData { get; set; } public UserModelDtoDetail UserInfo; @@ -46,11 +50,13 @@ protected override async Task OnInitializedAsync() { + _logger = new LoggerClient(LogWriters.ToArray()); + UserInfo = await NwindDataService.GetUserDetailByIdAsync(Customer.UserId); PhoneNumber = UserInfo.UserDto.PhoneNumber; EmailAddress = UserInfo.UserDto.EmailAddress; DetailGridData = Customer.TransferToDrivers; - BrowserConsoleLogWriter.Info($"DetailGridData: {DetailGridData.Count}"); + _logger.Info($"DetailGridData: {DetailGridData.Count}"); } void CustomizeEditModel(GridCustomizeEditModelEventArgs e) @@ -73,10 +79,10 @@ { if (e.IsNew) //add new orderData to orderData array - BrowserConsoleLogWriter.Info("New orderData added"); + _logger.Info("New orderData added"); //await NwindDataService.InsertEmployeeAsync((EditableEmployee)e.EditModel); else - BrowserConsoleLogWriter.Info("orderData updated"); + _logger.Info("orderData updated"); //await NwindDataService.UpdateEmployeeAsync((EditableEmployee)e.DataItem, (EditableEmployee)e.EditModel); @@ -86,14 +92,14 @@ { //await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem); //remove orderData from orderData array - BrowserConsoleLogWriter.Info("orderData deleted"); + _logger.Info("orderData deleted"); //await UpdateDataAsync(); } async Task UpdateDataAsync() { //DataSource = await NwindDataService.GetEmployeesEditableAsync(); //refresh grid - BrowserConsoleLogWriter.Info("orderData grid refreshed"); + _logger.Info("orderData grid refreshed"); } } \ No newline at end of file diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor index 1412cbc3..89e51bd2 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor @@ -7,9 +7,10 @@ @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @using TIAMWebApp.Shared.Application.Models.ClientSide.Messages @using TIAMWebApp.Shared.Application.Utility +@using AyCode.Core.Loggers @layout AdminLayout -@inject BrowserConsoleLogWriter BrowserConsoleLogWriter @inject IStringLocalizer localizer +@inject BrowserConsoleLogWriter BrowserConsoleLogWriter