Hide contact dropdown from everyone but admins (#533)

* hide known contacts from everyone but admin

* address review comments

* replace button by labeled checkbox

* remove unnecessary throws

* address code smells

* only set contacts if there are any

---------

Co-authored-by: Steffengreiner <[email protected]>

Author: wow-such-code

project-management/src/main/java/life/qbic/projectmanagement/application/ContactRepository.java

@@ -1,19 +1,22 @@
 package life.qbic.projectmanagement.application;
 
+import java.util.ArrayList;
 import java.util.List;
 import life.qbic.projectmanagement.domain.model.project.Contact;
+import org.springframework.security.access.prepost.PostFilter;
 import org.springframework.stereotype.Component;
 
 @Component
 public class ContactRepository {
 
+  @PostFilter("hasAnyAuthority('ROLE_ADMIN')")
   public List<Contact> findAll() {
-    //TODO implement
-    return dummyContacts();
+      //TODO implement
+      return dummyContacts();
   }
 
   private static List<Contact> dummyContacts() {
-    return List.of(
+    return new ArrayList<>(List.of(
         new Contact("Max Mustermann", "[email protected]"),
         new Contact("David Müller", "[email protected]"),
         new Contact("John Koch", "[email protected]"),
@@ -22,7 +25,7 @@ private static List<Contact> dummyContacts() {
         new Contact("Anna Bell", "[email protected]"),
         new Contact("Sophia Turner", "[email protected]"),
         new Contact("Tylor Smith", "[email protected]")
-    );
+    ));
   }
 
 

user-interface/frontend/themes/datamanager/components/dialog.css

@@ -216,7 +216,7 @@ vaadin-dialog-overlay::part(title) {
 }
 
 .contact-field .prefill-input-fields .contact-self-select {
-  width: 5em;
+  width: 36em;
 }
 
 .edit-project-dialog .form-content .contact-field .name-field {

user-interface/src/main/java/life/qbic/datamanager/views/general/contact/AutocompleteContactField.java

@@ -2,8 +2,7 @@
 
 import static java.util.Objects.isNull;
 
-import com.vaadin.flow.component.ClickEvent;
-import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.checkbox.Checkbox;
 import com.vaadin.flow.component.combobox.ComboBox;
 import com.vaadin.flow.component.customfield.CustomField;
 import com.vaadin.flow.component.html.Div;
@@ -32,12 +31,12 @@ public class AutocompleteContactField extends CustomField<Contact> implements
 
 
   private final ComboBox<Contact> contactSelection;
-  private final Button selfSelect;
+  private final Checkbox selfSelect;
   private final TextField nameField;
   private final TextField emailField;
   private final Binder<Contact> binder;
 
-  public AutocompleteContactField(String label) {
+  public AutocompleteContactField(String label, String shortName) {
     setLabel(label);
     addClassName("contact-field");
     binder = new Binder<>();
@@ -52,9 +51,9 @@ public AutocompleteContactField(String label) {
     contactSelection.setItemLabelGenerator(
         contact -> "%s - %s".formatted(contact.getFullName(), contact.getEmail()));
 
-    selfSelect = new Button("Myself");
+    selfSelect = new Checkbox("Choose myself as %s for this project".formatted(shortName));
     selfSelect.addClassName("contact-self-select");
-    selfSelect.addClickListener(this::onSelfSelected);
+    selfSelect.addValueChangeListener(this::onSelfSelected);
 
     nameField = new TextField();
     nameField.setRequired(false);
@@ -98,11 +97,13 @@ public AutocompleteContactField(String label) {
     clear();
   }
 
-  private void onSelfSelected(ClickEvent<Button> buttonClickEvent) {
-    Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-    QbicUserDetails details = (QbicUserDetails) authentication.getPrincipal();
-    Contact userAsContact = new Contact(details.fullName(), details.getEmailAddress());
-    setContact(userAsContact);
+  private void onSelfSelected(ComponentValueChangeEvent<Checkbox, Boolean> checkboxvalueChangeEvent) {
+    if(checkboxvalueChangeEvent.getValue().booleanValue()) {
+      Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+      QbicUserDetails details = (QbicUserDetails) authentication.getPrincipal();
+      Contact userAsContact = new Contact(details.fullName(), details.getEmailAddress());
+      setContact(userAsContact);
+    }
   }
 
   private void updateValidationProperty() {
@@ -182,4 +183,7 @@ public Binder<Contact> getBinder() {
     return binder;
   }
 
+  public void hideContactBox() {
+    contactSelection.setVisible(false);
+  }
 }

user-interface/src/main/java/life/qbic/datamanager/views/projects/create/AddProjectDialog.java

@@ -80,11 +80,13 @@ public AddProjectDialog(FinanceService financeService,
     this.experimentalInformationLayout = new ExperimentalInformationLayout(
         ontologyLookupService);
 
-    List<Contact> knownContacts = contactRepository.findAll().stream()
-        .map(contact -> new Contact(contact.fullName(), contact.emailAddress())).toList();
-    collaboratorsLayout.setPrincipalInvestigators(knownContacts);
-    collaboratorsLayout.setResponsiblePersons(knownContacts);
-    collaboratorsLayout.setProjectManagers(knownContacts);
+    List<Contact> knownContacts = contactRepository.findAll().stream().map(contact ->
+        new Contact(contact.fullName(), contact.emailAddress())).toList();
+    if(knownContacts.isEmpty()) {
+      collaboratorsLayout.hideContactBox();
+    } else {
+      collaboratorsLayout.setKnownContacts(knownContacts);
+    }
 
     stepContent = new HashMap<>();
 

user-interface/src/main/java/life/qbic/datamanager/views/projects/create/CollaboratorsLayout.java

@@ -37,15 +37,15 @@ public CollaboratorsLayout() {
     collaboratorsBinder.setBean(new ProjectCollaborators());
     collaboratorsBinder.setFieldsValidationStatusChangeListenerEnabled(true);
 
-    principalInvestigatorField = new AutocompleteContactField("Principal Investigator");
+    principalInvestigatorField = new AutocompleteContactField("Principal Investigator", "PI");
     principalInvestigatorField.setRequired(true);
     collaboratorsBinder.forField(principalInvestigatorField)
         .withNullRepresentation(principalInvestigatorField.getEmptyValue())
         .withValidator(it -> principalInvestigatorField.validate().isValid(), "")
         .bind(ProjectCollaborators::getPrincipalInvestigator,
             ProjectCollaborators::setPrincipalInvestigator);
 
-    responsiblePersonField = new AutocompleteContactField("Project Responsible/Co-Investigator (optional)");
+    responsiblePersonField = new AutocompleteContactField("Project Responsible/Co-Investigator (optional)", "Responsible");
     responsiblePersonField.setRequired(false);
     responsiblePersonField.setHelperText("Should be contacted about project-related questions");
     collaboratorsBinder.forField(responsiblePersonField)
@@ -54,7 +54,7 @@ public CollaboratorsLayout() {
         .bind(bean -> bean.getResponsiblePerson().orElse(null),
             ProjectCollaborators::setResponsiblePerson);
 
-    projectManagerField = new AutocompleteContactField("Project Manager");
+    projectManagerField = new AutocompleteContactField("Project Manager", "Manager");
     projectManagerField.setRequired(true);
     collaboratorsBinder.forField(projectManagerField)
         .withNullRepresentation(projectManagerField.getEmptyValue())
@@ -118,6 +118,18 @@ public ProjectCollaborators getProjectCollaborators() {
     return projectCollaborators;
   }
 
+  public void setKnownContacts(List<Contact> knownContacts) {
+    principalInvestigatorField.setItems(knownContacts);
+    responsiblePersonField.setItems(knownContacts);
+    projectManagerField.setItems(knownContacts);
+  }
+
+  public void hideContactBox() {
+    principalInvestigatorField.hideContactBox();
+    responsiblePersonField.hideContactBox();
+    projectManagerField.hideContactBox();
+  }
+
   public static final class ProjectCollaborators implements Serializable {
 
     @Serial

user-interface/src/main/java/life/qbic/datamanager/views/projects/edit/EditProjectInformationDialog.java

@@ -51,12 +51,14 @@ public EditProjectInformationDialog(ContactRepository contactRepository) {
 
     formLayout = new EditProjectInformationForm();
 
-    List<Contact> knownContacts = contactRepository.findAll().stream()
-        .map(contact -> new Contact(contact.fullName(), contact.emailAddress())).toList();
-    formLayout.setPrincipalInvestigators(knownContacts);
-    formLayout.setResponsiblePersons(knownContacts);
-    formLayout.setProjectManagers(knownContacts);
+    List<Contact> knownContacts = contactRepository.findAll().stream().map(contact ->
+        new Contact(contact.fullName(), contact.emailAddress())).toList();
 
+    if(knownContacts.isEmpty()) {
+      formLayout.hideContactBox();
+    } else {
+      formLayout.setKnownContacts(knownContacts);
+    }
 
     binder = formLayout.getBinder();
 

user-interface/src/main/java/life/qbic/datamanager/views/projects/edit/EditProjectInformationForm.java

@@ -85,15 +85,15 @@ public EditProjectInformationForm() {
     projectContactsLayout.add(projectContactsTitle);
     projectContactsLayout.add(projectContactsDescription);
 
-    principalInvestigatorField = new AutocompleteContactField("Principal Investigator");
+    principalInvestigatorField = new AutocompleteContactField("Principal Investigator", "PI");
     principalInvestigatorField.setRequired(true);
     principalInvestigatorField.setId("principal-investigator");
     binder.forField(principalInvestigatorField)
         .withValidator(it -> principalInvestigatorField.isValid(), "")
         .bind((ProjectInformation::getPrincipalInvestigator),
             ProjectInformation::setPrincipalInvestigator);
 
-    responsiblePersonField = new AutocompleteContactField("Project Responsible (optional)");
+    responsiblePersonField = new AutocompleteContactField("Project Responsible (optional)", "Responsible");
     responsiblePersonField.setRequired(false);
     responsiblePersonField.setId("responsible-person");
     responsiblePersonField.setHelperText("Should be contacted about project-related questions");
@@ -103,7 +103,7 @@ public EditProjectInformationForm() {
         .bind(projectInformation -> projectInformation.getResponsiblePerson().orElse(null),
             ProjectInformation::setResponsiblePerson);
 
-    projectManagerField = new AutocompleteContactField("Project Manager");
+    projectManagerField = new AutocompleteContactField("Project Manager", "Manager");
     projectManagerField.setRequired(true);
     projectManagerField.setId("project-manager");
     binder.forField(projectManagerField)
@@ -176,4 +176,15 @@ public Binder<ProjectInformation> getBinder() {
     return binder;
   }
 
+  public void setKnownContacts(List<Contact> knownContacts) {
+    principalInvestigatorField.setItems(knownContacts);
+    responsiblePersonField.setItems(knownContacts);
+    projectManagerField.setItems(knownContacts);
+  }
+
+  public void hideContactBox() {
+    principalInvestigatorField.hideContactBox();
+    responsiblePersonField.hideContactBox();
+    projectManagerField.hideContactBox();
+  }
 }