Correctly sync available projects, roles and clients on add and delete (#6981)

* Correctly sync available projects on add and delete

* Also fix user-roles

* Also fix user-clients

* Add Sort

Author: BartChris

Kitodo/src/main/java/org/kitodo/production/forms/user/UserEditViewClientsTab.java

@@ -107,6 +107,10 @@ public String deleteFromClient() {
                 for (Client client : this.userObject.getClients()) {
                     if (client.getId().equals(clientId)) {
                         this.userObject.getClients().remove(client);
+                        if (Objects.nonNull(this.clients) && !this.clients.contains(client)) {
+                            this.clients.add(client);
+                            this.clients.sort(Comparator.comparing(Client::getName, String.CASE_INSENSITIVE_ORDER));
+                        }
                         if (client.equals(this.userObject.getDefaultClient())) {
                             this.userObject.setDefaultClient(null);
                         }
@@ -137,6 +141,9 @@ public String addToClient() {
 
                 if (!this.userObject.getClients().contains(client)) {
                     this.userObject.getClients().add(client);
+                    if (Objects.nonNull(this.clients)) {
+                        this.clients.remove(client);
+                    }
                 }
             } catch (DAOException e) {
                 Helper.setErrorMessage(ERROR_DATABASE_READING,

Kitodo/src/main/java/org/kitodo/production/forms/user/UserEditViewProjectsTab.java

@@ -24,6 +24,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.kitodo.data.database.beans.Project;
+import org.kitodo.data.database.beans.Role;
 import org.kitodo.data.database.beans.User;
 import org.kitodo.data.database.exceptions.DAOException;
 import org.kitodo.production.enums.ObjectType;
@@ -105,6 +106,10 @@ public String deleteFromProject() {
                 for (Project project : this.userObject.getProjects()) {
                     if (project.getId().equals(projectId)) {
                         this.userObject.getProjects().remove(project);
+                        if (Objects.nonNull(this.projects) && !this.projects.contains(project)) {
+                            this.projects.add(project);
+                            this.projects.sort(Comparator.comparing(Project::getTitle, String.CASE_INSENSITIVE_ORDER));
+                        }
                         break;
                     }
                 }
@@ -132,6 +137,9 @@ public String addToProject() {
 
                 if (!this.userObject.getProjects().contains(project)) {
                     this.userObject.getProjects().add(project);
+                    if (Objects.nonNull(this.projects)) {
+                        this.projects.remove(project);
+                    }
                 }
             } catch (DAOException e) {
                 Helper.setErrorMessage(ERROR_DATABASE_READING,

Kitodo/src/main/java/org/kitodo/production/forms/user/UserEditViewRolesTab.java

@@ -23,6 +23,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.kitodo.data.database.beans.Client;
 import org.kitodo.data.database.beans.Role;
 import org.kitodo.data.database.beans.User;
 import org.kitodo.data.database.exceptions.DAOException;
@@ -104,6 +105,10 @@ public String deleteFromRole() {
                 for (Role role : this.userObject.getRoles()) {
                     if (role.getId().equals(roleId)) {
                         this.userObject.getRoles().remove(role);
+                        if (Objects.nonNull(this.availableRoles) && !this.availableRoles.contains(role)) {
+                            this.availableRoles.add(role);
+                            this.availableRoles.sort(Comparator.comparing(Role::getTitle, String.CASE_INSENSITIVE_ORDER));
+                        }
                         break;
                     }
                 }
@@ -131,6 +136,9 @@ public String addToRole() {
 
                 if (!this.userObject.getRoles().contains(role)) {
                     this.userObject.getRoles().add(role);
+                    if (Objects.nonNull(this.availableRoles)) {
+                        this.availableRoles.remove(role);
+                    }
                 }
             } catch (DAOException e) {
                 Helper.setErrorMessage(ERROR_DATABASE_READING,