Skip to content

The Unified and Autonomous Development Platform

chore: Minor UI improvements

Robin Shen86ed97f3b93d
diff --git a/server-core/src/main/java/io/onedev/server/annotation/Secret.java b/server-core/src/main/java/io/onedev/server/annotation/Secret.java
index f0e61d2e81..980f9a79a7 100644
--- a/server-core/src/main/java/io/onedev/server/annotation/Secret.java
+++ b/server-core/src/main/java/io/onedev/server/annotation/Secret.java
@@ -8,4 +8,5 @@ import java.lang.annotation.Target;
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface Secret {
+ int displayChars() default 0;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java b/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java
index 4df1c044f8..108286609e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java
@@ -41,7 +41,7 @@ public class DefaultDataTable<T, S> extends DataTable<T, S> {
}
});
- addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Unspecified")));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java
index 86ba30d60e..b8c8788e3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenEditBean.java
@@ -43,7 +43,7 @@ public class AccessTokenEditBean implements Serializable {
}
@Editable(order=200)
- @Secret
+ @Secret(displayChars=4)
@NotEmpty
public String getValue() {
return value;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.html
index 01f059254b..f7820b236b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.html
@@ -3,6 +3,7 @@
<h6 class="border-bottom px-4 py-3">
<span wicket:id="name" class="mr-2"></span>
<a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit this access token"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="regenerate" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Regenerate this access token"><wicket:svg href="refresh" class="icon"></wicket:svg></a>
<a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger mr-4" title="Delete this access token"><wicket:svg href="trash" class="icon"></wicket:svg></a>
<span wicket:id="expired" class="badge badge-light-danger">Expired</span>
</h6>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java
index cefd6be2cd..f127df8723 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java
@@ -1,17 +1,19 @@
package io.onedev.server.web.component.user.accesstoken;
import com.google.common.collect.Sets;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AccessTokenManager;
import io.onedev.server.model.AccessToken;
+import io.onedev.server.util.CryptoUtils;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.editable.BeanContext;
+import org.apache.wicket.Session;
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.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.Model;
@SuppressWarnings("serial")
abstract class AccessTokenPanel extends Panel {
@@ -34,7 +36,23 @@ abstract class AccessTokenPanel extends Panel {
}
});
-
+ add(new AjaxLink<Void>("regenerate") {
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("This will invalidate current access token and " +
+ "generate a new one. Do you really want to continue?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ var token = getToken();
+ token.setValue(CryptoUtils.generateSecret());
+ OneDev.getInstance(AccessTokenManager.class).createOrUpdate(token);
+ target.add(AccessTokenPanel.this);
+ Session.get().success("Access token regenerated successfully");
+ }
+ });
add(new AjaxLink<Void>("delete") {
@Override
@@ -52,11 +70,15 @@ abstract class AccessTokenPanel extends Panel {
add(new WebMarkupContainer("expired").setVisible(getToken().isExpired()));
- add(BeanContext.view("viewer", AccessTokenEditBean.of(getToken()), Sets.newHashSet("name"), true));
-
setOutputMarkupId(true);
}
-
+
+ @Override
+ protected void onBeforeRender() {
+ addOrReplace(BeanContext.view("viewer", AccessTokenEditBean.of(getToken()), Sets.newHashSet("name"), true));
+ super.onBeforeRender();
+ }
+
protected abstract AccessToken getToken();
protected abstract void onDelete(AjaxRequestTarget target);
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.java b/server-core/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.java
index d70092f77a..27453840f0 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.java
@@ -24,7 +24,7 @@ public abstract class EmptyValueLabel extends Label {
if (placeholder != null && EditableUtils.isDisplayPlaceholderAsValue(getElement()))
return "<i>" + HtmlEscape.escapeHtml5(placeholder) + "</i>";
else
- return "<i>Not defined</i>";
+ return "<i>Unspecified</i>";
} finally {
ComponentContext.pop();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
index e40963314d..977366ac69 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
@@ -28,7 +28,7 @@
</tbody>
<tfoot wicket:id="noRecords">
<tr>
- <td wicket:id="td">Not defined</td>
+ <td wicket:id="td">Unspecified</td>
</tr>
</tfoot>
</table>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html
index f738494d99..66667fd61a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html
@@ -16,7 +16,7 @@
</tbody>
<tfoot wicket:id="noRecords">
<tr>
- <td wicket:id="td">Not defined</td>
+ <td wicket:id="td">Unspecified</td>
</tr>
</tfoot>
</table>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java
index 5717a1bf54..e8b8dd929a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java
@@ -236,7 +236,7 @@ class JobDependencyListEditPanel extends PropertyEditor<List<Serializable>> {
DataTable<JobDependency, Void> dataTable;
add(dataTable = new DataTable<JobDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Unspecified")));
dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java
index dc9dc0f7cc..f1580187e4 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListViewPanel.java
@@ -130,7 +130,7 @@ class JobDependencyListViewPanel extends Panel {
super.onInitialize();
add(new NoRecordsBehavior());
addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Unspecified")));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.java
index 8c5d43b2e2..fcc9aa955c 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.java
@@ -217,7 +217,7 @@ class PostBuildActionListEditPanel extends PropertyEditor<List<Serializable>> {
DataTable<PostBuildAction, Void> dataTable;
add(dataTable = new DataTable<PostBuildAction, Void>("actions", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Unspecified")));
dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.java
index c9166fefab..1c2ba0f32f 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListViewPanel.java
@@ -1,135 +1,135 @@
-package io.onedev.server.web.editable.buildspec.job.postbuildaction;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-import io.onedev.server.buildspec.job.action.PostBuildAction;
-import io.onedev.server.web.behavior.NoRecordsBehavior;
-import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.EditableUtils;
-
-@SuppressWarnings("serial")
-class PostBuildActionListViewPanel extends Panel {
-
- private final List<PostBuildAction> actions = new ArrayList<>();
-
- public PostBuildActionListViewPanel(String id, List<Serializable> elements) {
- super(id);
-
- for (Serializable each: elements)
- actions.add((PostBuildAction) each);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- List<IColumn<PostBuildAction, Void>> columns = new ArrayList<>();
-
- columns.add(new AbstractColumn<PostBuildAction, Void>(Model.of("Description")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<PostBuildAction>> cellItem, String componentId, IModel<PostBuildAction> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getDescription()));
- }
-
- });
-
- columns.add(new AbstractColumn<PostBuildAction, Void>(Model.of("Condition")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<PostBuildAction>> cellItem, String componentId, IModel<PostBuildAction> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getCondition()));
- }
-
- });
-
- columns.add(new AbstractColumn<PostBuildAction, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<PostBuildAction>> cellItem, String componentId, IModel<PostBuildAction> rowModel) {
- int actionIndex = cellItem.findParent(Item.class).getIndex();
- Fragment fragment = new Fragment(componentId, "showDetailFrag", PostBuildActionListViewPanel.this);
- fragment.add(new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
-
- @Override
- protected Component newTitle(String componentId) {
- String actionType = EditableUtils.getDisplayName(actions.get(actionIndex).getClass());
- return new Label(componentId, "Post Build Action (type: " + actionType + ")");
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "post-build-action"));
- }
-
- @Override
- protected Component newBody(String id) {
- return BeanContext.view(id, actions.get(actionIndex));
- }
-
- };
- }
-
- });
-
- cellItem.add(fragment);
- }
-
- @Override
- public String getCssClass() {
- return "ellipsis text-right";
- }
-
- });
-
- IDataProvider<PostBuildAction> dataProvider = new ListDataProvider<PostBuildAction>() {
-
- @Override
- protected List<PostBuildAction> getData() {
- return actions;
- }
-
- };
-
- add(new DataTable<PostBuildAction, Void>("actions", columns, dataProvider, Integer.MAX_VALUE) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
- add(new NoRecordsBehavior());
- }
-
- });
- }
-
-}
+package io.onedev.server.web.editable.buildspec.job.postbuildaction;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.buildspec.job.action.PostBuildAction;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.EditableUtils;
+
+@SuppressWarnings("serial")
+class PostBuildActionListViewPanel extends Panel {
+
+ private final List<PostBuildAction> actions = new ArrayList<>();
+
+ public PostBuildActionListViewPanel(String id, List<Serializable> elements) {
+ super(id);
+
+ for (Serializable each: elements)
+ actions.add((PostBuildAction) each);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<IColumn<PostBuildAction, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<PostBuildAction, Void>(Model.of("Description")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<PostBuildAction>> cellItem, String componentId, IModel<PostBuildAction> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getDescription()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<PostBuildAction, Void>(Model.of("Condition")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<PostBuildAction>> cellItem, String componentId, IModel<PostBuildAction> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getCondition()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<PostBuildAction, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<PostBuildAction>> cellItem, String componentId, IModel<PostBuildAction> rowModel) {
+ int actionIndex = cellItem.findParent(Item.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", PostBuildActionListViewPanel.this);
+ fragment.add(new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ String actionType = EditableUtils.getDisplayName(actions.get(actionIndex).getClass());
+ return new Label(componentId, "Post Build Action (type: " + actionType + ")");
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "post-build-action"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ return BeanContext.view(id, actions.get(actionIndex));
+ }
+
+ };
+ }
+
+ });
+
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "ellipsis text-right";
+ }
+
+ });
+
+ IDataProvider<PostBuildAction> dataProvider = new ListDataProvider<PostBuildAction>() {
+
+ @Override
+ protected List<PostBuildAction> getData() {
+ return actions;
+ }
+
+ };
+
+ add(new DataTable<PostBuildAction, Void>("actions", columns, dataProvider, Integer.MAX_VALUE) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ addTopToolbar(new HeadersToolbar<Void>(this, null));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Unspecified")));
+ add(new NoRecordsBehavior());
+ }
+
+ });
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.java
index e8b524b2f0..2bc6228015 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.java
@@ -214,7 +214,7 @@ class ProjectDependencyListEditPanel extends PropertyEditor<List<Serializable>>
DataTable<ProjectDependency, Void> dataTable;
add(dataTable = new DataTable<ProjectDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Unspecified")));
dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.java
index 586e281484..d7162f3b66 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListViewPanel.java
@@ -1,142 +1,142 @@
-package io.onedev.server.web.editable.buildspec.job.projectdependency;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-import io.onedev.server.buildspec.job.projectdependency.ProjectDependency;
-import io.onedev.server.web.behavior.NoRecordsBehavior;
-import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
-import io.onedev.server.web.editable.BeanContext;
-
-@SuppressWarnings("serial")
-class ProjectDependencyListViewPanel extends Panel {
-
- private final List<ProjectDependency> dependencies = new ArrayList<>();
-
- public ProjectDependencyListViewPanel(String id, List<Serializable> elements) {
- super(id);
-
- for (Serializable each: elements)
- dependencies.add((ProjectDependency) each);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- List<IColumn<ProjectDependency, Void>> columns = new ArrayList<>();
-
- columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("Project")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getProjectPath()));
- }
-
- });
-
- columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("Build")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {
- ProjectDependency dependency = rowModel.getObject();
- cellItem.add(new Label(componentId, dependency.getBuildProvider().getDescription()));
- }
-
- });
-
- columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {
- int dependencyIndex = cellItem.findParent(Item.class).getIndex();
- Fragment fragment = new Fragment(componentId, "showDetailFrag", ProjectDependencyListViewPanel.this);
- fragment.add(new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
-
- @Override
- protected Component newTitle(String componentId) {
- return new Label(componentId, "Project Dependency");
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "project-dependency"));
- }
-
- @Override
- protected Component newBody(String id) {
- return BeanContext.view(id, dependencies.get(dependencyIndex));
- }
-
- };
- }
-
- });
-
- cellItem.add(fragment);
- }
-
- @Override
- public String getCssClass() {
- return "ellipsis text-right";
- }
-
- });
-
- IDataProvider<ProjectDependency> dataProvider = new ListDataProvider<ProjectDependency>() {
-
- @Override
- protected List<ProjectDependency> getData() {
- return dependencies;
- }
-
- };
-
- add(new DataTable<ProjectDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
- add(new NoRecordsBehavior());
- }
-
- });
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ProjectDependencyCssResourceReference()));
- }
-
-}
+package io.onedev.server.web.editable.buildspec.job.projectdependency;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.buildspec.job.projectdependency.ProjectDependency;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
+import io.onedev.server.web.editable.BeanContext;
+
+@SuppressWarnings("serial")
+class ProjectDependencyListViewPanel extends Panel {
+
+ private final List<ProjectDependency> dependencies = new ArrayList<>();
+
+ public ProjectDependencyListViewPanel(String id, List<Serializable> elements) {
+ super(id);
+
+ for (Serializable each: elements)
+ dependencies.add((ProjectDependency) each);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<IColumn<ProjectDependency, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("Project")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getProjectPath()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("Build")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {
+ ProjectDependency dependency = rowModel.getObject();
+ cellItem.add(new Label(componentId, dependency.getBuildProvider().getDescription()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {
+ int dependencyIndex = cellItem.findParent(Item.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", ProjectDependencyListViewPanel.this);
+ fragment.add(new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ return new Label(componentId, "Project Dependency");
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "project-dependency"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ return BeanContext.view(id, dependencies.get(dependencyIndex));
+ }
+
+ };
+ }
+
+ });
+
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "ellipsis text-right";
+ }
+
+ });
+
+ IDataProvider<ProjectDependency> dataProvider = new ListDataProvider<ProjectDependency>() {
+
+ @Override
+ protected List<ProjectDependency> getData() {
+ return dependencies;
+ }
+
+ };
+
+ add(new DataTable<ProjectDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ addTopToolbar(new HeadersToolbar<Void>(this, null));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Unspecified")));
+ add(new NoRecordsBehavior());
+ }
+
+ });
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new ProjectDependencyCssResourceReference()));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.java
index 9091563b26..463b4e13a4 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.java
@@ -206,7 +206,7 @@ class JobTriggerListEditPanel extends PropertyEditor<List<Serializable>> {
DataTable<JobTrigger, Void> dataTable;
add(dataTable = new DataTable<JobTrigger, Void>("triggers", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Unspecified")));
dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.java
index 7cbce1a592..eea59e42bc 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListViewPanel.java
@@ -120,7 +120,7 @@ class JobTriggerListViewPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Unspecified")));
add(new NoRecordsBehavior());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.java
index ec582da6dd..a70a66f6a6 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.java
@@ -178,7 +178,7 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {
DataTable<ParamSpec, Void> dataTable;
add(dataTable = new DataTable<ParamSpec, Void>("paramSpecs", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Unspecified")));
dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.java
index d207a4139d..d6da91991f 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.java
@@ -1,150 +1,150 @@
-package io.onedev.server.web.editable.buildspec.param.spec;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-import com.google.common.collect.Sets;
-
-import io.onedev.server.buildspec.param.spec.ParamSpec;
-import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference;
-import io.onedev.server.web.behavior.NoRecordsBehavior;
-import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.EditableUtils;
-
-@SuppressWarnings("serial")
-class ParamSpecListViewPanel extends Panel {
-
- private final List<ParamSpec> paramSpecs = new ArrayList<>();
-
- public ParamSpecListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {
- super(id);
-
- for (Serializable each: elements)
- paramSpecs.add((ParamSpec) each);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- List<IColumn<ParamSpec, Void>> columns = new ArrayList<>();
-
- columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("Name")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getName()));
- }
-
- });
-
- columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("Type")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {
- ParamSpec param = rowModel.getObject();
- cellItem.add(new Label(componentId, EditableUtils.getDisplayName(param.getClass())));
- }
-
- });
-
- columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {
- int paramIndex = cellItem.findParent(Item.class).getIndex();
- Fragment fragment = new Fragment(componentId, "showDetailFrag", ParamSpecListViewPanel.this);
- fragment.add(new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
-
- @Override
- protected Component newTitle(String componentId) {
- String paramType = EditableUtils.getDisplayName(paramSpecs.get(paramIndex).getClass());
- return new Label(componentId, "Parameter Spec (type: " + paramType + ")");
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "param-spec input-spec"));
- }
-
- @Override
- protected Component newBody(String id) {
- Set<String> excludedProperties = Sets.newHashSet("canBeChangedBy", "nameOfEmptyValue");
- return BeanContext.view(id, paramSpecs.get(paramIndex), excludedProperties, true);
- }
-
- };
- }
-
- });
-
- cellItem.add(fragment);
- }
-
- @Override
- public String getCssClass() {
- return "ellipsis text-right";
- }
-
- });
-
- IDataProvider<ParamSpec> dataProvider = new ListDataProvider<ParamSpec>() {
-
- @Override
- protected List<ParamSpec> getData() {
- return paramSpecs;
- }
-
- };
-
- add(new DataTable<ParamSpec, Void>("paramSpecs", columns, dataProvider, Integer.MAX_VALUE) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
- add(new NoRecordsBehavior());
- }
-
- });
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new InputSpecCssResourceReference()));
- response.render(CssHeaderItem.forReference(new ParamSpecCssResourceReference()));
- }
-
-}
+package io.onedev.server.web.editable.buildspec.param.spec;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import com.google.common.collect.Sets;
+
+import io.onedev.server.buildspec.param.spec.ParamSpec;
+import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.EditableUtils;
+
+@SuppressWarnings("serial")
+class ParamSpecListViewPanel extends Panel {
+
+ private final List<ParamSpec> paramSpecs = new ArrayList<>();
+
+ public ParamSpecListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {
+ super(id);
+
+ for (Serializable each: elements)
+ paramSpecs.add((ParamSpec) each);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<IColumn<ParamSpec, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("Name")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getName()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("Type")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {
+ ParamSpec param = rowModel.getObject();
+ cellItem.add(new Label(componentId, EditableUtils.getDisplayName(param.getClass())));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<ParamSpec, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ParamSpec>> cellItem, String componentId, IModel<ParamSpec> rowModel) {
+ int paramIndex = cellItem.findParent(Item.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", ParamSpecListViewPanel.this);
+ fragment.add(new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ String paramType = EditableUtils.getDisplayName(paramSpecs.get(paramIndex).getClass());
+ return new Label(componentId, "Parameter Spec (type: " + paramType + ")");
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "param-spec input-spec"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ Set<String> excludedProperties = Sets.newHashSet("canBeChangedBy", "nameOfEmptyValue");
+ return BeanContext.view(id, paramSpecs.get(paramIndex), excludedProperties, true);
+ }
+
+ };
+ }
+
+ });
+
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "ellipsis text-right";
+ }
+
+ });
+
+ IDataProvider<ParamSpec> dataProvider = new ListDataProvider<ParamSpec>() {
+
+ @Override
+ protected List<ParamSpec> getData() {
+ return paramSpecs;
+ }
+
+ };
+
+ add(new DataTable<ParamSpec, Void>("paramSpecs", columns, dataProvider, Integer.MAX_VALUE) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ addTopToolbar(new HeadersToolbar<Void>(this, null));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Unspecified")));
+ add(new NoRecordsBehavior());
+ }
+
+ });
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new InputSpecCssResourceReference()));
+ response.render(CssHeaderItem.forReference(new ParamSpecCssResourceReference()));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java
index f124346e86..6781706dd7 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java
@@ -282,7 +282,7 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {
DataTable<Step, Void> dataTable;
add(dataTable = new DataTable<>("steps", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Unspecified")));
dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.java
index 1ca2a07f88..f61143b3a2 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.java
@@ -121,7 +121,7 @@ class StepListViewPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Unspecified")));
add(new NoRecordsBehavior());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/interpolativestringlist/InterpolativeStringListPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/interpolativestringlist/InterpolativeStringListPropertyEditor.html
index d579b21ea0..077b19d714 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/interpolativestringlist/InterpolativeStringListPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/interpolativestringlist/InterpolativeStringListPropertyEditor.html
@@ -19,7 +19,7 @@
</tbody>
<tfoot wicket:id="noRecords">
<tr>
- <td colspan="3">Not defined</td>
+ <td colspan="3">Unspecified</td>
</tr>
</tfoot>
</table>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/creation/IssueCreationSettingListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/creation/IssueCreationSettingListEditPanel.java
index 328ab936ec..47e06e1d93 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/creation/IssueCreationSettingListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/creation/IssueCreationSettingListEditPanel.java
@@ -182,7 +182,7 @@ class IssueCreationSettingListEditPanel extends PropertyEditor<List<Serializable
DataTable<IssueCreationSetting, Void> dataTable;
add(dataTable = new DataTable<IssueCreationSetting, Void>("settings", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Unspecified")));
dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
index 9021dc3100..e09dd9f51b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
@@ -198,7 +198,7 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
DataTable<JobPrivilege, Void> dataTable;
add(dataTable = new DataTable<>("privileges", columns, dataProvider, Integer.MAX_VALUE));
dataTable.addTopToolbar(new HeadersToolbar<>(dataTable, null));
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Unspecified")));
dataTable.add(new NoRecordsBehavior());
dataTable.add(new SortBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html
index 16d2c10372..02a30c27b1 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.html
@@ -17,7 +17,7 @@
</tbody>
<tfoot wicket:id="noRecords">
<tr>
- <td colspan="3">Not defined</td>
+ <td colspan="3">Unspecified</td>
</tr>
</tfoot>
</table>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.html
index d78a6bf85f..85392683fe 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.html
@@ -13,7 +13,7 @@
</tbody>
<tfoot wicket:id="noRecords">
<tr>
- <td>Not defined</td>
+ <td>Unspecified</td>
</tr>
</tfoot>
</table>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretEditSupport.java
index 00019272c1..cf88515b9c 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretEditSupport.java
@@ -24,7 +24,7 @@ public class SecretEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null) {
- return new SecretPropertyViewer(id, model.getObject());
+ return new SecretPropertyViewer(id, model.getObject(), secret.displayChars());
} else {
return new EmptyValueLabel(id) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyViewer.html
index c9787aa867..029f949c13 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyViewer.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyViewer.html
@@ -1,6 +1,6 @@
<wicket:panel>
<div class="d-flex align-items-center">
- <div class="mr-2">************</div>
+ <div wicket:id="maskedValue" class="mr-2"></div>
<a wicket:id="copy" class="mt-n1" title="Copy to clipboard"><wicket:svg href="copy" class="icon icon-sm"/></a>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyViewer.java
index 1d8c7e2308..921a0092db 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/secret/SecretPropertyViewer.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.editable.secret;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
@@ -9,14 +10,18 @@ public class SecretPropertyViewer extends Panel {
private final String secret;
- public SecretPropertyViewer(String id, String secret) {
+ private final int displayChars;
+
+ public SecretPropertyViewer(String id, String secret, int displayChars) {
super(id);
this.secret = secret;
+ this.displayChars = displayChars;
}
@Override
protected void onInitialize() {
super.onInitialize();
+ add(new Label("maskedValue", secret.substring(0, displayChars) + "************"));
add(new CopyToClipboardLink("copy", Model.of(secret)));
}
}