The Unified and Autonomous Development Platform
feat: able to pin/unpin issues (#1469)
Robin Shencbe72f12f5bd
diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.javaindex 6a33ab924e..3a7b2ba002 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java@@ -34,7 +34,7 @@ public class SpecifiedChoices extends ChoiceProvider implements Validatable {private List<Choice> choices = new ArrayList<>();@Editable(name="Specified choices")- @Size(min=2, message="At least two choices need to be specified")+ @Size(min=1, message="At least one choice need to be specified")@OmitNamepublic List<Choice> getChoices() {return choices;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.javaindex 7f3f517573..c870b089e2 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java@@ -36,10 +36,14 @@ public interface IssueManager extends EntityManager<Issue> {void open(Issue issue);+ void togglePin(Issue issue);+Long getNextNumber(Project numberScope);void resetNextNumber(Project numberScope);+ List<Issue> queryPinned(Project project);+List<Issue> query(@Nullable ProjectScope projectScope, EntityQuery<Issue> issueQuery,boolean loadFieldsAndLinks, int firstResult, int maxResults);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 ac52cf8c59..252cc502ce 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@@ -8,6 +8,7 @@ import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.StringUtils;import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.cluster.ClusterManager;+import io.onedev.server.data.migration.VersionedXmlDoc;import io.onedev.server.entitymanager.*;import io.onedev.server.entityreference.ReferenceMigrator;import io.onedev.server.event.Listen;@@ -16,7 +17,6 @@ import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.project.issue.*;import io.onedev.server.event.system.SystemStarting;-import io.onedev.server.data.migration.VersionedXmlDoc;import io.onedev.server.model.*;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.administration.GlobalIssueSetting;@@ -208,6 +208,16 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IsslistenerRegistry.post(new IssueOpened(issue));}+ @Transactional+ @Override+ public void togglePin(Issue issue) {+ if (issue.getPinDate() != null)+ issue.setPinDate(null);+ else+ issue.setPinDate(new Date());+ dao.persist(issue);+ }+private List<javax.persistence.criteria.Order> getOrders(List<EntitySort> sorts, CriteriaBuilder builder, Root<Issue> root) {List<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: sorts) {@@ -1189,4 +1199,27 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssnumberGenerator.removeNextSequence(numberScope);}+ @Sessional+ @Override+ public List<Issue> queryPinned(Project project) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Issue> criteriaQuery = builder.createQuery(Issue.class);+ Root<Issue> root = criteriaQuery.from(Issue.class);+ criteriaQuery.where(+ builder.equal(root.get(Issue.PROP_PROJECT), project),+ builder.isNotNull(root.get(Issue.PROP_PIN_DATE)));+ criteriaQuery.orderBy(builder.desc(root.get(Issue.PROP_PIN_DATE)));++ Query<Issue> query = getSession().createQuery(criteriaQuery);+ query.setFirstResult(0);+ query.setMaxResults(Integer.MAX_VALUE);++ var issues = query.getResultList();+ for (var it = issues.iterator(); it.hasNext();) {+ if (!SecurityUtils.canAccess(it.next()))+ it.remove();+ }+ return issues;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex 110bbd057d..76ea7c6dd9 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -129,6 +129,8 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachmentpublic static final String PROP_CONFIDENTIAL = "confidential";+ public static final String PROP_PIN_DATE = "pinDate";+public static final Set<String> ALL_FIELDS = Sets.newHashSet(NAME_PROJECT, NAME_NUMBER, NAME_STATE, NAME_TITLE, NAME_SUBMITTER,NAME_DESCRIPTION, NAME_COMMENT, NAME_SUBMIT_DATE, NAME_LAST_ACTIVITY_DATE,@@ -261,6 +263,8 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachmentprivate boolean confidential;+ private Date pinDate;+@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)private Collection<IssueField> fields = new ArrayList<>();@@ -341,6 +345,14 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachmentthis.confidential = confidential;}+ public Date getPinDate() {+ return pinDate;+ }++ public void setPinDate(Date pinDate) {+ this.pinDate = pinDate;+ }+public Project getNumberScope() {return numberScope;}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4index a25e5eb88b..7451649c34 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4@@ -86,7 +86,7 @@ CommentedByMeConfidential: 'confidential';-+CurrentIssue: 'current' WS+ 'issue';diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/pin.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/pin.svgnew file mode 100644index 0000000000..7f8e415915--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/pin.svg@@ -0,0 +1 @@+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689727099295" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2289" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M648.728381 130.779429a73.142857 73.142857 0 0 1 22.674286 15.433142l191.561143 191.756191a73.142857 73.142857 0 0 1-22.137905 118.564571l-67.876572 30.061715-127.341714 127.488-10.093714 140.239238a73.142857 73.142857 0 0 1-124.684191 46.445714l-123.66019-123.782095-210.724572 211.699809-51.833904-51.614476 210.846476-211.821714-127.926857-128.024381a73.142857 73.142857 0 0 1 46.299428-124.635429l144.237715-10.776381 125.074285-125.220571 29.379048-67.779048a73.142857 73.142857 0 0 1 96.207238-38.034285z m-29.086476 67.120761l-34.913524 80.530286-154.087619 154.331429-171.398095 12.751238 303.323428 303.542857 12.044191-167.399619 156.233143-156.428191 80.384-35.59619-191.585524-191.73181z" p-id="2290"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/unpin.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/unpin.svgnew file mode 100644index 0000000000..5a712bc2b9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/unpin.svg@@ -0,0 +1 @@+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689727635946" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16823" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M932.394667 98.304l-3.114667-3.584a32 32 0 0 0-41.642667-3.114667l-3.584 3.114667-280.746666 280.704h-0.085334L94.72 883.968a32 32 0 0 0-3.114667 41.685333l3.114667 3.584a32 32 0 0 0 41.642667 3.114667l3.584-3.114667 240-239.957333 48.853333 122.538667a32 32 0 0 0 48.938667 13.738666l3.413333-2.986666 138.112-138.069334 211.242667 211.626667L875.946667 896l-0.085334-45.013333-211.328-211.669334 136.746667-136.704a32 32 0 0 0-6.698667-50.346666l-4.053333-1.962667-122.538667-49.024L929.28 139.946667a32 32 0 0 0 3.114667-41.642667l-3.114667-3.584 3.114667 3.584z m-313.642667 352.213333l102.954667 41.173334-251.477334 251.349333-41.088-102.912 189.610667-189.610667z m-303.36-337.792l-5.376 5.290667L106.709333 334.933333a96 96 0 0 0 16.597334 145.408l5.845333 3.584 174.976 100.010667 46.933333-46.933333-190.165333-108.629334a32 32 0 0 1-13.824-39.765333l1.92-3.882667 2.048-3.157333 2.389333-2.858667L356.693333 161.749333a32 32 0 0 1 49.749334 3.84l1.834666 2.986667 108.245334 202.965333 47.36-47.317333-99.157334-185.770667a96 96 0 0 0-13.525333-19.242666l-5.546667-5.632a96 96 0 0 0-124.373333-5.845334l-5.973333 4.992z" p-id="16824"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex 733c03a83e..db4fdb3980 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -26,7 +26,7 @@ import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.issue.IssueStateBadge;-import io.onedev.server.web.component.issue.link.IssueLinkPanel;+import io.onedev.server.web.component.issue.title.IssueTitlePanel;import io.onedev.server.web.component.milestone.choice.MilestoneMultiChoice;import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;import io.onedev.server.web.editable.BeanContext;@@ -171,7 +171,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement@Overrideprotected void populateItem(ListItem<Issue> item) {item.add(new IssueStateBadge("state", item.getModel()));- item.add(new IssueLinkPanel("numberAndTitle") {+ item.add(new IssueTitlePanel("numberAndTitle") {@Overrideprotected Issue getIssue() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksCssResourceReference.javanew file mode 100644index 0000000000..5384b560e1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksCssResourceReference.java@@ -0,0 +1,9 @@+package io.onedev.server.web.component.issue.link;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class IssueLinksCssResourceReference extends BaseDependentCssResourceReference {+ public IssueLinksCssResourceReference() {+ super(IssueLinksCssResourceReference.class, "issue-links.css");+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.htmlnew file mode 100644index 0000000000..08e0690b76--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.html@@ -0,0 +1,3 @@+<wicket:panel>+ <a wicket:id="links" class="issue-link d-inline-flex align-items-center mr-2"><span wicket:id="label"></span><wicket:svg href="arrow" class="icon icon-sm"/></a>+</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.javanew file mode 100644index 0000000000..daff0660ae--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinksPanel.java@@ -0,0 +1,96 @@+package io.onedev.server.web.component.issue.link;++import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueLink;+import io.onedev.server.model.LinkSpec;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+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.basic.Label;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.RepeatingView;++import java.util.List;++public abstract class IssueLinksPanel extends Panel {++ private RepeatingView linksView;++ private String expandedLink;++ public IssueLinksPanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ linksView = new RepeatingView("links");++ for (String linkName: getDisplayLinks()) {+ int count = 0;+ for (IssueLink link: getIssue().getTargetLinks()) {+ LinkSpec spec = link.getSpec();+ if (spec.getName().equals(linkName))+ count++;+ }+ for (IssueLink link: getIssue().getSourceLinks()) {+ LinkSpec spec = link.getSpec();+ if (spec.getOpposite() == null || spec.getOpposite().getName().equals(linkName))+ count++;+ }+ if (count != 0) {+ AjaxLink<Void> link = new AjaxLink<Void>(linksView.newChildId()) {++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (linkName.equals(expandedLink))+ expandedLink = null;+ else+ expandedLink = linkName;+ onToggleExpand(target);+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (linkName.equals(expandedLink))+ tag.put("class", tag.getAttribute("class") + " expanded");+ }++ };+ link.add(new Label("label", linkName));+ linksView.add(link);+ }+ }+ add(linksView);++ setOutputMarkupId(true);+ }++ protected abstract Issue getIssue();++ protected abstract List<String> getDisplayLinks();++ protected abstract void onToggleExpand(AjaxRequestTarget target);++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(linksView.size() != 0);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new IssueLinksCssResourceReference()));+ }++ public String getExpandedLink() {+ return expandedLink;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/link/issue-links.css b/server-core/src/main/java/io/onedev/server/web/component/issue/link/issue-links.cssnew file mode 100644index 0000000000..357a7cf99d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/link/issue-links.css@@ -0,0 +1,3 @@+.issue-link.expanded .icon {+ transform: rotate(90deg);+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.htmlindex 2df0c36238..25f3fc40cc 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html@@ -47,10 +47,15 @@<div class="primary d-flex mb-3"><div class="mr-4 flex-grow-1"><wicket:container wicket:id="numberAndTitle"></wicket:container>- <a wicket:id="copy" title="Copy issue number and title" class="copy mr-3 btn btn-icon btn-xs btn-light btn-hover-primary">- <wicket:svg href="copy" class="icon"></wicket:svg>- </a>- <a wicket:id="links" class="link link-info d-inline-flex align-items-center mr-2"><span wicket:id="label"></span><wicket:svg href="arrow" class="icon icon-sm"/></a>+ <span class="mr-3">+ <a wicket:id="copy" title="Copy issue number and title" class="copy ml-1 btn btn-icon btn-xs btn-light btn-hover-primary">+ <wicket:svg href="copy" class="icon"/>+ </a>+ <a wicket:id="pin" title="Pin this issue" class="pin ml-1 btn btn-icon btn-xs btn-light btn-hover-primary">+ <wicket:svg href="pin" class="icon"/>+ </a>+ </span>+ <span wicket:id="links" class="links"></span></div><div class="flex-shrink-0 d-none d-lg-block text-muted"><span class="votes mr-2" title="Votes">@@ -96,9 +101,4 @@</form></div></wicket:fragment>- <wicket:fragment wicket:id="unauthorizedLinkedIssueFrag">- <div class="mb-3">- <span wicket:id="number" class="mr-2"></span> <wicket:svg href="warning" class="icon"></wicket:svg> <i>You are not authorized to access this issue</i>- </div>- </wicket:fragment></wicket:panel>\ No newline at end of filediff --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 06b14e9f08..5cc0815f61 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,6 +1,5 @@package io.onedev.server.web.component.issue.list;-import com.google.common.collect.Lists;import com.google.common.collect.Sets;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.codeassist.parser.TerminalExpect;@@ -13,8 +12,6 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.imports.IssueImporter;import io.onedev.server.imports.IssueImporterContribution;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueLink;-import io.onedev.server.model.LinkSpec;import io.onedev.server.model.Project;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.administration.GlobalIssueSetting;@@ -22,9 +19,9 @@ import io.onedev.server.model.support.issue.field.spec.DateField;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.model.support.issue.field.spec.IntegerField;import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;-import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.issue.*;+import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.search.entitytext.IssueTextManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;@@ -32,8 +29,6 @@ import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;import io.onedev.server.util.LinkSide;import io.onedev.server.util.ProjectScope;-import io.onedev.server.util.criteria.Criteria;-import io.onedev.server.util.criteria.OrCriteria;import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.web.WebConstants;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;@@ -45,8 +40,9 @@ import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;-import io.onedev.server.web.component.issue.link.IssueLinkPanel;+import io.onedev.server.web.component.issue.link.IssueLinksPanel;import io.onedev.server.web.component.issue.operation.TransitionMenuLink;+import io.onedev.server.web.component.issue.title.IssueTitlePanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;import io.onedev.server.web.component.menu.MenuItem;@@ -94,6 +90,7 @@ 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.link.Link;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;@@ -109,12 +106,15 @@ 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;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Iterator;+import java.util.List;import static com.google.common.collect.Lists.newArrayList;import static io.onedev.server.search.entity.issue.IssueQuery.merge;import static io.onedev.server.search.entity.issue.IssueQuery.parseFuzzy;+import static java.util.Comparator.comparingInt;@SuppressWarnings("serial")public abstract class IssueListPanel extends Panel {@@ -330,14 +330,7 @@ public abstract class IssueListPanel extends Panel {List<IssueImporterContribution> contributions =new ArrayList<>(OneDev.getExtensions(IssueImporterContribution.class));- Collections.sort(contributions, new Comparator<IssueImporterContribution>() {-- @Override- public int compare(IssueImporterContribution o1, IssueImporterContribution o2) {- return o1.getOrder() - o2.getOrder();- }-- });+ Collections.sort(contributions, comparingInt(IssueImporterContribution::getOrder));for (IssueImporterContribution contribution: contributions)importers.addAll(contribution.getImporters());@@ -1220,18 +1213,18 @@ public abstract class IssueListPanel extends Panel {});- dataProvider = new LoadableDetachableDataProvider<Issue, Void>() {+ dataProvider = new LoadableDetachableDataProvider<>() {@Overridepublic Iterator<? extends Issue> iterator(long first, long count) {try {Object query = queryModel.getObject();if (query instanceof IssueQuery) {- return getIssueManager().query(getProjectScope(), (IssueQuery)query,- true, (int)first, (int)count).iterator();+ return getIssueManager().query(getProjectScope(), (IssueQuery) query,+ true, (int) first, (int) count).iterator();} else if (query instanceof String) {- return getIssueTextManager().query(getProjectScope(), (String)query,- true, (int)first, (int)count).iterator();+ return getIssueTextManager().query(getProjectScope(), (String) query,+ true, (int) first, (int) count).iterator();}} catch (ExplicitException e) {error(e.getMessage());@@ -1243,9 +1236,9 @@ public abstract class IssueListPanel extends Panel {public long calcSize() {try {Object query = queryModel.getObject();- if (query instanceof IssueQuery)- return getIssueManager().count(getProjectScope(), ((IssueQuery)query).getCriteria());- else if (query instanceof String)+ if (query instanceof IssueQuery)+ return getIssueManager().count(getProjectScope(), ((IssueQuery) query).getCriteria());+ else if (query instanceof String)return getIssueTextManager().count(getProjectScope(), (String) query);} catch (ExplicitException e) {error(e.getMessage());@@ -1256,16 +1249,16 @@ public abstract class IssueListPanel extends Panel {@Overridepublic IModel<Issue> model(Issue object) {Long issueId = object.getId();- return new LoadableDetachableModel<Issue>() {+ return new LoadableDetachableModel<>() {@Overrideprotected Issue load() {return getIssueManager().load(issueId);}-+};}-+};body = new WebMarkupContainer("body");@@ -1275,7 +1268,7 @@ public abstract class IssueListPanel extends Panel {List<IColumn<Issue, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<Issue, Void>(Model.of("")) {+ columns.add(new AbstractColumn<>(Model.of("")) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId, IModel<Issue> rowModel) {@@ -1286,23 +1279,23 @@ public abstract class IssueListPanel extends Panel {public String getCssClass() {return "new-indicator";}-+});if (getProject() != null && SecurityUtils.canManageIssues(getProject()))columns.add(selectionColumn = new SelectionColumn<Issue, Void>());- columns.add(new AbstractColumn<Issue, Void>(Model.of("")) {+ columns.add(new AbstractColumn<>(Model.of("")) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,- IModel<Issue> rowModel) {+ IModel<Issue> rowModel) {Item<?> row = cellItem.findParent(Item.class);- Cursor cursor = new Cursor(queryModel.getObject().toString(), (int)issuesTable.getItemCount(),- (int)issuesTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex(), getProjectScope());+ Cursor cursor = new Cursor(queryModel.getObject().toString(), (int) issuesTable.getItemCount(),+ (int) issuesTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex(), getProjectScope());cellItem.add(newIssueDetail(componentId, rowModel.getObject().getId(), cursor));}-+@SuppressWarnings("unchecked")private Component newIssueDetail(String componentId, Long issueId, @Nullable Cursor cursor) {Fragment fragment = new Fragment(componentId, "contentFrag", IssueListPanel.this);@@ -1312,12 +1305,12 @@ public abstract class IssueListPanel extends Panel {protected Issue load() {return getIssueManager().load(issueId);}-+});Issue issue = (Issue) fragment.getDefaultModelObject();-- fragment.add(new IssueLinkPanel("numberAndTitle") {++ fragment.add(new IssueTitlePanel("numberAndTitle") {@Overrideprotected Issue getIssue() {@@ -1333,60 +1326,57 @@ public abstract class IssueListPanel extends Panel {protected Cursor getCursor() {return cursor;}-+});-- fragment.add(new CopyToClipboardLink("copy",++ fragment.add(new CopyToClipboardLink("copy",Model.of(issue.getTitle() + " (#" + issue.getNumber() + ")")));-- AtomicReference<String> expandedLinkName = new AtomicReference<>(null);-- RepeatingView linksView = new RepeatingView("links");- for (String linkName: getListLinks()) {- int count = 0;- for (IssueLink link: issue.getTargetLinks()) {- LinkSpec spec = link.getSpec();- if (spec.getName().equals(linkName))- count++;++ fragment.add(new Link<Void>("pin") {++ @Override+ public void onClick() {+ getIssueManager().togglePin((Issue) fragment.getDefaultModelObject());}- for (IssueLink link: issue.getSourceLinks()) {- LinkSpec spec = link.getSpec();- if (spec.getOpposite() == null && spec.getName().equals(linkName))- count++;++ @Override+ protected void onConfigure() {+ super.onConfigure();+ var issue = (Issue) fragment.getDefaultModelObject();+ setVisible(issue.getPinDate() == null+ && SecurityUtils.canManageIssues(getProject())+ && issue.getProject().equals(getProject())+ && getPage() instanceof ProjectIssueListPage);}- if (count != 0) {- AjaxLink<Void> link = new AjaxLink<Void>(linksView.newChildId()) {+ });- @Override- public void onClick(AjaxRequestTarget target) {- if (linkName.equals(expandedLinkName.get()))- expandedLinkName.set(null);- else- expandedLinkName.set(linkName);- target.add(fragment);- }+ var linksPanel = new IssueLinksPanel("links") {- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- if (linkName.equals(expandedLinkName.get()))- tag.put("class", tag.getAttribute("class") + " expanded");- }-- };- link.add(new Label("label", linkName));- linksView.add(link);+ @Override+ protected Issue getIssue() {+ return (Issue) fragment.getDefaultModelObject();}- }- fragment.add(linksView);-++ @Override+ protected List<String> getDisplayLinks() {+ return getListLinks();+ }++ @Override+ protected void onToggleExpand(AjaxRequestTarget target) {+ target.add(fragment);+ }++ };+ fragment.add(linksPanel);+fragment.add(new Label("votes", issue.getVoteCount()));fragment.add(new Label("comments", issue.getCommentCount()));-+RepeatingView fieldsView = new RepeatingView("fields");- for (String field: getListFields()) {+ for (String field : getListFields()) {if (field.equals(Issue.NAME_STATE)) {- Fragment stateFragment = new Fragment(fieldsView.newChildId(),+ Fragment stateFragment = new Fragment(fieldsView.newChildId(),"stateFrag", IssueListPanel.this);AjaxLink<Void> transitLink = new TransitionMenuLink("transit") {@@ -1394,12 +1384,12 @@ public abstract class IssueListPanel extends Panel {protected Issue getIssue() {return (Issue) fragment.getDefaultModelObject();}-+};-+transitLink.add(new IssueStateBadge("state", (IModel<Issue>) fragment.getDefaultModel()));stateFragment.add(transitLink);-+fieldsView.add(stateFragment.setOutputMarkupId(true));} else {fieldsView.add(new FieldValuesPanel(fieldsView.newChildId(), Mode.AVATAR_AND_NAME, true) {@@ -1408,7 +1398,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {return new AttachAjaxIndicatorListener(- fieldsView.get(fieldsView.size()-1), AttachMode.APPEND, false);+ fieldsView.get(fieldsView.size() - 1), AttachMode.APPEND, false);}@Override@@ -1424,80 +1414,71 @@ public abstract class IssueListPanel extends Panel {elsereturn null;}-+}.setOutputMarkupId(true));}- }+ }fragment.add(fieldsView);-+LastActivity lastActivity = issue.getLastActivity();- if (lastActivity.getUser() != null)+ if (lastActivity.getUser() != null)fragment.add(new UserIdentPanel("user", lastActivity.getUser(), Mode.NAME));- else+ elsefragment.add(new WebMarkupContainer("user").setVisible(false));fragment.add(new Label("activity", lastActivity.getDescription()));fragment.add(new Label("date", DateUtils.formatAge(lastActivity.getDate()))- .add(new AttributeAppender("title", DateUtils.formatDateTime(lastActivity.getDate()))));+ .add(new AttributeAppender("title", DateUtils.formatDateTime(lastActivity.getDate()))));- fragment.add(new ListView<Issue>("linkedIssues", new LoadableDetachableModel<List<Issue>>() {+ fragment.add(new ListView<Issue>("linkedIssues", new LoadableDetachableModel<>() {@Overrideprotected List<Issue> load() {Issue issue = (Issue) fragment.getDefaultModelObject();OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);- LinkSide side = new LinkSide(expandedLinkName.get());+ LinkSide side = new LinkSide(linksPanel.getExpandedLink());return issue.findLinkedIssues(side.getSpec(), side.isOpposite());}-+}) {@Overrideprotected void populateItem(ListItem<Issue> item) {Issue issue = item.getModelObject();- if (SecurityUtils.canAccess(issue)) {- item.add(newIssueDetail("content", issue.getId(), null));- } else {- Fragment fragment = new Fragment("content", "unauthorizedLinkedIssueFrag", IssueListPanel.this);- if (getProject().equals(issue.getProject()))- fragment.add(new Label("number", "#" + issue.getNumber()));- else- fragment.add(new Label("number", issue.getProject().getPath() + "#" + issue.getNumber()));- item.add(fragment);- }+ item.add(newIssueDetail("content", issue.getId(), null));}@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(expandedLinkName.get() != null);+ setVisible(linksPanel.getExpandedLink() != null);}-+});-+fragment.add(new ChangeObserver() {-+@Overridepublic void onObservableChanged(IPartialPageRequestHandler handler) {Component detail = newIssueDetail(componentId, issueId, cursor);fragment.replaceWith(detail);handler.add(detail);}-+@Overridepublic Collection<String> findObservables() {return Sets.newHashSet(Issue.getDetailChangeObservable(issueId));}-+});-+fragment.setOutputMarkupId(true);-+return fragment;}-+});- body.add(issuesTable = new DataTable<Issue, Void>("issues", columns, dataProvider, WebConstants.PAGE_SIZE) {+ body.add(issuesTable = new DataTable<>("issues", columns, dataProvider, WebConstants.PAGE_SIZE) {@Overrideprotected Item<Issue> newRowItem(String id, int index, IModel<Issue> model) {@@ -1506,7 +1487,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected String load() {Issue issue = model.getObject();- return issue.isVisitedAfter(issue.getLastActivity().getDate())?"issue":"issue new";+ return issue.isVisitedAfter(issue.getLastActivity().getDate()) ? "issue" : "issue new";}}));var issueId = model.getObject().getId();@@ -1520,7 +1501,7 @@ public abstract class IssueListPanel extends Panel {item.setOutputMarkupId(true);return item;}-+});body.add(new WebMarkupContainer("tips").setVisible(getPage() instanceof ProjectIssueListPage));@@ -1552,7 +1533,7 @@ public abstract class IssueListPanel extends Panel {return null;}- private List<String> getListFields() {+ public List<String> getListFields() {Project current = getProject();while (current != null) {List<String> listFields = current.getIssueSetting().getListFields();@@ -1563,7 +1544,7 @@ public abstract class IssueListPanel extends Panel {return getGlobalIssueSetting().getListFields();}- private List<String> getListLinks() {+ public List<String> getListLinks() {Project current = getProject();while (current != null) {List<String> listLinks = current.getIssueSetting().getListLinks();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.cssindex 7722f46505..8ec9bddfa9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css@@ -1,59 +1,59 @@-.issue-list>div>.body table>tbody>tr>td {- padding: 1.2rem 0.8rem 0.7rem 0.8rem;-}-.issue-list>div>.body table>tbody>tr>td.row-selector {- padding-top: 1.3rem;-}-.issue-list .field.undefined {- display: none;-}-.issue-list .field .issue-state {- margin-bottom: 0.5rem;- margin-right: 0.5rem;-}--.issue-list>div>.body .new-indicator {- width: 4px;- padding: 0;-}-.issue-list>div>.body tr.issue.new td.new-indicator {- background: var(--primary);-}--.issue-list>div>.body tr.issue .working-indicator {- margin-top: 4px;-}--.issue-list .number {- margin-right: 0.25rem;-}-.issue-list .number, .issue-list .title {- font-size: 1.175rem;- font-weight: 500;-}-.issue-list .state {- border-bottom: 2px dotted transparent;- cursor: pointer;-}-.issue-list .state:hover {- border-color: var(--gray);-}--.issue-list .link.expanded .icon {- transform: rotate(90deg);-}--.issue-list .linked-issues {- border-left: 2px dashed var(--secondary);-}-.dark-mode .issue-list .linked-issues {- border-left-color: var(--dark-mode-dark-gray);-}-.issue-list .linked-issue {- margin-top: 0.7rem;- padding-top: 1.2rem;- border-top: 1px solid var(--light-gray);-}-.dark-mode .issue-list .linked-issue {- border-top-color: var(--dark-mode-light-dark);+.issue-list>div>.body table>tbody>tr>td {+ padding: 1.2rem 0.8rem 0.7rem 0.8rem;+}+.issue-list>div>.body table>tbody>tr>td.row-selector {+ padding-top: 1.3rem;+}+.issue-list .field.undefined {+ display: none;+}+.issue-list .field .issue-state {+ margin-bottom: 0.5rem;+ margin-right: 0.5rem;+}++.issue-list>div>.body .new-indicator {+ width: 4px;+ padding: 0;+}+.issue-list>div>.body tr.issue.new td.new-indicator {+ background: var(--primary);+}++.issue-list>div>.body tr.issue .working-indicator {+ margin-top: 4px;+}++.issue-list .number {+ margin-right: 0.25rem;+}+.issue-list .number, .issue-list .title {+ font-size: 1.175rem;+ font-weight: 500;+}+.issue-list .state {+ border-bottom: 2px dotted transparent;+ cursor: pointer;+}+.issue-list .state:hover {+ border-color: var(--gray);+}++.issue-list .issue-link {+ font-weight: 500;+}++.issue-list .linked-issues {+ border-left: 2px dashed var(--secondary);+}+.dark-mode .issue-list .linked-issues {+ border-left-color: var(--dark-mode-dark-gray);+}+.issue-list .linked-issue {+ margin-top: 0.7rem;+ padding-top: 1.2rem;+ border-top: 1px solid var(--light-gray);+}+.dark-mode .issue-list .linked-issue {+ border-top-color: var(--dark-mode-light-dark);}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.javaindex c526b6e677..d7127cbb62 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.issue.link;+package io.onedev.server.web.component.issue.title;import javax.annotation.Nullable;@@ -23,9 +23,9 @@ import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.ReferenceTransformer;@SuppressWarnings("serial")-public abstract class IssueLinkPanel extends Panel {+public abstract class IssueTitlePanel extends Panel {- public IssueLinkPanel(String id) {+ public IssueTitlePanel(String id) {super(id);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.htmlindex 80f44aa476..6243de434a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html@@ -3,7 +3,7 @@<wicket:fragment wicket:id="contentFrag"><div class="primary font-weight-bold mb-3"><wicket:container wicket:id="numberAndTitle"></wicket:container>- <a wicket:id="links" class="link-info font-weight-normal link d-inline-flex align-items-center mr-2"><span wicket:id="label"></span><wicket:svg href="arrow" class="icon icon-sm"/></a>+ <span wicket:id="links" class="links ml-3"></span><a wicket:id="showDetail" title="Click to show issue details" class="show-detail"><wicket:svg href="ellipsis" class="icon"/></a></div><div class="secondary d-flex flex-wrap mb-n2">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex a8e87c7b13..11aa79928f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -3,7 +3,9 @@ package io.onedev.server.web.page.project.issues.boards;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueLinkManager;import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.model.*;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.security.SecurityUtils;@@ -14,12 +16,12 @@ import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener.AttachMode;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;-import io.onedev.server.web.component.issue.link.IssueLinkPanel;+import io.onedev.server.web.component.issue.link.IssueLinksPanel;import io.onedev.server.web.component.issue.operation.TransitionMenuLink;+import io.onedev.server.web.component.issue.title.IssueTitlePanel;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.user.ident.Mode;-import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.CursorSupport;import org.apache.wicket.Component;@@ -28,10 +30,8 @@ import org.apache.wicket.ajax.attributes.CallbackParameter;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.Broadcast;-import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;@@ -44,11 +44,10 @@ import org.hibernate.Hibernate;import javax.annotation.Nullable;import java.util.List;-import java.util.concurrent.atomic.AtomicReference;@SuppressWarnings("serial")-abstract class BoardCardPanel extends GenericPanel<Issue> {-+public abstract class BoardCardPanel extends GenericPanel<Issue> {+private AbstractPostAjaxBehavior ajaxBehavior;public BoardCardPanel(String id, IModel<Issue> model) {@@ -146,8 +145,6 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {}fragment.add(avatarsView);-- BasePage page = (BasePage) getPage();fragment.add(new ModalLink("showDetail") {@@ -166,7 +163,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {@Overrideprotected CursorSupport<Issue> getCursorSupport() {- return new CursorSupport<Issue>() {+ return new CursorSupport<>() {@Overridepublic Cursor getCursor() {@@ -182,13 +179,13 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {protected Issue load() {return OneDev.getInstance(IssueManager.class).load(issueId);}-+}, cursor);-+replaceWith(cardDetail);target.add(cardDetail);}-+};}@@ -212,7 +209,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {});- fragment.add(new IssueLinkPanel("numberAndTitle") {+ fragment.add(new IssueTitlePanel("numberAndTitle") {@Overrideprotected Issue getIssue() {@@ -231,57 +228,36 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {});- AtomicReference<String> expandedLinkName = new AtomicReference<>(null);- RepeatingView linksView = new RepeatingView("links");-- for (String linkName: board.getDisplayLinks()) {- int count = 0;- for (IssueLink link: issue.getTargetLinks()) {- LinkSpec spec = link.getSpec();- if (spec.getName().equals(linkName))- count++;- }- for (IssueLink link: issue.getSourceLinks()) {- LinkSpec spec = link.getSpec();- if (spec.getOpposite() == null || spec.getOpposite().getName().equals(linkName))- count++;+ var linksPanel = new IssueLinksPanel("links") {++ @Override+ protected Issue getIssue() {+ return BoardCardPanel.this.getIssue();}- if (count != 0) {- AjaxLink<Void> link = new AjaxLink<Void>(linksView.newChildId()) {- @Override- public void onClick(AjaxRequestTarget target) {- if (linkName.equals(expandedLinkName.get()))- expandedLinkName.set(null);- else- expandedLinkName.set(linkName);- target.add(fragment);- }+ @Override+ protected List<String> getDisplayLinks() {+ return board.getDisplayLinks();+ }- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- if (linkName.equals(expandedLinkName.get()))- tag.put("class", tag.getAttribute("class") + " expanded");- }-- };- link.add(new Label("label", linkName));- linksView.add(link);+ @Override+ protected void onToggleExpand(AjaxRequestTarget target) {+ target.add(fragment);}- }- fragment.add(linksView);++ };+ fragment.add(linksPanel);- fragment.add(new ListView<Issue>("linkedIssues", new LoadableDetachableModel<List<Issue>>() {+ fragment.add(new ListView<Issue>("linkedIssues", new LoadableDetachableModel<>() {@Overrideprotected List<Issue> load() {Issue issue = issueModel.getObject();OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);- LinkSide side = new LinkSide(expandedLinkName.get());+ LinkSide side = new LinkSide(linksPanel.getExpandedLink());return issueModel.getObject().findLinkedIssues(side.getSpec(), side.isOpposite());}-+}) {@Override@@ -292,7 +268,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(expandedLinkName.get() != null);+ setVisible(linksPanel.getExpandedLink() != null);}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.cssindex a411b18ec2..5cf930a1fa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css@@ -92,9 +92,6 @@margin-top: 2px;margin-bottom: 0;}-.issue-boards>.body .board-card .link.expanded .icon {- transform: rotate(90deg);-}.issue-boards>.body .board-card .linked-issues {border-left: 2px dashed var(--secondary);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListCssResourceReference.javanew file mode 100644index 0000000000..e7342cf599--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListCssResourceReference.java@@ -0,0 +1,9 @@+package io.onedev.server.web.page.project.issues.list;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class ProjectIssueListCssResourceReference extends BaseDependentCssResourceReference {+ public ProjectIssueListCssResourceReference() {+ super(ProjectIssueListCssResourceReference.class, "project-issue-list.css");+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.htmlindex fa3293054d..353ce7ae3d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html@@ -1,6 +1,32 @@<wicket:extend>+ <div wicket:id="pinnedIssues" class="pinned-issues d-flex flex-wrap">+ <div wicket:id="pinnedIssues" class="card pinned-issue flex-grow-1">+ <div wicket:id="content" class="card-body"></div>+ </div>+ </div><div class="side-main side-main-wrap"><div wicket:id="savedQueries" class="side"></div><div wicket:id="issues" class="main"></div></div>+ <wicket:fragment wicket:id="pinnedIssueFrag">+ <div class="primary position-relative font-weight-bold mb-3">+ <wicket:container wicket:id="numberAndTitle"></wicket:container>+ <a wicket:id="copy" title="Copy issue number and title" class="copy ml-1 btn btn-icon btn-xs btn-light btn-hover-primary">+ <wicket:svg href="copy" class="icon"/>+ </a>+ <span wicket:id="links" class="links ml-3"/>+ <a wicket:id="unpin" class="unpin btn btn-icon btn-xs btn-light btn-hover-primary"><wicket:svg href="unpin" class="icon flip-x"/></a>+ </div>+ <div class="secondary d-flex flex-wrap">+ <div wicket:id="transit" class="state">+ <span wicket:id="state" class="mb-2 mr-2"></span>+ </div>+ <div wicket:id="fields" class="field"></div>+ </div>+ <wicket:enclosure child="linkedIssues">+ <div class="linked-issues pl-3">+ <div wicket:id="linkedIssues" class="linked-issue"><div wicket:id="content"></div></div>+ </div>+ </wicket:enclosure>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.javaindex 6652c9f32a..fbda4270a1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java@@ -1,40 +1,69 @@package io.onedev.server.web.page.project.issues.list;-import java.io.Serializable;-import java.util.ArrayList;--import javax.annotation.Nullable;--import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.model.IModel;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-+import com.google.common.collect.Sets;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.IssueLinkManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Issue;import io.onedev.server.model.IssueQueryPersonalization;import io.onedev.server.model.Project;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QueryPersonalization;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.ProjectIssueSetting;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.Input;+import io.onedev.server.util.LinkSide;+import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;+import io.onedev.server.web.behavior.ChangeObserver;+import io.onedev.server.web.behavior.ChangeObserver;+import io.onedev.server.web.component.issue.IssueStateBadge;+import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;+import io.onedev.server.web.component.issue.link.IssueLinksPanel;import io.onedev.server.web.component.issue.list.IssueListPanel;+import io.onedev.server.web.component.issue.operation.TransitionMenuLink;+import io.onedev.server.web.component.issue.title.IssueTitlePanel;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;import io.onedev.server.web.component.savedquery.PersonalQuerySupport;import io.onedev.server.web.component.savedquery.SaveQueryPanel;import io.onedev.server.web.component.savedquery.SavedQueriesPanel;+import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.issues.ProjectIssuesPage;+import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.NamedIssueQueriesBean;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+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.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.RepeatingView;+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.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;@SuppressWarnings("serial")public class ProjectIssueListPage extends ProjectIssuesPage {@@ -45,6 +74,14 @@ public class ProjectIssueListPage extends ProjectIssuesPage {private String query;+ private final IModel<List<Issue>> pinnedIssuesModel = new LoadableDetachableModel<>() {+ @Override+ protected List<Issue> load() {+ return getIssueManager().queryPinned(getProject());+ }++ };+private SavedQueriesPanel<NamedIssueQuery> savedQueries;private IssueListPanel issueList;@@ -58,11 +95,199 @@ public class ProjectIssueListPage extends ProjectIssuesPage {return OneDev.getInstance(IssueQueryPersonalizationManager.class);}+ private IssueManager getIssueManager() {+ return OneDev.getInstance(IssueManager.class);+ }+@Overrideprotected void onInitialize() {super.onInitialize();- add(savedQueries = new SavedQueriesPanel<NamedIssueQuery>("savedQueries") {+ add(new WebMarkupContainer("pinnedIssues") {+ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new ListView<>("pinnedIssues", pinnedIssuesModel) {++ @Override+ protected void populateItem(ListItem<Issue> item) {+ item.add(newContent("content", item.getModel().getObject().getId()));+ }++ private Component newContent(String componentId, Long issueId) {+ Issue issue = getIssueManager().load(issueId);++ Fragment fragment = new Fragment(componentId, "pinnedIssueFrag", ProjectIssueListPage.this);++ List<String> displayFields = issueList.getListFields();+ AjaxLink<Void> transitLink = new TransitionMenuLink("transit") {++ @Override+ protected Issue getIssue() {+ return getIssueManager().load(issueId);+ }++ };+ transitLink.setVisible(displayFields.contains(Issue.NAME_STATE));++ transitLink.add(new IssueStateBadge("state", new LoadableDetachableModel<>() {+ @Override+ protected Issue load() {+ return getIssueManager().load(issueId);+ }+ }));++ fragment.add(transitLink);++ RepeatingView fieldsView = new RepeatingView("fields");+ for (String fieldName: displayFields) {+ if (!fieldName.equals(Issue.NAME_STATE)) {+ Input field = issue.getFieldInputs().get(fieldName);+ if (field != null && !field.getValues().isEmpty()) {+ fieldsView.add(new FieldValuesPanel(fieldsView.newChildId(), Mode.AVATAR, true) {++ @Override+ protected Issue getIssue() {+ return getIssueManager().load(issueId);+ }++ @Override+ protected Input getField() {+ var issue = getIssueManager().load(issueId);+ if (issue.isFieldVisible(fieldName))+ return field;+ else+ return null;+ }++ @SuppressWarnings("deprecation")+ @Override+ protected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {+ return new AttachAjaxIndicatorListener(+ fieldsView.get(fieldsView.size()-1), AttachAjaxIndicatorListener.AttachMode.APPEND, false);+ }++ }.setOutputMarkupId(true));+ }+ }+ }++ fragment.add(fieldsView);+ fragment.add(new IssueTitlePanel("numberAndTitle") {++ @Override+ protected Issue getIssue() {+ return getIssueManager().load(issueId);+ }++ @Override+ protected Project getCurrentProject() {+ return getProject();+ }++ @Nullable+ @Override+ protected Cursor getCursor() {+ return null;+ }++ });++ fragment.add(new CopyToClipboardLink("copy",+ Model.of(issue.getTitle() + " (#" + issue.getNumber() + ")")));++ var linksPanel = new IssueLinksPanel("links") {++ @Override+ protected Issue getIssue() {+ return getIssueManager().load(issueId);+ }++ @Override+ protected List<String> getDisplayLinks() {+ return issueList.getListLinks();+ }++ @Override+ protected void onToggleExpand(AjaxRequestTarget target) {+ target.add(fragment);+ }+ };+ fragment.add(linksPanel);++ fragment.add(new Link<Void>("unpin") {++ @Override+ public void onClick() {+ getIssueManager().togglePin(getIssueManager().load(issueId));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManageIssues(getIssueManager().load(issueId).getProject()));+ }++ });++ fragment.add(new ListView<Issue>("linkedIssues", new LoadableDetachableModel<>() {++ @Override+ protected List<Issue> load() {+ Issue issue = getIssueManager().load(issueId);+ OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);+ LinkSide side = new LinkSide(linksPanel.getExpandedLink());+ return issue.findLinkedIssues(side.getSpec(), side.isOpposite());+ }++ }) {++ @Override+ protected void populateItem(ListItem<Issue> item) {+ item.add(newContent("content", item.getModel().getObject().getId()));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(linksPanel.getExpandedLink() != null);+ }++ });++ fragment.add(new ChangeObserver() {++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ Component content = newContent(componentId, issueId);+ fragment.replaceWith(content);+ handler.add(content);+ }++ @Override+ public Collection<String> findObservables() {+ return Sets.newHashSet(Issue.getDetailChangeObservable(issueId));+ }++ });++ fragment.setOutputMarkupId(true);++ return fragment;+ }++ });+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getPinnedIssues().isEmpty());+ }++ });++ add(savedQueries = new SavedQueriesPanel<>("savedQueries") {@Overrideprotected NamedQueriesBean<NamedIssueQuery> newNamedQueriesBean() {@@ -99,7 +324,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {elsereturn (ArrayList<NamedIssueQuery>) getIssueSetting().getNamedQueries();}-+});add(issueList = new IssueListPanel("issues", new IModel<String>() {@@ -246,6 +471,22 @@ public class ProjectIssueListPage extends ProjectIssuesPage {return paramsOf(project, query, page);}+ private List<Issue> getPinnedIssues() {+ return pinnedIssuesModel.getObject();+ }++ @Override+ protected void onDetach() {+ pinnedIssuesModel.detach();+ super.onDetach();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ProjectIssueListCssResourceReference()));+ }+@Overrideprotected Component newProjectTitle(String componentId) {return new Label(componentId, "Issues");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/project-issue-list.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/project-issue-list.cssnew file mode 100644index 0000000000..44dac1e2bc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/project-issue-list.css@@ -0,0 +1,46 @@+.pinned-issues {+ column-gap: 0.5rem;+}+.card.pinned-issue>.card-body {+ padding: 1.2rem 1.4rem;+ min-width: 480px;+}+.pinned-issue .primary {+ padding-right: 20px;+}+.pinned-issue .primary .number, .pinned-issue .primary .title {+ font-size: 1.2rem;+}+.pinned-issue.card {+ margin-bottom: 0.5rem;+}+.pinned-issue .unpin {+ position: absolute;+ top: 0;+ right: 0;+}+.pinned-issue .state {+ border-bottom: 2px dotted transparent;+ cursor: pointer;+}+.pinned-issue .state:hover {+ border-color: var(--gray);+}++.pinned-issue .linked-issues {+ border-left: 2px dashed var(--secondary);+}+.dark-mode .pinned-issue .linked-issues {+ border-left-color: var(--dark-mode-dark-gray);+}+.pinned-issue .linked-issue {+ margin-top: 0.7rem;+ padding-top: 1.2rem;+ border-top: 1px solid var(--light-gray);+}+.dark-mode .pinned-issue .linked-issue {+ border-top-color: var(--dark-mode-light-dark);+}+.pinned-issue .linked-issue .unpin {+ display: none;+}\ No newline at end of file