Fix #694 [Reference Data] Parameter types - UI problems + #696 Tab te…

…xt update (#704)
STARIONGROUP · Jul 17, 2024 · 00af25e · 00af25e
1 parent e494cd6
commit 00af25e
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/COMETwebapp/Components/Common/SelectedDataItemForm.razor.cs b/COMETwebapp/Components/Common/SelectedDataItemForm.razor.cs
@@ -74,6 +74,11 @@ public abstract partial class SelectedDataItemForm : DisposableComponent
         /// </summary>
         protected EditContext EditFormContext { get; set; }
 
+        /// <summary>
+        /// Gets or sets the custom validation fields names that will be validated immediately
+        /// </summary>
+        protected virtual IEnumerable<string> ImmediateValidationFields { get; } = Enumerable.Empty<string>();
+
         /// <summary>
         /// Method that is executed when the cancel button is clicked
         /// </summary>
@@ -124,6 +129,20 @@ private void InitializeEditContext(EditContext editFormContext)
             this.EditFormContext = editFormContext;
             this.MapOfValidationMessages.Clear();
             this.EditFormContext.OnFieldChanged += this.OnFieldChangedHandler;
+
+            this.ValidateCustomFields();
+        }
+
+        /// <summary>
+        /// Validate the custom fields contained by the collection <see cref="ImmediateValidationFields" />
+        /// </summary>
+        private void ValidateCustomFields()
+        {
+            foreach (var fieldStr in this.ImmediateValidationFields)
+            {
+                var fieldIdentifier = this.EditFormContext.Field(fieldStr);
+                this.MapOfValidationMessages[fieldIdentifier] = this.EditFormContext.GetValidationMessages(fieldIdentifier);
+            }
         }
 
         /// <summary>

diff --git a/COMETwebapp/Components/ReferenceData/ParameterTypes/ParameterTypeForm.razor.cs b/COMETwebapp/Components/ReferenceData/ParameterTypes/ParameterTypeForm.razor.cs
@@ -26,6 +26,8 @@ namespace COMETwebapp.Components.ReferenceData.ParameterTypes
 {
     using System.ComponentModel.DataAnnotations;
 
+    using CDP4Common.SiteDirectoryData;
+
     using COMETwebapp.Components.Common;
     using COMETwebapp.ViewModels.Components.ReferenceData.ParameterTypes;
 
@@ -43,6 +45,17 @@ public partial class ParameterTypeForm : SelectedDataItemForm
         [Required]
         public IParameterTypeTableViewModel ViewModel { get; set; }
 
+        /// <summary>
+        /// Gets or sets the custom validation fields names that will be validated immediately
+        /// </summary>
+        protected override IEnumerable<string> ImmediateValidationFields =>
+        [
+            nameof(DerivedQuantityKind.QuantityKindFactor),
+            nameof(EnumerationParameterType.ValueDefinition),
+            nameof(SampledFunctionParameterType.DependentParameterType),
+            nameof(SampledFunctionParameterType.IndependentParameterType)
+        ];
+
         /// <summary>
         /// Method that is executed when there is a valid submit
         /// </summary>

diff --git a/COMETwebapp/Components/Tabs/TabsPanelComponent.razor b/COMETwebapp/Components/Tabs/TabsPanelComponent.razor
@@ -37,7 +37,7 @@
                               @key="tab"/>
             }
 
-            <TabComponent Text="Open Model"
+            <TabComponent Text="Select Model"
                           Icon="typeof(FeatherPlus)"
                           OnClick="@(() => this.OnOpenTabClick.Invoke())"/>
 

diff --git a/...lidators/ReferenceData/ParameterTypes/GenericValidators/ParameterQuantityKindValidator.cs b/...lidators/ReferenceData/ParameterTypes/GenericValidators/ParameterQuantityKindValidator.cs
@@ -45,7 +45,7 @@ public ParameterQuantityKindValidator(IValidationService validationService)
             this.Include(new ParameterTypeValidator(validationService));
             this.RuleFor(x => x.DefaultScale).NotEmpty().Validate(validationService, nameof(QuantityKind.DefaultScale));
             this.RuleFor(x => x.QuantityDimensionSymbol).NotEmpty().Validate(validationService, nameof(QuantityKind.QuantityDimensionSymbol));
-            this.RuleFor(x => x.PossibleScale).NotEmpty().Validate(validationService, nameof(QuantityKind.PossibleScale));
+            this.RuleFor(x => x.PossibleScale).Validate(validationService, nameof(QuantityKind.PossibleScale));
         }
     }
 }