Merge branch 'develop' of https://gitlab.steamware.net/egalware-web/special/webdoorcreator into develop

WebDoorCreator.API/Controllers/DoorImageController.cs

@@ -82,5 +82,6 @@ namespace WebDoorCreator.API.Controllers
         }
 
         #endregion Private Methods
+
     }
 }

WebDoorCreator.API/Program.cs

@@ -16,8 +16,11 @@ var builder = WebApplication.CreateBuilder(args);
 ConfigurationManager configuration = builder.Configuration;
 // Redis
 var connStringRedis = configuration.GetConnectionString("Redis");
+if (string.IsNullOrEmpty(connStringRedis))
+{
+    connStringRedis = "localhost:6379, DefaultDatabase=11, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false";
+}
 string redisSrvAddr = connStringRedis.Substring(0, connStringRedis.IndexOf(":"));
-
 // avvio oggetto shared x redis...
 var redisMultiplexer = ConnectionMultiplexer.Connect(connStringRedis);
 

WebDoorCreator.Data/MessagePipe.cs

@@ -10,7 +10,7 @@ namespace WebDoorCreator.Data
 
         public MessagePipe(IConnectionMultiplexer redisConn, string channelName, bool enableLog = false)
         {
-            _channel = channelName;
+            _channel = new RedisChannel(channelName, RedisChannel.PatternMode.Literal); ;
             redis = redisConn;
             redisDb = redis.GetDatabase();
             this.enableLog = enableLog;
@@ -94,7 +94,7 @@ namespace WebDoorCreator.Data
         /// <summary>
         /// Canale associato al gestore pipeline messaggi
         /// </summary>
-        private string _channel { get; set; } = "";
+        private RedisChannel _channel { get; set; } = new RedisChannel("Default", RedisChannel.PatternMode.Literal);
 
         #endregion Private Properties
 
@@ -108,7 +108,7 @@ namespace WebDoorCreator.Data
             {
                 Log.Trace($"ch {channel} | {message}");
                 // messaggio
-                PubSubEventArgs mea = new PubSubEventArgs(message);
+                PubSubEventArgs mea = new PubSubEventArgs($"{message}");
                 // se qualcuno ascolta sollevo evento nuovo valore...
                 if (EA_NewMessage != null)
                 {

WebDoorCreator.Data/Services/WebDoorCreatorService.cs

@@ -3123,11 +3123,11 @@ namespace WebDoorCreator.Data.Services
             return fatto;
         }
 
-        public async Task<Dictionary<string, Dictionary<string, string>>?> VocLemmaTEMPGetAll()
+        public async Task<Dictionary<string, Dictionary<string, string>>> VocLemmaTEMPGetAll()
         {
             await Task.Delay(1);
             string source = "DB";
-            Dictionary<string, Dictionary<string, string>>? dbResult = new Dictionary<string, Dictionary<string, string>>();
+            Dictionary<string, Dictionary<string, string>> dbResult = new Dictionary<string, Dictionary<string, string>>();
             // cerco da cache
             Stopwatch stopWatch = new Stopwatch();
             stopWatch.Start();

WebDoorCreator.Data/User/ClaimConverter.cs

@@ -20,29 +20,27 @@ namespace WebDoorCreator.Data.User
             return (objectType == typeof(System.Security.Claims.Claim));
         }
 
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
         {
-            JObject jo = JObject.Load(reader);
-            string type = (string)jo["Type"];
-            string value = (string)jo["Value"];
-            string valueType = (string)jo["ValueType"];
-            string issuer = (string)jo["Issuer"];
-            string originalIssuer = (string)jo["OriginalIssuer"];
+            JObject jObj = JObject.Load(reader);
+            string type = $"{jObj["Type"]}";
+            string value = $"{jObj["Value"]}";
+            string valueType = $"{jObj["ValueType"]}";
+            string issuer = $"{jObj["Issuer"]}";
+            string originalIssuer = $"{jObj["OriginalIssuer"]}";
             return new Claim(type, value, valueType, issuer, originalIssuer);
         }
 
+
         public override bool CanWrite
         {
             get { return false; }
         }
 
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
         {
-#if false
+            // lascio eccezione perché è un deserializzatore "in sola lettura"
             throw new NotImplementedException(); 
-#endif
-            // da verificare
-            writer.WriteValue(JsonConvert.SerializeObject(value));
         } 
     }
 }

WebDoorCreator.UI/Components/DoorDef/DoorDefOrderTopRow.razor.cs

@@ -68,7 +68,7 @@ namespace WebDoorCreator.UI.Components.DoorDef
                 return;
 
             await Task.Delay(1);
-            NavManager.NavigateTo($"OrdersHomePage?idOrd={currOrderStatus.OrderId}");
+            NavManager.NavigateTo($"OrdersHomePage?idOrd={currOrderStatus?.OrderId}");
         }
     }
 }

WebDoorCreator.UI/Components/FilesMan/VocRefresh.razor.cs

@@ -60,7 +60,6 @@ namespace WebDoorCreator.UI.Components.FilesMan
             list2Mod = await WDCService.VocLemmaInsertPrepare(@$"{defaultPath}");
             if (list2Mod != null)
             {
-                //bool ok = await WDCService.VocLemmaInsert(); 
                 listVocLemmaTemp = await WDCService.VocLemmaTEMPGetAll();
                 if (listVocLemmaTemp != null)
                 {

WebDoorCreator.UI/Components/Order/OrdersDoorsDoorDef.razor.cs

@@ -95,7 +95,7 @@ namespace WebDoorCreator.UI.Components.Order
         [Inject]
         protected NavigationManager NavManager { get; set; } = null!;
 
-        protected OrderStatusViewModel ord2Show { get; set; } = new OrderStatusViewModel();
+        protected OrderStatusViewModel? ord2Show { get; set; } = new OrderStatusViewModel();
 
         protected string orderCodExt
         {

WebDoorCreator.UI/Pages/TestAnim.razor

@@ -23,7 +23,6 @@
                 <button class="btn btn-lg btn-primary" @onclick="() => changeLevel(2)">
                     <i class="fa-solid fa-plus"></i> GoTo L02
                 </button>
-                <ReportRdlcViewer></ReportRdlcViewer>
             </div>
 
             <div class="mt-2">