Set default icons, make icon label matching safer (#620)

* set default icons, make icon label matching safer

* nicer code, handle deletion of box value

Author: wow-such-code

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

@@ -7,15 +7,18 @@
 import com.vaadin.flow.data.renderer.ComponentRenderer;
 import java.util.List;
 import life.qbic.datamanager.views.projects.project.experiments.experiment.ExperimentDetailsComponent.BioIcon;
+import life.qbic.datamanager.views.projects.project.experiments.experiment.ExperimentDetailsComponent.SampleSourceType;
 
 /**
  * Factory class for creating ComboBoxes allowing the selection of icons for species and specimen.
  */
 public class BioIconComboboxFactory {
 
-  public ComboBox<BioIcon> iconBox(List<BioIcon> options, String title) {
+  public ComboBox<BioIcon> iconBox(SampleSourceType type, String title) {
+    BioIcon defaultIcon = BioIcon.getDefaultBioIcon(type);
+
     ComboBox<BioIcon> comboBox = new ComboBox<>(title);
-    comboBox.setItems(options);
+    comboBox.setItems(BioIcon.getOptionsForType(type));
     comboBox.setWidth("150px");
     comboBox.setItemLabelGenerator(
         BioIcon::getLabel);
@@ -26,8 +29,15 @@ public ComboBox<BioIcon> iconBox(List<BioIcon> options, String title) {
 
       return element;
     }));
-    comboBox.addValueChangeListener(valueChanged -> valueChanged.getSource()
-        .setPrefixComponent(styleIcon(valueChanged.getValue())));
+    comboBox.addValueChangeListener(valueChanged -> {
+      Object val = valueChanged.getValue();
+      if(val==null) {
+        comboBox.setValue(defaultIcon);
+      } else {
+        valueChanged.getSource().setPrefixComponent(styleIcon((BioIcon) val));
+      }
+    });
+    comboBox.setValue(defaultIcon);
     return comboBox;
   }
 

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

@@ -52,14 +52,14 @@ public ExperimentalInformationLayout(
 
     experimentalInformationBinder = new Binder<>(ExperimentalInformation.class);
 
-    ComboBox<BioIcon> speciesIconBox = bioIconComboboxFactory.iconBox(
-        BioIcon.getOptionsForType(SampleSourceType.SPECIES), "Species icon");
+    ComboBox<BioIcon> speciesIconBox = bioIconComboboxFactory.iconBox(SampleSourceType.SPECIES,
+        "Species icon");
     experimentalInformationBinder.forField(speciesIconBox)
         .bind(ExperimentalInformation::getSpeciesIcon,
             ExperimentalInformation::setSpeciesIcon);
 
-    ComboBox<BioIcon> specimenIconBox = bioIconComboboxFactory.iconBox(
-        BioIcon.getOptionsForType(SampleSourceType.SPECIMEN), "Specimen icon");
+    ComboBox<BioIcon> specimenIconBox = bioIconComboboxFactory.iconBox(SampleSourceType.SPECIMEN,
+        "Specimen icon");
     experimentalInformationBinder.forField(specimenIconBox)
         .bind(ExperimentalInformation::getSpecimenIcon,
             ExperimentalInformation::setSpecimenIcon);

user-interface/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/ExperimentDetailsComponent.java

@@ -659,8 +659,15 @@ public static BioIcon getTypeWithNameOrDefault(SampleSourceType sampleSourceType
         String iconName) {
       Optional<BioIcon> searchResult = getOptionsForType(sampleSourceType).stream()
           .filter(icon -> icon.label.equals(iconName)).findFirst();
-      return searchResult.orElseGet(() -> getOptionsForType(sampleSourceType).stream()
-          .filter(icon -> icon.label.equals("default")).findFirst().get());
+      return searchResult.orElseGet(() -> getDefaultBioIcon(sampleSourceType));
+    }
+
+    public static BioIcon getDefaultBioIcon(SampleSourceType sampleSourceType) {
+      return switch (sampleSourceType) {
+        case SPECIES -> DEFAULT_SPECIES;
+        case SPECIMEN -> DEFAULT_SPECIMEN;
+        case ANALYTE -> DEFAULT_ANALYTE;
+      };
     }
 
     public String getLabel() {

user-interface/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/create/AddExperimentDialog.java

@@ -84,14 +84,15 @@ public AddExperimentDialog(
         .bind(experimentDraft -> new HashSet<>(experimentDraft.getAnalytes()),
             ExperimentDraft::setAnalytes);
 
-    ComboBox<BioIcon> speciesIconBox = bioIconComboboxFactory.iconBox(
-        BioIcon.getOptionsForType(SampleSourceType.SPECIES), "Species icon");
+    ComboBox<BioIcon> speciesIconBox = bioIconComboboxFactory.iconBox(SampleSourceType.SPECIES,
+    "Species icon");
     binder.forField(speciesIconBox)
         .bind(ExperimentDraft::getSpeciesIcon,
             ExperimentDraft::setSpeciesIcon);
 
-    ComboBox<BioIcon> specimenIconBox = bioIconComboboxFactory.iconBox(
-        BioIcon.getOptionsForType(SampleSourceType.SPECIMEN), "Specimen icon");
+
+    ComboBox<BioIcon> specimenIconBox = bioIconComboboxFactory.iconBox(SampleSourceType.SPECIMEN,
+    "Specimen icon");
     binder.forField(specimenIconBox)
         .bind(ExperimentDraft::getSpecimenIcon,
             ExperimentDraft::setSpecimenIcon);

user-interface/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/update/EditExperimentDialog.java

@@ -66,8 +66,8 @@ public EditExperimentDialog(OntologyLookupService ontologyTermInformationService
         .bind(experimentDraft -> new HashSet<>(experimentDraft.getSpecies()),
             ExperimentDraft::setSpecies);
 
-    ComboBox<BioIcon> speciesIconBox = bioIconComboboxFactory.iconBox(
-        BioIcon.getOptionsForType(SampleSourceType.SPECIES), "Species icon");
+    ComboBox<BioIcon> speciesIconBox = bioIconComboboxFactory.iconBox(SampleSourceType.SPECIES,
+    "Species icon");
     binder.forField(speciesIconBox)
         .bind(ExperimentDraft::getSpeciesIcon,
             ExperimentDraft::setSpeciesIcon);
@@ -79,8 +79,8 @@ public EditExperimentDialog(OntologyLookupService ontologyTermInformationService
         .bind(experimentDraft -> new HashSet<>(experimentDraft.getSpecimens()),
             ExperimentDraft::setSpecimens);
 
-    ComboBox<BioIcon> specimenIconBox = bioIconComboboxFactory.iconBox(
-        BioIcon.getOptionsForType(SampleSourceType.SPECIMEN), "Specimen icon");
+    ComboBox<BioIcon> specimenIconBox = bioIconComboboxFactory.iconBox(SampleSourceType.SPECIMEN,
+    "Specimen icon");
     binder.forField(specimenIconBox)
         .bind(ExperimentDraft::getSpecimenIcon,
             ExperimentDraft::setSpecimenIcon);