Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BEE-27642 - fixes for run pipeline with compare table #345

Merged
merged 4 commits into from
Mar 24, 2023
Merged

BEE-27642 - fixes for run pipeline with compare table #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fae2d9
BEE-27642 - fixes for run pipeline with compare table
ovasilko Mar 22, 2023
978c568
BEE-27642 - tooltips
ovasilko Mar 23, 2023
5facb09
BEE-27642 - tooltips
ovasilko Mar 23, 2023
127901b
BEE-27642 - minor fix
ovasilko Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 46 additions & 15 deletions src/main/java/org/jenkinsci/plugins/electricflow/ElectricFlowPipelinePublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import edu.umd.cs.findbugs.annotations.NonNull;
import javax.servlet.ServletException;
Expand Down Expand Up @@ -324,6 +325,9 @@ public void setStageOption(String stageOption) {
this.stageOption = getSelectItemValue(stageOption);
}

public String getStoredStageOption() {
return stageOption;
}

public String getStartingStage() {
return startingStage;
Expand All @@ -334,6 +338,10 @@ public void setStartingStage(String startingStage) {
this.startingStage = getSelectItemValue(startingStage);
}

public String getStoredStartingStage() {
return startingStage;
}

public String getStagesToRun() {
return stagesToRun;
}
Expand Down Expand Up @@ -951,25 +959,39 @@ public boolean isApplicable(Class<? extends AbstractProject> aClass) {
}

public FormValidation doShowOldValues(
@QueryParameter("configuration") final String configuration,
@QueryParameter("projectName") final String projectName,
@QueryParameter("pipelineName") final String pipelineName,
@QueryParameter("addParam") final String addParam,
@QueryParameter("stagesToRun") final String stagesToRun,
@QueryParameter("storedConfiguration") final String storedConfiguration,
@QueryParameter("storedProjectName") final String storedProjectName,
@QueryParameter("storedPipelineName") final String storedPipelineName,
@QueryParameter("storedAddParam") final String storedAddParam,
@QueryParameter("storedStagesToRun") final String storedStagesToRun,
@QueryParameter("configuration") String configuration,
@QueryParameter("projectName") String projectName,
@QueryParameter("pipelineName") String pipelineName,
@QueryParameter("stageOption") String stageOption,
@QueryParameter("startingStage") String startingStage,
@QueryParameter("stagesToRun") String stagesToRun,
@QueryParameter("addParam") String addParam,
@QueryParameter("storedConfiguration") String storedConfiguration,
@QueryParameter("storedProjectName") String storedProjectName,
@QueryParameter("storedPipelineName") String storedPipelineName,
@QueryParameter("storedStageOption") String storedStageOption,
@QueryParameter("storedStartingStage") String storedStartingStage,
@QueryParameter("storedStagesToRun") String storedStagesToRun,
@QueryParameter("storedAddParam") String storedAddParam,
@AncestorInPath Item item) {
if (item == null || !item.hasPermission(Item.CONFIGURE)) {
return FormValidation.ok();
}
String configurationValue = configuration;
String projectNameValue = getSelectItemValue(projectName);
String pipelineNameValue = getSelectItemValue(pipelineName);
String addParamValue = getSelectItemValue(addParam);
String stageOptionValue = getSelectItemValue(stageOption);
String startingStageValue = getSelectItemValue(startingStage);
String stagesToRunValue = getSelectItemValue(stagesToRun);
String addParamValue = getSelectItemValue(addParam);

stageOptionValue = Objects.toString(stageOptionValue, "");
startingStageValue = Objects.toString(startingStageValue, "");
stagesToRunValue = Objects.toString(stagesToRunValue, "");

storedStageOption = Objects.toString(storedStageOption, "");
storedStartingStage = Objects.toString(storedStartingStage, "");
storedStagesToRun = Objects.toString(storedStagesToRun, "");

Map<String, String> stagesToRunMap = getStagesToRunMapFromParams(stagesToRunValue);
Map<String, String> storedStagesToRunMap = getStagesToRunMapFromParams(storedStagesToRun);
Expand All @@ -978,14 +1000,23 @@ public FormValidation doShowOldValues(
Map<String, String> storedPipelineParamsMap = getParamsMapFromAddParam(storedAddParam);

String comparisonTable =
"<table>"
"<table name=\"runPipelineCompare\">"
+ getValidationComparisonHeaderRow()
+ getValidationComparisonRow("Configuration", storedConfiguration, configurationValue)
+ getValidationComparisonRow("Project Name", storedProjectName, projectNameValue)
+ getValidationComparisonRow("Pipeline Name", storedPipelineName, pipelineNameValue)
+ getValidationComparisonRowsForExtraParameters(
"Stages to run", storedStagesToRunMap, stagesToRunMap)
+ getValidationComparisonRowsForExtraParameters(
+ getValidationComparisonRow("Stage Option", storedStageOption, stageOptionValue);

if (stageOptionValue.equals("startingStage") || storedStageOption.equals("startingStage")) {
comparisonTable += getValidationComparisonRow("Starting Stage", storedStartingStage, startingStageValue);
}

if (stageOptionValue.equals("stagesToRun") || storedStageOption.equals("stagesToRun")) {
comparisonTable += getValidationComparisonRowsForExtraParameters(
"Stages to run", storedStagesToRunMap, stagesToRunMap);
}

comparisonTable += getValidationComparisonRowsForExtraParameters(
"Pipeline Parameters", storedPipelineParamsMap, pipelineParamsMap)
+ "</table>";

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/electricflow/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public static String getParametersHTML(JSONArray parameters, String summaryText,
public static String getExtraHTML(
JSONArray parameters, String summaryText, String parameterName, String parameterValue, String sectionName) {

if (!parameters.isEmpty()) {
if (parameters != null && !parameters.isEmpty()) {
StringBuilder strBuilder = new StringBuilder(summaryText);

strBuilder.append(
Expand Down
15 changes: 12 additions & 3 deletions ...n/resources/org/jenkinsci/plugins/electricflow/ElectricFlowPipelinePublisher/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ All rights reserved.
<f:invisibleEntry>
<f:readOnlyTextbox field="storedPipelineName"/>
</f:invisibleEntry>
<f:invisibleEntry>
<f:readOnlyTextbox field="storedStageOption"/>
</f:invisibleEntry>
<f:invisibleEntry>
<f:readOnlyTextbox field="storedStartingStage"/>
</f:invisibleEntry>
<f:invisibleEntry>
<f:readOnlyTextbox field="storedStagesToRun"/>
</f:invisibleEntry>
<f:invisibleEntry>
<f:readOnlyTextbox field="storedAddParam"/>
</f:invisibleEntry>
Expand All @@ -81,7 +90,7 @@ All rights reserved.
<f:validateButton title="Compare Before Apply"
progress="Comparing values..."
method="showOldValues"
with="configuration,projectName,pipelineName,addParam,storedConfiguration,storedProjectName,storedPipelineName,storedAddParam" />
with="configuration,projectName,pipelineName,stageOption,startingStage,stagesToRun,addParam,storedConfiguration,storedProjectName,storedPipelineName,storedStageOption,storedStartingStage,storedStagesToRun,storedAddParam" />
</j:if>
</f:entry>

Expand Down Expand Up @@ -117,7 +126,7 @@ All rights reserved.
}
var json = JSON.parse(param);

var table = document.querySelector("[descriptorid='electricFlowSettings'] table");
var table = document.querySelector("[descriptorid='electricFlowSettings'] table:not([name='runPipelineCompare'])");
if (table == null) {
table = getElementByXpath("//select[@checkdependson='validationTrigger']/ancestor::table[@name]");
}
Expand Down Expand Up @@ -176,7 +185,7 @@ All rights reserved.
}
var json = JSON.parse(param);

var table = document.querySelector("[descriptorid='electricFlowSettings'] table");
var table = document.querySelector("[descriptorid='electricFlowSettings'] table:not([name='runPipelineCompare'])");
if (table == null) {
table = getElementByXpath("//select[@checkdependson='validationTrigger']/ancestor::table[@name]");
}
Expand Down