From 6adb23755a6797a99c59ca9453429dfd1016b4e7 Mon Sep 17 00:00:00 2001
From: Adam <adam.g@virtualplanet.eu>
Date: Fri, 28 Jun 2024 17:32:38 +0200
Subject: [PATCH 1/3] merge

---
 TIAMSharedUI/Shared/Components/Navbar.razor | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/TIAMSharedUI/Shared/Components/Navbar.razor b/TIAMSharedUI/Shared/Components/Navbar.razor
index d3f1d198..5bea1868 100644
--- a/TIAMSharedUI/Shared/Components/Navbar.razor
+++ b/TIAMSharedUI/Shared/Components/Navbar.razor
@@ -102,11 +102,20 @@
             <ul class="nav navbar-nav navbar-right">
                 <AuthorizeView>
                     <Authorized>
-                        <li class="nav-item">
-                            <NavLink class="nav-link" href="login">
-                                Test
-                            </NavLink>
-                        </li>
+                        @if(hasProperty)
+                        {
+                            <li class="nav-item">
+                                <NavLink class="nav-link" href="user/admin">
+                                    Admin
+                                </NavLink>
+                            </li>
+                            <li class="nav-item">
+                                <NavLink class="nav-link" href="user/messages">
+                                    Messages
+                                </NavLink>
+                            </li>
+                            
+                        }
                     </Authorized>
                 </AuthorizeView>
                 @if(enableLogin)

From 5fcab23479d5f9de75eca7bd72fb8450d98a627e Mon Sep 17 00:00:00 2001
From: Adam <adam.g@virtualplanet.eu>
Date: Sun, 30 Jun 2024 14:44:00 +0200
Subject: [PATCH 2/3] bleh...miac... logger api

---
 TIAM.Database/DataLayers/Admins/AdminDal.cs   |   7 +
 .../DbContexts/Admins/AdminDbContext.cs       |   4 +-
 .../Pages/User/SysAdmins/LogViewer.razor      |  75 ++++++
 .../SysAdmins/LogViewerGridComponent.razor    | 224 ++++++++++++++++++
 .../Shared/Components/Grids/LogViewerGrid.cs  |  33 +++
 .../Shared/Components/Grids/TiamGrid.cs       |   2 +-
 .../Server/Controllers/LoggerApiController.cs |  22 +-
 TIAMWebApp/Shared/Models/APIUrls.cs           |   7 +-
 .../ClientSide/UI/LogitemViewerModel.cs       |  28 +++
 9 files changed, 396 insertions(+), 6 deletions(-)
 create mode 100644 TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor
 create mode 100644 TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor
 create mode 100644 TIAMSharedUI/Shared/Components/Grids/LogViewerGrid.cs
 create mode 100644 TIAMWebApp/Shared/Models/ClientSide/UI/LogitemViewerModel.cs

diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs
index 7cf55d5b..592fefad 100644
--- a/TIAM.Database/DataLayers/Admins/AdminDal.cs
+++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs
@@ -28,6 +28,7 @@ using DevExpress.Data.Filtering;
 using DevExpress.Data.Linq;
 using DevExpress.Data.Linq.Helpers;
 using TIAM.Database.DbSets.Drivers;
+using AyCode.Entities.Server.LogItems;
 
 namespace TIAM.Database.DataLayers.Admins
 {
@@ -627,5 +628,11 @@ namespace TIAM.Database.DataLayers.Admins
 
         #endregion
 
+        #region Logs
+
+        public Task<List<AcLogItem>> GetLogItemsAsync() => SessionAsync(ctx => ctx.LogItems.ToList());
+
+        #endregion
+
     }
 }
diff --git a/TIAM.Database/DbContexts/Admins/AdminDbContext.cs b/TIAM.Database/DbContexts/Admins/AdminDbContext.cs
index a5579c78..f386f33e 100644
--- a/TIAM.Database/DbContexts/Admins/AdminDbContext.cs
+++ b/TIAM.Database/DbContexts/Admins/AdminDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using AyCode.Entities.Server.LogItems;
+using Microsoft.EntityFrameworkCore;
 using TIAM.Database.ModelBuilders.Companies;
 using TIAM.Database.ModelBuilders.Emails;
 using TIAM.Database.ModelBuilders.Products;
@@ -18,6 +19,7 @@ namespace TIAM.Database.DbContexts.Admins
 {
     public class AdminDbContext : DbContextBase, IAdminDbContext
     {
+        public DbSet<AcLogItem> LogItems { get; set; }
         public DbSet<User> Users { get; set; }
         public DbSet<Profile> Profiles { get; set; }
         public DbSet<Company> Companies { get; set; }
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor b/TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor
new file mode 100644
index 00000000..ec993678
--- /dev/null
+++ b/TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor
@@ -0,0 +1,75 @@
+@page "/sysadmin/logs"
+@using BlazorAnimation
+@using TIAM.Entities.Users
+@using TIAM.Models.Dtos.Users
+@using TIAM.Resources
+@using TIAM.Services
+@using TIAMSharedUI.Pages.Components
+@using TIAMSharedUI.Shared
+@using TIAMWebApp.Shared.Application.Interfaces
+@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
+@using TIAMWebApp.Shared.Application.Models.PageModels
+@using TIAMWebApp.Shared.Application.Utility
+@using AyCode.Services.Loggers
+@using TIAM.Core.Consts
+@layout AdminLayout
+@inject IEnumerable<IAcLogWriterClientBase> LogWriters
+@inject IStringLocalizer<TIAMResources> Localizer
+@inject ISessionService SessionService
+
+<PageTitle>User permissions</PageTitle>
+
+<div class="text-center m-5">
+    <h1>Drivers</h1>
+    <h2 style="font-size:small">Manage drivers here!</h2>
+</div>
+
+
+<div class="container-fluid">
+    <div class="row">
+        <div class=" col-12">
+            <Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
+                <div class="card">
+                    <div class="d-flex flex-column mb-4 pb-2">
+                        <div class="align-self-end pl-2 pb-2">
+                            <DxButton Text="Column Chooser"
+                                      RenderStyle="ButtonRenderStyle.Secondary"
+                                      IconCssClass="btn-column-chooser"
+                                      Click="ColumnChooserButton_Click" />
+                        </div>
+
+                        <LogViewerGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" ContextId="TiamConstClient.TransferProductId" GetAllTag="SignalRTags.GetUserProductMappingsByProductId"></LogViewerGridComponent>
+
+                    </div>
+
+                </div>
+            </Animation>
+        </div>
+
+        <div class=" col-12 col-xl-6">
+        </div>
+
+    </div>
+</div>
+
+@code {
+    private LoggerClient<ManageUserProductMappings> _logger;
+    //public UserModelDtoDetail UserModelDtoDetail = new();
+    
+
+    IGrid Grid { get; set; }
+    //object? MasterGridData { get; set; }
+
+    protected override async Task OnInitializedAsync()
+    {
+        _logger = new LoggerClient<ManageUserProductMappings>(LogWriters.ToArray());
+
+        base.OnInitialized();
+    }
+
+    void ColumnChooserButton_Click()
+    {
+        Grid.ShowColumnChooser();
+    }
+
+}
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor
new file mode 100644
index 00000000..480df5dc
--- /dev/null
+++ b/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor
@@ -0,0 +1,224 @@
+@using TIAM.Entities.Products
+@using TIAM.Entities.Transfers
+@using TIAM.Entities.Drivers
+@using TIAM.Entities.Users
+@using TIAM.Models.Dtos.Users
+@using TIAM.Services
+@using TIAMSharedUI.Shared.Components.Grids
+@using TIAMWebApp.Shared.Application.Interfaces
+@using TIAMWebApp.Shared.Application.Services
+@using TIAMWebApp.Shared.Application.Utility
+@using TIAM.Core.Loggers
+@using AyCode.Core.Loggers
+@using AyCode.Services.Loggers
+@using AyCode.Core
+@using AyCode.Core.Extensions
+@inject IServiceProviderDataService ServiceProviderDataService
+@inject IEnumerable<IAcLogWriterClientBase> LogWriters
+@inject AdminSignalRClient AdminSignalRClient
+@inject IWizardProcessor WizardProcessor
+@inject IUserDataService UserDataService
+
+
+<LogViewerGrid Logger="_logger"
+                        @ref="_logViewerGrid"
+                        ContextIds="new [] {ContextId}"
+                        GetAllMessageTag="GetAllTag"
+                        SignalRClient="AdminSignalRClient"
+                        PageSize="10"
+                        ValidationEnabled="false"
+                        CustomizeElement="Grid_CustomizeElement"
+                        CustomizeEditModel="CustomizeEditModel"
+                        EditMode="GridEditMode.EditForm"
+                        ColumnResizeMode="GridColumnResizeMode.NextColumn"
+                        DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode"
+                        ShowFilterRow="true">
+    <Columns>
+        <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
+        <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
+        @{
+            var userEmailFieldName = $"{nameof(UserProductMapping.User)}.{nameof(User.EmailAddress)}";
+        }
+        <DxGridDataColumn FieldName="@userEmailFieldName" Caption="User email" SortIndex="0" />
+        <DxGridDataColumn FieldName="ProductId" Caption="ServiceId" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
+        @{
+            var productNameFieldName = $"{nameof(UserProductMapping.Product)}.{nameof(Product.Name)}";
+        }
+        <DxGridDataColumn FieldName="@productNameFieldName" Caption="Service name" />
+        <DxGridDataColumn FieldName="Permissions" />
+    </Columns>
+    <DetailRowTemplate>
+        @{
+                <DxTabs>
+
+                    <DxTabPage Text="Products">
+                        <ProductDetailGridComponent GetAllTag="SignalRTags.GetProductsById" ContextId="((UserProductMapping)context.DataItem).ProductId" />
+                    </DxTabPage>
+                    <DxTabPage Text="Cars">
+                        <CarDetailGridComponent GetAllTag="SignalRTags.GetCarsForUserProductMapping" ContextId="((UserProductMapping)context.DataItem).Id" />
+                    </DxTabPage>
+                </DxTabs>
+        }
+    </DetailRowTemplate>
+
+    <EditFormTemplate Context="UserEditFormContext">
+
+        
+        @{
+            var transfer2 = (UserProductMapping)UserEditFormContext.EditModel;
+        }
+        <DxFormLayout CssClass="w-100">
+            
+            <DxFormLayoutItem Caption="UserId" ColSpanLg="6" ColSpanMd="12">
+                @transfer2.UserId
+                @{
+                    var a = UserEditFormContext.GetEditor("UserId");
+                } 
+                @* <DxButton Click="() => ShowPopup((UserProductMapping)UserEditFormContext.EditModel)" Context="ButtonContext">Select user</DxButton> *@
+                <DxButton Click="@(async (MouseEventArgs e) => await ShowPopup((UserProductMapping)UserEditFormContext.EditModel))" Context="ButtonContext">Select user</DxButton>
+            </DxFormLayoutItem>
+            
+            <DxFormLayoutItem Caption="Permissions" ColSpanMd="4">
+                @UserEditFormContext.GetEditor("Permissions")
+            </DxFormLayoutItem>
+
+
+
+        </DxFormLayout>
+    </EditFormTemplate>
+
+</LogViewerGrid>
+
+@code {
+    [Parameter] public Guid ContextId { get; set; }
+    [Parameter] public IProductRelation ParentData { get; set; } = null!;
+    [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllUserProductMappings;
+    [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never;
+
+    private LoggerClient<UserProductMappingGridComponent> _logger;    
+
+    private LogViewerGrid _logViewerGrid;
+
+    private UserProductMapping _tempProductMapping;
+
+    bool PopupVisible { get; set; }
+    private DxMaskedInput<string> _emailInput;
+    private DxButton _button1;
+    private ElementReference _errorMessage;
+    private string _errorCss = "display: none;";
+    private List<UserModelDto> FoundUsers { get; set; } = new List<UserModelDto>();
+
+
+    private string Email { get; set; } = "email@email.com";
+    string EmailMask { get; set; } = @"(\w|[.-])+@(\w|-)+\.(\w|-){2,4}";
+    UserModelDto _chosenUser = null!;
+
+    protected override void OnInitialized()
+    {
+        _logger = new LoggerClient<UserProductMappingGridComponent>(LogWriters.ToArray());
+
+        base.OnInitialized();
+    }
+
+    void CustomizeEditModel(GridCustomizeEditModelEventArgs e)
+    {
+        if (!e.IsNew) return;
+
+        if (ContextId.IsNullOrEmpty())
+        {
+            _logger.Warning($"ContextId.IsNullOrEmpty()");
+            return;
+        }
+
+        var newUpm = (UserProductMapping)e.EditModel;
+        newUpm.ProductId = ContextId;
+
+        var newProductMapping = new UserProductMapping
+        {
+            Id = Guid.NewGuid(),
+            ProductId = (Guid)ContextId,
+            Permissions = 2
+        };
+
+        //e.EditModel = newProductMapping;
+    }
+
+    async Task FindUser()
+    {
+        var userModelDto = await UserDataService.GetUserByEmailAsync(Email);
+        if (userModelDto != null)
+        {
+            _chosenUser = userModelDto;
+            FoundUsers.Add(_chosenUser);
+            _emailInput.Enabled = false;
+            _button1.Visible = false;
+        }
+        else
+        {
+            _emailInput.Value = "email@email.com";
+            _errorCss = "display: block";
+        }
+    }
+
+    void CancelCreateClick()
+    {
+        PopupVisible = false;
+    }
+
+    void SelectDriverPopupClosed()
+    {
+        //cancel clicked
+    }
+
+    void SelectDriverPopupClosing(PopupClosingEventArgs args)
+    {
+        //myModel = new TransferWizardModel();
+
+    }
+
+    public Task SubmitForm(object result)
+    {
+        _logger.Info($"Submitted nested form: {result.GetType().FullName}");
+        return Task.CompletedTask;
+    }
+
+    public Task ShowPopup(UserProductMapping emptyProductMapping)
+    {
+        _tempProductMapping = emptyProductMapping;
+        PopupVisible = true;
+
+        return Task.CompletedTask;
+    }
+
+    private async Task OnUserSelected(Guid userId)
+    {
+        // Logic after the user is selected
+        await Task.Run(() => Console.WriteLine($"Selected User ID: {userId}"));
+    }
+
+    private async Task OnRowClick(GridRowClickEventArgs e)
+    {
+        await SelectUser((Guid)e.Grid.GetRowValue(e.VisibleIndex, "Id"));
+    }
+
+    private async Task SelectUser(Guid id)
+    {
+        PopupVisible = false;
+        _tempProductMapping.UserId = id;
+
+        await OnUserSelected(id);
+    }
+
+    void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
+    {
+        if (e.ElementType == GridElementType.DataRow && (int)e.Grid.GetRowValue(e.VisibleIndex, "Permissions") == 1)
+        {
+            e.Style = "display: none";
+        }
+        // else if (e.ElementType == GridElementType.HeaderCell)
+        // {
+        //     e.Style = "background-color: rgba(0, 0, 0, 0.08); font-style=bold";
+
+        // }
+    }
+}
\ No newline at end of file
diff --git a/TIAMSharedUI/Shared/Components/Grids/LogViewerGrid.cs b/TIAMSharedUI/Shared/Components/Grids/LogViewerGrid.cs
new file mode 100644
index 00000000..56bbd26e
--- /dev/null
+++ b/TIAMSharedUI/Shared/Components/Grids/LogViewerGrid.cs
@@ -0,0 +1,33 @@
+using Microsoft.AspNetCore.Components;
+using AyCode.Entities.LogItems;
+using TIAM.Entities.Users;
+using TIAM.Services;
+using TIAM.Entities.Transfers;
+using TIAMWebApp.Shared.Application.Models.ClientSide.UI;
+
+namespace TIAMSharedUI.Shared.Components.Grids;
+
+public class LogViewerGrid : TiamGrid<LogitemViewerModel>
+{
+    public LogViewerGrid() : base()
+    {
+        GetAllMessageTag = SignalRTags.GetAllUserProductMappings;
+        AddMessageTag = SignalRTags.CreateUserProductMapping;
+        UpdateMessageTag = SignalRTags.UpdateUserProductMapping;
+        RemoveMessageTag = SignalRTags.DeleteUserProductMapping;
+    }
+
+    protected override Task SetParametersAsyncCore(ParameterView parameters)
+    {
+        if (!IsFirstInitializeParameters)
+        {
+            //ShowFilterRow = true;
+            //ShowGroupPanel = true;
+            //AllowSort = false;
+
+            //etc...
+        }
+
+        return base.SetParametersAsyncCore(parameters);
+    }
+}
\ No newline at end of file
diff --git a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
index b504101d..a57ee379 100644
--- a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
+++ b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
@@ -18,7 +18,7 @@ using TIAMWebApp.Shared.Application.Utility;
 
 namespace TIAMSharedUI.Shared.Components.Grids
 {
-    public class TiamGrid<TDataItem> : DxGrid where TDataItem : class, IId<Guid>
+    public class TiamGrid<TDataItem> : DxGrid where TDataItem : class, IId<Guid> 
     {
         protected bool IsFirstInitializeParameters;
         private SignalRDataSource<TDataItem> _dataSource = null!;
diff --git a/TIAMWebApp/Server/Controllers/LoggerApiController.cs b/TIAMWebApp/Server/Controllers/LoggerApiController.cs
index f39eb6f2..8f801cf4 100644
--- a/TIAMWebApp/Server/Controllers/LoggerApiController.cs
+++ b/TIAMWebApp/Server/Controllers/LoggerApiController.cs
@@ -3,8 +3,10 @@ using AyCode.Entities.Server.LogItems;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
+using TIAM.Database.DataLayers.Admins;
 using TIAMWebApp.Server.Services;
 using TIAMWebApp.Shared.Application.Models;
+using TIAMWebApp.Shared.Application.Models.ClientSide.UI;
 
 namespace TIAMWebApp.Server.Controllers
 {
@@ -12,13 +14,14 @@ namespace TIAMWebApp.Server.Controllers
     [ApiController]
     [EnableCors("_myAllowSpecificOrigins")]
     [Route("api/v1/[controller]")]
-    public class LoggerApiController(LoggerToLoggerApiController logger) : ControllerBase
+    public class LoggerApiController(LoggerToLoggerApiController logger, AdminDal _adminDal) : ControllerBase
     {
+        
         // = new TIAM.Core.Loggers.Logger<LoggerApiController>();
 
         [AllowAnonymous]
         [HttpPost]
-        [Route(APIUrls.LoggerRouteName)]
+        [Route(APIUrls.AddLogItemRouteName)]
         public async Task AddLogItem(AcLogItem? logItem)
         {
             try
@@ -44,5 +47,20 @@ namespace TIAMWebApp.Server.Controllers
                 Console.WriteLine($@"ERROR!!! {nameof(LoggerApiController)}->AddLogItem; ex: {ex.Message}{AcEnv.NL}{AcEnv.NL}{ex}");
             }
         }
+
+        [AllowAnonymous]
+        [HttpGet]
+        [Route(APIUrls.GetAllLogItemsRouteName)]
+        public async Task<List<LogitemViewerModel>> GetAllLogItems()
+        {
+            var result = await _adminDal.GetLogItemsAsync();
+            List<LogitemViewerModel> returnList = new List<LogitemViewerModel>();
+            foreach (var item in result)
+            {
+                returnList.Add(new LogitemViewerModel(Guid.NewGuid(), item, item.LogHeaderId));
+            }
+            return returnList;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/TIAMWebApp/Shared/Models/APIUrls.cs b/TIAMWebApp/Shared/Models/APIUrls.cs
index bf8d9a31..ef09de07 100644
--- a/TIAMWebApp/Shared/Models/APIUrls.cs
+++ b/TIAMWebApp/Shared/Models/APIUrls.cs
@@ -20,8 +20,11 @@ namespace TIAMWebApp.Shared.Application.Models
         public const string MessageAPI = BaseUrlWithSlashAndVersion + "MessageAPI/";
         public const string PaymentAPI = BaseUrlWithSlashAndVersion + "PaymentAPI/";
 
-        public const string LoggerRouteName = "Logger";
-        public const string Logger = LoggerApi + LoggerRouteName;
+        public const string AddLogItemRouteName = "AddLogItem";
+        public const string AddLogItem = LoggerApi + AddLogItemRouteName;
+
+        public const string GetAllLogItemsRouteName = "GetAllLogItems";
+        public const string GetAllLogItems = LoggerApi + GetAllLogItemsRouteName;
 
         //userdata
         public const string UserTestRouteName = "test1";
diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/LogitemViewerModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/LogitemViewerModel.cs
new file mode 100644
index 00000000..b17bb238
--- /dev/null
+++ b/TIAMWebApp/Shared/Models/ClientSide/UI/LogitemViewerModel.cs
@@ -0,0 +1,28 @@
+using AyCode.Core.Interfaces;
+using AyCode.Entities.LogItems;
+using AyCode.Interfaces.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI
+{
+    public class LogitemViewerModel : IId<Guid>
+    {
+        public AcLogItemClient AcLogItemClient { get; set; }
+
+        public int LogHeaderId { get; set; }
+        public Guid Id { get ; set; }
+
+        public LogitemViewerModel(Guid id, AcLogItemClient logItemClient, int logHeaderID) {
+            
+            Id = id;
+            AcLogItemClient = logItemClient;
+            LogHeaderId = logHeaderID;
+
+        }
+
+    }
+}

From 0b53befc75a58a1c54456a300369311a0285e622 Mon Sep 17 00:00:00 2001
From: Adam <adam.g@virtualplanet.eu>
Date: Sun, 30 Jun 2024 15:49:07 +0200
Subject: [PATCH 3/3] logviewer

---
 TIAM.Services/SignalRTags.cs                  |   2 +
 .../Pages/User/SysAdmins/LogViewer.razor      |   4 +-
 .../SysAdmins/LogViewerGridComponent.razor    | 185 ++----------------
 .../Shared/Components/Grids/LogViewerGrid.cs  |   5 +-
 TIAMSharedUI/Shared/Users/AdminNavMenu.razor  |   1 +
 .../Server/Controllers/LoggerApiController.cs |   9 +-
 TIAMWebApp/Server/Program.cs                  |   1 +
 .../Server/Services/DevAdminSignalRhub.cs     |   3 +-
 .../Shared/Utility/HttpClientLogItemWriter.cs |   2 +-
 9 files changed, 35 insertions(+), 177 deletions(-)

diff --git a/TIAM.Services/SignalRTags.cs b/TIAM.Services/SignalRTags.cs
index 8f6c79cc..f4913db1 100644
--- a/TIAM.Services/SignalRTags.cs
+++ b/TIAM.Services/SignalRTags.cs
@@ -95,4 +95,6 @@ public class SignalRTags : AcSignalRTags
     public const int GetTransferDestinationToProductsByProductId = 95;
     public const int GetTransferDestinationToProductsByTransferDestinationId = 96;
 
+    public const int GetAllLogItems = 100;
+
 }
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor b/TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor
index ec993678..a711e786 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor
@@ -20,7 +20,7 @@
 <PageTitle>User permissions</PageTitle>
 
 <div class="text-center m-5">
-    <h1>Drivers</h1>
+    <h1>Log viewer</h1>
     <h2 style="font-size:small">Manage drivers here!</h2>
 </div>
 
@@ -38,7 +38,7 @@
                                       Click="ColumnChooserButton_Click" />
                         </div>
 
-                        <LogViewerGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" ContextId="TiamConstClient.TransferProductId" GetAllTag="SignalRTags.GetUserProductMappingsByProductId"></LogViewerGridComponent>
+                        <LogViewerGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto"></LogViewerGridComponent>
 
                     </div>
 
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor
index 480df5dc..49e5b50e 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor
@@ -6,6 +6,7 @@
 @using TIAM.Services
 @using TIAMSharedUI.Shared.Components.Grids
 @using TIAMWebApp.Shared.Application.Interfaces
+@using TIAMWebApp.Shared.Application.Models.ClientSide.UI
 @using TIAMWebApp.Shared.Application.Services
 @using TIAMWebApp.Shared.Application.Utility
 @using TIAM.Core.Loggers
@@ -21,204 +22,56 @@
 
 
 <LogViewerGrid Logger="_logger"
-                        @ref="_logViewerGrid"
-                        ContextIds="new [] {ContextId}"
-                        GetAllMessageTag="GetAllTag"
+                        @ref="_logViewerGrid"                                          
                         SignalRClient="AdminSignalRClient"
                         PageSize="10"
                         ValidationEnabled="false"
-                        CustomizeElement="Grid_CustomizeElement"
-                        CustomizeEditModel="CustomizeEditModel"
+                        CustomizeElement="Grid_CustomizeElement"                        
                         EditMode="GridEditMode.EditForm"
                         ColumnResizeMode="GridColumnResizeMode.NextColumn"
                         DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode"
                         ShowFilterRow="true">
     <Columns>
-        <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
-        <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
-        @{
-            var userEmailFieldName = $"{nameof(UserProductMapping.User)}.{nameof(User.EmailAddress)}";
-        }
-        <DxGridDataColumn FieldName="@userEmailFieldName" Caption="User email" SortIndex="0" />
-        <DxGridDataColumn FieldName="ProductId" Caption="ServiceId" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
-        @{
-            var productNameFieldName = $"{nameof(UserProductMapping.Product)}.{nameof(Product.Name)}";
-        }
-        <DxGridDataColumn FieldName="@productNameFieldName" Caption="Service name" />
-        <DxGridDataColumn FieldName="Permissions" />
+        
+        <DxGridDataColumn FieldName="AcLogItemClient.Id"/>
+        <DxGridDataColumn FieldName="AcLogItemClient.CategoryName" />
+        <DxGridDataColumn FieldName="AcLogItemClient.CallerName" />
+        <DxGridDataColumn Width="80px" FieldName="AcLogItemClient.LogLevel" />
+
+        
     </Columns>
     <DetailRowTemplate>
         @{
-                <DxTabs>
-
-                    <DxTabPage Text="Products">
-                        <ProductDetailGridComponent GetAllTag="SignalRTags.GetProductsById" ContextId="((UserProductMapping)context.DataItem).ProductId" />
-                    </DxTabPage>
-                    <DxTabPage Text="Cars">
-                        <CarDetailGridComponent GetAllTag="SignalRTags.GetCarsForUserProductMapping" ContextId="((UserProductMapping)context.DataItem).Id" />
-                    </DxTabPage>
-                </DxTabs>
+            var a = ((LogitemViewerModel)context.DataItem).AcLogItemClient; 
         }
+        <p>@a.Text</p>
     </DetailRowTemplate>
 
-    <EditFormTemplate Context="UserEditFormContext">
-
-        
-        @{
-            var transfer2 = (UserProductMapping)UserEditFormContext.EditModel;
-        }
-        <DxFormLayout CssClass="w-100">
-            
-            <DxFormLayoutItem Caption="UserId" ColSpanLg="6" ColSpanMd="12">
-                @transfer2.UserId
-                @{
-                    var a = UserEditFormContext.GetEditor("UserId");
-                } 
-                @* <DxButton Click="() => ShowPopup((UserProductMapping)UserEditFormContext.EditModel)" Context="ButtonContext">Select user</DxButton> *@
-                <DxButton Click="@(async (MouseEventArgs e) => await ShowPopup((UserProductMapping)UserEditFormContext.EditModel))" Context="ButtonContext">Select user</DxButton>
-            </DxFormLayoutItem>
-            
-            <DxFormLayoutItem Caption="Permissions" ColSpanMd="4">
-                @UserEditFormContext.GetEditor("Permissions")
-            </DxFormLayoutItem>
-
-
-
-        </DxFormLayout>
-    </EditFormTemplate>
+    
 
 </LogViewerGrid>
 
-@code {
-    [Parameter] public Guid ContextId { get; set; }
-    [Parameter] public IProductRelation ParentData { get; set; } = null!;
-    [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetAllUserProductMappings;
+@code {    
     [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never;
 
-    private LoggerClient<UserProductMappingGridComponent> _logger;    
+    private LoggerClient<LogViewerGridComponent> _logger;
 
-    private LogViewerGrid _logViewerGrid;
-
-    private UserProductMapping _tempProductMapping;
-
-    bool PopupVisible { get; set; }
-    private DxMaskedInput<string> _emailInput;
-    private DxButton _button1;
-    private ElementReference _errorMessage;
-    private string _errorCss = "display: none;";
-    private List<UserModelDto> FoundUsers { get; set; } = new List<UserModelDto>();
-
-
-    private string Email { get; set; } = "email@email.com";
-    string EmailMask { get; set; } = @"(\w|[.-])+@(\w|-)+\.(\w|-){2,4}";
-    UserModelDto _chosenUser = null!;
+    private LogViewerGrid _logViewerGrid;    
 
     protected override void OnInitialized()
     {
-        _logger = new LoggerClient<UserProductMappingGridComponent>(LogWriters.ToArray());
+        _logger = new LoggerClient<LogViewerGridComponent>(LogWriters.ToArray());
 
         base.OnInitialized();
     }
 
-    void CustomizeEditModel(GridCustomizeEditModelEventArgs e)
-    {
-        if (!e.IsNew) return;
-
-        if (ContextId.IsNullOrEmpty())
-        {
-            _logger.Warning($"ContextId.IsNullOrEmpty()");
-            return;
-        }
-
-        var newUpm = (UserProductMapping)e.EditModel;
-        newUpm.ProductId = ContextId;
-
-        var newProductMapping = new UserProductMapping
-        {
-            Id = Guid.NewGuid(),
-            ProductId = (Guid)ContextId,
-            Permissions = 2
-        };
-
-        //e.EditModel = newProductMapping;
-    }
-
-    async Task FindUser()
-    {
-        var userModelDto = await UserDataService.GetUserByEmailAsync(Email);
-        if (userModelDto != null)
-        {
-            _chosenUser = userModelDto;
-            FoundUsers.Add(_chosenUser);
-            _emailInput.Enabled = false;
-            _button1.Visible = false;
-        }
-        else
-        {
-            _emailInput.Value = "email@email.com";
-            _errorCss = "display: block";
-        }
-    }
-
-    void CancelCreateClick()
-    {
-        PopupVisible = false;
-    }
-
-    void SelectDriverPopupClosed()
-    {
-        //cancel clicked
-    }
-
-    void SelectDriverPopupClosing(PopupClosingEventArgs args)
-    {
-        //myModel = new TransferWizardModel();
-
-    }
-
-    public Task SubmitForm(object result)
-    {
-        _logger.Info($"Submitted nested form: {result.GetType().FullName}");
-        return Task.CompletedTask;
-    }
-
-    public Task ShowPopup(UserProductMapping emptyProductMapping)
-    {
-        _tempProductMapping = emptyProductMapping;
-        PopupVisible = true;
-
-        return Task.CompletedTask;
-    }
-
-    private async Task OnUserSelected(Guid userId)
-    {
-        // Logic after the user is selected
-        await Task.Run(() => Console.WriteLine($"Selected User ID: {userId}"));
-    }
-
     private async Task OnRowClick(GridRowClickEventArgs e)
     {
-        await SelectUser((Guid)e.Grid.GetRowValue(e.VisibleIndex, "Id"));
-    }
-
-    private async Task SelectUser(Guid id)
-    {
-        PopupVisible = false;
-        _tempProductMapping.UserId = id;
-
-        await OnUserSelected(id);
+        
     }
 
     void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
     {
-        if (e.ElementType == GridElementType.DataRow && (int)e.Grid.GetRowValue(e.VisibleIndex, "Permissions") == 1)
-        {
-            e.Style = "display: none";
-        }
-        // else if (e.ElementType == GridElementType.HeaderCell)
-        // {
-        //     e.Style = "background-color: rgba(0, 0, 0, 0.08); font-style=bold";
-
-        // }
+       
     }
 }
\ No newline at end of file
diff --git a/TIAMSharedUI/Shared/Components/Grids/LogViewerGrid.cs b/TIAMSharedUI/Shared/Components/Grids/LogViewerGrid.cs
index 56bbd26e..a8a08c78 100644
--- a/TIAMSharedUI/Shared/Components/Grids/LogViewerGrid.cs
+++ b/TIAMSharedUI/Shared/Components/Grids/LogViewerGrid.cs
@@ -11,10 +11,7 @@ public class LogViewerGrid : TiamGrid<LogitemViewerModel>
 {
     public LogViewerGrid() : base()
     {
-        GetAllMessageTag = SignalRTags.GetAllUserProductMappings;
-        AddMessageTag = SignalRTags.CreateUserProductMapping;
-        UpdateMessageTag = SignalRTags.UpdateUserProductMapping;
-        RemoveMessageTag = SignalRTags.DeleteUserProductMapping;
+        GetAllMessageTag = SignalRTags.GetAllLogItems;
     }
 
     protected override Task SetParametersAsyncCore(ParameterView parameters)
diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor
index fbfacfd6..a26491c4 100644
--- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor
+++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor
@@ -26,6 +26,7 @@
 
                         <DxMenuItem NavigateUrl="sysadmin/userproductmappings" Text="Permissions" />
                         <DxMenuItem NavigateUrl="sysadmin/users" Text="Users" />
+                        <DxMenuItem NavigateUrl="sysadmin/logs" Text="Logs" />
                     </Items>
                 </DxMenuItem>
                 <DxMenuItem Text="HotelAdmin" IconCssClass="menu-icon-support menu-icon">
diff --git a/TIAMWebApp/Server/Controllers/LoggerApiController.cs b/TIAMWebApp/Server/Controllers/LoggerApiController.cs
index 8f801cf4..a65b4afd 100644
--- a/TIAMWebApp/Server/Controllers/LoggerApiController.cs
+++ b/TIAMWebApp/Server/Controllers/LoggerApiController.cs
@@ -1,9 +1,11 @@
 using AyCode.Core.Consts;
 using AyCode.Entities.Server.LogItems;
+using AyCode.Services.SignalRs;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using TIAM.Database.DataLayers.Admins;
+using TIAM.Services;
 using TIAMWebApp.Server.Services;
 using TIAMWebApp.Shared.Application.Models;
 using TIAMWebApp.Shared.Application.Models.ClientSide.UI;
@@ -51,16 +53,17 @@ namespace TIAMWebApp.Server.Controllers
         [AllowAnonymous]
         [HttpGet]
         [Route(APIUrls.GetAllLogItemsRouteName)]
+        [SignalR(SignalRTags.GetAllLogItems)]
         public async Task<List<LogitemViewerModel>> GetAllLogItems()
         {
             var result = await _adminDal.GetLogItemsAsync();
             List<LogitemViewerModel> returnList = new List<LogitemViewerModel>();
-            foreach (var item in result)
+            for (int i = 0; i < 100; i++ )
             {
-                returnList.Add(new LogitemViewerModel(Guid.NewGuid(), item, item.LogHeaderId));
+                
+                returnList.Add(new LogitemViewerModel(Guid.NewGuid(), result[i], result[i].LogHeaderId));
             }
             return returnList;
         }
-
     }
 }
\ No newline at end of file
diff --git a/TIAMWebApp/Server/Program.cs b/TIAMWebApp/Server/Program.cs
index dde2497f..c4fc24b3 100644
--- a/TIAMWebApp/Server/Program.cs
+++ b/TIAMWebApp/Server/Program.cs
@@ -43,6 +43,7 @@ builder.Services.AddScoped<ServiceProviderAPIController>();
 builder.Services.AddScoped<TransferDataAPIController>();
 builder.Services.AddScoped<MessageAPIController>();
 builder.Services.AddScoped<ProfileAPIController>();
+builder.Services.AddScoped<LoggerApiController>();
 
 
 builder.Services.AddSignalR(options => options.MaximumReceiveMessageSize = 102400 * 1024);//.AddMessagePackProtocol(options => options.SerializerOptions = MessagePackSerializerOptions.Standard.WithSecurity(MessagePackSecurity.UntrustedData));
diff --git a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs
index f77f1a86..0e8cfd6b 100644
--- a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs
+++ b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs
@@ -99,7 +99,7 @@ public class DevAdminSignalRHub : Hub<ISignalRHubItemServer>, IAcSignalRHubServe
     //private readonly ServiceProviderAPIController _serviceProviderApiController;
     //private readonly TransferDataAPIController _transferDataApiController;
 
-    public DevAdminSignalRHub(AdminDal adminDal, ServiceProviderAPIController serviceProviderApiController, TransferDataAPIController transferDataApiController, MessageAPIController messageApiController, ProfileAPIController profileApiController, IEnumerable<IAcLogWriterBase> logWriters)
+    public DevAdminSignalRHub(AdminDal adminDal, ServiceProviderAPIController serviceProviderApiController, TransferDataAPIController transferDataApiController, MessageAPIController messageApiController, ProfileAPIController profileApiController, LoggerApiController loggerApiController, IEnumerable<IAcLogWriterBase> logWriters)
     {
         _adminDal = adminDal;
         //_serviceProviderApiController = serviceProviderApiController;
@@ -111,6 +111,7 @@ public class DevAdminSignalRHub : Hub<ISignalRHubItemServer>, IAcSignalRHubServe
         _dynamicMethodCallModels.Add(new DynamicMethodCallModel<SignalRAttribute>(transferDataApiController));
         _dynamicMethodCallModels.Add(new DynamicMethodCallModel<SignalRAttribute>(messageApiController));
         _dynamicMethodCallModels.Add(new DynamicMethodCallModel<SignalRAttribute>(profileApiController));
+        _dynamicMethodCallModels.Add(new DynamicMethodCallModel<SignalRAttribute>(loggerApiController));
         //_dynamicMethodCallModels.Add(new DynamicMethodCallModel<SignalRAttribute>(typeof(AdminDal)));
 
     }
diff --git a/TIAMWebApp/Shared/Utility/HttpClientLogItemWriter.cs b/TIAMWebApp/Shared/Utility/HttpClientLogItemWriter.cs
index e99066be..f0ebfc9c 100644
--- a/TIAMWebApp/Shared/Utility/HttpClientLogItemWriter.cs
+++ b/TIAMWebApp/Shared/Utility/HttpClientLogItemWriter.cs
@@ -7,6 +7,6 @@ namespace TIAMWebApp.Shared.Application.Utility;
 
 public class HttpClientLogItemWriter : AcHttpClientLogItemWriter<AcLogItemClient>
 {
-    public HttpClientLogItemWriter(HttpClient httpClient) : base(httpClient, $"{Setting.ApiBaseUrl}/{APIUrls.Logger}")
+    public HttpClientLogItemWriter(HttpClient httpClient) : base(httpClient, $"{Setting.ApiBaseUrl}/{APIUrls.AddLogItem}")
     { }
 }
\ No newline at end of file