From d29ecd2b05286eca131d0c22add97c39e3c27b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rua?=
 <140734849+joao4all@users.noreply.github.com>
Date: Mon, 8 Apr 2024 13:14:59 +0100
Subject: [PATCH] Feat #557 As a user i want to show the options of a model and
 create, edit and delete an option (#570)

---
 .../EngineeringModelBodyTestFixture.cs        | 112 ++++++++++++
 .../OptionsTableTestFixture.cs                | 170 ++++++++++++++++++
 .../Model/ApplicationsTestFixture.cs          |   2 +-
 .../OptionValidatorTestFixture.cs             |  64 +++++++
 .../MeasurementUnitValidatorsTestFixture.cs   |  10 +-
 ...teDomainOfExpertiseValidatorTestFixture.cs |   4 +-
 .../EngineeringModelValidatorTestFixture.cs   |   4 +-
 .../ParticipantValidatorTestFixture.cs        |   4 +-
 .../RolesValidatorsTestFixture.cs             |   4 +-
 ...ngineeringModelBodyViewModelTestFixture.cs |  74 ++++++++
 .../OptionsTableViewModelTestFixture.cs       | 166 +++++++++++++++++
 .../EngineeringModelBody.razor                |  43 +++++
 .../EngineeringModelBody.razor.cs             |  98 ++++++++++
 .../EngineeringModel/OptionsForm.razor        |  46 +++++
 .../EngineeringModel/OptionsForm.razor.cs     |  97 ++++++++++
 .../EngineeringModel/OptionsTable.razor       |  89 +++++++++
 .../EngineeringModel/OptionsTable.razor.cs    | 111 ++++++++++++
 .../SiteDirectory/Roles/RolesTables.razor     |   1 -
 .../Extensions/ServiceCollectionExtensions.cs |   5 +-
 COMETwebapp/Model/Applications.cs             |   8 +
 .../EngineeringModel/EngineeringModel.razor   |  32 ++++
 .../Pages/ModelDashboard/ModelDashboard.razor |   2 +-
 COMETwebapp/Utilities/WebAppConstantValues.cs |   5 +
 .../EngineeringModel/OptionValidator.cs       |  48 +++++
 .../LinearConversionUnitValidator.cs          |   2 +-
 .../MeasurementUnitValidator.cs               |   2 +-
 .../MeasurementUnits/PrefixedUnitValidator.cs |   2 +-
 .../MeasurementUnits/UnitFactorValidator.cs   |   2 +-
 .../CreateDomainOfExpertiseValidator.cs       |   2 +-
 .../EngineeringModelValidator.cs              |   2 +-
 .../EngineeringModel/ParticipantValidator.cs  |   2 +-
 .../Roles/ParticipantRoleValidator.cs         |   2 +-
 .../Roles/PersonRoleValidator.cs              |   2 +-
 .../EngineeringModelBodyViewModel.cs          |  73 ++++++++
 .../IEngineeringModelBodyViewModel.cs         |  41 +++++
 .../Options/IOptionsTableViewModel.cs         |  61 +++++++
 .../Options/OptionsTableViewModel.cs          | 162 +++++++++++++++++
 .../Rows/OptionRowViewModel.cs                |  61 +++++++
 COMETwebapp/_Imports.razor                    |   1 +
 39 files changed, 1590 insertions(+), 26 deletions(-)
 create mode 100644 COMETwebapp.Tests/Components/EngineeringModel/EngineeringModelBodyTestFixture.cs
 create mode 100644 COMETwebapp.Tests/Components/EngineeringModel/OptionsTableTestFixture.cs
 create mode 100644 COMETwebapp.Tests/Validators/EngineeringModel/OptionValidatorTestFixture.cs
 rename COMETwebapp.Tests/Validators/{ => ReferenceData}/MeasurementUnitValidatorsTestFixture.cs (95%)
 rename COMETwebapp.Tests/Validators/{ => SiteDirectory}/CreateDomainOfExpertiseValidatorTestFixture.cs (96%)
 rename COMETwebapp.Tests/Validators/{EngineeringModel => SiteDirectory}/EngineeringModelValidatorTestFixture.cs (96%)
 rename COMETwebapp.Tests/Validators/{EngineeringModel => SiteDirectory}/ParticipantValidatorTestFixture.cs (95%)
 rename COMETwebapp.Tests/Validators/{ => SiteDirectory}/RolesValidatorsTestFixture.cs (96%)
 create mode 100644 COMETwebapp.Tests/ViewModels/Components/EngineeringModel/EngineeringModelBodyViewModelTestFixture.cs
 create mode 100644 COMETwebapp.Tests/ViewModels/Components/EngineeringModel/OptionsTableViewModelTestFixture.cs
 create mode 100644 COMETwebapp/Components/EngineeringModel/EngineeringModelBody.razor
 create mode 100644 COMETwebapp/Components/EngineeringModel/EngineeringModelBody.razor.cs
 create mode 100644 COMETwebapp/Components/EngineeringModel/OptionsForm.razor
 create mode 100644 COMETwebapp/Components/EngineeringModel/OptionsForm.razor.cs
 create mode 100644 COMETwebapp/Components/EngineeringModel/OptionsTable.razor
 create mode 100644 COMETwebapp/Components/EngineeringModel/OptionsTable.razor.cs
 create mode 100644 COMETwebapp/Pages/EngineeringModel/EngineeringModel.razor
 create mode 100644 COMETwebapp/Validators/EngineeringModel/OptionValidator.cs
 rename COMETwebapp/Validators/{ => ReferenceData}/MeasurementUnits/LinearConversionUnitValidator.cs (97%)
 rename COMETwebapp/Validators/{ => ReferenceData}/MeasurementUnits/MeasurementUnitValidator.cs (97%)
 rename COMETwebapp/Validators/{ => ReferenceData}/MeasurementUnits/PrefixedUnitValidator.cs (97%)
 rename COMETwebapp/Validators/{ => ReferenceData}/MeasurementUnits/UnitFactorValidator.cs (97%)
 rename COMETwebapp/Validators/{ => SiteDirectory}/CreateDomainOfExpertiseValidator.cs (97%)
 rename COMETwebapp/Validators/{ => SiteDirectory}/EngineeringModel/EngineeringModelValidator.cs (98%)
 rename COMETwebapp/Validators/{ => SiteDirectory}/EngineeringModel/ParticipantValidator.cs (97%)
 rename COMETwebapp/Validators/{ => SiteDirectory}/Roles/ParticipantRoleValidator.cs (97%)
 rename COMETwebapp/Validators/{ => SiteDirectory}/Roles/PersonRoleValidator.cs (97%)
 create mode 100644 COMETwebapp/ViewModels/Components/EngineeringModel/EngineeringModelBodyViewModel.cs
 create mode 100644 COMETwebapp/ViewModels/Components/EngineeringModel/IEngineeringModelBodyViewModel.cs
 create mode 100644 COMETwebapp/ViewModels/Components/EngineeringModel/Options/IOptionsTableViewModel.cs
 create mode 100644 COMETwebapp/ViewModels/Components/EngineeringModel/Options/OptionsTableViewModel.cs
 create mode 100644 COMETwebapp/ViewModels/Components/EngineeringModel/Rows/OptionRowViewModel.cs

diff --git a/COMETwebapp.Tests/Components/EngineeringModel/EngineeringModelBodyTestFixture.cs b/COMETwebapp.Tests/Components/EngineeringModel/EngineeringModelBodyTestFixture.cs
new file mode 100644
index 00000000..91b4e5ab
--- /dev/null
+++ b/COMETwebapp.Tests/Components/EngineeringModel/EngineeringModelBodyTestFixture.cs
@@ -0,0 +1,112 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EngineeringModelBodyTestFixture.cs" company="RHEA System S.A.">
+//    Copyright (c) 2023-2024 RHEA System S.A.
+//
+//    Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+//
+//    This file is part of CDP4-COMET WEB Community Edition
+//    The CDP4-COMET WEB Community Edition is the RHEA 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
+//    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,
+//    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.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.Tests.Components.EngineeringModel
+{
+    using System.Threading.Tasks;
+
+    using Bunit;
+
+    using CDP4Common.EngineeringModelData;
+
+    using COMET.Web.Common.Model.Configuration;
+    using COMET.Web.Common.Services.ConfigurationService;
+    using COMET.Web.Common.Test.Helpers;
+
+    using COMETwebapp.Components.EngineeringModel;
+    using COMETwebapp.ViewModels.Components.EngineeringModel;
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Options;
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Rows;
+
+    using DevExpress.Blazor;
+
+    using DynamicData;
+
+    using Microsoft.Extensions.DependencyInjection;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    using TestContext = Bunit.TestContext;
+
+    [TestFixture]
+    public class EngineeringModelBodyTestFixture
+    {
+        private TestContext context;
+        private IRenderedComponent<EngineeringModelBody> renderer;
+        private Mock<IEngineeringModelBodyViewModel> viewModel;
+        private Mock<IOptionsTableViewModel> optionsTableViewModel;
+        private Iteration iteration;
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.context = new TestContext();
+
+            this.viewModel = new Mock<IEngineeringModelBodyViewModel>();
+            this.iteration = new Iteration();
+
+            this.viewModel.Setup(x => x.CurrentThing).Returns(this.iteration);
+
+            this.optionsTableViewModel = new Mock<IOptionsTableViewModel>();
+            this.optionsTableViewModel.Setup(x => x.Rows).Returns(new SourceList<OptionRowViewModel>());
+            this.viewModel.Setup(x => x.OptionsTableViewModel).Returns(this.optionsTableViewModel.Object);
+
+            var configuration = new Mock<IConfigurationService>();
+            configuration.Setup(x => x.ServerConfiguration).Returns(new ServerConfiguration());
+
+            this.context.Services.AddSingleton(configuration.Object);
+            this.context.Services.AddSingleton(this.viewModel.Object);
+            this.context.ConfigureDevExpressBlazor();
+
+            this.renderer = this.context.RenderComponent<EngineeringModelBody>();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            this.context.CleanContext();
+            this.context.Dispose();
+        }
+
+        [Test]
+        public void VerifyOnInitialized()
+        {
+            Assert.Multiple(() =>
+            {
+                Assert.That(this.renderer.Instance.ViewModel, Is.Not.Null);
+                Assert.That(this.viewModel.Object.CurrentThing, Is.EqualTo(this.iteration));
+            });
+        }
+
+        [Test]
+        public async Task VerifySelectComponent()
+        {
+            var toolbarItem = this.renderer.FindComponent<DxToolbarItem>();
+            await this.renderer.InvokeAsync(toolbarItem.Instance.Click.InvokeAsync);
+            Assert.That(this.renderer.Instance.SelectedComponent, Is.Not.Null);
+        }
+    }
+}
diff --git a/COMETwebapp.Tests/Components/EngineeringModel/OptionsTableTestFixture.cs b/COMETwebapp.Tests/Components/EngineeringModel/OptionsTableTestFixture.cs
new file mode 100644
index 00000000..ebd1cef5
--- /dev/null
+++ b/COMETwebapp.Tests/Components/EngineeringModel/OptionsTableTestFixture.cs
@@ -0,0 +1,170 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="OptionsTableTestFixture.cs" company="RHEA System S.A.">
+//    Copyright (c) 2023-2024 RHEA System S.A.
+//
+//    Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+//
+//    This file is part of CDP4-COMET WEB Community Edition
+//    The CDP4-COMET WEB Community Edition is the RHEA 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
+//    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,
+//    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.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.Tests.Components.EngineeringModel
+{
+    using System.Linq;
+    using System.Threading.Tasks;
+
+    using Bunit;
+
+    using CDP4Common.EngineeringModelData;
+
+    using COMET.Web.Common.Test.Helpers;
+
+    using COMETwebapp.Components.EngineeringModel;
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Options;
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Rows;
+
+    using DevExpress.Blazor;
+
+    using DynamicData;
+
+    using Microsoft.AspNetCore.Components.Forms;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    using TestContext = Bunit.TestContext;
+
+    [TestFixture]
+    public class OptionsTableTestFixture
+    {
+        private TestContext context;
+        private IRenderedComponent<OptionsTable> renderer;
+        private Mock<IOptionsTableViewModel> viewModel;
+        private Option option;
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.context = new TestContext();
+            this.viewModel = new Mock<IOptionsTableViewModel>();
+
+            this.option = new Option()
+            {
+                Name = "A name",
+                ShortName = "AName",
+                Container = new Iteration(),
+            };
+
+            var rows = new SourceList<OptionRowViewModel>();
+            rows.Add(new OptionRowViewModel(this.option){ IsDefault = true});
+            this.viewModel.Setup(x => x.Rows).Returns(rows);
+            this.viewModel.Setup(x => x.Thing).Returns(new Option());
+            
+            this.context.ConfigureDevExpressBlazor();
+
+            this.renderer = this.context.RenderComponent<OptionsTable>(parameters =>
+            {
+                parameters.Add(p => p.ViewModel, this.viewModel.Object);
+            });
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            this.context.CleanContext();
+            this.context.Dispose();
+        }
+
+        [Test]
+        public void VerifyOnInitialized()
+        {
+            Assert.Multiple(() =>
+            {
+                Assert.That(this.renderer.Instance.ShouldCreateThing, Is.EqualTo(false));
+                Assert.That(this.renderer.Instance.ViewModel, Is.EqualTo(this.viewModel.Object));
+                Assert.That(this.renderer.Markup, Does.Contain(this.option.Name));
+                this.viewModel.Verify(x => x.InitializeViewModel(), Times.Once);
+            });
+        }
+
+        [Test]
+        public async Task VerifyDeleteOption()
+        {
+            var deleteButton = this.renderer.FindComponents<DxButton>().First(x => x.Instance.Id == "deleteButton");
+            await this.renderer.InvokeAsync(deleteButton.Instance.Click.InvokeAsync);
+            this.viewModel.Verify(x => x.OnDeleteButtonClick(It.IsAny<OptionRowViewModel>()), Times.Once);
+            this.viewModel.Setup(x => x.IsOnDeletionMode).Returns(true);
+
+            this.renderer.Render();
+
+            var deletionPopup = this.renderer.FindComponent<DxPopup>();
+            var confirmDeletionButton = deletionPopup.FindComponents<DxButton>().ElementAt(1);
+            await deletionPopup.InvokeAsync(confirmDeletionButton.Instance.Click.InvokeAsync);
+            this.viewModel.Verify(x => x.OnConfirmPopupButtonClick(), Times.Once);
+        }
+
+        [Test]
+        public async Task VerifyCreateOption()
+        {
+            var addOptionButton = this.renderer.FindComponents<DxButton>().First(x => x.Instance.Id == "addOptionButton");
+            await this.renderer.InvokeAsync(addOptionButton.Instance.Click.InvokeAsync);
+            var form = this.renderer.FindComponent<OptionsForm>();
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(form, Is.Not.Null);
+                Assert.That(form.Instance.IsVisible, Is.EqualTo(true));
+                Assert.That(form.Instance.ShouldCreate, Is.EqualTo(true));
+            });
+
+            var editForm = form.FindComponent<EditForm>();
+            await form.InvokeAsync(editForm.Instance.OnValidSubmit.InvokeAsync);
+            this.viewModel.Verify(x => x.CreateOrEditOption(true), Times.Once);
+        }
+
+        [Test]
+        public async Task VerifyEditOption()
+        {
+            var grid = this.renderer.FindComponent<DxGrid>();
+            await this.renderer.InvokeAsync(() => grid.Instance.SelectedDataItemChanged.InvokeAsync(this.viewModel.Object.Rows.Items.First()));
+
+            Assert.Multiple(() =>
+            {
+                this.viewModel.Verify(x => x.SetCurrentOption(It.IsAny<Option>()));
+                Assert.That(this.renderer.Instance.IsOnEditMode, Is.EqualTo(true));
+            });
+
+            var form = this.renderer.FindComponent<OptionsForm>();
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(form, Is.Not.Null);
+                Assert.That(form.Instance.IsVisible, Is.EqualTo(true));
+                Assert.That(form.Instance.ShouldCreate, Is.EqualTo(false));
+            });
+
+            var editForm = form.FindComponent<EditForm>();
+            await form.InvokeAsync(editForm.Instance.OnValidSubmit.InvokeAsync);
+            this.viewModel.Verify(x => x.CreateOrEditOption(false), Times.Once);
+
+            var cancelButton = editForm.FindComponents<DxButton>().First(x => x.Instance.Id == "cancelOptionsButton");
+            await editForm.InvokeAsync(cancelButton.Instance.Click.InvokeAsync);
+            Assert.That(this.renderer.Instance.IsOnEditMode, Is.EqualTo(false));
+        }
+    }
+}
diff --git a/COMETwebapp.Tests/Model/ApplicationsTestFixture.cs b/COMETwebapp.Tests/Model/ApplicationsTestFixture.cs
index 3b098660..71c54e0a 100644
--- a/COMETwebapp.Tests/Model/ApplicationsTestFixture.cs
+++ b/COMETwebapp.Tests/Model/ApplicationsTestFixture.cs
@@ -36,7 +36,7 @@ public void VerifyApplications()
         {
             var applications = Applications.ExistingApplications;
 
-            Assert.That(applications, Has.Count.EqualTo(12));
+            Assert.That(applications, Has.Count.EqualTo(13));
 
             foreach (var application in applications)
             {
diff --git a/COMETwebapp.Tests/Validators/EngineeringModel/OptionValidatorTestFixture.cs b/COMETwebapp.Tests/Validators/EngineeringModel/OptionValidatorTestFixture.cs
new file mode 100644
index 00000000..c217f5a8
--- /dev/null
+++ b/COMETwebapp.Tests/Validators/EngineeringModel/OptionValidatorTestFixture.cs
@@ -0,0 +1,64 @@
+// --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="OptionValidatorTestFixture.cs" company="RHEA System S.A.">
+//     Copyright (c) 2023-2024 RHEA System S.A.
+// 
+//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+// 
+//     This file is part of CDP4-COMET WEB Community Edition
+//     The CDP4-COMET WEB Community Edition is the RHEA 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
+//     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,
+//     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.
+// 
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.Tests.Validators.EngineeringModel
+{
+    using CDP4Common.EngineeringModelData;
+    using CDP4Common.Validation;
+
+    using COMETwebapp.Validators.EngineeringModel;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class OptionValidatorTestFixture
+    {
+        private OptionValidator validator;
+
+        [SetUp]
+        public void SetUp()
+        {
+            var validationService = new ValidationService();
+            this.validator = new OptionValidator(validationService);
+        }
+
+        [Test]
+        public void VerifyValidationScenarios()
+        {
+            var option = new Option();
+            Assert.That(this.validator.Validate(option).IsValid, Is.EqualTo(false));
+
+            option = new Option()
+            {
+                Name = "name1",
+                ShortName = "short name"
+            };
+
+            Assert.That(this.validator.Validate(option).IsValid, Is.EqualTo(false));
+
+            option.ShortName = "shortName";
+            Assert.That(this.validator.Validate(option).IsValid, Is.EqualTo(true));
+        }
+    }
+}
diff --git a/COMETwebapp.Tests/Validators/MeasurementUnitValidatorsTestFixture.cs b/COMETwebapp.Tests/Validators/ReferenceData/MeasurementUnitValidatorsTestFixture.cs
similarity index 95%
rename from COMETwebapp.Tests/Validators/MeasurementUnitValidatorsTestFixture.cs
rename to COMETwebapp.Tests/Validators/ReferenceData/MeasurementUnitValidatorsTestFixture.cs
index a8d5b38b..de828dbf 100644
--- a/COMETwebapp.Tests/Validators/MeasurementUnitValidatorsTestFixture.cs
+++ b/COMETwebapp.Tests/Validators/ReferenceData/MeasurementUnitValidatorsTestFixture.cs
@@ -22,12 +22,12 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Tests.Validators
+namespace COMETwebapp.Tests.Validators.ReferenceData
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
-    
-    using COMETwebapp.Validators.MeasurementUnits;
+
+    using COMETwebapp.Validators.ReferenceData.MeasurementUnits;
 
     using NUnit.Framework;
 
@@ -100,8 +100,8 @@ public void VerifyPrefixedUnitValidation()
 
             prefixedUnit = new PrefixedUnit()
             {
-                Prefix = new UnitPrefix(){ ShortName = "pre" },
-                ReferenceUnit = new SimpleUnit(){ ShortName = "ref" }
+                Prefix = new UnitPrefix() { ShortName = "pre" },
+                ReferenceUnit = new SimpleUnit() { ShortName = "ref" }
             };
 
             Assert.Multiple(() =>
diff --git a/COMETwebapp.Tests/Validators/CreateDomainOfExpertiseValidatorTestFixture.cs b/COMETwebapp.Tests/Validators/SiteDirectory/CreateDomainOfExpertiseValidatorTestFixture.cs
similarity index 96%
rename from COMETwebapp.Tests/Validators/CreateDomainOfExpertiseValidatorTestFixture.cs
rename to COMETwebapp.Tests/Validators/SiteDirectory/CreateDomainOfExpertiseValidatorTestFixture.cs
index eedb4a07..586072bb 100644
--- a/COMETwebapp.Tests/Validators/CreateDomainOfExpertiseValidatorTestFixture.cs
+++ b/COMETwebapp.Tests/Validators/SiteDirectory/CreateDomainOfExpertiseValidatorTestFixture.cs
@@ -22,12 +22,12 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Tests.Validators
+namespace COMETwebapp.Tests.Validators.SiteDirectory
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
 
-    using COMETwebapp.Validators;
+    using COMETwebapp.Validators.SiteDirectory;
 
     using NUnit.Framework;
 
diff --git a/COMETwebapp.Tests/Validators/EngineeringModel/EngineeringModelValidatorTestFixture.cs b/COMETwebapp.Tests/Validators/SiteDirectory/EngineeringModelValidatorTestFixture.cs
similarity index 96%
rename from COMETwebapp.Tests/Validators/EngineeringModel/EngineeringModelValidatorTestFixture.cs
rename to COMETwebapp.Tests/Validators/SiteDirectory/EngineeringModelValidatorTestFixture.cs
index df43906f..bb6e9fd1 100644
--- a/COMETwebapp.Tests/Validators/EngineeringModel/EngineeringModelValidatorTestFixture.cs
+++ b/COMETwebapp.Tests/Validators/SiteDirectory/EngineeringModelValidatorTestFixture.cs
@@ -22,12 +22,12 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Tests.Validators.EngineeringModel
+namespace COMETwebapp.Tests.Validators.SiteDirectory
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
 
-    using COMETwebapp.Validators.EngineeringModel;
+    using COMETwebapp.Validators.SiteDirectory.EngineeringModel;
 
     using NUnit.Framework;
 
diff --git a/COMETwebapp.Tests/Validators/EngineeringModel/ParticipantValidatorTestFixture.cs b/COMETwebapp.Tests/Validators/SiteDirectory/ParticipantValidatorTestFixture.cs
similarity index 95%
rename from COMETwebapp.Tests/Validators/EngineeringModel/ParticipantValidatorTestFixture.cs
rename to COMETwebapp.Tests/Validators/SiteDirectory/ParticipantValidatorTestFixture.cs
index f22e80c8..42bbbf8a 100644
--- a/COMETwebapp.Tests/Validators/EngineeringModel/ParticipantValidatorTestFixture.cs
+++ b/COMETwebapp.Tests/Validators/SiteDirectory/ParticipantValidatorTestFixture.cs
@@ -22,12 +22,12 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Tests.Validators.EngineeringModel
+namespace COMETwebapp.Tests.Validators.SiteDirectory
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
 
-    using COMETwebapp.Validators.EngineeringModel;
+    using COMETwebapp.Validators.SiteDirectory.EngineeringModel;
 
     using NUnit.Framework;
 
diff --git a/COMETwebapp.Tests/Validators/RolesValidatorsTestFixture.cs b/COMETwebapp.Tests/Validators/SiteDirectory/RolesValidatorsTestFixture.cs
similarity index 96%
rename from COMETwebapp.Tests/Validators/RolesValidatorsTestFixture.cs
rename to COMETwebapp.Tests/Validators/SiteDirectory/RolesValidatorsTestFixture.cs
index fecaa8dc..29424c59 100644
--- a/COMETwebapp.Tests/Validators/RolesValidatorsTestFixture.cs
+++ b/COMETwebapp.Tests/Validators/SiteDirectory/RolesValidatorsTestFixture.cs
@@ -22,12 +22,12 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Tests.Validators
+namespace COMETwebapp.Tests.Validators.SiteDirectory
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
 
-    using COMETwebapp.Validators.Roles;
+    using COMETwebapp.Validators.SiteDirectory.Roles;
 
     using NUnit.Framework;
 
diff --git a/COMETwebapp.Tests/ViewModels/Components/EngineeringModel/EngineeringModelBodyViewModelTestFixture.cs b/COMETwebapp.Tests/ViewModels/Components/EngineeringModel/EngineeringModelBodyViewModelTestFixture.cs
new file mode 100644
index 00000000..f200232c
--- /dev/null
+++ b/COMETwebapp.Tests/ViewModels/Components/EngineeringModel/EngineeringModelBodyViewModelTestFixture.cs
@@ -0,0 +1,74 @@
+// --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="EngineeringModelBodyViewModelTestFixture.cs" company="RHEA System S.A.">
+//     Copyright (c) 2023-2024 RHEA System S.A.
+// 
+//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+// 
+//     This file is part of CDP4-COMET WEB Community Edition
+//     The CDP4-COMET WEB Community Edition is the RHEA 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
+//     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,
+//     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.
+// 
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.Tests.ViewModels.Components.EngineeringModel
+{
+    using CDP4Common.EngineeringModelData;
+
+    using CDP4Dal;
+
+    using COMET.Web.Common.Services.SessionManagement;
+
+    using COMETwebapp.ViewModels.Components.EngineeringModel;
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Options;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class EngineeringModelBodyViewModelTestFixture
+    {
+        private EngineeringModelBodyViewModel viewModel;
+        private Mock<ISessionService> sessionService;
+        private CDPMessageBus messageBus;
+        private Mock<IOptionsTableViewModel> optionsTableViewModel;
+
+        [SetUp]
+        public void Setup()
+        {
+            this.sessionService = new Mock<ISessionService>();
+            this.optionsTableViewModel = new Mock<IOptionsTableViewModel>();
+            this.messageBus = new CDPMessageBus();
+
+            this.viewModel = new EngineeringModelBodyViewModel(this.sessionService.Object, this.messageBus, this.optionsTableViewModel.Object);
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            this.messageBus.ClearSubscriptions();
+            this.viewModel.Dispose();
+        }
+
+        [Test]
+        public void VerifyThingChanged()
+        {
+            var newIteration = new Iteration();
+            this.viewModel.CurrentThing = newIteration;
+
+            this.optionsTableViewModel.Verify(x => x.SetCurrentIteration(newIteration), Times.Once);
+        }
+    }
+}
diff --git a/COMETwebapp.Tests/ViewModels/Components/EngineeringModel/OptionsTableViewModelTestFixture.cs b/COMETwebapp.Tests/ViewModels/Components/EngineeringModel/OptionsTableViewModelTestFixture.cs
new file mode 100644
index 00000000..3e47f543
--- /dev/null
+++ b/COMETwebapp.Tests/ViewModels/Components/EngineeringModel/OptionsTableViewModelTestFixture.cs
@@ -0,0 +1,166 @@
+// --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="OptionsTableViewModelTestFixture.cs" company="RHEA System S.A.">
+//     Copyright (c) 2023-2024 RHEA System S.A.
+// 
+//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+// 
+//     This file is part of CDP4-COMET WEB Community Edition
+//     The CDP4-COMET WEB Community Edition is the RHEA 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
+//     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,
+//     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.
+// 
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.Tests.ViewModels.Components.EngineeringModel
+{
+    using CDP4Common.CommonData;
+    using CDP4Common.EngineeringModelData;
+    using CDP4Common.Types;
+
+    using CDP4Dal;
+    using CDP4Dal.Events;
+    using CDP4Dal.Permission;
+
+    using COMET.Web.Common.Enumerations;
+    using COMET.Web.Common.Services.SessionManagement;
+
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Options;
+
+    using Microsoft.Extensions.Logging;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class OptionsTableViewModelTestFixture
+    {
+        private OptionsTableViewModel viewModel;
+        private Mock<ISessionService> sessionService;
+        private Mock<IPermissionService> permissionService;
+        private Assembler assembler;
+        private Mock<ILogger<OptionsTableViewModel>> loggerMock;
+        private CDPMessageBus messageBus;
+        private Iteration iteration;
+        private Option option;
+
+        [SetUp]
+        public void Setup()
+        {
+            this.sessionService = new Mock<ISessionService>();
+            this.permissionService = new Mock<IPermissionService>();
+            this.messageBus = new CDPMessageBus();
+            this.loggerMock = new Mock<ILogger<OptionsTableViewModel>>();
+
+            this.option = new Option()
+            {
+                ShortName = "opt1",
+                Name = "Option 1",
+            };
+
+            this.iteration = new Iteration() { Container = new EngineeringModel() };
+            this.iteration.Option.Add(this.option);
+
+            this.assembler = new Assembler(new Uri("http://localhost:5000/"), this.messageBus);
+            var lazyOption = new Lazy<Thing>(this.option);
+            this.assembler.Cache.TryAdd(new CacheKey(), lazyOption);
+
+            this.permissionService.Setup(x => x.CanWrite(this.option.ClassKind, this.option.Container)).Returns(true);
+            var session = new Mock<ISession>();
+            session.Setup(x => x.PermissionService).Returns(this.permissionService.Object);
+            session.Setup(x => x.Assembler).Returns(this.assembler);
+            this.sessionService.Setup(x => x.Session).Returns(session.Object);
+
+            this.viewModel = new OptionsTableViewModel(this.sessionService.Object, this.messageBus, this.loggerMock.Object);
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            this.messageBus.ClearSubscriptions();
+            this.viewModel.Dispose();
+        }
+
+        [Test]
+        public void VerifyInitializeViewModel()
+        {
+            this.viewModel.InitializeViewModel();
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(this.viewModel.Rows.Count, Is.EqualTo(1));
+                Assert.That(this.viewModel.Rows.Items.First().Thing, Is.EqualTo(this.option));
+            });
+        }
+
+        [Test]
+        public void VerifyOptionRowProperties()
+        {
+            this.viewModel.InitializeViewModel();
+            var optionRow = this.viewModel.Rows.Items.First();
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(optionRow.Name, Is.EqualTo(this.option.Name));
+                Assert.That(optionRow.ShortName, Is.EqualTo(this.option.ShortName));
+                Assert.That(optionRow.IsDefault, Is.EqualTo(false));
+                Assert.That(optionRow.Thing, Is.EqualTo(this.option));
+                Assert.That(optionRow.IsAllowedToWrite, Is.EqualTo(true));
+            });
+        }
+
+        [Test]
+        public void VerifySessionRefresh()
+        {
+            this.viewModel.InitializeViewModel();
+            this.viewModel.SetCurrentIteration(this.iteration);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(this.viewModel.Rows, Has.Count.EqualTo(1));
+                Assert.That(this.viewModel.Rows.Items.First().IsDefault, Is.EqualTo(false));
+            });
+
+            this.iteration.DefaultOption = this.option;
+            this.messageBus.SendObjectChangeEvent(this.iteration, EventKind.Updated);
+            this.messageBus.SendMessage(SessionStateKind.RefreshEnded);
+
+            Assert.That(this.viewModel.Rows.Items.First().IsDefault, Is.EqualTo(true));
+        }
+
+        [Test]
+        public async Task VerifyOptionCreateOrEdit()
+        {
+            this.viewModel.InitializeViewModel();
+            this.viewModel.SetCurrentIteration(this.iteration);
+            this.viewModel.SetCurrentOption(this.option);
+
+            Assert.That(this.viewModel.Thing.Original, Is.Not.Null);
+            await this.viewModel.CreateOrEditOption(true);
+
+            Assert.Multiple(() =>
+            {
+                this.sessionService.Verify(x => x.UpdateThings(It.IsAny<EngineeringModel>(), It.IsAny<IEnumerable<Thing>>()), Times.Once);
+                this.sessionService.Verify(x => x.RefreshSession(), Times.Once);
+            });
+
+            this.sessionService.Setup(x => x.UpdateThings(It.IsAny<Thing>(), It.IsAny<IEnumerable<Thing>>())).Throws(new Exception());
+            this.viewModel.SetCurrentOption(new Option());
+            this.viewModel.SelectedIsDefaultValue = true;
+
+            await this.viewModel.CreateOrEditOption(false);
+            this.sessionService.Verify(x => x.RefreshSession(), Times.Once);
+        }
+    }
+}
diff --git a/COMETwebapp/Components/EngineeringModel/EngineeringModelBody.razor b/COMETwebapp/Components/EngineeringModel/EngineeringModelBody.razor
new file mode 100644
index 00000000..578a2625
--- /dev/null
+++ b/COMETwebapp/Components/EngineeringModel/EngineeringModelBody.razor
@@ -0,0 +1,43 @@
+<!------------------------------------------------------------------------------
+// Copyright (c) 2023-2024 RHEA System S.A.
+//
+//    Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+//
+//    This file is part of CDP4-COMET WEB Community Edition
+//    The CDP4-COMET WEB Community Edition is the RHEA 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
+//    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,
+//    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.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program. If not, see http://www.gnu.org/licenses/.
+------------------------------------------------------------------------------->
+@inherits SingleIterationApplicationBase<COMETwebapp.ViewModels.Components.EngineeringModel.IEngineeringModelBodyViewModel>
+
+<LoadingComponent IsVisible="@(this.ViewModel.IsLoading)">
+    <DxToolbar ItemClick="@this.OnItemClick">
+        <Items>
+            @foreach (var mappedValue in this.MapOfComponentsAndParameters)
+            {
+                <DxToolbarItem @key="@(mappedValue.Value.Item2)"
+                               Name="@(mappedValue.Value.Item2)"
+                               Text="@(mappedValue.Value.Item2)" 
+                               Tooltip="@(mappedValue.Value.Item2)"
+                               RenderStyle="@(mappedValue.Key == this.SelectedComponent ? ButtonRenderStyle.Primary : ButtonRenderStyle.Secondary)" />
+            }
+        </Items>
+    </DxToolbar>
+
+    @if (this.SelectedComponent != null)
+    {
+        <DynamicComponent Type="@this.SelectedComponent" 
+                          Parameters="this.dynamicComponentParameters"/>
+    }
+</LoadingComponent>
diff --git a/COMETwebapp/Components/EngineeringModel/EngineeringModelBody.razor.cs b/COMETwebapp/Components/EngineeringModel/EngineeringModelBody.razor.cs
new file mode 100644
index 00000000..3124ae60
--- /dev/null
+++ b/COMETwebapp/Components/EngineeringModel/EngineeringModelBody.razor.cs
@@ -0,0 +1,98 @@
+// --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="EngineeringModelBody.razor.cs" company="RHEA System S.A.">
+//     Copyright (c) 2023-2024 RHEA System S.A.
+// 
+//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+// 
+//     This file is part of CDP4-COMET WEB Community Edition
+//     The CDP4-COMET WEB Community Edition is the RHEA 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
+//     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,
+//     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.
+// 
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.Components.EngineeringModel
+{
+    using COMET.Web.Common.Extensions;
+
+    using DevExpress.Blazor;
+
+    using Microsoft.AspNetCore.Components;
+
+    using ReactiveUI;
+
+    /// <summary>
+    /// Core component for the Engineering model body application
+    /// </summary>
+    public partial class EngineeringModelBody
+    {
+        /// <summary>
+        /// Gets the selected component type
+        /// </summary>
+        public Type SelectedComponent { get; private set; }
+
+        /// <summary>
+        /// A <see cref="Dictionary{TKey,TValue}" /> for the <see cref="DynamicComponent.Parameters" />
+        /// </summary>
+        private readonly Dictionary<string, object> dynamicComponentParameters = [];
+
+        /// <summary>
+        /// A map with all the available components and their parameters => view model and name
+        /// </summary>
+        private Dictionary<Type, (object, string)> MapOfComponentsAndParameters => new()
+        {
+            {typeof(OptionsTable), (this.ViewModel.OptionsTableViewModel, "Options")},
+        };
+
+        /// <summary>
+        /// Initializes values of the component and of the ViewModel based on parameters provided from the url
+        /// </summary>
+        /// <param name="parameters">A <see cref="Dictionary{TKey,TValue}" /> for parameters</param>
+        protected override void InitializeValues(Dictionary<string, string> parameters)
+        {
+        }
+
+        /// <summary>
+        /// Method invoked when the component is ready to start, having received its
+        /// initial parameters from its parent in the render tree.
+        /// </summary>
+        protected override void OnInitialized()
+        {
+            base.OnInitialized();
+            this.Disposables.Add(this.ViewModel.WhenAnyValue(x => x.IsLoading).SubscribeAsync(_ => this.InvokeAsync(this.StateHasChanged)));
+
+            this.SelectComponent(this.MapOfComponentsAndParameters.First().Key);
+        }
+
+        /// <summary>
+        /// Method invoked to set the selected component from toolbar
+        /// </summary>
+        /// <param name="e">The <see cref="ToolbarItemClickEventArgs"/></param>
+        private void OnItemClick(ToolbarItemClickEventArgs e)
+        {
+            var selectedComponentAndParametersKvp = this.MapOfComponentsAndParameters.FirstOrDefault(x => x.Value.Item2 == e.ItemName);
+            this.SelectComponent(selectedComponentAndParametersKvp.Key);
+        }
+
+        /// <summary>
+        /// Selects a component to display and loads its parameters
+        /// </summary>
+        /// <param name="selectedComponent">The selected component</param>
+        private void SelectComponent(Type selectedComponent)
+        {
+            this.SelectedComponent = selectedComponent;
+            this.dynamicComponentParameters["ViewModel"] = this.MapOfComponentsAndParameters[this.SelectedComponent].Item1;
+        }
+    }
+}
diff --git a/COMETwebapp/Components/EngineeringModel/OptionsForm.razor b/COMETwebapp/Components/EngineeringModel/OptionsForm.razor
new file mode 100644
index 00000000..728413e8
--- /dev/null
+++ b/COMETwebapp/Components/EngineeringModel/OptionsForm.razor
@@ -0,0 +1,46 @@
+<!------------------------------------------------------------------------------
+Copyright (c) 2023-2024 RHEA System S.A.
+    Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+    This file is part of CDP4-COMET WEB Community Edition
+     The CDP4-COMET WEB Community Edition is the RHEA 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
+    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,
+    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.
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see http://www.gnu.org/licenses/.
+------------------------------------------------------------------------------->
+@inherits DisposableComponent
+
+<EditForm Context="editFormContext" Model="@(this.ViewModel.Thing)" OnValidSubmit="@(this.OnValidSubmit)">
+    <FluentValidationValidator />
+    <DxFormLayout CssClass="w-100">
+        <DxFormLayoutItem Caption="Shortname:" ColSpanMd="10">
+            <DxTextBox @bind-Text="@this.ViewModel.Thing.ShortName"/>
+        </DxFormLayoutItem>
+        <DxFormLayoutItem Caption="Name:" ColSpanMd="10">
+            <DxTextBox @bind-Text="@this.ViewModel.Thing.Name"/>
+        </DxFormLayoutItem>
+        <DxFormLayoutItem Caption="Is Default:" ColSpanMd="6">
+            <DxCheckBox @bind-Checked="@this.ViewModel.SelectedIsDefaultValue"/>
+        </DxFormLayoutItem>
+    </DxFormLayout>
+    <div class="pt-3"></div>
+    <ValidationSummary />
+    <div class="dxbl-grid-edit-form-buttons">
+        <DxButton Id="saveParticipantRoleButton"
+                  SubmitFormOnClick="true">
+            Save
+        </DxButton>
+        
+        <DxButton Id="cancelOptionsButton"
+                  Click="@(() => this.OnCancel())"
+                  RenderStyle="ButtonRenderStyle.Secondary">
+            Cancel
+        </DxButton>
+    </div>
+</EditForm>
diff --git a/COMETwebapp/Components/EngineeringModel/OptionsForm.razor.cs b/COMETwebapp/Components/EngineeringModel/OptionsForm.razor.cs
new file mode 100644
index 00000000..7b30a7d7
--- /dev/null
+++ b/COMETwebapp/Components/EngineeringModel/OptionsForm.razor.cs
@@ -0,0 +1,97 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="OptionsForm.razor.cs" company="RHEA System S.A.">
+//    Copyright (c) 2023-2024 RHEA System S.A.
+//
+//    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 RHEA 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
+//    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,
+//    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.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.Components.EngineeringModel
+{
+    using System.ComponentModel.DataAnnotations;
+
+    using COMET.Web.Common.Components;
+
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Options;
+
+    using Microsoft.AspNetCore.Components;
+
+    /// <summary>
+    /// Support class for the <see cref="OptionsForm"/>
+    /// </summary>
+    public partial class OptionsForm : DisposableComponent
+    {
+        /// <summary>
+        /// The <see cref="IOptionsTableViewModel" /> for this component
+        /// </summary>
+        [Parameter, Required]
+        public IOptionsTableViewModel ViewModel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value to check if the options form is visible
+        /// </summary>
+        [Parameter]
+        public bool IsVisible { get; set; }
+
+        /// <summary>
+        /// The method that is executed when the <see cref="IsVisible"/> property changes
+        /// </summary>
+        [Parameter]
+        public EventCallback<bool> IsVisibleChanged { get; set; }
+
+        /// <summary>
+        /// Gets or sets the condition to check if a new option should be created
+        /// </summary>
+        [Parameter]
+        public bool ShouldCreate { get; set; }
+
+        /// <summary>
+        /// Method that is executed after the cancel button is triggered
+        /// </summary>
+        [Parameter]
+        public EventCallback<Task> OnCanceled { get; set; }
+
+        /// <summary>
+        /// Method that is executed after the save button is triggered
+        /// </summary>
+        [Parameter]
+        public EventCallback<Task> OnSaved { get; set; }
+
+        /// <summary>
+        /// Method that is executed when the cancel button is clicked
+        /// </summary>
+        /// <returns></returns>
+        private async Task OnCancel()
+        {
+            this.IsVisible = false;
+            await this.IsVisibleChanged.InvokeAsync(this.IsVisible);
+            await this.OnCanceled.InvokeAsync();
+        }
+
+        /// <summary>
+        /// Method that is executed when there is a valid submit
+        /// </summary>
+        /// <returns>A <see cref="Task"/></returns>
+        private async Task OnValidSubmit()
+        {
+            await this.ViewModel.CreateOrEditOption(this.ShouldCreate);
+            await this.OnSaved.InvokeAsync();
+        }
+    }
+}
diff --git a/COMETwebapp/Components/EngineeringModel/OptionsTable.razor b/COMETwebapp/Components/EngineeringModel/OptionsTable.razor
new file mode 100644
index 00000000..00e5bbf3
--- /dev/null
+++ b/COMETwebapp/Components/EngineeringModel/OptionsTable.razor
@@ -0,0 +1,89 @@
+<!------------------------------------------------------------------------------
+Copyright (c) 2023-2024 RHEA System S.A.
+    Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+    This file is part of CDP4-COMET WEB Community Edition
+     The CDP4-COMET WEB Community Edition is the RHEA 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
+    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,
+    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.
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see http://www.gnu.org/licenses/.
+------------------------------------------------------------------------------->
+@using COMETwebapp.ViewModels.Components.EngineeringModel.Rows
+@inherits SelectedDataItemBase<CDP4Common.EngineeringModelData.Option, OptionRowViewModel>
+
+<LoadingComponent IsVisible="@(this.ViewModel.IsLoading)">
+    <div style="display: flex; justify-content: space-between;">
+        <DxGrid @ref="this.Grid"
+                Data="this.ViewModel.Rows.Items"
+                ColumnResizeMode="GridColumnResizeMode.ColumnsContainer"
+                ShowSearchBox="true"
+                SearchBoxNullText="Search for an option..."
+                AllowSelectRowByClick="true"
+                SelectionMode="GridSelectionMode.Single"
+                SelectedDataItemChanged="@((row) => this.OnSelectedDataItemChanged((OptionRowViewModel)row))"
+                PopupEditFormCssClass="pw-800"
+                PopupEditFormHeaderText="Option"
+                CustomizeElement="@(HighlightDefaultOptionRow)"
+                CustomizeEditModel="this.CustomizeEditThing"
+                EditMode="GridEditMode.PopupEditForm"
+                EditFormButtonsVisible="false"
+                PageSize="20"
+                PagerNavigationMode="PagerNavigationMode.Auto"
+                PageSizeSelectorVisible="true"
+                PageSizeSelectorItems="@(new int[] { 20, 35, 50 })"
+                PageSizeSelectorAllRowsItemVisible="true">
+            <Columns>
+                <DxGridDataColumn FieldName="@nameof(OptionRowViewModel.Name)" MinWidth="150"/>
+                <DxGridDataColumn FieldName="@nameof(OptionRowViewModel.ShortName)" MinWidth="80" SearchEnabled="false"/>
+                <DxGridDataColumn FieldName="@nameof(OptionRowViewModel.IsDefault)" UnboundType="GridUnboundColumnType.Boolean" Visible="false" Caption="Is Default" MinWidth="80" SearchEnabled="false"/>
+                <DxGridCommandColumn Width="200px" EditButtonVisible="false">
+                    <HeaderTemplate>
+                        <DxButton Id="addOptionButton" Text="Add Option" IconCssClass="oi oi-plus" Click="() => this.Grid.StartEditNewRowAsync()"/>
+                    </HeaderTemplate>
+                    <CellDisplayTemplate>
+                        @{
+                            var row = (OptionRowViewModel)context.DataItem;
+
+                            <DxButton Id="deleteButton"
+                                      Text="Delete"
+                                      Click="@(() => this.ViewModel.OnDeleteButtonClick(row))"
+                                      Enabled="@(row.IsAllowedToWrite)"/>
+                        }
+                    </CellDisplayTemplate>
+                </DxGridCommandColumn>
+            </Columns>
+
+            <EditFormTemplate Context="editFormTemplateContext">
+                <OptionsForm ViewModel="@this.ViewModel"
+                             IsVisible="true"
+                             ShouldCreate="true"
+                             OnSaved="@(() => this.Grid.CancelEditAsync())"
+                             OnCanceled="@(() => this.Grid.CancelEditAsync())"/>
+            </EditFormTemplate>
+        </DxGrid>
+        
+        @if (this.IsOnEditMode)
+        {
+            <div style="width: 70%; padding: 30px;">     
+                <OptionsForm ViewModel="@this.ViewModel"
+                             @bind-IsVisible="@this.IsOnEditMode"
+                             ShouldCreate="false"/>
+            </div>
+        }
+        
+    </div>
+</LoadingComponent>
+
+<DxPopup @bind-Visible="@this.ViewModel.IsOnDeletionMode" HeaderText="Please confirm" Width="auto" CloseOnOutsideClick="false">
+    @this.ViewModel.PopupDialog
+    <div class="dxbl-grid-confirm-dialog-buttons">
+        <DxButton Text="Cancel " RenderStyle="ButtonRenderStyle.Success" Click="@this.ViewModel.OnCancelPopupButtonClick" />
+        <DxButton Text="Confirm" RenderStyle="ButtonRenderStyle.Danger" Click="@this.OnConfirmDelete" />
+    </div>
+</DxPopup>
diff --git a/COMETwebapp/Components/EngineeringModel/OptionsTable.razor.cs b/COMETwebapp/Components/EngineeringModel/OptionsTable.razor.cs
new file mode 100644
index 00000000..7241b397
--- /dev/null
+++ b/COMETwebapp/Components/EngineeringModel/OptionsTable.razor.cs
@@ -0,0 +1,111 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="OptionsTable.razor.cs" company="RHEA System S.A.">
+//    Copyright (c) 2023-2024 RHEA System S.A.
+//
+//    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 RHEA 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
+//    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,
+//    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.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.Components.EngineeringModel
+{
+    using System.ComponentModel.DataAnnotations;
+
+    using CDP4Common.EngineeringModelData;
+
+    using COMETwebapp.Components.Common;
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Options;
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Rows;
+
+    using DevExpress.Blazor;
+
+    using Microsoft.AspNetCore.Components;
+
+    /// <summary>
+    /// Support class for the <see cref="OptionsTable"/>
+    /// </summary>
+    public partial class OptionsTable : SelectedDataItemBase<Option, OptionRowViewModel>
+    {
+        /// <summary>
+        /// The <see cref="IOptionsTableViewModel" /> for this component
+        /// </summary>
+        [Parameter, Required]
+        public IOptionsTableViewModel ViewModel { get; set; }
+
+        /// <summary>
+        /// Gets the value to check if component is on edit mode
+        /// </summary>
+        public bool IsOnEditMode { get; private set; }
+
+        /// <summary>
+        /// Method invoked when the component is ready to start, having received its
+        /// initial parameters from its parent in the render tree.
+        /// </summary>
+        protected override void OnInitialized()
+        {
+            base.OnInitialized();
+            this.Initialize(this.ViewModel);
+        }
+
+        /// <summary>
+        /// Method invoked when creating a new thing
+        /// </summary>
+        /// <param name="e">A <see cref="GridCustomizeEditModelEventArgs" /></param>
+        protected override void CustomizeEditThing(GridCustomizeEditModelEventArgs e)
+        {
+            base.CustomizeEditThing(e);
+
+            var dataItem = (OptionRowViewModel)e.DataItem;
+            this.ViewModel.SetCurrentOption(dataItem == null ? new Option() : dataItem.Thing);
+            e.EditModel = this.ViewModel.Thing;
+            this.IsOnEditMode = false;
+        }
+
+        /// <summary>
+        /// Method invoked every time a row is selected
+        /// </summary>
+        /// <param name="row">The selected row</param>
+        private void OnSelectedDataItemChanged(OptionRowViewModel row)
+        {
+            this.ViewModel.SetCurrentOption(row.Thing);
+            this.IsOnEditMode = true;
+        }
+
+        /// <summary>
+        /// Method invoked when the deletion popup is confirmed
+        /// </summary>
+        /// <returns></returns>
+        private async Task OnConfirmDelete()
+        {
+            await this.ViewModel.OnConfirmPopupButtonClick();
+            this.IsOnEditMode = false;
+        }
+
+        /// <summary>
+        /// Method invoked to "Show/Hide Deprecated Items"
+        /// </summary>
+        /// <param name="e">The <see cref="GridCustomizeElementEventArgs"/></param>
+        private static void HighlightDefaultOptionRow(GridCustomizeElementEventArgs e)
+        {
+            if (e.ElementType == GridElementType.DataRow && (bool)e.Grid.GetRowValue(e.VisibleIndex, nameof(OptionRowViewModel.IsDefault)))
+            {
+                e.CssClass = "fw-bold";
+            }
+        }
+    }
+}
diff --git a/COMETwebapp/Components/SiteDirectory/Roles/RolesTables.razor b/COMETwebapp/Components/SiteDirectory/Roles/RolesTables.razor
index d7782286..c3ec0c6a 100644
--- a/COMETwebapp/Components/SiteDirectory/Roles/RolesTables.razor
+++ b/COMETwebapp/Components/SiteDirectory/Roles/RolesTables.razor
@@ -25,7 +25,6 @@ Copyright (c) 2023-2024 RHEA System S.A.
                                OnRoleSelected="@(this.OnRoleSelected)"/>
     </div>
     
-
     @if (this.SelectedComponent != null)
     {
         <div style="width: 70%; padding: 30px; padding-top: 55px;">
diff --git a/COMETwebapp/Extensions/ServiceCollectionExtensions.cs b/COMETwebapp/Extensions/ServiceCollectionExtensions.cs
index a2515c37..164d5bf5 100644
--- a/COMETwebapp/Extensions/ServiceCollectionExtensions.cs
+++ b/COMETwebapp/Extensions/ServiceCollectionExtensions.cs
@@ -30,12 +30,13 @@ namespace COMETwebapp.Extensions
     using COMETwebapp.Services.SubscriptionService;
     using COMETwebapp.Utilities;
     using COMETwebapp.ViewModels.Components.BookEditor;
+    using COMETwebapp.ViewModels.Components.EngineeringModel;
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Options;
     using COMETwebapp.ViewModels.Components.SiteDirectory.DomainsOfExpertise;
     using COMETwebapp.ViewModels.Components.ModelDashboard;
     using COMETwebapp.ViewModels.Components.ModelDashboard.ParameterValues;
     using COMETwebapp.ViewModels.Components.ModelEditor;
     using COMETwebapp.ViewModels.Components.ParameterEditor;
-    using COMETwebapp.ViewModels.Components.ReferenceData;
     using COMETwebapp.ViewModels.Components.ReferenceData.Categories;
     using COMETwebapp.ViewModels.Components.ReferenceData.MeasurementScales;
     using COMETwebapp.ViewModels.Components.ReferenceData.MeasurementUnits;
@@ -103,6 +104,8 @@ public static void RegisterViewModels(this IServiceCollection serviceCollection)
             serviceCollection.AddTransient<IActiveDomainsTableViewModel, ActiveDomainsTableViewModel>();
             serviceCollection.AddTransient<IParticipantRolesTableViewModel, ParticipantRolesTableViewModel>();
             serviceCollection.AddTransient<IPersonRolesTableViewModel, PersonRolesTableViewModel>();
+            serviceCollection.AddTransient<IEngineeringModelBodyViewModel, EngineeringModelBodyViewModel>();
+            serviceCollection.AddTransient<IOptionsTableViewModel, OptionsTableViewModel>();
         }
     }
 }
diff --git a/COMETwebapp/Model/Applications.cs b/COMETwebapp/Model/Applications.cs
index dc8481a3..b9db9b50 100644
--- a/COMETwebapp/Model/Applications.cs
+++ b/COMETwebapp/Model/Applications.cs
@@ -112,6 +112,14 @@ public static class Applications
                 Description = "Visualize site directory data",
                 Url = WebAppConstantValues.SiteDirectoryPage
             },
+            new Application
+            {
+                Name = "Engineering Model",
+                Color = "#c3cffd",
+                Icon = "cog",
+                Description = "Visualize the engineering model data",
+                Url = WebAppConstantValues.EngineeringModelPage
+            },
             new Application    
             {
                 Name = "User Management",
diff --git a/COMETwebapp/Pages/EngineeringModel/EngineeringModel.razor b/COMETwebapp/Pages/EngineeringModel/EngineeringModel.razor
new file mode 100644
index 00000000..82a12dcf
--- /dev/null
+++ b/COMETwebapp/Pages/EngineeringModel/EngineeringModel.razor
@@ -0,0 +1,32 @@
+<!------------------------------------------------------------------------------
+Copyright (c) 2023-2024 RHEA System S.A.
+    Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+
+    This file is part of CDP4-COMET WEB Community Edition
+     The CDP4-COMET WEB Community Edition is the RHEA 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
+    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,
+    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.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see http://www.gnu.org/licenses/.
+------------------------------------------------------------------------------->
+@using COMETwebapp.Utilities
+@inherits COMET.Web.Common.Pages.SingleIterationPageTemplate
+@attribute [Route(WebAppConstantValues.EngineeringModelPage)]
+
+<SingleIterationApplicationTemplate IterationId="@this.RequestedIteration" ShowActiveModel="true">
+    <Body>
+		<EngineeringModelBody />
+    </Body>
+</SingleIterationApplicationTemplate>
+
+
+
diff --git a/COMETwebapp/Pages/ModelDashboard/ModelDashboard.razor b/COMETwebapp/Pages/ModelDashboard/ModelDashboard.razor
index ed300e7e..64dfb09d 100644
--- a/COMETwebapp/Pages/ModelDashboard/ModelDashboard.razor
+++ b/COMETwebapp/Pages/ModelDashboard/ModelDashboard.razor
@@ -1,7 +1,7 @@
 <!------------------------------------------------------------------------------
 Copyright (c) 2023-2024 RHEA System S.A.
 
-    Authors: Justine Veirier d'aiguebonne, Sam Gerené, Alex Vorobiev, Alexander van Delft
+    Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
 
     This file is part of CDP4-COMET WEB Community Edition
      The CDP4-COMET WEB Community Edition is the RHEA Web Application implementation of ECSS-E-TM-10-25 Annex A and Annex C.
diff --git a/COMETwebapp/Utilities/WebAppConstantValues.cs b/COMETwebapp/Utilities/WebAppConstantValues.cs
index c5df5402..b431ff3f 100644
--- a/COMETwebapp/Utilities/WebAppConstantValues.cs
+++ b/COMETwebapp/Utilities/WebAppConstantValues.cs
@@ -76,6 +76,11 @@ public static class WebAppConstantValues
         /// </summary>
         public const string ModelDashboardPage = "ModelDashboard";
 
+        /// <summary>
+        /// The page name of the Engieering Model data
+        /// </summary>
+        public const string EngineeringModelPage = "EngineeringModel";
+
         /// <summary>
         /// The page name of the Parameter Editor
         /// </summary>
diff --git a/COMETwebapp/Validators/EngineeringModel/OptionValidator.cs b/COMETwebapp/Validators/EngineeringModel/OptionValidator.cs
new file mode 100644
index 00000000..938ece8a
--- /dev/null
+++ b/COMETwebapp/Validators/EngineeringModel/OptionValidator.cs
@@ -0,0 +1,48 @@
+// --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="OptionValidator.cs" company="RHEA System S.A.">
+//     Copyright (c) 2023-2024 RHEA System S.A.
+// 
+//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+// 
+//     This file is part of CDP4-COMET WEB Community Edition
+//     The CDP4-COMET WEB Community Edition is the RHEA 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
+//     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,
+//     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.
+// 
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.Validators.EngineeringModel
+{
+    using CDP4Common.EngineeringModelData;
+    using CDP4Common.Validation;
+
+    using COMET.Web.Common.Extensions;
+
+    using FluentValidation;
+
+    /// <summary>
+    /// A class to validate the <see cref="Option"/>
+    /// </summary>
+    public class OptionValidator : AbstractValidator<Option>
+    {
+        /// <summary>
+        /// Instantiates a new <see cref="OptionValidator"/>
+        /// </summary>
+        public OptionValidator(IValidationService validationService) : base()
+        {
+            this.RuleFor(x => x.Name).Validate(validationService, nameof(Option.Name));
+            this.RuleFor(x => x.ShortName).Validate(validationService, nameof(Option.ShortName));
+        }
+    }
+}
diff --git a/COMETwebapp/Validators/MeasurementUnits/LinearConversionUnitValidator.cs b/COMETwebapp/Validators/ReferenceData/MeasurementUnits/LinearConversionUnitValidator.cs
similarity index 97%
rename from COMETwebapp/Validators/MeasurementUnits/LinearConversionUnitValidator.cs
rename to COMETwebapp/Validators/ReferenceData/MeasurementUnits/LinearConversionUnitValidator.cs
index 7a4e7ea2..b8072f63 100644
--- a/COMETwebapp/Validators/MeasurementUnits/LinearConversionUnitValidator.cs
+++ b/COMETwebapp/Validators/ReferenceData/MeasurementUnits/LinearConversionUnitValidator.cs
@@ -23,7 +23,7 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Validators.MeasurementUnits
+namespace COMETwebapp.Validators.ReferenceData.MeasurementUnits
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
diff --git a/COMETwebapp/Validators/MeasurementUnits/MeasurementUnitValidator.cs b/COMETwebapp/Validators/ReferenceData/MeasurementUnits/MeasurementUnitValidator.cs
similarity index 97%
rename from COMETwebapp/Validators/MeasurementUnits/MeasurementUnitValidator.cs
rename to COMETwebapp/Validators/ReferenceData/MeasurementUnits/MeasurementUnitValidator.cs
index f19cf7e1..fa9426a1 100644
--- a/COMETwebapp/Validators/MeasurementUnits/MeasurementUnitValidator.cs
+++ b/COMETwebapp/Validators/ReferenceData/MeasurementUnits/MeasurementUnitValidator.cs
@@ -23,7 +23,7 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Validators.MeasurementUnits
+namespace COMETwebapp.Validators.ReferenceData.MeasurementUnits
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
diff --git a/COMETwebapp/Validators/MeasurementUnits/PrefixedUnitValidator.cs b/COMETwebapp/Validators/ReferenceData/MeasurementUnits/PrefixedUnitValidator.cs
similarity index 97%
rename from COMETwebapp/Validators/MeasurementUnits/PrefixedUnitValidator.cs
rename to COMETwebapp/Validators/ReferenceData/MeasurementUnits/PrefixedUnitValidator.cs
index bad440c5..e14f48d5 100644
--- a/COMETwebapp/Validators/MeasurementUnits/PrefixedUnitValidator.cs
+++ b/COMETwebapp/Validators/ReferenceData/MeasurementUnits/PrefixedUnitValidator.cs
@@ -23,7 +23,7 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Validators.MeasurementUnits
+namespace COMETwebapp.Validators.ReferenceData.MeasurementUnits
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
diff --git a/COMETwebapp/Validators/MeasurementUnits/UnitFactorValidator.cs b/COMETwebapp/Validators/ReferenceData/MeasurementUnits/UnitFactorValidator.cs
similarity index 97%
rename from COMETwebapp/Validators/MeasurementUnits/UnitFactorValidator.cs
rename to COMETwebapp/Validators/ReferenceData/MeasurementUnits/UnitFactorValidator.cs
index a88b5c06..68e32dc7 100644
--- a/COMETwebapp/Validators/MeasurementUnits/UnitFactorValidator.cs
+++ b/COMETwebapp/Validators/ReferenceData/MeasurementUnits/UnitFactorValidator.cs
@@ -23,7 +23,7 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Validators.MeasurementUnits
+namespace COMETwebapp.Validators.ReferenceData.MeasurementUnits
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
diff --git a/COMETwebapp/Validators/CreateDomainOfExpertiseValidator.cs b/COMETwebapp/Validators/SiteDirectory/CreateDomainOfExpertiseValidator.cs
similarity index 97%
rename from COMETwebapp/Validators/CreateDomainOfExpertiseValidator.cs
rename to COMETwebapp/Validators/SiteDirectory/CreateDomainOfExpertiseValidator.cs
index c00d43ae..3497f883 100644
--- a/COMETwebapp/Validators/CreateDomainOfExpertiseValidator.cs
+++ b/COMETwebapp/Validators/SiteDirectory/CreateDomainOfExpertiseValidator.cs
@@ -23,7 +23,7 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Validators
+namespace COMETwebapp.Validators.SiteDirectory
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
diff --git a/COMETwebapp/Validators/EngineeringModel/EngineeringModelValidator.cs b/COMETwebapp/Validators/SiteDirectory/EngineeringModel/EngineeringModelValidator.cs
similarity index 98%
rename from COMETwebapp/Validators/EngineeringModel/EngineeringModelValidator.cs
rename to COMETwebapp/Validators/SiteDirectory/EngineeringModel/EngineeringModelValidator.cs
index aeeb3c1e..48bf6745 100644
--- a/COMETwebapp/Validators/EngineeringModel/EngineeringModelValidator.cs
+++ b/COMETwebapp/Validators/SiteDirectory/EngineeringModel/EngineeringModelValidator.cs
@@ -22,7 +22,7 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Validators.EngineeringModel
+namespace COMETwebapp.Validators.SiteDirectory.EngineeringModel
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
diff --git a/COMETwebapp/Validators/EngineeringModel/ParticipantValidator.cs b/COMETwebapp/Validators/SiteDirectory/EngineeringModel/ParticipantValidator.cs
similarity index 97%
rename from COMETwebapp/Validators/EngineeringModel/ParticipantValidator.cs
rename to COMETwebapp/Validators/SiteDirectory/EngineeringModel/ParticipantValidator.cs
index d7f113df..0e9b7e08 100644
--- a/COMETwebapp/Validators/EngineeringModel/ParticipantValidator.cs
+++ b/COMETwebapp/Validators/SiteDirectory/EngineeringModel/ParticipantValidator.cs
@@ -22,7 +22,7 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Validators.EngineeringModel
+namespace COMETwebapp.Validators.SiteDirectory.EngineeringModel
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
diff --git a/COMETwebapp/Validators/Roles/ParticipantRoleValidator.cs b/COMETwebapp/Validators/SiteDirectory/Roles/ParticipantRoleValidator.cs
similarity index 97%
rename from COMETwebapp/Validators/Roles/ParticipantRoleValidator.cs
rename to COMETwebapp/Validators/SiteDirectory/Roles/ParticipantRoleValidator.cs
index c4267037..83e1bc0e 100644
--- a/COMETwebapp/Validators/Roles/ParticipantRoleValidator.cs
+++ b/COMETwebapp/Validators/SiteDirectory/Roles/ParticipantRoleValidator.cs
@@ -22,7 +22,7 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Validators.Roles
+namespace COMETwebapp.Validators.SiteDirectory.Roles
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
diff --git a/COMETwebapp/Validators/Roles/PersonRoleValidator.cs b/COMETwebapp/Validators/SiteDirectory/Roles/PersonRoleValidator.cs
similarity index 97%
rename from COMETwebapp/Validators/Roles/PersonRoleValidator.cs
rename to COMETwebapp/Validators/SiteDirectory/Roles/PersonRoleValidator.cs
index 93eb41e3..1e6dd7b1 100644
--- a/COMETwebapp/Validators/Roles/PersonRoleValidator.cs
+++ b/COMETwebapp/Validators/SiteDirectory/Roles/PersonRoleValidator.cs
@@ -22,7 +22,7 @@
 //  </copyright>
 //  --------------------------------------------------------------------------------------------------------------------
 
-namespace COMETwebapp.Validators.Roles
+namespace COMETwebapp.Validators.SiteDirectory.Roles
 {
     using CDP4Common.SiteDirectoryData;
     using CDP4Common.Validation;
diff --git a/COMETwebapp/ViewModels/Components/EngineeringModel/EngineeringModelBodyViewModel.cs b/COMETwebapp/ViewModels/Components/EngineeringModel/EngineeringModelBodyViewModel.cs
new file mode 100644
index 00000000..244cc91b
--- /dev/null
+++ b/COMETwebapp/ViewModels/Components/EngineeringModel/EngineeringModelBodyViewModel.cs
@@ -0,0 +1,73 @@
+// --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="EngineeringModelBodyViewModel.cs" company="RHEA System S.A.">
+//     Copyright (c) 2023-2024 RHEA System S.A.
+// 
+//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+// 
+//     This file is part of CDP4-COMET WEB Community Edition
+//     The CDP4-COMET WEB Community Edition is the RHEA 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
+//     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,
+//     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.
+// 
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.ViewModels.Components.EngineeringModel
+{
+    using CDP4Dal;
+
+    using COMET.Web.Common.Services.SessionManagement;
+    using COMET.Web.Common.ViewModels.Components.Applications;
+
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Options;
+
+    /// <summary>
+    /// View Model that handle the logic for the Engineering model body application
+    /// </summary>
+    public class EngineeringModelBodyViewModel : SingleIterationApplicationBaseViewModel, IEngineeringModelBodyViewModel
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="IOptionsTableViewModel"/>
+        /// </summary>
+        public IOptionsTableViewModel OptionsTableViewModel { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EngineeringModelBodyViewModel" /> class.
+        /// </summary>
+        /// <param name="sessionService">The <see cref="ISessionService" /></param>
+        /// <param name="messageBus">The <see cref="ICDPMessageBus" /></param>
+        /// <param name="optionsTableViewModel">The <see cref="IOptionsTableViewModel"/></param>
+        public EngineeringModelBodyViewModel(ISessionService sessionService, ICDPMessageBus messageBus, IOptionsTableViewModel optionsTableViewModel) : base(sessionService, messageBus)
+        {
+            this.OptionsTableViewModel = optionsTableViewModel;
+        }
+
+        /// <summary>
+        /// Handles the refresh of the current <see cref="ISession" />
+        /// </summary>
+        /// <returns>A <see cref="Task" /></returns>
+        protected override Task OnSessionRefreshed() => Task.CompletedTask;
+        
+        /// <summary>
+        /// Update this view model properties
+        /// </summary>
+        /// <returns>A <see cref="Task" /></returns>
+        protected override async Task OnThingChanged()
+        {
+            await base.OnThingChanged();
+
+            this.OptionsTableViewModel.SetCurrentIteration(this.CurrentThing);
+            this.IsLoading = false;
+        }
+    }
+}
diff --git a/COMETwebapp/ViewModels/Components/EngineeringModel/IEngineeringModelBodyViewModel.cs b/COMETwebapp/ViewModels/Components/EngineeringModel/IEngineeringModelBodyViewModel.cs
new file mode 100644
index 00000000..d11df728
--- /dev/null
+++ b/COMETwebapp/ViewModels/Components/EngineeringModel/IEngineeringModelBodyViewModel.cs
@@ -0,0 +1,41 @@
+// --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="IEngineeringModelBodyViewModel.cs" company="RHEA System S.A.">
+//     Copyright (c) 2023-2024 RHEA System S.A.
+// 
+//     Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+// 
+//     This file is part of CDP4-COMET WEB Community Edition
+//     The CDP4-COMET WEB Community Edition is the RHEA 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
+//     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,
+//     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.
+// 
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.ViewModels.Components.EngineeringModel
+{
+    using COMET.Web.Common.ViewModels.Components.Applications;
+
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Options;
+
+    /// <summary>
+    /// View Model that handle the logic for the Engineering model body application
+    /// </summary>
+    public interface IEngineeringModelBodyViewModel : ISingleIterationApplicationBaseViewModel
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="IOptionsTableViewModel"/>
+        /// </summary>
+        IOptionsTableViewModel OptionsTableViewModel { get; }
+    }
+}
diff --git a/COMETwebapp/ViewModels/Components/EngineeringModel/Options/IOptionsTableViewModel.cs b/COMETwebapp/ViewModels/Components/EngineeringModel/Options/IOptionsTableViewModel.cs
new file mode 100644
index 00000000..518fd7f5
--- /dev/null
+++ b/COMETwebapp/ViewModels/Components/EngineeringModel/Options/IOptionsTableViewModel.cs
@@ -0,0 +1,61 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="IOptionsTableViewModel.cs" company="RHEA System S.A.">
+//    Copyright (c) 2023-2024 RHEA System S.A.
+//
+//    Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+//
+//    This file is part of CDP4-COMET WEB Community Edition
+//    The CDP4-COMET WEB Community Edition is the RHEA 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
+//    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,
+//    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.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.ViewModels.Components.EngineeringModel.Options
+{
+    using CDP4Common.EngineeringModelData;
+
+    using COMETwebapp.ViewModels.Components.Common.DeletableDataItemTable;
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Rows;
+
+    /// <summary>
+    /// View model used to manage <see cref="Option" />
+    /// </summary>
+    public interface IOptionsTableViewModel : IDeletableDataItemTableViewModel<Option, OptionRowViewModel>
+    {
+        /// <summary>
+        /// Creates or edits a <see cref="Option"/>
+        /// </summary>
+        /// <param name="shouldCreate">The value to check if a new <see cref="Option"/> should be created</param>
+        /// <returns>A <see cref="Task"/></returns>
+        Task CreateOrEditOption(bool shouldCreate);
+
+        /// <summary>
+        /// Sets the <see cref="OptionsTableViewModel.CurrentIteration"/> value
+        /// </summary>
+        /// <param name="iteration">The iteration to be set</param>
+        void SetCurrentIteration(Iteration iteration);
+
+        /// <summary>
+        /// Gets or sets the value to check if the option to create is the default option for the <see cref="OptionsTableViewModel.CurrentIteration"/>
+        /// </summary>
+        bool SelectedIsDefaultValue { get; set; }
+
+        /// <summary>
+        /// Sets the current option value
+        /// </summary>
+        /// <param name="option">The option to be set</param>
+        void SetCurrentOption(Option option);
+    }
+}
diff --git a/COMETwebapp/ViewModels/Components/EngineeringModel/Options/OptionsTableViewModel.cs b/COMETwebapp/ViewModels/Components/EngineeringModel/Options/OptionsTableViewModel.cs
new file mode 100644
index 00000000..b350c255
--- /dev/null
+++ b/COMETwebapp/ViewModels/Components/EngineeringModel/Options/OptionsTableViewModel.cs
@@ -0,0 +1,162 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="OptionsTableViewModel.cs" company="RHEA System S.A.">
+//    Copyright (c) 2023-2024 RHEA System S.A.
+//
+//    Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+//
+//    This file is part of CDP4-COMET WEB Community Edition
+//    The CDP4-COMET WEB Community Edition is the RHEA 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
+//    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,
+//    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.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.ViewModels.Components.EngineeringModel.Options
+{
+    using CDP4Common.CommonData;
+    using CDP4Common.EngineeringModelData;
+
+    using CDP4Dal;
+    using CDP4Dal.Events;
+
+    using COMET.Web.Common.Services.SessionManagement;
+
+    using COMETwebapp.ViewModels.Components.Common.DeletableDataItemTable;
+    using COMETwebapp.ViewModels.Components.EngineeringModel.Rows;
+    using COMETwebapp.ViewModels.Components.ReferenceData.ParameterTypes;
+
+    /// <summary>
+    /// View model used to manage <see cref="Option" />
+    /// </summary>
+    public class OptionsTableViewModel : DeletableDataItemTableViewModel<Option, OptionRowViewModel>, IOptionsTableViewModel
+    {
+        /// <summary>
+        /// Gets or sets the current <see cref="Iteration"/>
+        /// </summary>
+        private Iteration CurrentIteration { get; set; }
+
+        /// <summary>
+        /// A collection of <see cref="Type" /> used to create <see cref="ObjectChangedEvent" /> subscriptions
+        /// </summary>
+        private static readonly IEnumerable<Type> ObjectChangedTypesOfInterest = new List<Type>
+        {
+            typeof(Iteration)
+        };
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ParameterTypeTableViewModel" /> class.
+        /// </summary>
+        /// <param name="sessionService">The <see cref="ISessionService" /></param>
+        /// <param name="messageBus">The <see cref="ICDPMessageBus"/></param>
+        /// <param name="logger">The <see cref="ILogger{TCategoryName}"/></param>
+        public OptionsTableViewModel(ISessionService sessionService, ICDPMessageBus messageBus, ILogger<OptionsTableViewModel> logger)
+            : base(sessionService, messageBus, logger)
+        {
+            this.Thing = new Option();
+            this.InitializeSubscriptions(ObjectChangedTypesOfInterest);
+        }
+
+        /// <summary>
+        /// Gets or sets the value to check if the option to create is the default option for the <see cref="CurrentIteration"/>
+        /// </summary>
+        public bool SelectedIsDefaultValue { get; set; }
+
+        /// <summary>
+        /// Sets the <see cref="CurrentIteration"/> value
+        /// </summary>
+        /// <param name="iteration">The iteration to be set</param>
+        public void SetCurrentIteration(Iteration iteration)
+        {
+            this.CurrentIteration = iteration;
+        }
+
+        /// <summary>
+        /// Sets the current option value
+        /// </summary>
+        /// <param name="option">The option to be set</param>
+        public void SetCurrentOption(Option option)
+        {
+            this.SelectedIsDefaultValue = option.IsDefault;
+            this.Thing = option.Clone(true);
+        }
+
+        /// <summary>
+        /// Creates or edits a <see cref="Option"/>
+        /// </summary>
+        /// <param name="shouldCreate">The value to check if a new <see cref="Option"/> should be created</param>
+        /// <returns>A <see cref="Task"/></returns>
+        public async Task CreateOrEditOption(bool shouldCreate)
+        {
+            this.IsLoading = true;
+
+            var iterationClone = this.CurrentIteration.Clone(false);
+            var thingsToCreate = new List<Thing>();
+            var originalOption = (Option)this.Thing.Original;
+
+            iterationClone.DefaultOption = this.SelectedIsDefaultValue switch
+            {
+                true when !originalOption.IsDefault => this.Thing,
+                false when originalOption.IsDefault => null,
+                _ => iterationClone.DefaultOption
+            };
+
+            if (shouldCreate)
+            {
+                iterationClone.Option.Add(this.Thing);
+            }
+
+            thingsToCreate.Add(iterationClone);
+            thingsToCreate.Add(this.Thing);
+
+            try
+            {
+                await this.SessionService.UpdateThings(this.CurrentIteration.Container.Clone(true), thingsToCreate);
+                await this.SessionService.RefreshSession();
+            }
+            catch (Exception ex)
+            {
+                this.Logger.LogError(ex, "An error has occurred while creating or editing an Option");
+            }
+            
+            this.IsLoading = false;
+        }
+
+        /// <summary>
+        /// Handles the refresh of the current <see cref="ISession" />
+        /// </summary>
+        /// <returns>A <see cref="Task" /></returns>
+        protected override async Task OnSessionRefreshed()
+        {
+            var wasCurrentIterationUpdated = this.UpdatedThings.OfType<Iteration>().Any(x => x == this.CurrentIteration);
+
+            if (wasCurrentIterationUpdated)
+            {
+                this.RefreshIsDefault();
+            }
+
+            await base.OnSessionRefreshed();
+        }
+
+        /// <summary>
+        /// Refreshes the IsDefault field for all rows
+        /// </summary>
+        private void RefreshIsDefault()
+        {
+            foreach (var row in this.Rows.Items)
+            {
+                row.IsDefault = row.Thing == this.CurrentIteration.DefaultOption;
+            }
+        }
+    }
+}
diff --git a/COMETwebapp/ViewModels/Components/EngineeringModel/Rows/OptionRowViewModel.cs b/COMETwebapp/ViewModels/Components/EngineeringModel/Rows/OptionRowViewModel.cs
new file mode 100644
index 00000000..1b4e09ef
--- /dev/null
+++ b/COMETwebapp/ViewModels/Components/EngineeringModel/Rows/OptionRowViewModel.cs
@@ -0,0 +1,61 @@
+// --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="OptionRowViewModel.cs" company="RHEA System S.A.">
+//     Copyright (c) 2023-2024 RHEA System S.A.
+// 
+//    Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Antoine Théate, João Rua
+// 
+//     This file is part of CDP4-COMET WEB Community Edition
+//     The CDP4-COMET WEB Community Edition is the RHEA 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
+//     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,
+//     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.
+// 
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+namespace COMETwebapp.ViewModels.Components.EngineeringModel.Rows
+{
+    using CDP4Common.EngineeringModelData;
+
+    using COMETwebapp.ViewModels.Components.Common.Rows;
+
+    using ReactiveUI;
+
+    /// <summary>
+    /// Row View Model for  <see cref="Option" />
+    /// </summary>
+    public class OptionRowViewModel : BaseDataItemRowViewModel<Option>
+    {
+        /// <summary>
+        /// The backing field for <see cref="IsDefault"/>
+        /// </summary>
+        private bool isDefault;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OptionRowViewModel" /> class.
+        /// </summary>
+        /// <param name="option">The associated <see cref="Option" /></param>
+        public OptionRowViewModel(Option option) : base(option)
+        {
+            this.IsDefault = option.IsDefault;
+        }
+
+        /// <summary>
+        /// The value to check if the current option is default
+        /// </summary>
+        public bool IsDefault
+        {
+            get => this.isDefault;
+            set => this.RaiseAndSetIfChanged(ref this.isDefault, value);
+        }
+    }
+}
diff --git a/COMETwebapp/_Imports.razor b/COMETwebapp/_Imports.razor
index bac4b4fa..b9efa3fc 100644
--- a/COMETwebapp/_Imports.razor
+++ b/COMETwebapp/_Imports.razor
@@ -21,6 +21,7 @@
 @using COMETwebapp.Components.Common
 @using COMETwebapp.Components.Shared
 @using COMETwebapp.Components.ModelDashboard
+@using COMETwebapp.Components.EngineeringModel
 @using COMETwebapp.Components.SubscriptionDashboard
 @using COMETwebapp.Components.ParameterEditor
 @using COMETwebapp.Components.ModelDashboard.Elements