Skip to content

The Unified and Autonomous Development Platform

Fix issue #631 - Categorize various steps and make them searchable

Robin Shen06c0dc429442
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java
index dcb5430dc5..a80727923a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java
@@ -13,7 +13,9 @@ import io.onedev.server.model.Build;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
-@Editable(order=160, name="Build/Publish Docker Image")
+@Editable(order=160, name="Build Docker Image", description="Build and optionally publish docker image. "
+ + "Registry logins should be specified in the job executor executing this step if registry authentication "
+ + "is required for build or publish")
public class BuildImageStep extends Step {
private static final long serialVersionUID = 1L;
@@ -61,9 +63,7 @@ public class BuildImageStep extends Step {
this.tags = tags;
}
- @Editable(order=400, name="Publish After Build", description="Whether or not to publish built image to docker registry. "
- + "<b>NOTE: </b> Registry login should be specified in job executor running this step if you select to publish "
- + "this image")
+ @Editable(order=400, name="Publish After Build", description="Whether or not to publish built image to docker registry")
public boolean isPublish() {
return publish;
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java
index be84b0dd02..ee57faf223 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java
@@ -7,17 +7,18 @@ import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.k8shelper.Action;
-import io.onedev.k8shelper.StepFacade;
import io.onedev.k8shelper.ExecuteCondition;
+import io.onedev.k8shelper.StepFacade;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
+import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
public abstract class Step implements Serializable {
private static final long serialVersionUID = 1L;
-
+
private ExecuteCondition condition = ExecuteCondition.ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL;
public abstract StepFacade getFacade(Build build, String jobToken, ParamCombination paramCombination);
@@ -52,4 +53,12 @@ public abstract class Step implements Serializable {
return getAction(name, build, jobToken, paramCombination);
}
+ public static String getGroupedType(Class<? extends Step> stepClass) {
+ Editable editable = stepClass.getAnnotation(Editable.class);
+ if (editable != null && editable.group().length() != 0)
+ return editable.group() + "/" + EditableUtils.getDisplayName(stepClass);
+ else
+ return EditableUtils.getDisplayName(stepClass);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/StepGroup.java b/server-core/src/main/java/io/onedev/server/buildspec/step/StepGroup.java
new file mode 100644
index 0000000000..a2bbbd3c69
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/StepGroup.java
@@ -0,0 +1,7 @@
+package io.onedev.server.buildspec.step;
+
+public class StepGroup {
+
+ public static final String PUBLISH_REPORTS = "Publish Reports";
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java
index 3c5f56902a..f051b7442c 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java
@@ -30,7 +30,7 @@ import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.ParamSpecProvider;
import io.onedev.server.web.editable.annotation.VariableOption;
-@Editable(order=10000, name="Use Step Template", description="Step to use specified template")
+@Editable(order=10000, name="Use Step Template", description="Run specified step template")
public class UseTemplateStep extends Step {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js b/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js
index 8d942689e9..e8cc14f58e 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js
@@ -7,8 +7,7 @@
var $input = jQuery(this);
function onReturn() {
- if (onedev.server.form.confirmLeave())
- $(container).find(".active.selectable").find("a").addBack("a").click();
+ $(container).find(".active.selectable").find("a").addBack("a").click();
}
function onKeyup(e) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/filterabletree/FilterableTreePanel.html b/server-core/src/main/java/io/onedev/server/web/component/filterabletree/FilterableTreePanel.html
deleted file mode 100644
index 6852eb5266..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/filterabletree/FilterableTreePanel.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<wicket:panel>
- <div class="filterable-tree">
- <input wicket:id="input" class="form-control">
- <div wicket:id="content" class="content mt-3"></div>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/filterabletree/FilterableTreePanel.java b/server-core/src/main/java/io/onedev/server/web/component/filterabletree/FilterableTreePanel.java
deleted file mode 100644
index 0010cc91d2..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/filterabletree/FilterableTreePanel.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package io.onedev.server.web.component.filterabletree;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxChannel;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
-import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
-import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-
-@SuppressWarnings("serial")
-public abstract class FilterableTreePanel<T extends Serializable> extends GenericPanel<T> {
-
- public FilterableTreePanel(String id) {
- super(id);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- TextField<String> searchField = new TextField<>("input", Model.of(""));
- add(searchField);
-
- searchField.add(new OnTypingDoneBehavior(100) {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.setChannel(new AjaxChannel("tree-filter", AjaxChannel.Type.DROP));
- }
-
- @Override
- protected void onTypingDone(AjaxRequestTarget target) {
- String searchInput = searchField.getInput();
-
- List<T> matchNodes = getNodes(searchInput);
-
- List<T> filteredNodes = new ArrayList<>();
- for (T matchNode: matchNodes) {
- T currentNode = matchNode;
- while (currentNode != null) {
- if (!filteredNodes.contains(currentNode))
- filteredNodes.add(currentNode);
- currentNode = getParentNode(currentNode);
- }
- }
-
- NestedTree<T> tree = newTree(filteredNodes, searchInput);
- replace(tree);
- target.add(tree);
- }
-
- });
-
- add(newTree(getNodes(null), null));
-
- setOutputMarkupId(true);
- }
-
- private ITreeProvider<T> newTreeProvider(List<T> nodes) {
- return new ITreeProvider<T>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Iterator<? extends T> getRoots() {
- return getChildNodes(nodes, null).iterator();
- }
-
- @Override
- public boolean hasChildren(T node) {
- return !getChildNodes(nodes, node).isEmpty();
- }
-
- @Override
- public Iterator<? extends T> getChildren(T node) {
- return getChildNodes(nodes, node).iterator();
- }
-
- @Override
- public IModel<T> model(T object) {
- return Model.of(object);
- }
-
- };
- }
-
- private NestedTree<T> newTree(List<T> nodes, @Nullable String matchWith) {
- IModel<HashSet<T>> state;
-
- if (matchWith != null)
- state = new Model<HashSet<T>>(new HashSet<>(nodes));
- else
- state = new Model<HashSet<T>>(new HashSet<>(getChildNodes(nodes, null)));
-
- NestedTree<T> tree = new NestedTree<T>("content", newTreeProvider(nodes), state) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new HumanTheme());
- }
-
- @Override
- protected Component newContentComponent(String id, IModel<T> nodeModel) {
- return renderNode(nodes, nodeModel.getObject());
- }
-
- };
-
- tree.setOutputMarkupId(true);
-
- return tree;
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- String script = String.format("$('#%s>.filterable-tree>input').selectByTyping('#%s>.filterable-tree>div');",
- getMarkupId(), getMarkupId());
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
- protected abstract List<T> getNodes(@Nullable String matchWith);
-
- protected abstract List<T> getChildNodes(List<T> nodes, @Nullable T parentNode);
-
- @Nullable
- protected abstract T getParentNode(T childNode);
-
- protected abstract Component renderNode(List<T> nodes, T node);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
index 634ee545ff..3acac5d4b1 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
@@ -37,14 +37,15 @@ public class EditableUtils {
}
/**
- * Get category of specified element from category parameter of {@link Editable} annotation.
+ * Get group of specified element from group parameter of {@link Editable} annotation.
*
* @param element
- * annotated element to get category from
+ * annotated element to get group from
* @return
- * category name of specified element, or <tt>null</tt> if not defined
+ * group name of specified element, or <tt>null</tt> if not defined
*/
- public static @Nullable String getCategory(AnnotatedElement element) {
+ @Nullable
+ public static String getGroup(AnnotatedElement element) {
Editable editable = element.getAnnotation(Editable.class);
if (editable != null && editable.group().trim().length() != 0)
return editable.group();
@@ -60,7 +61,8 @@ public class EditableUtils {
* @return
* icon name of specified element, or <tt>null</tt> if not defined
*/
- public static @Nullable String getIcon(AnnotatedElement element) {
+ @Nullable
+ public static String getIcon(AnnotatedElement element) {
Editable editable = element.getAnnotation(Editable.class);
if (editable != null && editable.icon().trim().length() != 0)
return editable.icon();
@@ -76,7 +78,8 @@ public class EditableUtils {
* @return
* defined description, or <tt>null</tt> if description can not be found
*/
- public static @Nullable String getDescription(AnnotatedElement element) {
+ @Nullable
+ public static String getDescription(AnnotatedElement element) {
Editable editable = element.getAnnotation(Editable.class);
if (editable == null) {
return null;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepBean.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepBean.java
deleted file mode 100644
index 96786cc90e..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepBean.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.onedev.server.web.editable.buildspec.step;
-
-import java.io.Serializable;
-
-import javax.validation.constraints.NotNull;
-
-import io.onedev.server.buildspec.step.Step;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable
-public class StepBean implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private Step step;
-
- @Editable(name="Type", order=100)
- @NotNull(message="may not be empty")
- public Step getStep() {
- return step;
- }
-
- public void setStep(Step step) {
- this.step = step;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepCssResourceReference.java
index f45430e29d..f9163fbce8 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepCssResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepCssResourceReference.java
@@ -1,8 +1,8 @@
package io.onedev.server.web.editable.buildspec.step;
-import org.apache.wicket.request.resource.CssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-public class StepCssResourceReference extends CssResourceReference {
+public class StepCssResourceReference extends BaseDependentCssResourceReference {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.html
index d744c44d03..a217ecc33d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.html
@@ -5,11 +5,26 @@
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
- <div wicket:id="editor"></div>
+ <a wicket:id="type" class="btn btn-outline-secondary"><span wicket:id="label"></span> <wicket:svg href="arrow" class="icon rotate-90"/></a>
+ <div wicket:id="description" class="text-muted font-size-sm mt-2"></div>
+ <div wicket:id="editor" class="mt-3"></div>
</div>
<div class="modal-footer">
<input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
<a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
</div>
</form>
+ <wicket:fragment wicket:id="stepTypeChoiceFrag">
+ <input wicket:id="input" class="form-control" placeholder="Type to filter">
+ <div wicket:id="content" class="content mt-3"></div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="groupNodeFrag">
+ <a wicket:id="link" class="selectable"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="stepNodeFrag">
+ <a wicket:id="link" class="selectable">
+ <span wicket:id="label"></span>
+ <div wicket:id="description" class="font-size-sm text-muted text-wrap"></div>
+ </a>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java
index f20dec98c8..32c93693f9 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java
@@ -1,43 +1,86 @@
package io.onedev.server.web.editable.buildspec.step;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
+import java.util.Set;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
+import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
+import io.onedev.commons.loader.AppLoader;
+import io.onedev.commons.loader.ImplementationRegistry;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.buildspec.BuildSpecAware;
import io.onedev.server.buildspec.ParamSpecAware;
import io.onedev.server.buildspec.step.Step;
+import io.onedev.server.util.match.MatchScoreProvider;
+import io.onedev.server.util.match.MatchScoreUtils;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.editable.EditableUtils;
@SuppressWarnings("serial")
abstract class StepEditPanel extends Panel implements BuildSpecAware, ParamSpecAware {
+ private static final List<Class<? extends Step>> stepClasses = new ArrayList<>();
+
+ static {
+ ImplementationRegistry registry = AppLoader.getInstance(ImplementationRegistry.class);
+ stepClasses.addAll(registry.getImplementations(Step.class));
+ EditableUtils.sortAnnotatedElements(stepClasses);
+ }
+
private final List<Step> steps;
private final int stepIndex;
+ private Step step;
+
public StepEditPanel(String id, List<Step> steps, int stepIndex) {
super(id);
this.steps = steps;
this.stepIndex = stepIndex;
+
+ if (stepIndex != -1)
+ step = steps.get(stepIndex);
}
@Override
protected void onInitialize() {
super.onInitialize();
-
- StepBean bean = new StepBean();
- if (stepIndex != -1)
- bean.setStep(steps.get(stepIndex));
Form<?> form = new Form<Void>("form") {
@@ -64,25 +107,292 @@ abstract class StepEditPanel extends Panel implements BuildSpecAware, ParamSpecA
});
- BeanEditor editor = BeanContext.edit("editor", bean);
- form.add(editor);
- form.add(new AjaxButton("save") {
+ form.add(new DropdownLink("type") {
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("label", new LoadableDetachableModel<String>() {
- Step step = bean.getStep();
- if (editor.isValid()) {
- if (stepIndex != -1) {
- steps.set(stepIndex, step);
- } else {
- steps.add(step);
+ @Override
+ protected String load() {
+ if (step != null)
+ return Step.getGroupedType(step.getClass());
+ else
+ return "Please select type";
+ }
+
+ }));
+ }
+
+ @Override
+ protected void onInitialize(FloatingPanel dropdown) {
+ super.onInitialize(dropdown);
+ dropdown.add(AttributeAppender.append("class", "step-type-choice"));
+ }
+
+ private List<TreeNode> getNodes() {
+ List<TreeNode> nodes = new ArrayList<>();
+
+ Set<String> addedGroups = new HashSet<>();
+ for (Class<? extends Step> stepClass: stepClasses) {
+ String group = EditableUtils.getGroup(stepClass);
+ if (group != null && addedGroups.add(group))
+ nodes.add(new GroupNode(group));
+ nodes.add(new StepNode(stepClass));
+ }
+
+ return nodes;
+ }
+
+ protected List<TreeNode> getChildNodes(List<TreeNode> nodes, TreeNode parentNode) {
+ List<TreeNode> childNodes = new ArrayList<>();
+ if (parentNode == null) {
+ for (TreeNode node: nodes) {
+ if (node instanceof GroupNode) {
+ childNodes.add(node);
+ } else {
+ StepNode stepNode = (StepNode) node;
+ if (EditableUtils.getGroup(stepNode.stepClass) == null)
+ childNodes.add(node);
+ }
}
- onSave(target);
} else {
- target.add(form);
+ for (TreeNode node: nodes) {
+ if (node instanceof StepNode) {
+ StepNode stepNode = (StepNode) node;
+ if (parentNode.getName().equals(EditableUtils.getGroup(stepNode.stepClass)))
+ childNodes.add(node);
+ }
+ }
}
+ return childNodes;
+ }
+
+ private NestedTree<TreeNode> newTree(FloatingPanel dropdown, List<TreeNode> nodes, Set<TreeNode> state) {
+ NestedTree<TreeNode> tree = new NestedTree<TreeNode>("content", new ITreeProvider<TreeNode>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Iterator<? extends TreeNode> getRoots() {
+ return getChildNodes(nodes, null).iterator();
+ }
+
+ @Override
+ public boolean hasChildren(TreeNode node) {
+ return node instanceof GroupNode;
+ }
+
+ @Override
+ public Iterator<? extends TreeNode> getChildren(TreeNode node) {
+ return getChildNodes(nodes, node).iterator();
+ }
+
+ @Override
+ public IModel<TreeNode> model(TreeNode object) {
+ return Model.of(object);
+ }
+
+ }, Model.ofSet(state)) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new HumanTheme());
+ }
+
+ @Override
+ protected Component newContentComponent(String id, IModel<TreeNode> nodeModel) {
+ TreeNode node = nodeModel.getObject();
+
+ if (node instanceof GroupNode) {
+ Fragment fragment = new Fragment(id, "groupNodeFrag", StepEditPanel.this);
+
+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (getState(node) == State.COLLAPSED)
+ expand(node);
+ else
+ collapse(node);
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ };
+ link.add(new Label("label", node.getName()));
+ fragment.add(link);
+
+ return fragment;
+ } else {
+ Fragment fragment = new Fragment(id, "stepNodeFrag", StepEditPanel.this);
+
+ StepNode stepNode = (StepNode) node;
+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ try {
+ Step newStep = stepNode.stepClass.newInstance();
+ if (step != null) {
+ newStep.setName(step.getName());
+ newStep.setCondition(step.getCondition());
+ }
+ step = newStep;
+
+ String description = getDescription();
+ if (description != null)
+ form.replace(new Label("description", description).setEscapeModelStrings(false));
+ else
+ form.replace(new WebMarkupContainer("description").setVisible(false));
+
+ BeanEditor editor = BeanContext.edit("editor", step);
+ form.replace(editor);
+ target.add(form);
+
+ String script = String.format("onedev.server.form.markDirty($('#%s'));",
+ form.getMarkupId());
+ target.appendJavaScript(script);
+ } catch (InstantiationException | IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ dropdown.close();
+ }
+
+ };
+ link.add(new Label("label", EditableUtils.getDisplayName(stepNode.stepClass)));
+
+ for (TreeNode each: nodes) {
+ if (each instanceof StepNode) {
+ if (node.equals(each))
+ link.add(AttributeAppender.append("class", "active"));
+ break;
+ }
+ }
+ fragment.add(link);
+
+ String description = StringUtils.trimToNull(StringUtils.substringBefore(
+ EditableUtils.getDescription(stepNode.stepClass), "."));
+ if (description != null)
+ link.add(new Label("description", description).setEscapeModelStrings(false));
+ else
+ link.add(new WebMarkupContainer("description").setVisible(false));
+
+ return fragment;
+ }
+ }
+
+ };
+
+ tree.setOutputMarkupId(true);
+
+ return tree;
+ }
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ Fragment fragment = new Fragment(id, "stepTypeChoiceFrag", StepEditPanel.this) {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new SelectByTypingResourceReference()));
+
+ String script = String.format("$('#%s>input').selectByTyping('#%s>div');",
+ getMarkupId(), getMarkupId());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ };
+
+ TextField<String> searchField = new TextField<>("input", Model.of(""));
+ fragment.add(searchField);
+
+ searchField.add(new OnTypingDoneBehavior(100) {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setChannel(new AjaxChannel("step-choice", AjaxChannel.Type.DROP));
+ }
+
+ @Override
+ protected void onTypingDone(AjaxRequestTarget target) {
+ String searchInput = StringUtils.trimToNull(searchField.getInput());
+
+ List<TreeNode> nodes = getNodes();
+
+ NestedTree<TreeNode> tree;
+ if (searchInput != null) {
+ MatchScoreProvider<TreeNode> matchScoreProvider = new MatchScoreProvider<TreeNode>() {
+
+ @Override
+ public double getMatchScore(TreeNode object) {
+ return MatchScoreUtils.getMatchScore(object.getName(), searchInput);
+ }
+
+ };
+
+ List<TreeNode> matchNodes = MatchScoreUtils.filterAndSort(nodes, matchScoreProvider);
+
+ List<TreeNode> filteredNodes = new ArrayList<>();
+
+ Set<String> addedGroups = new HashSet<>();
+ for (TreeNode matchNode: matchNodes) {
+ if (matchNode instanceof StepNode) {
+ StepNode currentNode = (StepNode) matchNode;
+ filteredNodes.add(currentNode);
+ String group = EditableUtils.getGroup(currentNode.stepClass);
+ if (group != null && addedGroups.add(group))
+ filteredNodes.add(new GroupNode(group));
+ }
+ }
+ tree = newTree(dropdown, filteredNodes, new HashSet<>(filteredNodes));
+ } else {
+ tree = newTree(dropdown, nodes, new HashSet<>());
+ }
+
+ fragment.replace(tree);
+ target.add(tree);
+ }
+
+ });
+
+ fragment.add(newTree(dropdown, getNodes(), new HashSet<>()));
+ fragment.setOutputMarkupId(true);
+
+ return fragment;
+ }
+
+ });
+
+ String description = getDescription();
+ if (description != null)
+ form.add(new Label("description", description).setEscapeModelStrings(false));
+ else
+ form.add(new WebMarkupContainer("description").setVisible(false));
+
+ if (step != null)
+ form.add(BeanContext.edit("editor", step));
+ else
+ form.add(new WebMarkupContainer("editor").setOutputMarkupPlaceholderTag(true).setVisible(false));
+
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ if (stepIndex != -1)
+ steps.set(stepIndex, step);
+ else
+ steps.add(step);
+
+ onSave(target);
}
});
@@ -105,9 +415,93 @@ abstract class StepEditPanel extends Panel implements BuildSpecAware, ParamSpecA
add(form);
}
-
+
+ private String getDescription() {
+ if (step != null) {
+ return StringUtils.trimToNull(StringUtils.stripStart(
+ EditableUtils.getDescription(step.getClass()), "."));
+ } else {
+ return null;
+ }
+ }
+
protected abstract void onSave(AjaxRequestTarget target);
protected abstract void onCancel(AjaxRequestTarget target);
+ private static interface TreeNode extends Serializable {
+
+ String getName();
+
+ }
+
+ private static class GroupNode implements TreeNode {
+
+ private final String name;
+
+ public GroupNode(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ } else if (other instanceof GroupNode) {
+ GroupNode otherNode = (GroupNode) other;
+ return new EqualsBuilder().append(getName(), otherNode.getName()).isEquals();
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ if (getName() == null)
+ return super.hashCode();
+ else
+ return new HashCodeBuilder(17, 37).append(getName()).toHashCode();
+ }
+
+ }
+
+ private static class StepNode implements TreeNode {
+
+ private final Class<? extends Step> stepClass;
+
+ public StepNode(Class<? extends Step> stepClass) {
+ this.stepClass = stepClass;
+ }
+
+ @Override
+ public String getName() {
+ return EditableUtils.getDisplayName(stepClass);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ } else if (other instanceof StepNode) {
+ StepNode otherNode = (StepNode) other;
+ return new EqualsBuilder().append(stepClass, otherNode.stepClass).isEquals();
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ if (getName() == null)
+ return super.hashCode();
+ else
+ return new HashCodeBuilder(17, 37).append(stepClass).toHashCode();
+ }
+
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css
index e8be9c3770..82c4edf9a0 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css
@@ -3,3 +3,13 @@
width: 600px;
}
}
+
+.floating.step-type-choice {
+ padding: 24px 18px 24px 18px;
+ width: 480px !important;
+}
+.floating.step-type-choice>.content>.content {
+ overflow: auto;
+ max-height: 480px;
+}
+
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.html
index 831cdc54ac..485d4ee7d3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.html
@@ -31,7 +31,10 @@
<h5 class="modal-title">Outline Search</h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
- <div wicket:id="body" class="modal-body"></div>
+ <div class="modal-body">
+ <input wicket:id="input" class="form-control" placeholder="Type to filter">
+ <div wicket:id="content" class="content overflow-auto mt-3"></div>
+ </div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="outlineNodeFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
index e7c3b7ccb0..503defb576 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
@@ -15,6 +15,7 @@ import javax.annotation.Nullable;
import javax.servlet.http.Cookie;
import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
@@ -33,6 +34,7 @@ import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -88,10 +90,11 @@ import io.onedev.server.util.match.MatchScoreProvider;
import io.onedev.server.util.match.MatchScoreUtils;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;
import io.onedev.server.web.component.codecomment.CodeCommentPanel;
-import io.onedev.server.web.component.filterabletree.FilterableTreePanel;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.component.menu.MenuItem;
@@ -980,75 +983,127 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
target.appendJavaScript("onedev.server.sourceView.onCloseComment();");
}
- private Component newOutlineSearchPanel(String id, ModalPanel modal) {
- Fragment fragment = new Fragment(id, "outlineSearchFrag", SourceViewPanel.this);
- fragment.add(new AjaxLink<Void>("close") {
+ private NestedTree<Symbol> newOutlineSearchTree(ModalPanel modal, List<Symbol> symbols, Set<Symbol> state) {
+ NestedTree<Symbol> tree = new NestedTree<Symbol>("content", newSymbolTreeProvider(symbols), Model.ofSet(state)) {
@Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new HumanTheme());
}
-
- });
-
- fragment.add(new FilterableTreePanel<Symbol>("body") {
@Override
- protected List<Symbol> getNodes(String matchWith) {
- MatchScoreProvider<Symbol> matchScoreProvider = new MatchScoreProvider<Symbol>() {
+ protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {
+ Fragment fragment = new Fragment(id, "outlineNodeFrag", SourceViewPanel.this);
+
+ Symbol symbol = nodeModel.getObject();
+
+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
@Override
- public double getMatchScore(Symbol object) {
- return MatchScoreUtils.getMatchScore(object.getName(), matchWith);
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ context.onSelect(target, context.getBlobIdent(), BlobRendererer.getSourcePosition(symbol.getPosition()));
}
};
+ link.add(symbol.renderIcon("icon"));
+ link.add(symbol.render("label", null));
+ link.add(AttributeAppender.replace("class", "selectable"));
+
+ for (Symbol each: symbols) {
+ if (each.isDisplayInOutline()) {
+ if (symbol == each)
+ link.add(AttributeAppender.append("class", "active"));
+ break;
+ }
+ }
+
+ fragment.add(link);
+ fragment.setOutputMarkupId(true);
+
+ return fragment;
+ }
+
+ };
+
+ tree.setOutputMarkupId(true);
+
+ return tree;
+ }
+
+ private Component newOutlineSearchPanel(String id, ModalPanel modal) {
+ Fragment fragment = new Fragment(id, "outlineSearchFrag", SourceViewPanel.this) {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new SelectByTypingResourceReference()));
- return MatchScoreUtils.filterAndSort(symbols, matchScoreProvider);
+ String script = String.format("$('#%s>.outline-search>.modal-body>input').selectByTyping('#%s>.outline-search>.modal-body>div');",
+ getMarkupId(), getMarkupId());
+ response.render(OnDomReadyHeaderItem.forScript(script));
}
+
+ };
+ fragment.add(new AjaxLink<Void>("close") {
@Override
- protected List<Symbol> getChildNodes(List<Symbol> nodes, Symbol parentNode) {
- return getChildSymbols(nodes, parentNode);
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
}
+
+ });
+ TextField<String> searchField = new TextField<>("input", Model.of(""));
+ fragment.add(searchField);
+
+ searchField.add(new OnTypingDoneBehavior(100) {
+
@Override
- protected Symbol getParentNode(Symbol childNode) {
- return childNode.getOutlineParent();
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setChannel(new AjaxChannel("outline-search", AjaxChannel.Type.DROP));
}
@Override
- protected Component renderNode(List<Symbol> nodes, Symbol node) {
- Fragment fragment = new Fragment(id, "outlineNodeFrag", SourceViewPanel.this);
+ protected void onTypingDone(AjaxRequestTarget target) {
+ String searchInput = StringUtils.trimToNull(searchField.getInput());
- AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
+ MatchScoreProvider<Symbol> matchScoreProvider = new MatchScoreProvider<Symbol>() {
@Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
- context.onSelect(target, context.getBlobIdent(), BlobRendererer.getSourcePosition(node.getPosition()));
+ public double getMatchScore(Symbol object) {
+ return MatchScoreUtils.getMatchScore(object.getName(), searchInput);
}
};
- link.add(node.renderIcon("icon"));
- link.add(node.render("label", null));
- link.add(AttributeAppender.replace("class", "selectable"));
- for (Symbol each: nodes) {
- if (each.isDisplayInOutline()) {
- if (node == each)
- link.add(AttributeAppender.append("class", "active"));
- break;
+ List<Symbol> matchedSymbols = MatchScoreUtils.filterAndSort(symbols, matchScoreProvider);
+
+ List<Symbol> filteredSymbols = new ArrayList<>();
+ for (Symbol matchSymbol: matchedSymbols) {
+ Symbol currentSymbol = matchSymbol;
+ while (currentSymbol != null) {
+ if (!filteredSymbols.contains(currentSymbol))
+ filteredSymbols.add(currentSymbol);
+ currentSymbol = currentSymbol.getOutlineParent();
}
}
- fragment.add(link);
- fragment.setOutputMarkupId(true);
-
- return fragment;
+ Set<Symbol> state = new HashSet<>(filteredSymbols);
+ NestedTree<Symbol> tree = newOutlineSearchTree(modal, filteredSymbols, state);
+ fragment.replace(tree);
+ target.add(tree);
}
-
- });
+
+ });
+
+ Set<Symbol> state = new HashSet<>((getChildSymbols(symbols, null)));
+ fragment.add(newOutlineSearchTree(modal, symbols, state));
+
+ fragment.setOutputMarkupId(true);
return fragment;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css
index 5672a63834..1d67abc53a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css
@@ -118,7 +118,6 @@
background: var(--gray-dark);
}
-.outline-search .filterable-tree>.content {
- height: 400px;
- overflow: auto;
+.outline-search>.modal-body>.content {
+ height: 480px;
}
diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java
index a5809f0584..86e6564318 100644
--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java
+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java
@@ -19,6 +19,7 @@ import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblem.Severity;
import io.onedev.server.git.BlobIdent;
@@ -30,13 +31,15 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
-@Editable(order=8000, name="Publish Checkstyle Report")
+@Editable(order=8000, group=StepGroup.PUBLISH_REPORTS, name="Checkstyle")
public class PublishCheckstyleReportStep extends PublishProblemReportStep {
private static final long serialVersionUID = 1L;
private static final int TAB_WIDTH = 8;
+ public static final String HH = "hh";
+
@Editable(order=100, description="Specify checkstyle result xml file relative to <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>, "
+ "for instance, <tt>target/checkstyle-result.xml</tt>. "
+ "Refer to <a href='https://checkstyle.org/'>checkstyle documentation</a> "
diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java
index 96d5a3bb2d..dfc6829fd9 100644
--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java
+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java
@@ -2,11 +2,12 @@ package io.onedev.server.plugin.report.checkstyle;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
-@Editable(order=3000, name="Publish ESLint Report")
+@Editable(order=3000, group=StepGroup.PUBLISH_REPORTS, name="ESLint")
public class PublishESLintReportStep extends PublishCheckstyleReportStep {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java
index 6e8123bb81..eb4b749fce 100644
--- a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java
+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java
@@ -19,6 +19,7 @@ import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.codequality.CoverageStatus;
import io.onedev.server.model.Build;
import io.onedev.server.plugin.report.coverage.Coverage;
@@ -32,7 +33,7 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
-@Editable(order=9910, name="Publish Clover Coverage Report")
+@Editable(order=9910, group=StepGroup.PUBLISH_REPORTS, name="Clover Coverage")
public class PublishCloverReportStep extends PublishCoverageReportStep {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java
index ef79844d20..1419612ebc 100644
--- a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java
+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java
@@ -2,11 +2,12 @@ package io.onedev.server.plugin.report.clover;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
-@Editable(order=9900, name="Publish Jest Coverage Report")
+@Editable(order=9900, group=StepGroup.PUBLISH_REPORTS, name="Jest Coverage")
public class PublishJestCoverageReportStep extends PublishCloverReportStep {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java b/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java
index 7069bf4f6b..85a078964c 100644
--- a/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java
+++ b/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java
@@ -25,6 +25,7 @@ import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblem.Severity;
import io.onedev.server.git.BlobIdent;
@@ -38,7 +39,7 @@ import io.onedev.server.web.editable.annotation.Patterns;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRendererer;
-@Editable(order=8030, name="Publish CPD Report")
+@Editable(order=8030, group=StepGroup.PUBLISH_REPORTS, name="CPD")
public class PublishCPDReportStep extends PublishProblemReportStep {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.java b/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.java
index 51521e3ee0..722e7c0b43 100644
--- a/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.java
+++ b/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.java
@@ -20,6 +20,7 @@ import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.codequality.CoverageStatus;
import io.onedev.server.model.Build;
import io.onedev.server.plugin.report.coverage.Coverage;
@@ -34,7 +35,7 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
-@Editable(order=9920, name="Publish JaCoCo Coverage Report")
+@Editable(order=9920, group=StepGroup.PUBLISH_REPORTS, name="JaCoCo Coverage")
public class PublishJacocoReportStep extends PublishCoverageReportStep {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestReportStep.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestReportStep.java
index a97dcda9fa..e56724ac2c 100644
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestReportStep.java
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestReportStep.java
@@ -15,6 +15,7 @@ import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.model.Build;
import io.onedev.server.plugin.report.unittest.PublishUnitTestReportStep;
import io.onedev.server.plugin.report.unittest.UnitTestReport;
@@ -23,7 +24,7 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
-@Editable(order=7000, name="Publish Jest Test Report")
+@Editable(order=7000, group=StepGroup.PUBLISH_REPORTS, name="Jest Test")
public class PublishJestReportStep extends PublishUnitTestReportStep {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/PublishJUnitReportStep.java b/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/PublishJUnitReportStep.java
index b74acbfed2..cc02c51946 100644
--- a/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/PublishJUnitReportStep.java
+++ b/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/PublishJUnitReportStep.java
@@ -17,6 +17,7 @@ import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.model.Build;
import io.onedev.server.plugin.report.unittest.PublishUnitTestReportStep;
import io.onedev.server.plugin.report.unittest.UnitTestReport;
@@ -26,7 +27,7 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
-@Editable(order=7010, name="Publish JUnit Report")
+@Editable(order=7010, group=StepGroup.PUBLISH_REPORTS, name="JUnit")
public class PublishJUnitReportStep extends PublishUnitTestReportStep {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java
index 39853577be..06b1de04d2 100644
--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java
+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java
@@ -14,11 +14,12 @@ import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.step.PublishReportStep;
+import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.model.Build;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
-@Editable(order=1100, name="Publish Markdown Report")
+@Editable(order=1100, group=StepGroup.PUBLISH_REPORTS, name="Markdown")
public class PublishMarkdownReportStep extends PublishReportStep {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java
index 485472f53a..773ac5649b 100644
--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java
+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java
@@ -14,12 +14,13 @@ import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.step.PublishReportStep;
+import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.model.Build;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
-@Editable(order=1200, name="Publish Markdown Report (for Pull Request)", description="This report will be displayed in pull request overview "
- + "page if the build belongs to a pull request")
+@Editable(order=1200, group=StepGroup.PUBLISH_REPORTS, name="Pull Request Markdown",
+ description="This report will be displayed in pull request overview page if build is triggered by pull request")
public class PublishPullRequestMarkdownReportStep extends PublishReportStep {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java b/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java
index 347aa5abdf..b0efd94497 100644
--- a/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java
+++ b/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java
@@ -19,6 +19,7 @@ import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblem.Severity;
import io.onedev.server.git.BlobIdent;
@@ -30,7 +31,7 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
-@Editable(order=8020, name="Publish PMD Report")
+@Editable(order=8020, group=StepGroup.PUBLISH_REPORTS, name="PMD")
public class PublishPMDReportStep extends PublishProblemReportStep {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java b/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java
index 52e2f612c7..ee3bdf8c6b 100644
--- a/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java
+++ b/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java
@@ -24,6 +24,7 @@ import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.step.StepGroup;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblem.Severity;
import io.onedev.server.git.BlobIdent;
@@ -35,7 +36,7 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
-@Editable(order=8010, name="Publish SpotBugs Report")
+@Editable(order=8010, group=StepGroup.PUBLISH_REPORTS, name="SpotBugs")
public class PublishSpotBugsReportStep extends PublishProblemReportStep {
private static final long serialVersionUID = 1L;