Revize 1af8a62a

Added application role and user seed, users list and create/update bug fixes

src/Core/Application/Leuze.Core.Application.UI/Pages/Users/Components/UserAside.razor

@@ -56 +56 @@
 
                         @foreach (var user in Users)
                         {
-                            <option value="@user.Id" selected="@(Senior == user.Id)">@user.Name</option>
+                            @if (UserId != default(Guid) && user.Id == UserId) { }
+                            else
+                            {
+                                <option value="@user.Id" selected="@(Senior == user.Id)">@user.Name</option>
+                            }
                         }
                     </select>
                 }
@@ -287 +291 @@
             Name = result.Result.User.Name;
             Email = result.Result.User.Email;
             Role = result.Result.User.Role.Id;
+            Senior = result.Result.User.SeniorId ?? default(Guid);
             Loading = false;
         }
     }

src/Core/Domain/Leuze.Core.Domain/Domains/Users/DTOs/UserDetailDto.cs

@@ -6 +6 @@
     /// <summary>
     /// 
     /// </summary>
-    public record UserDetailDto(Guid Id, string Name, string Email, bool IsAdUser, RoleItem Role);
+    public record UserDetailDto(Guid Id, string Name, string Email, bool IsAdUser, Guid? SeniorId, RoleItem Role);
 }

src/Core/Infrastructure/Leuze.Core.Infrastructure.Persistence/Repository/DomainUserRepository.cs

@@ -67 +67 @@
         /// <inheritdoc/>
         public async Task<UserDetailDto> GetDetailByIdAsync(Guid id)
             => await dbSet.Include(o => o.User).ThenInclude(o => o.Roles).Where(o => o.UserId == id)
-                .Select(o => new UserDetailDto(o.UserId, o.Name.FullName, o.EmailAddress.Email, o.User.IsAdUser, o.User.Roles.Select(a => new RoleItem(a.Id, a.Name)).FirstOrDefault()))
+                .Select(o => new UserDetailDto(o.UserId, o.Name.FullName, o.EmailAddress.Email, o.User.IsAdUser, o.SeniorUserId, o.User.Roles.Select(a => new RoleItem(a.Id, a.Name)).Single()))
                 .SingleOrDefaultAsync();
 
         /// <inheritdoc/>

src/Core/Infrastructure/Leuze.Core.Infrastructure.Persistence/Seeds/ApplicationSeed.cs

@@ -24 +24 @@
         public static void Run(LeuzeDbContext context, UserManager<ApplicationUser> userManager, RoleManager<ApplicationRole> roleManager)
         {
             var permissions = context.Set<ApplicationPermission>().ToList();
-            var role1 = context.Set<ApplicationRole>().Single(o => o.Id == CreateRole("Administrátor", false, roleManager, permissions).Id);
-            var role2 = context.Set<ApplicationRole>().Single(o => o.Id == CreateRole("MA", false, roleManager, permissions).Id);
-            var role3 = context.Set<ApplicationRole>().Single(o => o.Id == CreateRole("Uživatel", true, roleManager, permissions).Id);
+            var role1 = CreateRole("Admin", false, roleManager, permissions);
+            var role2 = CreateRole("TL", false, roleManager, permissions);
+            var role3 = CreateRole("MA", true, roleManager, permissions);
+            CreateUser("Testovací admin", "[e-mail]", role1, context, userManager);
+            CreateUser("Testovací TL", "[e-mail]", role2, context, userManager);
+            CreateUser("Testovací MA", "[e-mail]", role3, context, userManager);
         }
 
         private static void CreateUser(string name, string email, ApplicationRole role, LeuzeDbContext context, UserManager<ApplicationUser> userManager)
@@ -34 +37 @@
             ApplicationUser user = new(email, email, false);
             userManager.CreateAsync(user).Wait();
             userManager.AddPasswordAsync(user, "Test123*").Wait();
+            userManager.AddToRoleAsync(user, role.Name).Wait();
             user = context.Set<ApplicationUser>().Single(o => o.Id == user.Id);
-            DomainUser domainUser = new(user, new("Testovací uživatel"), new("[e-mail]"), null!);
+            DomainUser domainUser = new(user, new(name), new(email), null!);
             context.Add(domainUser);
             context.SaveChanges();
         }