Merge branch 'develop' into issue_2993

tpurschke · web-flow · commit 6c40f84da967 · 2025-04-02T20:18:00.000+02:00
diff --git a/roles/ui/files/FWO.UI/Pages/_Host.cshtml b/roles/ui/files/FWO.UI/Pages/_Host.cshtml
@@ -1,4 +1,4 @@
-﻿@page "/"
+@page "/"
 @namespace FWO.Ui.Pages
 @using FWO.Config.Api
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@@ -14,9 +14,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>FWO</title>
     <base href="~/" />
-    <link rel="stylesheet" href="@VersionedLink("/css/bootstrap/bootstrap.min.css")" />
-    <link rel="stylesheet" href="@VersionedLink("/css/site.css")" />
-    <link href="FWO.Ui.styles.css" rel="stylesheet" /> <!-- needed for css isolation (e.g. in compliance matrix) -->
+    <link rel="stylesheet" href="/css/bootstrap/bootstrap.min.css" asp-append-version=true />
+    <link rel="stylesheet" href="/css/site.css" asp-append-version="true"/>
+    <link href="FWO.Ui.styles.css" rel="stylesheet" asp-append-version=true /> <!-- needed for css isolation (e.g. in compliance matrix) -->
 </head>
 <body class="sticky-group sticky-group-35 sticky-group-40 sticky-group-60 vheight100">
     <app>
@@ -34,18 +34,18 @@
         <a class="dismiss">🗙</a>
     </div>
     
-    <script src="@VersionedLink("_framework/blazor.server.js")" autostart="false"></script>
-    <script src="@VersionedLink("_content/BlazorTable/BlazorTable.min.js")"></script>
-    <script src="@VersionedLink("/js/window.js")"></script>
-    <script src="@VersionedLink("/js/scrollIntoView.js")"></script>
-    <script src="@VersionedLink("/js/downloadFile.js")"></script>
-    <script src="@VersionedLink("/js/clipboardCopy.js")"></script>
-    <script src="@VersionedLink("/js/globalKeyboardListener.js")"></script>
+    <script src="_framework/blazor.server.js" autostart="false" asp-append-version="true"></script>
+    <script src="_content/BlazorTable/BlazorTable.min.js" asp-append-version="true"></script>
+    <script src="/js/window.js" asp-append-version="true"></script>
+    <script src="/js/scrollIntoView.js" asp-append-version="true"></script>
+    <script src="/js/downloadFile.js" asp-append-version="true"></script>
+    <script src="/js/clipboardCopy.js" asp-append-version="true"></script>
+    <script src="/js/globalKeyboardListener.js" asp-append-version="true"></script>
     <script>Blazor.start();</script>
 </body>
 </html>
 
 @functions {
     // Needed to prevent browser from caching files from previous versions
-    string VersionedLink(string path) => $"{path}?v={globalConfig.ProductVersion}";
+    //string VersionedLink(string path) => $"{path}?v={globalConfig.ProductVersion}";
 }
diff --git a/scripts/customizing/modelling/getOwnersFromCsvWithoutUsers.py b/scripts/customizing/modelling/getOwnersFromCsvWithoutUsers.py
@@ -171,7 +171,12 @@ def extractAppDataFromCsvFile(csvFile: str, appData: dict, containsIp: bool):
                 # add app server ip addresses (but do not add the whole app - it must already exist)
                 appServerIp = line[appServerIpColumn]
                 if appServerIp is not None and appServerIp != "" and appServerIp not in appData[appId]['app_servers']:
-                    appData[appId]['app_servers'].append(appServerIp)
+                    appData[appId]['app_servers'].append({
+                        "ip": appServerIp,
+                        "ip_end": appServerIp,
+                        "type": "host",
+                        "name": f"host_{appServerIp}"
+                    })
                 else:
                     # logger.debug(f'ignoring line from csv file: {appId} - empty IP')
                     countSkips += 1                    
