The Unified and Autonomous Development Platform
fix: Fuzzy search order by doesn't work anymore (OD-2431)
Robin Shencf8569d0e560
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex 699e7ce2da..57455404bd 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -278,14 +278,15 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imquery.where(getPredicates(project, commentQuery.getCriteria(), request, query, root, builder));List<javax.persistence.criteria.Order> orders = new ArrayList<>();- if (commentQuery.getCriteria() != null)- orders.addAll(commentQuery.getCriteria().getPreferOrders(builder, root));for (EntitySort sort: commentQuery.getSorts()) {if (sort.getDirection() == ASCENDING)orders.add(builder.asc(CodeCommentQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));elseorders.add(builder.desc(CodeCommentQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));}++ if (commentQuery.getCriteria() != null)+ orders.addAll(commentQuery.getCriteria().getPreferOrders(builder, root));var found = false;for (var order: orders) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex efa720c13b..4c922c4bdc 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -273,7 +273,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isspublic List<javax.persistence.criteria.Order> buildOrders(List<EntitySort> sorts, CriteriaBuilder builder,From<Issue, Issue> issue,List<javax.persistence.criteria.Order> preferOrders) {- List<javax.persistence.criteria.Order> orders = new ArrayList<>(preferOrders);+ List<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: sorts) {if (Issue.SORT_FIELDS.containsKey(sort.getField())) {if (sort.getDirection() == Direction.ASCENDING)@@ -290,6 +290,8 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss}}+ orders.addAll(preferOrders);+var found = false;for (var order: orders) {if (order.getExpression() instanceof SingularAttributePath) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 5549fc792e..e59f4d8bd9 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -1043,8 +1043,6 @@ public class DefaultProjectManager extends BaseEntityManager<Project>query.where(getPredicates(projectQuery.getCriteria(), query, root, builder));List<Order> orders = new ArrayList<>();- if (projectQuery.getCriteria() != null)- orders.addAll(projectQuery.getCriteria().getPreferOrders(builder, root));for (EntitySort sort : projectQuery.getSorts()) {if (sort.getDirection() == ASCENDING)@@ -1053,6 +1051,9 @@ public class DefaultProjectManager extends BaseEntityManager<Project>orders.add(builder.desc(ProjectQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));}+ if (projectQuery.getCriteria() != null)+ orders.addAll(projectQuery.getCriteria().getPreferOrders(builder, root));+var found = false;for (var order: orders) {if (order.getExpression() instanceof SingularAttributePath) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 25ee67e8ad..82e1755501 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -908,8 +908,6 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>query.where(getPredicates(targetProject, requestQuery.getCriteria(), query, root, builder));List<Order> orders = new ArrayList<>();- if (requestQuery.getCriteria() != null)- orders.addAll(requestQuery.getCriteria().getPreferOrders(builder, root));for (EntitySort sort: requestQuery.getSorts()) {if (sort.getDirection() == Direction.ASCENDING) {orders.add(builder.asc(PullRequestQuery.getPath(@@ -920,6 +918,9 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>}}+ if (requestQuery.getCriteria() != null)+ orders.addAll(requestQuery.getCriteria().getPreferOrders(builder, root));+var found = false;for (var order: orders) {if (order.getExpression() instanceof SingularAttributePath) {diff --git a/server-core/src/main/java/io/onedev/server/entityreference/LinkTransformer.java b/server-core/src/main/java/io/onedev/server/entityreference/LinkTransformer.javaindex 7833ddc45f..cf90a46552 100644--- a/server-core/src/main/java/io/onedev/server/entityreference/LinkTransformer.java+++ b/server-core/src/main/java/io/onedev/server/entityreference/LinkTransformer.java@@ -1,13 +1,15 @@package io.onedev.server.entityreference;-import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;+import java.util.function.BiFunction;++import javax.annotation.Nullable;+import org.apache.wicket.request.cycle.RequestCycle;import org.unbescape.html.HtmlEscape;-import javax.annotation.Nullable;-import java.util.function.BiFunction;+import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;+import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;public class LinkTransformer implements BiFunction<EntityReference, String, String> {@@ -21,8 +23,8 @@ public class LinkTransformer implements BiFunction<EntityReference, String, Stripublic String apply(@Nullable EntityReference reference, String text) {text = HtmlEscape.escapeHtml5(text);if (reference instanceof IssueReference) {- return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(IssueActivitiesPage.class,- IssueActivitiesPage.paramsOf(reference.getProject(), reference.getNumber())) + "'>" + text + "</a>";+ return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(IssueDetailPage.class,+ IssueDetailPage.paramsOf(reference.getProject(), reference.getNumber())) + "'>" + text + "</a>";} else if (reference instanceof BuildReference) {return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(BuildDashboardPage.class,BuildDashboardPage.paramsOf(reference.getProject(), reference.getNumber())) + "'>" + text + "</a>";diff --git a/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.javaindex 74befc0fc9..0c8a4f0b63 100644--- a/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java@@ -1,22 +1,25 @@package io.onedev.server.markdown;+import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;++import javax.annotation.Nullable;++import org.apache.wicket.request.cycle.RequestCycle;+import org.jsoup.nodes.Document;+import org.unbescape.html.HtmlEscape;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entityreference.*;+import io.onedev.server.entityreference.BuildReference;+import io.onedev.server.entityreference.IssueReference;+import io.onedev.server.entityreference.PullRequestReference;import io.onedev.server.model.Project;import io.onedev.server.web.UrlManager;import io.onedev.server.web.component.markdown.SuggestionSupport;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;-import org.apache.wicket.request.cycle.RequestCycle;-import org.jsoup.nodes.Document;-import org.unbescape.html.HtmlEscape;--import javax.annotation.Nullable;--import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;public class ReferenceProcessor implements HtmlProcessor {@@ -30,7 +33,7 @@ public class ReferenceProcessor implements HtmlProcessor {if (reference instanceof IssueReference) {String url;if (RequestCycle.get() != null)- url = RequestCycle.get().urlFor(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(reference.getProject(), reference.getNumber())).toString();+ url = RequestCycle.get().urlFor(IssueDetailPage.class, IssueDetailPage.paramsOf(reference.getProject(), reference.getNumber())).toString();elseurl = OneDev.getInstance(UrlManager.class).urlForIssue(reference.getProject(), reference.getNumber());return String.format("<a href='%s' class='issue reference' data-reference='%s'>%s</a>",diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex 0b36019b57..220b294fa2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -73,7 +73,7 @@ import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;import io.onedev.server.web.page.project.issues.iteration.IterationIssuesPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.util.ProjectAware;@@ -267,8 +267,8 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, ProIssue issue = OneDev.getInstance(IssueManager.class).get(Long.valueOf(value));if (issue != null) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);- Link<Void> issueLink = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class,- IssueActivitiesPage.paramsOf(issue));+ Link<Void> issueLink = new BookmarkablePageLink<Void>("link", IssueDetailPage.class,+ IssueDetailPage.paramsOf(issue));issueLink.add(new Label("label", issue.getReference().toString(getProject())));linkFrag.add(issueLink);valueContainer.add(linkFrag);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.javaindex 0d17c8a572..76ba08e7b0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java@@ -77,7 +77,7 @@ import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.page.base.BasePage;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;import io.onedev.server.web.util.DeleteCallback;public abstract class IssuePrimaryPanel extends Panel {@@ -515,8 +515,8 @@ public abstract class IssuePrimaryPanel extends Panel {Long linkedIssueId = linkedIssue.getId();Fragment fragment = new Fragment(componentId, "linkedIssueFrag", this);- var link = new BookmarkablePageLink<Void>("title", IssueActivitiesPage.class,- IssueActivitiesPage.paramsOf(linkedIssue));+ var link = new BookmarkablePageLink<Void>("title", IssueDetailPage.class,+ IssueDetailPage.paramsOf(linkedIssue));link.add(new Label("label", linkedIssue.getTitle() + " (" + linkedIssue.getReference().toString(getProject()) + ")"));fragment.add(link);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.javaindex cc8cc6c6d7..173fd8e5d1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java@@ -1,5 +1,12 @@package io.onedev.server.web.component.issue.referencedfrom;+import static org.unbescape.html.HtmlEscape.escapeHtml5;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.cycle.RequestCycle;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;@@ -7,13 +14,7 @@ import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.cycle.RequestCycle;--import static org.unbescape.html.HtmlEscape.escapeHtml5;+import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;public class ReferencedFromIssuePanel extends GenericPanel<Issue> {@@ -39,8 +40,8 @@ public class ReferencedFromIssuePanel extends GenericPanel<Issue> {Issue issue = getModelObject();if (SecurityUtils.canAccessProject(issue.getProject())) {- String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,- IssueActivitiesPage.paramsOf(issue)).toString();+ String url = RequestCycle.get().urlFor(IssueDetailPage.class,+ IssueDetailPage.paramsOf(issue)).toString();String summary = String.format("<a href='%s'>%s</a>",url, escapeHtml5(issue.getSummary(project)));add(new Label("summary", summary).setEscapeModelStrings(false));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/tabs/IssueTabsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/tabs/IssueTabsPanel.htmlnew file mode 100644index 0000000000..049e8b2f5c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/tabs/IssueTabsPanel.html@@ -0,0 +1,4 @@+<wicket:panel>+ <ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>+ <div wicket:id="tabContent"></div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/tabs/IssueTabsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/tabs/IssueTabsPanel.javanew file mode 100644index 0000000000..064a24be35--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/tabs/IssueTabsPanel.java@@ -0,0 +1,214 @@+package io.onedev.server.web.component.issue.tabs;++import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;++import com.google.common.collect.Lists;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.search.entity.build.BuildQuery;+import io.onedev.server.search.entity.build.FixedIssueCriteria;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.behavior.ChangeObserver;+import io.onedev.server.web.component.build.list.BuildListPanel;+import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;+import io.onedev.server.web.component.issue.authorizations.IssueAuthorizationsPanel;+import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;+import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;+import io.onedev.server.web.component.tabbable.AjaxActionTab;+import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;++public class IssueTabsPanel extends GenericPanel<Issue> {++ private static final String TAB_CONTENT_ID = "tabContent";++ private IssueActivitiesPanel activities;++ public IssueTabsPanel(String id, IModel<Issue> model) {+ super(id, model);+ }++ private IssueActivitiesPanel newActivitiesPanel() {+ IssueActivitiesPanel activities = new IssueActivitiesPanel(TAB_CONTENT_ID) {++ @Override+ protected Issue getIssue() {+ return IssueTabsPanel.this.getIssue();+ }++ };+ activities.setOutputMarkupId(true);+ return activities;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Tabbable("tabs", new LoadableDetachableModel<>() {++ @Override+ protected List<? extends Tab> load() {+ List<Tab> tabs = new ArrayList<>();++ tabs.add(new AjaxActionTab(Model.of("Activities")) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ activities = newActivitiesPanel();+ IssueTabsPanel.this.replace(activities);+ target.add(activities);+ }++ @Override+ public boolean isSelected() {+ return IssueTabsPanel.this.get(TAB_CONTENT_ID) instanceof IssueActivitiesPanel;+ }++ @Override+ protected Component renderOptions(String componentId) {+ return activities.renderOptions(componentId);+ }++ });++ if (!getIssue().getFixCommits(false).isEmpty()) {+ if (SecurityUtils.canReadCode(getIssue().getProject())) {+ tabs.add(new AjaxActionTab(Model.of("Fixing Commits")) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component content = new IssueCommitsPanel(TAB_CONTENT_ID, IssueTabsPanel.this.getModel());+ content.setOutputMarkupId(true);+ IssueTabsPanel.this.replace(content);+ target.add(content);+ }++ @Override+ public boolean isSelected() {+ return IssueTabsPanel.this.get(TAB_CONTENT_ID) instanceof IssueCommitsPanel;+ }++ });+ if (!getIssue().getPullRequests().isEmpty()) {+ tabs.add(new AjaxActionTab(Model.of("Pull Requests")) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component content = new IssuePullRequestsPanel(TAB_CONTENT_ID, new AbstractReadOnlyModel<Issue>() {++ @Override+ public Issue getObject() {+ return getIssue();+ }++ });+ IssueTabsPanel.this.replace(content);+ target.add(content);+ }++ @Override+ public boolean isSelected() {+ return IssueTabsPanel.this.get(TAB_CONTENT_ID) instanceof IssuePullRequestsPanel;+ }++ });+ }+ }++ tabs.add(new AjaxActionTab(Model.of("Fixing Builds")) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component content = new BuildListPanel(TAB_CONTENT_ID, Model.of((String)null), true, true) {++ @Override+ protected BuildQuery getBaseQuery() {+ return new BuildQuery(new FixedIssueCriteria(getIssue()), new ArrayList<>());+ }++ @Override+ protected Project getProject() {+ return getIssue().getProject();+ }++ }.setOutputMarkupId(true);++ IssueTabsPanel.this.replace(content);+ target.add(content);+ }++ @Override+ public boolean isSelected() {+ return IssueTabsPanel.this.get(TAB_CONTENT_ID) instanceof BuildListPanel;+ }++ });+ }++ if (getIssue().isConfidential() && SecurityUtils.canModifyIssue(getIssue())) {+ tabs.add(new AjaxActionTab(Model.of("Authorizations")) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component content = new IssueAuthorizationsPanel(TAB_CONTENT_ID) {++ @Override+ protected Issue getIssue() {+ return IssueTabsPanel.this.getIssue();+ }++ }.setOutputMarkupId(true);++ IssueTabsPanel.this.replace(content);+ target.add(content);+ }++ @Override+ public boolean isSelected() {+ return IssueTabsPanel.this.get(TAB_CONTENT_ID) instanceof IssueAuthorizationsPanel;+ }++ });+ }++ return tabs;+ }++ }) {+ @Override+ public void onInitialize() {+ super.onInitialize();++ add(new ChangeObserver() {++ @Override+ public Collection<String> findObservables() {+ return Lists.newArrayList(Issue.getDetailChangeObservable(getIssue().getId()));+ }++ });++ setOutputMarkupId(true);+ }+ });++ add(activities = newActivitiesPanel());+ }++ private Issue getIssue() {+ return getModelObject();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.javaindex a907e3cd7a..fa21a8a235 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java@@ -1,13 +1,9 @@package io.onedev.server.web.component.issue.title;-import io.onedev.server.entityreference.LinkTransformer;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.web.WebSession;-import io.onedev.server.web.asset.emoji.Emojis;-import io.onedev.server.web.component.link.ActionablePageLink;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;-import io.onedev.server.web.util.Cursor;+import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;++import javax.annotation.Nullable;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;@@ -18,9 +14,14 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;-import javax.annotation.Nullable;--import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;+import io.onedev.server.entityreference.LinkTransformer;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.web.WebSession;+import io.onedev.server.web.asset.emoji.Emojis;+import io.onedev.server.web.component.link.ActionablePageLink;+import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;+import io.onedev.server.web.util.Cursor;public abstract class IssueTitlePanel extends Panel {@@ -36,7 +37,7 @@ public abstract class IssueTitlePanel extends Panel {var label = "(" + issue.getReference().toString(getCurrentProject()) + ")";WebMarkupContainer numberLink;add(numberLink = new ActionablePageLink("number",- IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue)) {+ IssueDetailPage.class, IssueDetailPage.paramsOf(issue)) {@Overridepublic IModel<?> getBody() {@@ -53,8 +54,8 @@ public abstract class IssueTitlePanel extends Panel {});- String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,- IssueActivitiesPage.paramsOf(issue)).toString();+ String url = RequestCycle.get().urlFor(IssueDetailPage.class,+ IssueDetailPage.paramsOf(issue)).toString();var transformed = transformReferences(issue.getTitle(), issue.getProject(), new LinkTransformer(url));transformed = Emojis.getInstance().apply(transformed);diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.javaindex 2a77b1d115..05bdbeff52 100644--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java@@ -117,11 +117,7 @@ import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.imports.ProjectImportPage;import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;import io.onedev.server.web.page.project.issues.create.NewIssuePage;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;-import io.onedev.server.web.page.project.issues.detail.IssueAuthorizationsPage;-import io.onedev.server.web.page.project.issues.detail.IssueBuildsPage;-import io.onedev.server.web.page.project.issues.detail.IssueCommitsPage;-import io.onedev.server.web.page.project.issues.detail.IssuePullRequestsPage;+import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;import io.onedev.server.web.page.project.issues.imports.IssueImportPage;import io.onedev.server.web.page.project.issues.iteration.IterationBurndownPage;import io.onedev.server.web.page.project.issues.iteration.IterationEditPage;@@ -395,11 +391,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new ProjectPageMapper("${project}/~boards", IssueBoardsPage.class));add(new ProjectPageMapper("${project}/~boards/${board}", IssueBoardsPage.class));add(new ProjectPageMapper("${project}/~issues", ProjectIssueListPage.class));- add(new ProjectPageMapper("${project}/~issues/${issue}", IssueActivitiesPage.class));- add(new ProjectPageMapper("${project}/~issues/${issue}/commits", IssueCommitsPage.class));- add(new ProjectPageMapper("${project}/~issues/${issue}/pulls", IssuePullRequestsPage.class));- add(new ProjectPageMapper("${project}/~issues/${issue}/builds", IssueBuildsPage.class));- add(new ProjectPageMapper("${project}/~issues/${issue}/authorizations", IssueAuthorizationsPage.class));+ add(new ProjectPageMapper("${project}/~issues/${issue}", IssueDetailPage.class));add(new ProjectPageMapper("${project}/~issues/new", NewIssuePage.class));add(new ProjectPageMapper("${project}/~issues/import/${importer}", IssueImportPage.class));add(new ProjectPageMapper("${project}/~iterations", IterationListPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.htmlindex 666499991d..cb5590799a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html@@ -9,8 +9,7 @@<div class="main flex-grow-1"><div wicket:id="operations" class="mb-5"></div><div wicket:id="primary" class="mb-5"></div>- <ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>- <div wicket:id="tabContent"></div>+ <div wicket:id="tabs"></div></div><div wicket:id="moreInfo"></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 94951913ae..11f4788205 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -1,6 +1,5 @@package io.onedev.server.web.page.project.issues.boards;-import java.util.ArrayList;import java.util.List;import javax.annotation.Nullable;@@ -10,12 +9,8 @@ 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.panel.GenericPanel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.IRequestHandler;-import org.apache.wicket.request.Url;-import org.apache.wicket.request.cycle.IRequestCycleListener;+import org.apache.wicket.request.cycle.AbstractRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;@@ -26,38 +21,25 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.search.entity.build.BuildQuery;-import io.onedev.server.search.entity.build.FixedIssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectScope;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.component.build.list.BuildListPanel;import io.onedev.server.web.component.entity.nav.EntityNavPanel;-import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;-import io.onedev.server.web.component.issue.authorizations.IssueAuthorizationsPanel;-import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;import io.onedev.server.web.component.issue.editabletitle.IssueEditableTitlePanel;import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;import io.onedev.server.web.component.issue.primary.IssuePrimaryPanel;-import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;import io.onedev.server.web.component.issue.side.IssueSidePanel;+import io.onedev.server.web.component.issue.tabs.IssueTabsPanel;import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;-import io.onedev.server.web.component.tabbable.AjaxActionTab;-import io.onedev.server.web.component.tabbable.Tab;-import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.util.CursorSupport;import io.onedev.server.xodus.VisitInfoManager;abstract class CardDetailPanel extends GenericPanel<Issue> implements InputContext {-- private static final String TAB_CONTENT_ID = "tabContent";-- private IssueActivitiesPanel activities;-+public CardDetailPanel(String id, IModel<Issue> model) {super(id, model);}@@ -65,20 +47,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConteprivate Issue getIssue() {return getModelObject();}-- private IssueActivitiesPanel newActivitiesPanel() {- IssueActivitiesPanel activities = new IssueActivitiesPanel(TAB_CONTENT_ID) {-- @Override- protected Issue getIssue() {- return CardDetailPanel.this.getIssue();- }-- };- activities.setOutputMarkupId(true);- return activities;- }-+@Overrideprotected void onInitialize() {super.onInitialize();@@ -117,104 +86,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte});- List<Tab> tabs = new ArrayList<>();- tabs.add(new AjaxActionTab(Model.of("Activities")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- activities = newActivitiesPanel();- CardDetailPanel.this.replace(activities);- target.add(activities);- }-- @Override- protected Component renderOptions(String componentId) {- return activities.renderOptions(componentId);- }-- });-- if (!getIssue().getFixCommits(false).isEmpty()) {- if (SecurityUtils.canReadCode(getIssue().getProject())) {- tabs.add(new AjaxActionTab(Model.of("Fixing Commits")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component content = new IssueCommitsPanel(TAB_CONTENT_ID, CardDetailPanel.this.getModel());- content.setOutputMarkupId(true);- CardDetailPanel.this.replace(content);- target.add(content);- }-- });- if (!getIssue().getPullRequests().isEmpty()) {- tabs.add(new AjaxActionTab(Model.of("Pull Requests")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component content = new IssuePullRequestsPanel(TAB_CONTENT_ID, new AbstractReadOnlyModel<Issue>() {-- @Override- public Issue getObject() {- return getIssue();- }-- });- CardDetailPanel.this.replace(content);- target.add(content);- }-- });- }- }-- tabs.add(new AjaxActionTab(Model.of("Fixing Builds")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component content = new BuildListPanel(TAB_CONTENT_ID, Model.of((String)null), true, true) {-- @Override- protected BuildQuery getBaseQuery() {- return new BuildQuery(new FixedIssueCriteria(getIssue()), new ArrayList<>());- }-- @Override- protected Project getProject() {- return getIssue().getProject();- }-- }.setOutputMarkupId(true);-- CardDetailPanel.this.replace(content);- target.add(content);- }-- });-- if (getIssue().isConfidential() && SecurityUtils.canModifyIssue(getIssue())) {- tabs.add(new AjaxActionTab(Model.of("Authorizations")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component content = new IssueAuthorizationsPanel(TAB_CONTENT_ID) {-- @Override- protected Issue getIssue() {- return CardDetailPanel.this.getIssue();- }-- }.setOutputMarkupId(true);-- CardDetailPanel.this.replace(content);- target.add(content);- }-- });- }- }-- add(new Tabbable("tabs", tabs).setOutputMarkupId(true));+ add(new IssueTabsPanel("tabs", getModel()));add(new SideInfoPanel("moreInfo") {@@ -255,7 +127,9 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte@Overrideprotected EntityQuery<Issue> parse(String queryString, Project project) {- IssueQueryParseOption option = new IssueQueryParseOption().withCurrentUserCriteria(true);+ IssueQueryParseOption option = new IssueQueryParseOption()+ .withCurrentProjectCriteria(true)+ .withCurrentUserCriteria(true);return IssueQuery.parse(project, queryString, option, true);}@@ -280,9 +154,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte}});-- add(activities = newActivitiesPanel());-+add(new AjaxLink<Void>("close") {@Override@@ -298,47 +170,14 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte});- RequestCycle.get().getListeners().add(new IRequestCycleListener() {-- @Override- public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, Url url) {- }-- @Override- public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler) {- }-- @Override- public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler) {- }-- @Override- public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler handler) {- }-- @Override- public void onExceptionRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler, Exception exception) {- }-- @Override- public IRequestHandler onException(RequestCycle cycle, Exception ex) {- return null;- }-+ RequestCycle.get().getListeners().add(new AbstractRequestCycleListener() {+@Overridepublic void onEndRequest(RequestCycle cycle) {if (SecurityUtils.getAuthUser() != null)OneDev.getInstance(VisitInfoManager.class).visitIssue(SecurityUtils.getAuthUser(), getIssue());}- @Override- public void onDetach(RequestCycle cycle) {- }-- @Override- public void onBeginRequest(RequestCycle cycle) {- }-});setOutputMarkupId(true);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.javaindex a92f28e6f6..e7b1264e46 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java@@ -32,7 +32,7 @@ import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlerimport io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.page.simple.security.LoginPage;@@ -106,7 +106,7 @@ public class NewIssuePage extends ProjectPage implements InputContext {super.onSubmit();Issue issue = editor.getConvertedInput();OneDev.getInstance(IssueManager.class).open(issue);- setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue));+ setResponsePage(IssueDetailPage.class, IssueDetailPage.paramsOf(issue));}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.htmldeleted file mode 100644index 199d391a98..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="activities"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.javadeleted file mode 100644index 20dc73bbb1..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.java+++ /dev/null@@ -1,34 +0,0 @@-package io.onedev.server.web.page.project.issues.detail;--import org.apache.wicket.Component;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.model.Issue;-import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;--public class IssueActivitiesPage extends IssueDetailPage {-- private IssueActivitiesPanel activities;-- public IssueActivitiesPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(activities = new IssueActivitiesPanel("activities") {-- @Override- protected Issue getIssue() {- return IssueActivitiesPage.this.getIssue();- }-- });- }-- public Component renderOptions(String componentId) {- return activities.renderOptions(componentId);- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueAuthorizationsPage.htmldeleted file mode 100644index df338de0b1..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueAuthorizationsPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="authorizations"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueAuthorizationsPage.javadeleted file mode 100644index 152a2b26cc..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueAuthorizationsPage.java+++ /dev/null@@ -1,28 +0,0 @@-package io.onedev.server.web.page.project.issues.detail;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.model.Issue;-import io.onedev.server.web.component.issue.authorizations.IssueAuthorizationsPanel;--public class IssueAuthorizationsPage extends IssueDetailPage {-- public IssueAuthorizationsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new IssueAuthorizationsPanel("authorizations") {-- @Override- protected Issue getIssue() {- return IssueAuthorizationsPage.this.getIssue();- }-- });- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.htmldeleted file mode 100644index 10ae2852bf..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="builds"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.javadeleted file mode 100644index aedf335e43..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java+++ /dev/null@@ -1,108 +0,0 @@-package io.onedev.server.web.page.project.issues.detail;--import java.io.Serializable;--import javax.annotation.Nullable;--import io.onedev.server.web.util.paginghistory.ParamPagingHistorySupport;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.model.IModel;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.search.entity.build.BuildQuery;-import io.onedev.server.search.entity.build.FixedIssueCriteria;-import io.onedev.server.web.component.build.list.BuildListPanel;-import io.onedev.server.web.util.paginghistory.PagingHistorySupport;--public class IssueBuildsPage extends IssueDetailPage {-- private static final String PARAM_QUERY = "query";-- private static final String PARAM_PAGE = "page";-- private String query;-- private BuildListPanel buildList;-- public IssueBuildsPage(PageParameters params) {- super(params);- query = params.get(PARAM_QUERY).toString();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(buildList = new BuildListPanel("builds", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return query;- }-- @Override- public void setObject(String object) {- query = object;- PageParameters params = getPageParameters();- params.set(PARAM_QUERY, query);- params.remove(PARAM_PAGE);- CharSequence url = RequestCycle.get().urlFor(IssueBuildsPage.class, params);- pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);- }-- }, true, true) {-- @Override- protected BuildQuery getBaseQuery() {- return new BuildQuery(new FixedIssueCriteria(getIssue()));- }-- @Override- protected PagingHistorySupport getPagingHistorySupport() {- return new ParamPagingHistorySupport() {-- @Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getIssue(), query);- params.add(PARAM_PAGE, currentPage+1);- return params;- }-- @Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;- }-- };- }-- @Override- protected Project getProject() {- return null;- }-- });- }-- @Override- protected void onPopState(AjaxRequestTarget target, Serializable data) {- query = (String) data;- getPageParameters().set(PARAM_QUERY, query);- target.add(buildList);- }-- public static PageParameters paramsOf(Issue issue, @Nullable String query) {- PageParameters params = paramsOf(issue);- if (query != null)- params.add(PARAM_QUERY, query);- return params;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.htmldeleted file mode 100644index e93fdf5f96..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="commits"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.javadeleted file mode 100644index 91f1b0ab18..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.java+++ /dev/null@@ -1,19 +0,0 @@-package io.onedev.server.web.page.project.issues.detail;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;--public class IssueCommitsPage extends IssueDetailPage {-- public IssueCommitsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(new IssueCommitsPanel("commits", issueModel));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.htmlindex bb46f1acb0..534b4582b1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html@@ -8,8 +8,7 @@<div class="main flex-grow-1"><div wicket:id="operations" class="mb-5"></div><div wicket:id="primary" class="mb-5"></div>- <ul wicket:id="issueTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>- <wicket:child></wicket:child>+ <div wicket:id="issueTabs"></div></div><div wicket:id="side"></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 759fe74319..080b68b63b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -1,7 +1,5 @@package io.onedev.server.web.page.project.issues.detail;-import java.util.ArrayList;-import java.util.Collection;import java.util.List;import javax.persistence.EntityNotFoundException;@@ -20,16 +18,11 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.IRequestHandler;-import org.apache.wicket.request.Url;-import org.apache.wicket.request.cycle.IRequestCycleListener;+import org.apache.wicket.request.cycle.AbstractRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.collect.Lists;-import io.onedev.server.OneDev;import io.onedev.server.buildspecmodel.inputspec.InputContext;import io.onedev.server.entitymanager.IssueLinkManager;@@ -44,18 +37,15 @@ import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectScope;import io.onedev.server.web.WebSession;-import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.component.entity.nav.EntityNavPanel;import io.onedev.server.web.component.issue.editabletitle.IssueEditableTitlePanel;import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;import io.onedev.server.web.component.issue.primary.IssuePrimaryPanel;import io.onedev.server.web.component.issue.side.IssueSidePanel;+import io.onedev.server.web.component.issue.tabs.IssueTabsPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;-import io.onedev.server.web.component.tabbable.PageTab;-import io.onedev.server.web.component.tabbable.Tab;-import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.issues.ProjectIssuesPage;@@ -65,7 +55,7 @@ import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.CursorSupport;import io.onedev.server.xodus.VisitInfoManager;-public abstract class IssueDetailPage extends ProjectIssuesPage implements InputContext {+public class IssueDetailPage extends ProjectIssuesPage implements InputContext {public static final String PARAM_ISSUE = "issue";@@ -151,53 +141,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input}});- add(new Tabbable("issueTabs", new LoadableDetachableModel<>() {- @Override- protected List<? extends Tab> load() {- List<Tab> tabs = new ArrayList<>();- tabs.add(new PageTab(Model.of("Activities"), IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue())) {-- @Override- protected Component renderOptions(String componentId) {- IssueActivitiesPage page = (IssueActivitiesPage) getPage();- return page.renderOptions(componentId);- }-- });-- if (!getIssue().getFixCommits(false).isEmpty()) {- if (SecurityUtils.canReadCode(getProject())) {- tabs.add(new PageTab(Model.of("Fixing Commits"), IssueCommitsPage.class, IssueCommitsPage.paramsOf(getIssue())));- if (!getIssue().getPullRequests().isEmpty())- tabs.add(new PageTab(Model.of("Pull Requests"), IssuePullRequestsPage.class, IssuePullRequestsPage.paramsOf(getIssue())));- }- // Do not calculate fix builds now as it might be slow- tabs.add(new PageTab(Model.of("Fixing Builds"), IssueBuildsPage.class, IssueBuildsPage.paramsOf(getIssue())));- }-- if (getIssue().isConfidential() && SecurityUtils.canModifyIssue(getIssue()))- tabs.add(new PageTab(Model.of("Authorizations"), IssueAuthorizationsPage.class, IssueAuthorizationsPage.paramsOf(getIssue())));-- return tabs;- }-- }) {- @Override- public void onInitialize() {- super.onInitialize();-- add(new ChangeObserver() {-- @Override- public Collection<String> findObservables() {- return Lists.newArrayList(Issue.getDetailChangeObservable(getIssue().getId()));- }-- });-- setOutputMarkupId(true);- }- });+ add(new IssueTabsPanel("issueTabs", issueModel));add(new SideInfoPanel("side") {@@ -277,32 +221,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input});- RequestCycle.get().getListeners().add(new IRequestCycleListener() {-- @Override- public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, Url url) {- }-- @Override- public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler) {- }-- @Override- public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler) {- }-- @Override- public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler handler) {- }-- @Override- public void onExceptionRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler, Exception exception) {- }-- @Override- public IRequestHandler onException(RequestCycle cycle, Exception ex) {- return null;- }+ RequestCycle.get().getListeners().add(new AbstractRequestCycleListener() {@Overridepublic void onEndRequest(RequestCycle cycle) {@@ -310,14 +229,6 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements InputOneDev.getInstance(VisitInfoManager.class).visitIssue(SecurityUtils.getAuthUser(), getIssue());}- @Override- public void onDetach(RequestCycle cycle) {- }-- @Override- public void onBeginRequest(RequestCycle cycle) {- }-});}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.htmldeleted file mode 100644index 3745a70d99..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="pullRequests"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.javadeleted file mode 100644index 99952e95d8..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.java+++ /dev/null@@ -1,19 +0,0 @@-package io.onedev.server.web.page.project.issues.detail;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;--public class IssuePullRequestsPage extends IssueDetailPage {-- public IssuePullRequestsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(new IssuePullRequestsPanel("pullRequests", issueModel));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.javaindex 9eeb7e68cb..b37c03d103 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java@@ -22,6 +22,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("7 days", "7 天");m.put("<a wicket:id=\"verifyRecoveryCode\">Verify by recovery code</a> if you can not access your TOTP authenticator","<a wicket:id=\"verifyRecoveryCode\">通过恢复代码验证</a>(如果您无法访问 TOTP 认证器)");+ m.put("<b class='text-danger'>NOTE: </b> This step requires an enterprise subscription. <a href='https://onedev.io/pricing' target='_blank'>Try free</a> for 30 days",+ "<b class='text-danger'>注意:</b> 此步骤需要企业版订阅。<a href='https://onedev.io/pricing' target='_blank'>免费试用 30 天</a>");m.put("<b class='text-warning'>NOTE: </b><a href='https://docs.onedev.io/tutorials/issue/time-tracking' target='_blank'>Time tracking</a> is an enterprise feature. <a href='https://onedev.io/pricing' target='_blank'>Try free</a> for 30 days","<b class='text-warning'>注意:</b><a href='https://docs.onedev.io/tutorials/issue/time-tracking' target='_blank'>时间跟踪</a>是企业版功能。<a href='https://onedev.io/pricing' target='_blank'>免费试用</a>30天");m.put("<b>Tips: </b> Type <tt>@</tt> to <a href='https://docs.onedev.io/appendix/job-variables' target='_blank' tabindex='-1'>insert variable</a>. Use <tt>@@</tt> for literal <tt>@</tt>",@@ -1561,10 +1563,20 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Run docker buildx imagetools command with specified arguments. This step can only be executed by server docker executor or remote docker executor","使用指定参数运行 docker buildx imagetools 命令。此步骤只能由服务器 docker 执行器或远程 docker 执行器执行");m.put("Run job", "运行任务");+ m.put("Run osv scanner to scan violated licenses used by various <a href='https://deps.dev/' target='_blank'>dependencies</a>. It can only be executed by docker aware executor.",+ "运行 OSV 扫描器扫描各种 <a href='https://deps.dev/' target='_blank'>依赖项</a> 使用的违反许可证。它只能由 docker 感知执行器执行。");+ m.put("Run osv scanner to scan vulnerabilities in <a href='https://google.github.io/osv-scanner/supported-languages-and-lockfiles/' target='_blank'>various lock files</a>. It can only be executed by docker aware executor.",+ "运行 OSV 扫描器扫描各种 <a href='https://google.github.io/osv-scanner/supported-languages-and-lockfiles/' target='_blank'>锁定文件</a> 中的漏洞。它只能由 docker 感知执行器执行。");m.put("Run specified docker container. <a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>Job workspace</a> is mounted into the container and its path is placed in environment variable <code>ONEDEV_WORKSPACE</code>. <b class='text-warning'>Note: </b> this step can only be executed by server docker executor or remote docker executor","运行指定的 docker 容器。<a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>Job workspace</a> 挂载到容器中,其路径放置在环境变量 <code>ONEDEV_WORKSPACE</code> 中。<b class='text-warning'>注意:</b> 此步骤只能由服务器 docker 执行器或远程 docker 执行器执行");m.put("Run specified step template", "运行指定的步骤模板");m.put("Run this job", "运行此任务");+ m.put("Run trivy container image scanner to find issues in specified image. For vulnerabilities, it checks various <a href='https://aquasecurity.github.io/trivy/v0.50/docs/coverage/language/#supported-languages' target='_blank'>distribution files</a>It can only be executed by docker aware executor.",+ "运行 trivy 容器镜像扫描器扫描指定镜像中的问题。对于漏洞,它检查各种 <a href='https://aquasecurity.github.io/trivy/v0.50/docs/coverage/language/#supported-languages' target='_blank'>分布文件</a>。它只能由 docker 感知执行器执行。");+ m.put("Run trivy filesystem scanner to scan various <a href='https://aquasecurity.github.io/trivy/v0.50/docs/coverage/language/#supported-languages' target='_blank'>lock files</a>. It can only be executed by a docker aware executor, and is recommended to run <span class='text-warning'>after dependencies are resolved</span> (npm install or alike). Compared to OSV scanner, its setup is a bit verbose, but can provide more accurate result",+ "运行 trivy 文件系统扫描器扫描各种 <a href='https://aquasecurity.github.io/trivy/v0.50/docs/coverage/language/#supported-languages' target='_blank'>锁定文件</a>。它只能由 docker 感知执行器执行,建议在 <span class='text-warning'>依赖项解析后</span> 运行(例如 npm install)。与 OSV 扫描器相比,它的设置稍微冗长,但可以提供更准确的结果");+ m.put("Run trivy rootfs scanner to scan various <a href='https://aquasecurity.github.io/trivy/v0.50/docs/coverage/language/#supported-languages' target='_blank'>distribution files</a>. It can only be executed by a docker aware executor and is recommended to run against staging area of your project",+ "运行 trivy 根文件系统扫描器扫描各种 <a href='https://aquasecurity.github.io/trivy/v0.50/docs/coverage/language/#supported-languages' target='_blank'>分布文件</a>。它只能由 docker 感知执行器执行,建议在项目暂存区域运行。");m.put("Running", "运行中");m.put("SMTP Host", "SMTP 主机");m.put("SMTP Password", "SMTP 密码");@@ -2367,18 +2379,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("{0} commits", "{0} 个提交");m.put("{0} files", "{0} 个文件");m.put("{0} tags", "{0} 个标签");- m.put("<b class='text-danger'>NOTE: </b> This step requires an enterprise subscription. <a href='https://onedev.io/pricing' target='_blank'>Try free</a> for 30 days",- "<b class='text-danger'>注意:</b> 此步骤需要企业版订阅。<a href='https://onedev.io/pricing' target='_blank'>免费试用 30 天</a>");- m.put("Run osv scanner to scan violated licenses used by various <a href='https://deps.dev/' target='_blank'>dependencies</a>. It can only be executed by docker aware executor.",- "运行 OSV 扫描器扫描各种 <a href='https://deps.dev/' target='_blank'>依赖项</a> 使用的违反许可证。它只能由 docker 感知执行器执行。");- m.put("Run osv scanner to scan vulnerabilities in <a href='https://google.github.io/osv-scanner/supported-languages-and-lockfiles/' target='_blank'>various lock files</a>. It can only be executed by docker aware executor.",- "运行 OSV 扫描器扫描各种 <a href='https://google.github.io/osv-scanner/supported-languages-and-lockfiles/' target='_blank'>锁定文件</a> 中的漏洞。它只能由 docker 感知执行器执行。");- m.put("Run trivy container image scanner to find issues in specified image. For vulnerabilities, it checks various <a href='https://aquasecurity.github.io/trivy/v0.50/docs/coverage/language/#supported-languages' target='_blank'>distribution files</a>It can only be executed by docker aware executor.",- "运行 trivy 容器镜像扫描器扫描指定镜像中的问题。对于漏洞,它检查各种 <a href='https://aquasecurity.github.io/trivy/v0.50/docs/coverage/language/#supported-languages' target='_blank'>分布文件</a>。它只能由 docker 感知执行器执行。");- m.put("Run trivy filesystem scanner to scan various <a href='https://aquasecurity.github.io/trivy/v0.50/docs/coverage/language/#supported-languages' target='_blank'>lock files</a>. It can only be executed by a docker aware executor, and is recommended to run <span class='text-warning'>after dependencies are resolved</span> (npm install or alike). Compared to OSV scanner, its setup is a bit verbose, but can provide more accurate result",- "运行 trivy 文件系统扫描器扫描各种 <a href='https://aquasecurity.github.io/trivy/v0.50/docs/coverage/language/#supported-languages' target='_blank'>锁定文件</a>。它只能由 docker 感知执行器执行,建议在 <span class='text-warning'>依赖项解析后</span> 运行(例如 npm install)。与 OSV 扫描器相比,它的设置稍微冗长,但可以提供更准确的结果");- m.put("Run trivy rootfs scanner to scan various <a href='https://aquasecurity.github.io/trivy/v0.50/docs/coverage/language/#supported-languages' target='_blank'>distribution files</a>. It can only be executed by a docker aware executor and is recommended to run against staging area of your project",- "运行 trivy 根文件系统扫描器扫描各种 <a href='https://aquasecurity.github.io/trivy/v0.50/docs/coverage/language/#supported-languages' target='_blank'>分布文件</a>。它只能由 docker 感知执行器执行,建议在项目暂存区域运行。");// Manually added keysm.put("Create Administrator Account", "创建管理员账户");diff --git a/server-ee b/server-eeindex 3fc0286101..d8ffe6e5b6 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 3fc02861015db794867623f152e3cb76e2973bdb+Subproject commit d8ffe6e5b678c787ecbcd08036eeaf684fd6f94a