TIAM.Database.Test/TIAM.Database.Test.csproj

@@ -30,8 +30,8 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.4.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.4.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

TIAM.Database/DataLayers/Admins/AdminDal.cs

@@ -45,7 +45,6 @@ namespace TIAM.Database.DataLayers.Admins
 
         public Task<List<Transfer>> GetTransfersAsync() => SessionAsync(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToList());
         public Task<string> GetTransfersJsonAsync() => SessionAsync(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson());
-        public Task<string> GetTransfersByUserIdJsonAsync(Guid userId) => SessionAsync(ctx => ctx.GetTransfers().Where(x => x.UserId == userId).OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson());
         public string GetTransfersJson() => Session(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson());
         public Transfer? GetTransferById(Guid transferId) => Session(ctx => ctx.GetTransferById(transferId));
         public string? GetTransferJsonById(Guid transferId) => Session(ctx => ctx.GetTransferById(transferId)?.ToJson());

TIAM.Database/DbSets/Products/ProductDbSetExtensions.cs

@@ -1,5 +1,4 @@
-using AyCode.Core.Extensions;
+using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
 using TIAM.Entities.Products;
 
 namespace TIAM.Database.DbSets.Products;
@@ -9,11 +8,7 @@ public static class ProductDbSetExtensions
     #region Add, Update, Remove
 
     public static bool AddProduct(this IProductDbSet ctx, Product product)
-    {
+        => ctx.Products.Add(product).State == EntityState.Added;
-        if (product.Id.IsNullOrEmpty()) product.Id = Guid.NewGuid();
-
-        return ctx.Products.Add(product).State == EntityState.Added;
-    }
 
     public static bool UpdateProduct(this IProductDbSet ctx, Product product)
         => ctx.Products.Update(product).State == EntityState.Modified;

TIAM.Entities/ServiceProviders/Company.cs

@@ -8,7 +8,7 @@ using TIAM.Entities.Users;
 namespace TIAM.Entities.ServiceProviders;
 
 [Table("ServiceProviders")]
-public class Company : AcCompany<User, UserToCompany, Profile, Address>, ICompany, IProductsRelation, IProfileRelation<Profile>
+public class Company : AcCompany<User, UserToCompany, Profile, Address>, ICompany, IProductsRelation
 {
     public virtual List<Product> Products { get; set; } = new();
 

TIAM.Models/Dtos/Users/UserModelDtoDetail.cs

@@ -7,21 +7,12 @@ using TIAM.Entities.Users;
 
 namespace TIAM.Models.Dtos.Users
 {
-    public class UserModelDtoDetail : AcUserModelDtoDetailBase<UserDtoDetail, Profile, Company, UserToCompany, Address>, IProductsRelation, IUserModelDtoMinBase, IProfileForeignKey
+    public class UserModelDtoDetail : AcUserModelDtoDetailBase<UserDtoDetail, Profile, Company, UserToCompany, Address>, IProductsRelation, IUserModelDtoMinBase
     {
-        public Guid ProfileId
-        {
-            get => ProfileDto.Id;
-            set {}
-        }
-
         public List<UserProductMapping> UserProductMappings { get; set; }
         public List<Product> Products { get; set; }
 
-        public UserModelDtoDetail()
+        public UserModelDtoDetail() { }
-        {
-        }
-
         public UserModelDtoDetail(User user) : base(user)
         {
             if (user.Products.Count == 0) return;
@@ -49,5 +40,6 @@ namespace TIAM.Models.Dtos.Users
             //TODO: Models... - J.
             throw new NotImplementedException("CreateMainEntity");
         }
+
     }
 }

TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj

@@ -28,8 +28,8 @@
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.6" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.4.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.4.1" />
   </ItemGroup>
 
   <ItemGroup>

TIAM.Services/SignalRTags.cs

@@ -4,13 +4,11 @@ namespace TIAM.Services;
 
 public class SignalRTags : AcSignalRTags
 {
-    public const int GetTransfer = 1;
+    public const int None = 0;
-    public const int GetTransfers = 2;
-    public const int GetTransfersByUserId = 3;
-    public const int GetTransfersByDriverId = 4;
-    public const int GetTransfersByProductId = 5;
-    public const int GetTransfersByCompanyId = 6;
 
+    public const int GetTransfer = 3;
+    public const int GetTransfers = 4;
+    public const int GetTransfersByContextId = 5;
     public const int UpdateTransfer = 7;
     public const int AddTransfer = 8;
     public const int RemoveTransfer = 9;

TIAMMobileApp/TIAMMobileApp.csproj

@@ -88,15 +88,15 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Update="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.60" />
+      <PackageReference Update="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.40" />
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Update="Microsoft.Maui.Controls" Version="8.0.60" />
+      <PackageReference Update="Microsoft.Maui.Controls" Version="8.0.40" />
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.60" />
+      <PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.40" />
     </ItemGroup>
 
 </Project>

TIAMSharedUI/Pages/User/ServiceProvider.razor

@@ -60,7 +60,7 @@
                         <DetailRowTemplate>
                             <DxTabs>
                                 <DxTabPage Text="Profile">
-                                    <ProfileGridComponent ParentData="((Company)context.DataItem)" KeyboardNavigationEnabled="true" />
+                                    <ProfileGridComponent ProfileId="((Company)context.DataItem).ProfileId" KeyboardNavigationEnabled="true" />
                                 </DxTabPage>
                                 <DxTabPage Text="Products">
                                     <ProductDetailGridComponent ContextId="((Company)context.DataItem).Id" KeyboardNavigationEnabled="true" />

TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor

@@ -22,7 +22,7 @@
 
 
 <AddressDetailGrid @ref="_addressGrid"
-                   ContextIds="new[] {ParentData.AddressId}"
+                   ContextId="ParentData.AddressId"
                    DataSource="DataSource"
              Logger="_logger"
              SignalRClient="AdminSignalRClient"

TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor

@@ -13,8 +13,6 @@
 @using TIAM.Entities.Addresses
 @using TIAMSharedUI.Shared.Components.Grids
 @using AyCode.Core
-@using TIAM.Entities.Products
-@using TIAM.Entities.Users
 @layout AdminLayout
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 @inject IStringLocalizer<TIAMResources> localizer
@@ -127,12 +125,12 @@
                         <CompaniesNestedUserProductMapping CurrentCompany="(TIAM.Entities.ServiceProviders.Company)context.DataItem" KeyboardNavigationEnabled="true" />
                         </DetailRowTemplate> *@
                         <DetailRowTemplate>
-                            <DxTabs ActiveTabIndexChanged="ActiveTabIndexChanged">
+                            <DxTabs>
                                 <DxTabPage Text="Profile">
-                                    <ProfileGridComponent ParentData="((Company)context.DataItem)" KeyboardNavigationEnabled="true" />
+                                    <ProfileGridComponent ProfileId="((Company)context.DataItem).ProfileId" KeyboardNavigationEnabled="true" />
                                 </DxTabPage>
                                 <DxTabPage Text="Products">
-                                    <ProductDetailGridComponent @ref="_productDetailGridComponent" OnGridEditModelSaving="OnProductGridItemSaving" ParentData="(Company)context.DataItem" KeyboardNavigationEnabled="true" />
+                                    <ProductDetailGridComponent ProductGrid="" ParentData="(Company)context.DataItem" KeyboardNavigationEnabled="true" />
                                 </DxTabPage>
                                 <DxTabPage Text="Address">
                                     <AddressDetailGridComponent ParentData="((Company)context.DataItem).Profile" KeyboardNavigationEnabled="true" />
@@ -165,8 +163,6 @@
 @code {
     private LoggerClient<ManageServiceProviders> _logger;
 
-    private ProductDetailGridComponent? _productDetailGridComponent;
-
     //public Transfer myModel = new Transfer();
 
     //public List<Company> ServiceProviderDataList { get; set; }
@@ -177,7 +173,7 @@
     private CompanyGrid _gridCompany;
     private bool _autoCollapseDetailRow;
 
-    private Company _companyToSetOwner = null;
+    private Company CompanyToSetOwner = null;
 
     public List<string> IgnoreList =
     [
@@ -197,7 +193,6 @@
     DateTime StartDate { get; set; } = DateTime.Today;
     DxSchedulerDataStorage _dataStorage = new();   
 
-
     void SendMail(Company item)
     {
         _logger.Info($"Sending mail to {item.OwnerId}, {item.Id}");
@@ -212,7 +207,7 @@
     void SetOwnerPopup(Company item)
     {
         _logger.Info($"Setting owner of {item.OwnerId}, {item.Id}");
-        _companyToSetOwner = item;
+        CompanyToSetOwner = item;
         _setOwnerPopupVisible = true;
     }
 
@@ -224,15 +219,15 @@
 
         //overwrite ServiceProvider ownerid
         //var target = await serviceProviderDataService.GetServiceProviderByIdAsync(CompanyToSetOwner.Id);        
-        if (_companyToSetOwner == null)
+        if (CompanyToSetOwner == null)
         {
             return null;
         }
         else
         {
-            _companyToSetOwner.OwnerId = userModelDto.Id;
+            CompanyToSetOwner.OwnerId = userModelDto.Id;
-            var result = await serviceProviderDataService.UpdateServiceProviderAsync(_companyToSetOwner);
+            var result = await serviceProviderDataService.UpdateServiceProviderAsync(CompanyToSetOwner);
-            _companyToSetOwner = null;
+            CompanyToSetOwner = null;
             return result;
         }
     }
@@ -311,30 +306,6 @@
         await base.OnInitializedAsync();
     }
 
-    private void OnProductGridItemSaving(GridEditModelSavingEventArgs e)
-    {
-        _logger.Detail($"OnProductGridItemSaving");
-
-        var company = _productDetailGridComponent!.ParentData as Company;
-        if (company == null || company.OwnerId.IsNullOrEmpty())
-        {
-            _logger.Error($"OnProductGridItemSaving; company == null || company.OwnerId.IsNullOrEmpty(); company.OwnerId: {company?.OwnerId}");
-            return;
-        } 
-
-        var product = ((Product)e.EditModel);
-
-        if (e.IsNew)
-        {
-            if (product.Id.IsNullOrEmpty()) product.Id = Guid.NewGuid();
-
-            product.ServiceProviderId = company.Id;
-            product.UserProductMappings.Add(new UserProductMapping(company.OwnerId.Value, product.Id) { IsAdmin = true });
-        }
-        else
-        { }
-    }
-
     void ColumnChooserButton_Click()
     {
         _gridCompany.ShowColumnChooser();
@@ -357,10 +328,4 @@
         _gridCompany.ExpandDetailRow(0);
         _gridCompany.EndUpdate();
     }
-
-    private void ActiveTabIndexChanged(int index)
-    {
-        _logger.Detail($"ActiveTabIndexChanged");
-    }
-
 }

TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor

@@ -97,7 +97,7 @@
                             <DetailRowTemplate>
                                 <DxTabs>
                                     <DxTabPage Text="Profile">
-                                        <ProfileGridComponent ParentData="((UserModelDtoDetail)context.DataItem)" KeyboardNavigationEnabled="true" />
+                                        <ProfileGridComponent ProfileId="((UserModelDtoDetail)context.DataItem).ProfileDto.Id" KeyboardNavigationEnabled="true" />
                                     </DxTabPage>
                                     <DxTabPage Text="Address">
                                         <AddressDetailGridComponent ParentData="((UserModelDtoDetail)context.DataItem).ProfileDto" KeyboardNavigationEnabled="true" />

TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor

@@ -23,7 +23,7 @@
 @inject AdminSignalRClient AdminSignalRClient;
 
 
-<ProductDetailGrid @ref="_productGrid"
+<ProductDetailGrid @ref="ProductGrid"
                    DataSource="ParentData.Products"                                  
                    Logger="_logger"
                    SignalRClient="AdminSignalRClient"
@@ -50,7 +50,7 @@
     <DetailRowTemplate>
         <DxTabs>
             <DxTabPage Text="Profile">
-                <ProfileGridComponent ParentData="((Product)context.DataItem)" KeyboardNavigationEnabled="true" />
+                <ProfileGridComponent ProfileId="((Product)context.DataItem).ProfileId" KeyboardNavigationEnabled="true" />
             </DxTabPage>            
         </DxTabs>
     </DetailRowTemplate>
@@ -82,9 +82,8 @@
     [Parameter] public bool KeyboardNavigationEnabled { get; set; }    
     [Parameter] public Guid? ContextId { get; set; }
     [Parameter] public IProductsRelation ParentData { get; set; } = null!;
-    [Parameter] public EventCallback<GridEditModelSavingEventArgs> OnGridEditModelSaving { get; set; }
 
-    private ProductDetailGrid _productGrid = null!;
+    public ProductDetailGrid ProductGrid = null!;
     private LoggerClient<ProductDetailGridComponent> _logger = null!;    
     protected override void OnInitialized()
     {        
@@ -98,40 +97,31 @@
     {
         _logger.Debug($"Saving: {args.DataItem.Name}, {args.DataItem.ServiceProviderId}");
 
-        //ProductGrid.SaveChangesAsync();
+        ProductGrid.SaveChangesAsync();
     }
 
-    public async Task DataItemSaving(GridEditModelSavingEventArgs e)
+    private void DataItemSaving(GridEditModelSavingEventArgs e)
-    {
-        await OnGridEditModelSaving.InvokeAsync(e);
-
-        if (e.Cancel) return;
-
-        var product = ((Product)e.EditModel);
-
-        if (e.IsNew)
     {
         _logger.Debug($"DataItemSaving");
+        ((Product)e.EditModel).ServiceProviderId = (Guid)ContextId!;
+        Guid _profileId = Guid.NewGuid();
+        ((Product)e.EditModel).Profile = new Profile();
+        ((Product)e.EditModel).Profile.Id = _profileId;
+        ((Product)e.EditModel).ProfileId = _profileId;
+        ((Product)e.EditModel).Profile.Name = ((Product)e.EditModel).Name;
+        Guid _addressId = Guid.NewGuid();
+        ((Product)e.EditModel).Profile.Address = new Address();
+        ((Product)e.EditModel).Profile.AddressId = _addressId;
+        ((Product)e.EditModel).Profile.Address.Id = _addressId;
+        ((Product)e.EditModel).UserProductMappings.Add(new UserProductMapping(Guid.NewGuid, ParentData.));
 
-            var profileId = Guid.NewGuid();
-            product.Profile = new Profile(profileId, product.Name);
-            product.ProfileId = profileId;
 
-            var addressId = Guid.NewGuid();
-            product.Profile.Address = new Address(addressId);
-            product.Profile.AddressId = addressId;
 
-            //((Product)e.EditModel).UserProductMappings.Add(new UserProductMapping(Guid.NewGuid, ParentData.));
-        }
-        else
-        {
         
-        }
+        _logger.Debug($"Saving: {((Product)e.EditModel).Name}, {((Product)e.EditModel).ServiceProviderId}");
-
-        _logger.Debug($"Saving: {product.Name}, {product.ServiceProviderId}");
         
         //var result = serviceProviderDataService.CreateProductAsync((Product)e.EditModel);
-        //_logger.Debug($"saved product: {product.ServiceProviderId}");
+        _logger.Debug($"saved product: {((Product)e.EditModel).ServiceProviderId}");
     }
 
     private void DataItemDeleting(GridDataItemDeletingEventArgs obj)

TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor

@@ -8,17 +8,13 @@
 @using AyCode.Services.Loggers
 @using TIAM.Core.Loggers
 @using AyCode.Core
-@using AyCode.Interfaces.Profiles.Dtos
-@using TIAM.Entities.Addresses
-@using TIAM.Entities.Profiles
 @using Profile = TIAM.Entities.Profiles.Profile
 @inject IServiceProviderDataService serviceProviderDataService
 @inject IUserDataService userDataService
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 @inject AdminSignalRClient AdminSignalRClient
-
 <ProfileDetailGrid @ref="_profileGrid"
-                   ContextIds="new[] {ParentData.ProfileId}"
+                   ContextId="ProfileId"
                    Logger="_logger"
                    SignalRClient="AdminSignalRClient"
                    PageSize="5"
@@ -55,8 +51,8 @@
 @code {
     [Parameter]
     public bool KeyboardNavigationEnabled { get; set; }
-
+    [Parameter]
-    [Parameter] public IProfileForeignKey ParentData { get; set; } = null!;
+    public Guid ProfileId { get; set; } = Guid.Empty;
 
     private ProfileDetailGrid _profileGrid = null!;
     private LoggerClient<ProfileGridComponent> _logger = null!;    
@@ -70,7 +66,7 @@
     protected override void OnParametersSet()
     {
         
-        _logger.DebugConditional(ParentData.ProfileId.ToString());
+        _logger.DebugConditional(ProfileId.ToString());
         base.OnParametersSet();
     }
 

TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor

@@ -83,8 +83,7 @@
     {
         _logger = new LoggerClient<ServiceProviderGridComponent>(LogWriters.ToArray());
 
-        // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
+        //_detailGridData = UserModelDtoDetail.ServiceProviders ?? new List<Company>();
-        _detailGridData = UserModelDtoDetail.ServiceProviders ?? [];
         //_availableServices = await ServiceProviderDataService.GetServiceProvidersAsync();
 
         //_logger.Info($"DetailGridData: {_detailGridData.Count}");

TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs

@@ -1,5 +1,4 @@
 using System.ComponentModel;
-using AyCode.Blazor.Components.Services;
 using AyCode.Core;
 using AyCode.Core.Enums;
 using AyCode.Core.Extensions;
@@ -28,7 +27,7 @@ namespace TIAMSharedUI.Shared.Components.Grids
 
         [Parameter] public LoggerClient Logger { get; set; }
         [Parameter] public string GridName { get; set; }
-        [Parameter] public Guid[]? ContextIds { get; set; }
+        [Parameter] public Guid? ContextId { get; set; }
         [Parameter] public AcSignalRClientBase SignalRClient { get; set; }
 
         [Parameter] public int GetAllMessageTag { get; set; }
@@ -81,8 +80,8 @@ namespace TIAMSharedUI.Shared.Components.Grids
                 throw new NullReferenceException($"[{GetType().Name}] SignalRClient == null");
             }
 
-            var crudTags = new SignalRCrudTags(GetAllMessageTag, GetItemMessageTag, AddMessageTag, UpdateMessageTag, RemoveMessageTag);
+            var crudTags = new SignalRCrudTags(GetAllMessageTag, SignalRTags.None, AddMessageTag, UpdateMessageTag, RemoveMessageTag);
-            _dataSource = new SignalRDataSource<TDataItem>(SignalRClient, crudTags, ContextIds);
+            _dataSource = new SignalRDataSource<TDataItem>(SignalRClient, crudTags, ContextId);
 
             Data = _dataSource;
 
@@ -109,7 +108,6 @@ namespace TIAMSharedUI.Shared.Components.Grids
             Logger.Debug($"{_gridLogName} OnDataSourceLoaded");
 
             Reload();
-            _dataSource.LoadItem(_dataSource.First().Id).Forget();
             return OnDataSourceChanged.InvokeAsync(_dataSource);
         }
 

TIAMSharedUI/Shared/SignalRTransferCrudTags.cs

@@ -1,23 +0,0 @@
-using AyCode.Services.SignalRs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TIAM.Services;
-
-namespace TIAMSharedUI.Shared
-{
-    public static class SignalRTiamCrudTags
-    {
-        public static SignalRCrudTags CompanyCrudTags { get; } = new SignalRCrudTags(SignalRTags.GetCompanies, SignalRTags.GetCompany, SignalRTags.AddCompany, SignalRTags.UpdateCompany, SignalRTags.RemoveCompany);
-
-        #region Transfers
-        public static SignalRCrudTags TransferCrudTags { get; } = new SignalRCrudTags(SignalRTags.GetTransfers, SignalRTags.GetTransfer, SignalRTags.AddTransfer, SignalRTags.UpdateTransfer, SignalRTags.RemoveTransfer);
-        public static SignalRCrudTags TransferByUserCrudTags { get; } = new SignalRCrudTags(SignalRTags.GetTransfersByUserId, SignalRTags.GetTransfer, SignalRTags.AddTransfer, SignalRTags.UpdateTransfer, SignalRTags.RemoveTransfer);
-        public static SignalRCrudTags TransferByDriverCrudTags { get; } = new SignalRCrudTags(SignalRTags.GetTransfersByDriverId, SignalRTags.GetTransfer, SignalRTags.AddTransfer, SignalRTags.UpdateTransfer, SignalRTags.RemoveTransfer);
-        public static SignalRCrudTags TransferByProductCrudTags { get; } = new SignalRCrudTags(SignalRTags.GetTransfersByProductId, SignalRTags.GetTransfer, SignalRTags.AddTransfer, SignalRTags.UpdateTransfer, SignalRTags.RemoveTransfer);
-        public static SignalRCrudTags TransferByCompanyCrudTags { get; } = new SignalRCrudTags(SignalRTags.GetTransfersByCompanyId, SignalRTags.GetTransfer, SignalRTags.AddTransfer, SignalRTags.UpdateTransfer, SignalRTags.RemoveTransfer);
-        #endregion Transfers
-    }
-}

TIAMSharedUI/TIAMSharedUI.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Blazor.AnimateOnScroll" Version="1.1.0" />
     <PackageReference Include="BlazorAnimation" Version="2.2.0" />
     <PackageReference Include="DevExpress.Blazor" Version="23.2.3" />
-    <PackageReference Include="MessagePack" Version="2.5.168" />
+    <PackageReference Include="MessagePack" Version="2.5.140" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.6" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
   </ItemGroup>

TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs

@@ -59,8 +59,6 @@ namespace TIAMWebApp.Server.Controllers
                 case TrackingState.Remove:
                     return await adminDal.RemoveCompanyAsync(company);
 
-                case TrackingState.Get:
-                case TrackingState.GetAll:
                 default:
                     throw new ArgumentOutOfRangeException(nameof(trackingState), trackingState, null);
             }
@@ -113,7 +111,6 @@ namespace TIAMWebApp.Server.Controllers
         [AllowAnonymous]
         [HttpPost]
         [Route(APIUrls.GetServiceProviderByIdRouteName)]
-        [SignalR(SignalRTags.GetCompany)]
         public async Task<Company?> GetServiceProviderById([FromBody] Guid id)
         {
             _logger.Info($@"GetServiceProviderById called with id: {id}");
@@ -264,8 +261,6 @@ namespace TIAMWebApp.Server.Controllers
                 case TrackingState.Remove:
                     return await adminDal.RemoveCarAsync(car);
 
-                case TrackingState.Get:
-                case TrackingState.GetAll:
                 default:
                     throw new ArgumentOutOfRangeException(nameof(trackingState), trackingState, null);
             }

TIAMWebApp/Server/Controllers/TransferDataAPIController.cs

@@ -393,36 +393,17 @@ namespace TIAMWebApp.Server.Controllers
             return result;
         }
 
-        [Authorize]
-        [HttpGet]
-        [Route(APIUrls.GetTransfersByUserIdRouteName)]
-        [SignalR(SignalRTags.GetTransfersByUserId)]
-        public async Task<string> GetTransfersByUserId(Guid userId)
-        {
-            var result = await _adminDal.GetTransfersByUserIdJsonAsync(userId);
-            return result;
-        }
-
-        [Authorize]
-        [HttpGet]
-        [Route(APIUrls.GetTransfersByDriverRouteName)]
-        [SignalR(SignalRTags.GetTransfersByDriverId)]
-        public Task<string> GetDriverTransfers(Guid transferId, Guid userProductMappingId)
-        {
-            throw new NotImplementedException();
-            //var result = await _adminDal.GetTransfersByUserIdJsonAsync(userId);
-            //return result;
-        }
-
         [AllowAnonymous]
         [HttpPost]
         [Route(APIUrls.GetTransferByIdRouteName)]
-        [SignalR(SignalRTags.GetTransfer)]
+        public async Task<IActionResult> GetTransferById([FromBody] Guid transferId)
-        public string? GetTransferById([FromBody] Guid transferId)
         {
             _logger.Info($"Get transfer by id called; transferId: {transferId}");
 
-            return _adminDal.GetTransferJsonById(transferId);
+            var result = _adminDal.GetTransferById(transferId);
+
+            //TODO: Implementálni a Logout-ot kliens és szerver oldalon is! - J.
+            return Ok(result);
         }
 
         [AllowAnonymous]

TIAMWebApp/Server/Properties/launchSettings.json

@@ -1,44 +1,4 @@
 {
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "http://localhost:5175"
-    },
-    "https": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://localhost:7116;http://localhost:5175"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}"
-    },
-    "WSL": {
-      "commandName": "WSL2",
-      "launchBrowser": true,
-      "launchUrl": "https://localhost:7116",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "ASPNETCORE_URLS": "https://localhost:7116;http://localhost:5175"
-      },
-      "distributionName": ""
-    }
-  },
     "iisSettings": {
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
@@ -46,5 +6,35 @@
         "applicationUrl": "http://localhost:28749",
         "sslPort": 44368
       }
+    },
+    "profiles": {
+      "http": {
+        "commandName": "Project",
+        "dotnetRunMessages": true,
+        "launchBrowser": true,
+        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+        "applicationUrl": "http://localhost:5175",
+        "environmentVariables": {
+          "ASPNETCORE_ENVIRONMENT": "Development"
+        }
+      },
+      "https": {
+        "commandName": "Project",
+        "dotnetRunMessages": true,
+        "launchBrowser": true,
+        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+        "applicationUrl": "https://localhost:7116;http://localhost:5175",
+        "environmentVariables": {
+          "ASPNETCORE_ENVIRONMENT": "Development"
+        }
+      },
+      "IIS Express": {
+        "commandName": "IISExpress",
+        "launchBrowser": true,
+        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+        "environmentVariables": {
+          "ASPNETCORE_ENVIRONMENT": "Development"
+        }
+      }
     }
   }

TIAMWebApp/Server/Services/DevAdminSignalRhub.cs

@@ -48,10 +48,10 @@ public class MethodInfoModel<TAttribute> where TAttribute : TagAttribute
 
         var parameters = methodInfo.GetParameters();
 
-        //if (parameters.Length > 1)
+        if (parameters.Length > 1)
-        //    throw new Exception("MethodInfoModel; parameters.Length > 1");
+            throw new Exception("MethodInfoModel; parameters.Length > 1");
 
-        if (parameters.Length > 0)
+        if (parameters.Length == 1)
             ParameterType = parameters[0].ParameterType;
     }
 }
@@ -63,12 +63,10 @@ public class DynamicMethodCallModel<TAttribute> where TAttribute : TagAttribute
 
 
     public DynamicMethodCallModel(Type instanceObjectType) : this(instanceObjectType, null!)
-    {
+    { }
-    }
 
     public DynamicMethodCallModel(Type instanceObjectType, params object[] constructorParams) : this(Activator.CreateInstance(instanceObjectType, constructorParams)!)
-    {
+    { }
-    }
 
     public DynamicMethodCallModel(object instanceObject)
     {
@@ -78,9 +76,6 @@ public class DynamicMethodCallModel<TAttribute> where TAttribute : TagAttribute
         {
             if (methodInfo.GetCustomAttribute(typeof(TAttribute)) is not TAttribute attribute) continue;
 
-            if (MethodsByMessageTag.ContainsKey(attribute.MessageTag))
-                throw new Exception($"Multiple SignaRMessageTag! messageTag: {attribute.MessageTag}; methodName: {methodInfo.Name}");
-
             MethodsByMessageTag[attribute.MessageTag] = new MethodInfoModel<TAttribute>(attribute, methodInfo!);
         }
     }
@@ -152,23 +147,16 @@ public class DevAdminSignalRHub : Hub<ISignalRHubItemServer>, IAcSignalRHubServe
                 {
                     _logger.Debug($"{logText}({methodInfoModel.ParameterType.Name})");
 
-                    //paramValues = new object[1];
+                    paramValues = new object[1];
 
                     if (methodInfoModel.ParameterType == typeof(Guid) || methodInfoModel.ParameterType == typeof(Guid?))
                     {
                         var msg = message!.MessagePackTo<SignalPostJsonDataMessage<IdMessage>>();
+                        if (msg.PostData.Id.IsNullOrEmpty()) throw new NullReferenceException($"PostData.Id.IsNullOrEmpty(); Id: {msg.PostData.Id}");
 
-                        paramValues = new object[msg.PostData.Ids.Count];
+                        paramValues[0] = msg.PostData.Id;
-
-                        for (var i = 0; i < msg.PostData.Ids.Count; i++)
-                        {
-                            var id = msg.PostData.Ids[i];
-                            if (id.IsNullOrEmpty()) throw new NullReferenceException($"PostData.Id.IsNullOrEmpty(); Ids: {msg.PostData.Ids}");
-
-                            paramValues[i] = msg.PostData.Ids[i];
                     }
-                    }
+                    else paramValues[0] = message!.MessagePackTo<SignalPostJsonDataMessage<object>>(MessagePackSerializerOptions.Standard).PostDataJson.JsonTo(methodInfoModel.ParameterType)!;
-                    else paramValues = [message!.MessagePackTo<SignalPostJsonDataMessage<object>>(MessagePackSerializerOptions.Standard).PostDataJson.JsonTo(methodInfoModel.ParameterType)!];
                 }
                 else _logger.Debug($"{logText}()");
 
@@ -182,7 +170,7 @@ public class DevAdminSignalRHub : Hub<ISignalRHubItemServer>, IAcSignalRHubServe
             switch (messageTag)
             {
                 case SignalRTags.GetAddress:
-                    var id = message!.MessagePackTo<SignalPostJsonDataMessage<IdMessage>>().PostData.Ids[0];
+                    var id = message!.MessagePackTo<SignalPostJsonDataMessage<IdMessage>>().PostData.Id;
 
                     var address = await _adminDal.GetAddressByIdAsync(id);
                     await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, address), requestId);
@@ -190,7 +178,7 @@ public class DevAdminSignalRHub : Hub<ISignalRHubItemServer>, IAcSignalRHubServe
                     return;
 
                 case SignalRTags.GetAddressesByContextId:
-                    id = message!.MessagePackTo<SignalPostJsonDataMessage<IdMessage>>().PostData.Ids[0];
+                    id = message!.MessagePackTo<SignalPostJsonDataMessage<IdMessage>>().PostData.Id;
 
                     address = await _adminDal.GetAddressByIdAsync(id);
                     await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, new List<Address> { address! }), requestId);

TIAMWebApp/Server/TIAMWebApp.Server.csproj.user

@@ -4,7 +4,4 @@
     <ActiveDebugProfile>https</ActiveDebugProfile>
     <NameOfLastUsedPublishProfile>C:\REPOS\AYCODE\source\TourIAm\TIAMWebApp\Server\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
-  </PropertyGroup>
 </Project>

TIAMWebApp/Shared/Models/APIUrls.cs

@@ -87,9 +87,6 @@ namespace TIAMWebApp.Shared.Application.Models
         public const string GetTransfersByUserIdRouteName = "GetTransfersByUserId";
         public const string GetTransfersByUserId = TransferDataAPI+GetTransfersByUserIdRouteName;
 
-        public const string GetTransfersByDriverRouteName = "GetTransfersByDriverId";
-        public const string GetTransfersByDriver = TransferDataAPI + GetTransfersByDriverRouteName;
-
         public const string GetTransferByIdRouteName = "GetTransferById";
         public const string GetTransferById = TransferDataAPI+GetTransferByIdRouteName;
         
@@ -180,28 +177,20 @@ namespace TIAMWebApp.Shared.Application.Models
         //permissions
         //1
         public const string GetPermissionsForContextByContextIdRouteName = "GetPermissionsForContextByContextId";
-
         public const string GetPermissionsForContextByContextId = ServiceProviderAPI+GetPermissionsForContextByContextIdRouteName;
-
         //2. get the contexts where the user has permission
         public const string GetPermissionContextByUserIdRouteName = "GetPermissionContextByUserId";
-
         public const string GetPermissionContextByUserId = ServiceProviderAPI+GetPermissionContextByUserIdRouteName;
-
         //12
         public const string GetPermissionGroupsForContextByContextIdRouteName = "GetPermissionGroupsForContextByContextId";
         public const string GetPermissionGroupsForContextByContextId = ServiceProviderAPI+GetPermissionGroupsForContextByContextIdRouteName;
 
         //file upload
         public const string UploadImageRouteName = "UploadImage";
-
         public const string UploadImage = FileAPI+UploadImageRouteName;
-
         //get images
         public const string GetImagesRouteName = "GetAllMedia";
-
         public const string GetImages = FileAPI+GetImagesRouteName;
-
         //get image by name
         public const string GetImageRouteName = "GetImage";
         public const string GetImage = FileAPI+GetImageRouteName;

TIAMWebApp/Shared/Services/AcSignalRClientBase.cs

@@ -0,0 +1,251 @@
+using System.Collections.Concurrent;
+using AyCode.Core;
+using AyCode.Core.Extensions;
+using AyCode.Core.Helpers;
+using AyCode.Core.Interfaces;
+using AyCode.Services.Loggers;
+using AyCode.Services.SignalRs;
+using MessagePack.Resolvers;
+using Microsoft.AspNetCore.SignalR.Client;
+using TIAMWebApp.Shared.Application.Models.ClientSide;
+using TIAMWebApp.Shared.Application.Utility;
+
+namespace TIAMWebApp.Shared.Application.Services
+{
+    public class AdminSignalRClient(IEnumerable<IAcLogWriterClientBase> logWriters) : AcSignalRClientBase("DevAdminHub", logWriters);
+
+    public abstract class AcSignalRClientBase : IAcSignalRHubClient
+    {
+        private readonly ConcurrentDictionary<int, object?> _responseByRequestId = new();
+
+        protected readonly HubConnection HubConnection;
+        protected readonly LoggerClient Logger;
+
+        public event Action<int, byte[], int?> OnMessageReceived;
+        //public event Action<int, int> OnMessageRequested;
+
+        public int Timeout = 10000;
+
+        protected AcSignalRClientBase(string hubName, IEnumerable<IAcLogWriterClientBase> logWriters)
+        {
+            Logger = new LoggerClient(GetType().Name, logWriters.ToArray());
+
+            HubConnection = new HubConnectionBuilder()
+                .WithUrl($"{Setting.BaseUrl}/{hubName}")
+                //.AddMessagePackProtocol(options => {
+                //        options.SerializerOptions = MessagePackSerializerOptions.Standard
+                //            .WithResolver(MessagePack.Resolvers.StandardResolver.Instance)
+                //            .WithSecurity(MessagePackSecurity.UntrustedData)
+                //            .WithCompression(MessagePackCompression.Lz4Block)
+                //            .WithCompressionMinLength(256);})
+                .Build();
+
+            HubConnection.Closed += HubConnection_Closed;
+
+            _ = HubConnection.On<int, byte[], int?>(nameof(IAcSignalRHubClient.OnReceiveMessage), OnReceiveMessage);
+            //_ = HubConnection.On<int, int>(nameof(IAcSignalRHubClient.OnRequestMessage), OnRequestMessage);
+
+            HubConnection.StartAsync().Forget();
+            
+        }
+
+        private Task HubConnection_Closed(Exception? arg)
+        {
+            if (_responseByRequestId.IsEmpty) Logger.DebugConditional($"Client HubConnection_Closed");
+            else Logger.Warning($"Client HubConnection_Closed; {nameof(_responseByRequestId)} count: {_responseByRequestId.Count}");
+
+            _responseByRequestId.Clear();
+            return Task.CompletedTask;
+        }
+
+        public async Task StartConnection()
+        {
+            if (HubConnection.State == HubConnectionState.Disconnected)
+                await HubConnection.StartAsync();
+
+            if (HubConnection.State != HubConnectionState.Connected)
+                await TaskHelper.WaitToAsync(() => HubConnection.State == HubConnectionState.Connected, Timeout, 25);
+        }
+
+        public async Task StopConnection()
+        {
+            await HubConnection.StopAsync();
+            await HubConnection.DisposeAsync();
+        }
+
+        public virtual Task SendMessageToServerAsync(int messageTag)
+            => SendMessageToServerAsync(messageTag, null, AcDomain.NextUniqueInt32);
+
+        public virtual async Task SendMessageToServerAsync(int messageTag, ISignalRMessage? message, int? requestId)
+        {
+            Logger.DebugConditional($"Client SendMessageToServerAsync; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};");
+
+            await StartConnection();
+
+            var msgp = message?.ToMessagePack(ContractlessStandardResolver.Options);
+            HubConnection.SendAsync(nameof(IAcSignalRHubClient.OnReceiveMessage), messageTag, msgp, requestId).Forget();
+        }
+
+        #region CRUD
+        public virtual Task<TResponseData?> GetByIdAsync<TResponseData>(int messageTag, Guid id) where TResponseData : class
+            => SendMessageToServerAsync<TResponseData>(messageTag, new SignalPostJsonDataMessage<IdMessage>(new IdMessage(id)), AcDomain.NextUniqueInt32);
+        public virtual Task GetByIdAsync<TResponseData>(int messageTag, Guid id, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
+            => SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage<IdMessage>(new IdMessage(id)), responseCallback);
+
+        public virtual Task<TResponseData?> GetAllAsync<TResponseData>(int messageTag) where TResponseData : class
+            => SendMessageToServerAsync<TResponseData>(messageTag);
+        public virtual Task GetAllAsync<TResponseData>(int messageTag, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
+            => SendMessageToServerAsync(messageTag, null, responseCallback);
+        public virtual Task GetAllAsync<TResponseData>(int messageTag, Guid? contextId, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
+            => SendMessageToServerAsync(messageTag, (contextId.IsNullOrEmpty() ? null : new SignalPostJsonDataMessage<IdMessage>(new IdMessage(contextId.Value))), responseCallback);
+
+        public virtual Task<TResponseData?> GetAllAsync<TResponseData>(int messageTag, Guid? contextId) where TResponseData : class
+            => SendMessageToServerAsync<TResponseData>(messageTag, contextId.IsNullOrEmpty() ? null : new SignalPostJsonDataMessage<IdMessage>(new IdMessage(contextId.Value)), AcDomain.NextUniqueInt32);
+
+        public virtual Task<TPostData?> PostDataAsync<TPostData>(int messageTag, TPostData postData) where TPostData : class
+            => SendMessageToServerAsync<TPostData>(messageTag, new SignalPostJsonDataMessage<TPostData>(postData), AcDomain.NextUniqueInt32);
+        public virtual Task PostDataAsync<TPostData>(int messageTag, TPostData postData, Action<ISignalResponseMessage<TPostData?>> responseCallback) where TPostData : class
+            => SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage<TPostData>(postData), responseCallback);
+
+        #endregion CRUD
+
+        public virtual Task<TResponse?> SendMessageToServerAsync<TResponse>(int messageTag) where TResponse : class
+            => SendMessageToServerAsync<TResponse>(messageTag, null, AcDomain.NextUniqueInt32);
+
+        public virtual Task<TResponse?> SendMessageToServerAsync<TResponse>(int messageTag, ISignalRMessage? message) where TResponse : class
+            => SendMessageToServerAsync<TResponse>(messageTag, message, AcDomain.NextUniqueInt32);
+
+        protected virtual async Task<TResponse?> SendMessageToServerAsync<TResponse>(int messageTag, ISignalRMessage? message, int requestId) where TResponse : class
+        {
+            Logger.DebugConditional($"Client SendMessageToServerAsync<TResult>; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};");
+            
+            _responseByRequestId[requestId] = null;
+            await SendMessageToServerAsync(messageTag, message, requestId);
+
+            try
+            {
+                if (await TaskHelper.WaitToAsync(() => _responseByRequestId[requestId] != null, Timeout, 25) &&
+                    _responseByRequestId.TryRemove(requestId, out var obj) && obj is ISignalResponseMessage<string> responseMessage)
+                {
+                    if (responseMessage.Status == SignalResponseStatus.Error || responseMessage.ResponseData == null)
+                    {
+                        var errorText = $"Client SendMessageToServerAsync<TResponseData> response error; await; tag: {messageTag}; Status: {responseMessage.Status}; requestId: {requestId};";
+
+                        Logger.Error(errorText);
+
+                        //TODO: Ideiglenes, majd a ResponseMessage-et kell visszaadni a Status miatt! - J.
+                        throw new Exception(errorText); 
+                        //return default;
+                    }
+
+                    return responseMessage.ResponseData.JsonTo<TResponse>();
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"SendMessageToServerAsync; messageTag: {messageTag}; requestId: {requestId}; {ex.Message}", ex);
+            }
+
+            _responseByRequestId.TryRemove(requestId, out _);
+            return default;
+        }
+
+        public virtual Task SendMessageToServerAsync<TResponseData>(int messageTag, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
+            => SendMessageToServerAsync(messageTag, null, responseCallback);
+
+        public virtual Task SendMessageToServerAsync<TResponseData>(int messageTag, ISignalRMessage? message, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
+        {
+            if (messageTag == 0)
+                Logger.Error($"SendMessageToServerAsync; messageTag == 0");
+
+            var requestId = AcDomain.NextUniqueInt32;
+
+            _responseByRequestId[requestId] = new Action<ISignalResponseMessage<string>>(responseMessage  =>
+            {
+                TResponseData? responseData = default;
+
+                if (responseMessage.Status == SignalResponseStatus.Success)
+                {
+                    responseData = string.IsNullOrEmpty(responseMessage.ResponseData) ? default : responseMessage.ResponseData.JsonTo<TResponseData?>();
+                }
+                else Logger.Error($"Client SendMessageToServerAsync<TResponseData> response error; callback; tag: {messageTag}; Status: {responseMessage.Status}; requestId: {requestId};");
+
+                responseCallback(new SignalResponseMessage<TResponseData?>(responseMessage.Status, responseData));
+            });
+                
+            return SendMessageToServerAsync(messageTag, message, requestId);
+        }
+
+        public virtual Task OnReceiveMessage(int messageTag, byte[] message, int? requestId)
+        {
+            var logText = $"Client OnReceiveMessage; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};";
+
+            if (message.Length == 0) Logger.Warning($"message.Length == 0! {logText}");
+            else Logger.Info(logText);
+
+            try
+            {
+                if (requestId.HasValue && _responseByRequestId.ContainsKey(requestId.Value))
+                {
+                    var reqId = requestId.Value;
+
+                    var responseMessage = message.MessagePackTo<SignalResponseJsonMessage>(ContractlessStandardResolver.Options);
+
+                    switch (_responseByRequestId[reqId])
+                    {
+                        case null:
+                            _responseByRequestId[reqId] = responseMessage;
+                            return Task.CompletedTask;
+
+                        case Action<ISignalResponseMessage<string>> messagePackCallback:
+                            _responseByRequestId.TryRemove(reqId, out _);
+
+                            messagePackCallback.Invoke(responseMessage);
+                            return Task.CompletedTask;
+
+                        //case Action<string> jsonCallback:
+                        //    _responseByRequestId.TryRemove(reqId, out _);
+
+                        //    jsonCallback.Invoke(responseMessage);
+                        //    return Task.CompletedTask;
+
+                        default:
+                            Logger.Error($"Client OnReceiveMessage switch; unknown message type: {_responseByRequestId[reqId]?.GetType().Name}");
+                            break;
+                    }
+
+                    _responseByRequestId.TryRemove(reqId, out _);
+                }
+
+                OnMessageReceived(messageTag, message, requestId);
+            }
+            catch(Exception ex)
+            {
+                if (requestId.HasValue)
+                    _responseByRequestId.TryRemove(requestId.Value, out _);
+
+                Logger.Error($"Client OnReceiveMessage; messageTag: {messageTag}; requestId: {requestId}; {ex.Message}", ex);
+                throw;
+            }
+
+            return Task.CompletedTask;
+        }
+        //public virtual Task OnRequestMessage(int messageTag, int requestId)
+        //{
+        //    Logger.DebugConditional($"Client OnRequestMessage; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};");
+
+        //    try
+        //    {
+        //        OnMessageRequested(messageTag, requestId);
+        //    }
+        //    catch(Exception ex)
+        //    {
+        //        Logger.Error($"Client OnReceiveMessage; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId}; {ex.Message}", ex);
+        //        throw;
+        //    }
+
+        //    return Task.CompletedTask;
+
+        //}
+    }
+}

TIAMWebApp/Shared/Services/AdminSignalRClient.cs

@@ -1,17 +0,0 @@
-using System.Collections.Concurrent;
-using AyCode.Blazor.Components.Services;
-using AyCode.Core;
-using AyCode.Core.Extensions;
-using AyCode.Core.Helpers;
-using AyCode.Core.Interfaces;
-using AyCode.Services.Loggers;
-using AyCode.Services.SignalRs;
-using MessagePack.Resolvers;
-using Microsoft.AspNetCore.SignalR.Client;
-using TIAMWebApp.Shared.Application.Models.ClientSide;
-using TIAMWebApp.Shared.Application.Utility;
-
-namespace TIAMWebApp.Shared.Application.Services
-{
-    public class AdminSignalRClient(IEnumerable<IAcLogWriterClientBase> logWriters) : AcSignalRClientBase($"{Setting.BaseUrl}/DevAdminHub", new LoggerClient(nameof(AdminSignalRClient), logWriters.ToArray()));
-}

TIAMWebApp/Shared/Services/ServiceProviderDataService.cs

@@ -113,7 +113,7 @@ namespace TIAMWebApp.Shared.Application.Services
         //17.
         public Task GetPropertiesByOwnerIdAsync(Guid id, Action<Dictionary<Guid, string>?> callback)
         {
-            return _adminSignalRClient.GetByIdAsync<Dictionary<Guid, string>>(SignalRTags.GetPropertiesByOwnerId, response =>
+            return _adminSignalRClient.GetByIdAsync<Dictionary<Guid, string>>(SignalRTags.GetPropertiesByOwnerId, id, response =>
             {
                 if (response.Status == SignalResponseStatus.Error)
                     callback.Invoke(null);
@@ -121,7 +121,7 @@ namespace TIAMWebApp.Shared.Application.Services
                 _logger.DetailConditional($"companyPropertiesByOwner async: {string.Join("; ", response.ResponseData!.Values)}");
 
                 callback.Invoke(response.ResponseData);
-            }, id);
+            });
         }
 
         //17.
@@ -167,7 +167,7 @@ namespace TIAMWebApp.Shared.Application.Services
             var companies = await _adminSignalRClient.GetAllAsync<List<Company>>(SignalRTags.GetCompanies);
             if (companies != null) _logger.DetailConditional($"companies: {string.Join("; ", companies.Count)}");
 
-            return companies ?? [];
+            return companies;
         }
 
         //24.

TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj

@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MessagePack" Version="2.5.168" />
+    <PackageReference Include="MessagePack" Version="2.5.140" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.6" />
     <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.6" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.6" />
@@ -33,10 +33,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Aycode.Blazor\AyCode.Blazor.Components\AyCode.Blazor.Components.csproj" />
-    <ProjectReference Include="..\..\..\Aycode.Blazor\AyCode.Blazor.Models\AyCode.Blazor.Models.csproj" />
-    <ProjectReference Include="..\..\..\Aycode.Blazor\AyCode.Maui.Core\AyCode.Maui.Core.csproj" />
-    <ProjectReference Include="..\..\TIAM.Core\TIAM.Core.csproj" />
     <ProjectReference Include="..\..\TIAM.Database\TIAM.Database.csproj" />
     <ProjectReference Include="..\..\TIAM.Entities\TIAM.Entities.csproj" />
     <ProjectReference Include="..\..\TIAM.Models\TIAM.Models.csproj" />

TIAMWebApp/Shared/Utility/SignaRClientLogItemWriter.cs

@@ -16,10 +16,7 @@ namespace TIAMWebApp.Shared.Application.Utility
             //.AddMessagePackProtocol(options => options.SerializerOptions = MessagePackSerializerOptions.Standard.WithSecurity(MessagePackSecurity.UntrustedData))
             .Build();
 
-        public SignaRClientLogItemWriter() : this(AppType.Web, LogLevel.Detail)
+        public SignaRClientLogItemWriter() : base(AppType.Web, LogLevel.Detail)
-        { }
-
-        public SignaRClientLogItemWriter(AppType appType, LogLevel logLevel, string? categoryName = null) : base(appType, logLevel, categoryName)
         {
             _hubConnection.StartAsync().Forget();
         }

TIAMWebApp/Shared/Utility/SignalRDataSourceAsync.cs

@@ -0,0 +1,104 @@
+using System.Diagnostics;
+using AyCode.Core.Enums;
+using AyCode.Core.Helpers;
+using AyCode.Core.Interfaces;
+using AyCode.Services.SignalRs;
+using TIAM.Services;
+using TIAMWebApp.Shared.Application.Services;
+
+namespace TIAMWebApp.Shared.Application.Utility;
+
+[Serializable]
+[DebuggerDisplay("Count = {Count}")]
+public class SignalRDataSourceAsync<T> : SignalRDataSource<T> where T : class, IId<Guid>
+{
+    public Action<ItemChangedEventArgs<T>>? OnItemChanged;
+    public Action<SignalRDataSourceAsync<T>>? OnDataSourceLoaded;
+
+    public SignalRDataSourceAsync(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, Guid? contextId = null, Action<SignalRDataSourceAsync<T>>? onDataSourceLoaded = null, bool autoLoadDataSource = false) 
+        : base(signalRClient, signalRCrudTags, contextId)
+    {
+        OnDataSourceLoaded = onDataSourceLoaded;
+
+        if (autoLoadDataSource) LoadDataSourceAsync();
+    }
+
+    public void LoadDataSourceAsync(bool clearChangeTracking = true)
+    {
+        if (SignalRCrudTags.GetAllMessageTag == SignalRTags.None) throw new ArgumentException($"_signalRCrudTags.GetAllMessageTag == SignalRTags.None;");
+        
+        //Monitor.Exit(SyncRoot); //Exception test - J.
+
+        //Monitor.Enter(SyncRoot);
+        //try
+        //{
+        //    SignalRClient.GetAllAsync<List<T>>(SignalRCrudTags.GetAllMessageTag, ContextId, response =>
+        //    {
+        //        try
+        //        {
+        //            if (response.Status == SignalResponseStatus.Error) throw new Exception($"LoadDataSourceAsync; response.Status == SignalResponseStatus.Error");
+        //            if (response.ResponseData == null) throw new NullReferenceException($"response.ResponseData == null");
+
+        //            Clear(clearChangeTracking);
+        //            InnerList.AddRange(response.ResponseData);
+        //        }
+        //        finally
+        //        {
+        //            Monitor.Exit(SyncRoot);
+        //        }
+
+        //        OnDataSourceLoaded?.Invoke(this);
+        //    }).Forget();
+        //}
+        //catch (Exception)
+        //{
+        //    Monitor.Exit(SyncRoot);
+        //    throw;
+        //}
+    }
+
+
+    //public T Add(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Add).GetAwaiter().GetResult();
+    //public Task AddAsync(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Add);
+        
+
+    //public Task UpdateAsync(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Update);
+
+    //public Task RemoveAsync(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Remove);
+
+    //public Task RemoveAsync(Guid id, int messageTag)
+    //{
+    //    var item = _list.FirstOrDefault(x => x.Id == id);
+
+    //    return item == null ? Task.CompletedTask : RemoveAsync(item, messageTag);
+    //}
+
+    //protected virtual Task PostDataToServerAsync(T item, int messageTag, TrackingState trackingState)
+    //{
+    //    if (messageTag == 0) return Task.CompletedTask;
+
+    //    logger.Info($"{_listLogName} PostDataToServerAsync called; transferId " + item.Id);
+
+    //    if (item.Id.IsNullOrEmpty()) item.Id = Guid.NewGuid();
+
+    //    _list.UpdateCollection(item, trackingState == TrackingState.Remove); //egyből látszódik a változás a grid-ben, nem csak a callback lefutásakor! felhasználóbarátabb... - J.
+
+    //    await _signalRClient.PostDataAsync(messageTag, item, async repsonse =>
+    //    {
+    //        if (repsonse.Status != SignalResponseStatus.Success || repsonse.ResponseData == null)
+    //        {
+    //            RefreshDataSourceAsync().Forget();
+    //            return;
+    //        }
+
+    //        _list.UpdateCollection(repsonse.ResponseData, trackingState == TrackingState.Remove);
+
+    //        var eventArgs = new ItemChangedEventArgs<T>(repsonse.ResponseData, trackingState);
+    //        OnItemChanged.Invoke(eventArgs);
+    //    });
+
+    //    //transfer = await devAdminSignalClient.PostDataAsync(SignalRTags.UpdateTransferAsync, transfer);
+
+    //    return Task.CompletedTask;
+    //}
+}

TIAMWebApp/Shared/Utility/TrackingItemHelpers.cs

@@ -0,0 +1,47 @@
+using System.Reflection;
+using System.Text.Json;
+using AyCode.Core.Extensions;
+
+namespace TIAMWebApp.Shared.Application.Utility;
+
+public static class TrackingItemHelpers
+{
+    public static T JsonClone<T>(T source) => source.ToJson().JsonTo<T>()!;
+
+    public static T ReflectionClone<T>(T source)
+    {
+        var type = source!.GetType();
+
+        if (type.IsPrimitive || typeof(string) == type)
+            return source;
+
+        if (type.IsArray)
+        {
+            var elementType = Type.GetType(type.FullName!.Replace("[]", string.Empty))!;
+            var array = (source as Array)!;
+            var cloned = Array.CreateInstance(elementType, array.Length);
+
+            for (var i = 0; i < array.Length; i++)
+                cloned.SetValue(ReflectionClone(array.GetValue(i)), i);
+
+            return (T)Convert.ChangeType(cloned, type);
+        }
+
+        var clone = Activator.CreateInstance(type);
+
+        while (type != null && type != typeof(object))
+        {
+            foreach (var field in type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance))
+            {
+                var fieldValue = field.GetValue(source);
+                if (fieldValue == null) continue;
+
+                field.SetValue(clone, ReflectionClone(fieldValue));
+            }
+
+            type = type.BaseType;
+        }
+
+        return (T)clone!;
+    }
+}

Tiam.Services.Client.Tests/SignalRClientTest.cs

@@ -1,88 +0,0 @@
-using AyCode.Core.Enums;
-using AyCode.Core.Helpers;
-using AyCode.Core.Loggers;
-using AyCode.Services.Loggers;
-using AyCode.Services.SignalRs;
-using Azure;
-using TIAM.Core.Loggers;
-using TIAM.Entities.ServiceProviders;
-using TIAM.Services;
-using TIAMWebApp.Shared.Application.Services;
-using TIAMWebApp.Shared.Application.Utility;
-
-namespace Tiam.Services.Client.Tests
-{
-    [TestClass]
-    public class SignalRClientTest //: TestModelBase
-    {
-        private const string CompanyIdString = "3587F169-683C-4EEE-BCB5-E8D57F8C6DCE";
-
-        private readonly AdminSignalRClient _signalRClient = new(new List<IAcLogWriterClientBase> { new SignaRClientLogItemWriter(AppType.TestUnit, LogLevel.Detail, nameof(SignalRClientTest)) });
-
-        [TestInitialize]
-        public void TestInitialize()
-        { }
-
-        [TestCleanup]
-        public void TearDown()
-        { }
-
-        [DataTestMethod]
-        [DataRow(CompanyIdString)]
-        public async Task GetCompanyTest_ReturnCompany_WhenHasCompany(string companyIdString)
-        {
-            var companyId = Guid.Parse(companyIdString);
-            var company = await _signalRClient.GetByIdAsync<Company>(SignalRTags.GetCompany, companyId);
-
-            Assert.IsNotNull(company);
-        }
-
-        [DataTestMethod]
-        [DataRow(CompanyIdString)]
-        public async Task GetCompanyAsyncTest_ReturnCompany_WhenHasCompany(string companyIdString)
-        {
-            Company? company = null;
-            var companyId = Guid.Parse(companyIdString);
-
-            await _signalRClient.GetByIdAsync<Company>(SignalRTags.GetCompany, response =>
-            {
-                Assert.IsNotNull(response.ResponseData);
-                Assert.IsTrue(response.Status == SignalResponseStatus.Success);
-
-                company = response.ResponseData;
-            }, companyId);
-
-            await TaskHelper.WaitToAsync(() => company != null, 5000, 50);
-
-            Assert.IsNotNull(company);
-        }
-
-        [TestMethod]
-        public async Task GetAllCompanyTest_ReturnCompanies_WhenHasCompanies()
-        {
-            var companies = await _signalRClient.GetAllAsync<List<Company>>(SignalRTags.GetCompanies);
-
-            Assert.IsNotNull(companies);
-            Assert.IsTrue(companies.Count > 0);
-        }
-
-        [TestMethod]
-        public async Task GetAllCompanyAsyncTest_ReturnCompanies_WhenHasCompanies()
-        {
-            List<Company>? companies = null;
-
-            await _signalRClient.GetAllAsync<List<Company>>(SignalRTags.GetCompanies, response =>
-            {
-                Assert.IsNotNull(response.ResponseData);
-                Assert.IsTrue(response.Status == SignalResponseStatus.Success);
-
-                companies = response.ResponseData;
-            });
-
-            await TaskHelper.WaitToAsync(() => companies != null, 5000, 50);
-
-            Assert.IsNotNull(companies);
-            Assert.IsTrue(companies.Count > 0);
-        }
-    }
-}

Tiam.Services.Client.Tests/SignalRDataSourceTest.cs

@@ -1,104 +0,0 @@
-using System.Linq.Expressions;
-using AyCode.Core.Enums;
-using AyCode.Core.Extensions;
-using AyCode.Core.Helpers;
-using AyCode.Core.Loggers;
-using AyCode.Services.Loggers;
-using AyCode.Services.SignalRs;
-using Azure;
-using DevExpress.DashboardBlazor;
-using DevExpress.Data.Filtering;
-using DevExpress.Data.Linq;
-using DevExpress.Data.Linq.Helpers;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using TIAM.Core.Loggers;
-using TIAM.Database.DataLayers.Admins;
-using TIAM.Entities.ServiceProviders;
-using TIAM.Entities.Transfers;
-using TIAM.Services;
-using TIAMSharedUI.Shared;
-using TIAMWebApp.Shared.Application.Services;
-using TIAMWebApp.Shared.Application.Utility;
-
-namespace Tiam.Services.Client.Tests
-{
-    [TestClass]
-    public class SignalRDataSourceTest //: TestModelBase
-    {
-        private const string UserIdString = "540271F6-C604-4C16-8160-D5A7CAFEDF00";
-        private const string CompanyIdString = "3587F169-683C-4EEE-BCB5-E8D57F8C6DCE";
-        private const string TransferIdString = "108E5A63-AA9E-47BE-ACFA-00306FFC5215";
-
-        private readonly SignalRDataSource<Transfer> _signalRDataSource = new(new AdminSignalRClient(new List<IAcLogWriterClientBase> { new SignaRClientLogItemWriter(AppType.TestUnit, LogLevel.Detail, nameof(SignalRDataSourceTest)) }), 
-            SignalRTiamCrudTags.TransferByUserCrudTags, Guid.Parse(UserIdString));
-
-
-        [TestInitialize]
-        public async Task TestInitialize()
-        {
-            var userId = Guid.Parse(UserIdString);
-            await _signalRDataSource.LoadDataSource();
-
-            Assert.IsTrue(_signalRDataSource.Count > 0);
-            Assert.IsTrue(_signalRDataSource.All(x => x.UserId == userId));
-        }
-
-        [TestCleanup]
-        public void TearDown()
-        {
-        }
-
-        [DataTestMethod]
-        [DataRow(TransferIdString)]
-        public void GetTransferTest_ReturnTransfer_WhenHasTransfer(string transferIdString)
-        {
-            var transferId = Guid.Parse(transferIdString);
-            _signalRDataSource.TryGetValue(transferId, out var transfer);
-
-            Assert.IsNotNull(transfer);
-        }
-
-        [DataTestMethod]
-        [DataRow(TransferIdString)]
-        public async Task UpdateTransferLuggageTest_ReturnTransfer_WhenDbTransferEquals(string transferIdString)
-        {
-            var transferId = Guid.Parse(transferIdString);
-            _signalRDataSource.TryGetValue(transferId, out var transfer);
-
-            Assert.IsNotNull(transfer);
-
-            var luggageCount = (byte)(new Random().Next(0, 5));
-            transfer.LuggageCount = luggageCount;
-
-            await _signalRDataSource.SaveItem(transferId, TrackingState.Update);
-            Assert.IsTrue(transfer.LuggageCount == luggageCount);
-
-            var dbTransfer = await _signalRDataSource.SignalRClient.GetByIdAsync<Transfer>(SignalRTags.GetTransfer, transferId);
-
-            Assert.IsNotNull(dbTransfer);
-            Assert.IsTrue(dbTransfer.LuggageCount == luggageCount);
-        }
-
-        [DataTestMethod]
-        public void FilterExpressionTest_WhenTransfersFiletered()
-        {
-            var converter = new CriteriaToExpressionConverter();
-            //CriteriaOperator critOps = CriteriaOperator.Parse(tdashboard.EmployeeFilter);
-            var criteriaString = CriteriaOperator.FromLambda<Transfer>(x => x.LuggageCount == 1).ToString();
-
-            //var json = criteria.AsQueryable().Expression.ToJson();
-            //criteria = JsonConvert.DeserializeObject<Expression<Transfer>(json);
-            var criteria = CriteriaOperator.Parse(criteriaString);
-
-            //_signalRDataSource.AsQueryable().Expression.
-            var filteredData = _signalRDataSource.AsQueryable().AppendWhere(converter, criteria) as IQueryable<Transfer>;
-
-            Assert.IsNotNull(filteredData);
-            var filteredTransfers = _signalRDataSource.AsQueryable().Provider.CreateQuery<Transfer>(filteredData.Expression).ToList();
-
-            Assert.IsNotNull(filteredTransfers);
-            Assert.IsTrue(filteredTransfers.All(x => x.LuggageCount == 1));
-        }
-    }
-}

Tiam.Services.Client.Tests/Tiam.Services.Client.Tests.csproj

@@ -1,57 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Aycode.Blazor\AyCode.Blazor.Controllers\AyCode.Blazor.Controllers.csproj" />
-    <ProjectReference Include="..\..\Aycode.Blazor\AyCode.Blazor.Models\AyCode.Blazor.Models.csproj" />
-    <ProjectReference Include="..\..\Aycode.Blazor\AyCode.Maui.Core\AyCode.Maui.Core.csproj" />
-    <ProjectReference Include="..\TIAM.Core\TIAM.Core.csproj" />
-    <ProjectReference Include="..\TIAM.Entities\TIAM.Entities.csproj" />
-    <ProjectReference Include="..\TIAM.Models\TIAM.Models.csproj" />
-    <ProjectReference Include="..\TIAM.Services\TIAM.Services.csproj" />
-    <ProjectReference Include="..\TIAMResources\TIAM.Resources.csproj" />
-    <ProjectReference Include="..\TIAMWebApp\Client\TIAMWebApp.Client.csproj" />
-    <ProjectReference Include="..\TIAMWebApp\Shared\TIAMWebApp.Shared.Application.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="AyCode.Core">
-      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Entities">
-      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Interfaces">
-      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Models">
-      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Services">
-      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Services.dll</HintPath>
-    </Reference>
-    <Reference Include="AyCode.Utils">
-      <HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Utils.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
-  </ItemGroup>
-
-</Project>

TourIAmProject.sln

@@ -50,8 +50,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TIAM.Services.Server.Tests"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TIAM.Models.Server", "TIAM.Models.Server\TIAM.Models.Server.csproj", "{D21032B0-B25F-495E-B784-1D3166FE720C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tiam.Services.Client.Tests", "Tiam.Services.Client.Tests\Tiam.Services.Client.Tests.csproj", "{EF40BC68-945A-47ED-8739-2D0BCD415019}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -144,10 +142,6 @@ Global
 		{D21032B0-B25F-495E-B784-1D3166FE720C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D21032B0-B25F-495E-B784-1D3166FE720C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D21032B0-B25F-495E-B784-1D3166FE720C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF40BC68-945A-47ED-8739-2D0BCD415019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF40BC68-945A-47ED-8739-2D0BCD415019}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF40BC68-945A-47ED-8739-2D0BCD415019}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF40BC68-945A-47ED-8739-2D0BCD415019}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE