chore: Remove Hilla from new project wizard (#469)

* chore: Remove Hilla from new project wizard

* spotless

Author: MarcinVaadin

plugin/src/main/kotlin/com/vaadin/plugin/module/HelloWorldPanel.kt

@@ -41,22 +41,19 @@ class HelloWorldPanel(private val model: HelloWorldModel) {
     }
 
     private class ViewModel(val model: HelloWorldModel) {
-        val framework =
-            SegmentModel(StarterSupport.frameworks, model.frameworkProperty, StarterSupport::isSupportedFramework)
-        val language =
-            SegmentModel(StarterSupport.languages, model.languageProperty, StarterSupport::isSupportedLanguage)
+        val language = SegmentModel(StarterSupport.languages, model.languageProperty, { _, _ -> true })
         val buildTool =
             SegmentModel(StarterSupport.buildTools, model.buildToolProperty, StarterSupport::isSupportedBuildTool)
         val architecture =
             SegmentModel(
                 StarterSupport.architectures, model.architectureProperty, StarterSupport::isSupportedArchitecture)
 
         fun all(): List<SegmentModel> {
-            return listOf(framework, language, buildTool, architecture)
+            return listOf(language, buildTool, architecture)
         }
 
         fun isSupported(segmentModel: SegmentModel, value: String): Boolean {
-            return segmentModel.supported(model, value)
+            return segmentModel.supported.let { it(model, value) } ?: true
         }
     }
 
@@ -68,7 +65,6 @@ class HelloWorldPanel(private val model: HelloWorldModel) {
     private val notAllArchitecturesSupportedMessage = graph.property("")
 
     init {
-        viewModel.framework.property.afterChange { refreshSegments("framework") }
         viewModel.language.property.afterChange { refreshSegments("language") }
         viewModel.buildTool.property.afterChange { refreshSegments("buildTool") }
         viewModel.architecture.property.afterChange { refreshSegments("architecture") }
@@ -85,7 +81,6 @@ class HelloWorldPanel(private val model: HelloWorldModel) {
     }
 
     val root: DialogPanel = panel {
-        buildSegment(row("Framework") {}, viewModel.framework)
         buildSegment(row("Language") {}, viewModel.language)
         row("") { text("<i>Kotlin support uses a community add-on.</i>") }.visibleIf(kotlinInfoVisibleProperty)
         buildSegment(row("Build tool") {}, viewModel.buildTool)
@@ -94,9 +89,6 @@ class HelloWorldPanel(private val model: HelloWorldModel) {
     }
 
     private fun refreshSegments(source: String) {
-        if (source != "framework") {
-            viewModel.framework.update()
-        }
         if (source != "language") {
             viewModel.language.update()
         }
@@ -106,7 +98,6 @@ class HelloWorldPanel(private val model: HelloWorldModel) {
         if (source != "architecture") {
             viewModel.architecture.update()
         }
-        refreshArchitecturesSupportedMessage()
         refreshKotlinInfo()
         fallbackToFirstEnabled()
     }
@@ -115,15 +106,6 @@ class HelloWorldPanel(private val model: HelloWorldModel) {
         kotlinInfoVisibleProperty.set(viewModel.language.value() == "kotlin")
     }
 
-    private fun refreshArchitecturesSupportedMessage() {
-        if (StarterSupport.supportsAllArchitectures(model)) {
-            notAllArchitecturesSupportedMessage.set("")
-        } else {
-            val frameworkName = viewModel.framework.label()
-            notAllArchitecturesSupportedMessage.set("<i>$frameworkName does not support all architectures.</i>")
-        }
-    }
-
     private fun fallbackToFirstEnabled() {
         viewModel.all().filter { !viewModel.isSupported(it, it.value()) }.forEach { it.reset() }
     }

plugin/src/main/kotlin/com/vaadin/plugin/module/StarterProjectPanel.kt

@@ -13,15 +13,8 @@ class StarterProjectPanel(private val model: StarterProjectModel) {
             segmentedButton(setOf(false, true)) { this.text = if (it) "Prerelease" else "Stable" }
                 .bind(model.usePrereleaseProperty)
         }
-        row { text("Include Walking Skeleton").bold() }
-        row {
-            text(
-                "A walking skeleton is a minimal application that includes a fully-functional " +
-                    "end-to-end workflow. All major building blocks are included, but it does not " +
-                    "yet perform any meaningful tasks.",
-                MAX_LINE_LENGTH)
-        }
-        row("Pure Java with Vaadin Flow") { checkBox("").bindSelected(model.includeFlowProperty) }
-        row("Full-stack React with Vaadin Hilla") { checkBox("").bindSelected(model.includeHillaProperty) }
+        row { text("Include sample view").bold() }
+        row { text("A sample view built fully in Java, front to back.", MAX_LINE_LENGTH) }
+        row("Include sample view") { checkBox("").bindSelected(model.includeFlowProperty) }
     }
 }

plugin/src/main/kotlin/com/vaadin/plugin/module/VaadinPanel.kt

@@ -101,20 +101,6 @@ class VaadinPanel(propertyGraph: PropertyGraph, private val wizardContext: Wizar
                         "muscles to your skeleton—transforming it into a fully-featured application.",
                     MAX_LINE_LENGTH)
             }
-            row { text("Flow and Hilla").bold() }
-            row {
-                text(
-                    "<a href=\"https://vaadin.com/flow\">Flow framework</a> is the most productive" +
-                        " choice, allowing 100% of the user interface to be coded in server-side Java.",
-                    MAX_LINE_LENGTH)
-            }
-            row {
-                text(
-                    "<a href=\"https://hilla.dev/\">Hilla framework</a>, on the other hand, enables" +
-                        " implementation of your user interface with React while automatically connecting it to your" +
-                        " Java backend.",
-                    MAX_LINE_LENGTH)
-            }
         }
 
         starterProjectGroup!!.expanded = true

plugin/src/main/kotlin/com/vaadin/plugin/starter/HelloWorldModel.kt

@@ -10,12 +10,10 @@ class HelloWorldModel(val groupIdProperty: com.intellij.openapi.observable.prope
     DownloadableModel {
 
     private val graph = PropertyGraph()
-    val frameworkProperty = graph.property(StarterSupport.frameworks.keys.first())
     val languageProperty = graph.property(StarterSupport.languages.keys.first())
     val buildToolProperty = graph.property(StarterSupport.buildTools.keys.first())
     val architectureProperty = graph.property(StarterSupport.architectures.keys.first())
 
-    val framework by frameworkProperty
     val language by languageProperty
     val buildTool by buildToolProperty
     val architecture by architectureProperty
@@ -24,7 +22,7 @@ class HelloWorldModel(val groupIdProperty: com.intellij.openapi.observable.prope
     override fun getDownloadLink(project: Project): String {
         val params =
             mapOf(
-                "framework" to framework,
+                "framework" to "flow",
                 "language" to language,
                 "buildtool" to buildTool,
                 "stack" to architecture,

plugin/src/main/kotlin/com/vaadin/plugin/starter/StarterSupport.kt

@@ -4,8 +4,6 @@ class StarterSupport {
 
     companion object {
 
-        val frameworks = linkedMapOf("flow" to "Flow / Java", "hilla" to "Hilla / React")
-
         val languages = linkedMapOf("java" to "Java", "kotlin" to "Kotlin")
 
         val architectures =
@@ -18,52 +16,20 @@ class StarterSupport {
 
         val buildTools = linkedMapOf("maven" to "Maven", "gradle" to "Gradle")
 
-        private val supportMatrix =
-            arrayOf(
-                StarterSupportMatrixElement(
-                    "flow",
-                    languages.keys,
-                    setOf("springboot", "quarkus", "jakartaee", "servlet"),
-                    buildTools.keys,
-                ),
-                StarterSupportMatrixElement("hilla", setOf("java"), setOf("springboot"), buildTools.keys),
-            )
-
-        fun isSupportedFramework(model: HelloWorldModel, framework: String): Boolean {
-            val foundSupport = getSupport(framework) ?: return false
-            return foundSupport.architectures.contains(model.architecture)
-        }
-
-        fun isSupportedLanguage(model: HelloWorldModel, language: String): Boolean {
-            val foundSupport = getSupport(model.framework) ?: return false
-            return foundSupport.languages.contains(language)
-        }
-
         fun isSupportedArchitecture(model: HelloWorldModel, architecture: String): Boolean {
-            val foundSupport = getSupport(model.framework) ?: return false
             if (model.buildTool == "gradle") {
-                return foundSupport.architectures.contains(architecture) &&
-                    setOf("springboot", "servlet").contains(architecture)
+                return setOf("springboot", "servlet").contains(architecture)
             } else if (model.language == "kotlin") {
                 return architecture == "springboot"
             }
-            return foundSupport.architectures.contains(architecture)
+            return true
         }
 
         fun isSupportedBuildTool(model: HelloWorldModel, buildTool: String): Boolean {
-            val foundSupport = getSupport(model.framework) ?: return false
             if (model.language == "kotlin") {
-                return foundSupport.buildTools.contains(buildTool) && buildTool == "maven"
+                return buildTool == "maven"
             }
-            return foundSupport.buildTools.contains(buildTool)
-        }
-
-        fun supportsAllArchitectures(model: HelloWorldModel): Boolean {
-            return getSupport(model.framework)?.architectures?.containsAll(architectures.keys)!!
-        }
-
-        private fun getSupport(framework: String): StarterSupportMatrixElement? {
-            return supportMatrix.find { it.framework == framework }
+            return true
         }
     }
 }