solving merge conflict on dev - feature

Author: MathoMathiasCamara

VERSION

@@ -1 +1 @@
-5.13.2
+5.13.3

src/Moryx.AbstractionLayer.Products.Endpoints/HubMiddlewareExtension.cs

@@ -14,7 +14,7 @@
 using System.Net;
 using Moryx.AbstractionLayer.Properties;
 using Moryx.Asp.Extensions.Exception;
-
+using Moryx.Configuration;
 namespace Moryx.AbstractionLayer.Products.Endpoints
 {
     /// <summary>
@@ -45,7 +45,7 @@ public ActionResult<ProductCustomization> GetProductCustomization()
                 Importers = _productManagement.Importers.Select(i => new ProductImporter
                 {
                     Name = i.Key,
-                    Parameters = EntryConvert.EncodeObject(i.Value)
+                    Parameters = EntryConvert.EncodeObject(i.Value, new PossibleValuesSerialization(null, new ValueProviderExecutor(new ValueProviderExecutorSettings().AddDefaultValueProvider())))
                 }).ToArray()
             };
         }

src/Moryx.AbstractionLayer.Products.Endpoints/ProductManagementController.cs

@@ -1,13 +1,16 @@
 // Copyright (c) 2020, Phoenix Contact GmbH & Co. KG
 // Licensed under the Apache License, Version 2.0
 
+using System;
 using System.ComponentModel;
+using System.Configuration;
 using System.Linq;
 using System.Threading.Tasks;
 using Caliburn.Micro;
 using Moryx.Controls;
 using Moryx.Products.UI.ProductService;
 using Moryx.Tools;
+using EntryValueType = Moryx.Serialization.EntryValueType;
 
 namespace Moryx.Products.UI.Interaction
 {
@@ -81,8 +84,52 @@ public EntryViewModel Parameters
 
         public bool ValidateInput()
         {
-            return Parameters.SubEntries.All(se => !se.Entry.Validation.IsRequired || !string.IsNullOrWhiteSpace(se.Value));
+            foreach (var subEntry in Parameters.SubEntries)
+            {
+               if (!ValidateEntry(subEntry)) 
+                   return false;
+            }
+            return true;
+        }
+
+        private bool ValidateEntry(EntryViewModel entryViewModel)
+        {
+            if (!entryViewModel.Entry.Validation.IsRequired)
+                return true;
+
+            switch (entryViewModel.ValueType)
+            {
+                case EntryValueType.Class:
+                case EntryValueType.Collection:
+                case EntryValueType.Exception:
+                case EntryValueType.Stream:
+                    foreach (var subEntry in entryViewModel.SubEntries)
+                    {
+                        if (!ValidateEntry(subEntry))
+                            return false;
+                    }
+                    break;
+                default: // all value types
+                    if (string.IsNullOrWhiteSpace(entryViewModel.Value))
+                        return false;
+
+                    if (entryViewModel.Entry.Validation.Regex != null)
+                    {
+                        var validator = new RegexStringValidator(entryViewModel.Entry.Validation.Regex);
+                        try
+                        {
+                            validator.Validate(entryViewModel.Value);
+                        }
+                        catch (ArgumentException exception)
+                        {
+                            return false;
+                        }
+                    }
+                    break;
+            }
+            return true;
         }
+        
 
         /// <summary>
         /// Import product using the current values

src/Moryx.AbstractionLayer.Products.Endpoints/ProductManagementHub.cs

@@ -6,7 +6,6 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.1.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
 		<PackageReference Include="Moryx.Runtime.Kernel" />
 		<PackageReference Include="Moryx.Asp.Extensions" />

src/Moryx.Products.UI.Interaction/Products/Import/ImporterViewModel.cs

@@ -35,9 +35,6 @@ public void ConfigureServices(IServiceCollection services)
                 .AllowCredentials());
             });
 
-            services.AddSignalR();
-            // Add MORYX SignalR hubs
-            services.AddMoryxProductManagementHub();
             services.AddControllers()
                .AddJsonOptions(jo => jo.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter()));
 
@@ -69,10 +66,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             if (env.IsDevelopment())
                 app.UseCors("CorsPolicy");
             app.UseAuthorization();
-
-            // Add MORYX SignalR hubs
-            app.UseMoryxProductManagementHub();
-           
+                       
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapControllers();