From 17f3274abc23add29d8b073a40949ee1fc8a77b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20B=C3=B6rchers?= <holger@boerchers.org>
Date: Mon, 3 Aug 2020 22:15:25 +0200
Subject: [PATCH 01/11] Added Blazorise gui framework

---
 .../Repository/BaseRepository.cs              | 25 ++---
 .../Repository/IRepository.cs                 |  5 +-
 .../Repository/Repository.cs                  |  2 +-
 UserService/Pages/Directory.razor             | 40 +++++---
 UserService/Pages/Directory.razor.cs          | 45 +++++++++
 UserService/Pages/OrganizationUnits.razor     | 67 +++++++------
 UserService/Pages/SecurityGroups.razor        | 82 ++++++++--------
 UserService/Pages/Users.razor                 | 98 +++++++++----------
 UserService/Pages/_Host.cshtml                | 54 +++++-----
 UserService/Shared/NavMenu.razor              | 61 ++++--------
 UserService/Shared/SurveyPrompt.razor         | 16 ---
 UserService/Startup.cs                        | 17 +++-
 UserService/UserService.csproj                | 11 ++-
 UserService/_Imports.razor                    |  5 +-
 14 files changed, 290 insertions(+), 238 deletions(-)
 create mode 100644 UserService/Pages/Directory.razor.cs
 delete mode 100644 UserService/Shared/SurveyPrompt.razor

diff --git a/UserService.DatabaseLayer/Repository/BaseRepository.cs b/UserService.DatabaseLayer/Repository/BaseRepository.cs
index aeb0dd7..7df73ec 100644
--- a/UserService.DatabaseLayer/Repository/BaseRepository.cs
+++ b/UserService.DatabaseLayer/Repository/BaseRepository.cs
@@ -1,8 +1,8 @@
-using System;
+#nullable enable
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Linq.Expressions;
-using System.Runtime.CompilerServices;
-using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
@@ -12,43 +12,46 @@ namespace UserService.DatabaseLayer.Repository
 {
     public class BaseRepository<T> where T : Node
     {
-        protected readonly Func<UserServiceDbContext, DbSet<T>> _context;
+        protected readonly Func<UserServiceDbContext, DbSet<T>> Context;
 
         protected BaseRepository(Func<UserServiceDbContext, DbSet<T>> context)
         {
-            _context = context;
+            Context = context;
         }
 
-        public virtual async Task<IReadOnlyList<T>> GetAllAsync(CancellationToken token = default)
+        public virtual async Task<IReadOnlyList<T>> GetAllAsync(Expression<Func<T, bool>>? predicate = null, CancellationToken token = default)
         {
             await using var db = new UserServiceDbContext();
-            return await _context(db).Include(x => x.Parent).ToListAsync(token);
+
+            IQueryable<T> queryable = Context(db).Include(x => x.Parent);
+            if(queryable != null) queryable = queryable.Where(predicate);
+            return await queryable.ToListAsync(token);
         }
 
         public async Task<T?> GetAsync(Expression<Func<T, bool>> predicate, CancellationToken token = default)
         {
             await using var db = new UserServiceDbContext();
-            return await _context(db).FirstOrDefaultAsync(predicate, token);
+            return await Context(db).FirstOrDefaultAsync(predicate, token);
         }
 
         public async Task AddAsync(T entity, CancellationToken token = default)
         {
             await using var db = new UserServiceDbContext();
-            await _context(db).AddAsync(@entity, token);
+            await Context(db).AddAsync(@entity, token);
             await db.SaveChangesAsync(token);
         }
 
         public async Task UpdateAsync(T entity, CancellationToken token = default)
         {
             await using var db = new UserServiceDbContext();
-            _context(db).Update(entity);
+            Context(db).Update(entity);
             await db.SaveChangesAsync(token);
         }
 
         public async Task DeleteAsync(T entity, CancellationToken token = default)
         {
             await using var db = new UserServiceDbContext();
-            _context(db).Remove(entity);
+            Context(db).Remove(entity);
             await db.SaveChangesAsync(token);
         }
     }
diff --git a/UserService.DatabaseLayer/Repository/IRepository.cs b/UserService.DatabaseLayer/Repository/IRepository.cs
index 19f8598..189c21a 100644
--- a/UserService.DatabaseLayer/Repository/IRepository.cs
+++ b/UserService.DatabaseLayer/Repository/IRepository.cs
@@ -1,4 +1,5 @@
-using System;
+#nullable enable
+using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Threading;
@@ -9,7 +10,7 @@ namespace UserService.DatabaseLayer.Repository
 {
     public interface IRepository<T> where T : Node
     {
-        Task<IReadOnlyList<T>> GetAllAsync(CancellationToken token = default);
+        Task<IReadOnlyList<T>> GetAllAsync(Expression<Func<T, bool>>? predicate = null, CancellationToken token = default);
         Task<T?> GetAsync(Expression<Func<T, bool>> predicate, CancellationToken token = default);
         Task AddAsync(T entity, CancellationToken token = default);
         Task UpdateAsync(T entity, CancellationToken token = default);
diff --git a/UserService.DatabaseLayer/Repository/Repository.cs b/UserService.DatabaseLayer/Repository/Repository.cs
index 2be88fd..86afdd3 100644
--- a/UserService.DatabaseLayer/Repository/Repository.cs
+++ b/UserService.DatabaseLayer/Repository/Repository.cs
@@ -23,7 +23,7 @@ namespace UserService.DatabaseLayer.Repository
 
             await using var db = new UserServiceDbContext();
             var result = new List<OrganizationUnit>();
-            var rootOus = await _context(db)
+            var rootOus = await Context(db)
                 .Include(x => x.Parent)
                 .ToListAsync(token);
 
diff --git a/UserService/Pages/Directory.razor b/UserService/Pages/Directory.razor
index 4ba6e41..39bb61c 100644
--- a/UserService/Pages/Directory.razor
+++ b/UserService/Pages/Directory.razor
@@ -1,11 +1,20 @@
 @page "/directory"
-@using UserService.DatabaseLayer.DataModels
 @using UserService.DatabaseLayer.Repository
 @inject IOrganizationUnitsRepository OuRepository
+@inherits DirectoryBase
 
-<h1>TODO</h1>
+@functions {
 
-@if (_organizationUnits == null)
+
+
+}
+
+<Row>
+    <Column ColumnSize="ColumnSize.Is12">
+        <h1>TODO</h1>
+    </Column>
+</Row>
+@if (OrganizationUnits == null)
 {
     <p>
         <em>Loading...</em>
@@ -13,17 +22,20 @@
 }
 else
 {
+    <Row>
+        <Column ColumnSize="ColumnSize.Is4">
+            <TreeView Nodes="OrganizationUnits"
+                      GetChildNodes="@(item => item?.Children)"
+                      HasChildNodes="@(item => item?.Children?.Any() == true)"
+                      @bind-SelectedNode="@SelectedNode">
+                <NodeContent>
+                    <Icon Name="IconName.Folder"/>
+                    @context?.CommonName
+                </NodeContent> </TreeView>
+        </Column>
+        <Column ColumnSize="ColumnSize.Is4">
 
-
-}
-@code {
-    private IReadOnlyList<OrganizationUnit> _organizationUnits;
-    private OrganizationUnit _selectedOu;
-
-    protected override async Task OnInitializedAsync()
-    {
-        _organizationUnits = (await OuRepository.GetAllAsync().ConfigureAwait(false)).Where(x=> x.Parent is null).ToList();
-    }
-
+        </Column>
+    </Row>
 
 }
\ No newline at end of file
diff --git a/UserService/Pages/Directory.razor.cs b/UserService/Pages/Directory.razor.cs
new file mode 100644
index 0000000..4a7ac5c
--- /dev/null
+++ b/UserService/Pages/Directory.razor.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using UserService.DatabaseLayer.DataModels;
+using UserService.DatabaseLayer.Repository;
+
+namespace UserService.Pages
+{
+    public class DirectoryBase : ComponentBase
+    {
+        private Node? _selectedNode;
+        public IReadOnlyList<Node>? OrganizationUnits { get; set; }
+
+        public Node? SelectedNode
+        {
+            get => _selectedNode;
+            set
+            {
+                if(Equals(_selectedNode, value)) return;
+                _selectedNode = value;
+                OnSelectedNodeChanged(value);
+            }
+        }
+
+        private async void OnSelectedNodeChanged(Node? value)
+        {
+            Members = await UsersRepository.GetAllAsync();
+        }
+
+        [Inject] public IOrganizationUnitsRepository OuRepository { get; set; }
+
+        [Inject] public IUsersRepository UsersRepository { get; set; }
+
+
+        protected override async Task OnInitializedAsync()
+        {
+            OrganizationUnits = (await OuRepository.GetAllAsync().ConfigureAwait(false))
+                .Where(x => x.Parent is null)
+                .ToList();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/UserService/Pages/OrganizationUnits.razor b/UserService/Pages/OrganizationUnits.razor
index c17c79e..ff8896c 100644
--- a/UserService/Pages/OrganizationUnits.razor
+++ b/UserService/Pages/OrganizationUnits.razor
@@ -12,33 +12,36 @@
 }
 else
 {
-    <MatTable Items="@OrganizationUnits" class="mat-elevation-z5">
-        <MatTableHeader>
-            <th style="width: 20%">Common Name</th>
-            <th style="width: 20%">Description</th>
-            <th style="width: 20%">Parent</th>
-            <th style="width: auto">Manager</th>
-            <th style="width: auto"> </th>
-            <th style="width: auto"> </th>
-        </MatTableHeader>
-        <MatTableRow>
-            <td>@context.CommonName</td>
-            <td>@context.Description</td>
-            <td>@context.Parent</td>
-            <td>@context.Manager</td>
-            <td>
-                <a href="organizationUnits" @onclick="@(e => Edit(context))">edit</a>
-            </td>
-            <td>
-                <a href="organizationUnits" @onclick="@(e => Delete(context))">delete</a>
-            </td>
-        </MatTableRow>
-    </MatTable>
+
+
+
+    @*<MatTable Items="@OrganizationUnits" class="mat-elevation-z5">
+            <MatTableHeader>
+                <th style="width: 20%">Common Name</th>
+                <th style="width: 20%">Description</th>
+                <th style="width: 20%">Parent</th>
+                <th style="width: auto">Manager</th>
+                <th style="width: auto"> </th>
+                <th style="width: auto"> </th>
+            </MatTableHeader>
+            <MatTableRow>
+                <td>@context.CommonName</td>
+                <td>@context.Description</td>
+                <td>@context.Parent</td>
+                <td>@context.Manager</td>
+                <td>
+                    <a href="organizationUnits" @onclick="@(e => Edit(context))">edit</a>
+                </td>
+                <td>
+                    <a href="organizationUnits" @onclick="@(e => Delete(context))">delete</a>
+                </td>
+            </MatTableRow>
+        </MatTable>*@
 
     <MatButton @onclick="@(e => Edit(new OrganizationUnit()))">Create organization unit</MatButton>
 }
 
-<MatDialog @bind-IsOpen="@DialogIsOpen">
+@*<MatDialog @bind-IsOpen="@DialogIsOpen">
     @if (OuToEdit != null)
     {
         <MatDialogTitle>@(OuToEdit.Id == 0 ? "New" : "Edit") @OuToEdit.CommonName (@OuToEdit.Id)</MatDialogTitle>
@@ -47,16 +50,16 @@ else
             <p/>
             <MatTextField Label="Description" @bind-Value="@OuToEdit.Description"/>
             @*<MatTextField Label="Manager" @bind-Value="@OuToEdit.Manager"/>*@
-            <p/>
-            <MatSelectItem Items="@OrganizationUnits" Label="Parent" @bind-Value="@OuToEdit.Parent"/>
-        </MatDialogContent>
-    }
-    else
-    {
-        <MatDialogTitle>No securityGroup selected</MatDialogTitle>
-    }
+@*<p />
+    <MatSelectItem Items="@OrganizationUnits" Label="Parent" @bind-Value="@OuToEdit.Parent" />
+            </MatDialogContent>
+        }
+        else
+        {
+    <MatDialogTitle>No securityGroup selected</MatDialogTitle>
+        }
     <MatDialogActions>
         <MatButton OnClick="@(e => { DialogIsOpen = false; })">No Thanks</MatButton>
         <MatButton OnClick="@OkClick">OK</MatButton>
     </MatDialogActions>
-</MatDialog>
\ No newline at end of file
+    </MatDialog>*@
\ No newline at end of file
diff --git a/UserService/Pages/SecurityGroups.razor b/UserService/Pages/SecurityGroups.razor
index fdbfba0..0904a02 100644
--- a/UserService/Pages/SecurityGroups.razor
+++ b/UserService/Pages/SecurityGroups.razor
@@ -13,47 +13,47 @@
 }
 else
 {
-    <MatTable Items="@SecurityGroups" class="mat-elevation-z5">
-        <MatTableHeader>
-            <th style="width: 30%">Common Name</th>
-            <th style="width: 20%">Description</th>
-            <th style="width: 20%">E-Mail</th>
-            <th style="width: 20%">Parent</th>
-            <th style="width: auto"> </th>
-            <th style="width: auto"> </th>
-        </MatTableHeader>
-        <MatTableRow>
-            <td>@context.CommonName</td>
-            <td>@context.Description</td>
-            <td>@context.EMail</td>
-            <td>@context.Parent</td>
-            <td><a href="securitygroups" @onclick="@(e => EditSecurityGroup(context))">edit</a></td>
-            <td><a href="securitygroups" @onclick="@(e => DeleteSecurityGroup(context))">delete</a></td>
+    @*<MatTable Items="@SecurityGroups" class="mat-elevation-z5">
+            <MatTableHeader>
+                <th style="width: 30%">Common Name</th>
+                <th style="width: 20%">Description</th>
+                <th style="width: 20%">E-Mail</th>
+                <th style="width: 20%">Parent</th>
+                <th style="width: auto"> </th>
+                <th style="width: auto"> </th>
+            </MatTableHeader>
+            <MatTableRow>
+                <td>@context.CommonName</td>
+                <td>@context.Description</td>
+                <td>@context.EMail</td>
+                <td>@context.Parent</td>
+                <td><a href="securitygroups" @onclick="@(e => EditSecurityGroup(context))">edit</a></td>
+                <td><a href="securitygroups" @onclick="@(e => DeleteSecurityGroup(context))">delete</a></td>
 
-            </MatTableRow>
-    </MatTable>
-    <MatButton @onclick="@(e => EditSecurityGroup(new SecurityGroup()))">Create new group</MatButton>
+                </MatTableRow>
+        </MatTable>
+        <MatButton @onclick="@(e => EditSecurityGroup(new SecurityGroup()))">Create new group</MatButton>*@
 }
 
-<MatDialog @bind-IsOpen="@DialogIsOpen">
-    @if (SecurityGroupToEdit != null)
-    {
-        <MatDialogTitle>@(SecurityGroupToEdit.Id == 0 ? "New" : "Edit") @SecurityGroupToEdit.CommonName (@SecurityGroupToEdit.Id)</MatDialogTitle>
-        <MatDialogContent>
-            <MatTextField Label="Common name" @bind-Value="@SecurityGroupToEdit.CommonName" ReadOnly="@(SecurityGroupToEdit.Id != 0)"></MatTextField>
-            <p />
-            <MatTextField Label="Description" @bind-Value="@SecurityGroupToEdit.Description"></MatTextField>
-            <MatTextField Label="E-Mail" @bind-Value="@SecurityGroupToEdit.EMail"></MatTextField>
-            <p />
-            <MatSelectItem Items="@OrganizationUnits" Label="Parent" @bind-Value="@SecurityGroupToEdit.Parent"></MatSelectItem>
-        </MatDialogContent>
-    }
-    else
-    {
-        <MatDialogTitle>No securityGroup selected</MatDialogTitle>
-    }
-    <MatDialogActions>
-        <MatButton OnClick="@(e => { DialogIsOpen = false; })">No Thanks</MatButton>
-        <MatButton OnClick="@OkClick">OK</MatButton>
-    </MatDialogActions>
-</MatDialog>
\ No newline at end of file
+@*<MatDialog @bind-IsOpen="@DialogIsOpen">
+        @if (SecurityGroupToEdit != null)
+        {
+            <MatDialogTitle>@(SecurityGroupToEdit.Id == 0 ? "New" : "Edit") @SecurityGroupToEdit.CommonName (@SecurityGroupToEdit.Id)</MatDialogTitle>
+            <MatDialogContent>
+                <MatTextField Label="Common name" @bind-Value="@SecurityGroupToEdit.CommonName" ReadOnly="@(SecurityGroupToEdit.Id != 0)"></MatTextField>
+                <p />
+                <MatTextField Label="Description" @bind-Value="@SecurityGroupToEdit.Description"></MatTextField>
+                <MatTextField Label="E-Mail" @bind-Value="@SecurityGroupToEdit.EMail"></MatTextField>
+                <p />
+                <MatSelectItem Items="@OrganizationUnits" Label="Parent" @bind-Value="@SecurityGroupToEdit.Parent"></MatSelectItem>
+            </MatDialogContent>
+        }
+        else
+        {
+            <MatDialogTitle>No securityGroup selected</MatDialogTitle>
+        }
+        <MatDialogActions>
+            <MatButton OnClick="@(e => { DialogIsOpen = false; })">No Thanks</MatButton>
+            <MatButton OnClick="@OkClick">OK</MatButton>
+        </MatDialogActions>
+    </MatDialog>*@
\ No newline at end of file
diff --git a/UserService/Pages/Users.razor b/UserService/Pages/Users.razor
index 6bc2fd3..77ac95a 100644
--- a/UserService/Pages/Users.razor
+++ b/UserService/Pages/Users.razor
@@ -12,55 +12,55 @@
 }
 else
 {
-    <MatTable Items="@Users" class="mat-elevation-z5">
-        <MatTableHeader>
-            <th style="width: 20%">Common Name</th>
-            <th style="width: 30%">Full name</th>
-            <th style="width: 20%">Description</th>
-            <th style="width: 20%">E-Mail</th>
-            <th style="width: 20%">Parent</th>
-            <th style="width: auto">Is active</th>
-            <th style="width: auto"> </th>
-            <th style="width: auto"> </th>
-        </MatTableHeader>
-        <MatTableRow>
-            <td>@context.CommonName</td>
-            <td>@context.FullName</td>
-            <td>@context.Description</td>
-            <td>@context.EMail</td>
-            <td>@context.Parent</td>
-            <td>@context.IsActive</td>
-            <td><a href="users" @onclick="@(e => EditUser(context))">edit</a></td>
-            <td><a href="users" @onclick="@(e => DeleteUser(context))">delete</a></td>
-        </MatTableRow>
-    </MatTable>
+    @*<MatTable Items="@Users" class="mat-elevation-z5">
+            <MatTableHeader>
+                <th style="width: 20%">Common Name</th>
+                <th style="width: 30%">Full name</th>
+                <th style="width: 20%">Description</th>
+                <th style="width: 20%">E-Mail</th>
+                <th style="width: 20%">Parent</th>
+                <th style="width: auto">Is active</th>
+                <th style="width: auto"> </th>
+                <th style="width: auto"> </th>
+            </MatTableHeader>
+            <MatTableRow>
+                <td>@context.CommonName</td>
+                <td>@context.FullName</td>
+                <td>@context.Description</td>
+                <td>@context.EMail</td>
+                <td>@context.Parent</td>
+                <td>@context.IsActive</td>
+                <td><a href="users" @onclick="@(e => EditUser(context))">edit</a></td>
+                <td><a href="users" @onclick="@(e => DeleteUser(context))">delete</a></td>
+            </MatTableRow>
+        </MatTable>
 
-    <MatButton @onclick="@(e => EditUser(new User()))">Create user</MatButton>
+        <MatButton @onclick="@(e => EditUser(new User()))">Create user</MatButton>*@
 }
 
-<MatDialog @bind-IsOpen="@DialogIsOpen">
-    @if (UserToEdit != null)
-    {
-        <MatDialogTitle>@(UserToEdit.Id == 0 ? "New" : "Edit") @UserToEdit.CommonName (@UserToEdit.Id)</MatDialogTitle>
-        <MatDialogContent>
-            <MatTextField Label="Common name" @bind-Value="@UserToEdit.CommonName" ReadOnly="@(UserToEdit.Id != 0)" />
-            <MatSlideToggle Label="Is active" @bind-Value="@UserToEdit.IsActive" />
-            <p />
-            <MatTextField Label="First name" @bind-Value="@UserToEdit.FirstName" />
-            <MatTextField Label="Last name" @bind-Value="@UserToEdit.LastName" />
-            <p />
-            <MatTextField Label="Description" @bind-Value="@UserToEdit.Description" />
-            <MatTextField Label="E-Mail" @bind-Value="@UserToEdit.EMail" />
-            <p />
-            <MatSelectItem  Items="@OrganizationUnits" TItem="Node" Label="Parent" @bind-Value="@UserToEdit.Parent" />
-        </MatDialogContent>
-    }
-    else
-    {
-        <MatDialogTitle>No securityGroup selected</MatDialogTitle>
-    }
-    <MatDialogActions>
-        <MatButton OnClick="@(e => { DialogIsOpen = false; })">No Thanks</MatButton>
-        <MatButton OnClick="@OkClick">OK</MatButton>
-    </MatDialogActions>
-</MatDialog>
\ No newline at end of file
+@*<MatDialog @bind-IsOpen="@DialogIsOpen">
+        @if (UserToEdit != null)
+        {
+            <MatDialogTitle>@(UserToEdit.Id == 0 ? "New" : "Edit") @UserToEdit.CommonName (@UserToEdit.Id)</MatDialogTitle>
+            <MatDialogContent>
+                <MatTextField Label="Common name" @bind-Value="@UserToEdit.CommonName" ReadOnly="@(UserToEdit.Id != 0)" />
+                <MatSlideToggle Label="Is active" @bind-Value="@UserToEdit.IsActive" />
+                <p />
+                <MatTextField Label="First name" @bind-Value="@UserToEdit.FirstName" />
+                <MatTextField Label="Last name" @bind-Value="@UserToEdit.LastName" />
+                <p />
+                <MatTextField Label="Description" @bind-Value="@UserToEdit.Description" />
+                <MatTextField Label="E-Mail" @bind-Value="@UserToEdit.EMail" />
+                <p />
+                <MatSelectItem  Items="@OrganizationUnits" TItem="Node" Label="Parent" @bind-Value="@UserToEdit.Parent" />
+            </MatDialogContent>
+        }
+        else
+        {
+            <MatDialogTitle>No securityGroup selected</MatDialogTitle>
+        }
+        <MatDialogActions>
+            <MatButton OnClick="@(e => { DialogIsOpen = false; })">No Thanks</MatButton>
+            <MatButton OnClick="@OkClick">OK</MatButton>
+        </MatDialogActions>
+    </MatDialog>*@
\ No newline at end of file
diff --git a/UserService/Pages/_Host.cshtml b/UserService/Pages/_Host.cshtml
index 8b3f80a..b5f61a9 100644
--- a/UserService/Pages/_Host.cshtml
+++ b/UserService/Pages/_Host.cshtml
@@ -8,33 +8,41 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>UserService</title>
-    <base href="~/"/>
+    <base href="~/" />
+    <link href="css/site.css" rel="stylesheet" />
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
-    <link href="css/site.css" rel="stylesheet"/>
-    <script src="_content/MatBlazor/dist/matBlazor.js"></script>
-    <link href="_content/MatBlazor/dist/matBlazor.css" rel="stylesheet"/>
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.0/css/all.css">
+
+    <link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
+    <link href="_content/Blazorise.Bootstrap/blazorise.bootstrap.css" rel="stylesheet" />
+    <link href="_content/Blazorise.Sidebar/blazorise.sidebar.css" rel="stylesheet" />
+    <link href="_content/Blazorise.TreeView/blazorise.treeview.css" rel="stylesheet" />
+
 </head>
 <body>
-<app>
-    <component type="typeof(App)" render-mode="ServerPrerendered"/>
-</app>
+    <app>
+        <component type="typeof(App)" render-mode="ServerPrerendered" />
+    </app>
 
-<div id="blazor-error-ui">
-    <environment include="Staging,Production">
-        An error has occurred. This application may no longer respond until reloaded.
-    </environment>
-    <environment include="Development">
-        An unhandled exception has occurred. See browser dev tools for details.
-    </environment>
-    <a href="" class="reload">Reload</a>
-    <a class="dismiss">🗙</a>
-</div>
-<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
-<script src="_framework/blazor.server.js"></script>
+    <div id="blazor-error-ui">
+        <environment include="Staging,Production">
+            An error has occurred. This application may no longer respond until reloaded.
+        </environment>
+        <environment include="Development">
+            An unhandled exception has occurred. See browser dev tools for details.
+        </environment>
+        <a href="" class="reload">Reload</a>
+        <a class="dismiss">🗙</a>
+    </div>
+    <script src="_framework/blazor.server.js"></script>
+    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
+
+    <script src="_content/Blazorise/blazorise.js"></script>
+    <script src="_content/Blazorise.Bootstrap/blazorise.bootstrap.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/UserService/Shared/NavMenu.razor b/UserService/Shared/NavMenu.razor
index d1a68c0..5e569fa 100644
--- a/UserService/Shared/NavMenu.razor
+++ b/UserService/Shared/NavMenu.razor
@@ -1,49 +1,26 @@
-<div class="top-row pl-4 navbar navbar-dark">
-    <a class="navbar-brand" href="">UserService</a>
-    <button class="navbar-toggler" @onclick="ToggleNavMenu">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-</div>
-
-
-<div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
-    <ul class="nav flex-column">
-        <li class="nav-item px-3">
-            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="oi oi-home" aria-hidden="true"></span> Home
-            </NavLink>
-        </li>
-        <li class="nav-item px-3">
-            <NavLink class="nav-link" href="users">
-                <span class="oi oi-plus" aria-hidden="true"></span> Users
-            </NavLink>
-        </li>
-        <li class="nav-item px-3">
-            <NavLink class="nav-link" href="securitygroups">
-                <span class="oi oi-plus" aria-hidden="true"></span> Security groups
-            </NavLink>
-        </li>
-        <li class="nav-item px-3">
-            <NavLink class="nav-link" href="organizationUnits">
-                <span class="oi oi-plus" aria-hidden="true"></span> Organization units
-            </NavLink>
-        </li>
-        <li class="nav-item px-3">
-            <NavLink class="nav-link" href="directory">
-                <span class="oi oi-plus" aria-hidden="true"></span> Directory
-            </NavLink>
-        </li>
-    </ul>
-</div>
+<Sidebar Data="@_sidebarInfo" />
 
 @code {
-    private bool _collapseNavMenu = true;
+    private SidebarInfo _sidebarInfo;
 
-    private string NavMenuCssClass => _collapseNavMenu ? "collapse" : null;
-
-    private void ToggleNavMenu()
+    protected override void OnInitialized()
     {
-        _collapseNavMenu = !_collapseNavMenu;
+        _sidebarInfo = new SidebarInfo
+        {
+            Brand = new SidebarBrandInfo
+            {
+                Text = "SidebarBrand",
+                To = "/"
+            }, Items = new List<SidebarItemInfo>
+            {
+                new SidebarItemInfo
+                {
+                    Text = "Directory",
+                    Icon = IconName.Folder,
+                    To = "/directory"
+                }
+            }
+        };
     }
 
 }
\ No newline at end of file
diff --git a/UserService/Shared/SurveyPrompt.razor b/UserService/Shared/SurveyPrompt.razor
deleted file mode 100644
index e9706c8..0000000
--- a/UserService/Shared/SurveyPrompt.razor
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="alert alert-secondary mt-4" role="alert">
-    <span class="oi oi-pencil mr-2" aria-hidden="true"></span>
-    <strong>@Title</strong>
-
-    <span class="text-nowrap">
-        Please take our
-        <a target="_blank" class="font-weight-bold" href="https://go.microsoft.com/fwlink/?linkid=2112271">brief survey</a>
-    </span>
-    and tell us what you think.
-</div>
-
-@code {
-    // Demonstrates how a parent component can supply parameters
-    [Parameter]
-    public string Title { get; set; }
-}
diff --git a/UserService/Startup.cs b/UserService/Startup.cs
index e43811c..b3c667e 100644
--- a/UserService/Startup.cs
+++ b/UserService/Startup.cs
@@ -1,4 +1,7 @@
 using System.Net.Http;
+using Blazorise;
+using Blazorise.Bootstrap;
+using Blazorise.Icons.FontAwesome;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -26,7 +29,13 @@ namespace UserService
             services.AddSingleton<IUsersRepository, UsersRepository>();
             services.AddSingleton<ISecurityGroupsRepository, SecurityGroupsRepository>();
             services.AddSingleton<IOrganizationUnitsRepository, OrganizationUnitsRepository>();
-            services.AddScoped<HttpClient>();
+            services
+                .AddBlazorise(options =>
+                {
+                    options.ChangeTextOnKeyPress = true; // optional
+                })
+                .AddBootstrapProviders()
+                .AddFontAwesomeIcons();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -48,6 +57,10 @@ namespace UserService
 
             app.UseRouting();
 
+            app.ApplicationServices
+                .UseBootstrapProviders()
+                .UseFontAwesomeIcons();
+
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapBlazorHub();
@@ -55,4 +68,4 @@ namespace UserService
             });
         }
     }
-}
+}
\ No newline at end of file
diff --git a/UserService/UserService.csproj b/UserService/UserService.csproj
index 1217d5d..990bac0 100644
--- a/UserService/UserService.csproj
+++ b/UserService/UserService.csproj
@@ -5,12 +5,15 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MatBlazor" Version="2.6.2" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\UserService.DatabaseLayer\UserService.DatabaseLayer.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.1.2" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.1.2" />
+    <PackageReference Include="Blazorise.Sidebar" Version="0.9.1.2" />
+    <PackageReference Include="Blazorise.TreeView" Version="0.9.1.2" />
+  </ItemGroup>
+
 </Project>
diff --git a/UserService/_Imports.razor b/UserService/_Imports.razor
index 2e8ba2a..ea8639c 100644
--- a/UserService/_Imports.razor
+++ b/UserService/_Imports.razor
@@ -7,4 +7,7 @@
 @using Microsoft.JSInterop
 @using UserService
 @using UserService.Shared
-@using MatBlazor
\ No newline at end of file
+@using Blazorise
+@using Blazorise.Sidebar
+@using Blazorise.TreeView
+
-- 
2.49.0


From 8eace42aaa53eab7376c2d239ddc3414296fd928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20B=C3=B6rchers?= <holger@boerchers.org>
Date: Mon, 3 Aug 2020 22:41:50 +0200
Subject: [PATCH 02/11] little work

---
 UserService.DatabaseLayer/Repository/BaseRepository.cs | 2 +-
 UserService/Pages/Directory.razor.cs                   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/UserService.DatabaseLayer/Repository/BaseRepository.cs b/UserService.DatabaseLayer/Repository/BaseRepository.cs
index 7df73ec..c9e58b0 100644
--- a/UserService.DatabaseLayer/Repository/BaseRepository.cs
+++ b/UserService.DatabaseLayer/Repository/BaseRepository.cs
@@ -24,7 +24,7 @@ namespace UserService.DatabaseLayer.Repository
             await using var db = new UserServiceDbContext();
 
             IQueryable<T> queryable = Context(db).Include(x => x.Parent);
-            if(queryable != null) queryable = queryable.Where(predicate);
+            if(predicate != null) queryable = queryable.Where(predicate);
             return await queryable.ToListAsync(token);
         }
 
diff --git a/UserService/Pages/Directory.razor.cs b/UserService/Pages/Directory.razor.cs
index 4a7ac5c..31b6510 100644
--- a/UserService/Pages/Directory.razor.cs
+++ b/UserService/Pages/Directory.razor.cs
@@ -26,9 +26,12 @@ namespace UserService.Pages
 
         private async void OnSelectedNodeChanged(Node? value)
         {
-            Members = await UsersRepository.GetAllAsync();
+            if (value == null) return;
+            Members = await UsersRepository.GetAllAsync(x => x.ParentId == value.Id);
         }
 
+        public IReadOnlyList<Member> Members { get; set; }
+
         [Inject] public IOrganizationUnitsRepository OuRepository { get; set; }
 
         [Inject] public IUsersRepository UsersRepository { get; set; }
-- 
2.49.0


From 5d3c64d193454f1b7cf580c53f4bc1dde78efbad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20B=C3=B6rchers?= <holgerb83@gmail.com>
Date: Tue, 4 Aug 2020 22:47:35 +0200
Subject: [PATCH 03/11] Added very nice DataGrid control

---
 UserService.DatabaseLayer/DataModels/Node.cs  |  17 ---
 UserService.DatabaseLayer/Queryable.cs        |  17 +++
 .../Repository/BaseRepository.cs              |   5 +-
 .../Repository/OrganizationUnitsRepository.cs |  50 ++++++++
 .../Repository/Repository.cs                  | 121 ------------------
 .../Repository/SecurityGroupsRepository.cs    |  11 ++
 .../Repository/UsersRepository.cs             |  11 ++
 UserService.Test/UnitTest1.cs                 |  11 +-
 UserService.db                                | Bin 40960 -> 40960 bytes
 UserService/App.razor                         |   5 +-
 UserService/Pages/Directory.razor             |  14 +-
 UserService/Pages/OrganizationUnits.razor     |  65 ----------
 UserService/Pages/OrganizationUnits.razor.cs  |  41 ------
 UserService/Pages/SecurityGroups.razor        |  58 ++-------
 UserService/Pages/Users.razor                 |  73 +++--------
 UserService/Pages/Users.razor.cs              |  12 +-
 UserService/Shared/NavMenu.razor              |  18 ++-
 UserService/Startup.cs                        |   1 -
 UserService/UserService.csproj                |   1 +
 UserService/_Imports.razor                    |   2 +-
 20 files changed, 157 insertions(+), 376 deletions(-)
 create mode 100644 UserService.DatabaseLayer/Queryable.cs
 create mode 100644 UserService.DatabaseLayer/Repository/OrganizationUnitsRepository.cs
 delete mode 100644 UserService.DatabaseLayer/Repository/Repository.cs
 create mode 100644 UserService.DatabaseLayer/Repository/SecurityGroupsRepository.cs
 create mode 100644 UserService.DatabaseLayer/Repository/UsersRepository.cs
 delete mode 100644 UserService/Pages/OrganizationUnits.razor
 delete mode 100644 UserService/Pages/OrganizationUnits.razor.cs

diff --git a/UserService.DatabaseLayer/DataModels/Node.cs b/UserService.DatabaseLayer/DataModels/Node.cs
index 5484f05..881ad38 100644
--- a/UserService.DatabaseLayer/DataModels/Node.cs
+++ b/UserService.DatabaseLayer/DataModels/Node.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 using System.Text;
 
 namespace UserService.DatabaseLayer.DataModels
@@ -9,22 +8,6 @@ namespace UserService.DatabaseLayer.DataModels
     public class OrganizationUnit : Node
     {
         public Member? Manager { get; set; }
-
-        /// <inheritdoc />
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            if (Level != 0)
-            {
-                sb.Append("|");
-            }
-
-            sb.Append('-', Level * 4);
-
-            return sb + CommonName;
-        }
-
-
     }
 
     public class SecurityGroup : Member
diff --git a/UserService.DatabaseLayer/Queryable.cs b/UserService.DatabaseLayer/Queryable.cs
new file mode 100644
index 0000000..bc15ede
--- /dev/null
+++ b/UserService.DatabaseLayer/Queryable.cs
@@ -0,0 +1,17 @@
+using System.Linq.Expressions;
+
+// ReSharper disable once CheckNamespace
+namespace System.Linq
+{
+    public static class Queryable
+    {
+        /// <summary>
+        /// Makes a where filtering, if it is not null.
+        /// </summary>
+        public static IQueryable<TSource> WhereOrDefault<TSource>(this IQueryable<TSource> source, Expression<Func<TSource, bool>>? predicate)
+        {
+            if (source == null) throw new ArgumentNullException(nameof(source));
+            return predicate is null ? source : source.Where(predicate);
+        }
+    }
+}
diff --git a/UserService.DatabaseLayer/Repository/BaseRepository.cs b/UserService.DatabaseLayer/Repository/BaseRepository.cs
index c9e58b0..32065b7 100644
--- a/UserService.DatabaseLayer/Repository/BaseRepository.cs
+++ b/UserService.DatabaseLayer/Repository/BaseRepository.cs
@@ -22,10 +22,7 @@ namespace UserService.DatabaseLayer.Repository
         public virtual async Task<IReadOnlyList<T>> GetAllAsync(Expression<Func<T, bool>>? predicate = null, CancellationToken token = default)
         {
             await using var db = new UserServiceDbContext();
-
-            IQueryable<T> queryable = Context(db).Include(x => x.Parent);
-            if(predicate != null) queryable = queryable.Where(predicate);
-            return await queryable.ToListAsync(token);
+            return await Context(db).Include(x => x.Parent).WhereOrDefault(predicate).ToListAsync(token);
         }
 
         public async Task<T?> GetAsync(Expression<Func<T, bool>> predicate, CancellationToken token = default)
diff --git a/UserService.DatabaseLayer/Repository/OrganizationUnitsRepository.cs b/UserService.DatabaseLayer/Repository/OrganizationUnitsRepository.cs
new file mode 100644
index 0000000..08e5222
--- /dev/null
+++ b/UserService.DatabaseLayer/Repository/OrganizationUnitsRepository.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using UserService.DatabaseLayer.DataModels;
+
+namespace UserService.DatabaseLayer.Repository
+{
+    public class OrganizationUnitsRepository : BaseRepository<OrganizationUnit>, IOrganizationUnitsRepository
+    {
+        public OrganizationUnitsRepository() : base(x => x.OrganizationUnits)
+        {
+        }
+
+        /// <inheritdoc cref="GetAllAsync" />
+        public override async Task<IReadOnlyList<OrganizationUnit>> GetAllAsync(
+            Expression<Func<OrganizationUnit, bool>>? predicate = null, CancellationToken token = default)
+        {
+            await using var db = new UserServiceDbContext();
+            var result = new List<OrganizationUnit>();
+            var rootOus = await Context(db)
+                .Include(x => x.Parent)
+                .WhereOrDefault(predicate)
+                .ToListAsync(cancellationToken: token);
+
+            IEnumerable<OrganizationUnit> Rec(Node node)
+            {
+                if (!(node is OrganizationUnit organizationUnit)) yield break;
+                yield return organizationUnit;
+                foreach (var ouChild in rootOus.Where(x => x.ParentId != null && x.ParentId == organizationUnit.Id))
+                {
+                    foreach (var unit in Rec(ouChild))
+                    {
+                        yield return unit;
+                    }
+                }
+            }
+
+            foreach (var ou in rootOus.Where(x => x.ParentId is null))
+            {
+                result.AddRange(Rec(ou));
+            }
+
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/UserService.DatabaseLayer/Repository/Repository.cs b/UserService.DatabaseLayer/Repository/Repository.cs
deleted file mode 100644
index 86afdd3..0000000
--- a/UserService.DatabaseLayer/Repository/Repository.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using UserService.DatabaseLayer.DataModels;
-
-namespace UserService.DatabaseLayer.Repository
-{
-    public class OrganizationUnitsRepository : BaseRepository<OrganizationUnit>, IOrganizationUnitsRepository
-    {
-        public OrganizationUnitsRepository() : base(x => x.OrganizationUnits)
-        {
-        }
-
-        /// <inheritdoc />
-        public override async Task<IReadOnlyList<OrganizationUnit>> GetAllAsync(CancellationToken token = default)
-        {
-
-
-            await using var db = new UserServiceDbContext();
-            var result = new List<OrganizationUnit>();
-            var rootOus = await Context(db)
-                .Include(x => x.Parent)
-                .ToListAsync(token);
-
-            IEnumerable<OrganizationUnit> Rec(Node node)
-            {
-                if (!(node is OrganizationUnit organizationUnit)) yield break;
-                yield return organizationUnit;
-                foreach (var ouChild in rootOus.Where(x=>x.ParentId != null && x.ParentId == organizationUnit.Id))
-                {
-                    foreach (var unit in Rec(ouChild))
-                    {
-                        yield return unit;
-                    }
-                }
-            }
-            foreach (var ou in rootOus.Where(x=> x.ParentId is null))
-            {
-                result.AddRange(Rec(ou));
-            }
-            return result;
-        }
-    }
-
-    public class SecurityGroupsRepository : BaseRepository<SecurityGroup>, ISecurityGroupsRepository
-    {
-        public SecurityGroupsRepository() : base(x=> x.SecurityGroups)
-        {
-        }
-    }
-
-
-    public class UsersRepository : BaseRepository<User>, IUsersRepository
-    {
-        public UsersRepository() : base(x => x.Users)
-        {
-        }
-    }
-
-    public class NodesRepository : INodesRepository
-    {
-        public NodesRepository()
-        {
-        }
-
-        public static async IAsyncEnumerable<Node> GetNodesAsync([EnumeratorCancellation] CancellationToken token = default)
-        {
-            await using var db = new UserServiceDbContext();
-            await foreach (var note in db.OrganizationUnits.AsAsyncEnumerable().WithCancellation(token))
-            {
-                yield return note;
-            }
-            await foreach (var node in db.SecurityGroups.AsAsyncEnumerable().WithCancellation(token))
-            {
-                yield return node;
-            }
-
-            await foreach (var node in db.Users.AsAsyncEnumerable().WithCancellation(token))
-            {
-                yield return node;
-            }
-        }
-
-        public async Task<IReadOnlyList<Node>> GetAllAsync(CancellationToken token = default)
-        {
-            
-            var list = new List<Node>();
-            await foreach (var node in GetNodesAsync(token))
-            {
-                list.Add(node);
-            }
-
-            return list;
-        }
-
-        public Task<Node?> GetAsync(Expression<Func<Node, bool>> predicate, CancellationToken token = default)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task AddAsync(Node entity, CancellationToken token = default)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task UpdateAsync(Node entity, CancellationToken token = default)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task DeleteAsync(Node entity, CancellationToken token = default)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/UserService.DatabaseLayer/Repository/SecurityGroupsRepository.cs b/UserService.DatabaseLayer/Repository/SecurityGroupsRepository.cs
new file mode 100644
index 0000000..0f4ce54
--- /dev/null
+++ b/UserService.DatabaseLayer/Repository/SecurityGroupsRepository.cs
@@ -0,0 +1,11 @@
+using UserService.DatabaseLayer.DataModels;
+
+namespace UserService.DatabaseLayer.Repository
+{
+    public class SecurityGroupsRepository : BaseRepository<SecurityGroup>, ISecurityGroupsRepository
+    {
+        public SecurityGroupsRepository() : base(x => x.SecurityGroups)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/UserService.DatabaseLayer/Repository/UsersRepository.cs b/UserService.DatabaseLayer/Repository/UsersRepository.cs
new file mode 100644
index 0000000..95421ca
--- /dev/null
+++ b/UserService.DatabaseLayer/Repository/UsersRepository.cs
@@ -0,0 +1,11 @@
+using UserService.DatabaseLayer.DataModels;
+
+namespace UserService.DatabaseLayer.Repository
+{
+    public class UsersRepository : BaseRepository<User>, IUsersRepository
+    {
+        public UsersRepository() : base(x => x.Users)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/UserService.Test/UnitTest1.cs b/UserService.Test/UnitTest1.cs
index 10d9223..4fd7428 100644
--- a/UserService.Test/UnitTest1.cs
+++ b/UserService.Test/UnitTest1.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using NUnit.Framework;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using UserService.DatabaseLayer.DataModels;
 
 namespace UserService.Test
@@ -45,7 +43,6 @@ namespace UserService.Test
             NewMethod(ous, null, 0, ref sb);
             var result = sb.ToString();
             Assert.Pass();
-
         }
 
         private static void NewMethod(IEnumerable<OrganizationUnit> ous, Node parent, int level, ref StringBuilder sb)
diff --git a/UserService.db b/UserService.db
index a58f715c4fe64657c72fe9d82a82469b3d78bf70..0dafeee3a7baea65d68fcf3ce55865aec5426161 100644
GIT binary patch
delta 154
zcmZoTz|?SnX#<M^Ge587WOf5tCSJ+Sf&!m;OpQ6X8N?YFMUBNJIT;F4OHzyeg%+n4
zfmwPvrNt$g=?+yXX?iKC0U${qu*haV+l@ku9Ge1I6h!#>7c=tT<p0LMp8pB|2mV+5
z_xKlY7AxrHXJch%Wc<f5d1ZYxGe7^<$?OfXO#EAcw)XS0vM@6+a%|q!?<N2M_cbpQ

delta 82
zcmZoTz|?SnX#<M^Gas+tWOf7D&4L12yqo=OHwrPbZwg>h5aQ!s$;f|`{~P~${wMq&
m_+Rng+bmJg%|9`KWAe)SXl6eCU6a`xK-#A9Z{F4KCIA2(xElfh

diff --git a/UserService/App.razor b/UserService/App.razor
index ece7489..9c5b0e0 100644
--- a/UserService/App.razor
+++ b/UserService/App.razor
@@ -1,5 +1,4 @@
-
-<CascadingAuthenticationState>
+<CascadingAuthenticationState>
     <Router AppAssembly="@typeof(Program).Assembly">
         <Found Context="routeData">
             <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
@@ -10,4 +9,4 @@
             </LayoutView>
         </NotFound>
     </Router>
-</CascadingAuthenticationState>
+</CascadingAuthenticationState>
\ No newline at end of file
diff --git a/UserService/Pages/Directory.razor b/UserService/Pages/Directory.razor
index 39bb61c..a7eed1e 100644
--- a/UserService/Pages/Directory.razor
+++ b/UserService/Pages/Directory.razor
@@ -1,14 +1,6 @@
 @page "/directory"
-@using UserService.DatabaseLayer.Repository
-@inject IOrganizationUnitsRepository OuRepository
 @inherits DirectoryBase
 
-@functions {
-
-
-
-}
-
 <Row>
     <Column ColumnSize="ColumnSize.Is12">
         <h1>TODO</h1>
@@ -29,12 +21,12 @@ else
                       HasChildNodes="@(item => item?.Children?.Any() == true)"
                       @bind-SelectedNode="@SelectedNode">
                 <NodeContent>
-                    <Icon Name="IconName.Folder"/>
+                    <Icon Name="IconName.Folder" />
                     @context?.CommonName
-                </NodeContent> </TreeView>
+                </NodeContent>
+            </TreeView>
         </Column>
         <Column ColumnSize="ColumnSize.Is4">
-
         </Column>
     </Row>
 
diff --git a/UserService/Pages/OrganizationUnits.razor b/UserService/Pages/OrganizationUnits.razor
deleted file mode 100644
index ff8896c..0000000
--- a/UserService/Pages/OrganizationUnits.razor
+++ /dev/null
@@ -1,65 +0,0 @@
-@page "/organizationUnits"
-@using UserService.DatabaseLayer.DataModels
-@inherits OrganizationUnitsBase
-
-<h1>List of all organization units</h1>
-
-@if (OrganizationUnits is null)
-{
-    <p>
-        <em>Loading...</em>
-    </p>
-}
-else
-{
-
-
-
-    @*<MatTable Items="@OrganizationUnits" class="mat-elevation-z5">
-            <MatTableHeader>
-                <th style="width: 20%">Common Name</th>
-                <th style="width: 20%">Description</th>
-                <th style="width: 20%">Parent</th>
-                <th style="width: auto">Manager</th>
-                <th style="width: auto"> </th>
-                <th style="width: auto"> </th>
-            </MatTableHeader>
-            <MatTableRow>
-                <td>@context.CommonName</td>
-                <td>@context.Description</td>
-                <td>@context.Parent</td>
-                <td>@context.Manager</td>
-                <td>
-                    <a href="organizationUnits" @onclick="@(e => Edit(context))">edit</a>
-                </td>
-                <td>
-                    <a href="organizationUnits" @onclick="@(e => Delete(context))">delete</a>
-                </td>
-            </MatTableRow>
-        </MatTable>*@
-
-    <MatButton @onclick="@(e => Edit(new OrganizationUnit()))">Create organization unit</MatButton>
-}
-
-@*<MatDialog @bind-IsOpen="@DialogIsOpen">
-    @if (OuToEdit != null)
-    {
-        <MatDialogTitle>@(OuToEdit.Id == 0 ? "New" : "Edit") @OuToEdit.CommonName (@OuToEdit.Id)</MatDialogTitle>
-        <MatDialogContent>
-            <MatTextField Label="Common name" @bind-Value="@OuToEdit.CommonName" ReadOnly="@(OuToEdit.Id != 0)"/>
-            <p/>
-            <MatTextField Label="Description" @bind-Value="@OuToEdit.Description"/>
-            @*<MatTextField Label="Manager" @bind-Value="@OuToEdit.Manager"/>*@
-@*<p />
-    <MatSelectItem Items="@OrganizationUnits" Label="Parent" @bind-Value="@OuToEdit.Parent" />
-            </MatDialogContent>
-        }
-        else
-        {
-    <MatDialogTitle>No securityGroup selected</MatDialogTitle>
-        }
-    <MatDialogActions>
-        <MatButton OnClick="@(e => { DialogIsOpen = false; })">No Thanks</MatButton>
-        <MatButton OnClick="@OkClick">OK</MatButton>
-    </MatDialogActions>
-    </MatDialog>*@
\ No newline at end of file
diff --git a/UserService/Pages/OrganizationUnits.razor.cs b/UserService/Pages/OrganizationUnits.razor.cs
deleted file mode 100644
index 637a122..0000000
--- a/UserService/Pages/OrganizationUnits.razor.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
-using UserService.DatabaseLayer.DataModels;
-using UserService.DatabaseLayer.Repository;
-
-namespace UserService.Pages
-{
-    public class OrganizationUnitsBase : ComponentBase
-    {
-        [Inject] private IOrganizationUnitsRepository OrganizationUnitsRepository { get; set; } = null!;
-
-        protected bool DialogIsOpen { get; set; }
-        protected OrganizationUnit? OuToEdit { get; private set; }
-
-        protected IReadOnlyList<OrganizationUnit>? OrganizationUnits { get; private set; }
-
-        protected override async Task OnInitializedAsync()
-        {
-            OrganizationUnits = await OrganizationUnitsRepository.GetAllAsync().ConfigureAwait(false);
-        }
-
-        protected void Edit(OrganizationUnit organizationUnit)
-        {
-            DialogIsOpen = true;
-            OuToEdit = organizationUnit;
-        }
-
-        protected async Task OkClick()
-        {
-            if (OuToEdit is null) return;
-            await OrganizationUnitsRepository.UpdateAsync(OuToEdit).ConfigureAwait(false);
-            DialogIsOpen = false;
-        }
-
-        protected async Task Delete(OrganizationUnit organizationUnit)
-        {
-            await OrganizationUnitsRepository.DeleteAsync(organizationUnit).ConfigureAwait(false);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UserService/Pages/SecurityGroups.razor b/UserService/Pages/SecurityGroups.razor
index 0904a02..e21b1e7 100644
--- a/UserService/Pages/SecurityGroups.razor
+++ b/UserService/Pages/SecurityGroups.razor
@@ -1,59 +1,21 @@
 @page "/securitygroups"
 @using UserService.DatabaseLayer.DataModels
-@using UserService.DatabaseLayer.Repository
 @inherits SecurityGroupsBase
 
 <h1>Table of all security groups</h1>
 
 @if (SecurityGroups is null)
 {
-    <p>
-        <em>Loading...</em>
-    </p>
+<p>
+    <em>Loading...</em>
+</p>
 }
 else
 {
-    @*<MatTable Items="@SecurityGroups" class="mat-elevation-z5">
-            <MatTableHeader>
-                <th style="width: 30%">Common Name</th>
-                <th style="width: 20%">Description</th>
-                <th style="width: 20%">E-Mail</th>
-                <th style="width: 20%">Parent</th>
-                <th style="width: auto"> </th>
-                <th style="width: auto"> </th>
-            </MatTableHeader>
-            <MatTableRow>
-                <td>@context.CommonName</td>
-                <td>@context.Description</td>
-                <td>@context.EMail</td>
-                <td>@context.Parent</td>
-                <td><a href="securitygroups" @onclick="@(e => EditSecurityGroup(context))">edit</a></td>
-                <td><a href="securitygroups" @onclick="@(e => DeleteSecurityGroup(context))">delete</a></td>
-
-                </MatTableRow>
-        </MatTable>
-        <MatButton @onclick="@(e => EditSecurityGroup(new SecurityGroup()))">Create new group</MatButton>*@
-}
-
-@*<MatDialog @bind-IsOpen="@DialogIsOpen">
-        @if (SecurityGroupToEdit != null)
-        {
-            <MatDialogTitle>@(SecurityGroupToEdit.Id == 0 ? "New" : "Edit") @SecurityGroupToEdit.CommonName (@SecurityGroupToEdit.Id)</MatDialogTitle>
-            <MatDialogContent>
-                <MatTextField Label="Common name" @bind-Value="@SecurityGroupToEdit.CommonName" ReadOnly="@(SecurityGroupToEdit.Id != 0)"></MatTextField>
-                <p />
-                <MatTextField Label="Description" @bind-Value="@SecurityGroupToEdit.Description"></MatTextField>
-                <MatTextField Label="E-Mail" @bind-Value="@SecurityGroupToEdit.EMail"></MatTextField>
-                <p />
-                <MatSelectItem Items="@OrganizationUnits" Label="Parent" @bind-Value="@SecurityGroupToEdit.Parent"></MatSelectItem>
-            </MatDialogContent>
-        }
-        else
-        {
-            <MatDialogTitle>No securityGroup selected</MatDialogTitle>
-        }
-        <MatDialogActions>
-            <MatButton OnClick="@(e => { DialogIsOpen = false; })">No Thanks</MatButton>
-            <MatButton OnClick="@OkClick">OK</MatButton>
-        </MatDialogActions>
-    </MatDialog>*@
\ No newline at end of file
+<DataGrid TItem="SecurityGroup" Data="@SecurityGroups">
+    <DataGridCommandColumn TItem="User" />
+    <DataGridColumn TItem="SecurityGroup" Field="@nameof(SecurityGroup.Id)" Caption="#" Sortable="false" />
+    <DataGridColumn TItem="SecurityGroup" Field="@nameof(SecurityGroup.CommonName)" Caption="CN" Editable="true" />
+    <DataGridColumn TItem="SecurityGroup" Field="@nameof(SecurityGroup.EMail)" Caption="EMail" Editable="true" />
+</DataGrid>
+}
\ No newline at end of file
diff --git a/UserService/Pages/Users.razor b/UserService/Pages/Users.razor
index 77ac95a..ed95eb6 100644
--- a/UserService/Pages/Users.razor
+++ b/UserService/Pages/Users.razor
@@ -12,55 +12,24 @@
 }
 else
 {
-    @*<MatTable Items="@Users" class="mat-elevation-z5">
-            <MatTableHeader>
-                <th style="width: 20%">Common Name</th>
-                <th style="width: 30%">Full name</th>
-                <th style="width: 20%">Description</th>
-                <th style="width: 20%">E-Mail</th>
-                <th style="width: 20%">Parent</th>
-                <th style="width: auto">Is active</th>
-                <th style="width: auto"> </th>
-                <th style="width: auto"> </th>
-            </MatTableHeader>
-            <MatTableRow>
-                <td>@context.CommonName</td>
-                <td>@context.FullName</td>
-                <td>@context.Description</td>
-                <td>@context.EMail</td>
-                <td>@context.Parent</td>
-                <td>@context.IsActive</td>
-                <td><a href="users" @onclick="@(e => EditUser(context))">edit</a></td>
-                <td><a href="users" @onclick="@(e => DeleteUser(context))">delete</a></td>
-            </MatTableRow>
-        </MatTable>
-
-        <MatButton @onclick="@(e => EditUser(new User()))">Create user</MatButton>*@
-}
-
-@*<MatDialog @bind-IsOpen="@DialogIsOpen">
-        @if (UserToEdit != null)
-        {
-            <MatDialogTitle>@(UserToEdit.Id == 0 ? "New" : "Edit") @UserToEdit.CommonName (@UserToEdit.Id)</MatDialogTitle>
-            <MatDialogContent>
-                <MatTextField Label="Common name" @bind-Value="@UserToEdit.CommonName" ReadOnly="@(UserToEdit.Id != 0)" />
-                <MatSlideToggle Label="Is active" @bind-Value="@UserToEdit.IsActive" />
-                <p />
-                <MatTextField Label="First name" @bind-Value="@UserToEdit.FirstName" />
-                <MatTextField Label="Last name" @bind-Value="@UserToEdit.LastName" />
-                <p />
-                <MatTextField Label="Description" @bind-Value="@UserToEdit.Description" />
-                <MatTextField Label="E-Mail" @bind-Value="@UserToEdit.EMail" />
-                <p />
-                <MatSelectItem  Items="@OrganizationUnits" TItem="Node" Label="Parent" @bind-Value="@UserToEdit.Parent" />
-            </MatDialogContent>
-        }
-        else
-        {
-            <MatDialogTitle>No securityGroup selected</MatDialogTitle>
-        }
-        <MatDialogActions>
-            <MatButton OnClick="@(e => { DialogIsOpen = false; })">No Thanks</MatButton>
-            <MatButton OnClick="@OkClick">OK</MatButton>
-        </MatDialogActions>
-    </MatDialog>*@
\ No newline at end of file
+    <DataGrid TItem="User" Editable="true" EditMode="DataGridEditMode.Inline" Data="@Users" RowInserted="@RowInsertedCallback">
+        <DataGridCommandColumn TItem="User">
+            <NewCommandTemplate>
+                <Button Color="Color.Success" Clicked="@context.Clicked">New</Button>
+            </NewCommandTemplate>
+            <EditCommandTemplate>
+                <Button Color="Color.Primary" Clicked="@context.Clicked">Edit</Button>
+            </EditCommandTemplate>
+            <DeleteCommandTemplate>
+                <Button Color="Color.Danger" Clicked="@context.Clicked">Delete</Button>
+            </DeleteCommandTemplate>
+        </DataGridCommandColumn>
+        <DataGridColumn TItem="User" Field="@nameof(User.Id)" Caption="#" Sortable="false"/>
+        <DataGridColumn TItem="User" Field="@nameof(User.CommonName)" Caption="CN" CellsEditableOnEditCommand="false" Editable="true"/>
+        <DataGridColumn TItem="User" Field="@nameof(User.FirstName)" Caption="First Name" Editable="true"/>
+        <DataGridColumn TItem="User" Field="@nameof(User.LastName)" Caption="Last Name" Editable="true"/>
+        <DataGridColumn TItem="User" Field="@nameof(User.EMail)" Caption="EMail" Editable="true"/>
+        <DataGridColumn TItem="User" Field="@nameof(User.Parent)" Caption="Parent" Editable="false"/>
+        <DataGridCheckColumn TItem="User" Field="@nameof(User.IsActive)" Caption="Active" Editable="true"/>
+    </DataGrid>
+}
\ No newline at end of file
diff --git a/UserService/Pages/Users.razor.cs b/UserService/Pages/Users.razor.cs
index 8aac50e..0c712a9 100644
--- a/UserService/Pages/Users.razor.cs
+++ b/UserService/Pages/Users.razor.cs
@@ -1,6 +1,7 @@
-using System.Collections.Generic;
+using Microsoft.AspNetCore.Components;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
+using Blazorise.DataGrid;
 using UserService.DatabaseLayer.DataModels;
 using UserService.DatabaseLayer.Repository;
 
@@ -40,5 +41,12 @@ namespace UserService.Pages
         {
             await UsersRepository.DeleteAsync(user).ConfigureAwait(false);
         }
+
+        protected async Task RowInsertedCallback(SavedRowItem<User, Dictionary<string, object>> obj)
+        {
+            var user = obj.Item;
+            user.ParentId = -2;
+            await UsersRepository.AddAsync(user);
+        }
     }
 }
\ No newline at end of file
diff --git a/UserService/Shared/NavMenu.razor b/UserService/Shared/NavMenu.razor
index 5e569fa..3fb8567 100644
--- a/UserService/Shared/NavMenu.razor
+++ b/UserService/Shared/NavMenu.razor
@@ -9,18 +9,30 @@
         {
             Brand = new SidebarBrandInfo
             {
-                Text = "SidebarBrand",
+                Text = "User service",
                 To = "/"
-            }, Items = new List<SidebarItemInfo>
+            },
+            Items = new List<SidebarItemInfo>
             {
                 new SidebarItemInfo
                 {
                     Text = "Directory",
                     Icon = IconName.Folder,
                     To = "/directory"
+                },
+                new SidebarItemInfo
+                {
+                    Text = "Users",
+                    Icon = IconName.Users,
+                    To = "/users"
+                },
+                new SidebarItemInfo
+                {
+                    Text = "Security groups",
+                    Icon = IconName.Book,
+                    To = "/securitygroups"
                 }
             }
         };
     }
-
 }
\ No newline at end of file
diff --git a/UserService/Startup.cs b/UserService/Startup.cs
index b3c667e..dfd5430 100644
--- a/UserService/Startup.cs
+++ b/UserService/Startup.cs
@@ -1,4 +1,3 @@
-using System.Net.Http;
 using Blazorise;
 using Blazorise.Bootstrap;
 using Blazorise.Icons.FontAwesome;
diff --git a/UserService/UserService.csproj b/UserService/UserService.csproj
index 990bac0..ebd1211 100644
--- a/UserService/UserService.csproj
+++ b/UserService/UserService.csproj
@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Blazorise.Bootstrap" Version="0.9.1.2" />
+    <PackageReference Include="Blazorise.DataGrid" Version="0.9.1.2" />
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.1.2" />
     <PackageReference Include="Blazorise.Sidebar" Version="0.9.1.2" />
     <PackageReference Include="Blazorise.TreeView" Version="0.9.1.2" />
diff --git a/UserService/_Imports.razor b/UserService/_Imports.razor
index ea8639c..8a87504 100644
--- a/UserService/_Imports.razor
+++ b/UserService/_Imports.razor
@@ -10,4 +10,4 @@
 @using Blazorise
 @using Blazorise.Sidebar
 @using Blazorise.TreeView
-
+@using Blazorise.DataGrid
-- 
2.49.0


From 07f466d74b909152bf9fdcd386382351a33567a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20B=C3=B6rchers?= <holgerb83@gmail.com>
Date: Thu, 6 Aug 2020 20:31:48 +0200
Subject: [PATCH 04/11] modified user view

---
 UserService.db                | Bin 40960 -> 40960 bytes
 UserService/Pages/Users.razor |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/UserService.db b/UserService.db
index 0dafeee3a7baea65d68fcf3ce55865aec5426161..52aa9e57426b1a08190f8baa5a0289305d763cd3 100644
GIT binary patch
delta 159
zcmZoTz|?SnX#<M^vjES-$?OL5Ogs-a3kvMyu`uK0W)Njy6txzW=48l9OwRrnTAW%0
zV(6tL=4Gbl6g#Bmr4}XU=jo-SdI5!9AflTkZJ!A-a&8J>Q4ka0pUcR9lm8q4dj2Q;
zANXJK-{W7*KX<c4K{G!aD>EbGKhDXE>l2v;_%}>uZ;)r=-vG3_gP)a!nSqgW^VWWE
F0RWHSF|Yst

delta 88
zcmZoTz|?SnX#<M^Ge587WOf7j&4L1-c{WShJ`-Z(*c8B`Ai~eTn34Y`|2O{i{7?8l
s@W0}}$G>>9R6#TU!~l-Ti|Z4a`T4g_W^Vv#?B}1np`T^*&VF|R0PJxd4*&oF

diff --git a/UserService/Pages/Users.razor b/UserService/Pages/Users.razor
index ed95eb6..a0cfbc3 100644
--- a/UserService/Pages/Users.razor
+++ b/UserService/Pages/Users.razor
@@ -15,13 +15,13 @@ else
     <DataGrid TItem="User" Editable="true" EditMode="DataGridEditMode.Inline" Data="@Users" RowInserted="@RowInsertedCallback">
         <DataGridCommandColumn TItem="User">
             <NewCommandTemplate>
-                <Button Color="Color.Success" Clicked="@context.Clicked">New</Button>
+                <Button Color="Color.Success" Clicked="@context.Clicked" title="Create user"><i class="fa fa-user-plus"></i></Button>
             </NewCommandTemplate>
             <EditCommandTemplate>
-                <Button Color="Color.Primary" Clicked="@context.Clicked">Edit</Button>
+                <Button Color="Color.Primary" Clicked="@context.Clicked" title="Edit user"><i class="fa fa-user-edit"></i></Button>
             </EditCommandTemplate>
             <DeleteCommandTemplate>
-                <Button Color="Color.Danger" Clicked="@context.Clicked">Delete</Button>
+                <Button Color="Color.Danger" Clicked="@context.Clicked" title="Delete user"><i class="fa fa-user-minus"></i></Button>
             </DeleteCommandTemplate>
         </DataGridCommandColumn>
         <DataGridColumn TItem="User" Field="@nameof(User.Id)" Caption="#" Sortable="false"/>
-- 
2.49.0


From d58a8702b33cb3f456ae7dc4dee5fad136999934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20B=C3=B6rchers?= <holgerb83@gmail.com>
Date: Thu, 6 Aug 2020 22:57:25 +0200
Subject: [PATCH 05/11] little modifications to users

---
 .idea/.idea.UserService/.idea/indexLayout.xml |   8 +++
 .idea/.idea.UserService/.idea/modules.xml     |   8 +++
 .../.idea/projectSettingsUpdater.xml          |   6 +++
 .idea/.idea.UserService/.idea/vcs.xml         |   6 +++
 .idea/.idea.UserService/riderModule.iml       |  15 ++++++
 UserService.DatabaseLayer/DataModels/Node.cs  |   2 +-
 .../Repository/BaseRepository.cs              |   5 +-
 .../Repository/IRepository.cs                 |   2 +-
 UserService.db                                | Bin 40960 -> 40960 bytes
 UserService/Pages/Users.razor                 |   4 +-
 UserService/Pages/Users.razor.cs              |  46 +++++++++---------
 11 files changed, 74 insertions(+), 28 deletions(-)
 create mode 100644 .idea/.idea.UserService/.idea/indexLayout.xml
 create mode 100644 .idea/.idea.UserService/.idea/modules.xml
 create mode 100644 .idea/.idea.UserService/.idea/projectSettingsUpdater.xml
 create mode 100644 .idea/.idea.UserService/.idea/vcs.xml
 create mode 100644 .idea/.idea.UserService/riderModule.iml

diff --git a/.idea/.idea.UserService/.idea/indexLayout.xml b/.idea/.idea.UserService/.idea/indexLayout.xml
new file mode 100644
index 0000000..27ba142
--- /dev/null
+++ b/.idea/.idea.UserService/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ContentModelUserStore">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.UserService/.idea/modules.xml b/.idea/.idea.UserService/.idea/modules.xml
new file mode 100644
index 0000000..9ed9bc0
--- /dev/null
+++ b/.idea/.idea.UserService/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.UserService/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.UserService/riderModule.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.UserService/.idea/projectSettingsUpdater.xml b/.idea/.idea.UserService/.idea/projectSettingsUpdater.xml
new file mode 100644
index 0000000..4bb9f4d
--- /dev/null
+++ b/.idea/.idea.UserService/.idea/projectSettingsUpdater.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderProjectSettingsUpdater">
+    <option name="vcsConfiguration" value="2" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.UserService/.idea/vcs.xml b/.idea/.idea.UserService/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/.idea.UserService/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.UserService/riderModule.iml b/.idea/.idea.UserService/riderModule.iml
new file mode 100644
index 0000000..19473e1
--- /dev/null
+++ b/.idea/.idea.UserService/riderModule.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RIDER_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$USER_HOME$/.nuget/packages/microsoft.net.test.sdk/16.6.1/build/netcoreapp2.1" />
+    <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.6.1/build/netcoreapp2.1/x64/testhost.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.6.1/build/netcoreapp2.1/x64/testhost.exe" />
+    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/NUnit3.TestAdapter.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/NUnit3.TestAdapter.pdb" />
+    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/nunit.engine.api.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/nunit.engine.core.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/nunit.engine.dll" />
+    <content url="file://$MODULE_DIR$/../.." />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/UserService.DatabaseLayer/DataModels/Node.cs b/UserService.DatabaseLayer/DataModels/Node.cs
index 881ad38..c5b63f1 100644
--- a/UserService.DatabaseLayer/DataModels/Node.cs
+++ b/UserService.DatabaseLayer/DataModels/Node.cs
@@ -52,7 +52,7 @@ namespace UserService.DatabaseLayer.DataModels
         public Node? Parent { get; set; } //Parent
         public int? ParentId { get; set; }
 
-        public override string ToString() => $"[{GetType().Name}] {Id:D5} {CommonName}";
+        public override string ToString() => CommonName;
 
         public int Level => Parent?.Level + 1 ?? 0;
 
diff --git a/UserService.DatabaseLayer/Repository/BaseRepository.cs b/UserService.DatabaseLayer/Repository/BaseRepository.cs
index 32065b7..2df2c97 100644
--- a/UserService.DatabaseLayer/Repository/BaseRepository.cs
+++ b/UserService.DatabaseLayer/Repository/BaseRepository.cs
@@ -38,11 +38,12 @@ namespace UserService.DatabaseLayer.Repository
             await db.SaveChangesAsync(token);
         }
 
-        public async Task UpdateAsync(T entity, CancellationToken token = default)
+        public async Task<bool> UpdateAsync(T entity, CancellationToken token = default)
         {
             await using var db = new UserServiceDbContext();
             Context(db).Update(entity);
-            await db.SaveChangesAsync(token);
+            var items= await db.SaveChangesAsync(token);
+            return items > 0;
         }
 
         public async Task DeleteAsync(T entity, CancellationToken token = default)
diff --git a/UserService.DatabaseLayer/Repository/IRepository.cs b/UserService.DatabaseLayer/Repository/IRepository.cs
index 189c21a..5a95ac4 100644
--- a/UserService.DatabaseLayer/Repository/IRepository.cs
+++ b/UserService.DatabaseLayer/Repository/IRepository.cs
@@ -13,7 +13,7 @@ namespace UserService.DatabaseLayer.Repository
         Task<IReadOnlyList<T>> GetAllAsync(Expression<Func<T, bool>>? predicate = null, CancellationToken token = default);
         Task<T?> GetAsync(Expression<Func<T, bool>> predicate, CancellationToken token = default);
         Task AddAsync(T entity, CancellationToken token = default);
-        Task UpdateAsync(T entity, CancellationToken token = default);
+        Task<bool> UpdateAsync(T entity, CancellationToken token = default);
         Task DeleteAsync(T entity, CancellationToken token = default);
     }
 
diff --git a/UserService.db b/UserService.db
index 52aa9e57426b1a08190f8baa5a0289305d763cd3..dd1435b74729284c613821714f65c7bf236939c2 100644
GIT binary patch
delta 98
zcmV-o0G<DUzyg540<Z)y0}l-uvj;HR3<M4*064SdJRdV84-caO57`g)53dj85AYA_
z58e->57H0854#Vw52+8$562J3vk?$=4+IbU00xtxe`5m=54E!gfT<4z00005v$T&)
E5H@-sM*si-

delta 98
zcmV-o0G<DUzyg540<Z)y0}u@1vj;HR3<Nd_3jnj_JRdV85D%RJ57`g)53dj85AYA_
z58e->51kLv55W(+548`e56ut9vk?$=4+I4R0RfYte`5m>53sWbfT<4z1Oos8v$T&)
E5KIgowg3PC

diff --git a/UserService/Pages/Users.razor b/UserService/Pages/Users.razor
index a0cfbc3..d420664 100644
--- a/UserService/Pages/Users.razor
+++ b/UserService/Pages/Users.razor
@@ -12,7 +12,7 @@
 }
 else
 {
-    <DataGrid TItem="User" Editable="true" EditMode="DataGridEditMode.Inline" Data="@Users" RowInserted="@RowInsertedCallback">
+    <DataGrid TItem="User" Editable="true" EditMode="DataGridEditMode.Inline" RowRemoving="RowDeletingCallback" Data="@Users" RowInserted="RowInsertedCallback" RowUpdating="RowUpdatingCallback">
         <DataGridCommandColumn TItem="User">
             <NewCommandTemplate>
                 <Button Color="Color.Success" Clicked="@context.Clicked" title="Create user"><i class="fa fa-user-plus"></i></Button>
@@ -29,7 +29,7 @@ else
         <DataGridColumn TItem="User" Field="@nameof(User.FirstName)" Caption="First Name" Editable="true"/>
         <DataGridColumn TItem="User" Field="@nameof(User.LastName)" Caption="Last Name" Editable="true"/>
         <DataGridColumn TItem="User" Field="@nameof(User.EMail)" Caption="EMail" Editable="true"/>
-        <DataGridColumn TItem="User" Field="@nameof(User.Parent)" Caption="Parent" Editable="false"/>
+        <DataGridSelectColumn TItem="User" Field="@nameof(User.Parent)" Caption="Parent" Editable="true"/>
         <DataGridCheckColumn TItem="User" Field="@nameof(User.IsActive)" Caption="Active" Editable="true"/>
     </DataGrid>
 }
\ No newline at end of file
diff --git a/UserService/Pages/Users.razor.cs b/UserService/Pages/Users.razor.cs
index 0c712a9..cc16240 100644
--- a/UserService/Pages/Users.razor.cs
+++ b/UserService/Pages/Users.razor.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Blazorise.DataGrid;
+using Microsoft.JSInterop;
 using UserService.DatabaseLayer.DataModels;
 using UserService.DatabaseLayer.Repository;
 
@@ -12,8 +13,7 @@ namespace UserService.Pages
         [Inject] private IUsersRepository UsersRepository { get; set; } = null!;
         [Inject] private IOrganizationUnitsRepository OrganizationUnitsRepository { get; set; } = null!;
 
-        protected bool DialogIsOpen { get; set; }
-        protected User? UserToEdit { get; private set; }
+        [Inject] private IJSRuntime JsRuntime { get; set; } = null!;
 
         protected IReadOnlyList<User>? Users { get; private set; }
         protected IReadOnlyList<OrganizationUnit>? OrganizationUnits { get; private set; }
@@ -24,29 +24,31 @@ namespace UserService.Pages
             OrganizationUnits = await OrganizationUnitsRepository.GetAllAsync().ConfigureAwait(false);
         }
 
-        protected void EditUser(User user)
+        protected async Task RowInsertedCallback(SavedRowItem<User, Dictionary<string, object>> arg)
         {
-            DialogIsOpen = true;
-            UserToEdit = user;
-        }
-
-        protected async Task OkClick()
-        {
-            if (UserToEdit is null) return;
-            await UsersRepository.UpdateAsync(UserToEdit).ConfigureAwait(false);
-            DialogIsOpen = false;
-        }
-
-        protected async Task DeleteUser(User user)
-        {
-            await UsersRepository.DeleteAsync(user).ConfigureAwait(false);
-        }
-
-        protected async Task RowInsertedCallback(SavedRowItem<User, Dictionary<string, object>> obj)
-        {
-            var user = obj.Item;
+            var user = arg.Item;
             user.ParentId = -2;
             await UsersRepository.AddAsync(user);
         }
+
+        protected async Task RowDeletingCallback(CancellableRowChange<User> arg)
+        {
+            var confirmed = await JsRuntime.InvokeAsync<bool>("confirm",
+                $"You are about to delete the user {arg.Item.FullName}. Are you sure?").ConfigureAwait(false);
+            if (confirmed)
+            {
+                await UsersRepository.DeleteAsync(arg.Item).ConfigureAwait(false);
+                return;
+            }
+
+            arg.Cancel = true;
+        }
+        
+            protected async Task RowUpdatingCallback(CancellableRowChange<User, Dictionary<string, object>> arg)
+            {
+                var result = await UsersRepository.UpdateAsync(arg.Item);
+                arg.Cancel = !result;
+            }
+
     }
 }
\ No newline at end of file
-- 
2.49.0


From fc5c6d0ce779f31e0f3dbf062f6271377e63b3b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20B=C3=B6rchers?= <holgerb83@gmail.com>
Date: Sat, 8 Aug 2020 20:03:57 +0200
Subject: [PATCH 06/11] Try to make parent editable

---
 UserService/Pages/Users.razor | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/UserService/Pages/Users.razor b/UserService/Pages/Users.razor
index d420664..344483d 100644
--- a/UserService/Pages/Users.razor
+++ b/UserService/Pages/Users.razor
@@ -29,7 +29,27 @@ else
         <DataGridColumn TItem="User" Field="@nameof(User.FirstName)" Caption="First Name" Editable="true"/>
         <DataGridColumn TItem="User" Field="@nameof(User.LastName)" Caption="Last Name" Editable="true"/>
         <DataGridColumn TItem="User" Field="@nameof(User.EMail)" Caption="EMail" Editable="true"/>
-        <DataGridSelectColumn TItem="User" Field="@nameof(User.Parent)" Caption="Parent" Editable="true"/>
+        <DataGridSelectColumn TItem="User" Field="@nameof(User.Parent)" Caption="Parent" Editable="true">
+            <DisplayTemplate>
+                @{
+                    var name = ((User) context).Parent?.CommonName ?? "-";
+                    @name
+                }
+
+            </DisplayTemplate>
+            <EditTemplate>
+                @{
+                    <Blazorise.SelectEdit TValue="User" SelectedValue="@((User)(context.CellValue))" SelectedValueChanged="@(v => context.CellValue = v)">
+                    @foreach (var item in OrganizationUnits)
+                    {
+
+                        <SelectItem TValue="OrganizationUnit" Value="@(item)">@item.CommonName</SelectItem>
+                    }
+                    </Blazorise.SelectEdit>
+                }
+
+            </EditTemplate>
+        </DataGridSelectColumn>
         <DataGridCheckColumn TItem="User" Field="@nameof(User.IsActive)" Caption="Active" Editable="true"/>
     </DataGrid>
 }
\ No newline at end of file
-- 
2.49.0


From 23da5583fd0b065ea8f222c61f0e878c6f574820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20B=C3=B6rchers?= <holger@boerchers.org>
Date: Thu, 13 Aug 2020 22:53:44 +0200
Subject: [PATCH 07/11] Added FxCop and get Organization Unit selection running

---
 .editorconfig                                 |   4 ++++
 .../DataModels/ModelBuilderExtensions.cs      |   7 ++++++-
 UserService.DatabaseLayer/DataModels/Node.cs  |   4 ++--
 .../Repository/BaseRepository.cs              |  14 +++++++-------
 .../Repository/OrganizationUnitsRepository.cs |   2 +-
 .../UserService.DatabaseLayer.csproj          |   8 ++++++--
 UserService.Test/UnitTest1.cs                 |  10 +++++-----
 UserService.Test/UserService.Test.csproj      |   8 ++++++--
 UserService.db                                | Bin 40960 -> 40960 bytes
 UserService.sln                               |   5 +++++
 UserService/Pages/Directory.razor.cs          |  11 +++++------
 UserService/Pages/SecurityGroups.razor        |   4 ++--
 UserService/Pages/SecurityGroups.razor.cs     |  14 +++++++-------
 UserService/Pages/Users.razor                 |  15 +++++++--------
 UserService/Pages/Users.razor.cs              |  15 +++++++++++----
 UserService/Startup.cs                        |   2 ++
 UserService/UserService.csproj                |   8 ++++++++
 17 files changed, 84 insertions(+), 47 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..3d25c9a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,4 @@
+[*.cs]
+
+# CA1822: Member als statisch markieren
+dotnet_diagnostic.CA1822.severity = suggestion
diff --git a/UserService.DatabaseLayer/DataModels/ModelBuilderExtensions.cs b/UserService.DatabaseLayer/DataModels/ModelBuilderExtensions.cs
index d06cd66..68710ae 100644
--- a/UserService.DatabaseLayer/DataModels/ModelBuilderExtensions.cs
+++ b/UserService.DatabaseLayer/DataModels/ModelBuilderExtensions.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using System;
+using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 
 namespace UserService.DatabaseLayer.DataModels
@@ -7,6 +8,7 @@ namespace UserService.DatabaseLayer.DataModels
     {
         public static void Seed(this ModelBuilder modelBuilder)
         {
+            if (modelBuilder == null) throw new ArgumentNullException(nameof(modelBuilder));
             var groups = new OrganizationUnit { CommonName = "Groups", Id = -1 };
             var users = new OrganizationUnit { CommonName = "Users", Id = -2 };
             var germany = new OrganizationUnit{CommonName = "Germany", Id = -6, ParentId = -2};
@@ -25,6 +27,7 @@ namespace UserService.DatabaseLayer.DataModels
 
         public static void CreateRelations(this ModelBuilder modelBuilder)
         {
+            if (modelBuilder == null) throw new ArgumentNullException(nameof(modelBuilder));
             modelBuilder.Entity<UserMember>()
                 .HasKey(bc => new { bc.MemberId, bc.UserId });
             modelBuilder.Entity<UserMember>()
@@ -47,6 +50,7 @@ namespace UserService.DatabaseLayer.DataModels
     {
         public static IEnumerable<SecurityGroup> GetSecurityGroups(this User user)
         {
+            if (user == null) throw new ArgumentNullException(nameof(user));
             foreach (var userMember in user.MemberOf)
             {
                 if (userMember.Member is SecurityGroup securityGroup)
@@ -62,6 +66,7 @@ namespace UserService.DatabaseLayer.DataModels
     {
         public static IEnumerable<User> GetUsers(this SecurityGroup securityGroup)
         {
+            if (securityGroup == null) throw new ArgumentNullException(nameof(securityGroup));
             foreach (var userMember in securityGroup.Members)
             {
                 if (userMember.User is null) continue;
diff --git a/UserService.DatabaseLayer/DataModels/Node.cs b/UserService.DatabaseLayer/DataModels/Node.cs
index c5b63f1..ed5c873 100644
--- a/UserService.DatabaseLayer/DataModels/Node.cs
+++ b/UserService.DatabaseLayer/DataModels/Node.cs
@@ -1,7 +1,7 @@
-using System;
+#nullable enable
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Text;
 
 namespace UserService.DatabaseLayer.DataModels
 {
diff --git a/UserService.DatabaseLayer/Repository/BaseRepository.cs b/UserService.DatabaseLayer/Repository/BaseRepository.cs
index 2df2c97..b50f2ee 100644
--- a/UserService.DatabaseLayer/Repository/BaseRepository.cs
+++ b/UserService.DatabaseLayer/Repository/BaseRepository.cs
@@ -12,7 +12,7 @@ namespace UserService.DatabaseLayer.Repository
 {
     public class BaseRepository<T> where T : Node
     {
-        protected readonly Func<UserServiceDbContext, DbSet<T>> Context;
+        protected Func<UserServiceDbContext, DbSet<T>> Context { get; }
 
         protected BaseRepository(Func<UserServiceDbContext, DbSet<T>> context)
         {
@@ -22,27 +22,27 @@ namespace UserService.DatabaseLayer.Repository
         public virtual async Task<IReadOnlyList<T>> GetAllAsync(Expression<Func<T, bool>>? predicate = null, CancellationToken token = default)
         {
             await using var db = new UserServiceDbContext();
-            return await Context(db).Include(x => x.Parent).WhereOrDefault(predicate).ToListAsync(token);
+            return await Context(db).Include(x => x.Parent).WhereOrDefault(predicate).ToListAsync(token).ConfigureAwait(false);
         }
 
         public async Task<T?> GetAsync(Expression<Func<T, bool>> predicate, CancellationToken token = default)
         {
             await using var db = new UserServiceDbContext();
-            return await Context(db).FirstOrDefaultAsync(predicate, token);
+            return await Context(db).FirstOrDefaultAsync(predicate, token).ConfigureAwait(false);
         }
 
         public async Task AddAsync(T entity, CancellationToken token = default)
         {
             await using var db = new UserServiceDbContext();
-            await Context(db).AddAsync(@entity, token);
-            await db.SaveChangesAsync(token);
+            await Context(db).AddAsync(@entity, token).ConfigureAwait(false);
+            await db.SaveChangesAsync(token).ConfigureAwait(false);
         }
 
         public async Task<bool> UpdateAsync(T entity, CancellationToken token = default)
         {
             await using var db = new UserServiceDbContext();
             Context(db).Update(entity);
-            var items= await db.SaveChangesAsync(token);
+            var items= await db.SaveChangesAsync(token).ConfigureAwait(false);
             return items > 0;
         }
 
@@ -50,7 +50,7 @@ namespace UserService.DatabaseLayer.Repository
         {
             await using var db = new UserServiceDbContext();
             Context(db).Remove(entity);
-            await db.SaveChangesAsync(token);
+            await db.SaveChangesAsync(token).ConfigureAwait(false);
         }
     }
 }
\ No newline at end of file
diff --git a/UserService.DatabaseLayer/Repository/OrganizationUnitsRepository.cs b/UserService.DatabaseLayer/Repository/OrganizationUnitsRepository.cs
index 08e5222..7a1fa41 100644
--- a/UserService.DatabaseLayer/Repository/OrganizationUnitsRepository.cs
+++ b/UserService.DatabaseLayer/Repository/OrganizationUnitsRepository.cs
@@ -24,7 +24,7 @@ namespace UserService.DatabaseLayer.Repository
             var rootOus = await Context(db)
                 .Include(x => x.Parent)
                 .WhereOrDefault(predicate)
-                .ToListAsync(cancellationToken: token);
+                .ToListAsync(cancellationToken: token).ConfigureAwait(false);
 
             IEnumerable<OrganizationUnit> Rec(Node node)
             {
diff --git a/UserService.DatabaseLayer/UserService.DatabaseLayer.csproj b/UserService.DatabaseLayer/UserService.DatabaseLayer.csproj
index c6062ce..fc60665 100644
--- a/UserService.DatabaseLayer/UserService.DatabaseLayer.csproj
+++ b/UserService.DatabaseLayer/UserService.DatabaseLayer.csproj
@@ -7,11 +7,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.6">
+      <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.6" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.7">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.7" />
     </ItemGroup>
 
 </Project>
diff --git a/UserService.Test/UnitTest1.cs b/UserService.Test/UnitTest1.cs
index 4fd7428..0b70fc3 100644
--- a/UserService.Test/UnitTest1.cs
+++ b/UserService.Test/UnitTest1.cs
@@ -19,10 +19,10 @@ namespace UserService.Test
         public async Task Test1()
         {
             await using var db = new UserServiceDbContext();
-            var user = await db.Users.FirstOrDefaultAsync();
-            var secGroup = await db.SecurityGroups.FirstOrDefaultAsync();
-            var ous = await db.OrganizationUnits.ToListAsync();
-            var mo = await db.UserMembers.ToListAsync();
+            var user = await db.Users.FirstOrDefaultAsync().ConfigureAwait(false);
+            var secGroup = await db.SecurityGroups.FirstOrDefaultAsync().ConfigureAwait(false);
+            var ous = await db.OrganizationUnits.ToListAsync().ConfigureAwait(false);
+            var mo = await db.UserMembers.ToListAsync().ConfigureAwait(false);
 
             var securityGroupsOfUser = user.GetSecurityGroups();
             var usersOfSecurityGroup = secGroup.GetUsers();
@@ -38,7 +38,7 @@ namespace UserService.Test
         public async Task Test2()
         {
             await using var db = new UserServiceDbContext();
-            var ous = await db.OrganizationUnits.ToListAsync();
+            var ous = await db.OrganizationUnits.ToListAsync().ConfigureAwait(false);
             var sb = new StringBuilder();
             NewMethod(ous, null, 0, ref sb);
             var result = sb.ToString();
diff --git a/UserService.Test/UserService.Test.csproj b/UserService.Test/UserService.Test.csproj
index 022e46a..48b2f52 100644
--- a/UserService.Test/UserService.Test.csproj
+++ b/UserService.Test/UserService.Test.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -7,9 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/UserService.db b/UserService.db
index dd1435b74729284c613821714f65c7bf236939c2..e800ecad9718b37fe45c3e03a9a4f4b284dd32ec 100644
GIT binary patch
delta 40
vcmZoTz|?SnX~P9uMz+ltZ3B$h&+@P2KhA%Av!FmJ|Kz##CP48^^?C{bNLde9

delta 40
vcmZoTz|?SnX~P9uM)u7YZ3B$hSMs0bKhA%Av!FmJ|Kz##CP48^^?C{bNHq^y

diff --git a/UserService.sln b/UserService.sln
index f9488a0..3136372 100644
--- a/UserService.sln
+++ b/UserService.sln
@@ -9,6 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UserService.Test", "UserSer
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UserService.DatabaseLayer", "UserService.DatabaseLayer\UserService.DatabaseLayer.csproj", "{4505C991-7E39-416F-94E5-D906DD0D90F9}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A8D411B0-CD71-4448-9D4F-12898D0CCDD6}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/UserService/Pages/Directory.razor.cs b/UserService/Pages/Directory.razor.cs
index 31b6510..2e238b7 100644
--- a/UserService/Pages/Directory.razor.cs
+++ b/UserService/Pages/Directory.razor.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
@@ -27,14 +26,14 @@ namespace UserService.Pages
         private async void OnSelectedNodeChanged(Node? value)
         {
             if (value == null) return;
-            Members = await UsersRepository.GetAllAsync(x => x.ParentId == value.Id);
+            Members = await UsersRepository.GetAllAsync(x => x.ParentId == value.Id).ConfigureAwait(false);
         }
 
-        public IReadOnlyList<Member> Members { get; set; }
+        public IReadOnlyList<Member>? Members { get; set; }
 
-        [Inject] public IOrganizationUnitsRepository OuRepository { get; set; }
+        [Inject] public IOrganizationUnitsRepository OuRepository { get; set; } = null!;
 
-        [Inject] public IUsersRepository UsersRepository { get; set; }
+        [Inject] public IUsersRepository UsersRepository { get; set; } = null!;
 
 
         protected override async Task OnInitializedAsync()
diff --git a/UserService/Pages/SecurityGroups.razor b/UserService/Pages/SecurityGroups.razor
index e21b1e7..21b50da 100644
--- a/UserService/Pages/SecurityGroups.razor
+++ b/UserService/Pages/SecurityGroups.razor
@@ -4,7 +4,7 @@
 
 <h1>Table of all security groups</h1>
 
-@if (SecurityGroups is null)
+@if (Groups is null)
 {
 <p>
     <em>Loading...</em>
@@ -12,7 +12,7 @@
 }
 else
 {
-<DataGrid TItem="SecurityGroup" Data="@SecurityGroups">
+<DataGrid TItem="SecurityGroup" Data="@Groups">
     <DataGridCommandColumn TItem="User" />
     <DataGridColumn TItem="SecurityGroup" Field="@nameof(SecurityGroup.Id)" Caption="#" Sortable="false" />
     <DataGridColumn TItem="SecurityGroup" Field="@nameof(SecurityGroup.CommonName)" Caption="CN" Editable="true" />
diff --git a/UserService/Pages/SecurityGroups.razor.cs b/UserService/Pages/SecurityGroups.razor.cs
index b1269ba..1c65bfd 100644
--- a/UserService/Pages/SecurityGroups.razor.cs
+++ b/UserService/Pages/SecurityGroups.razor.cs
@@ -8,18 +8,18 @@ namespace UserService.Pages
 {
     public class SecurityGroupsBase : ComponentBase
     {
-        [Inject] private ISecurityGroupsRepository? SecurityGroupsRepository { get; set; }
-        [Inject] private IOrganizationUnitsRepository? OrganizationUnitsRepository { get; set; }
+        [Inject] private ISecurityGroupsRepository SecurityGroupsRepository { get; set; } = null!;
+        [Inject] private IOrganizationUnitsRepository OrganizationUnitsRepository { get; set; } = null!;
 
-        protected bool DialogIsOpen;
-        protected SecurityGroup? SecurityGroupToEdit;
+        protected bool DialogIsOpen { get; set; }
+        protected SecurityGroup? SecurityGroupToEdit { get; set; }
 
-        protected IReadOnlyList<SecurityGroup>? SecurityGroups;
-        protected IReadOnlyList<OrganizationUnit>? OrganizationUnits;
+        protected IReadOnlyList<SecurityGroup>? Groups { get; set; }
+        protected IReadOnlyList<OrganizationUnit>? OrganizationUnits { get; set; }
 
         protected override async Task OnInitializedAsync()
         {
-            SecurityGroups = await SecurityGroupsRepository.GetAllAsync().ConfigureAwait(false);
+            Groups = await SecurityGroupsRepository.GetAllAsync().ConfigureAwait(false);
             OrganizationUnits = await OrganizationUnitsRepository.GetAllAsync().ConfigureAwait(false);
         }
 
diff --git a/UserService/Pages/Users.razor b/UserService/Pages/Users.razor
index 344483d..16e99a6 100644
--- a/UserService/Pages/Users.razor
+++ b/UserService/Pages/Users.razor
@@ -29,24 +29,23 @@ else
         <DataGridColumn TItem="User" Field="@nameof(User.FirstName)" Caption="First Name" Editable="true"/>
         <DataGridColumn TItem="User" Field="@nameof(User.LastName)" Caption="Last Name" Editable="true"/>
         <DataGridColumn TItem="User" Field="@nameof(User.EMail)" Caption="EMail" Editable="true"/>
-        <DataGridSelectColumn TItem="User" Field="@nameof(User.Parent)" Caption="Parent" Editable="true">
+        <DataGridSelectColumn TItem="User" Field="@nameof(User.ParentId)" Caption="Parent" Editable="true">
             <DisplayTemplate>
                 @{
-                    var name = ((User) context).Parent?.CommonName ?? "-";
+                    var name = ((User) context ).Parent?.CommonName ?? "-";
                     @name
                 }
 
             </DisplayTemplate>
             <EditTemplate>
-                @{
-                    <Blazorise.SelectEdit TValue="User" SelectedValue="@((User)(context.CellValue))" SelectedValueChanged="@(v => context.CellValue = v)">
+               
+                    <Select TValue="int" SelectedValue="@((int)(context.CellValue))" SelectedValueChanged="@(v => context.CellValue = v)" >
                     @foreach (var item in OrganizationUnits)
                     {
-
-                        <SelectItem TValue="OrganizationUnit" Value="@(item)">@item.CommonName</SelectItem>
+                        <SelectItem TValue="int" Value="@(item.Id)">@item.CommonName</SelectItem>
                     }
-                    </Blazorise.SelectEdit>
-                }
+                    </Select>
+                
 
             </EditTemplate>
         </DataGridSelectColumn>
diff --git a/UserService/Pages/Users.razor.cs b/UserService/Pages/Users.razor.cs
index cc16240..a134c6f 100644
--- a/UserService/Pages/Users.razor.cs
+++ b/UserService/Pages/Users.razor.cs
@@ -1,5 +1,7 @@
-using Microsoft.AspNetCore.Components;
+using System;
+using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Blazorise.DataGrid;
 using Microsoft.JSInterop;
@@ -20,19 +22,21 @@ namespace UserService.Pages
 
         protected override async Task OnInitializedAsync()
         {
-            Users = await UsersRepository.GetAllAsync();
+            Users = await UsersRepository.GetAllAsync().ConfigureAwait(false);
             OrganizationUnits = await OrganizationUnitsRepository.GetAllAsync().ConfigureAwait(false);
         }
 
         protected async Task RowInsertedCallback(SavedRowItem<User, Dictionary<string, object>> arg)
         {
+            if (arg == null) throw new ArgumentNullException(nameof(arg));
             var user = arg.Item;
             user.ParentId = -2;
-            await UsersRepository.AddAsync(user);
+            await UsersRepository.AddAsync(user).ConfigureAwait(false);
         }
 
         protected async Task RowDeletingCallback(CancellableRowChange<User> arg)
         {
+            if (arg == null) throw new ArgumentNullException(nameof(arg));
             var confirmed = await JsRuntime.InvokeAsync<bool>("confirm",
                 $"You are about to delete the user {arg.Item.FullName}. Are you sure?").ConfigureAwait(false);
             if (confirmed)
@@ -46,7 +50,10 @@ namespace UserService.Pages
         
             protected async Task RowUpdatingCallback(CancellableRowChange<User, Dictionary<string, object>> arg)
             {
-                var result = await UsersRepository.UpdateAsync(arg.Item);
+                if (arg == null) throw new ArgumentNullException(nameof(arg));
+                var user = arg.Item;
+                user.Parent = OrganizationUnits.FirstOrDefault(x => x.Id == (int?)arg.Values[nameof(Node.ParentId)]);
+                var result = await UsersRepository.UpdateAsync(user).ConfigureAwait(false);
                 arg.Cancel = !result;
             }
 
diff --git a/UserService/Startup.cs b/UserService/Startup.cs
index dfd5430..8827107 100644
--- a/UserService/Startup.cs
+++ b/UserService/Startup.cs
@@ -1,3 +1,4 @@
+using System;
 using Blazorise;
 using Blazorise.Bootstrap;
 using Blazorise.Icons.FontAwesome;
@@ -40,6 +41,7 @@ namespace UserService
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
+            if (app == null) throw new ArgumentNullException(nameof(app));
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
diff --git a/UserService/UserService.csproj b/UserService/UserService.csproj
index ebd1211..1bffdf8 100644
--- a/UserService/UserService.csproj
+++ b/UserService/UserService.csproj
@@ -5,6 +5,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\.editorconfig" Link=".editorconfig" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\UserService.DatabaseLayer\UserService.DatabaseLayer.csproj" />
   </ItemGroup>
@@ -15,6 +19,10 @@
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.1.2" />
     <PackageReference Include="Blazorise.Sidebar" Version="0.9.1.2" />
     <PackageReference Include="Blazorise.TreeView" Version="0.9.1.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>
-- 
2.49.0


From ccb5b6a15442c62aa8f091a8fbba17234a1723ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20B=C3=B6rchers?= <holger@boerchers.org>
Date: Thu, 13 Aug 2020 23:18:11 +0200
Subject: [PATCH 08/11] minor fixes

---
 .idea/.idea.UserService/riderModule.iml |   6 +++---
 UserService.db                          | Bin 40960 -> 40960 bytes
 UserService/Pages/Users.razor           |  24 ++++++++++++++++++++----
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.idea/.idea.UserService/riderModule.iml b/.idea/.idea.UserService/riderModule.iml
index 19473e1..882628e 100644
--- a/.idea/.idea.UserService/riderModule.iml
+++ b/.idea/.idea.UserService/riderModule.iml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="RIDER_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$USER_HOME$/.nuget/packages/microsoft.net.test.sdk/16.6.1/build/netcoreapp2.1" />
-    <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.6.1/build/netcoreapp2.1/x64/testhost.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.6.1/build/netcoreapp2.1/x64/testhost.exe" />
+    <content url="file://$USER_HOME$/.nuget/packages/microsoft.net.test.sdk/16.7.0/build/netcoreapp2.1" />
+    <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.7.0/build/netcoreapp2.1/x64/testhost.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.7.0/build/netcoreapp2.1/x64/testhost.exe" />
     <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/NUnit3.TestAdapter.dll" />
     <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/NUnit3.TestAdapter.pdb" />
     <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/nunit.engine.api.dll" />
diff --git a/UserService.db b/UserService.db
index e800ecad9718b37fe45c3e03a9a4f4b284dd32ec..cef1d65e32c2db506dde6510f5271a1def64ea62 100644
GIT binary patch
delta 68
zcmZoTz|?SnX@j;cBl~0>+a-*DHea-LFcLq@|AGG%|2_Uo{0I4W^Ka!}$$y-GG5_(+
Yf&!)dljqiR0adT4*95A*RIjH10G(bM-T(jq

delta 68
zcmZoTz|?SnX@j;c<G;x|wo4e<Hea-LFcSa3|BC+}|6=}2{0I4W^Ka!p%fFKUIREj@
Yf&!)dljqiR0adT4*95A*RIjH10H@X(-~a#s

diff --git a/UserService/Pages/Users.razor b/UserService/Pages/Users.razor
index 16e99a6..d72a398 100644
--- a/UserService/Pages/Users.razor
+++ b/UserService/Pages/Users.razor
@@ -12,17 +12,33 @@
 }
 else
 {
-    <DataGrid TItem="User" Editable="true" EditMode="DataGridEditMode.Inline" RowRemoving="RowDeletingCallback" Data="@Users" RowInserted="RowInsertedCallback" RowUpdating="RowUpdatingCallback">
+    <DataGrid TItem="User" RowSelectable="@(u => false)" Editable="true" EditMode="DataGridEditMode.Inline" RowRemoving="RowDeletingCallback" Data="@Users" RowInserted="RowInsertedCallback" RowUpdating="RowUpdatingCallback">
         <DataGridCommandColumn TItem="User">
             <NewCommandTemplate>
-                <Button Color="Color.Success" Clicked="@context.Clicked" title="Create user"><i class="fa fa-user-plus"></i></Button>
+                <Button Color="Color.Success" Clicked="@context.Clicked" title="Create user">
+                    <i class="fa fa-user-plus"></i>
+                </Button>
             </NewCommandTemplate>
             <EditCommandTemplate>
-                <Button Color="Color.Primary" Clicked="@context.Clicked" title="Edit user"><i class="fa fa-user-edit"></i></Button>
+                <Button Color="Color.Primary" Clicked="@context.Clicked" title="Edit user">
+                    <i class="fa fa-user-edit"></i>
+                </Button>
             </EditCommandTemplate>
             <DeleteCommandTemplate>
-                <Button Color="Color.Danger" Clicked="@context.Clicked" title="Delete user"><i class="fa fa-user-minus"></i></Button>
+                <Button Color="Color.Danger" Clicked="@context.Clicked" title="Delete user">
+                    <i class="fa fa-user-minus"></i>
+                </Button>
             </DeleteCommandTemplate>
+            <SaveCommandTemplate>
+                <Button Color="Color.Success" Clicked="@context.Clicked" title="Save user">
+                    <i class="fas fa-save"></i>
+                </Button>
+            </SaveCommandTemplate>
+            <CancelCommandTemplate>
+                <Button Color="Color.Danger" Clicked="@context.Clicked" title="Cancel editing">
+                    <i class="far fa-times-circle"></i>
+                </Button>
+            </CancelCommandTemplate>
         </DataGridCommandColumn>
         <DataGridColumn TItem="User" Field="@nameof(User.Id)" Caption="#" Sortable="false"/>
         <DataGridColumn TItem="User" Field="@nameof(User.CommonName)" Caption="CN" CellsEditableOnEditCommand="false" Editable="true"/>
-- 
2.49.0


From 697886730ebaa5a3b9778dfc53b6fcb8114f532b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20B=C3=B6rchers?= <holger@boerchers.org>
Date: Sun, 16 Aug 2020 22:10:23 +0200
Subject: [PATCH 09/11] added validator

---
 UserService.db                   | Bin 40960 -> 40960 bytes
 UserService/Pages/Users.razor    |  34 ++++++++++++++++++++----
 UserService/Pages/Users.razor.cs |  44 ++++++++++++++++++++++++-------
 3 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/UserService.db b/UserService.db
index cef1d65e32c2db506dde6510f5271a1def64ea62..11403be6291cbe783e4caabbba18c425a201ee63 100644
GIT binary patch
delta 145
zcmZoTz|?SnX#<M^vjES_$?OISj4w9}3hd;u;8SO?5M^K#)#Ku3PzBPGl9HSZ*@<as
zsi|(6IVGt@ze0;siwqr%^iop2k%Tu(+CCFv<k}R#qQE1-KbMjJCjU47_55=u^A$({
oO)lkUV`XM!{KYkSaeX4Q0RM)~><ugVSy`AF7`ZlY?e`V{0FX>6O#lD@

delta 146
zcmZoTz|?SnX#<M^Ge587WOf4u#)q2)1$OdS@ToIch%zvWT8m0^GGrwtXa5T=PAvj4
z^imS@GE;Mk9a8gBi<0y6^iop2fWj^i(an;!&x9B`HwCaLaPjjmX5_!g|BZkBWPt(+
sCjR3<qf7bO_<u97{o|axxIU4YpMUFS_J)=GtPBhctel&-_InEe0J8Wj<NyEw

diff --git a/UserService/Pages/Users.razor b/UserService/Pages/Users.razor
index d72a398..82bbe63 100644
--- a/UserService/Pages/Users.razor
+++ b/UserService/Pages/Users.razor
@@ -12,7 +12,7 @@
 }
 else
 {
-    <DataGrid TItem="User" RowSelectable="@(u => false)" Editable="true" EditMode="DataGridEditMode.Inline" RowRemoving="RowDeletingCallback" Data="@Users" RowInserted="RowInsertedCallback" RowUpdating="RowUpdatingCallback">
+    <DataGrid TItem="User" RowSelectable="@(u => false)" Editable="true" EditMode="DataGridEditMode.Popup" RowRemoving="RowDeletingCallback" Data="@Users" RowInserted="RowInsertedCallback" RowUpdating="RowUpdatingCallback">
         <DataGridCommandColumn TItem="User">
             <NewCommandTemplate>
                 <Button Color="Color.Success" Clicked="@context.Clicked" title="Create user">
@@ -40,11 +40,35 @@ else
                 </Button>
             </CancelCommandTemplate>
         </DataGridCommandColumn>
-        <DataGridColumn TItem="User" Field="@nameof(User.Id)" Caption="#" Sortable="false"/>
-        <DataGridColumn TItem="User" Field="@nameof(User.CommonName)" Caption="CN" CellsEditableOnEditCommand="false" Editable="true"/>
+        <DataGridColumn TItem="User" Field="@nameof(User.Id)" Caption="#" Sortable="false" />
+
+        <DataGridColumn TItem="User" Field="@nameof(User.CommonName)" Caption="CN" CellsEditableOnEditCommand="false" Editable="true">
+            <EditTemplate>
+                <Validation Validator="@ValidateCommonName">
+                    <TextEdit Placeholder="Enter common name" Text="@((string)(((CellEditContext)context).CellValue))" TextChanged="@(v=>((CellEditContext)context).CellValue=v)">
+                        <Feedback>
+                            <ValidationSuccess></ValidationSuccess>
+                            <ValidationError>Please enter a valid common name!</ValidationError>
+                        </Feedback>
+                    </TextEdit>
+                </Validation>
+            </EditTemplate>
+        </DataGridColumn>
         <DataGridColumn TItem="User" Field="@nameof(User.FirstName)" Caption="First Name" Editable="true"/>
         <DataGridColumn TItem="User" Field="@nameof(User.LastName)" Caption="Last Name" Editable="true"/>
-        <DataGridColumn TItem="User" Field="@nameof(User.EMail)" Caption="EMail" Editable="true"/>
+        <DataGridColumn TItem="User" Field="@nameof(User.EMail)" Caption="EMail" Editable="true">
+            <EditTemplate>
+                <Validation Validator="@ValidateEmail">
+                    <TextEdit Placeholder="Enter email" Text="@((string)(((CellEditContext)context).CellValue))" TextChanged="@(v=>((CellEditContext)context).CellValue=v)">
+                        <Feedback>
+                            <ValidationNone>Please enter the email.</ValidationNone>
+                            <ValidationSuccess>Email is ok.</ValidationSuccess>
+                            <ValidationError>Enter valid email!</ValidationError>
+                        </Feedback>
+                    </TextEdit>
+                </Validation>
+            </EditTemplate>
+        </DataGridColumn>
         <DataGridSelectColumn TItem="User" Field="@nameof(User.ParentId)" Caption="Parent" Editable="true">
             <DisplayTemplate>
                 @{
@@ -55,7 +79,7 @@ else
             </DisplayTemplate>
             <EditTemplate>
                
-                    <Select TValue="int" SelectedValue="@((int)(context.CellValue))" SelectedValueChanged="@(v => context.CellValue = v)" >
+                    <Select TValue="int?" SelectedValue="@((int?)(context.CellValue))" SelectedValueChanged="@(v => context.CellValue = v)" >
                     @foreach (var item in OrganizationUnits)
                     {
                         <SelectItem TValue="int" Value="@(item.Id)">@item.CommonName</SelectItem>
diff --git a/UserService/Pages/Users.razor.cs b/UserService/Pages/Users.razor.cs
index a134c6f..ff80935 100644
--- a/UserService/Pages/Users.razor.cs
+++ b/UserService/Pages/Users.razor.cs
@@ -1,8 +1,10 @@
 using System;
 using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
+using Blazorise;
 using Blazorise.DataGrid;
 using Microsoft.JSInterop;
 using UserService.DatabaseLayer.DataModels;
@@ -47,15 +49,39 @@ namespace UserService.Pages
 
             arg.Cancel = true;
         }
-        
-            protected async Task RowUpdatingCallback(CancellableRowChange<User, Dictionary<string, object>> arg)
-            {
-                if (arg == null) throw new ArgumentNullException(nameof(arg));
-                var user = arg.Item;
-                user.Parent = OrganizationUnits.FirstOrDefault(x => x.Id == (int?)arg.Values[nameof(Node.ParentId)]);
-                var result = await UsersRepository.UpdateAsync(user).ConfigureAwait(false);
-                arg.Cancel = !result;
-            }
 
+        protected static void ValidateCommonName(ValidatorEventArgs e)
+        {
+            if (e == null) throw new ArgumentNullException(nameof(e));
+            var commonName = e.Value?.ToString();
+
+            if (string.IsNullOrEmpty(commonName))
+                e.Status = ValidationStatus.Error;
+            else
+                e.Status = ValidationStatus.Success;
+        }
+
+        protected static void ValidateEmail(ValidatorEventArgs e)
+        {
+            if (e == null) throw new ArgumentNullException(nameof(e));
+            var email = e.Value?.ToString();
+
+            if (string.IsNullOrEmpty(email))
+                e.Status = ValidationStatus.None;
+            else if (!new EmailAddressAttribute().IsValid(email))
+            {
+                e.Status = ValidationStatus.Error;
+            }
+            else
+                e.Status = ValidationStatus.Success;
+        }
+        protected async Task RowUpdatingCallback(CancellableRowChange<User, Dictionary<string, object>> arg)
+        {
+            if (arg == null) throw new ArgumentNullException(nameof(arg));
+            var user = arg.Item;
+            user.Parent = OrganizationUnits.FirstOrDefault(x => x.Id == (int?) arg.Values[nameof(Node.ParentId)]);
+            var result = await UsersRepository.UpdateAsync(user).ConfigureAwait(false);
+            arg.Cancel = !result;
+        }
     }
 }
\ No newline at end of file
-- 
2.49.0


From 8fcd1c4c44ed0be5b5ace5f2dbdbf1dc894854e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20B=C3=B6rchers?= <holger@boerchers.org>
Date: Tue, 18 Aug 2020 21:59:10 +0200
Subject: [PATCH 10/11] Working on users view, added infrastructure lib

---
 .../DataModels/ModelBuilderExtensions.cs      |   1 +
 UserService.DatabaseLayer/DataModels/Node.cs  |  62 ------------------
 .../DataModels/UserServiceDbContext.cs        |   1 +
 .../UserServiceDbContextModelSnapshot.cs      |   3 +-
 .../Repository/BaseRepository.cs              |   1 +
 .../Repository/IRepository.cs                 |   2 +-
 .../Repository/OrganizationUnitsRepository.cs |   1 +
 .../Repository/SecurityGroupsRepository.cs    |   2 +-
 .../Repository/UsersRepository.cs             |   2 +-
 .../UserService.DatabaseLayer.csproj          |   6 +-
 .../DataModels/Member.cs                      |  13 ++++
 UserService.Infrastructure/DataModels/Node.cs |  24 +++++++
 .../DataModels/OrganizationUnit.cs            |   7 ++
 .../DataModels/SecurityGroup.cs               |   6 ++
 UserService.Infrastructure/DataModels/User.cs |  15 +++++
 .../DataModels/UserMember.cs                  |  12 ++++
 .../UserService.Infrastructure.csproj         |  12 ++++
 UserService.Infrastructure/Validators.cs      |  22 +++++++
 UserService.Test/UnitTest1.cs                 |   1 +
 UserService.Test/UserService.Test.csproj      |   2 +
 UserService.db                                | Bin 40960 -> 40960 bytes
 UserService.sln                               |   6 ++
 UserService/Pages/Directory.razor.cs          |   2 +-
 UserService/Pages/SecurityGroups.razor        |   2 +-
 UserService/Pages/SecurityGroups.razor.cs     |   2 +-
 UserService/Pages/Users.razor                 |  13 ++--
 UserService/Pages/Users.razor.cs              |  61 +++++++++++------
 UserService/UserService.csproj                |   2 +
 28 files changed, 184 insertions(+), 99 deletions(-)
 delete mode 100644 UserService.DatabaseLayer/DataModels/Node.cs
 create mode 100644 UserService.Infrastructure/DataModels/Member.cs
 create mode 100644 UserService.Infrastructure/DataModels/Node.cs
 create mode 100644 UserService.Infrastructure/DataModels/OrganizationUnit.cs
 create mode 100644 UserService.Infrastructure/DataModels/SecurityGroup.cs
 create mode 100644 UserService.Infrastructure/DataModels/User.cs
 create mode 100644 UserService.Infrastructure/DataModels/UserMember.cs
 create mode 100644 UserService.Infrastructure/UserService.Infrastructure.csproj
 create mode 100644 UserService.Infrastructure/Validators.cs

diff --git a/UserService.DatabaseLayer/DataModels/ModelBuilderExtensions.cs b/UserService.DatabaseLayer/DataModels/ModelBuilderExtensions.cs
index 68710ae..e2be228 100644
--- a/UserService.DatabaseLayer/DataModels/ModelBuilderExtensions.cs
+++ b/UserService.DatabaseLayer/DataModels/ModelBuilderExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.DataModels
 {
diff --git a/UserService.DatabaseLayer/DataModels/Node.cs b/UserService.DatabaseLayer/DataModels/Node.cs
deleted file mode 100644
index ed5c873..0000000
--- a/UserService.DatabaseLayer/DataModels/Node.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace UserService.DatabaseLayer.DataModels
-{
-    public class OrganizationUnit : Node
-    {
-        public Member? Manager { get; set; }
-    }
-
-    public class SecurityGroup : Member
-    {
-    }
-
-    public class User : Member
-    {
-        public string? FirstName { get; set; }
-        public string? LastName { get; set; }
-        public bool IsActive { get; set; }
-
-        public string FullName => $"{FirstName} {LastName}";
-
-        public IEnumerable<UserMember> MemberOf { get; set; } = new List<UserMember>();
-    }
-
-    public class UserMember
-    {
-        public int MemberId { get; set; }
-        public Member? Member { get; set; }
-
-        public int UserId { get; set; }
-
-        public User? User { get; set; }
-    }
-
-    public abstract class Member : Node
-    {
-        [EmailAddress]
-        public string? EMail { get; set; }
-
-        public ICollection<UserMember> Members { get; set; } = new List<UserMember>();
-    }
-
-    public abstract class Node : ICloneable
-    {
-        public int Id { get; set; }
-        [Required] public string CommonName { get; set; } = null!;
-        public string? Description { get; set; }
-        public ICollection<Node> Children { get; set; } = new List<Node>();
-        public Node? Parent { get; set; } //Parent
-        public int? ParentId { get; set; }
-
-        public override string ToString() => CommonName;
-
-        public int Level => Parent?.Level + 1 ?? 0;
-
-        /// <inheritdoc />
-        public virtual object Clone() => MemberwiseClone();
-    }
-}
\ No newline at end of file
diff --git a/UserService.DatabaseLayer/DataModels/UserServiceDbContext.cs b/UserService.DatabaseLayer/DataModels/UserServiceDbContext.cs
index 68c5567..cd9e5d8 100644
--- a/UserService.DatabaseLayer/DataModels/UserServiceDbContext.cs
+++ b/UserService.DatabaseLayer/DataModels/UserServiceDbContext.cs
@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.DataModels
 {
diff --git a/UserService.DatabaseLayer/Migrations/UserServiceDbContextModelSnapshot.cs b/UserService.DatabaseLayer/Migrations/UserServiceDbContextModelSnapshot.cs
index 4d03a6e..c9aa074 100644
--- a/UserService.DatabaseLayer/Migrations/UserServiceDbContextModelSnapshot.cs
+++ b/UserService.DatabaseLayer/Migrations/UserServiceDbContextModelSnapshot.cs
@@ -1,8 +1,7 @@
 // <auto-generated />
-using System;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using UserService.DatabaseLayer.DataModels;
 
 namespace UserService.DatabaseLayer.Migrations
diff --git a/UserService.DatabaseLayer/Repository/BaseRepository.cs b/UserService.DatabaseLayer/Repository/BaseRepository.cs
index b50f2ee..61db729 100644
--- a/UserService.DatabaseLayer/Repository/BaseRepository.cs
+++ b/UserService.DatabaseLayer/Repository/BaseRepository.cs
@@ -7,6 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using UserService.DatabaseLayer.DataModels;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.Repository
 {
diff --git a/UserService.DatabaseLayer/Repository/IRepository.cs b/UserService.DatabaseLayer/Repository/IRepository.cs
index 5a95ac4..74058e5 100644
--- a/UserService.DatabaseLayer/Repository/IRepository.cs
+++ b/UserService.DatabaseLayer/Repository/IRepository.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
-using UserService.DatabaseLayer.DataModels;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.Repository
 {
diff --git a/UserService.DatabaseLayer/Repository/OrganizationUnitsRepository.cs b/UserService.DatabaseLayer/Repository/OrganizationUnitsRepository.cs
index 7a1fa41..fa44e7c 100644
--- a/UserService.DatabaseLayer/Repository/OrganizationUnitsRepository.cs
+++ b/UserService.DatabaseLayer/Repository/OrganizationUnitsRepository.cs
@@ -6,6 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using UserService.DatabaseLayer.DataModels;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.Repository
 {
diff --git a/UserService.DatabaseLayer/Repository/SecurityGroupsRepository.cs b/UserService.DatabaseLayer/Repository/SecurityGroupsRepository.cs
index 0f4ce54..6948ce7 100644
--- a/UserService.DatabaseLayer/Repository/SecurityGroupsRepository.cs
+++ b/UserService.DatabaseLayer/Repository/SecurityGroupsRepository.cs
@@ -1,4 +1,4 @@
-using UserService.DatabaseLayer.DataModels;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.Repository
 {
diff --git a/UserService.DatabaseLayer/Repository/UsersRepository.cs b/UserService.DatabaseLayer/Repository/UsersRepository.cs
index 95421ca..cb60251 100644
--- a/UserService.DatabaseLayer/Repository/UsersRepository.cs
+++ b/UserService.DatabaseLayer/Repository/UsersRepository.cs
@@ -1,4 +1,4 @@
-using UserService.DatabaseLayer.DataModels;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.Repository
 {
diff --git a/UserService.DatabaseLayer/UserService.DatabaseLayer.csproj b/UserService.DatabaseLayer/UserService.DatabaseLayer.csproj
index fc60665..6bd1a27 100644
--- a/UserService.DatabaseLayer/UserService.DatabaseLayer.csproj
+++ b/UserService.DatabaseLayer/UserService.DatabaseLayer.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
-        <LangVersion>8</LangVersion>
+        <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
@@ -18,4 +18,8 @@
       <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.7" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\UserService.Infrastructure\UserService.Infrastructure.csproj" />
+    </ItemGroup>
+
 </Project>
diff --git a/UserService.Infrastructure/DataModels/Member.cs b/UserService.Infrastructure/DataModels/Member.cs
new file mode 100644
index 0000000..ee4a4cc
--- /dev/null
+++ b/UserService.Infrastructure/DataModels/Member.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace UserService.Infrastructure.DataModels
+{
+    public abstract class Member : Node
+    {
+        [EmailAddress]
+        public string? EMail { get; set; }
+
+        public ICollection<UserMember> Members { get; set; } = new List<UserMember>();
+    }
+}
\ No newline at end of file
diff --git a/UserService.Infrastructure/DataModels/Node.cs b/UserService.Infrastructure/DataModels/Node.cs
new file mode 100644
index 0000000..6bbb3c0
--- /dev/null
+++ b/UserService.Infrastructure/DataModels/Node.cs
@@ -0,0 +1,24 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace UserService.Infrastructure.DataModels
+{
+    public abstract class Node : ICloneable
+    {
+        public int Id { get; set; }
+        [Required] public string CommonName { get; set; } = null!;
+        public string? Description { get; set; }
+        public ICollection<Node> Children { get; set; } = new List<Node>();
+        public Node? Parent { get; set; } //Parent
+        public int? ParentId { get; set; }
+
+        public override string ToString() => CommonName;
+
+        public int Level => Parent?.Level + 1 ?? 0;
+
+        /// <inheritdoc />
+        public virtual object Clone() => MemberwiseClone();
+    }
+}
\ No newline at end of file
diff --git a/UserService.Infrastructure/DataModels/OrganizationUnit.cs b/UserService.Infrastructure/DataModels/OrganizationUnit.cs
new file mode 100644
index 0000000..405278a
--- /dev/null
+++ b/UserService.Infrastructure/DataModels/OrganizationUnit.cs
@@ -0,0 +1,7 @@
+namespace UserService.Infrastructure.DataModels
+{
+    public class OrganizationUnit : Node
+    {
+        public Member? Manager { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/UserService.Infrastructure/DataModels/SecurityGroup.cs b/UserService.Infrastructure/DataModels/SecurityGroup.cs
new file mode 100644
index 0000000..78d3a91
--- /dev/null
+++ b/UserService.Infrastructure/DataModels/SecurityGroup.cs
@@ -0,0 +1,6 @@
+namespace UserService.Infrastructure.DataModels
+{
+    public class SecurityGroup : Member
+    {
+    }
+}
\ No newline at end of file
diff --git a/UserService.Infrastructure/DataModels/User.cs b/UserService.Infrastructure/DataModels/User.cs
new file mode 100644
index 0000000..a7f458e
--- /dev/null
+++ b/UserService.Infrastructure/DataModels/User.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace UserService.Infrastructure.DataModels
+{
+    public class User : Member
+    {
+        public string? FirstName { get; set; }
+        public string? LastName { get; set; }
+        public bool IsActive { get; set; }
+
+        public string FullName => $"{FirstName} {LastName}";
+
+        public IEnumerable<UserMember> MemberOf { get; set; } = new List<UserMember>();
+    }
+}
\ No newline at end of file
diff --git a/UserService.Infrastructure/DataModels/UserMember.cs b/UserService.Infrastructure/DataModels/UserMember.cs
new file mode 100644
index 0000000..91d4f69
--- /dev/null
+++ b/UserService.Infrastructure/DataModels/UserMember.cs
@@ -0,0 +1,12 @@
+namespace UserService.Infrastructure.DataModels
+{
+    public class UserMember
+    {
+        public int MemberId { get; set; }
+        public Member? Member { get; set; }
+
+        public int UserId { get; set; }
+
+        public User? User { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/UserService.Infrastructure/UserService.Infrastructure.csproj b/UserService.Infrastructure/UserService.Infrastructure.csproj
new file mode 100644
index 0000000..551862b
--- /dev/null
+++ b/UserService.Infrastructure/UserService.Infrastructure.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.3.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/UserService.Infrastructure/Validators.cs b/UserService.Infrastructure/Validators.cs
new file mode 100644
index 0000000..5eabcf6
--- /dev/null
+++ b/UserService.Infrastructure/Validators.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using UserService.Infrastructure.DataModels;
+
+namespace UserService.Infrastructure
+{
+    public static class Validators
+    {
+        public static bool? ValidateEmail(string mailAddress)
+        {
+            if (string.IsNullOrEmpty(mailAddress)) return null;
+            return new EmailAddressAttribute().IsValid(mailAddress);
+        }
+
+        public static bool? ValidateCommonName(string commonName, IReadOnlyList<User> users)
+        {
+            if (string.IsNullOrEmpty(commonName)) return false;
+            return users.All(x => x.CommonName != commonName);
+        }
+    }
+}
diff --git a/UserService.Test/UnitTest1.cs b/UserService.Test/UnitTest1.cs
index 0b70fc3..8fc8774 100644
--- a/UserService.Test/UnitTest1.cs
+++ b/UserService.Test/UnitTest1.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using UserService.DatabaseLayer.DataModels;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.Test
 {
diff --git a/UserService.Test/UserService.Test.csproj b/UserService.Test/UserService.Test.csproj
index 48b2f52..c20cbd9 100644
--- a/UserService.Test/UserService.Test.csproj
+++ b/UserService.Test/UserService.Test.csproj
@@ -4,6 +4,8 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
+
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/UserService.db b/UserService.db
index 11403be6291cbe783e4caabbba18c425a201ee63..adc6bf48576a35c914c5bf477dd3fb9dc74b6429 100644
GIT binary patch
delta 273
zcmZoTz|?SnX#=AH8_!Dy0iM;9*$os}SMz-4nY>w0Af2ZkC@LYzz$nVVz`((fm6(^A
zm-sKVIJL-zo0~xzC~ht-&&iOLpOKiCm&gv1fU+Hu@>7eFGg6C+_413-y&wvl4sU~q
z@u@Qyr~-9MN~-We%#oDj=VZvp&q+@$G6Gv*=wPImlFIG@7INAwY5Powk#|!7lLF6N
z1_A!*jQltGzwxi1EKnf9#y=edf$mM^7vi7G!1j-am6?%|otytRkj*=JaeW*c{|2BY
lpywKZp5x!ZzYM6jik}}S%F4sS%)rPE^d2kk=B@qS0s#82OUnQN

delta 159
zcmZoTz|?SnX#=AH8=pFZ0ME<G>;?*qFE<Mc?BuZkidcv;FpBDNaWkj_X-P>*PKNBn
zw6xSzx6GW9)S_RZ#i>Px4n}$@soqG!n<Z_Z2{CeQ3Sd&;`^_N0KbMjJCjU47_55=u
z^A$({%`W9<V`XM!{KYkSaeW*c0|QXahRN&=3XB_ok{$f4EX)jyT${J{dkX*nln*Q6

diff --git a/UserService.sln b/UserService.sln
index 3136372..6153a9d 100644
--- a/UserService.sln
+++ b/UserService.sln
@@ -14,6 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserService.Infrastructure", "UserService.Infrastructure\UserService.Infrastructure.csproj", "{586BD023-5C7B-4D9C-A17E-A0D5CEDADD20}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -32,6 +34,10 @@ Global
 		{4505C991-7E39-416F-94E5-D906DD0D90F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4505C991-7E39-416F-94E5-D906DD0D90F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4505C991-7E39-416F-94E5-D906DD0D90F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{586BD023-5C7B-4D9C-A17E-A0D5CEDADD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{586BD023-5C7B-4D9C-A17E-A0D5CEDADD20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{586BD023-5C7B-4D9C-A17E-A0D5CEDADD20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{586BD023-5C7B-4D9C-A17E-A0D5CEDADD20}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/UserService/Pages/Directory.razor.cs b/UserService/Pages/Directory.razor.cs
index 2e238b7..d7e6419 100644
--- a/UserService/Pages/Directory.razor.cs
+++ b/UserService/Pages/Directory.razor.cs
@@ -2,8 +2,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
-using UserService.DatabaseLayer.DataModels;
 using UserService.DatabaseLayer.Repository;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.Pages
 {
diff --git a/UserService/Pages/SecurityGroups.razor b/UserService/Pages/SecurityGroups.razor
index 21b50da..aef421f 100644
--- a/UserService/Pages/SecurityGroups.razor
+++ b/UserService/Pages/SecurityGroups.razor
@@ -1,5 +1,5 @@
 @page "/securitygroups"
-@using UserService.DatabaseLayer.DataModels
+@using UserService.Infrastructure.DataModels
 @inherits SecurityGroupsBase
 
 <h1>Table of all security groups</h1>
diff --git a/UserService/Pages/SecurityGroups.razor.cs b/UserService/Pages/SecurityGroups.razor.cs
index 1c65bfd..c1fcb06 100644
--- a/UserService/Pages/SecurityGroups.razor.cs
+++ b/UserService/Pages/SecurityGroups.razor.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
-using UserService.DatabaseLayer.DataModels;
 using UserService.DatabaseLayer.Repository;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.Pages
 {
diff --git a/UserService/Pages/Users.razor b/UserService/Pages/Users.razor
index 82bbe63..33c4612 100644
--- a/UserService/Pages/Users.razor
+++ b/UserService/Pages/Users.razor
@@ -1,5 +1,5 @@
 @page "/users"
-@using UserService.DatabaseLayer.DataModels
+@using UserService.Infrastructure.DataModels
 @inherits UsersBase
 
 <h1>List of all users</h1>
@@ -12,7 +12,9 @@
 }
 else
 {
-    <DataGrid TItem="User" RowSelectable="@(u => false)" Editable="true" EditMode="DataGridEditMode.Popup" RowRemoving="RowDeletingCallback" Data="@Users" RowInserted="RowInsertedCallback" RowUpdating="RowUpdatingCallback">
+    <TextEdit Placeholder="Search" Size="Size.Large" @bind-Text="@CustomFilterValue" />
+
+    <DataGrid TItem="User" RowSelectable="@(u => false)" CustomFilter="@OnCustomFilter" Sortable="true" Editable="true" EditMode="DataGridEditMode.Popup" RowRemoving="RowDeletingCallback" Data="@Users" RowInserted="RowInsertedCallback" RowInserting="RowInsertingCallback" RowUpdating="RowUpdatingCallback">
         <DataGridCommandColumn TItem="User">
             <NewCommandTemplate>
                 <Button Color="Color.Success" Clicked="@context.Clicked" title="Create user">
@@ -54,7 +56,7 @@ else
                 </Validation>
             </EditTemplate>
         </DataGridColumn>
-        <DataGridColumn TItem="User" Field="@nameof(User.FirstName)" Caption="First Name" Editable="true"/>
+        <DataGridColumn TItem="User" Field="@nameof(User.FirstName)" Caption="First Name" Editable="true" />
         <DataGridColumn TItem="User" Field="@nameof(User.LastName)" Caption="Last Name" Editable="true"/>
         <DataGridColumn TItem="User" Field="@nameof(User.EMail)" Caption="EMail" Editable="true">
             <EditTemplate>
@@ -78,17 +80,14 @@ else
 
             </DisplayTemplate>
             <EditTemplate>
-               
                     <Select TValue="int?" SelectedValue="@((int?)(context.CellValue))" SelectedValueChanged="@(v => context.CellValue = v)" >
                     @foreach (var item in OrganizationUnits)
                     {
                         <SelectItem TValue="int" Value="@(item.Id)">@item.CommonName</SelectItem>
                     }
                     </Select>
-                
-
             </EditTemplate>
         </DataGridSelectColumn>
-        <DataGridCheckColumn TItem="User" Field="@nameof(User.IsActive)" Caption="Active" Editable="true"/>
+        <DataGridCheckColumn TItem="User" Field="@nameof(User.IsActive)" Caption="Active" Editable="true" />
     </DataGrid>
 }
\ No newline at end of file
diff --git a/UserService/Pages/Users.razor.cs b/UserService/Pages/Users.razor.cs
index ff80935..78592c4 100644
--- a/UserService/Pages/Users.razor.cs
+++ b/UserService/Pages/Users.razor.cs
@@ -1,14 +1,14 @@
 using System;
 using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 using Blazorise;
 using Blazorise.DataGrid;
 using Microsoft.JSInterop;
-using UserService.DatabaseLayer.DataModels;
 using UserService.DatabaseLayer.Repository;
+using UserService.Infrastructure;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.Pages
 {
@@ -21,6 +21,7 @@ namespace UserService.Pages
 
         protected IReadOnlyList<User>? Users { get; private set; }
         protected IReadOnlyList<OrganizationUnit>? OrganizationUnits { get; private set; }
+        protected string? CustomFilterValue { get; set; }
 
         protected override async Task OnInitializedAsync()
         {
@@ -28,14 +29,24 @@ namespace UserService.Pages
             OrganizationUnits = await OrganizationUnitsRepository.GetAllAsync().ConfigureAwait(false);
         }
 
-        protected async Task RowInsertedCallback(SavedRowItem<User, Dictionary<string, object>> arg)
+        protected async Task RowInsertingCallback(CancellableRowChange<User, Dictionary<string, object>> arg)
         {
-            if (arg == null) throw new ArgumentNullException(nameof(arg));
-            var user = arg.Item;
-            user.ParentId = -2;
-            await UsersRepository.AddAsync(user).ConfigureAwait(false);
+            if (arg is null) throw new ArgumentNullException(nameof(arg));
+            var mailValidation = Validators.ValidateEmail(arg.Values[nameof(User.EMail)]?.ToString());
+            var commonNameValidation = Validators.ValidateCommonName(arg.Values[nameof(User.CommonName)]?.ToString(), Users);
+            if (mailValidation == true && commonNameValidation == true) return;
+
+            await JsRuntime.InvokeVoidAsync("alert", "User could not be added").ConfigureAwait(false);
+            arg.Cancel = true;
         }
 
+        protected async Task RowInsertedCallback(SavedRowItem<User, Dictionary<string, object>> arg)
+        {
+            if (arg is null) throw new ArgumentNullException(nameof(arg));
+            var user = arg.Item;
+            user.Parent = OrganizationUnits?.FirstOrDefault(x => x.Id == user.ParentId);
+            await UsersRepository.AddAsync(user).ConfigureAwait(false);
+        }
         protected async Task RowDeletingCallback(CancellableRowChange<User> arg)
         {
             if (arg == null) throw new ArgumentNullException(nameof(arg));
@@ -50,38 +61,46 @@ namespace UserService.Pages
             arg.Cancel = true;
         }
 
-        protected static void ValidateCommonName(ValidatorEventArgs e)
+        protected void ValidateCommonName(ValidatorEventArgs e)
         {
             if (e == null) throw new ArgumentNullException(nameof(e));
             var commonName = e.Value?.ToString();
-
-            if (string.IsNullOrEmpty(commonName))
-                e.Status = ValidationStatus.Error;
-            else
-                e.Status = ValidationStatus.Success;
+            var validationResult = Validators.ValidateCommonName(commonName, Users);
+            e.Status = validationResult == false ? ValidationStatus.Error : ValidationStatus.Success;
         }
 
         protected static void ValidateEmail(ValidatorEventArgs e)
         {
             if (e == null) throw new ArgumentNullException(nameof(e));
             var email = e.Value?.ToString();
+            var validationResult = Validators.ValidateEmail(email);
 
-            if (string.IsNullOrEmpty(email))
-                e.Status = ValidationStatus.None;
-            else if (!new EmailAddressAttribute().IsValid(email))
+            e.Status = validationResult switch
             {
-                e.Status = ValidationStatus.Error;
-            }
-            else
-                e.Status = ValidationStatus.Success;
+                null => ValidationStatus.None,
+                false => ValidationStatus.Error,
+                _ => ValidationStatus.Success
+            };
         }
         protected async Task RowUpdatingCallback(CancellableRowChange<User, Dictionary<string, object>> arg)
         {
             if (arg == null) throw new ArgumentNullException(nameof(arg));
             var user = arg.Item;
-            user.Parent = OrganizationUnits.FirstOrDefault(x => x.Id == (int?) arg.Values[nameof(Node.ParentId)]);
+            user.Parent = OrganizationUnits.FirstOrDefault(x => x.Id == (int?)arg.Values[nameof(Node.ParentId)]);
             var result = await UsersRepository.UpdateAsync(user).ConfigureAwait(false);
             arg.Cancel = !result;
         }
+
+        protected bool OnCustomFilter(User model)
+        {
+            // We want to accept empty value as valid or otherwise
+            // datagrid will not show anything.
+            if (string.IsNullOrEmpty(CustomFilterValue) || CustomFilterValue.Length < 3) return true;
+
+            return
+                model?.FirstName?.Contains(CustomFilterValue, StringComparison.OrdinalIgnoreCase) == true
+                || model?.LastName?.Contains(CustomFilterValue, StringComparison.OrdinalIgnoreCase) == true
+                || model?.CommonName?.Contains(CustomFilterValue, StringComparison.OrdinalIgnoreCase) == true;
+        }
     }
 }
\ No newline at end of file
diff --git a/UserService/UserService.csproj b/UserService/UserService.csproj
index 1bffdf8..c104d48 100644
--- a/UserService/UserService.csproj
+++ b/UserService/UserService.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,6 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\UserService.DatabaseLayer\UserService.DatabaseLayer.csproj" />
+    <ProjectReference Include="..\UserService.Infrastructure\UserService.Infrastructure.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-- 
2.49.0


From 6d975599a3e811a88ebca6cf20843391f77f4eed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20B=C3=B6rchers?= <holgerb83@gmail.com>
Date: Fri, 21 Aug 2020 22:23:30 +0200
Subject: [PATCH 11/11] start working on security group view

---
 .../DataModels/ModelBuilderExtensions.cs      |   3 +-
 ... 20200821193933_InitialCreate.Designer.cs} |  42 ++++-----
 ...ial.cs => 20200821193933_InitialCreate.cs} |  10 +--
 .../UserServiceDbContextModelSnapshot.cs      |  41 ++++-----
 .../DataModels/Member.cs                      |   3 -
 UserService.Infrastructure/DataModels/User.cs |   7 +-
 UserService.Infrastructure/NodeExtensions.cs  |  23 +++++
 .../UserService.Infrastructure.csproj         |   1 +
 UserService.Infrastructure/Validators.cs      |   4 +-
 UserService.db                                | Bin 40960 -> 40960 bytes
 UserService/Pages/MembersBase.cs              |  36 ++++++++
 UserService/Pages/SecurityGroups.razor        |  80 ++++++++++++++++--
 UserService/Pages/SecurityGroups.razor.cs     |  42 ++++-----
 UserService/Pages/Users.razor                 |  18 +++-
 UserService/Pages/Users.razor.cs              |  43 ++++------
 15 files changed, 243 insertions(+), 110 deletions(-)
 rename UserService.DatabaseLayer/Migrations/{20200725195658_initial.Designer.cs => 20200821193933_InitialCreate.Designer.cs} (76%)
 rename UserService.DatabaseLayer/Migrations/{20200725195658_initial.cs => 20200821193933_InitialCreate.cs} (98%)
 create mode 100644 UserService.Infrastructure/NodeExtensions.cs
 create mode 100644 UserService/Pages/MembersBase.cs

diff --git a/UserService.DatabaseLayer/DataModels/ModelBuilderExtensions.cs b/UserService.DatabaseLayer/DataModels/ModelBuilderExtensions.cs
index e2be228..242eebd 100644
--- a/UserService.DatabaseLayer/DataModels/ModelBuilderExtensions.cs
+++ b/UserService.DatabaseLayer/DataModels/ModelBuilderExtensions.cs
@@ -17,7 +17,7 @@ namespace UserService.DatabaseLayer.DataModels
             var arizona = new OrganizationUnit{CommonName = "Arizona" , Id = -4, ParentId = -5 };
             var france = new OrganizationUnit{CommonName = "France" , Id = -3, ParentId = -2 };
             modelBuilder.Entity<OrganizationUnit>().HasData(users, groups, germany, usa, arizona, france);
-            var user = new User { CommonName = "holger", IsActive = true, Id = -7, ParentId = germany.Id };
+            var user = new User { CommonName = Environment.UserName, IsActive = true, Id = -7, ParentId = users.Id };
             modelBuilder.Entity<User>().HasData(user);
             var secGroup = new SecurityGroup { CommonName = "Global Admin", Id = -8, ParentId = groups.Id };
             modelBuilder.Entity<SecurityGroup>().HasData(secGroup);
@@ -39,7 +39,6 @@ namespace UserService.DatabaseLayer.DataModels
                 .HasOne(bc => bc.Member)
                 .WithMany(c => c!.Members)
                 .HasForeignKey(bc => bc.MemberId);
-
             modelBuilder.Entity<Node>()
                 .HasMany(c => c.Children)
                 .WithOne(e => e.Parent!)
diff --git a/UserService.DatabaseLayer/Migrations/20200725195658_initial.Designer.cs b/UserService.DatabaseLayer/Migrations/20200821193933_InitialCreate.Designer.cs
similarity index 76%
rename from UserService.DatabaseLayer/Migrations/20200725195658_initial.Designer.cs
rename to UserService.DatabaseLayer/Migrations/20200821193933_InitialCreate.Designer.cs
index 56a7dcf..315dc82 100644
--- a/UserService.DatabaseLayer/Migrations/20200725195658_initial.Designer.cs
+++ b/UserService.DatabaseLayer/Migrations/20200821193933_InitialCreate.Designer.cs
@@ -9,16 +9,16 @@ using UserService.DatabaseLayer.DataModels;
 namespace UserService.DatabaseLayer.Migrations
 {
     [DbContext(typeof(UserServiceDbContext))]
-    [Migration("20200725195658_initial")]
-    partial class initial
+    [Migration("20200821193933_InitialCreate")]
+    partial class InitialCreate
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "3.1.6");
+                .HasAnnotation("ProductVersion", "3.1.7");
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.Node", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.Node", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -47,7 +47,7 @@ namespace UserService.DatabaseLayer.Migrations
                     b.HasDiscriminator<string>("Discriminator").HasValue("Node");
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.UserMember", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.UserMember", b =>
                 {
                     b.Property<int>("MemberId")
                         .HasColumnType("INTEGER");
@@ -69,9 +69,9 @@ namespace UserService.DatabaseLayer.Migrations
                         });
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.Member", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.Member", b =>
                 {
-                    b.HasBaseType("UserService.DatabaseLayer.DataModels.Node");
+                    b.HasBaseType("UserService.Infrastructure.DataModels.Node");
 
                     b.Property<string>("EMail")
                         .HasColumnType("TEXT");
@@ -79,9 +79,9 @@ namespace UserService.DatabaseLayer.Migrations
                     b.HasDiscriminator().HasValue("Member");
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.OrganizationUnit", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.OrganizationUnit", b =>
                 {
-                    b.HasBaseType("UserService.DatabaseLayer.DataModels.Node");
+                    b.HasBaseType("UserService.Infrastructure.DataModels.Node");
 
                     b.Property<int?>("ManagerId")
                         .HasColumnType("INTEGER");
@@ -127,9 +127,9 @@ namespace UserService.DatabaseLayer.Migrations
                         });
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.SecurityGroup", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.SecurityGroup", b =>
                 {
-                    b.HasBaseType("UserService.DatabaseLayer.DataModels.Member");
+                    b.HasBaseType("UserService.Infrastructure.DataModels.Member");
 
                     b.HasDiscriminator().HasValue("SecurityGroup");
 
@@ -142,9 +142,9 @@ namespace UserService.DatabaseLayer.Migrations
                         });
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.User", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.User", b =>
                 {
-                    b.HasBaseType("UserService.DatabaseLayer.DataModels.Member");
+                    b.HasBaseType("UserService.Infrastructure.DataModels.Member");
 
                     b.Property<string>("FirstName")
                         .HasColumnType("TEXT");
@@ -162,36 +162,36 @@ namespace UserService.DatabaseLayer.Migrations
                         {
                             Id = -7,
                             CommonName = "holger",
-                            ParentId = -6,
+                            ParentId = -2,
                             IsActive = true
                         });
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.Node", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.Node", b =>
                 {
-                    b.HasOne("UserService.DatabaseLayer.DataModels.Node", "Parent")
+                    b.HasOne("UserService.Infrastructure.DataModels.Node", "Parent")
                         .WithMany("Children")
                         .HasForeignKey("ParentId");
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.UserMember", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.UserMember", b =>
                 {
-                    b.HasOne("UserService.DatabaseLayer.DataModels.Member", "Member")
+                    b.HasOne("UserService.Infrastructure.DataModels.Member", "Member")
                         .WithMany("Members")
                         .HasForeignKey("MemberId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("UserService.DatabaseLayer.DataModels.User", "User")
+                    b.HasOne("UserService.Infrastructure.DataModels.User", "User")
                         .WithMany("MemberOf")
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.OrganizationUnit", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.OrganizationUnit", b =>
                 {
-                    b.HasOne("UserService.DatabaseLayer.DataModels.Member", "Manager")
+                    b.HasOne("UserService.Infrastructure.DataModels.Member", "Manager")
                         .WithMany()
                         .HasForeignKey("ManagerId");
                 });
diff --git a/UserService.DatabaseLayer/Migrations/20200725195658_initial.cs b/UserService.DatabaseLayer/Migrations/20200821193933_InitialCreate.cs
similarity index 98%
rename from UserService.DatabaseLayer/Migrations/20200725195658_initial.cs
rename to UserService.DatabaseLayer/Migrations/20200821193933_InitialCreate.cs
index bfb6a17..47c7b27 100644
--- a/UserService.DatabaseLayer/Migrations/20200725195658_initial.cs
+++ b/UserService.DatabaseLayer/Migrations/20200821193933_InitialCreate.cs
@@ -2,7 +2,7 @@
 
 namespace UserService.DatabaseLayer.Migrations
 {
-    public partial class initial : Migration
+    public partial class InitialCreate : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
@@ -90,13 +90,13 @@ namespace UserService.DatabaseLayer.Migrations
 
             migrationBuilder.InsertData(
                 table: "Node",
-                columns: new[] { "Id", "CommonName", "Description", "Discriminator", "ParentId", "EMail" },
-                values: new object[] { -8, "Global Admin", null, "SecurityGroup", -1, null });
+                columns: new[] { "Id", "CommonName", "Description", "Discriminator", "ParentId", "EMail", "FirstName", "IsActive", "LastName" },
+                values: new object[] { -7, "holger", null, "User", -2, null, null, true, null });
 
             migrationBuilder.InsertData(
                 table: "Node",
-                columns: new[] { "Id", "CommonName", "Description", "Discriminator", "ParentId", "EMail", "FirstName", "IsActive", "LastName" },
-                values: new object[] { -7, "holger", null, "User", -6, null, null, true, null });
+                columns: new[] { "Id", "CommonName", "Description", "Discriminator", "ParentId", "EMail" },
+                values: new object[] { -8, "Global Admin", null, "SecurityGroup", -1, null });
 
             migrationBuilder.InsertData(
                 table: "Node",
diff --git a/UserService.DatabaseLayer/Migrations/UserServiceDbContextModelSnapshot.cs b/UserService.DatabaseLayer/Migrations/UserServiceDbContextModelSnapshot.cs
index c9aa074..6bd5c44 100644
--- a/UserService.DatabaseLayer/Migrations/UserServiceDbContextModelSnapshot.cs
+++ b/UserService.DatabaseLayer/Migrations/UserServiceDbContextModelSnapshot.cs
@@ -1,7 +1,8 @@
 // <auto-generated />
-
+using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using UserService.DatabaseLayer.DataModels;
 
 namespace UserService.DatabaseLayer.Migrations
@@ -13,9 +14,9 @@ namespace UserService.DatabaseLayer.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "3.1.6");
+                .HasAnnotation("ProductVersion", "3.1.7");
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.Node", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.Node", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -44,7 +45,7 @@ namespace UserService.DatabaseLayer.Migrations
                     b.HasDiscriminator<string>("Discriminator").HasValue("Node");
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.UserMember", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.UserMember", b =>
                 {
                     b.Property<int>("MemberId")
                         .HasColumnType("INTEGER");
@@ -66,9 +67,9 @@ namespace UserService.DatabaseLayer.Migrations
                         });
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.Member", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.Member", b =>
                 {
-                    b.HasBaseType("UserService.DatabaseLayer.DataModels.Node");
+                    b.HasBaseType("UserService.Infrastructure.DataModels.Node");
 
                     b.Property<string>("EMail")
                         .HasColumnType("TEXT");
@@ -76,9 +77,9 @@ namespace UserService.DatabaseLayer.Migrations
                     b.HasDiscriminator().HasValue("Member");
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.OrganizationUnit", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.OrganizationUnit", b =>
                 {
-                    b.HasBaseType("UserService.DatabaseLayer.DataModels.Node");
+                    b.HasBaseType("UserService.Infrastructure.DataModels.Node");
 
                     b.Property<int?>("ManagerId")
                         .HasColumnType("INTEGER");
@@ -124,9 +125,9 @@ namespace UserService.DatabaseLayer.Migrations
                         });
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.SecurityGroup", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.SecurityGroup", b =>
                 {
-                    b.HasBaseType("UserService.DatabaseLayer.DataModels.Member");
+                    b.HasBaseType("UserService.Infrastructure.DataModels.Member");
 
                     b.HasDiscriminator().HasValue("SecurityGroup");
 
@@ -139,9 +140,9 @@ namespace UserService.DatabaseLayer.Migrations
                         });
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.User", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.User", b =>
                 {
-                    b.HasBaseType("UserService.DatabaseLayer.DataModels.Member");
+                    b.HasBaseType("UserService.Infrastructure.DataModels.Member");
 
                     b.Property<string>("FirstName")
                         .HasColumnType("TEXT");
@@ -159,36 +160,36 @@ namespace UserService.DatabaseLayer.Migrations
                         {
                             Id = -7,
                             CommonName = "holger",
-                            ParentId = -6,
+                            ParentId = -2,
                             IsActive = true
                         });
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.Node", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.Node", b =>
                 {
-                    b.HasOne("UserService.DatabaseLayer.DataModels.Node", "Parent")
+                    b.HasOne("UserService.Infrastructure.DataModels.Node", "Parent")
                         .WithMany("Children")
                         .HasForeignKey("ParentId");
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.UserMember", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.UserMember", b =>
                 {
-                    b.HasOne("UserService.DatabaseLayer.DataModels.Member", "Member")
+                    b.HasOne("UserService.Infrastructure.DataModels.Member", "Member")
                         .WithMany("Members")
                         .HasForeignKey("MemberId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("UserService.DatabaseLayer.DataModels.User", "User")
+                    b.HasOne("UserService.Infrastructure.DataModels.User", "User")
                         .WithMany("MemberOf")
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("UserService.DatabaseLayer.DataModels.OrganizationUnit", b =>
+            modelBuilder.Entity("UserService.Infrastructure.DataModels.OrganizationUnit", b =>
                 {
-                    b.HasOne("UserService.DatabaseLayer.DataModels.Member", "Manager")
+                    b.HasOne("UserService.Infrastructure.DataModels.Member", "Manager")
                         .WithMany()
                         .HasForeignKey("ManagerId");
                 });
diff --git a/UserService.Infrastructure/DataModels/Member.cs b/UserService.Infrastructure/DataModels/Member.cs
index ee4a4cc..48be61a 100644
--- a/UserService.Infrastructure/DataModels/Member.cs
+++ b/UserService.Infrastructure/DataModels/Member.cs
@@ -5,9 +5,6 @@ namespace UserService.Infrastructure.DataModels
 {
     public abstract class Member : Node
     {
-        [EmailAddress]
-        public string? EMail { get; set; }
-
         public ICollection<UserMember> Members { get; set; } = new List<UserMember>();
     }
 }
\ No newline at end of file
diff --git a/UserService.Infrastructure/DataModels/User.cs b/UserService.Infrastructure/DataModels/User.cs
index a7f458e..29307e0 100644
--- a/UserService.Infrastructure/DataModels/User.cs
+++ b/UserService.Infrastructure/DataModels/User.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
 
 namespace UserService.Infrastructure.DataModels
 {
@@ -7,7 +9,10 @@ namespace UserService.Infrastructure.DataModels
         public string? FirstName { get; set; }
         public string? LastName { get; set; }
         public bool IsActive { get; set; }
-
+        
+        [EmailAddress]
+        public string? EMail { get; set; }
+        
         public string FullName => $"{FirstName} {LastName}";
 
         public IEnumerable<UserMember> MemberOf { get; set; } = new List<UserMember>();
diff --git a/UserService.Infrastructure/NodeExtensions.cs b/UserService.Infrastructure/NodeExtensions.cs
new file mode 100644
index 0000000..db0a73d
--- /dev/null
+++ b/UserService.Infrastructure/NodeExtensions.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UserService.Infrastructure.DataModels;
+
+namespace UserService.Infrastructure
+{
+    public static class NodeExtensions
+    {
+        public static void MapFields(this User user, Dictionary<string, object> values)
+        {
+            if (user == null) throw new ArgumentNullException(nameof(user));
+            if (values == null) throw new ArgumentNullException(nameof(values));
+            var properties = user.GetType().GetProperties();
+            foreach (var keyValuePair in values)
+            {
+                var propertyInfo = properties.FirstOrDefault(x => x.Name == keyValuePair.Key);
+                if (propertyInfo == null) continue;
+                propertyInfo.SetValue(user, keyValuePair.Value);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/UserService.Infrastructure/UserService.Infrastructure.csproj b/UserService.Infrastructure/UserService.Infrastructure.csproj
index 551862b..9b7b3a1 100644
--- a/UserService.Infrastructure/UserService.Infrastructure.csproj
+++ b/UserService.Infrastructure/UserService.Infrastructure.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/UserService.Infrastructure/Validators.cs b/UserService.Infrastructure/Validators.cs
index 5eabcf6..11222cd 100644
--- a/UserService.Infrastructure/Validators.cs
+++ b/UserService.Infrastructure/Validators.cs
@@ -7,13 +7,13 @@ namespace UserService.Infrastructure
 {
     public static class Validators
     {
-        public static bool? ValidateEmail(string mailAddress)
+        public static bool? ValidateEmail(string? mailAddress)
         {
             if (string.IsNullOrEmpty(mailAddress)) return null;
             return new EmailAddressAttribute().IsValid(mailAddress);
         }
 
-        public static bool? ValidateCommonName(string commonName, IReadOnlyList<User> users)
+        public static bool? ValidateCommonName(string? commonName, IEnumerable<Member> users)
         {
             if (string.IsNullOrEmpty(commonName)) return false;
             return users.All(x => x.CommonName != commonName);
diff --git a/UserService.db b/UserService.db
index adc6bf48576a35c914c5bf477dd3fb9dc74b6429..ca2980f8c942ced04ca1ebd17230eba88d94d3ed 100644
GIT binary patch
delta 396
zcmZoTz|?SnX#<-8%Pj`}Tbl(HF7T_XFfzM}8yOfG7+4q?8d@4#8XL!Z=4F;-CgwO7
zr6!i78tWPAnR9Js6u8fCA<yi}iBByr0|NsG-&zK~Tl}2-b^M`xYxy<#uko+mEGRIQ
zZ}M5Y7zMHaQ1FwRL6U({6sUodAtOI0J+<gxXmM)M<OciD$!T`FldsxqPY$!!n&iO7
z@|}VI`)0ujZ~2AU8JR^n{PI&$K^8Ic|776*36Wr6U}a=xWc=}y3spjqfq{*Mk&zQ3
z!NGrtf&VxEH~tU&ulS$v-{Zf*e+lTcUHopWK+XSufXIJ;!Q^i+`3p?`1d+f0urM<)
z{s$5NK$dXu-+-9)k^c?<bN)yCclmDs%{st8`9{B-2uRsa5b*=zpx;2XV3$q|U}0rp
IX5{<{0P`k#ZU6uP

delta 1088
zcmZuv-Ahwp9DdKvcDA{l{U&5~u<RIxnYs3Xx>>Y2Fhj%y(+Gk%ZfD!EZAZ>FN-vuK
zK_9#Ds;eM~6$+y+>LQ~ky0D9)u&6E~jHHVqSi0Hlecvs^h!-Ay=lOj-=Xu|m1>MYo
zZl1FjIPonUXl7Vnquc3rI=kJSE?;L?r}wOqRMLtR_c&aRt~!Je1Iq}O3-y6_a7<u*
z=Kq)T)-T9z&9k<WEdsY}i!cLY@QR<a<!tSIk=NiLKg0{xy!D4QSE#o~ty$c#LqJRe
zUSUELQc_7umC=-}9kEzY6Xv^{cAL?J8k3Sq$w(5lI54itS|}!KDTk^>2dV|ZM|Z27
ztra=<;ch|L%U9<J0+>-ujYnn8O&7QVZbw+o9;Z~$W3r$|+~8>x%xF?h%NkuqBS$=w
zN-NR8bU1=LhDmaeGJA{`gtd2I?FjW|G$j<{PH0j56Vp;!QIn(C!@~wVxSwgIH7BKD
zUvF<bE~exVE>BO1*{G&wCR1WW)kK=z7^$WDNurOz8`_u#mq1*g?$G_Bl1hsqRgJGx
zOK8H|9f&3*CGH5Ri2=%N+Hpva$Fwl50#Ol^lK7lb;$bnOjb)Vd)|FLXaGl=AT2PCx
zCY{z(v8UCHn2^rNVq!{+$&!{9$7SiCA-RkGjvlX$+SA}6;;YtEQ>)>)*Yj6z?H2xA
zU+(tNGrQn5+Rs@KzQ(G-gX(!%6Gx;AYI3TSd*biOwfRSLd4K!W0H-e^C>H83ufTTv
zju^Iq8B)VC&y)YPBLr(ScV*aQGcv1d<UMbtoklaJ;Tp2TECX+#2y^fW7U3JLzz28%
z58*!Cft&CYuEQ)j`0>h+#SL7=YG4`0Xn``0c^aDtaz=tBj^KuYqMjm4(5Tb1jCq|B
ztDt8QQz3EX7r`>+D`m=*NOA)UHdN|h9t+GfP=@dD6+Z8TkMJIr;3vF<=kN?3!vna7
zb>?9nZeWGe;Km&WE16&+6L=Dt2p9=)1Plc91Xu#P+|s4yZHQ%&nS8EpdR4AjSf?|r
F{RZ6cFuVW&

diff --git a/UserService/Pages/MembersBase.cs b/UserService/Pages/MembersBase.cs
new file mode 100644
index 0000000..fddd685
--- /dev/null
+++ b/UserService/Pages/MembersBase.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Blazorise;
+using Blazorise.DataGrid;
+using Microsoft.AspNetCore.Components;
+using UserService.Infrastructure;
+using UserService.Infrastructure.DataModels;
+
+namespace UserService.Pages
+{
+    public abstract class MembersBase<T> : ComponentBase where T : Member
+    {
+        protected IReadOnlyList<OrganizationUnit>? OrganizationUnits { get; set; }
+
+        protected IReadOnlyList<T>? Members { get; set; }
+
+        protected string? CustomFilterValue { get; set; }
+
+        protected abstract Task RowInsertingCallback(CancellableRowChange<T, Dictionary<string, object>> arg);
+
+        protected abstract Task RowInsertedCallback(SavedRowItem<T, Dictionary<string, object>> arg);
+        protected abstract Task RowDeletingCallback(CancellableRowChange<T> arg);
+        protected abstract Task RowUpdatingCallback(CancellableRowChange<T, Dictionary<string, object>> arg);
+        protected abstract bool OnCustomFilter(T model);
+
+        protected void ValidateCommonName(ValidatorEventArgs e)
+        {
+            if (e == null) throw new ArgumentNullException(nameof(e));
+            var commonName = e.Value?.ToString();
+            var validationResult = Validators.ValidateCommonName(commonName, Members ?? Enumerable.Empty<Member>());
+            e.Status = validationResult == false ? ValidationStatus.Error : ValidationStatus.Success;
+        }
+    }
+}
\ No newline at end of file
diff --git a/UserService/Pages/SecurityGroups.razor b/UserService/Pages/SecurityGroups.razor
index aef421f..e02635f 100644
--- a/UserService/Pages/SecurityGroups.razor
+++ b/UserService/Pages/SecurityGroups.razor
@@ -4,7 +4,7 @@
 
 <h1>Table of all security groups</h1>
 
-@if (Groups is null)
+@if (Members is null)
 {
 <p>
     <em>Loading...</em>
@@ -12,10 +12,76 @@
 }
 else
 {
-<DataGrid TItem="SecurityGroup" Data="@Groups">
-    <DataGridCommandColumn TItem="User" />
-    <DataGridColumn TItem="SecurityGroup" Field="@nameof(SecurityGroup.Id)" Caption="#" Sortable="false" />
-    <DataGridColumn TItem="SecurityGroup" Field="@nameof(SecurityGroup.CommonName)" Caption="CN" Editable="true" />
-    <DataGridColumn TItem="SecurityGroup" Field="@nameof(SecurityGroup.EMail)" Caption="EMail" Editable="true" />
-</DataGrid>
+<TextEdit Placeholder="Search" Size="Size.Large" @bind-Text="@CustomFilterValue" />
+
+    <DataGrid 
+        TItem="SecurityGroup" 
+        RowSelectable="@(u => false)" 
+        CustomFilter="@OnCustomFilter" 
+        Sortable="true" 
+        Editable="true" 
+        EditMode="DataGridEditMode.Inline" 
+        RowRemoving="RowDeletingCallback" 
+        Data="@Members" 
+        RowInserted="RowInsertedCallback" 
+        RowInserting="RowInsertingCallback" 
+        RowUpdating="RowUpdatingCallback">
+        <DataGridCommandColumn TItem="SecurityGroup">
+            <NewCommandTemplate>
+                <Button Color="Color.Success" Clicked="@context.Clicked" title="Create security group">
+                    <i class="fas fa-users"></i>
+                </Button>
+            </NewCommandTemplate>
+            <EditCommandTemplate>
+                <Button Color="Color.Primary" Clicked="@context.Clicked" title="Edit security group">
+                    <i class="fa fa-user-edit"></i>
+                </Button>
+            </EditCommandTemplate>
+            <DeleteCommandTemplate>
+                <Button Color="Color.Danger" Clicked="@context.Clicked" title="Delete security group">
+                    <i class="fa fa-user-minus"></i>
+                </Button>
+            </DeleteCommandTemplate>
+            <SaveCommandTemplate>
+                <Button Color="Color.Success" Clicked="@context.Clicked" title="Save security group">
+                    <i class="fas fa-save"></i>
+                </Button>
+            </SaveCommandTemplate>
+            <CancelCommandTemplate>
+                <Button Color="Color.Danger" Clicked="@context.Clicked" title="Cancel editing">
+                    <i class="far fa-times-circle"></i>
+                </Button>
+            </CancelCommandTemplate>
+        </DataGridCommandColumn>
+        <DataGridColumn TItem="SecurityGroup" Field="@nameof(SecurityGroup.Id)" Caption="#" Sortable="false" />
+
+        <DataGridColumn TItem="SecurityGroup" Field="@nameof(SecurityGroup.CommonName)" Caption="CN" CellsEditableOnEditCommand="false" Editable="true">
+            <EditTemplate>
+                <Validation Validator="@ValidateCommonName">
+                    <TextEdit Placeholder="Enter common name" Text="@((string)(((CellEditContext)context).CellValue))" TextChanged="@(v=>((CellEditContext)context).CellValue=v)">
+                        <Feedback>
+                            <ValidationSuccess></ValidationSuccess>
+                            <ValidationError>Please enter a valid common name!</ValidationError>
+                        </Feedback>
+                    </TextEdit>
+                </Validation>
+            </EditTemplate>
+        </DataGridColumn>
+        <DataGridSelectColumn TItem="SecurityGroup" Field="@nameof(SecurityGroup.ParentId)" Caption="Parent" Editable="true">
+            <DisplayTemplate>
+                @{
+                    var name = ((SecurityGroup) context ).Parent?.CommonName ?? "-";
+                    @name
+                }
+            </DisplayTemplate>
+            <EditTemplate>
+                    <Select TValue="int?" SelectedValue="@((int?)(context.CellValue))" SelectedValueChanged="@(v => context.CellValue = v)" >
+                    @foreach (var item in OrganizationUnits ?? Enumerable.Empty<OrganizationUnit>())
+                    {
+                        <SelectItem TValue="int" Value="@(item.Id)">@item.CommonName</SelectItem>
+                    }
+                    </Select>
+            </EditTemplate>
+        </DataGridSelectColumn>
+    </DataGrid>
 }
\ No newline at end of file
diff --git a/UserService/Pages/SecurityGroups.razor.cs b/UserService/Pages/SecurityGroups.razor.cs
index c1fcb06..4145a00 100644
--- a/UserService/Pages/SecurityGroups.razor.cs
+++ b/UserService/Pages/SecurityGroups.razor.cs
@@ -1,47 +1,49 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Blazorise.DataGrid;
 using Microsoft.AspNetCore.Components;
 using UserService.DatabaseLayer.Repository;
 using UserService.Infrastructure.DataModels;
 
 namespace UserService.Pages
 {
-    public class SecurityGroupsBase : ComponentBase
+    public class SecurityGroupsBase : MembersBase<SecurityGroup>
     {
         [Inject] private ISecurityGroupsRepository SecurityGroupsRepository { get; set; } = null!;
         [Inject] private IOrganizationUnitsRepository OrganizationUnitsRepository { get; set; } = null!;
 
-        protected bool DialogIsOpen { get; set; }
-        protected SecurityGroup? SecurityGroupToEdit { get; set; }
-
-        protected IReadOnlyList<SecurityGroup>? Groups { get; set; }
-        protected IReadOnlyList<OrganizationUnit>? OrganizationUnits { get; set; }
-
         protected override async Task OnInitializedAsync()
         {
-            Groups = await SecurityGroupsRepository.GetAllAsync().ConfigureAwait(false);
+            Members = await SecurityGroupsRepository.GetAllAsync().ConfigureAwait(false);
             OrganizationUnits = await OrganizationUnitsRepository.GetAllAsync().ConfigureAwait(false);
         }
 
-        protected void EditSecurityGroup(SecurityGroup securityGroup)
+        /// <inheritdoc />
+        protected override async Task RowInsertingCallback(CancellableRowChange<SecurityGroup, Dictionary<string, object>> arg)
         {
-            SecurityGroupToEdit = securityGroup;
-            DialogIsOpen = true;
         }
 
-        protected async Task OkClick()
+        /// <inheritdoc />
+        protected override async Task RowInsertedCallback(SavedRowItem<SecurityGroup, Dictionary<string, object>> arg)
         {
-            if (!(SecurityGroupToEdit is null))
-            {
-                await SecurityGroupsRepository.UpdateAsync(SecurityGroupToEdit).ConfigureAwait(false);
-            }
-
-            DialogIsOpen = false;
         }
 
-        protected async Task DeleteSecurityGroup(SecurityGroup securityGroup)
+        /// <inheritdoc />
+        protected override async Task RowDeletingCallback(CancellableRowChange<SecurityGroup> arg)
         {
-            await SecurityGroupsRepository.DeleteAsync(securityGroup).ConfigureAwait(false);
+            
+            
+        }
+
+        /// <inheritdoc />
+        protected override async Task RowUpdatingCallback(CancellableRowChange<SecurityGroup, Dictionary<string, object>> arg)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override bool OnCustomFilter(SecurityGroup model)
+        {
+            return true;
         }
     }
 }
\ No newline at end of file
diff --git a/UserService/Pages/Users.razor b/UserService/Pages/Users.razor
index 33c4612..625b638 100644
--- a/UserService/Pages/Users.razor
+++ b/UserService/Pages/Users.razor
@@ -4,7 +4,7 @@
 
 <h1>List of all users</h1>
 
-@if (Users == null)
+@if (Members == null)
 {
     <p>
         <em>Loading...</em>
@@ -14,7 +14,18 @@ else
 {
     <TextEdit Placeholder="Search" Size="Size.Large" @bind-Text="@CustomFilterValue" />
 
-    <DataGrid TItem="User" RowSelectable="@(u => false)" CustomFilter="@OnCustomFilter" Sortable="true" Editable="true" EditMode="DataGridEditMode.Popup" RowRemoving="RowDeletingCallback" Data="@Users" RowInserted="RowInsertedCallback" RowInserting="RowInsertingCallback" RowUpdating="RowUpdatingCallback">
+    <DataGrid 
+        TItem="User" 
+        RowSelectable="@(u => false)" 
+        CustomFilter="@OnCustomFilter" 
+        Sortable="true" 
+        Editable="true" 
+        EditMode="DataGridEditMode.Inline" 
+        RowRemoving="RowDeletingCallback" 
+        Data="@Members" 
+        RowInserted="RowInsertedCallback" 
+        RowInserting="RowInsertingCallback" 
+        RowUpdating="RowUpdatingCallback">
         <DataGridCommandColumn TItem="User">
             <NewCommandTemplate>
                 <Button Color="Color.Success" Clicked="@context.Clicked" title="Create user">
@@ -77,11 +88,10 @@ else
                     var name = ((User) context ).Parent?.CommonName ?? "-";
                     @name
                 }
-
             </DisplayTemplate>
             <EditTemplate>
                     <Select TValue="int?" SelectedValue="@((int?)(context.CellValue))" SelectedValueChanged="@(v => context.CellValue = v)" >
-                    @foreach (var item in OrganizationUnits)
+                    @foreach (var item in OrganizationUnits ?? Enumerable.Empty<OrganizationUnit>())
                     {
                         <SelectItem TValue="int" Value="@(item.Id)">@item.CommonName</SelectItem>
                     }
diff --git a/UserService/Pages/Users.razor.cs b/UserService/Pages/Users.razor.cs
index 78592c4..ac0916b 100644
--- a/UserService/Pages/Users.razor.cs
+++ b/UserService/Pages/Users.razor.cs
@@ -12,42 +12,40 @@ using UserService.Infrastructure.DataModels;
 
 namespace UserService.Pages
 {
-    public class UsersBase : ComponentBase
+    public class UsersBase : MembersBase<User>
     {
         [Inject] private IUsersRepository UsersRepository { get; set; } = null!;
         [Inject] private IOrganizationUnitsRepository OrganizationUnitsRepository { get; set; } = null!;
 
         [Inject] private IJSRuntime JsRuntime { get; set; } = null!;
 
-        protected IReadOnlyList<User>? Users { get; private set; }
-        protected IReadOnlyList<OrganizationUnit>? OrganizationUnits { get; private set; }
-        protected string? CustomFilterValue { get; set; }
-
         protected override async Task OnInitializedAsync()
         {
-            Users = await UsersRepository.GetAllAsync().ConfigureAwait(false);
+            Members = await UsersRepository.GetAllAsync().ConfigureAwait(false);
             OrganizationUnits = await OrganizationUnitsRepository.GetAllAsync().ConfigureAwait(false);
         }
 
-        protected async Task RowInsertingCallback(CancellableRowChange<User, Dictionary<string, object>> arg)
+        protected override async Task RowInsertingCallback(CancellableRowChange<User, Dictionary<string, object>> arg)
         {
             if (arg is null) throw new ArgumentNullException(nameof(arg));
             var mailValidation = Validators.ValidateEmail(arg.Values[nameof(User.EMail)]?.ToString());
-            var commonNameValidation = Validators.ValidateCommonName(arg.Values[nameof(User.CommonName)]?.ToString(), Users);
+            var commonNameValidation = Validators.ValidateCommonName(arg.Values[nameof(User.CommonName)]?.ToString(),
+                Members ?? Enumerable.Empty<User>());
             if (mailValidation == true && commonNameValidation == true) return;
 
             await JsRuntime.InvokeVoidAsync("alert", "User could not be added").ConfigureAwait(false);
             arg.Cancel = true;
         }
 
-        protected async Task RowInsertedCallback(SavedRowItem<User, Dictionary<string, object>> arg)
+        protected override async Task RowInsertedCallback(SavedRowItem<User, Dictionary<string, object>> arg)
         {
             if (arg is null) throw new ArgumentNullException(nameof(arg));
             var user = arg.Item;
-            user.Parent = OrganizationUnits?.FirstOrDefault(x => x.Id == user.ParentId);
             await UsersRepository.AddAsync(user).ConfigureAwait(false);
+            user.Parent = OrganizationUnits?.FirstOrDefault(x => x.Id == user.ParentId);
         }
-        protected async Task RowDeletingCallback(CancellableRowChange<User> arg)
+
+        protected override async Task RowDeletingCallback(CancellableRowChange<User> arg)
         {
             if (arg == null) throw new ArgumentNullException(nameof(arg));
             var confirmed = await JsRuntime.InvokeAsync<bool>("confirm",
@@ -61,14 +59,6 @@ namespace UserService.Pages
             arg.Cancel = true;
         }
 
-        protected void ValidateCommonName(ValidatorEventArgs e)
-        {
-            if (e == null) throw new ArgumentNullException(nameof(e));
-            var commonName = e.Value?.ToString();
-            var validationResult = Validators.ValidateCommonName(commonName, Users);
-            e.Status = validationResult == false ? ValidationStatus.Error : ValidationStatus.Success;
-        }
-
         protected static void ValidateEmail(ValidatorEventArgs e)
         {
             if (e == null) throw new ArgumentNullException(nameof(e));
@@ -82,25 +72,28 @@ namespace UserService.Pages
                 _ => ValidationStatus.Success
             };
         }
-        protected async Task RowUpdatingCallback(CancellableRowChange<User, Dictionary<string, object>> arg)
+
+        protected override async Task RowUpdatingCallback(CancellableRowChange<User, Dictionary<string, object>> arg)
         {
             if (arg == null) throw new ArgumentNullException(nameof(arg));
             var user = arg.Item;
-            user.Parent = OrganizationUnits.FirstOrDefault(x => x.Id == (int?)arg.Values[nameof(Node.ParentId)]);
+            user.MapFields(arg.Values);
+            user.Parent = OrganizationUnits?.FirstOrDefault(x => x.Id == (int?) arg.Values[nameof(Node.ParentId)]);
             var result = await UsersRepository.UpdateAsync(user).ConfigureAwait(false);
             arg.Cancel = !result;
         }
 
-        protected bool OnCustomFilter(User model)
+        protected override bool OnCustomFilter(User model)
         {
+            if (model == null) throw new ArgumentNullException(nameof(model));
             // We want to accept empty value as valid or otherwise
             // datagrid will not show anything.
             if (string.IsNullOrEmpty(CustomFilterValue) || CustomFilterValue.Length < 3) return true;
 
             return
-                model?.FirstName?.Contains(CustomFilterValue, StringComparison.OrdinalIgnoreCase) == true
-                || model?.LastName?.Contains(CustomFilterValue, StringComparison.OrdinalIgnoreCase) == true
-                || model?.CommonName?.Contains(CustomFilterValue, StringComparison.OrdinalIgnoreCase) == true;
+                model.FirstName?.Contains(CustomFilterValue, StringComparison.OrdinalIgnoreCase) == true
+                || model.LastName?.Contains(CustomFilterValue, StringComparison.OrdinalIgnoreCase) == true
+                || model.CommonName.Contains(CustomFilterValue, StringComparison.OrdinalIgnoreCase);
         }
     }
 }
\ No newline at end of file
-- 
2.49.0