Merge branch 'master' of http://git2.aycode.com/Adam/TourIAm

TIAMSharedUI/Pages/User/ServiceProvider.razor

@@ -3,6 +3,7 @@
 @using AyCode.Services.Loggers
 @using TIAM.Entities.ServiceProviders
 @using TIAM.Resources
+@using TIAM.Services
 @using TIAMSharedUI.Pages.User.SysAdmins
 @using TIAMSharedUI.Shared
 @using TIAMSharedUI.Shared.Components.Grids
@@ -63,7 +64,7 @@
                         <ProfileGridComponent ParentData="((Company)myContext.DataItem)" KeyboardNavigationEnabled="true" />
                     </DxTabPage>
                     <DxTabPage Text="Products">
-                        <ProductDetailGridComponent ParentData="((Company)myContext.DataItem)" KeyboardNavigationEnabled="true" />
+                        <ProductDetailGridComponent GetAllTag="SignalRTags.GetProductsByOwnerId" ContextId="((Company)myContext.DataItem).Id" ParentData="((Company)myContext.DataItem)" KeyboardNavigationEnabled="true" />
                     </DxTabPage>
                     <DxTabPage Text="Address">
                         <AddressDetailGridComponent ParentData="((Company)myContext.DataItem).Profile" KeyboardNavigationEnabled="true" />

TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor

@@ -89,10 +89,10 @@
     [Parameter] public Guid? ContextId { get; set; }
     [Parameter] public IProductsRelation? ParentData { get; set; } = null!;
     [Parameter] public EventCallback<GridEditModelSavingEventArgs> OnGridEditModelSaving { get; set; }
-    [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetProductsByContextId;
+    [Parameter] public int GetAllTag { get; set; } = SignalRTags.GetProductsByOwnerId;
     [Parameter] public GridDetailExpandButtonDisplayMode DetailExpandButtonDisplayMode { get; set; } = GridDetailExpandButtonDisplayMode.Never;
 
-    private ProductDetailGrid _productGrid = null!;
+    // private ProductDetailGrid _productGrid = null!;
     private LoggerClient<ProductDetailGridComponent> _logger = null!;    
     protected override void OnInitialized()
     {

TIAMSharedUI/Shared/Components/Grids/CompanyByIdDetailGrid.cs

@@ -7,7 +7,7 @@ public class CompanyByIdDetailGrid : CompanyGrid
 {
     public CompanyByIdDetailGrid() : base()
     {
-        GetAllMessageTag = SignalRTags.GetCompany;
+        GetAllMessageTag = SignalRTags.GetCompaniesById;
         AddMessageTag = SignalRTags.AddCompany;
         UpdateMessageTag = SignalRTags.UpdateCompany;
         RemoveMessageTag = SignalRTags.RemoveCompany;