From 9e182be1a271d2a8f7b5d46f0c042fcc35cd0ed6 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 16 Dec 2024 21:14:53 +0000
Subject: [PATCH] Add combobox

---
 .../jenkins/plugins/designlibrary/Select.java |  5 ++++
 .../plugins/designlibrary/Select/index.jelly  | 23 +++++++++++++++++++
 .../designlibrary/Select/index.properties     |  4 +++-
 src/main/webapp/Select/Combobox.java          | 10 ++++++++
 src/main/webapp/Select/combobox.jelly         |  3 +++
 5 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 src/main/webapp/Select/Combobox.java
 create mode 100644 src/main/webapp/Select/combobox.jelly

diff --git a/src/main/java/io/jenkins/plugins/designlibrary/Select.java b/src/main/java/io/jenkins/plugins/designlibrary/Select.java
index 7597a062..82ca915b 100644
--- a/src/main/java/io/jenkins/plugins/designlibrary/Select.java
+++ b/src/main/java/io/jenkins/plugins/designlibrary/Select.java
@@ -8,6 +8,7 @@
 import hudson.model.AutoCompletionCandidates;
 import hudson.model.Describable;
 import hudson.model.Descriptor;
+import hudson.util.ComboBoxModel;
 import hudson.util.ListBoxModel;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -52,6 +53,10 @@ public ListBoxModel doFillStateItems() {
             return m;
         }
 
+        public ComboBoxModel doFillState2Items() {
+            return new ComboBoxModel(STATES);
+        }
+
         public ListBoxModel doFillCityItems(@QueryParameter String state) {
             ListBoxModel m = new ListBoxModel();
             for (String s : asList("X", "Y", "Z")) {
diff --git a/src/main/resources/io/jenkins/plugins/designlibrary/Select/index.jelly b/src/main/resources/io/jenkins/plugins/designlibrary/Select/index.jelly
index ff2b4b05..681b6983 100644
--- a/src/main/resources/io/jenkins/plugins/designlibrary/Select/index.jelly
+++ b/src/main/resources/io/jenkins/plugins/designlibrary/Select/index.jelly
@@ -87,6 +87,29 @@ THE SOFTWARE.
     </s:section>
 
     <s:section title="${%searchable}" description="${%searchable.description}">
+      <div class="jenkins-paragraph">${%combobox}</div>
+
+      <s:group>
+        <s:preview>
+          <form>
+            <button type="submit" disabled="true" style="display: none" aria-hidden="true"/>
+            <f:entry title="U.S. State" field="state2">
+              <f:combobox/>
+            </f:entry>
+          </form>
+        </s:preview>
+        <s:code-panes>
+          <s:code-pane title="Jelly">
+            <s:code file="combobox.jelly"/>
+          </s:code-pane>
+          <s:code-pane title="Java">
+            <s:code file="Combobox.java" language="java"/>
+          </s:code-pane>
+        </s:code-panes>
+      </s:group>
+
+      <div class="jenkins-paragraph">${%textbox}</div>
+
       <s:group>
         <s:preview>
           <f:entry title="U.S. State" field="state">
diff --git a/src/main/resources/io/jenkins/plugins/designlibrary/Select/index.properties b/src/main/resources/io/jenkins/plugins/designlibrary/Select/index.properties
index db585ab0..aa6edafe 100644
--- a/src/main/resources/io/jenkins/plugins/designlibrary/Select/index.properties
+++ b/src/main/resources/io/jenkins/plugins/designlibrary/Select/index.properties
@@ -4,5 +4,7 @@ usage.2=If you want a simpler <code>select</code> to be rendered you can use the
 Jelly tag and create a <code>doFillFieldNameItems</code> method in the <code>descriptor</code>.
 dynamic=Dynamic select
 dynamic.description=Updates the contents of a "select" control dynamically based on selections of other controls.
-searchable=Searchable select
+searchable=Autocomplete
 searchable.description=Allows users to quickly browse a select by typing to filter the available choices. Start typing a U.S. state for results to appear.
+combobox=Using <code>combobox</code> forces the user to select an option from the available choices, it''ll also display all choices on focus.
+textbox=Using <code>textbox</code> on the other hand allows the user to enter free text if they so desire.
diff --git a/src/main/webapp/Select/Combobox.java b/src/main/webapp/Select/Combobox.java
new file mode 100644
index 00000000..509b08bd
--- /dev/null
+++ b/src/main/webapp/Select/Combobox.java
@@ -0,0 +1,10 @@
+public class Sample {
+    private static final String[] STATES = new String[]{
+            "Alabama",
+            "..."
+    };
+
+    public ComboBoxModel doFillStateItems() {
+        return new ComboBoxModel(STATES);
+    }
+}
\ No newline at end of file
diff --git a/src/main/webapp/Select/combobox.jelly b/src/main/webapp/Select/combobox.jelly
new file mode 100644
index 00000000..33b1f09a
--- /dev/null
+++ b/src/main/webapp/Select/combobox.jelly
@@ -0,0 +1,3 @@
+<f:entry title="U.S. State" field="state">
+  <f:combobox />
+</f:entry>