Merge branch 'release/FixRedisRegression'

Update nuget e eliminazione warnings

MP.Data/MP.Data.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
@@ -12,14 +12,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.7" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.7" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.6">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.6" />
+        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.7" />
         <PackageReference Include="NLog" Version="5.0.1" />
     </ItemGroup>
 </Project>

MP.Mon/Components/CmpHeader.razor

@@ -1,6 +1,6 @@
 <div class="px-2">
     <img class="logoImg img-fluid" src="images/LogoMapo.png" height="24" />
-    <span class="mainHead p-3"><b><span style="color: #DEDEDE;">MP MON</span>itor</b></span>
+    <span class="mainHead p-3 align-middle"><b><span style="color: #DEDEDE;">MP MON</span>itor</b></span>
 </div>
 <div class="px-2">
     <span id="text-white text-right">

MP.Mon/Components/DetailMSE.razor.cs

@@ -68,10 +68,6 @@ namespace MP.Mon.Components
                 }
                 if (needUpdate)
                 {
-                    if (false)
-                    {
-                        Log.Trace($"Elapsed Timer {CurrRecord?.CodMacchina}");
-                    }
                     await InvokeAsync(() => StateHasChanged());
                 }
                 OldRecord = CurrRecord;

MP.Mon/Components/LoadingData.razor

@@ -1,6 +1,10 @@
-<div class="row p-5 m-5 bg-light">
+<div class="row p-5 m-5 alert alert-primary">
-    <div class="col-12 text-center mt-5 py-5 alert alert-primary">
+    <div class="col-6 text-center mt-4 py-3 bg-light">
+        <h1>MAPO MON</h1>
+        EgalWare MES suite <img class="logoImg img-fluid" src="images/logoCliente.png" />
+    </div>
+    <div class="col-6 text-center mt-4 py-3  bg-light">
         <h3>loading data</h3>
-        <i class="fas fa-spinner fa-spin fa-5x"></i>
+        <i class="fas fa-spinner fa-spin fa-4x"></i>
     </div>
 </div>

MP.Mon/Data/MpDataService.cs

@@ -119,12 +119,12 @@ namespace MP.Mon.Data
         {
             Stopwatch stopWatch = new Stopwatch();
             stopWatch.Start();
-            List<MappaStatoExpl> result = new List<MappaStatoExpl>();
+            List<MappaStatoExpl>? result = new List<MappaStatoExpl>();
             // cerco in redis...
-            var rawData = await redisDb.StringGetAsync(redisMseKey);
+            RedisValue rawData = await redisDb.StringGetAsync(redisMseKey);
-            if (!string.IsNullOrEmpty(rawData))
+            if (!string.IsNullOrEmpty($"{rawData}"))
             {
-                result = JsonConvert.DeserializeObject<List<MappaStatoExpl>>(rawData);
+                result = JsonConvert.DeserializeObject<List<MappaStatoExpl>>($"{rawData}");
                 stopWatch.Stop();
                 TimeSpan ts = stopWatch.Elapsed;
                 Log.Debug($"Read from REDIS: {ts.TotalMilliseconds}ms");

MP.Mon/MP.Mon.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.15.2207.1219</Version>
+    <Version>6.15.2207.1308</Version>
   </PropertyGroup>
 
   <ItemGroup>

MP.Mon/Pages/Index.razor

@@ -5,7 +5,6 @@
 <PageTitle>MP MON</PageTitle>
 
 <div class="row statusMap mx-1 my-1">
-
     @if (listMSE == null)
     {
         <div class="col-12">

MP.Mon/Pages/Index.razor.cs

@@ -20,11 +20,11 @@ namespace MP.Mon.Pages
         public async void ElapsedSlowTimer(object? source, System.Timers.ElapsedEventArgs e)
         {
             listMSE = null;
-            await Task.Delay(1);
+            await Task.Delay(10);
             Log.Info("Elapsed Slow Timer --> full page reload");
             // dispongo i vari timers...
             disposeTimers();
-            await Task.Delay(1);
+            await Task.Delay(10);
             // reload pagina
             NavManager.NavigateTo(NavManager.Uri);
         }
@@ -157,12 +157,14 @@ namespace MP.Mon.Pages
         protected override async Task OnInitializedAsync()
         {
             await setupConf();
-            //await ReloadData();
             MMDataService.dataPipe.EA_NewMessage += DataPipe_EA_NewMessage;
             MMDataService.blinkPipe.EA_NewMessage += BlinkPipe_EA_NewMessage;
+            Random rnd = new Random();
+            await Task.Delay(rnd.Next(1000, 1200));
             StartTimer();
         }
 
+
         #endregion Protected Methods
 
         #region Private Fields
@@ -211,7 +213,6 @@ namespace MP.Mon.Pages
         /// <exception cref="NotImplementedException"></exception>
         private void DataPipe_EA_NewMessage(object? sender, EventArgs e)
         {
-            //fastTimer.Stop();
             PubSubEventArgs currArgs = (PubSubEventArgs)e;
             // conversione on-the-fly List<string> --> allarmi
             if (!string.IsNullOrEmpty(currArgs.newMessage))
@@ -239,12 +240,13 @@ namespace MP.Mon.Pages
             }
             InvokeAsync(() =>
             {
+#if false
                 // attesa random 0-50ms...
                 Random rnd = new Random();
-                Task.Delay(rnd.Next(5, 50));
+                Task.Delay(rnd.Next(5, 50)); 
+#endif
                 StateHasChanged();
             });
-            //fastTimer.Start();
         }
 
         private void disposeTimers()

MP.Mon/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MON MAPO</i>
-    <h4>Versione: 6.15.2207.1219</h4>
+    <h4>Versione: 6.15.2207.1308</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

MP.Mon/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2207.1219
+6.15.2207.1308

MP.Mon/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2207.1219</version>
+  <version>6.15.2207.1308</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

MP.Mon/Shared/MainLayout.razor.css

@@ -13,14 +13,14 @@ main {
     /*border-bottom: 1px solid #696969;*/
     color: #696969;
     font-size: 1.4em;
-    height: 3rem;
+    height: 2.6rem;
     display: flex;
     align-items: center;
     justify-content: space-evenly;
 }
 
 .mainHead{
-    font-size: 1.7rem;
+    font-size: 1.6rem;
 }
 
 .top-row ::deep a,

MP.Mon/wwwroot/css/site.css

@@ -308,7 +308,7 @@ a,
 /* Gestione size caratteri */
 .mainHead,
 .logoImg {
-  height: 1.6em;
+  height: 1.5em;
 }
 @media all and (min-width: 425px) {
   .mainHead {