♻️ Replace multi select combo box

The old one was not compatible with Vaadin 23.2+!
McPringle · Aug 24, 2024 · c330eb0 · c330eb0
1 parent 1137191
commit c330eb0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -162,11 +162,6 @@
             <artifactId>a-vaadin-helper</artifactId>
             <version>1.9.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.vaadin.componentfactory</groupId>
-            <artifactId>multi-combo-box-flow</artifactId>
-            <version>23.1.2</version>
-        </dependency>
         <dependency>
             <groupId>org.vaadin.reportui</groupId>
             <artifactId>report-ui</artifactId>

diff --git a/src/main/java/org/komunumo/ui/view/admin/events/EventDialog.java b/src/main/java/org/komunumo/ui/view/admin/events/EventDialog.java
@@ -18,9 +18,9 @@
 
 package org.komunumo.ui.view.admin.events;
 
-import com.vaadin.componentfactory.multiselect.MultiComboBox;
 import com.vaadin.flow.component.checkbox.Checkbox;
 import com.vaadin.flow.component.combobox.ComboBox;
+import com.vaadin.flow.component.combobox.MultiSelectComboBox;
 import com.vaadin.flow.component.formlayout.FormLayout;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.richtexteditor.RichTextEditor;
@@ -80,10 +80,10 @@ public void createForm(@NotNull final FormLayout formLayout, @NotNull final Bind
         final var type = new Select<EventType>();
         final var title = new TextField("Title");
         final var subtitle = new TextField("Subtitle");
-        final var speaker = new MultiComboBox<EventSpeakerEntity>("Speaker");
-        final var organizer = new MultiComboBox<Member>("Organizer");
+        final var speaker = new MultiSelectComboBox<EventSpeakerEntity>("Speaker");
+        final var organizer = new MultiSelectComboBox<Member>("Organizer");
         final var description = new RichTextEditor();
-        final var keyword = new MultiComboBox<KeywordEntity>("Keyword");
+        final var keyword = new MultiSelectComboBox<KeywordEntity>("Keyword");
         final var agenda = new RichTextEditor();
         final var level = new Select<EventLevel>();
         final var language = new Select<EventLanguage>();
@@ -111,12 +111,12 @@ public void createForm(@NotNull final FormLayout formLayout, @NotNull final Bind
         });
         subtitle.setValueChangeMode(EAGER);
         speaker.setItemLabelGenerator(EventSpeakerEntity::fullName);
-        speaker.setItems(databaseService.getAllEventSpeakers());
+        speaker.setItems(databaseService.getAllEventSpeakers().toList());
         organizer.setItemLabelGenerator(value -> String.format("%s %s", value.getFirstName(), value.getLastName()));
-        organizer.setItems(databaseService.getAllAdmins());
+        organizer.setItems(databaseService.getAllAdmins().toList());
         organizer.setRequiredIndicatorVisible(true);
         keyword.setItemLabelGenerator(KeywordEntity::keyword);
-        keyword.setItems(databaseService.getAllKeywords());
+        keyword.setItems(databaseService.getAllKeywords().toList());
         level.setLabel("Level");
         level.setItems(EventLevel.values());
         language.setLabel("Language");