From 41ec4d379a58f27833a56fe2555f8489340d13b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rua?=
 <140734849+joao4all@users.noreply.github.com>
Date: Wed, 31 Jul 2024 08:29:12 +0100
Subject: [PATCH] Fix #689 2 tabs of same view: Filtering is identical (#712)

---
 .../Applications/DynamicApplicationBase.razor |  2 +-
 .../DynamicApplicationBase.razor.cs           |  6 ++
 .../ParameterEditorTestFixture.cs             | 28 ++++++---
 ...ParameterEditorBodyViewModelTestFixture.cs | 26 +-------
 .../ModelDashboard/ModelDashboardBody.razor   |  2 +-
 .../ModelDashboardBody.razor.cs               |  1 +
 .../ParameterEditor/ParameterEditorBody.razor |  4 +-
 .../ParameterEditorBody.razor.cs              |  4 +-
 .../ParameterEditor/ParameterTable.razor      |  2 +-
 .../ParameterEditor/ParameterTable.razor.cs   | 30 ++++-----
 .../SubscriptionDashboardBody.razor.cs        |  1 +
 .../SystemRepresentationBody.razor.cs         |  1 +
 .../Components/Tabs/TabsPanelComponent.razor  |  3 +-
 .../Components/Viewer/ViewerBody.razor.cs     |  1 +
 .../Model/TabbedApplicationInformation.cs     |  6 ++
 .../IModelDashboardBodyViewModel.cs           |  5 ++
 .../ModelDashboardBodyViewModel.cs            | 55 +++++++---------
 .../IParameterEditorBodyViewModel.cs          | 17 +++--
 .../ParameterEditorBodyViewModel.cs           | 63 +++++++------------
 .../ISubscriptionDashboardBodyViewModel.cs    |  6 ++
 .../SubscriptionDashboardBodyViewModel.cs     | 46 +++++++-------
 21 files changed, 156 insertions(+), 153 deletions(-)

diff --git a/COMET.Web.Common/Components/Applications/DynamicApplicationBase.razor b/COMET.Web.Common/Components/Applications/DynamicApplicationBase.razor
index aac0d088..e72d4595 100644
--- a/COMET.Web.Common/Components/Applications/DynamicApplicationBase.razor
+++ b/COMET.Web.Common/Components/Applications/DynamicApplicationBase.razor
@@ -20,5 +20,5 @@
 //   limitations under the License.
 ------------------------------------------------------------------------------->
 <CascadingValue Value="this.CurrentThing">
-    <DynamicComponent Type="this.ApplicationBaseType" Parameters="this.parameters"/>
+    <DynamicComponent Type="this.ApplicationBaseType" Parameters="this.parameters" @key="this.Id"/>
 </CascadingValue>
diff --git a/COMET.Web.Common/Components/Applications/DynamicApplicationBase.razor.cs b/COMET.Web.Common/Components/Applications/DynamicApplicationBase.razor.cs
index 6a4a5aa6..66b8d4c5 100644
--- a/COMET.Web.Common/Components/Applications/DynamicApplicationBase.razor.cs
+++ b/COMET.Web.Common/Components/Applications/DynamicApplicationBase.razor.cs
@@ -59,6 +59,12 @@ public partial class DynamicApplicationBase
         [Parameter]
         public Thing CurrentThing { get; set; }
 
+        /// <summary>
+        /// Gets or sets the component's id
+        /// </summary>
+        [Parameter]
+        public object Id { get; set; }
+
         /// <summary>
         /// Gets the <see cref="Dictionary{TKey,TValue}"/> of parameters that have to be passed to the <see cref="DynamicComponent"/>
         /// </summary>
diff --git a/COMETwebapp.Tests/Pages/ParameterEditor/ParameterEditorTestFixture.cs b/COMETwebapp.Tests/Pages/ParameterEditor/ParameterEditorTestFixture.cs
index 8c649f7a..e01a4656 100644
--- a/COMETwebapp.Tests/Pages/ParameterEditor/ParameterEditorTestFixture.cs
+++ b/COMETwebapp.Tests/Pages/ParameterEditor/ParameterEditorTestFixture.cs
@@ -73,7 +73,7 @@ public class ParameterEditorTestFixture
         private Mock<ISession> session;
         private Iteration firstIteration;
         private Iteration secondIteration;
-        private ICDPMessageBus messageBus;
+        private CDPMessageBus messageBus;
 
         [SetUp]
         public void Setup()
@@ -123,21 +123,31 @@ public void Setup()
             mockConfigurationService.Setup(x => x.ServerConfiguration).Returns(new ServerConfiguration());
             this.messageBus = new CDPMessageBus();
 
+            var parameterTableViewModel = new Mock<IParameterTableViewModel>();
+            parameterTableViewModel.Setup(x => x.Rows).Returns(new SourceList<ParameterBaseRowViewModel>());
+
+            var parameterEditorBodyViewModel = new Mock<IParameterEditorBodyViewModel>();
+            parameterEditorBodyViewModel.Setup(x => x.OptionSelector).Returns(new Mock<IOptionSelectorViewModel>().Object);
+            parameterEditorBodyViewModel.Setup(x => x.BatchParameterEditorViewModel).Returns(new Mock<IBatchParameterEditorViewModel>().Object);
+            parameterEditorBodyViewModel.Setup(x => x.ParameterTypeSelector).Returns(new Mock<IParameterTypeSelectorViewModel>().Object);
+            parameterEditorBodyViewModel.Setup(x => x.ElementSelector).Returns(new Mock<IElementBaseSelectorViewModel>().Object);
+            parameterEditorBodyViewModel.Setup(x => x.ParameterTableViewModel).Returns(parameterTableViewModel.Object);
+
+            var configurationService = new Mock<IStringTableService>();
+            configurationService.Setup(x => x.GetText(It.IsAny<string>())).Returns("something");
+
             this.context.ConfigureDevExpressBlazor();
             this.context.Services.AddSingleton(this.viewModel);
             this.context.Services.AddSingleton(this.sessionService.Object);
+            this.context.Services.AddSingleton(mockConfigurationService.Object);
+            this.context.Services.AddSingleton(parameterEditorBodyViewModel.Object);
+            this.context.Services.AddSingleton(parameterTableViewModel.Object);
+            this.context.Services.AddSingleton(configurationService.Object);
+            this.context.Services.AddSingleton<ICDPMessageBus>(this.messageBus);
             this.context.Services.AddSingleton<IOpenModelViewModel, OpenModelViewModel>();
-            this.context.Services.AddSingleton<IParameterEditorBodyViewModel, ParameterEditorBodyViewModel>();
             this.context.Services.AddSingleton<IBatchParameterEditorViewModel, BatchParameterEditorViewModel>();
             this.context.Services.AddSingleton<ISubscriptionService, SubscriptionService>();
-            this.context.Services.AddSingleton<IParameterTableViewModel, ParameterTableViewModel>();
             this.context.Services.AddSingleton<INotificationService, NotificationService>();
-            this.context.Services.AddSingleton(mockConfigurationService.Object);
-            this.context.Services.AddSingleton(this.messageBus);
-
-            var configurationService = new Mock<IStringTableService>();
-            configurationService.Setup(x => x.GetText(It.IsAny<string>())).Returns("something");
-            this.context.Services.AddSingleton(configurationService.Object);
         }
 
         [TearDown]
diff --git a/COMETwebapp.Tests/ViewModels/Components/ParameterEditor/ParameterEditorBodyViewModelTestFixture.cs b/COMETwebapp.Tests/ViewModels/Components/ParameterEditor/ParameterEditorBodyViewModelTestFixture.cs
index 6d0e1aba..6cca26c6 100644
--- a/COMETwebapp.Tests/ViewModels/Components/ParameterEditor/ParameterEditorBodyViewModelTestFixture.cs
+++ b/COMETwebapp.Tests/ViewModels/Components/ParameterEditor/ParameterEditorBodyViewModelTestFixture.cs
@@ -242,33 +242,13 @@ public async Task VerifyApplyFilters()
             await TaskHelper.WaitWhileAsync(() => this.viewModel.IsLoading);
 
             this.viewModel.ElementSelector.SelectedElementBase = this.viewModel.ElementSelector.AvailableElements.First();
-            await TaskHelper.WaitWhileAsync(() => this.viewModel.IsLoading);
-
-            this.tableViewModel.Verify(x => x.ApplyFilters(this.iteration.DefaultOption, this.viewModel.ElementSelector.SelectedElementBase, null, true), Times.Once);
-
-            this.viewModel.ElementSelector.SelectedElementBase = null;
-            await TaskHelper.WaitWhileAsync(() => this.viewModel.IsLoading);
-
             this.viewModel.ParameterTypeSelector.SelectedParameterType = this.viewModel.ParameterTypeSelector.AvailableParameterTypes.First();
-            await TaskHelper.WaitWhileAsync(() => this.viewModel.IsLoading);
-
-            this.tableViewModel.Verify(x => x.ApplyFilters(this.iteration.DefaultOption,
-                null, this.viewModel.ParameterTypeSelector.SelectedParameterType, true), Times.Once);
-
-            this.viewModel.ParameterTypeSelector.SelectedParameterType = null;
-            await TaskHelper.WaitWhileAsync(() => this.viewModel.IsLoading);
-
             this.viewModel.OptionSelector.SelectedOption = this.viewModel.CurrentThing.Option.Last();
-            await TaskHelper.WaitWhileAsync(() => this.viewModel.IsLoading);
-
-            this.tableViewModel.Verify(x => x.ApplyFilters(this.iteration.Option.Last(),
-                null, null, true), Times.Once);
-
             this.viewModel.IsOwnedParameters = false;
-            await TaskHelper.WaitWhileAsync(() => this.viewModel.IsLoading);
 
-            this.tableViewModel.Verify(x => x.ApplyFilters(this.iteration.Option.Last(),
-                null, null, false), Times.Once);
+            this.viewModel.ApplyFilters();
+
+            this.tableViewModel.Verify(x => x.ApplyFilters(It.IsAny<Option>(), It.IsAny<ElementBase>(), It.IsAny<ParameterType>(), It.IsAny<bool>()), Times.AtLeastOnce);
         }
 
         [Test]
diff --git a/COMETwebapp/Components/ModelDashboard/ModelDashboardBody.razor b/COMETwebapp/Components/ModelDashboard/ModelDashboardBody.razor
index a7f9322c..6519e672 100644
--- a/COMETwebapp/Components/ModelDashboard/ModelDashboardBody.razor
+++ b/COMETwebapp/Components/ModelDashboard/ModelDashboardBody.razor
@@ -43,4 +43,4 @@
             </div>
         </div>
     </div>
-</LoadingComponent>
\ No newline at end of file
+</LoadingComponent>
diff --git a/COMETwebapp/Components/ModelDashboard/ModelDashboardBody.razor.cs b/COMETwebapp/Components/ModelDashboard/ModelDashboardBody.razor.cs
index 8ec5e201..942b37c5 100644
--- a/COMETwebapp/Components/ModelDashboard/ModelDashboardBody.razor.cs
+++ b/COMETwebapp/Components/ModelDashboard/ModelDashboardBody.razor.cs
@@ -97,6 +97,7 @@ private void UpdateUrl(string pageName = WebAppConstantValues.ModelDashboardPage
                 additionalParameters[QueryKeys.ParameterKey] = this.ViewModel.ParameterTypeSelector.SelectedParameterType.Iid.ToShortGuid();
             }
 
+            this.ViewModel.UpdateDashboards();
             this.UpdateUrlWithParameters(additionalParameters, pageName);
         }
 
diff --git a/COMETwebapp/Components/ParameterEditor/ParameterEditorBody.razor b/COMETwebapp/Components/ParameterEditor/ParameterEditorBody.razor
index 8b6260da..519a4d4f 100644
--- a/COMETwebapp/Components/ParameterEditor/ParameterEditorBody.razor
+++ b/COMETwebapp/Components/ParameterEditor/ParameterEditorBody.razor
@@ -26,7 +26,7 @@ Copyright (c) 2024 Starion Group S.A.
 
 @inherits COMET.Web.Common.Components.Applications.SingleIterationApplicationBase<COMETwebapp.ViewModels.Components.ParameterEditor.IParameterEditorBodyViewModel>
 
-<LoadingComponent IsVisible="@(this.ViewModel.IsLoading || this.ViewModel.BatchParameterEditorViewModel.IsLoading)">
+<LoadingComponent IsVisible="@(this.ViewModel.IsLoading)">
     <div id="@WebAppConstantValues.ParameterEditorPage.QueryPageBodyName()" class="container-fluid">
         <div class="row ">
             <div class="col">
@@ -60,4 +60,4 @@ Copyright (c) 2024 Starion Group S.A.
             <ParameterTable ViewModel="this.ViewModel.ParameterTableViewModel"/>
         </div>
     </div>
-</LoadingComponent>
\ No newline at end of file
+</LoadingComponent>
diff --git a/COMETwebapp/Components/ParameterEditor/ParameterEditorBody.razor.cs b/COMETwebapp/Components/ParameterEditor/ParameterEditorBody.razor.cs
index 493d74ca..c5063fdc 100644
--- a/COMETwebapp/Components/ParameterEditor/ParameterEditorBody.razor.cs
+++ b/COMETwebapp/Components/ParameterEditor/ParameterEditorBody.razor.cs
@@ -46,7 +46,8 @@ protected override void OnViewModelAssigned()
         {
             base.OnViewModelAssigned();
 
-            this.Disposables.Add(this.WhenAnyValue(x => x.ViewModel.OptionSelector.SelectedOption,
+            this.Disposables.Add(this.WhenAnyValue(
+                    x => x.ViewModel.OptionSelector.SelectedOption,
                     x => x.ViewModel.ParameterTypeSelector.SelectedParameterType,
                     x => x.ViewModel.ElementSelector.SelectedElementBase,
                     x => x.ViewModel.IsOwnedParameters)
@@ -99,6 +100,7 @@ private void UpdateUrl()
                 additionalParameters["owned"] = this.ViewModel.IsOwnedParameters.ToString();
             }
 
+            this.ViewModel.ApplyFilters();
             this.UpdateUrlWithParameters(additionalParameters, WebAppConstantValues.ParameterEditorPage);
         }
     }
diff --git a/COMETwebapp/Components/ParameterEditor/ParameterTable.razor b/COMETwebapp/Components/ParameterEditor/ParameterTable.razor
index 77388896..0005ed75 100644
--- a/COMETwebapp/Components/ParameterEditor/ParameterTable.razor
+++ b/COMETwebapp/Components/ParameterEditor/ParameterTable.razor
@@ -66,7 +66,7 @@
     <DxGrid @ref="this.Grid"
             CssClass="default-grid"
             ShowAllRows="true"
-            Data="@this.sortedCollection"
+            Data="@(this.sortedCollection)"
             SelectionMode="GridSelectionMode.Single"
             AllowSelectRowByClick="false"
             ShowFilterRow="true"
diff --git a/COMETwebapp/Components/ParameterEditor/ParameterTable.razor.cs b/COMETwebapp/Components/ParameterEditor/ParameterTable.razor.cs
index 3e63a4e5..ec7597ba 100644
--- a/COMETwebapp/Components/ParameterEditor/ParameterTable.razor.cs
+++ b/COMETwebapp/Components/ParameterEditor/ParameterTable.razor.cs
@@ -1,18 +1,18 @@
 // --------------------------------------------------------------------------------------------------------------------
-//  <copyright file="ParameterTable.cs" company="Starion Group S.A.">
-//     Copyright (c) 2023-2024 Starion Group S.A.
+//  <copyright file="ParameterTable.razor.cs" company="Starion Group S.A.">
+//     Copyright (c) 2024 Starion Group S.A.
 // 
-//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Théate Antoine
+//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Théate Antoine, João Rua
 // 
-//     This file is part of CDP4-COMET WEB Community Edition
-//     The CDP4-COMET WEB Community Edition is the Starion Web Application implementation of ECSS-E-TM-10-25 Annex A and Annex C.
+//     This file is part of COMET WEB Community Edition
+//     The COMET WEB Community Edition is the Starion Group Web Application implementation of ECSS-E-TM-10-25 Annex A and Annex C.
 // 
-//     The CDP4-COMET WEB Community Edition is free software; you can redistribute it and/or
+//     The COMET WEB Community Edition is free software; you can redistribute it and/or
 //     modify it under the terms of the GNU Affero General Public
 //     License as published by the Free Software Foundation; either
 //     version 3 of the License, or (at your option) any later version.
 // 
-//     The CDP4-COMET WEB Community Edition is distributed in the hope that it will be useful,
+//     The COMET WEB Community Edition is distributed in the hope that it will be useful,
 //     but WITHOUT ANY WARRANTY; without even the implied warranty of
 //     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 //    Affero General Public License for more details.
@@ -26,8 +26,7 @@ namespace COMETwebapp.Components.ParameterEditor
 {
     using System.Collections.ObjectModel;
 
-    using CDP4Common.EngineeringModelData;
-    using CDP4Common.SiteDirectoryData;
+    using COMET.Web.Common.Extensions;
 
     using COMETwebapp.Comparer;
     using COMETwebapp.ViewModels.Components.ParameterEditor;
@@ -46,14 +45,14 @@ namespace COMETwebapp.Components.ParameterEditor
     public partial class ParameterTable
     {
         /// <summary>
-        /// <see cref="EventCallback" /> to close the popup editor
+        /// The <see cref="ParameterBaseRowViewModelComparer" />
         /// </summary>
-        private EventCallback closeEditor;
+        private readonly ParameterBaseRowViewModelComparer comparer = new();
 
         /// <summary>
-        /// The <see cref="ParameterBaseRowViewModelComparer" />
+        /// <see cref="EventCallback" /> to close the popup editor
         /// </summary>
-        private ParameterBaseRowViewModelComparer comparer = new();
+        private EventCallback closeEditor;
 
         /// <summary>
         /// The sorted collection of <see cref="ParameterBaseRowViewModel" />
@@ -80,9 +79,10 @@ protected override void OnInitialized()
             base.OnInitialized();
 
             this.Disposables.Add(this.WhenAnyValue(x => x.ViewModel.IsOnEditMode)
-                .Subscribe(_ => this.InvokeAsync(this.StateHasChanged)));
+                .SubscribeAsync(_ => this.InvokeAsync(this.StateHasChanged)));
 
             this.Disposables.Add(this.ViewModel.Rows.Connect()
+                .AutoRefresh()
                 .Sort(this.comparer)
                 .Bind(out this.sortedCollection)
                 .Subscribe(_ => this.InvokeAsync(this.StateHasChanged)));
@@ -93,7 +93,7 @@ protected override void OnInitialized()
         /// <summary>
         /// Customizes the table rows
         /// </summary>
-        /// <param name="e">The <see cref="GridCustomizeElementEventArgs"/></param>
+        /// <param name="e">The <see cref="GridCustomizeElementEventArgs" /></param>
         private void OnCustomizeElement(GridCustomizeElementEventArgs e)
         {
             if (e.ElementType == GridElementType.DataRow)
diff --git a/COMETwebapp/Components/SubscriptionDashboard/SubscriptionDashboardBody.razor.cs b/COMETwebapp/Components/SubscriptionDashboard/SubscriptionDashboardBody.razor.cs
index e9eea248..43047ae8 100644
--- a/COMETwebapp/Components/SubscriptionDashboard/SubscriptionDashboardBody.razor.cs
+++ b/COMETwebapp/Components/SubscriptionDashboard/SubscriptionDashboardBody.razor.cs
@@ -98,6 +98,7 @@ private void UpdateUrl()
                 additionalParameters[QueryKeys.ParameterKey] = this.ViewModel.ParameterTypeSelector.SelectedParameterType.Iid.ToShortGuid();
             }
 
+            this.ViewModel.UpdateTables();
             this.UpdateUrlWithParameters(additionalParameters, WebAppConstantValues.SubscriptionDashboardPage);
         }
 
diff --git a/COMETwebapp/Components/SystemRepresentation/SystemRepresentationBody.razor.cs b/COMETwebapp/Components/SystemRepresentation/SystemRepresentationBody.razor.cs
index be0e6d28..8ad765ca 100644
--- a/COMETwebapp/Components/SystemRepresentation/SystemRepresentationBody.razor.cs
+++ b/COMETwebapp/Components/SystemRepresentation/SystemRepresentationBody.razor.cs
@@ -77,6 +77,7 @@ private void UpdateUrl()
                 additionalParameters[QueryKeys.OptionKey] = this.ViewModel.OptionSelector.SelectedOption.Iid.ToShortGuid();
             }
 
+            this.ViewModel.ApplyFilters();
             this.UpdateUrlWithParameters(additionalParameters, WebAppConstantValues.SystemRepresentationPage);
         }
     }
diff --git a/COMETwebapp/Components/Tabs/TabsPanelComponent.razor b/COMETwebapp/Components/Tabs/TabsPanelComponent.razor
index c80771de..c9ffc4a0 100644
--- a/COMETwebapp/Components/Tabs/TabsPanelComponent.razor
+++ b/COMETwebapp/Components/Tabs/TabsPanelComponent.razor
@@ -70,7 +70,8 @@
         <div class="template-container" id="tabs-page-content">
             <DynamicApplicationBase ViewModel="this.Panel.CurrentTab.ApplicationBaseViewModel"
                                     ApplicationBaseType="this.Panel.CurrentTab.ComponentType"
-                                    CurrentThing="this.Panel.CurrentTab.ObjectOfInterest as Thing"/>
+                                    CurrentThing="this.Panel.CurrentTab.ObjectOfInterest as Thing"
+                                    Id="@(this.Panel.CurrentTab.Id)"/>
         </div>
     }
 </div>
diff --git a/COMETwebapp/Components/Viewer/ViewerBody.razor.cs b/COMETwebapp/Components/Viewer/ViewerBody.razor.cs
index febceb2a..b48b6a50 100644
--- a/COMETwebapp/Components/Viewer/ViewerBody.razor.cs
+++ b/COMETwebapp/Components/Viewer/ViewerBody.razor.cs
@@ -138,6 +138,7 @@ private void UpdateUrl()
                 additionalParameters["option"] = this.ViewModel.OptionSelector.SelectedOption.Iid.ToShortGuid();
             }
 
+            this.ViewModel.InitializeViewModel();
             this.UpdateUrlWithParameters(additionalParameters, WebAppConstantValues.ViewerPage);
         }
     }
diff --git a/COMETwebapp/Model/TabbedApplicationInformation.cs b/COMETwebapp/Model/TabbedApplicationInformation.cs
index c80f172d..0179bec0 100644
--- a/COMETwebapp/Model/TabbedApplicationInformation.cs
+++ b/COMETwebapp/Model/TabbedApplicationInformation.cs
@@ -42,6 +42,7 @@ public TabbedApplicationInformation(IApplicationBaseViewModel applicationBaseVie
             this.ApplicationBaseViewModel = applicationBaseViewModel;
             this.ComponentType = componentType;
             this.ObjectOfInterest = objectOfInterest;
+            this.Id = Guid.NewGuid();
         }
 
         /// <summary>
@@ -58,5 +59,10 @@ public TabbedApplicationInformation(IApplicationBaseViewModel applicationBaseVie
         /// Gets the object of interest
         /// </summary>
         public object ObjectOfInterest { get; }
+
+        /// <summary>
+        /// Gets the tab's id
+        /// </summary>
+        public Guid Id { get; }
     }
 }
diff --git a/COMETwebapp/ViewModels/Components/ModelDashboard/IModelDashboardBodyViewModel.cs b/COMETwebapp/ViewModels/Components/ModelDashboard/IModelDashboardBodyViewModel.cs
index a5eafafc..4cfeca92 100644
--- a/COMETwebapp/ViewModels/Components/ModelDashboard/IModelDashboardBodyViewModel.cs
+++ b/COMETwebapp/ViewModels/Components/ModelDashboard/IModelDashboardBodyViewModel.cs
@@ -59,5 +59,10 @@ public interface IModelDashboardBodyViewModel : ISingleIterationApplicationBaseV
         /// Gets the <see cref="IElementDashboardViewModel" />
         /// </summary>
         IElementDashboardViewModel ElementDashboard { get; }
+
+        /// <summary>
+        /// Update the dashboard view models properties
+        /// </summary>
+        void UpdateDashboards();
     }
 }
diff --git a/COMETwebapp/ViewModels/Components/ModelDashboard/ModelDashboardBodyViewModel.cs b/COMETwebapp/ViewModels/Components/ModelDashboard/ModelDashboardBodyViewModel.cs
index 809782d4..54a1c44f 100644
--- a/COMETwebapp/ViewModels/Components/ModelDashboard/ModelDashboardBodyViewModel.cs
+++ b/COMETwebapp/ViewModels/Components/ModelDashboard/ModelDashboardBodyViewModel.cs
@@ -1,18 +1,18 @@
 // --------------------------------------------------------------------------------------------------------------------
 //  <copyright file="ModelDashboardBodyViewModel.cs" company="Starion Group S.A.">
-//     Copyright (c) 2023-2024 Starion Group S.A.
+//     Copyright (c) 2024 Starion Group S.A.
 // 
-//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Théate Antoine, Nabil Abbar
+//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Théate Antoine, João Rua
 // 
-//     This file is part of CDP4-COMET WEB Community Edition
-//     The CDP4-COMET WEB Community Edition is the Starion Web Application implementation of ECSS-E-TM-10-25 Annex A and Annex C.
+//     This file is part of COMET WEB Community Edition
+//     The COMET WEB Community Edition is the Starion Group Web Application implementation of ECSS-E-TM-10-25 Annex A and Annex C.
 // 
-//     The CDP4-COMET WEB Community Edition is free software; you can redistribute it and/or
+//     The COMET WEB Community Edition is free software; you can redistribute it and/or
 //     modify it under the terms of the GNU Affero General Public
 //     License as published by the Free Software Foundation; either
 //     version 3 of the License, or (at your option) any later version.
 // 
-//     The CDP4-COMET WEB Community Edition is distributed in the hope that it will be useful,
+//     The COMET WEB Community Edition is distributed in the hope that it will be useful,
 //     but WITHOUT ANY WARRANTY; without even the implied warranty of
 //     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 //    Affero General Public License for more details.
@@ -28,7 +28,6 @@ namespace COMETwebapp.ViewModels.Components.ModelDashboard
 
     using CDP4Dal;
 
-    using COMET.Web.Common.Extensions;
     using COMET.Web.Common.Services.SessionManagement;
     using COMET.Web.Common.ViewModels.Components.Applications;
     using COMET.Web.Common.ViewModels.Components.Selectors;
@@ -52,11 +51,6 @@ public class ModelDashboardBodyViewModel : SingleIterationApplicationBaseViewMod
         public ModelDashboardBodyViewModel(ISessionService sessionService, IParameterDashboardViewModel parameterDashboard, ICDPMessageBus messageBus) : base(sessionService, messageBus)
         {
             this.ParameterDashboard = parameterDashboard;
-
-            this.Disposables.Add(this.WhenAnyValue(x => x.FiniteStateSelector.SelectedActualFiniteState,
-                    x => x.OptionSelector.SelectedOption,
-                    x => x.ParameterTypeSelector.SelectedParameterType)
-                .SubscribeAsync(_ => this.UpdateDashboards()));
         }
 
         /// <summary>
@@ -89,6 +83,22 @@ public ModelDashboardBodyViewModel(ISessionService sessionService, IParameterDas
         /// </summary>
         public IParameterTypeSelectorViewModel ParameterTypeSelector { get; private set; } = new ParameterTypeSelectorViewModel();
 
+        /// <summary>
+        /// Update the dashboard view models properties
+        /// </summary>
+        public void UpdateDashboards()
+        {
+            this.IsLoading = true;
+
+            this.ParameterDashboard.UpdateProperties(this.CurrentThing, this.OptionSelector.SelectedOption,
+                this.FiniteStateSelector.SelectedActualFiniteState, this.ParameterTypeSelector.SelectedParameterType,
+                this.CurrentDomain, this.AvailableDomains);
+
+            this.ElementDashboard.UpdateProperties(this.CurrentThing, this.CurrentDomain);
+
+            this.IsLoading = false;
+        }
+
         /// <summary>
         /// Handles the refresh of the current <see cref="ISession" />
         /// </summary>
@@ -105,7 +115,7 @@ protected override Task OnSessionRefreshed()
         protected override async Task OnDomainChanged()
         {
             await base.OnDomainChanged();
-            await this.UpdateDashboards();
+            this.UpdateDashboards();
         }
 
         /// <summary>
@@ -124,24 +134,7 @@ protected override async Task OnThingChanged()
                 : this.SessionService.GetModelDomains((EngineeringModelSetup)this.CurrentThing.IterationSetup.Container);
 
             this.CurrentDomain = this.CurrentThing == null ? null : this.SessionService.GetDomainOfExpertise(this.CurrentThing);
-            await this.UpdateDashboards();
-        }
-
-        /// <summary>
-        /// Update the dashboard view models properties
-        /// </summary>
-        /// <returns>A <see cref="Task" /></returns>
-        private async Task UpdateDashboards()
-        {
-            this.IsLoading = true;
-            await Task.Delay(1);
-
-            this.ParameterDashboard.UpdateProperties(this.CurrentThing, this.OptionSelector.SelectedOption,
-                this.FiniteStateSelector.SelectedActualFiniteState, this.ParameterTypeSelector.SelectedParameterType,
-                this.CurrentDomain, this.AvailableDomains);
-
-            this.ElementDashboard.UpdateProperties(this.CurrentThing, this.CurrentDomain);
-            this.IsLoading = false;
+            this.UpdateDashboards();
         }
     }
 }
diff --git a/COMETwebapp/ViewModels/Components/ParameterEditor/IParameterEditorBodyViewModel.cs b/COMETwebapp/ViewModels/Components/ParameterEditor/IParameterEditorBodyViewModel.cs
index 523bd2ed..6baa3241 100644
--- a/COMETwebapp/ViewModels/Components/ParameterEditor/IParameterEditorBodyViewModel.cs
+++ b/COMETwebapp/ViewModels/Components/ParameterEditor/IParameterEditorBodyViewModel.cs
@@ -1,18 +1,18 @@
 // --------------------------------------------------------------------------------------------------------------------
 //  <copyright file="IParameterEditorBodyViewModel.cs" company="Starion Group S.A.">
-//     Copyright (c) 2023-2024 Starion Group S.A.
+//     Copyright (c) 2024 Starion Group S.A.
 // 
-//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Théate Antoine
+//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Théate Antoine, João Rua
 // 
-//     This file is part of CDP4-COMET WEB Community Edition
-//     The CDP4-COMET WEB Community Edition is the Starion Web Application implementation of ECSS-E-TM-10-25 Annex A and Annex C.
+//     This file is part of COMET WEB Community Edition
+//     The COMET WEB Community Edition is the Starion Group Web Application implementation of ECSS-E-TM-10-25 Annex A and Annex C.
 // 
-//     The CDP4-COMET WEB Community Edition is free software; you can redistribute it and/or
+//     The COMET WEB Community Edition is free software; you can redistribute it and/or
 //     modify it under the terms of the GNU Affero General Public
 //     License as published by the Free Software Foundation; either
 //     version 3 of the License, or (at your option) any later version.
 // 
-//     The CDP4-COMET WEB Community Edition is distributed in the hope that it will be useful,
+//     The COMET WEB Community Edition is distributed in the hope that it will be useful,
 //     but WITHOUT ANY WARRANTY; without even the implied warranty of
 //     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 //    Affero General Public License for more details.
@@ -69,5 +69,10 @@ public interface IParameterEditorBodyViewModel : ISingleIterationApplicationBase
         /// Gets or sets the <see cref="IBatchParameterEditorViewModel" />
         /// </summary>
         IBatchParameterEditorViewModel BatchParameterEditorViewModel { get; set; }
+
+        /// <summary>
+        /// Apply all the filters on the <see cref="IParameterTableViewModel" />
+        /// </summary>
+        void ApplyFilters();
     }
 }
diff --git a/COMETwebapp/ViewModels/Components/ParameterEditor/ParameterEditorBodyViewModel.cs b/COMETwebapp/ViewModels/Components/ParameterEditor/ParameterEditorBodyViewModel.cs
index eadc7a09..fe65e062 100644
--- a/COMETwebapp/ViewModels/Components/ParameterEditor/ParameterEditorBodyViewModel.cs
+++ b/COMETwebapp/ViewModels/Components/ParameterEditor/ParameterEditorBodyViewModel.cs
@@ -30,7 +30,6 @@ namespace COMETwebapp.ViewModels.Components.ParameterEditor
     using CDP4Dal;
     using CDP4Dal.Events;
 
-    using COMET.Web.Common.Extensions;
     using COMET.Web.Common.Services.SessionManagement;
     using COMET.Web.Common.ViewModels.Components.Applications;
     using COMET.Web.Common.ViewModels.Components.Selectors;
@@ -75,11 +74,6 @@ public ParameterEditorBodyViewModel(ISessionService sessionService, ISubscriptio
             this.ParameterTableViewModel = parameterTableView;
             this.BatchParameterEditorViewModel = batchParameterEditorViewModel;
 
-            this.Disposables.Add(this.WhenAnyValue(x => x.ElementSelector.SelectedElementBase,
-                x => x.OptionSelector.SelectedOption,
-                x => x.ParameterTypeSelector.SelectedParameterType,
-                x => x.IsOwnedParameters).SubscribeAsync(_ => this.ApplyFilters()));
-
             this.InitializeSubscriptions(ObjectChangedTypesOfInterest);
             this.RegisterViewModelsWithReusableRows([this.ParameterTableViewModel]);
         }
@@ -123,13 +117,25 @@ public bool IsOwnedParameters
         /// </summary>
         public IBatchParameterEditorViewModel BatchParameterEditorViewModel { get; set; }
 
+        /// <summary>
+        /// Apply all the filters on the <see cref="IParameterTableViewModel" />
+        /// </summary>
+        public void ApplyFilters()
+        {
+            if (this.CurrentThing != null)
+            {
+                this.ParameterTableViewModel.ApplyFilters(this.OptionSelector.SelectedOption, this.ElementSelector.SelectedElementBase,
+                    this.ParameterTypeSelector.SelectedParameterType, this.IsOwnedParameters);
+            }
+        }
+
         /// <summary>
         /// Handles the refresh of the current <see cref="ISession" />
         /// </summary>
         /// <returns>A <see cref="Task" /></returns>
         protected override async Task OnSessionRefreshed()
         {
-            if (!this.AddedThings.Any() && !this.DeletedThings.Any() && !this.UpdatedThings.Any())
+            if (this.AddedThings.Count == 0 && this.DeletedThings.Count == 0 && this.UpdatedThings.Count == 0)
             {
                 return;
             }
@@ -158,7 +164,7 @@ protected override async Task OnDomainChanged()
 
                 if (this.IsOwnedParameters)
                 {
-                    await this.ApplyFilters();
+                    this.ApplyFilters();
                 }
 
                 this.IsLoading = false;
@@ -172,42 +178,21 @@ protected override async Task OnDomainChanged()
         protected override async Task OnThingChanged()
         {
             await base.OnThingChanged();
-            this.IsOwnedParameters = true;
-            this.ElementSelector.CurrentIteration = this.CurrentThing;
-            this.OptionSelector.CurrentIteration = this.CurrentThing;
-            this.ParameterTypeSelector.CurrentIteration = this.CurrentThing;
-            this.BatchParameterEditorViewModel.CurrentIteration = this.CurrentThing;
-            await this.InitializeTable();
-        }
 
-        /// <summary>
-        /// Initialize the <see cref="IParameterTableViewModel" />
-        /// </summary>
-        /// <returns>A <see cref="Task" /></returns>
-        private async Task InitializeTable()
-        {
             this.IsLoading = true;
-            await Task.Delay(1);
-            this.ParameterTableViewModel.InitializeViewModel(this.CurrentThing, this.CurrentDomain, this.OptionSelector.SelectedOption);
-            this.IsLoading = false;
-        }
 
-        /// <summary>
-        /// Apply all the filters on the <see cref="IParameterTableViewModel" />
-        /// </summary>
-        /// <returns>A <see cref="Task" /></returns>
-        private async Task ApplyFilters()
-        {
-            if (this.CurrentThing != null)
+            if (!this.HasSetInitialValuesOnce)
             {
-                this.IsLoading = true;
-                await Task.Delay(1);
-
-                this.ParameterTableViewModel.ApplyFilters(this.OptionSelector.SelectedOption, this.ElementSelector.SelectedElementBase,
-                    this.ParameterTypeSelector.SelectedParameterType, this.IsOwnedParameters);
-
-                this.IsLoading = false;
+                this.IsOwnedParameters = true;
+                this.ElementSelector.CurrentIteration = this.CurrentThing;
+                this.OptionSelector.CurrentIteration = this.CurrentThing;
+                this.ParameterTypeSelector.CurrentIteration = this.CurrentThing;
+                this.BatchParameterEditorViewModel.CurrentIteration = this.CurrentThing;
             }
+
+            this.ParameterTableViewModel.InitializeViewModel(this.CurrentThing, this.CurrentDomain, this.OptionSelector.SelectedOption);
+            this.ApplyFilters();
+            this.IsLoading = false;
         }
     }
 }
diff --git a/COMETwebapp/ViewModels/Components/SubscriptionDashboard/ISubscriptionDashboardBodyViewModel.cs b/COMETwebapp/ViewModels/Components/SubscriptionDashboard/ISubscriptionDashboardBodyViewModel.cs
index 1a1b6292..51bec14c 100644
--- a/COMETwebapp/ViewModels/Components/SubscriptionDashboard/ISubscriptionDashboardBodyViewModel.cs
+++ b/COMETwebapp/ViewModels/Components/SubscriptionDashboard/ISubscriptionDashboardBodyViewModel.cs
@@ -51,5 +51,11 @@ public interface ISubscriptionDashboardBodyViewModel : ISingleIterationApplicati
         /// Gets the <see cref="IParameterTypeSelectorViewModel" />
         /// </summary>
         IParameterTypeSelectorViewModel ParameterTypeSelector { get; }
+
+        /// <summary>
+        /// Updates the <see cref="ISubscribedTableViewModel" /> and <see cref="IDomainOfExpertiseSubscriptionTableViewModel" />
+        /// </summary>
+        /// <returns>A <see cref="Task" /></returns>
+        void UpdateTables();
     }
 }
diff --git a/COMETwebapp/ViewModels/Components/SubscriptionDashboard/SubscriptionDashboardBodyViewModel.cs b/COMETwebapp/ViewModels/Components/SubscriptionDashboard/SubscriptionDashboardBodyViewModel.cs
index 45fd5033..64062df6 100644
--- a/COMETwebapp/ViewModels/Components/SubscriptionDashboard/SubscriptionDashboardBodyViewModel.cs
+++ b/COMETwebapp/ViewModels/Components/SubscriptionDashboard/SubscriptionDashboardBodyViewModel.cs
@@ -1,18 +1,18 @@
 // --------------------------------------------------------------------------------------------------------------------
 //  <copyright file="SubscriptionDashboardBodyViewModel.cs" company="Starion Group S.A.">
-//     Copyright (c) 2023-2024 Starion Group S.A.
+//     Copyright (c) 2024 Starion Group S.A.
 // 
-//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Théate Antoine, Nabil Abbar
+//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Théate Antoine, João Rua
 // 
-//     This file is part of CDP4-COMET WEB Community Edition
-//     The CDP4-COMET WEB Community Edition is the Starion Web Application implementation of ECSS-E-TM-10-25 Annex A and Annex C.
+//     This file is part of COMET WEB Community Edition
+//     The COMET WEB Community Edition is the Starion Group Web Application implementation of ECSS-E-TM-10-25 Annex A and Annex C.
 // 
-//     The CDP4-COMET WEB Community Edition is free software; you can redistribute it and/or
+//     The COMET WEB Community Edition is free software; you can redistribute it and/or
 //     modify it under the terms of the GNU Affero General Public
 //     License as published by the Free Software Foundation; either
 //     version 3 of the License, or (at your option) any later version.
 // 
-//     The CDP4-COMET WEB Community Edition is distributed in the hope that it will be useful,
+//     The COMET WEB Community Edition is distributed in the hope that it will be useful,
 //     but WITHOUT ANY WARRANTY; without even the implied warranty of
 //     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 //    Affero General Public License for more details.
@@ -46,14 +46,14 @@ public class SubscriptionDashboardBodyViewModel : SingleIterationApplicationBase
         /// </summary>
         /// <param name="sessionService">The <see cref="ISessionService" /></param>
         /// <param name="subscribedTable">The <see cref="ISubscribedTableViewModel" /></param>
-        /// <param name="messageBus">The <see cref="CDPMessageBus"/></param>
+        /// <param name="messageBus">The <see cref="CDPMessageBus" /></param>
         public SubscriptionDashboardBodyViewModel(ISessionService sessionService, ISubscribedTableViewModel subscribedTable, ICDPMessageBus messageBus) : base(sessionService, messageBus)
         {
             this.SubscribedTable = subscribedTable;
 
             this.Disposables.Add(this.WhenAnyValue(x => x.OptionSelector.SelectedOption,
                     x => x.ParameterTypeSelector.SelectedParameterType)
-                .SubscribeAsync(_ => this.UpdateTables()));
+                .Subscribe(_ => this.UpdateTables()));
         }
 
         /// <summary>
@@ -76,6 +76,20 @@ public SubscriptionDashboardBodyViewModel(ISessionService sessionService, ISubsc
         /// </summary>
         public IParameterTypeSelectorViewModel ParameterTypeSelector { get; } = new ParameterTypeSelectorViewModel();
 
+        /// <summary>
+        /// Updates the <see cref="ISubscribedTableViewModel" /> and <see cref="IDomainOfExpertiseSubscriptionTableViewModel" />
+        /// </summary>
+        /// <returns>A <see cref="Task" /></returns>
+        public void UpdateTables()
+        {
+            this.IsLoading = true;
+
+            this.SubscribedTable.ApplyFilters(this.OptionSelector.SelectedOption, this.ParameterTypeSelector.SelectedParameterType);
+            this.DomainOfExpertiseSubscriptionTable.ApplyFilters(this.OptionSelector.SelectedOption, this.ParameterTypeSelector.SelectedParameterType);
+
+            this.IsLoading = false;
+        }
+
         /// <summary>
         /// Update this view model properties when the <see cref="Iteration" /> has changed
         /// </summary>
@@ -112,7 +126,7 @@ protected override async Task OnThingChanged()
         protected override async Task OnSessionRefreshed()
         {
             await this.OnThingChanged();
-            await this.UpdateTables();
+            this.UpdateTables();
         }
 
         /// <summary>
@@ -124,19 +138,5 @@ protected override Task OnDomainChanged()
             base.OnDomainChanged();
             return this.OnThingChanged();
         }
-
-        /// <summary>
-        /// Updates the <see cref="ISubscribedTableViewModel" /> and <see cref="IDomainOfExpertiseSubscriptionTableViewModel" />
-        /// </summary>
-        /// <returns>A <see cref="Task" /></returns>
-        private async Task UpdateTables()
-        {
-            this.IsLoading = true;
-            await Task.Delay(1);
-
-            this.SubscribedTable.ApplyFilters(this.OptionSelector.SelectedOption, this.ParameterTypeSelector.SelectedParameterType);
-            this.DomainOfExpertiseSubscriptionTable.ApplyFilters(this.OptionSelector.SelectedOption, this.ParameterTypeSelector.SelectedParameterType);
-            this.IsLoading = false;
-        }
     }
 }