fix: styling of select boxes for issue and version parameter

src/main/java/hudson/plugins/jira/listissuesparameter/JiraIssueParameterDefinition.java

@@ -22,22 +22,28 @@
 import com.atlassian.jira.rest.client.api.domain.IssueField;
 import hudson.Extension;
 import hudson.cli.CLICommand;
+import hudson.model.Item;
 import hudson.model.Job;
 import hudson.model.ParameterDefinition;
 import hudson.model.ParameterValue;
+import hudson.model.ParametersDefinitionProperty;
 import hudson.plugins.jira.JiraSession;
 import hudson.plugins.jira.JiraSite;
+import hudson.util.ListBoxModel;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.Symbol;
+import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
+import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.interceptor.RequirePOST;
 
 public class JiraIssueParameterDefinition extends ParameterDefinition {
     private static final long serialVersionUID = 3927562542249244416L;
@@ -75,7 +81,10 @@
     public List<JiraIssueParameterDefinition.Result> getIssues()
             throws IOException, TimeoutException, RestClientException {
         Job<?, ?> job = Stapler.getCurrentRequest2().findAncestorObject(Job.class);
+        return getIssues(job);
+    }
 
+    public List<JiraIssueParameterDefinition.Result> getIssues(Job<?, ?> job) {
         JiraSite site = JiraSite.get(job);
         if (site == null) {
             throw new IllegalStateException(
@@ -122,6 +131,22 @@
         public String getDisplayName() {
             return "Jira Issue Parameter";
         }
+
+        @RequirePOST
+        public ListBoxModel doFillValueItems(@AncestorInPath Job<?, ?> job, @QueryParameter String name) {
+            ListBoxModel items = new ListBoxModel();
+            if (job.hasPermission(Item.BUILD)) {
+                ParametersDefinitionProperty prop = job.getProperty(ParametersDefinitionProperty.class);
+                if (prop != null) {
+                    ParameterDefinition def = prop.getParameterDefinition(name);
+                    if (def instanceof JiraIssueParameterDefinition jiraIssueDef) {
+                        List<Result> issueValues = jiraIssueDef.getIssues(job);
+                        issueValues.forEach(it -> items.add(it.summary, it.key));
+                    }
+                }
+            }
+            return items;
+        }
     }
 
     public static class Result {

src/main/java/hudson/plugins/jira/versionparameter/JiraVersionParameterDefinition.java

@@ -4,21 +4,19 @@
 import com.atlassian.jira.rest.client.api.domain.Version;
 import hudson.Extension;
 import hudson.cli.CLICommand;
-import hudson.model.Job;
-import hudson.model.ParameterDefinition;
-import hudson.model.ParameterValue;
+import hudson.model.*;
 import hudson.plugins.jira.JiraSession;
 import hudson.plugins.jira.JiraSite;
+import hudson.util.ListBoxModel;
 import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.*;
+import org.kohsuke.stapler.interceptor.RequirePOST;
 
 public class JiraVersionParameterDefinition extends ParameterDefinition {
     private static final long serialVersionUID = 4232979892748310160L;
@@ -69,7 +67,10 @@
 
     public List<JiraVersionParameterDefinition.Result> getVersions() throws IOException, RestClientException {
         Job<?, ?> contextJob = Stapler.getCurrentRequest2().findAncestorObject(Job.class);
+        return getVersions(contextJob);
+    }
 
+    public List<JiraVersionParameterDefinition.Result> getVersions(Job<?, ?> contextJob) {
         JiraSite site = JiraSite.get(contextJob);
         if (site == null) {
             throw new IllegalStateException(
@@ -173,6 +174,22 @@
         public String getDisplayName() {
             return "Jira Release Version Parameter";
         }
+
+        @RequirePOST
+        public ListBoxModel doFillVersionItems(@AncestorInPath Job<?, ?> job, @QueryParameter String name) {
+            ListBoxModel items = new ListBoxModel();
+            if (job.hasPermission(Item.BUILD)) {
+                ParametersDefinitionProperty prop = job.getProperty(ParametersDefinitionProperty.class);
+                if (prop != null) {
+                    ParameterDefinition def = prop.getParameterDefinition(name);
+                    if (def instanceof JiraVersionParameterDefinition jiraVersionDef) {
+                        List<JiraVersionParameterDefinition.Result> issueValues = jiraVersionDef.getVersions(job);
+                        issueValues.forEach(it -> items.add(it.name));
+                    }
+                }
+            }
+            return items;
+        }
     }
 
     public static class Result {

src/main/resources/hudson/plugins/jira/listissuesparameter/JiraIssueParameterDefinition/index.jelly

@@ -16,26 +16,13 @@ limitations under the License.
 <!-- this is the page fragment displayed when triggering a new build -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-  <j:set var="escapeEntryTitleAndDescription" value="false"/>
-  <f:entry title="${h.escape(it.name)}" description="${it.formattedDescription}">
-    <!-- this div is required because of ParametersDefinitionProperty.java#117 -->
-    <div name="parameter">
-      <input type="hidden" name="name" value="${it.name}"/>
-      <j:choose>
-        <j:when test="${it.issues == null or it.issues.size() == 0}">
-          <!-- no tags at all -->
-          ${%No issues matched the search.}<br/>
-          ${%If you trigger the build, it will likely fail.}
-        </j:when>
-        <j:otherwise>
-          <!-- everything is fine, we can display the drop-down list to the user -->
-          <select name="value">
-            <j:forEach var="issue" items="${it.issues}">
-              <option value="${issue.key}">${issue.key}: ${issue.summary}</option>
-            </j:forEach>
-          </select>
-        </j:otherwise>
-      </j:choose>
-    </div>
-  </f:entry>
+    <j:set var="escapeEntryTitleAndDescription" value="false"/>
+    <j:set var="instance" value="${it}"/>
+    <j:set var="descriptor" value="${it.descriptor}"/>
+    <f:entry field="value" title="${h.escape(it.name)}" description="${it.formattedDescription}">
+        <div name="parameter">
+            <input type="hidden" name="name" value="${it.name}"/>
+            <f:select/>
+        </div>
+    </f:entry>
 </j:jelly>

src/main/resources/hudson/plugins/jira/listissuesparameter/JiraIssueParameterValue/value.jelly

@@ -17,6 +17,7 @@ limitations under the License.
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
   <j:set var="escapeEntryTitleAndDescription" value="false"/>
   <f:entry title="${h.escape(it.name)}">
-    <f:textbox name="${it.name}" value="${it.issue}" />
+    <j:set var="readOnlyMode" value="true"/>
+    <f:textbox name="${it.name}" value="${it.value}"/>
   </f:entry>
 </j:jelly>

src/main/resources/hudson/plugins/jira/versionparameter/JiraVersionParameterDefinition/index.jelly

@@ -1,26 +1,13 @@
 <!-- this is the page fragment displayed when triggering a new build -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-  <j:set var="escapeEntryTitleAndDescription" value="false"/>
-  <f:entry title="${h.escape(it.name)}" description="${it.formattedDescription}">
-    <!-- this div is required because of ParametersDefinitionProperty.java#117 -->
-    <div name="parameter">
-      <input type="hidden" name="name" value="${it.name}"/>
-      <j:choose>
-        <j:when test="${it.versions == null or it.versions.size() == 0}">
-          <!-- no tags at all -->
-          ${%No versions found meeting your filter criteria.}<br/>
-          ${%If you trigger the build, it will likely fail.}
-        </j:when>
-        <j:otherwise>
-          <!-- everything is fine, we can display the drop-down list to the user -->
-          <select name="version">
-            <j:forEach var="version" items="${it.versions}">
-              <option value="${version.name}">${version.name}</option>
-            </j:forEach>
-          </select>
-        </j:otherwise>
-      </j:choose>
-    </div>
-  </f:entry>
+    <j:set var="escapeEntryTitleAndDescription" value="false"/>
+    <j:set var="instance" value="${it}"/>
+    <j:set var="descriptor" value="${it.descriptor}"/>
+    <f:entry field="version" title="${h.escape(it.name)}" description="${it.formattedDescription}">
+        <div name="parameter">
+            <input type="hidden" name="name" value="${it.name}"/>
+            <f:select/>
+        </div>
+    </f:entry>
 </j:jelly>

src/main/resources/hudson/plugins/jira/versionparameter/JiraVersionParameterValue/value.jelly

@@ -2,6 +2,7 @@
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
   <j:set var="escapeEntryTitleAndDescription" value="false"/>
   <f:entry title="${h.escape(it.name)}">
-    <f:textbox name="${it.name}" value="${it.version}" />
+    <j:set var="readOnlyMode" value="true"/>
+    <f:textbox name="${it.name}" value="${it.version}"/>
   </f:entry>
 </j:jelly>

src/test/java/hudson/plugins/jira/listissuesparameter/JiraIssueParameterDefinitionTest.java

@@ -0,0 +1,63 @@
+package hudson.plugins.jira.listissuesparameter;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import com.atlassian.jira.rest.client.api.domain.Issue;
+import hudson.model.Item;
+import hudson.model.Job;
+import hudson.model.ParametersDefinitionProperty;
+import hudson.util.ListBoxModel;
+import java.util.List;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+class JiraIssueParameterDefinitionTest {
+
+    @Nested
+    @ExtendWith(MockitoExtension.class)
+    class DescriptorImplTest {
+
+        private JiraIssueParameterDefinition.DescriptorImpl uut = new JiraIssueParameterDefinition.DescriptorImpl();
+
+        @Test
+        void shouldFillValueItems(
+                @Mock Job<?, ?> job,
+                @Mock ParametersDefinitionProperty propertyDef,
+                @Mock JiraIssueParameterDefinition paramDef,
+                @Mock Issue issue) {
+            when(job.hasPermission(Item.BUILD)).thenReturn(true);
+            when(job.getProperty(ParametersDefinitionProperty.class)).thenReturn(propertyDef);
+            when(propertyDef.getParameterDefinition("PARAM_NAME")).thenReturn(paramDef);
+            when(issue.getKey()).thenReturn("JIRA-1234");
+            when(issue.getSummary()).thenReturn("Summary");
+            JiraIssueParameterDefinition.Result item = new JiraIssueParameterDefinition.Result(issue, null);
+            when(paramDef.getIssues(any())).thenReturn(List.of(item));
+
+            ListBoxModel result = uut.doFillValueItems(job, "PARAM_NAME");
+
+            assertThat(result, hasSize(1));
+            ListBoxModel.Option option = result.get(0);
+            assertEquals("JIRA-1234", option.value);
+            assertEquals("Summary", option.name);
+            verify(job).hasPermission(Item.BUILD);
+        }
+
+        @Test
+        void shouldNotFillValueItemsIfPermissionMissing(@Mock Job<?, ?> job) {
+            ListBoxModel result = uut.doFillValueItems(job, "PARAM_NAME");
+
+            assertThat(result, hasSize(0));
+            verify(job).hasPermission(Item.BUILD);
+            verifyNoMoreInteractions(job);
+        }
+    }
+}

src/test/java/hudson/plugins/jira/versionparameter/JiraVersionParameterDefinitionTest.java

@@ -1,23 +1,33 @@
 package hudson.plugins.jira.versionparameter;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 import static org.mockito.Mockito.mockStatic;
 
+import com.atlassian.jira.rest.client.api.domain.Version;
 import hudson.cli.CLICommand;
+import hudson.model.Item;
 import hudson.model.Job;
 import hudson.model.ParameterValue;
+import hudson.model.ParametersDefinitionProperty;
 import hudson.plugins.jira.JiraSession;
 import hudson.plugins.jira.JiraSite;
 import hudson.plugins.jira.extension.ExtendedVersion;
+import hudson.util.ListBoxModel;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest2;
+import org.mockito.Mock;
 import org.mockito.MockedStatic;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 class JiraVersionParameterDefinitionTest {
 
@@ -258,4 +268,41 @@
             throw new RuntimeException(e);
         }
     }
+
+    @Nested
+    @ExtendWith(MockitoExtension.class)
+    class DescriptorImplTest {
+
+        private JiraVersionParameterDefinition.DescriptorImpl uut = new JiraVersionParameterDefinition.DescriptorImpl();
+
+        @Test
+        void shouldFillVersionItems(
+                @Mock Job<?, ?> job,
+                @Mock ParametersDefinitionProperty propertyDef,
+                @Mock JiraVersionParameterDefinition paramDef) {
+            when(job.hasPermission(Item.BUILD)).thenReturn(true);
+            when(job.getProperty(ParametersDefinitionProperty.class)).thenReturn(propertyDef);
+            when(propertyDef.getParameterDefinition("PARAM_NAME")).thenReturn(paramDef);
+            Version version = new Version(null, 1L, "1.0.0", "", false, false, null);
+            JiraVersionParameterDefinition.Result item = new JiraVersionParameterDefinition.Result(version);
+            when(paramDef.getVersions(any())).thenReturn(List.of(item));
+
+            ListBoxModel result = uut.doFillVersionItems(job, "PARAM_NAME");
+
+            assertThat(result, hasSize(1));
+            ListBoxModel.Option option = result.get(0);
+            assertEquals("1.0.0", option.value);
+            assertEquals("1.0.0", option.name);
+            verify(job).hasPermission(Item.BUILD);
+        }
+
+        @Test
+        void shouldNotFillVersionsItemsIfPermissionMissing(@Mock Job<?, ?> job) {
+            ListBoxModel result = uut.doFillVersionItems(job, "PARAM_NAME");
+
+            assertThat(result, hasSize(0));
+            verify(job).hasPermission(Item.BUILD);
+            verifyNoMoreInteractions(job);
+        }
+    }
 }