Replace dash with underscore to match with enum values #2917

(cherry picked from commit b73c5e0)
jmix-framework · Mar 15, 2024 · aeead3d · aeead3d
1 parent bf4c990
commit aeead3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/jmix-flowui/flowui/src/main/java/io/jmix/flowui/menu/ListMenuBuilder.java b/jmix-flowui/flowui/src/main/java/io/jmix/flowui/menu/ListMenuBuilder.java
@@ -150,7 +150,7 @@ protected VaadinIcon getVaadinIcon(String iconString) {
             if (!parts[0].equals("vaadin")) {
                 return null;
             }
-            return VaadinIcon.valueOf(parts[1].toUpperCase());
+            return VaadinIcon.valueOf(parts[1].toUpperCase().replace('-', '_'));
         } else {
             return VaadinIcon.valueOf(iconString);
         }

diff --git a/jmix-flowui/flowui/src/test/groovy/component/listmenu/ListMenuTest.groovy b/jmix-flowui/flowui/src/test/groovy/component/listmenu/ListMenuTest.groovy
@@ -57,7 +57,7 @@ class ListMenuTest extends FlowuiTestSpecification {
                       description="Description">
                     <item view="ListMenuTestView"
                           title="List menu test view"
-                          icon="ABACUS"
+                          icon="vaadin:academy-cap"
                           description="Description"
                           shortcutCombination="O"/>
                     <item bean="TestMenuItemBean" 
@@ -91,9 +91,9 @@ class ListMenuTest extends FlowuiTestSpecification {
         def menuItem = listMenu.getMenuItem("ListMenuTestView")
         menuItem != null
         menuItem.title == "List menu test view"
-        menuItem.icon == VaadinIcon.ABACUS
+        menuItem.icon == VaadinIcon.ACADEMY_CAP
         (menuItem.prefixComponent as Icon).element.getAttribute("icon") ==
-                VaadinIcon.ABACUS.create().element.getAttribute("icon")
+                VaadinIcon.ACADEMY_CAP.create().element.getAttribute("icon")
         menuItem.description == "Description"
         menuItem.shortcutCombination.key.keys.get(0) == "KeyO"