Merge branch 'develop' into develop

abarz722 · web-flow · commit 3e9df07f790f · 2025-09-03T19:24:14.000+02:00
diff --git a/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorAlerts.razor b/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorAlerts.razor
@@ -1,4 +1,4 @@
-﻿@using FWO.Middleware.Client
+@using FWO.Middleware.Client
 
 @inject ApiConnection apiConnection
 @inject UserConfig userConfig
@@ -13,7 +13,7 @@
 @if(InitComplete)
 {
     <div class="vheight75">
-        <PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
+        <PageSizeComponent PageSize="20" PageSizeCallback="UpdatePageSize"></PageSizeComponent>
         <Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="Alert" Items="alertEntrys">
             <Column TableItem="Alert" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)"  Sortable="true" Filterable="true"/>
             <Column TableItem="Alert" Title="@(userConfig.GetText("timestamp"))" Field="@(x => x.Timestamp)"  Sortable="true" Filterable="true"/>
diff --git a/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorAll.razor b/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorAll.razor
@@ -1,4 +1,4 @@
-﻿@using System.Text
+@using System.Text
 
 @inject ApiConnection apiConnection
 @inject UserConfig userConfig
@@ -11,7 +11,7 @@
 @if(InitComplete)
 {
     <div class="vheight75">
-        <PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
+        <PageSizeComponent PageSize="20" PageSizeCallback="UpdatePageSize"></PageSizeComponent>
         <Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys">
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("source"))" Field="@(x => x.Source)" Sortable="true" Filterable="true"/>
diff --git a/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorAppDataImportLog.razor b/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorAppDataImportLog.razor
@@ -1,4 +1,4 @@
-﻿@inject ApiConnection apiConnection
+@inject ApiConnection apiConnection
 @inject UserConfig userConfig
 
 @page "/monitoring/app_data_import_logs"
@@ -11,7 +11,7 @@
 @if(InitComplete)
 {
     <div class="vheight75">
-        <PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
+        <PageSizeComponent PageSize="20" PageSizeCallback="UpdatePageSize"></PageSizeComponent>
         <Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys">
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("severity"))" Field="@(x => x.Severity)" Sortable="true" Filterable="true"/>
diff --git a/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorAreaIpDataImportLog.razor b/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorAreaIpDataImportLog.razor
@@ -1,4 +1,4 @@
-﻿@inject ApiConnection apiConnection
+@inject ApiConnection apiConnection
 @inject UserConfig userConfig
 
 @page "/monitoring/area_ip_data_import_logs"
@@ -11,7 +11,7 @@
 @if(InitComplete)
 {
     <div class="vheight75">
-        <PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
+        <PageSizeComponent PageSize="20" PageSizeCallback="UpdatePageSize"></PageSizeComponent>
         <Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys">
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("severity"))" Field="@(x => x.Severity)" Sortable="true" Filterable="true"/>
diff --git a/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorAutodiscoveryLog.razor b/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorAutodiscoveryLog.razor
@@ -1,4 +1,4 @@
-﻿@using FWO.Middleware.Client
+@using FWO.Middleware.Client
 
 @inject ApiConnection apiConnection
 @inject UserConfig userConfig
@@ -13,7 +13,7 @@
 @if(InitComplete)
 {
     <div class="vheight75">
-        <PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
+        <PageSizeComponent PageSize="20" PageSizeCallback="UpdatePageSize"></PageSizeComponent>
         <Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys">
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("timestamp"))" Field="@(x => x.Timestamp)" Sortable="true" Filterable="true"/>
diff --git a/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorDailyChecks.razor b/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorDailyChecks.razor
@@ -1,4 +1,4 @@
-﻿@inject ApiConnection apiConnection
+@inject ApiConnection apiConnection
 @inject UserConfig userConfig
 
 @page "/monitoring/daily_check_logs"
@@ -11,7 +11,7 @@
 @if(InitComplete)
 {
     <div class="vheight75">
-        <PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
+        <PageSizeComponent PageSize="20" PageSizeCallback="UpdatePageSize"></PageSizeComponent>
         <Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys">
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("timestamp"))" Field="@(x => x.Timestamp)" Sortable="true" Filterable="true"/>
diff --git a/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorExternalRequestTickets.razor b/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorExternalRequestTickets.razor
@@ -1,4 +1,4 @@
-﻿@using FWO.Data.Middleware
+@using FWO.Data.Middleware
 @using FWO.Data.Modelling
 @using FWO.Data.Workflow
 @using FWO.Middleware.Client
@@ -20,7 +20,7 @@
 {
     <SelectOwner SelectedOwner="actOwner" SelectedOwnerChanged="FetchOwnerData" Apps="allOwners" />
     <div class="m-2 vheight75">
-        <PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
+        <PageSizeComponent PageSize="20" PageSizeCallback="UpdatePageSize"></PageSizeComponent>
         <Table PageSize="PageSize" class="table table-bordered th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="OwnerTicket" Items="ownerTickets" ColumnReorder="true">
             <Column TableItem="OwnerTicket" Title="@(userConfig.GetText("actions"))" Field="(x => x.Ticket.Id)" Sortable="false" Filterable="false">
                 <Template>
@@ -236,7 +236,7 @@ else
             }
 
             await ModellingHandlerBase.LogChange(ModellingTypes.ChangeType.InitRequests, ModellingTypes.ModObjectType.CommunicationProfile,
-                0, $"Reinitialized Rollout Requests", apiConnection, userConfig, 
+                0, $"Reinitialized Rollout Requests", apiConnection, userConfig,
 				actOwnerTicket.Ticket.Tasks.FirstOrDefault()?.Owners.FirstOrDefault()?.Owner.Id, DefaultInit.DoNothing, userConfig.User.Name);
         }
         catch (Exception exception)
diff --git a/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorExternalRequests.razor b/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorExternalRequests.razor
@@ -1,4 +1,4 @@
-﻿@using FWO.Data.Middleware
+@using FWO.Data.Middleware
 @using FWO.Middleware.Client
 @using RestSharp
 @using System.Net
@@ -26,7 +26,7 @@
                 <label for="cbx_show_all" class="form-check-label">@(userConfig.GetText("show_all"))</label>
             </div>
         </div>
-        <PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
+        <PageSizeComponent PageSize="20" PageSizeCallback="UpdatePageSize"></PageSizeComponent>
         <Table PageSize="PageSize" class="table table-bordered th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="ExternalRequest" Items="openRequests" ColumnReorder="true">
             <Column TableItem="ExternalRequest" Title="@(userConfig.GetText("actions"))" Field="(x => x.Id)" Sortable="false" Filterable="false">
                 <Template Context="request">
@@ -48,7 +48,7 @@
                                 </Authorized>
                                 <NotAuthorized>
                                     <button type="button" class="btn btn-sm btn-danger" disabled>@(userConfig.GetText("unlock"))</button>
-                                </NotAuthorized> 
+                                </NotAuthorized>
                             </AuthorizeView>
                         }
                     </div>
@@ -175,7 +175,7 @@ else
                 </Authorized>
                 <NotAuthorized>
                     <button type="button" class="btn btn-sm btn-danger" disabled>@(userConfig.GetText("change_state"))</button>
-                </NotAuthorized> 
+                </NotAuthorized>
             </AuthorizeView>
         </div>
     </Footer>
@@ -258,8 +258,8 @@ else
 
     private async Task ChangeDisplay()
     {
-        displayAll = !displayAll; 
-        await FetchData(); 
+        displayAll = !displayAll;
+        await FetchData();
     }
 
     private void Details(ExternalRequest request)
diff --git a/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorImportLog.razor b/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorImportLog.razor
@@ -1,4 +1,4 @@
-﻿@inject ApiConnection apiConnection
+@inject ApiConnection apiConnection
 @inject UserConfig userConfig
 
 @page "/monitoring/import_logs"
@@ -11,7 +11,7 @@
 @if(InitComplete)
 {
     <div class="vheight75">
-        <PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
+        <PageSizeComponent PageSize="20" PageSizeCallback="UpdatePageSize"></PageSizeComponent>
         <Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys">
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("severity"))" Field="@(x => x.Severity)" Sortable="true" Filterable="true"/>
diff --git a/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorImportStatus.razor b/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorImportStatus.razor
@@ -1,4 +1,4 @@
-﻿@page "/monitoring/import_status"
+@page "/monitoring/import_status"
 @attribute [Authorize(Roles = $"{Roles.Admin}, {Roles.Importer}, {Roles.Auditor}, {Roles.FwAdmin}")]
 
 @inject ApiConnection apiConnection
@@ -13,7 +13,7 @@
 @if(InitComplete)
 {
     <div class="m-2 vheight75">
-        <PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
+        <PageSizeComponent PageSize="20" PageSizeCallback="UpdatePageSize"></PageSizeComponent>
         <Table PageSize="PageSize" class="table table-bordered th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="ImportStatus" Items="sortedImportStati" ColumnReorder="true" TableRowClass="@(stat => getTableRowClass(stat))">
             <Column TableItem="ImportStatus" Title="@(userConfig.GetText("actions"))" Field="(x => x.MgmId)" Sortable="false" Filterable="false">
                 <Template>
@@ -176,7 +176,7 @@ else
                     imp.SortPrio = 2;
                 }
             }
-            else if( 
+            else if(
                     // last import not successful
                     (imp.LastImport != null && imp.LastImport.Length > 0 && !imp.LastImport[0].SuccessfulImport)
                     // active, but no import at all
diff --git a/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorUiLog.razor b/roles/ui/files/FWO.UI/Pages/Monitoring/MonitorUiLog.razor
@@ -1,4 +1,4 @@
-﻿
+
 @inject ApiConnection apiConnection
 @inject UserConfig userConfig
 
@@ -25,7 +25,7 @@
         <hr />
     }
     <div class="vheight75">
-        <PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
+        <PageSizeComponent PageSize="20" PageSizeCallback="UpdatePageSize"></PageSizeComponent>
         <Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary table-responsive overflow-auto sticky-header" TableItem="LogEntry" Items="logEntrys">
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("id"))" Field="@(x => x.Id)" Sortable="true" Filterable="true"/>
             <Column TableItem="LogEntry" Title="@(userConfig.GetText("severity"))" Field="@(x => x.Severity)" Sortable="true" Filterable="true"/>
@@ -60,7 +60,7 @@ else
     private List<LogEntry> logEntrys = new List<LogEntry>();
     private List<UiUser> uiUsers = new List<UiUser>();
     private UiUser actUser = new UiUser();
-    private bool seeAllUsers = false; 
+    private bool seeAllUsers = false;
     private bool InitComplete = false;
 
     private int PageSize { get; set; }
diff --git a/roles/ui/files/FWO.UI/Pages/Monitoring/MonitoringMain.razor b/roles/ui/files/FWO.UI/Pages/Monitoring/MonitoringMain.razor
@@ -1,4 +1,4 @@
-﻿@using FWO.Data.Middleware
+@using FWO.Data.Middleware
 @using FWO.Middleware.Client
 @using RestSharp
 @using System.Net
@@ -31,7 +31,7 @@
         else
         {
             <div class="vheight75">
-                <PageSizeComponent PageSizeCallback="UpdatePageSize"></PageSizeComponent>
+                <PageSizeComponent PageSize="20" PageSizeCallback="UpdatePageSize"></PageSizeComponent>
                 <Table PageSize="PageSize" TableClass="table table-bordered table-sm th-bg-secondary sticky-header" TableItem="Alert" Items="alertEntrys">
                     <Column Context="alert" TableItem="Alert" Title="@(userConfig.GetText("actions"))" Field="(x => x.Id)">
                         <Template>
@@ -213,7 +213,7 @@
     {
         try
         {
-            actStatus = JsonSerializer.Deserialize<ImportStatus>(( alert.JsonData ?? throw new ArgumentException($"Missing Import Data!") ).ToString() 
+            actStatus = JsonSerializer.Deserialize<ImportStatus>(( alert.JsonData ?? throw new ArgumentException($"Missing Import Data!") ).ToString()
 				?? throw new FormatException($"Could not convert Import Data to string!")) ?? throw new JsonException($"Import Data not converted!");
             DetailsMode = true;
         }
diff --git a/roles/ui/files/FWO.UI/Shared/PageSizeComponent.razor b/roles/ui/files/FWO.UI/Shared/PageSizeComponent.razor
@@ -1,4 +1,4 @@
-﻿@inject UserConfig UserConfig
+@inject UserConfig UserConfig
 
 
 <form class="my-1" onsubmit="SubmitPageSize">
@@ -12,13 +12,13 @@
 @code {
     [Parameter] public EventCallback<int> PageSizeCallback { get; set; }
 
-    private int PageSize { get; set; } = 0;
+    [Parameter] public int PageSize { get; set; } = 0;
 
     protected override async Task OnInitializedAsync()
     {
         await SubmitPageSize();
 
-        base.OnInitialized();
+        await base.OnInitializedAsync();
     }
 
     private async Task SubmitPageSize()
