From 9b80e7b25ce7316099343ae04e3a2e34f5e313ee Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Mon, 29 May 2023 09:15:49 +0200
Subject: [PATCH] utilizzo metodo nuovo claims x nav menu

---
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  2 +-
 .../Components/Gen/NavMenuHorizontal.razor    |  2 +-
 .../Components/Gen/NavMenuHorizontal.razor.cs | 39 ++++++++++++++++---
 WebDoorCreator.UI/WebDoorCreator.UI.csproj    |  2 +-
 6 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 5b92b9c..633f24f 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.2908</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 49d6894..6efddaa 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2305.2710
+0.9.2305.2908
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index d99c0f3..a720de5 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.2908</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/Components/Gen/NavMenuHorizontal.razor b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor
index 15cc1e5..d05cb93 100644
--- a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor
+++ b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor
@@ -73,7 +73,7 @@
                                     {
                                         @if (compToShow != null)
                                         {
-                                            <div>@compToShow.CompanyName</div>
+                                            <input class="form-control form-control-sm" value="@compToShow.CompanyName" disabled/>
                                         }
                                     }
                                 }
diff --git a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor.cs b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor.cs
index 5a24807..7a154a4 100644
--- a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor.cs
+++ b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor.cs
@@ -22,6 +22,7 @@ namespace WebDoorCreator.UI.Components.Gen
         public EventCallback<Dictionary<string, Dictionary<string, string>>> E_VocLemmas { get; set; }
 
         public List<CompanyModel> listCompanies { get; set; } = new List<CompanyModel>();
+        protected List<System.Security.Claims.Claim>? userClaims { get; set; } = null;
 
         public List<string> listRecord { get; set; } = new List<string>();
 
@@ -195,7 +196,7 @@ namespace WebDoorCreator.UI.Components.Gen
                 compToShow = listCompanies?.FirstOrDefault()!;
             }
             userCurrCompany = compToShow.CompanyId;
-        }
+        } 
 
         protected override async Task OnInitializedAsync()
         {
@@ -230,14 +231,15 @@ namespace WebDoorCreator.UI.Components.Gen
         {
             // reset preliminare
             listRecord = new List<string>();
-            listCompanies = new List<CompanyModel>();
+            //listCompanies = new List<CompanyModel>();
             if (!NavManager.Uri.Contains("UserAdmin"))
             {
                 if (!string.IsNullOrEmpty(userId) && string.IsNullOrEmpty(userRole))
                 {
                     // FARE!!! rivedere con await WDCUsrServ.UserDataGetById(userId);
 
-
+                    var user = await _userManager.FindByNameAsync(userId);
+#if false
                     var user = await _userManager.FindByNameAsync(userId);
                     var roleList = await _userManager.GetRolesAsync(user);
                     if (roleList != null)
@@ -278,10 +280,35 @@ namespace WebDoorCreator.UI.Components.Gen
                                 }
                                 compToShow = listCompanies?.FirstOrDefault()!;
                             }
-                        }
-                        fixSelCompany();
-                        userClaimsList = listRecord;
+                        } 
+                }
+#endif
+                    var obj = await WDCUService.UserDataGetById(user.Id);
+                    if (obj != null)
+                    {
+                        userClaims = obj.Claims.ToList();
+                        if (userClaims != null)
+                        {
+                            if (obj.Roles.Contains("SuperAdmin"))
+                            {
+                                listCompanies = await WDCService.CompanyGetByKey(0);
+                            }
+                            else
+                            {
+                                foreach (var item in obj.Claims.ToList())
+                                {
+                                    List<CompanyModel> rawComp = await WDCService.CompanyGetByKey(int.Parse(item.Value));
+                                    if (rawComp != null)
+                                    {
+                                        CompanyModel comp2Add = rawComp?.FirstOrDefault()!;
+                                        listCompanies.Add(comp2Add);
+                                    }
+                                }
+                            }
+                        } 
                     }
+                    fixSelCompany();
+                    userClaimsList = listRecord;
                 }
             }
         }
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 3bdc440..fa9af50 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.2908</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
