From 632f894c5e2cc33085fadfd44481be44ccb7b064 Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Wed, 26 Jun 2024 17:26:52 +0200
Subject: [PATCH 1/3] improvements, fixes...

---
 TIAM.Models/Dtos/Users/UserDtoDetail.cs              |  9 ++++++++-
 .../SysAdmins/UserProductMappingGridComponent.razor  | 12 ++++++++----
 .../Controllers/ServiceProviderAPIController.cs      |  2 +-
 Tiam.Services.Client.Tests/SignalRClientTest.cs      | 10 ++++++++++
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/TIAM.Models/Dtos/Users/UserDtoDetail.cs b/TIAM.Models/Dtos/Users/UserDtoDetail.cs
index 528c1e7e..de26feb5 100644
--- a/TIAM.Models/Dtos/Users/UserDtoDetail.cs
+++ b/TIAM.Models/Dtos/Users/UserDtoDetail.cs
@@ -1,10 +1,17 @@
-using AyCode.Interfaces;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json.Serialization;
+using AyCode.Interfaces;
 using TIAM.Entities.Users;
 
 namespace TIAM.Models.Dtos.Users
 {
     public class UserDtoDetail : UserDto, IUserDtoDetail
     {
+        [NotMapped]
+        [JsonIgnore]
+        [Newtonsoft.Json.JsonIgnore]
+        public string? FullName => Profile.FullName;
+
         public string? PhoneNumber { get; set; }
         public string? RefreshToken { get; set; }
         public Guid? RefferalId { get; set; }
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
index 5ae522ef..7a4425a4 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
@@ -34,8 +34,12 @@
     <Columns>
         <DxGridCommandColumn Width="135" MinWidth="135" DeleteButtonVisible="AcDomain.IsDeveloperVersion" EditButtonVisible="AcDomain.IsDeveloperVersion" FixedPosition="GridColumnFixedPosition.Left" />
         <DxGridDataColumn FieldName="Id" SortIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
-        <DxGridDataColumn FieldName="UserId" />
-        <DxGridDataColumn FieldName="ProductId" Width="40%" />
+        <DxGridDataColumn FieldName="UserId" Caption="UserId" />
+        @* <DxGridDataColumn FieldName="@nameof(UserProductMapping.User.EmailAddress)" Caption="User name" /> *@
+        <DxGridDataColumn FieldName="ProductId" Caption="ServiceId" />
+        @* <DxGridDataColumn FieldName="@nameof(UserProductMapping.Product.Name)" Caption="Service name" /> *@
+        <DxGridDataColumn FieldName="UserProductMapping.Product.Name" Caption="Service name" />
+        @* <DxGridDataColumn FieldName="@nameof(Product.ServiceProvider.Name)" Caption="Company name" /> *@
         <DxGridDataColumn FieldName="Permissions" />
     </Columns>
     <DetailRowTemplate>
@@ -50,10 +54,10 @@
 
     <EditFormTemplate Context="userEditFormContext">
         @{
-            var transfer2 = (UserProductMapping)userEditFormContext.EditModel;
+            var userProduct = (UserProductMapping)userEditFormContext.EditModel;
         }
         <DxFormLayout CssClass="w-100">
-            <DxFormLayoutItem Caption="UserId" ColSpanMd="4">
+            <DxFormLayoutItem Caption="User" ColSpanMd="4">
                 @userEditFormContext.GetEditor("UserId")
             </DxFormLayoutItem>
             <DxFormLayoutItem Caption="Product:" ColSpanMd="4">
diff --git a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs
index 5c900a22..f9ceed0d 100644
--- a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs
+++ b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs
@@ -273,7 +273,7 @@ namespace TIAMWebApp.Server.Controllers
         {
             _logger.Info($@"GetAllUserProductMappings called");
 
-            var companyies = (await adminDal.GetAllUserProductMappingsAsync()).OrderBy(x => x.ProductId).ToList();
+            var companyies = (await adminDal.GetAllUserProductMappingsAsync()).OrderBy(x => x.User.Profile.Name).ToList();
             return companyies;
         }
 
diff --git a/Tiam.Services.Client.Tests/SignalRClientTest.cs b/Tiam.Services.Client.Tests/SignalRClientTest.cs
index dd2f7dbe..be68a922 100644
--- a/Tiam.Services.Client.Tests/SignalRClientTest.cs
+++ b/Tiam.Services.Client.Tests/SignalRClientTest.cs
@@ -8,6 +8,7 @@ using TIAM.Core.Loggers;
 using TIAM.Database.Test;
 using TIAM.Entities.ServiceProviders;
 using TIAM.Entities.Transfers;
+using TIAM.Entities.Users;
 using TIAM.Services;
 using TIAMWebApp.Shared.Application.Services;
 using TIAMWebApp.Shared.Application.Utility;
@@ -91,6 +92,15 @@ namespace Tiam.Services.Client.Tests
             Assert.IsTrue(companies.Count > 0);
         }
 
+        [TestMethod]
+        public async Task GetAllUserProductMappingsTest_ReturnProductMappings_WhenHasProductMappings()
+        {
+            var userProductMapping = await _signalRClient.GetAllAsync<List<UserProductMapping>>(SignalRTags.GetAllUserProductMappings);
+
+            Assert.IsNotNull(userProductMapping);
+            Assert.IsTrue(userProductMapping.Count > 0);
+        }
+
         [DataTestMethod]
         [DataRow(["cfb27fc2-54c2-4f07-8471-587d6b79b019", "7385c4e3-3c1e-4c5e-9926-8c0ea60dcb38"])]
         public async Task TransferDestinationCrudTest(string[] transferDestIdAddressIdStrings)

From 2ef38a91850ce6159728c02e8bb2b4db489f93dc Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Wed, 26 Jun 2024 17:27:27 +0200
Subject: [PATCH 2/3] fix

---
 TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor
index 6ec7d586..7b0f929d 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor
@@ -36,7 +36,8 @@
                    ValidationEnabled="false"
                    EditMode="GridEditMode.EditForm"
                    ColumnResizeMode="GridColumnResizeMode.NextColumn"
-                   DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode">
+                   DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode"
+                   ShowFilterRow="true">
     <Columns>
         <DxGridCommandColumn NewButtonVisible="true" Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
         <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N"/>

From 127577da86143ca422a0136bf1c775f95def56b5 Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Wed, 26 Jun 2024 17:28:00 +0200
Subject: [PATCH 3/3] fix2

---
 .../Pages/User/SysAdmins/UserProductMappingGridComponent.razor  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
index 7a4425a4..ae2b9034 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
@@ -38,7 +38,7 @@
         @* <DxGridDataColumn FieldName="@nameof(UserProductMapping.User.EmailAddress)" Caption="User name" /> *@
         <DxGridDataColumn FieldName="ProductId" Caption="ServiceId" />
         @* <DxGridDataColumn FieldName="@nameof(UserProductMapping.Product.Name)" Caption="Service name" /> *@
-        <DxGridDataColumn FieldName="UserProductMapping.Product.Name" Caption="Service name" />
+        @* <DxGridDataColumn FieldName="UserProductMapping.Product.Name" Caption="Service name" /> *@
         @* <DxGridDataColumn FieldName="@nameof(Product.ServiceProvider.Name)" Caption="Company name" /> *@
         <DxGridDataColumn FieldName="Permissions" />
     </Columns>