TIAM.Models/Dtos/Users/UserDtoDetail.cs

@@ -1,17 +1,10 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using AyCode.Interfaces;
-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; }

TIAMSharedUI/Pages/User/SysAdmins/ProductGridComponent.razor

@@ -36,8 +36,7 @@
                    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"/>

TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor

@@ -34,12 +34,8 @@
     <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" Caption="UserId" />
+        <DxGridDataColumn FieldName="UserId" />
-        @* <DxGridDataColumn FieldName="@nameof(UserProductMapping.User.EmailAddress)" Caption="User name" /> *@
+        <DxGridDataColumn FieldName="ProductId" Width="40%" />
-        <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>
@@ -54,10 +50,10 @@
 
     <EditFormTemplate Context="userEditFormContext">
         @{
-            var userProduct = (UserProductMapping)userEditFormContext.EditModel;
+            var transfer2 = (UserProductMapping)userEditFormContext.EditModel;
         }
         <DxFormLayout CssClass="w-100">
-            <DxFormLayoutItem Caption="User" ColSpanMd="4">
+            <DxFormLayoutItem Caption="UserId" ColSpanMd="4">
                 @userEditFormContext.GetEditor("UserId")
             </DxFormLayoutItem>
             <DxFormLayoutItem Caption="Product:" ColSpanMd="4">

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.User.Profile.Name).ToList();
+            var companyies = (await adminDal.GetAllUserProductMappingsAsync()).OrderBy(x => x.ProductId).ToList();
             return companyies;
         }
 

Tiam.Services.Client.Tests/SignalRClientTest.cs

@@ -8,7 +8,6 @@ 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;
@@ -92,15 +91,6 @@ 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)