Merge pull request #2554 from SolidProgramming/nuget_bumps

Nuget bumps + #2529
CactuseSecurity · Sep 26, 2024 · c4cc916 · c4cc916
2 parents 09d6c11 + 2734808
commit c4cc916
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 16 deletions.
diff --git a/roles/database/files/sql/idempotent/fworch-texts.sql b/roles/database/files/sql/idempotent/fworch-texts.sql
@@ -2981,8 +2981,8 @@ INSERT INTO txt VALUES ('E9013', 'German',  'Schnittstelle kann nicht gel&ouml;s
 INSERT INTO txt VALUES ('E9013', 'English', 'Interface cannot be deleted because it is in use: ');
 INSERT INTO txt VALUES ('E9014', 'German',  'Bitte zuerst die gemachten &Auml;nderungen speichern.');
 INSERT INTO txt VALUES ('E9014', 'English', 'Please save changes first.');
-INSERT INTO txt VALUES ('E9015', 'German',  'Schnittstelle kann beantragte nicht ersetzen: Falscher Typ.');
-INSERT INTO txt VALUES ('E9015', 'English', 'Interface cannot replace requested one: Wrong type.');
+INSERT INTO txt VALUES ('E9015', 'German',  'Schnittstelle kann die angeforderte nicht ersetzen: Die Richtungen der Schnittstellen stimmen nicht &uuml;berein (eine ist eine Quellschnittstelle, die andere eine Zielschnittstelle).');
+INSERT INTO txt VALUES ('E9015', 'English', 'Interface cannot replace requested one: the directions of the interfaces do not match (one is a source interface, the other a destination interface).');
 INSERT INTO txt VALUES ('E9016', 'German',  'Beantragte Schnittstelle kann nicht gel&ouml;scht werden.');
 INSERT INTO txt VALUES ('E9016', 'English', 'Requested interface cannot be deleted.');
 INSERT INTO txt VALUES ('E9101', 'German',  'Fehler bei externer Auftragserzeugung.');

diff --git a/roles/lib/files/FWO.Api.Client/FWO.Api.Client.csproj b/roles/lib/files/FWO.Api.Client/FWO.Api.Client.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="GraphQL.Client" Version="6.1.0" />
     <PackageReference Include="GraphQL.Client.Serializer.Newtonsoft" Version="6.1.0" />
     <PackageReference Include="GraphQL.Client.Serializer.SystemTextJson" Version="6.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.8" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/roles/lib/files/FWO.Config.File/FWO.Config.File.csproj b/roles/lib/files/FWO.Config.File/FWO.Config.File.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.2" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/roles/lib/files/FWO.Middleware/FWO.Middleware.csproj b/roles/lib/files/FWO.Middleware/FWO.Middleware.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.2" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.1.0" />
   </ItemGroup>   
 
   <ItemGroup>

diff --git a/roles/lib/files/FWO.Report/FWO.Report.csproj b/roles/lib/files/FWO.Report/FWO.Report.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Haukcode.WkHtmlToPdfDotNet" Version="1.5.90" />
+    <PackageReference Include="Haukcode.WkHtmlToPdfDotNet" Version="1.5.93" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/roles/middleware/files/FWO.Middleware.Server/FWO.Middleware.Server.csproj b/roles/middleware/files/FWO.Middleware.Server/FWO.Middleware.Server.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/roles/test/files/FWO.Test/FWO.Test.csproj b/roles/test/files/FWO.Test/FWO.Test.csproj
@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Haukcode.WkHtmlToPdfDotNet" Version="1.5.90" />
+    <PackageReference Include="Haukcode.WkHtmlToPdfDotNet" Version="1.5.93" />
     <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/roles/ui/files/FWO.UI/Pages/Login.razor b/roles/ui/files/FWO.UI/Pages/Login.razor
@@ -22,8 +22,8 @@
 @if (showLoginForm)
 {    
     <div class="row text-center">
-        <div class="col-lg-4 col-md-3 col-sm-2"></div>
-        <div class="col-lg-4 col-md-6 col-sm-8 col-xs-12">
+        <div class="col-xl col-lg col-md-3 col-sm-2"></div>
+        <div class="col-xl-2 col-lg-3 col-md-6 col-sm-8 col-xs-12">
             <img src="images/FWO_logo.png">
             <br><br>            
         @* <h2 class="text-center"> @(userConfig.GetText("login")) </h2> *@
@@ -51,7 +51,7 @@
                 </form>  
             </div>
         </div> 
-        <div class="col-lg-4 col-md-3 col-sm-2"></div>       
+        <div class="col-xl col-lg col-md-3 col-sm-2"></div>       
     </div>
     @if(ShowWelcomeMessage)
     {

diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConn.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConn.razor
@@ -342,7 +342,7 @@
                 }
             }
         </div>
-    </div>
+    </div>    
     <InProgress Display="workInProgress"/>
     <EditServiceGroup @bind-Display="ConnHandler.EditSvcGrpMode" @bind-SvcGroupHandler="ConnHandler.SvcGrpHandler"/>
     <EditAppRole @bind-Display="ConnHandler.DisplayAppRoleMode" @bind-AppRoleHandler="ConnHandler.AppRoleHandler"/>
@@ -463,7 +463,7 @@
             }
             if(Container.NwGroupElements.Count > 0)
             {
-                ConnHandler.NwGroupToDestination(Container.NwGroupElements);
+                ConnHandler.NwGroupToDestination(Container.NwGroupElements);                
             }
             if(Container.AppServerElements.Count > 0)
             {

diff --git a/roles/ui/files/FWO.UI/Services/ModellingConnectionHandler.cs b/roles/ui/files/FWO.UI/Services/ModellingConnectionHandler.cs
@@ -586,6 +586,10 @@ public void NwGroupToSource(List<ModellingNwGroup> nwGroups)
                     {
                         SrcNwGroupsToAdd.Add(nwGroup);
                     }
+                    else
+                    {
+                        DisplayMessageInUi(null, userConfig.GetText("E_modify_title"), userConfig.GetText("E9015"), true);
+                    }
                 }
                 CalcVisibility();
             }
@@ -602,6 +606,10 @@ public void NwGroupToDestination(List<ModellingNwGroup> nwGroups)
                     {
                         DstNwGroupsToAdd.Add(nwGroup);
                     }
+                    else
+                    {
+                        DisplayMessageInUi(null, userConfig.GetText("E_modify_title"), userConfig.GetText("E9015"), true);
+                    }
                 }
                 CalcVisibility();
             }