Merge branch 'develop' into feature_3085

tpurschke · web-flow · commit 70c851e02cb5 · 2025-03-27T20:21:37.000+01:00
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.6.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.7.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/roles/tests-unit/files/FWO.Test/FWO.Test.csproj b/roles/tests-unit/files/FWO.Test/FWO.Test.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="NUnit" Version="4.3.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.6.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.7.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/roles/ui/files/FWO.UI/Pages/Settings/SearchUser.razor b/roles/ui/files/FWO.UI/Pages/Settings/SearchUser.razor
@@ -1,4 +1,4 @@
-﻿@using FWO.Data.Middleware
+@using FWO.Data.Middleware
 @using FWO.Middleware.Client
 @using RestSharp
 @using System.Net
@@ -12,22 +12,20 @@
     <Body>
         @if (Display)
         {
-            <form>
+            <form class="mt-2">
                 <form class="form-group row" data-toggle="tooltip" title="@(userConfig.PureLine("H5351"))">
-                    <label class="col-sm-2 col-form-label col-form-label-sm">@(userConfig.GetText("from_ldap")):</label>
-                    <div class="col-sm-3">
+                    <label class="col-form-label col-form-label-sm col-2 col-md-3 col-xl-2">@(userConfig.GetText("from_ldap")):</label>
+                    <div class="col-10 col-md-9 col-xl-5 col-xxl-3">
                         <Dropdown ElementType="UiLdapConnection" ElementToString="@(l => l.Name)" @bind-SelectedElement="selectedLdap" Elements="connectedLdaps">
                             <ElementTemplate Context="ldap">
                                 @ldap.Name
                             </ElementTemplate>
                         </Dropdown>
                     </div>
-                    <label class="col-sm-2 col-form-label col-form-label-sm">@(userConfig.GetText("search_pattern")):</label>
-                    <div class="col-sm-3">
-                        <input class="form-control-sm col-sm" type="text" @bind="searchPattern" />
-                    </div>
-                    <div class="col-sm-2">
-                        <button type="button" class="btn btn-sm btn-success" @onclick="async() => await SearchInLdap()" @onclick:preventDefault>@(userConfig.GetText("search"))</button>
+                    <div class="col-12 col-xl-5 col-xxl-7 mt-lg-2 mt-xl-0">
+                        <label for="lblSearchPattern" class="col-form-label col-form-label-sm">@(userConfig.GetText("search_pattern")):</label>
+                        <input id="lblSearchPattern" class="form-control-sm col-sm" type="text" @bind="searchPattern" />
+                        <button type="button" class="btn btn-sm btn-success mt-1 mt-md-0 mt-xl-1 mt-xxl-0" @onclick="async() => await SearchInLdap()" @onclick:preventDefault>@(userConfig.GetText("search"))</button>
                     </div>
                 </form>
                 @if(UserSearchMode)
diff --git a/roles/ui/files/FWO.UI/Shared/Dropdown.razor b/roles/ui/files/FWO.UI/Shared/Dropdown.razor
@@ -269,29 +269,25 @@
 
     private async Task SelectElement(ElementType element)
     {
-        Debug.Assert(!Multiselect, "If the Multiselect option is enabled do not use the property SelectedElement but SelectedElements instead.");
-        if (( SelectedElements.Count() == 0 && element != null ) || !Object.Equals(element, SelectedElements.FirstOrDefault()))
+        if (element == null)
         {
-            if (element == null)
+            Debug.Assert(Nullable == true, "The assigned value is null but the Nullable option is not enabled.");
+            SelectedElements = Enumerable.Empty<ElementType>();
+        }
+        else
+        {
+            if (Multiselect)
             {
-                Debug.Assert(Nullable == true, "The assigned value is null but the Nullable option is not enabled.");
-                SelectedElements = Enumerable.Empty<ElementType>();
+                SelectedElements = SelectedElements.Append(element);
+                await SelectedElementsChanged.InvokeAsync(SelectedElements);
             }
             else
             {
-                if (Multiselect)
-                {
-                    SelectedElements = SelectedElements.Append(element);
-                    await SelectedElementsChanged.InvokeAsync(SelectedElements);
-                }
-                else
-                {
-                    SelectedElement = element;
-                    await SelectedElementChanged.InvokeAsync(element);
-                }
+                SelectedElement = element;
+                await SelectedElementChanged.InvokeAsync(element);
             }
-            await CompleteSelectionChange();
         }
+        await CompleteSelectionChange();
     }
 
     private async Task CompleteSelectionChange()

Original file line number	Diff line number	Diff line change
`@@ -269,29 +269,25 @@`
`269`	`269`
`270`	`270`	`private async Task SelectElement(ElementType element)`
`271`	`271`	`{`
`272`		`- Debug.Assert(!Multiselect, "If the Multiselect option is enabled do not use the property SelectedElement but SelectedElements instead.");`
`273`		`- if (( SelectedElements.Count() == 0 && element != null ) \|\| !Object.Equals(element, SelectedElements.FirstOrDefault()))`
	`272`	`+ if (element == null)`
`274`	`273`	`{`
`275`		`- if (element == null)`
	`274`	`+ Debug.Assert(Nullable == true, "The assigned value is null but the Nullable option is not enabled.");`
	`275`	`+ SelectedElements = Enumerable.Empty<ElementType>();`
	`276`	`+ }`
	`277`	`+ else`
	`278`	`+ {`
	`279`	`+ if (Multiselect)`
`276`	`280`	`{`
`277`		`- Debug.Assert(Nullable == true, "The assigned value is null but the Nullable option is not enabled.");`
`278`		`- SelectedElements = Enumerable.Empty<ElementType>();`
	`281`	`+ SelectedElements = SelectedElements.Append(element);`
	`282`	`+ await SelectedElementsChanged.InvokeAsync(SelectedElements);`
`279`	`283`	`}`
`280`	`284`	`else`
`281`	`285`	`{`
`282`		`- if (Multiselect)`
`283`		`- {`
`284`		`- SelectedElements = SelectedElements.Append(element);`
`285`		`- await SelectedElementsChanged.InvokeAsync(SelectedElements);`
`286`		`- }`
`287`		`- else`
`288`		`- {`
`289`		`- SelectedElement = element;`
`290`		`- await SelectedElementChanged.InvokeAsync(element);`
`291`		`- }`
	`286`	`+ SelectedElement = element;`
	`287`	`+ await SelectedElementChanged.InvokeAsync(element);`
`292`	`288`	`}`
`293`		`- await CompleteSelectionChange();`
`294`	`289`	`}`
	`290`	`+ await CompleteSelectionChange();`
`295`	`291`	`}`
`296`	`292`
`297`	`293`	`private async Task CompleteSelectionChange()`