From f0f91c9f20b32cdc1bf14c4e07c6c685e0b5d91d Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Fri, 15 May 2026 15:57:22 +0100
Subject: [PATCH] Update admin role checks to use "Admin" instead of
 "Administrator"

---
 .../Presentation/ViewModels/Admin/AdminBooksViewModel.cs      | 4 ++--
 .../Presentation/ViewModels/Admin/AdminCompaniesViewModel.cs  | 4 ++--
 .../ViewModels/Admin/AdminCompanyLogosViewModel.cs            | 4 ++--
 .../Presentation/ViewModels/Admin/AdminDocumentsViewModel.cs  | 4 ++--
 .../Presentation/ViewModels/Admin/AdminGpusViewModel.cs       | 4 ++--
 .../Admin/AdminInstructionSetExtensionsViewModel.cs           | 4 ++--
 .../ViewModels/Admin/AdminInstructionSetsViewModel.cs         | 4 ++--
 .../ViewModels/Admin/AdminMachineFamiliesViewModel.cs         | 2 +-
 .../ViewModels/Admin/AdminMachinePhotosViewModel.cs           | 4 ++--
 .../Presentation/ViewModels/Admin/AdminMachinesViewModel.cs   | 2 +-
 .../Presentation/ViewModels/Admin/AdminMagazinesViewModel.cs  | 4 ++--
 .../Presentation/ViewModels/Admin/AdminPeopleViewModel.cs     | 4 ++--
 .../Presentation/ViewModels/Admin/AdminProcessorsViewModel.cs | 4 ++--
 .../ViewModels/Admin/AdminResolutionsViewModel.cs             | 4 ++--
 .../Presentation/ViewModels/Admin/AdminScreensViewModel.cs    | 4 ++--
 .../ViewModels/Admin/AdminSoftwareScreenshotsViewModel.cs     | 4 ++--
 .../ViewModels/Admin/AdminSoundSynthsViewModel.cs             | 2 +-
 Marechai.App/Presentation/ViewModels/MainViewModel.cs         | 4 ++--
 Marechai.Database/Models/ApplicationRole.cs                   | 2 +-
 19 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminBooksViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminBooksViewModel.cs
index 049e12eb..61ad0861 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminBooksViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminBooksViewModel.cs
@@ -213,8 +213,8 @@ public partial class AdminBooksViewModel : ObservableObject, IRegionAware
             string token = _tokenService.GetToken();
             if(string.IsNullOrWhiteSpace(token)) { IsAdmin = false; return; }
             IEnumerable<string> roles = _jwtService.GetRoles(token);
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch { IsAdmin = false; }
     }
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminCompaniesViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminCompaniesViewModel.cs
index 2a2a3498..e96c0eb9 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminCompaniesViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminCompaniesViewModel.cs
@@ -291,8 +291,8 @@ public partial class AdminCompaniesViewModel : ObservableObject, IRegionAware
 
             IEnumerable<string> roles = _jwtService.GetRoles(token);
 
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch
         {
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminCompanyLogosViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminCompanyLogosViewModel.cs
index 180d0dbe..b2bb9719 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminCompanyLogosViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminCompanyLogosViewModel.cs
@@ -139,8 +139,8 @@ public partial class AdminCompanyLogosViewModel : ObservableObject, IRegionAware
 
             IEnumerable<string> roles = _jwtService.GetRoles(token);
 
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch
         {
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminDocumentsViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminDocumentsViewModel.cs
index 113e1d83..6dcea9c3 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminDocumentsViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminDocumentsViewModel.cs
@@ -179,8 +179,8 @@ public partial class AdminDocumentsViewModel : ObservableObject, IRegionAware
             string token = _tokenService.GetToken();
             if(string.IsNullOrWhiteSpace(token)) { IsAdmin = false; return; }
             IEnumerable<string> roles = _jwtService.GetRoles(token);
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch { IsAdmin = false; }
     }
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminGpusViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminGpusViewModel.cs
index 6c420646..5ac99127 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminGpusViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminGpusViewModel.cs
@@ -179,8 +179,8 @@ public partial class AdminGpusViewModel : ObservableObject, IRegionAware
 
             IEnumerable<string> roles = _jwtService.GetRoles(token);
 
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch
         {
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminInstructionSetExtensionsViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminInstructionSetExtensionsViewModel.cs
index 1ce110bd..da6e1cc0 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminInstructionSetExtensionsViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminInstructionSetExtensionsViewModel.cs
@@ -122,8 +122,8 @@ public partial class AdminInstructionSetExtensionsViewModel : ObservableObject,
 
             IEnumerable<string> roles = _jwtService.GetRoles(token);
 
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch
         {
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminInstructionSetsViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminInstructionSetsViewModel.cs
index 767b1f67..6f8fb9c5 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminInstructionSetsViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminInstructionSetsViewModel.cs
@@ -125,8 +125,8 @@ public partial class AdminInstructionSetsViewModel : ObservableObject, IRegionAw
 
             IEnumerable<string> roles = _jwtService.GetRoles(token);
 
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch
         {
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminMachineFamiliesViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminMachineFamiliesViewModel.cs
index 9329d08c..7a575e7b 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminMachineFamiliesViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminMachineFamiliesViewModel.cs
@@ -90,7 +90,7 @@ public partial class AdminMachineFamiliesViewModel : ObservableObject, IRegionAw
             if(string.IsNullOrWhiteSpace(token)) { IsAdmin = false; return; }
             IEnumerable<string> roles = _jwtService.GetRoles(token);
             IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch { IsAdmin = false; }
     }
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminMachinePhotosViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminMachinePhotosViewModel.cs
index 2640c1bd..d610fb85 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminMachinePhotosViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminMachinePhotosViewModel.cs
@@ -137,8 +137,8 @@ public partial class AdminMachinePhotosViewModel : ObservableObject, IRegionAwar
 
             IEnumerable<string> roles = _jwtService.GetRoles(token);
 
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch
         {
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminMachinesViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminMachinesViewModel.cs
index 5d15b760..9395bfb1 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminMachinesViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminMachinesViewModel.cs
@@ -211,7 +211,7 @@ public partial class AdminMachinesViewModel : ObservableObject, IRegionAware
             if(string.IsNullOrWhiteSpace(token)) { IsAdmin = false; return; }
             IEnumerable<string> roles = _jwtService.GetRoles(token);
             IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch { IsAdmin = false; }
     }
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminMagazinesViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminMagazinesViewModel.cs
index 1ae46140..750b33cb 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminMagazinesViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminMagazinesViewModel.cs
@@ -182,8 +182,8 @@ public partial class AdminMagazinesViewModel : ObservableObject, IRegionAware
             string token = _tokenService.GetToken();
             if(string.IsNullOrWhiteSpace(token)) { IsAdmin = false; return; }
             IEnumerable<string> roles = _jwtService.GetRoles(token);
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch { IsAdmin = false; }
     }
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminPeopleViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminPeopleViewModel.cs
index c2d96a76..7f8cc2d0 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminPeopleViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminPeopleViewModel.cs
@@ -153,8 +153,8 @@ public partial class AdminPeopleViewModel : ObservableObject, IRegionAware
 
             IEnumerable<string> roles = _jwtService.GetRoles(token);
 
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch
         {
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminProcessorsViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminProcessorsViewModel.cs
index 650a5796..80c8b3c8 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminProcessorsViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminProcessorsViewModel.cs
@@ -226,8 +226,8 @@ public partial class AdminProcessorsViewModel : ObservableObject, IRegionAware
 
             IEnumerable<string> roles = _jwtService.GetRoles(token);
 
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch
         {
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminResolutionsViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminResolutionsViewModel.cs
index 22d21073..b6e91eac 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminResolutionsViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminResolutionsViewModel.cs
@@ -128,8 +128,8 @@ public partial class AdminResolutionsViewModel : ObservableObject, IRegionAware
 
             IEnumerable<string> roles = _jwtService.GetRoles(token);
 
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch
         {
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminScreensViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminScreensViewModel.cs
index 8ae4f216..64c19aa4 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminScreensViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminScreensViewModel.cs
@@ -109,8 +109,8 @@ public partial class AdminScreensViewModel : ObservableObject, IRegionAware
 
             IEnumerable<string> roles = _jwtService.GetRoles(token);
 
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch { IsAdmin = false; }
     }
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminSoftwareScreenshotsViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminSoftwareScreenshotsViewModel.cs
index 015b7b26..45290340 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminSoftwareScreenshotsViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminSoftwareScreenshotsViewModel.cs
@@ -162,8 +162,8 @@ public partial class AdminSoftwareScreenshotsViewModel : ObservableObject, IRegi
 
             IEnumerable<string> roles = _jwtService.GetRoles(token);
 
-            IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+            IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch
         {
diff --git a/Marechai.App/Presentation/ViewModels/Admin/AdminSoundSynthsViewModel.cs b/Marechai.App/Presentation/ViewModels/Admin/AdminSoundSynthsViewModel.cs
index d688421e..d61fbf38 100644
--- a/Marechai.App/Presentation/ViewModels/Admin/AdminSoundSynthsViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/Admin/AdminSoundSynthsViewModel.cs
@@ -122,7 +122,7 @@ public partial class AdminSoundSynthsViewModel : ObservableObject, IRegionAware
             IEnumerable<string> roles = _jwtService.GetRoles(token);
 
             IsAdmin = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                      roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+                      roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
         }
         catch { IsAdmin = false; }
     }
diff --git a/Marechai.App/Presentation/ViewModels/MainViewModel.cs b/Marechai.App/Presentation/ViewModels/MainViewModel.cs
index 5a9609ba..f7a4800b 100644
--- a/Marechai.App/Presentation/ViewModels/MainViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/MainViewModel.cs
@@ -199,8 +199,8 @@ public partial class MainViewModel : ObservableObject
             {
                 IEnumerable<string> roles = _jwtService.GetRoles(token);
 
-                IsAdminUser = roles.Contains("Uberadmin",      StringComparer.OrdinalIgnoreCase) ||
-                              roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
+                IsAdminUser = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
+                              roles.Contains("Admin",     StringComparer.OrdinalIgnoreCase);
             }
             else
             {
diff --git a/Marechai.Database/Models/ApplicationRole.cs b/Marechai.Database/Models/ApplicationRole.cs
index f22511fd..a5d8c52e 100644
--- a/Marechai.Database/Models/ApplicationRole.cs
+++ b/Marechai.Database/Models/ApplicationRole.cs
@@ -40,7 +40,7 @@ public class ApplicationRole : IdentityRole
     public const string RolePhysicalCurator = "PhysicalCurator";
     public const string RoleTechnician      = "Technician";
     public const string RoleSuperTechnician = "SuperTechnician";
-    public const string RoleAdmin           = "Administrator";
+    public const string RoleAdmin           = "Admin";
     public const string RoleNone            = "NormalUser";
 
     public ApplicationRole() => Created = DateTime.UtcNow;