The Unified and Autonomous Development Platform
Get issues since last successful build instead of last build for fixed issues in build
Robin Shen75eb598acda8
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex c17800d824..fd558414a3 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -148,14 +148,10 @@ public class Build extends ProjectBelongingpublic static final String PROP_SUBMITTER = "submitter";- public static final String PROP_SUBMITTER_NAME = "submitterName";-public static final String NAME_CANCELLER = "Canceller";public static final String PROP_CANCELLER = "canceller";- public static final String PROP_CANCELLER_NAME = "cancellerName";-public static final String NAME_SUBMIT_DATE = "Submit Date";public static final String PROP_SUBMIT_DATE = "submitDate";@@ -712,9 +708,9 @@ public class Build extends ProjectBelongingpublic Collection<Long> getFixedIssueIds() {if (fixedIssueIds == null) {fixedIssueIds = new HashSet<>();- Build prevBuild = getStreamPrevious(null);- if (prevBuild != null) {- for (RevCommit commit: getCommits(null))+ Build prevSuccessfulBuild = getStreamPrevious(Status.SUCCESSFUL);+ if (prevSuccessfulBuild != null) {+ for (RevCommit commit: getCommits(Status.SUCCESSFUL))fixedIssueIds.addAll(getProject().parseFixedIssueIds(commit.getFullMessage()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 90a662e94e..091d205984 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -1,59 +1,6 @@package io.onedev.server.web.component.issue.list;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Comparator;-import java.util.Iterator;-import java.util.List;-import java.util.concurrent.atomic.AtomicReference;--import javax.annotation.Nullable;--import org.apache.commons.collections4.CollectionUtils;-import org.apache.commons.collections4.Predicate;-import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.event.Broadcast;-import org.apache.wicket.event.IEvent;-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.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;-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.RepeatingView;-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 org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.collect.Sets;-import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;@@ -119,6 +66,48 @@ import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;+import org.apache.commons.collections4.CollectionUtils;+import org.apache.commons.collections4.Predicate;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.*;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;+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.RepeatingView;+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 org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import javax.annotation.Nullable;+import java.util.*;+import java.util.concurrent.atomic.AtomicReference;@SuppressWarnings("serial")public abstract class IssueListPanel extends Panel {@@ -1511,7 +1500,7 @@ public abstract class IssueListPanel extends Panel {}});- body.add(new WebMarkupContainer("tips").setVisible(getProject() != null));+ body.add(new WebMarkupContainer("tips").setVisible(getPage() instanceof ProjectIssueListPage));if (getPagingHistorySupport() != null)issuesTable.setCurrentPage(getPagingHistorySupport().getCurrentPage());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.htmlindex 90ec12a127..4a9a9504e3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.html@@ -1,10 +1,10 @@<wicket:extend><div wicket:id="content" class="issues"></div>- <wicket:fragment wicket:id="hasPreviousBuildFrag">+ <wicket:fragment wicket:id="hasPreviousSuccessfulBuildFrag"><div wicket:id="issues"></div>- <div class="font-size-sm text-muted mt-4"><wicket:svg href="bulb" class="icon mt-n1 mr-1"/> This page lists fixed issues since previous build on <a href="https://docs.onedev.io/concepts#build-stream" class="link-primary" target="_blank">same stream</a></div>+ <div class="font-size-sm text-muted mt-4"><wicket:svg href="bulb" class="icon icon-sm mt-n1"/> This page lists fixed issues since previous successful build on <a href="https://docs.onedev.io/concepts#build-stream" class="link-primary" target="_blank">same stream</a></div></wicket:fragment>- <wicket:fragment wicket:id="noPreviousBuildFrag">- <div class="alert alert-light-warning">Fixed issues not available for first build of a job</div>+ <wicket:fragment wicket:id="noPreviousSuccessfulBuildFrag">+ <div class="alert alert-light-warning">No previous successful build on <a href="https://docs.onedev.io/concepts#build-stream" class="link-primary" target="_blank">same stream</a> to calculate fixed issues since</div></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.javaindex edbd50fe6a..ff06595068 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java@@ -39,8 +39,8 @@ public class FixedIssuesPage extends BuildDetailPage {protected void onInitialize() {super.onInitialize();- if (getBuild().getStreamPrevious(null) != null) {- Fragment fragment = new Fragment("content", "hasPreviousBuildFrag", this);+ if (getBuild().getStreamPrevious(Build.Status.SUCCESSFUL) != null) {+ Fragment fragment = new Fragment("content", "hasPreviousSuccessfulBuildFrag", this);fragment.add(issueList = new IssueListPanel("issues", new IModel<String>() {@@ -98,7 +98,7 @@ public class FixedIssuesPage extends BuildDetailPage {add(fragment);} else {- add(new Fragment("content", "noPreviousBuildFrag", this));+ add(new Fragment("content", "noPreviousSuccessfulBuildFrag", this));}}