Update to Vaadin 24.3.20

.github/workflows/gradle.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         # test against following Java versions:
-        java: [ 11, 17 ]
+        java: [ 17 ]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

.gitignore

@@ -47,10 +47,11 @@ build
 **/.npmrc
 **/frontend/generated/*
 
-# Files by VAADIN 23
+# Files by VAADIN 24
 **/vite.config.ts
 **/vite.generated.ts
 **/.pnpmfile.cjs
+**/bundles/
 
 galite-demo/galite-vaadin/frontend/index.html
 galite-demo/galite-vaadin-spring/frontend/index.html

build.gradle.kts

@@ -55,12 +55,12 @@ subprojects {
   }
 
   tasks.withType<JavaCompile> {
-    sourceCompatibility = JavaVersion.VERSION_11.toString()
-    targetCompatibility = JavaVersion.VERSION_11.toString()
+    sourceCompatibility = JavaVersion.VERSION_17.toString()
+    targetCompatibility = JavaVersion.VERSION_17.toString()
   }
 
   tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = "11"
+    kotlinOptions.jvmTarget = "17"
   }
 }
 

buildSrc/src/main/kotlin/org/kopi/galite/gradle/Versions.kt

@@ -17,9 +17,8 @@
 package org.kopi.galite.gradle
 
 object Versions {
-  const val VAADIN = "23.3.8"
-  const val KARIBU_TESTING = "1.3.23"
-  const val ENHANCED_DIALOG = "23.1.2"
+  const val VAADIN = "24.3.20"
+  const val KARIBU_TESTING = "2.1.0"
 
   const val EXPOSED = "0.42.1"
   const val HIKARI = "5.1.0"
@@ -31,10 +30,9 @@ object Versions {
   const val GETOPT = "1.0.13"
   const val JDOM = "2.0.5"
   const val APACHE_POI = "5.2.5"
-  const val SLF4J = "1.7.30"
+  const val SLF4J = "2.0.9"
   const val APEX_CHARTS = "23.0.1"
-  const val IRON_ICONS = "2.0.1"
-  const val JAVAX_SERVLET_API = "4.0.1"
+  const val JAKARTA_SERVLET_API = "6.0.0"
   const val JAVAX_MAIL = "1.6.2"
   const val JAVAX_ACTIVATION = "1.1.1"
   const val FULL_CALENDAR = "3.1.0"

galite-core/build.gradle.kts

@@ -35,12 +35,10 @@ dependencies {
   // Vaadin addons
   // Wysiwyg-e Rich Text Editor component for Java
   implementation("org.vaadin.pekka", "wysiwyg_e-java", Versions.WYSIWYG_EJAVA)
-  // EnhancedDialog
-  implementation("com.vaadin.componentfactory", "enhanced-dialog", Versions.ENHANCED_DIALOG)
+
   // Apex charts
   implementation("com.github.appreciated", "apexcharts", Versions.APEX_CHARTS)
-  // Iron Icons
-  implementation("com.flowingcode.addons", "iron-icons", Versions.IRON_ICONS)
+
   //FullCalendar for Flow dependency
   implementation("org.vaadin.stefan", "fullcalendar2", Versions.FULL_CALENDAR)
 
@@ -68,8 +66,7 @@ dependencies {
   //getOpt dependency
   implementation("gnu.getopt", "java-getopt", Versions.GETOPT)
 
-  // Compile only dependency for Vaadin servlet
-  compileOnly("javax.servlet", "javax.servlet-api", Versions.JAVAX_SERVLET_API)
+  compileOnly("jakarta.servlet", "jakarta.servlet-api", "6.0.0")
 
   // Dataframe used in Pivot Table
   implementation("org.jetbrains.kotlinx", "dataframe", Versions.KOTLINX_DATAFRAME)

galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/actor/Actor.kt

@@ -19,7 +19,6 @@ package org.kopi.galite.visual.ui.vaadin.actor
 
 import org.kopi.galite.visual.ui.vaadin.base.Styles
 
-import com.flowingcode.vaadin.addons.ironicons.IronIconEnum
 import com.vaadin.flow.component.HasEnabled
 import com.vaadin.flow.component.Key
 import com.vaadin.flow.component.KeyModifier
@@ -52,11 +51,11 @@ open class Actor(val caption: String?,
     super.setText(caption)
 
     if (icon != null) {
-      if (icon is VaadinIcon) {
-        super.setIcon(Icon(icon))
-      } else if (icon is IronIconEnum) {
-        super.setIcon(icon.create())
-      }
+        if (icon is VaadinIcon) {
+            super.setIcon(Icon(icon))
+        } else if (icon is Icon) {
+            super.setIcon(icon)
+        }
     }
   }
 }

galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/actor/VClickableNavigationItem.kt

@@ -17,7 +17,6 @@
  */
 package org.kopi.galite.visual.ui.vaadin.actor
 
-import com.flowingcode.vaadin.addons.ironicons.IronIconEnum
 import com.vaadin.flow.component.Key
 import com.vaadin.flow.component.KeyModifier
 import com.vaadin.flow.component.icon.Icon
@@ -36,15 +35,9 @@ open class VClickableNavigationItem : VNavigationItem() {
 
   override fun setIcon(iconName: Any?) {
     icon = when (iconName) {
-      is VaadinIcon -> {
-        Icon(iconName)
-      }
-      is IronIconEnum -> {
-        iconName.create()
-      }
-      else -> {
-        Icon("")
-      }
+      is VaadinIcon -> Icon(iconName)
+      is Icon -> iconName
+      else -> Icon("")
     }
   }
 

galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/base/Utils.kt

@@ -26,12 +26,6 @@ import org.kopi.galite.visual.ui.vaadin.window.PopupWindow
 import org.kopi.galite.visual.ui.vaadin.window.Window
 import org.kopi.galite.visual.VColor
 
-import com.flowingcode.vaadin.addons.ironicons.AvIcons
-import com.flowingcode.vaadin.addons.ironicons.DeviceIcons
-import com.flowingcode.vaadin.addons.ironicons.EditorIcons
-import com.flowingcode.vaadin.addons.ironicons.FileIcons
-import com.flowingcode.vaadin.addons.ironicons.IronIcons
-import com.flowingcode.vaadin.addons.ironicons.MapsIcons
 import com.vaadin.flow.component.Component
 import com.vaadin.flow.component.UI
 import com.vaadin.flow.component.icon.VaadinIcon
@@ -302,8 +296,8 @@ object Utils : Utils() {
     pngToIconMap["expanded"] = VaadinIcon.FOLDER_OPEN_O
     pngToIconMap["expanded_p"] = VaadinIcon.FOLDER_OPEN_O
     pngToIconMap["exportCsv"] = VaadinIcon.FILE_TEXT_O
-    pngToIconMap["exportPdf"] = FileIcons.PDF
-    pngToIconMap["exportXlsx"] = FileIcons.EXCEL
+    pngToIconMap["exportPdf"] = VaadinIcon.FILE_O
+    pngToIconMap["exportXlsx"] = VaadinIcon.FILE_TABLE
     pngToIconMap["foldColumn"] = VaadinIcon.FOLDER_O
     pngToIconMap["fold"] = VaadinIcon.FOLDER_O
     pngToIconMap["formula"] = VaadinIcon.CALC
@@ -323,12 +317,12 @@ object Utils : Utils() {
     pngToIconMap["preview"] = VaadinIcon.FILE_TEXT_O
     pngToIconMap["print"] = VaadinIcon.PRINT
     pngToIconMap["quit"] = VaadinIcon.POWER_OFF
-    pngToIconMap["save"] = IronIcons.SAVE
+    pngToIconMap["save"] = VaadinIcon.SAFE
     pngToIconMap["searchop"] = VaadinIcon.SEARCH
     pngToIconMap["search"] = VaadinIcon.FILE_SEARCH
     pngToIconMap["serialquery"] = VaadinIcon.RECORDS
-    pngToIconMap["serviceoff"] = DeviceIcons.SIGNAL_CELLULAR_OFF
-    pngToIconMap["serviceon"] = DeviceIcons.SIGNAL_CELLULAR_4_BAR
+    pngToIconMap["serviceoff"] = VaadinIcon.POWER_OFF
+    pngToIconMap["serviceon"] = VaadinIcon.SIGNAL
     pngToIconMap["store"] = VaadinIcon.BUILDING_O
     pngToIconMap["suggest"] = VaadinIcon.PHONE
     pngToIconMap["timeStamp"] = VaadinIcon.CLOCK
@@ -352,7 +346,7 @@ object Utils : Utils() {
     pngToIconMap["bar_chart"] = VaadinIcon.BAR_CHART
     pngToIconMap["bkup3"] = VaadinIcon.WARNING
     pngToIconMap["bkup"] = VaadinIcon.WARNING
-    pngToIconMap["block2"] = IronIcons.UNDO
+    pngToIconMap["block2"] = VaadinIcon.REFRESH
     pngToIconMap["board"] = VaadinIcon.COGS
     pngToIconMap["bold"] = VaadinIcon.BOLD
     pngToIconMap["bomb"] = VaadinIcon.BOMB
@@ -383,8 +377,8 @@ object Utils : Utils() {
     pngToIconMap["fax"] = VaadinIcon.PHONE
     pngToIconMap["fw"] = VaadinIcon.STEP_FORWARD
     pngToIconMap["gifIcon"] = VaadinIcon.FILE_PICTURE
-    pngToIconMap["green"] = MapsIcons.MAP
-    pngToIconMap["guide"] = IronIcons.HELP
+    pngToIconMap["green"] = VaadinIcon.MAP_MARKER
+    pngToIconMap["guide"] = VaadinIcon.QUESTION_CIRCLE_O
     pngToIconMap["ident"] = VaadinIcon.ARROWS_LONG_RIGHT
     pngToIconMap["index"] = VaadinIcon.BOOK
     pngToIconMap["interrupt"] = VaadinIcon.STOP
@@ -393,23 +387,23 @@ object Utils : Utils() {
     pngToIconMap["launch"] = VaadinIcon.ARROW_RIGHT
     pngToIconMap["line_chart"] = VaadinIcon.LINE_CHART
     pngToIconMap["lock"] = VaadinIcon.LOCK
-    pngToIconMap["login"] = IronIcons.ACCOUNT_CIRCLE
+    pngToIconMap["login"] = VaadinIcon.USER
     pngToIconMap["moneycheck"] = VaadinIcon.MONEY
     pngToIconMap["money"] = VaadinIcon.MONEY
-    pngToIconMap["notice"] = IronIcons.LIGHTBULB_OUTLINE
-    pngToIconMap["ofolder"] = IronIcons.FOLDER_OPEN
-    pngToIconMap["pageFirst"] = AvIcons.SKIP_PREVIOUS
-    pngToIconMap["pageLast"] = AvIcons.SKIP_NEXT
-    pngToIconMap["pageLeft"] = AvIcons.FAST_REWIND
-    pngToIconMap["pageRight"] = AvIcons.FAST_FORWARD
+    pngToIconMap["notice"] = VaadinIcon.LIGHTBULB
+    pngToIconMap["ofolder"] = VaadinIcon.FOLDER_OPEN_O
+    pngToIconMap["pageFirst"] = VaadinIcon.ANGLE_DOUBLE_LEFT
+    pngToIconMap["pageLast"] = VaadinIcon.ANGLE_DOUBLE_RIGHT
+    pngToIconMap["pageLeft"] = VaadinIcon.ANGLE_LEFT
+    pngToIconMap["pageRight"] = VaadinIcon.ANGLE_RIGHT
     pngToIconMap["password"] = VaadinIcon.PASSWORD
     pngToIconMap["paste"] = VaadinIcon.PASTE
     pngToIconMap["phone"] = VaadinIcon.PHONE
     pngToIconMap["pie_chart"] = VaadinIcon.PIE_CHART
     pngToIconMap["printoptions"] = VaadinIcon.WRENCH
     pngToIconMap["project"] = VaadinIcon.CUBES
-    pngToIconMap["red"] = MapsIcons.MAP
-    pngToIconMap["redo"] = IronIcons.REDO
+    pngToIconMap["red"] = VaadinIcon.MAP_MARKER
+    pngToIconMap["redo"] = VaadinIcon.ROTATE_RIGHT
     pngToIconMap["refresh"] = VaadinIcon.REFRESH
     pngToIconMap["reload"] = VaadinIcon.REFRESH
     pngToIconMap["report"] = VaadinIcon.TABLE
@@ -424,17 +418,17 @@ object Utils : Utils() {
     pngToIconMap["todo"] = VaadinIcon.TASKS
     pngToIconMap["top"] = VaadinIcon.BOOK
     pngToIconMap["underline"] = VaadinIcon.UNDERLINE
-    pngToIconMap["undo"] = IronIcons.UNDO
+    pngToIconMap["undo"] = VaadinIcon.ROTATE_LEFT
     pngToIconMap["unident"] = VaadinIcon.ARROW_CIRCLE_LEFT
     pngToIconMap["unstick"] = VaadinIcon.PIN
-    pngToIconMap["update"] = EditorIcons.MODE_EDIT
+    pngToIconMap["update"] = VaadinIcon.EDIT
     pngToIconMap["users"] = VaadinIcon.USERS
     pngToIconMap["utils"] = VaadinIcon.TOOLS
     pngToIconMap["validate"] = VaadinIcon.CHECK
-    pngToIconMap["wait"] = DeviceIcons.ACCESS_TIME
-    pngToIconMap["warning"] = IronIcons.WARNING
-    pngToIconMap["window"] = IronIcons.CHEVRON_RIGHT
-    pngToIconMap["yellow"] = MapsIcons.MAP
+    pngToIconMap["wait"] = VaadinIcon.CLOCK
+    pngToIconMap["warning"] = VaadinIcon.EXCLAMATION_CIRCLE
+    pngToIconMap["window"] = VaadinIcon.CHEVRON_RIGHT
+    pngToIconMap["yellow"] = VaadinIcon.MAP_MARKER
     pngToIconMap["zoomheight"] = VaadinIcon.VAADIN_H
     pngToIconMap["zoomminus"] = VaadinIcon.SEARCH_MINUS
     pngToIconMap["zoomoptimal"] = VaadinIcon.VAADIN_H

galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/base/VInputLabel.kt

@@ -17,12 +17,12 @@
  */
 package org.kopi.galite.visual.ui.vaadin.base
 
-import com.vaadin.flow.component.html.Label
+import com.vaadin.flow.component.html.NativeLabel
 
 /**
  * An input label component.
  */
-class VInputLabel(text: String? = "") : Label(text) {
+class VInputLabel(text: String? = "") : NativeLabel(text) {
 
   //---------------------------------------------------
   // IMPLEMENTATIONS

galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/field/InputTextField.kt

@@ -46,9 +46,10 @@ import com.vaadin.flow.component.KeyDownEvent
 import com.vaadin.flow.component.KeyNotifier
 import com.vaadin.flow.component.KeyPressEvent
 import com.vaadin.flow.component.KeyUpEvent
+import com.vaadin.flow.component.shared.HasPrefix
+import com.vaadin.flow.component.shared.HasSuffix
 import com.vaadin.flow.component.textfield.Autocomplete
 import com.vaadin.flow.component.textfield.HasAutocomplete
-import com.vaadin.flow.component.textfield.HasPrefixAndSuffix
 import com.vaadin.flow.component.textfield.TextFieldVariant
 import com.vaadin.flow.dom.DomEvent
 
@@ -61,7 +62,7 @@ import com.vaadin.flow.dom.DomEvent
 open class InputTextField<C> internal constructor(protected val internalField: C)
   : HasSize, AbstractCompositeField<C, InputTextField<C>, String>(null),
       KeyNotifier, HasStyle, BlurNotifier<InputTextField<C>>, Focusable<InputTextField<C>>,
-      HasAutocomplete, HasPrefixAndSuffix, JSKeyDownHandler
+      HasAutocomplete, HasPrefix, HasSuffix, JSKeyDownHandler
         where C: AbstractField<*, out Any>, C: Focusable<*>
       /*, HasSelectionHandlers<Suggestion?>, SuggestionHandler TODO*/ {
 

galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/field/TextField.kt

@@ -30,12 +30,12 @@ import org.kopi.galite.visual.ui.vaadin.event.TextFieldListener
 import org.kopi.galite.visual.ui.vaadin.form.DTextField
 import org.kopi.galite.visual.ui.vaadin.form.KeyNavigator
 
-import com.flowingcode.vaadin.addons.ironicons.IronIcons
 import com.vaadin.flow.component.Component
 import com.vaadin.flow.component.HasStyle
 import com.vaadin.flow.component.dependency.CssImport
 import com.vaadin.flow.component.dependency.JsModule
-import com.vaadin.flow.component.icon.IronIcon
+import com.vaadin.flow.component.icon.Icon
+import com.vaadin.flow.component.icon.VaadinIcon
 import com.vaadin.flow.component.textfield.TextField
 import com.vaadin.flow.data.binder.Binder
 
@@ -144,7 +144,7 @@ class TextField(val model: VField,
    */
   var validator: TextValidator? = null
 
-  private var autofill: IronIcon? = null
+  private var autofill: Icon? = null
 
   internal var lastCommunicatedValue = ""
 
@@ -164,7 +164,7 @@ class TextField(val model: VField,
     inputField.isEnabled = enabled
     add(inputField)
     if (hasAutofill && type != Type.DATE) {
-      autofill = IronIcons.ARROW_DROP_DOWN.create()
+      autofill = Icon(VaadinIcon.ANGLE_DOWN)
       autofill!!.addClickListener {
         fireAutofill()
       }

galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/field/VCodeField.kt

@@ -34,7 +34,7 @@ import com.vaadin.flow.component.dependency.CssImport
 class VCodeField(enumerations : Array<String>?) : InputTextField<ComboBox<String>>(ComboBox<String>()), KeyNotifier {
 
   init {
-    internalField.setItems(Arrays.stream(enumerations))
+    internalField.setItems(enumerations?.toList() ?: emptyList())
     element.themeList.add("galite-combobox")
   }
 

galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/field/VDateField.kt

@@ -99,7 +99,7 @@ class DatePickerLight : AbstractField<TextField, String>(null), HasComponents,
     textField.className = "input"
     textField.suffixComponent = icon
     textField.isClearButtonVisible = true
-    textField.isPreventInvalidInput = true
+    textField.allowedCharPattern = "\\d"
     textField.pattern = "[0-9/\\.]*"
     textField.maxLength = 10
 
@@ -257,4 +257,4 @@ class DatePickerLight : AbstractField<TextField, String>(null), HasComponents,
   fun addPickerListener(listener: ComponentEventListener<ValueChanged>): Registration {
     return addListener(ValueChanged::class.java, listener)
   }
-}
+}

galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/field/VDecimalField.kt

@@ -35,7 +35,7 @@ class VDecimalField(col: Int,
   : InputTextField<TextField>(TextField()) {
   init {
     internalField.pattern = "[0-9-.,]*"
-    internalField.isPreventInvalidInput = true
+    internalField.allowedCharPattern = "\\d"
     val dfs = DecimalFormatSymbols.get(MainWindow.locale)
 
     if (dfs!!.decimalSeparator != '.') {

galite-core/src/main/kotlin/org/kopi/galite/visual/ui/vaadin/field/VIntegerField.kt

@@ -26,7 +26,7 @@ class VIntegerField(width : Int, minval : Double, maxval : Double) : InputTextFi
 
   init {
     internalField.pattern = "[0-9-]*"
-    internalField.isPreventInvalidInput = true
+    internalField.allowedCharPattern = "\\d"
     internalField.element.setProperty("min", minval)
     internalField.element.setProperty("max", maxval)
     this.width = width.toString()