bind model from jelly to

jenkinsci · Jan 15, 2018 · 4fc9cb4 · 4fc9cb4
1 parent ed5bec5
commit 4fc9cb4
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 29 deletions.
diff --git a/src/main/java/com/qasymphony/ci/plugin/action/PushingResultAction.java b/src/main/java/com/qasymphony/ci/plugin/action/PushingResultAction.java
@@ -294,6 +294,8 @@ public Publisher newInstance(StaplerRequest req, JSONObject formData) throws hud
       configuration.setJenkinsProjectName(req.getParameter("name"));
       configuration.setSubmitToContainer(formData.getBoolean("submitToContainer"));
       configuration.setCreateNewTestRunsEveryBuild(formData.getBoolean("createNewTestRunsEveryBuild"));
+      configuration.setContainerId(formData.getLong("containerId"));
+      configuration.setContainerType(formData.getString("containerType"));
       configuration.setReadFromJenkins(formData.getBoolean("readFromJenkins"));
       configuration.setEachMethodAsTestCase(formData.getBoolean("eachMethodAsTestCase"));
       configuration = ConfigService.validateConfiguration(configuration, formData);

diff --git a/src/main/java/com/qasymphony/ci/plugin/model/Configuration.java b/src/main/java/com/qasymphony/ci/plugin/model/Configuration.java
@@ -29,6 +29,8 @@ public class Configuration extends AbstractDescribableImpl<Configuration> {
 
   private boolean submitToContainer;
   private boolean createNewTestRunsEveryBuild;
+  private long containerId;
+  private String containerType;
   /**
    * Read from testResult action from jenkins
    */
@@ -38,14 +40,14 @@ public class Configuration extends AbstractDescribableImpl<Configuration> {
 
   public static Configuration newInstance() {
     return new Configuration(0L, "", "", 0, "", 0L, "", 0, "",
-            0, 0, false, "", false, false);
+            0, 0, false, "", false, false, 0, "");
   }
 
   @DataBoundConstructor
   public Configuration(Long id, String url, String appSecretKey, long projectId,
                        String projectName, long releaseId, String releaseName, long environmentId,
                        String environmentName, long testSuiteId, long moduleId, Boolean readFromJenkins, String resultPattern,
-                       Boolean submitToContainer, Boolean createNewTestRunsEveryBuild) {
+                       Boolean submitToContainer, Boolean createNewTestRunsEveryBuild, long containerId, String containerType) {
     this.url = url;
     this.appSecretKey = appSecretKey;
     this.projectId = projectId;
@@ -61,6 +63,8 @@ public Configuration(Long id, String url, String appSecretKey, long projectId,
     this.resultPattern = resultPattern;
     this.submitToContainer = submitToContainer;
     this.createNewTestRunsEveryBuild = createNewTestRunsEveryBuild;
+    this.containerId = containerId;
+    this.containerType = containerType;
   }
 
   public Long getId() {
@@ -217,41 +221,57 @@ public Configuration setCreateNewTestRunsEveryBuild(boolean createNewTestRunsEve
     return this;
   }
 
+  public long getContainerId() {
+    return containerId;
+  }
+
+  public void setContainerId(long containerId) {
+    this.containerId = containerId;
+  }
+
+  public String getContainerType() {
+    return containerType;
+  }
+
+  public void setContainerType(String containerType) {
+    this.containerType = containerType;
+  }
+
   @Override
   public String toString() {
     return "Configuration{" +
-      "id=" + id +
-      ", url='" + url + '\'' +
-      ", appSecretKey='" + appSecretKey + '\'' +
-      ", projectId=" + projectId +
-      ", projectName='" + projectName + '\'' +
-      ", releaseId=" + releaseId +
-      ", releaseName='" + releaseName + '\'' +
-      ", environmentId=" + environmentId +
-      ", environmentName='" + environmentName + '\'' +
-      ", testSuiteId=" + testSuiteId +
-      ", moduleId=" + moduleId +
-      ", jenkinsServerUrl='" + jenkinsServerUrl + '\'' +
-      ", jenkinsProjectName='" + jenkinsProjectName + '\'' +
-      ", readFromJenkins=" + readFromJenkins +
-      ", resultPattern='" + resultPattern + '\'' +
-      ", eachMethodAsTestCase='" + eachMethodAsTestCase + '\'' +
-      '}';
+            "id=" + id +
+            ", url='" + url + '\'' +
+            ", appSecretKey='" + appSecretKey + '\'' +
+            ", projectId=" + projectId +
+            ", projectName='" + projectName + '\'' +
+            ", releaseId=" + releaseId +
+            ", releaseName='" + releaseName + '\'' +
+            ", environmentId=" + environmentId +
+            ", environmentName='" + environmentName + '\'' +
+            ", testSuiteId=" + testSuiteId +
+            ", moduleId=" + moduleId +
+            ", jenkinsServerUrl='" + jenkinsServerUrl + '\'' +
+            ", jenkinsProjectName='" + jenkinsProjectName + '\'' +
+            ", readFromJenkins=" + readFromJenkins +
+            ", resultPattern='" + resultPattern + '\'' +
+            ", eachMethodAsTestCase='" + eachMethodAsTestCase + '\'' +
+            '}';
   }
 
   /**
    * @return {@link Setting}
    */
   public Setting toSetting() {
     return new Setting()
-      .setId(this.id)
-      .setJenkinsServer(this.jenkinsServerUrl)
-      .setJenkinsProjectName(this.jenkinsProjectName)
-      .setProjectId(this.projectId)
-      .setReleaseId(this.releaseId)
-      .setModuleId(this.moduleId)
-      .setEnvironmentId(this.environmentId)
-      .setTestSuiteId(this.testSuiteId);
+            .setId(this.id)
+            .setJenkinsServer(this.jenkinsServerUrl)
+            .setJenkinsProjectName(this.jenkinsProjectName)
+            .setProjectId(this.projectId)
+            .setReleaseId(this.releaseId)
+            .setModuleId(this.moduleId)
+            .setEnvironmentId(this.environmentId)
+            .setTestSuiteId(this.testSuiteId);
   }
 
   @Extension

diff --git a/src/main/resources/com/qasymphony/ci/plugin/action/PushingResultAction/config.jelly b/src/main/resources/com/qasymphony/ci/plugin/action/PushingResultAction/config.jelly
@@ -56,8 +56,10 @@
                  value="${instance.configuration.releaseId}"/>
       <f:textbox name="config.environmentId" field="environmentId"
                  value="${instance.configuration.environmentId}"/>
-      <f:textbox name="config.containerTypeId" field="containerTypeId"
-                 value="${instance.configuration.containerTypeId}"/>
+      <f:textbox name="config.containerId" field="containerId"
+                 value="${instance.configuration.containerId}"/>
+      <f:textbox name="config.containerType" field="containerType"
+                 value="${instance.configuration.containerType}"/>
 
       <f:textbox name="config.projectName" field="projectName"
                  value="${instance.configuration.projectName}"/>

diff --git a/src/main/webapp/js/app.js b/src/main/webapp/js/app.js
@@ -14,6 +14,12 @@ $j(document).ready(function () {
     }
     var nodeId = contentItem.getAttribute("qtest.id");
     var nodeType = contentItem.getAttribute("qtest.type");
+
+    var containerIdField = $j("input[name='config.containerId']");
+    containerIdField.val(nodeId ? nodeId : null);
+    var containerTypeField = $j("input[name='config.containerType']");
+    containerTypeField.val(nodeType ? nodeType : null);
+
     if (nodeType === 'release' || nodeType === 'test-cycle') {
         $j("#createNewTestRun").prop('disabled', false);
     } else {