From b899a16bc046ad07a97873e87eeae77016188553 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 29 May 2023 09:42:06 +0200
Subject: [PATCH 1/3] Fix filtro company!

---
 Resources/ChangeLog.html                   | 2 +-
 Resources/VersNum.txt                      | 2 +-
 Resources/manifest.xml                     | 2 +-
 WebDoorCreator.UI/Pages/UserAdmin.razor.cs | 7 ++++++-
 WebDoorCreator.UI/WebDoorCreator.UI.csproj | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 5b92b9c..df9d1ba 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2305.2710</h4>
+    <h4>Version: 0.9.2305.2909</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 49d6894..492b22f 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2305.2710
+0.9.2305.2909
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index d99c0f3..7ef4d35 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2305.2710</version>
+  <version>0.9.2305.2909</version>
   <url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/WebDoorCreator.UI/Pages/UserAdmin.razor.cs b/WebDoorCreator.UI/Pages/UserAdmin.razor.cs
index 3b8109d..c616539 100644
--- a/WebDoorCreator.UI/Pages/UserAdmin.razor.cs
+++ b/WebDoorCreator.UI/Pages/UserAdmin.razor.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.JSInterop;
+using System.Linq;
 using WebDoorCreator.Data.DbModels;
 using WebDoorCreator.Data.Services;
 using WebDoorCreator.Data.User;
@@ -144,7 +145,11 @@ namespace WebDoorCreator.UI.Pages
             // filtro visualizzazione x Company, SE richeisto
             if (FiltCompany != "0")
             {
-                UsersAll = UsersAll.Where(x => ConvertClaim(x.Claims).Contains(FiltCompany)).ToList();
+                System.Security.Claims.Claim cClaim = new System.Security.Claims.Claim("CompanyId", $"{FiltCompany}");
+                UsersAll = UsersAll
+                            //.Where(x => x.Claims.Any(c => c == cClaim))
+                            .Where(x => x.Claims.Any(c => c.Type == "CompanyId" && c.Value == $"{FiltCompany}"))
+                            .ToList();
             }
             UsersList = UsersAll
                         .Skip(numRecord * (currPage - 1)).Take(numRecord)
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 3bdc440..5a6fe70 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-        <Version>0.9.2305.2710</Version>
+        <Version>0.9.2305.2909</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>

From 21f330d1f72de4e6572c370bb55033a2aefc90f1 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 29 May 2023 10:26:28 +0200
Subject: [PATCH 2/3] Aggiunta gestione search

---
 Resources/ChangeLog.html                   |  2 +-
 Resources/VersNum.txt                      |  2 +-
 Resources/manifest.xml                     |  2 +-
 WebDoorCreator.Data/User/UserData.cs       |  9 ++----
 WebDoorCreator.UI/Pages/UserAdmin.razor    |  7 ++++
 WebDoorCreator.UI/Pages/UserAdmin.razor.cs | 37 ++++++++++++++++++----
 WebDoorCreator.UI/WebDoorCreator.UI.csproj |  2 +-
 7 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index df9d1ba..0b031ba 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2305.2909</h4>
+    <h4>Version: 0.9.2305.2910</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 492b22f..f79ab77 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2305.2909
+0.9.2305.2910
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 7ef4d35..527d040 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2305.2909</version>
+  <version>0.9.2305.2910</version>
   <url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/WebDoorCreator.Data/User/UserData.cs b/WebDoorCreator.Data/User/UserData.cs
index ab77b27..c6788c6 100644
--- a/WebDoorCreator.Data/User/UserData.cs
+++ b/WebDoorCreator.Data/User/UserData.cs
@@ -1,20 +1,17 @@
 ﻿using Microsoft.AspNetCore.Identity;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Security.Claims;
 
 namespace WebDoorCreator.Data.User
 {
     /// <summary>
     /// Classe generalizzaizone identity (user + roles + claims) x gestione semplificata in editing
     /// </summary>
+    [Serializable]
     public class UserData
     {
         #region Public Properties
 
-        public List<System.Security.Claims.Claim> Claims { get; set; } = new List<System.Security.Claims.Claim>();
+        public List<Claim> Claims { get; set; } = new List<Claim>();
 
         public IdentityUser Identity { get; set; } = null!;
 
diff --git a/WebDoorCreator.UI/Pages/UserAdmin.razor b/WebDoorCreator.UI/Pages/UserAdmin.razor
index ee69762..9e7cbc5 100644
--- a/WebDoorCreator.UI/Pages/UserAdmin.razor
+++ b/WebDoorCreator.UI/Pages/UserAdmin.razor
@@ -100,6 +100,13 @@ else
                 <div>
                     <h3>User Administration</h3>
                 </div>
+                <div class="d-flex justify-content-between gap-3 mb-1">
+                    <div class="input-group" title="Search">
+                        <span class="input-group-text"><i class="fa-solid fa-magnifying-glass"></i></span>
+                        <input class="form-control" placeholder="Search" @bind="@searchVal">
+                        <button class="input-group-text" @onclick="resetSearch"><i class="fa-solid fa-xmark"></i></button>
+                    </div>
+                </div>
                 <div class="d-flex justify-content-between gap-3 mb-1">
                     <div class="input-group">
                         <span class="input-group-text"><i class="fas fa-user-tag"></i></span>
diff --git a/WebDoorCreator.UI/Pages/UserAdmin.razor.cs b/WebDoorCreator.UI/Pages/UserAdmin.razor.cs
index c616539..aceb423 100644
--- a/WebDoorCreator.UI/Pages/UserAdmin.razor.cs
+++ b/WebDoorCreator.UI/Pages/UserAdmin.razor.cs
@@ -28,14 +28,31 @@ namespace WebDoorCreator.UI.Pages
 
         #region Public Properties
 
-        public string searchVal
+        protected string searchVal
         {
-            get
+            get => _searchVal;
+            set
             {
-                return AppMService.SearchVal;
+                if (value != _searchVal)
+                {
+                    _searchVal = value;
+                    var pUpd = Task.Run(async () =>
+                    {
+                        await ReloadData();
+                    });
+                    pUpd.Wait();
+                }
             }
         }
 
+        protected void resetSearch()
+        {
+            searchVal = "";
+        }
+
+
+        private string _searchVal { get; set; } = "";
+
         #endregion Public Properties
 
         #region Public Methods
@@ -126,7 +143,9 @@ namespace WebDoorCreator.UI.Pages
 
         public void Dispose()
         {
-            AppMService.EA_SearchUpdated -= OnSeachUpdated;
+#if false
+            AppMService.EA_SearchUpdated -= OnSeachUpdated; 
+#endif
         }
 
         /// <summary>
@@ -147,7 +166,6 @@ namespace WebDoorCreator.UI.Pages
             {
                 System.Security.Claims.Claim cClaim = new System.Security.Claims.Claim("CompanyId", $"{FiltCompany}");
                 UsersAll = UsersAll
-                            //.Where(x => x.Claims.Any(c => c == cClaim))
                             .Where(x => x.Claims.Any(c => c.Type == "CompanyId" && c.Value == $"{FiltCompany}"))
                             .ToList();
             }
@@ -184,8 +202,10 @@ namespace WebDoorCreator.UI.Pages
         [Inject]
         protected UserManager<IdentityUser> _UserManager { get; set; } = null!;
 
+#if false
         [Inject]
-        protected MessageService AppMService { get; set; } = null!;
+        protected MessageService AppMService { get; set; } = null!; 
+#endif
 
         [Inject]
         protected AuthenticationStateProvider AuthenticationStateProvider { get; set; } = null!;
@@ -230,8 +250,11 @@ namespace WebDoorCreator.UI.Pages
 
         protected override async Task OnInitializedAsync()
         {
+            searchVal = "";
+#if false
             AppMService.ShowSearch = true;
-            AppMService.EA_SearchUpdated += OnSeachUpdated;
+            AppMService.EA_SearchUpdated += OnSeachUpdated; 
+#endif
             // lettura dati
             await ReloadData();
 #if false
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 5a6fe70..9c1b69f 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-        <Version>0.9.2305.2909</Version>
+        <Version>0.9.2305.2910</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>

From 13b83369ae20d9dcb9c900511d47b84709b2e464 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 29 May 2023 10:28:39 +0200
Subject: [PATCH 3/3] Fix search panel users

---
 WebDoorCreator.UI/Pages/UserAdmin.razor | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/WebDoorCreator.UI/Pages/UserAdmin.razor b/WebDoorCreator.UI/Pages/UserAdmin.razor
index 9e7cbc5..4c65473 100644
--- a/WebDoorCreator.UI/Pages/UserAdmin.razor
+++ b/WebDoorCreator.UI/Pages/UserAdmin.razor
@@ -106,8 +106,6 @@ else
                         <input class="form-control" placeholder="Search" @bind="@searchVal">
                         <button class="input-group-text" @onclick="resetSearch"><i class="fa-solid fa-xmark"></i></button>
                     </div>
-                </div>
-                <div class="d-flex justify-content-between gap-3 mb-1">
                     <div class="input-group">
                         <span class="input-group-text"><i class="fas fa-user-tag"></i></span>
                         <select class="form-select" @bind="@FiltUserRole">
@@ -119,7 +117,6 @@ else
                                 </option>
                             }
                         </select>
-                        @*<span class="input-group-text">ROLES</span>*@
                     </div>
                     <div class="input-group">
                         <span class="input-group-text"><i class="fa-solid fa-building"></i></span>
