The Unified and Autonomous Development Platform
Some refactoring
Robin Shenc8b9090f2a7e
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex a7056a2a19..950f841824 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -100,6 +100,10 @@ import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;+import io.onedev.server.entitymanager.DashboardGroupShareManager;+import io.onedev.server.entitymanager.DashboardManager;+import io.onedev.server.entitymanager.DashboardUserShareManager;+import io.onedev.server.entitymanager.DashboardVisitManager;import io.onedev.server.entitymanager.EmailAddressManager;import io.onedev.server.entitymanager.GitLfsLockManager;import io.onedev.server.entitymanager.GpgKeyManager;@@ -148,6 +152,10 @@ import io.onedev.server.entitymanager.impl.DefaultCodeCommentQueryPersonalizatioimport io.onedev.server.entitymanager.impl.DefaultCodeCommentReplyManager;import io.onedev.server.entitymanager.impl.DefaultCodeCommentStatusChangeManager;import io.onedev.server.entitymanager.impl.DefaultCommitQueryPersonalizationManager;+import io.onedev.server.entitymanager.impl.DefaultDashboardGroupShareManager;+import io.onedev.server.entitymanager.impl.DefaultDashboardManager;+import io.onedev.server.entitymanager.impl.DefaultDashboardUserShareManager;+import io.onedev.server.entitymanager.impl.DefaultDashboardVisitManager;import io.onedev.server.entitymanager.impl.DefaultEmailAddressManager;import io.onedev.server.entitymanager.impl.DefaultGitLfsLockManager;import io.onedev.server.entitymanager.impl.DefaultGpgKeyManager;@@ -456,6 +464,10 @@ public class CoreModule extends AbstractPluginModule {bind(CodeCommentTextManager.class).to(DefaultCodeCommentTextManager.class);bind(PendingSuggestionApplyManager.class).to(DefaultPendingSuggestionApplyManager.class);bind(IssueAuthorizationManager.class).to(DefaultIssueAuthorizationManager.class);+ bind(DashboardManager.class).to(DefaultDashboardManager.class);+ bind(DashboardUserShareManager.class).to(DefaultDashboardUserShareManager.class);+ bind(DashboardGroupShareManager.class).to(DefaultDashboardGroupShareManager.class);+ bind(DashboardVisitManager.class).to(DefaultDashboardVisitManager.class);bind(WebHookManager.class);@@ -694,7 +706,7 @@ public class CoreModule extends AbstractPluginModule {contributeFromPackage(ExceptionHandler.class, UnauthenticatedExceptionHandler.class);contributeFromPackage(ExceptionHandler.class, ConstraintViolationExceptionHandler.class);contributeFromPackage(ExceptionHandler.class, PageExpiredExceptionHandler.class);-+bind(UrlManager.class).to(DefaultUrlManager.class);bind(CodeCommentEventBroadcaster.class);bind(PullRequestEventBroadcaster.class);diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.javaindex 48adb56b5e..6e73e880d6 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java@@ -11,7 +11,6 @@ import io.onedev.k8shelper.ExecuteCondition;import io.onedev.k8shelper.StepFacade;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;-import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.annotation.Editable;@Editable@@ -53,12 +52,4 @@ public abstract class Step implements Serializable {return getAction(name, build, jobToken, paramCombination);}- public static String getGroupedType(Class<? extends Step> stepClass) {- Editable editable = stepClass.getAnnotation(Editable.class);- if (editable != null && editable.group().length() != 0)- return editable.group() + " / " + EditableUtils.getDisplayName(stepClass);- else- return EditableUtils.getDisplayName(stepClass);- }-}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/DashboardGroupShareManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardGroupShareManager.javanew file mode 100644index 0000000000..b854165b6e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardGroupShareManager.java@@ -0,0 +1,13 @@+package io.onedev.server.entitymanager;++import java.util.Collection;++import io.onedev.server.model.Dashboard;+import io.onedev.server.model.DashboardGroupShare;+import io.onedev.server.persistence.dao.EntityManager;++public interface DashboardGroupShareManager extends EntityManager<DashboardGroupShare> {++ void syncShares(Dashboard dashboard, Collection<String> groupNames);++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/DashboardManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardManager.javanew file mode 100644index 0000000000..f37dee9e95--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardManager.java@@ -0,0 +1,22 @@+package io.onedev.server.entitymanager;++import java.util.Collection;+import java.util.List;++import javax.annotation.Nullable;++import io.onedev.server.model.Dashboard;+import io.onedev.server.model.User;+import io.onedev.server.persistence.dao.EntityManager;++public interface DashboardManager extends EntityManager<Dashboard> {++ List<Dashboard> queryAccessible(@Nullable User user);++ @Nullable+ Dashboard find(User owner, String name);++ void syncShares(Dashboard dashboard, boolean forEveryone,+ Collection<String> groupNames, Collection<String> userNames);++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/DashboardUserShareManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardUserShareManager.javanew file mode 100644index 0000000000..8436d352f7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardUserShareManager.java@@ -0,0 +1,13 @@+package io.onedev.server.entitymanager;++import java.util.Collection;++import io.onedev.server.model.Dashboard;+import io.onedev.server.model.DashboardUserShare;+import io.onedev.server.persistence.dao.EntityManager;++public interface DashboardUserShareManager extends EntityManager<DashboardUserShare> {++ void syncShares(Dashboard dashboard, Collection<String> userNames);++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/DashboardVisitManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardVisitManager.javanew file mode 100644index 0000000000..01ffe5ad5f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardVisitManager.java@@ -0,0 +1,8 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.DashboardVisit;+import io.onedev.server.persistence.dao.EntityManager;++public interface DashboardVisitManager extends EntityManager<DashboardVisit> {++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/MembershipManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/MembershipManager.javaindex 7b9f28cdd7..178307324a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/MembershipManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/MembershipManager.java@@ -1,6 +1,7 @@package io.onedev.server.entitymanager;import java.util.Collection;+import java.util.List;import io.onedev.server.model.Membership;import io.onedev.server.model.User;@@ -12,4 +13,6 @@ public interface MembershipManager extends EntityManager<Membership> {void syncMemberships(User user, Collection<String> groupNames);+ List<User> queryMembers(User user);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.javaindex a47bfb9f21..9478f0522e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java@@ -14,5 +14,7 @@ public interface MilestoneManager extends EntityManager<Milestone> {void delete(Milestone milestone);Milestone findInHierarchy(String milestoneFQN);-++ @Nullable+ Milestone findNextOpen(Project project);}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardGroupShareManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardGroupShareManager.javanew file mode 100644index 0000000000..35aa1db792--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardGroupShareManager.java@@ -0,0 +1,76 @@+package io.onedev.server.entitymanager.impl;++import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.collect.MapDifference;+import com.google.common.collect.Maps;++import io.onedev.server.entitymanager.DashboardGroupShareManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.model.Dashboard;+import io.onedev.server.model.DashboardGroupShare;+import io.onedev.server.model.Group;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultDashboardGroupShareManager extends BaseEntityManager<DashboardGroupShare>+ implements DashboardGroupShareManager {++ private static final Logger logger = LoggerFactory.getLogger(DefaultDashboardGroupShareManager.class);++ private final GroupManager groupManager;++ @Inject+ public DefaultDashboardGroupShareManager(Dao dao, GroupManager groupManager) {+ super(dao);+ this.groupManager = groupManager;+ }++ @Transactional+ @Override+ public void syncShares(Dashboard dashboard, Collection<String> groupNames) {+ Map<String, DashboardGroupShare> syncMap = new HashMap<>();+ for (String groupName: groupNames) {+ Group group = groupManager.find(groupName);+ if (group == null) {+ logger.warn("Unable to find group: " + groupName);+ } else {+ DashboardGroupShare share = new DashboardGroupShare();+ share.setGroup(group);+ share.setDashboard(dashboard);+ syncMap.put(groupName, share);+ }+ }++ Map<String, DashboardGroupShare> currentMap = new HashMap<>();+ dashboard.getGroupShares().forEach(share ->+ currentMap.put(share.getGroup().getName(), share));++ MapDifference<String, DashboardGroupShare> diff = Maps.difference(currentMap, syncMap);++ diff.entriesOnlyOnLeft().values().forEach(share -> delete(share));+ diff.entriesOnlyOnRight().values().forEach(share -> save(share));+ }++ @Override+ public List<DashboardGroupShare> query() {+ return query(true);+ }++ @Override+ public int count() {+ return count(true);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardManager.javanew file mode 100644index 0000000000..c96c752d7b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardManager.java@@ -0,0 +1,111 @@+package io.onedev.server.entitymanager.impl;++import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;+import javax.persistence.criteria.Subquery;++import org.hibernate.criterion.Restrictions;+import org.hibernate.query.Query;++import io.onedev.server.entitymanager.DashboardGroupShareManager;+import io.onedev.server.entitymanager.DashboardManager;+import io.onedev.server.entitymanager.DashboardUserShareManager;+import io.onedev.server.model.Dashboard;+import io.onedev.server.model.DashboardGroupShare;+import io.onedev.server.model.DashboardUserShare;+import io.onedev.server.model.Group;+import io.onedev.server.model.User;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;++@Singleton+public class DefaultDashboardManager extends BaseEntityManager<Dashboard> implements DashboardManager {++ private final DashboardGroupShareManager groupShareManager;++ private final DashboardUserShareManager userShareManager;++ @Inject+ public DefaultDashboardManager(Dao dao, DashboardGroupShareManager groupShareManager,+ DashboardUserShareManager userShareManager) {+ super(dao);+ this.groupShareManager = groupShareManager;+ this.userShareManager = userShareManager;+ }++ @Override+ public List<Dashboard> query() {+ return query(true);+ }++ @Override+ public int count() {+ return count(true);+ }++ @Sessional+ @Override+ public List<Dashboard> queryAccessible(User user) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Dashboard> criteriaQuery = builder.createQuery(Dashboard.class);+ Root<Dashboard> root = criteriaQuery.from(Dashboard.class);++ if (user != null) {+ List<Predicate> predicates = new ArrayList<>();+ predicates.add(builder.equal(root.get(Dashboard.PROP_OWNER), user));++ Subquery<DashboardUserShare> userShareQuery = criteriaQuery.subquery(DashboardUserShare.class);+ Root<DashboardUserShare> userShareRoot = userShareQuery.from(DashboardUserShare.class);+ userShareQuery.select(userShareRoot);++ predicates.add(builder.exists(userShareQuery.where(+ builder.equal(userShareRoot.get(DashboardUserShare.PROP_DASHBOARD), root),+ builder.equal(userShareRoot.get(DashboardUserShare.PROP_USER), user))));++ for (Group group: user.getGroups()) {+ Subquery<DashboardGroupShare> groupShareQuery = criteriaQuery.subquery(DashboardGroupShare.class);+ Root<DashboardGroupShare> groupShareRoot = groupShareQuery.from(DashboardGroupShare.class);+ groupShareQuery.select(groupShareRoot);++ predicates.add(builder.exists(groupShareQuery.where(+ builder.equal(groupShareRoot.get(DashboardGroupShare.PROP_DASHBOARD), root),+ builder.equal(groupShareRoot.get(DashboardGroupShare.PROP_GROUP), group))));+ }+ criteriaQuery.where(builder.or(predicates.toArray(new Predicate[0])));+ } else {+ criteriaQuery.where(builder.equal(root.get(Dashboard.PROP_FOR_EVERYONE), true));+ }++ Query<Dashboard> query = getSession().createQuery(criteriaQuery);+ return query.getResultList();+ }++ @Override+ public Dashboard find(User owner, String name) {+ EntityCriteria<Dashboard> criteria = EntityCriteria.of(Dashboard.class);+ criteria.add(Restrictions.eq(Dashboard.PROP_OWNER, owner));+ criteria.add(Restrictions.eq(Dashboard.PROP_NAME, name));+ return find(criteria);+ }++ @Transactional+ @Override+ public void syncShares(Dashboard dashboard, boolean forEveryone,+ Collection<String> groupNames, Collection<String> userNames) {+ dashboard.setForEveryone(forEveryone);+ groupShareManager.syncShares(dashboard, groupNames);+ userShareManager.syncShares(dashboard, userNames);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardUserShareManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardUserShareManager.javanew file mode 100644index 0000000000..d6b482e5de--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardUserShareManager.java@@ -0,0 +1,76 @@+package io.onedev.server.entitymanager.impl;++import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.collect.MapDifference;+import com.google.common.collect.Maps;++import io.onedev.server.entitymanager.DashboardUserShareManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.Dashboard;+import io.onedev.server.model.DashboardUserShare;+import io.onedev.server.model.User;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultDashboardUserShareManager extends BaseEntityManager<DashboardUserShare>+ implements DashboardUserShareManager {++ private static final Logger logger = LoggerFactory.getLogger(DefaultDashboardUserShareManager.class);++ private final UserManager userManager;++ @Inject+ public DefaultDashboardUserShareManager(Dao dao, UserManager userManager) {+ super(dao);+ this.userManager = userManager;+ }++ @Override+ public List<DashboardUserShare> query() {+ return query(true);+ }++ @Override+ public int count() {+ return count(true);+ }++ @Transactional+ @Override+ public void syncShares(Dashboard dashboard, Collection<String> userNames) {+ Map<String, DashboardUserShare> syncMap = new HashMap<>();+ for (String userName: userNames) {+ User user = userManager.findByName(userName);+ if (user == null) {+ logger.warn("Unable to find user: " + userName);+ } else {+ DashboardUserShare share = new DashboardUserShare();+ share.setUser(user);+ share.setDashboard(dashboard);+ syncMap.put(userName, share);+ }+ }++ Map<String, DashboardUserShare> currentMap = new HashMap<>();+ dashboard.getUserShares().forEach(share ->+ currentMap.put(share.getUser().getName(), share));++ MapDifference<String, DashboardUserShare> diff = Maps.difference(currentMap, syncMap);++ diff.entriesOnlyOnLeft().values().forEach(share -> delete(share));+ diff.entriesOnlyOnRight().values().forEach(share -> save(share));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardVisitManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardVisitManager.javanew file mode 100644index 0000000000..a60fbe9e71--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardVisitManager.java@@ -0,0 +1,32 @@+package io.onedev.server.entitymanager.impl;++import java.util.List;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.entitymanager.DashboardVisitManager;+import io.onedev.server.model.DashboardVisit;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultDashboardVisitManager extends BaseEntityManager<DashboardVisit>+ implements DashboardVisitManager {++ @Inject+ public DefaultDashboardVisitManager(Dao dao) {+ super(dao);+ }++ @Override+ public List<DashboardVisit> query() {+ return query(true);+ }++ @Override+ public int count() {+ return count(true);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.javaindex b508958f9f..11c7df87a9 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java@@ -1,5 +1,6 @@package io.onedev.server.entitymanager.impl;+import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;import java.util.List;@@ -7,7 +8,13 @@ import java.util.Map;import javax.inject.Inject;import javax.inject.Singleton;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;+import javax.persistence.criteria.Subquery;+import org.hibernate.query.Query;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -19,6 +26,7 @@ import io.onedev.server.entitymanager.MembershipManager;import io.onedev.server.model.Group;import io.onedev.server.model.Membership;import io.onedev.server.model.User;+import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;@@ -78,4 +86,28 @@ public class DefaultMembershipManager extends BaseEntityManager<Membership> impldiff.entriesOnlyOnRight().values().forEach(membership -> save(membership));}+ @Sessional+ @Override+ public List<User> queryMembers(User user) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<User> criteriaQuery = builder.createQuery(User.class);+ Root<User> root = criteriaQuery.from(User.class);++ List<Predicate> predicates = new ArrayList<>();+ for (Group group: user.getGroups()) {++ Subquery<Membership> membershipQuery = criteriaQuery.subquery(Membership.class);+ Root<Membership> membershipRoot = membershipQuery.from(Membership.class);+ membershipQuery.select(membershipRoot);++ predicates.add(builder.exists(membershipQuery.where(+ builder.equal(membershipRoot.get(Membership.PROP_USER), root),+ builder.equal(membershipRoot.get(Membership.PROP_GROUP), group))));+ }++ criteriaQuery.where(builder.or(predicates.toArray(new Predicate[0])));+ Query<User> query = getSession().createQuery(criteriaQuery);+ return query.getResultList();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.javaindex b66ded16ee..bb46caee7b 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java@@ -5,6 +5,7 @@ import java.util.List;import javax.inject.Inject;import javax.inject.Singleton;+import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import io.onedev.commons.utils.StringUtils;@@ -64,5 +65,15 @@ public class DefaultMilestoneManager extends BaseEntityManager<Milestone> implempublic int count() {return count(true);}++ @Sessional+ @Override+ public Milestone findNextOpen(Project project) {+ EntityCriteria<Milestone> criteria = EntityCriteria.of(Milestone.class);+ criteria.add(Restrictions.in("project", project.getSelfAndAncestors()));+ criteria.add(Restrictions.eq(Milestone.PROP_CLOSED, false));+ criteria.addOrder(Order.asc(Milestone.PROP_DUE_DATE));+ return find(criteria);+ }}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.javaindex d889b901b8..6e5d4be2cf 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.java@@ -15,6 +15,8 @@ import io.onedev.server.util.NameAndEmail;public interface CommitInfoManager {+ int getFileCount(Project project);+List<String> getFiles(Project project);int getCommitCount(Project project, User user, String path);diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.javaindex 20b92008d1..07a1a1f95e 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java@@ -91,7 +91,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManager imprivate static final Logger logger = LoggerFactory.getLogger(DefaultCommitInfoManager.class);- private static final int INFO_VERSION = 14;+ private static final int INFO_VERSION = 15;private static final long LOG_FILE_SIZE = 256*1024;@@ -145,6 +145,8 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManager imprivate static final ByteIterable FILES_KEY = new StringByteIterable("files");+ private static final ByteIterable FILE_COUNT_KEY = new StringByteIterable("fileCount");+private static final ByteIterable OVERALL_CONTRIBUTIONS_KEY = new StringByteIterable("overallContributions");private static final ByteIterable COMMIT_COUNT_KEY = new StringByteIterable("commitCount");@@ -163,6 +165,8 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManager imprivate final Map<Long, List<String>> filesCache = new ConcurrentHashMap<>();+ private final Map<Long, Integer> fileCountCache = new ConcurrentHashMap<>();+private final Map<Long, Integer> totalCommitCountCache = new ConcurrentHashMap<>();private final Map<Long, List<NameAndEmail>> usersCache = new ConcurrentHashMap<>();@@ -591,6 +595,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManager imbyte[] bytesOfFiles = SerializationUtils.serialize((Serializable) files);defaultStore.put(txn, FILES_KEY, new ArrayByteIterable(bytesOfFiles));+ writeInt(defaultStore, txn, FILE_COUNT_KEY, files.size());defaultStore.put(txn, LAST_COMMIT_OF_FILES_KEY, new CommitByteIterable(commitId));filesCache.remove(project.getId());}@@ -624,6 +629,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManager imif (filesChanged) {bytesOfFiles = SerializationUtils.serialize((Serializable) files);defaultStore.put(txn, FILES_KEY, new ArrayByteIterable(bytesOfFiles));+ writeInt(defaultStore, txn, FILE_COUNT_KEY, files.size());defaultStore.put(txn, LAST_COMMIT_OF_FILES_KEY, new CommitByteIterable(commitId));filesCache.remove(project.getId());}@@ -1122,6 +1128,26 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManager imreturn commitCount;}+ @Override+ public int getFileCount(Project project) {+ Integer fileCount = fileCountCache.get(project.getId());+ if (fileCount == null) {+ Environment env = getEnv(project.getId().toString());+ Store store = getStore(env, DEFAULT_STORE);++ fileCount = env.computeInReadonlyTransaction(new TransactionalComputable<Integer>() {++ @Override+ public Integer compute(Transaction txn) {+ return readInt(store, txn, FILE_COUNT_KEY, 0);+ }++ });+ fileCountCache.put(project.getId(), fileCount);+ }+ return fileCount;+ }+static class CollectingWork extends Prioritized {private final String refName;diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 439297aa0b..5605feea50 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -4330,4 +4330,7 @@ public class DataMigrator {}}+ private void migrate98(File dataDir, Stack<Integer> versions) {+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/Dashboard.java b/server-core/src/main/java/io/onedev/server/model/Dashboard.javanew file mode 100644index 0000000000..4060cf4f98--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/Dashboard.java@@ -0,0 +1,124 @@+package io.onedev.server.model;++import static io.onedev.server.model.Dashboard.PROP_NAME;++import java.util.ArrayList;+import java.util.Collection;++import javax.persistence.CascadeType;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.Lob;+import javax.persistence.ManyToOne;+import javax.persistence.OneToMany;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;++import io.onedev.server.model.support.Widget;++@Entity+@Table(+ indexes={@Index(columnList="o_owner_id"), @Index(columnList=PROP_NAME)},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_owner_id", PROP_NAME})})+public class Dashboard extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public static final String PROP_OWNER = "owner";++ public static final String PROP_NAME = "name";++ public static final String PROP_FOR_EVERYONE = "forEveryone";++ public static final int COLUMNS = 16;++ public static final int CELL_HEIGHT = 50;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private User owner;++ @Column(nullable=false)+ private String name;++ private boolean forEveryone;++ @Lob+ @Column(nullable=false, length=65535)+ private ArrayList<Widget> widgets = new ArrayList<>();++ @OneToMany(mappedBy="dashboard", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+ private Collection<DashboardVisit> visits = new ArrayList<>();++ @OneToMany(mappedBy="dashboard", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+ private Collection<DashboardUserShare> userShares = new ArrayList<>();++ @OneToMany(mappedBy="dashboard", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+ private Collection<DashboardGroupShare> groupShares = new ArrayList<>();++ public User getOwner() {+ return owner;+ }++ public void setOwner(User owner) {+ this.owner = owner;+ }++ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ public boolean isForEveryone() {+ return forEveryone;+ }++ public void setForEveryone(boolean forEveryone) {+ this.forEveryone = forEveryone;+ }++ public ArrayList<Widget> getWidgets() {+ return widgets;+ }++ public void setWidgets(ArrayList<Widget> widgets) {+ this.widgets = widgets;+ }++ public Collection<DashboardUserShare> getUserShares() {+ return userShares;+ }++ public void setUserShares(Collection<DashboardUserShare> userShares) {+ this.userShares = userShares;+ }++ public Collection<DashboardGroupShare> getGroupShares() {+ return groupShares;+ }++ public void setGroupShares(Collection<DashboardGroupShare> groupShares) {+ this.groupShares = groupShares;+ }++ public Collection<DashboardVisit> getVisits() {+ return visits;+ }++ public void setVisits(Collection<DashboardVisit> visits) {+ this.visits = visits;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/DashboardGroupShare.java b/server-core/src/main/java/io/onedev/server/model/DashboardGroupShare.javanew file mode 100644index 0000000000..4d7bd1123a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/DashboardGroupShare.java@@ -0,0 +1,52 @@+package io.onedev.server.model;++import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;++@Entity+@Table(+ indexes={@Index(columnList="o_group_id"), @Index(columnList="o_dashboard_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_group_id", "o_dashboard_id"})+})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+public class DashboardGroupShare extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public static String PROP_DASHBOARD = "dashboard";++ public static String PROP_GROUP = "group";++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Dashboard dashboard;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Group group;++ public Dashboard getDashboard() {+ return dashboard;+ }++ public void setDashboard(Dashboard dashboard) {+ this.dashboard = dashboard;+ }++ public Group getGroup() {+ return group;+ }++ public void setGroup(Group group) {+ this.group = group;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/DashboardUserShare.java b/server-core/src/main/java/io/onedev/server/model/DashboardUserShare.javanew file mode 100644index 0000000000..e0c41911b0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/DashboardUserShare.java@@ -0,0 +1,52 @@+package io.onedev.server.model;++import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;++@Entity+@Table(+ indexes={@Index(columnList="o_user_id"), @Index(columnList="o_dashboard_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_dashboard_id"})+})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+public class DashboardUserShare extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public static String PROP_DASHBOARD = "dashboard";++ public static String PROP_USER = "user";++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Dashboard dashboard;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private User user;++ public Dashboard getDashboard() {+ return dashboard;+ }++ public void setDashboard(Dashboard dashboard) {+ this.dashboard = dashboard;+ }++ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/DashboardVisit.java b/server-core/src/main/java/io/onedev/server/model/DashboardVisit.javanew file mode 100644index 0000000000..6cb3f549b6--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/DashboardVisit.java@@ -0,0 +1,66 @@+package io.onedev.server.model;++import java.util.Date;++import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;++@Entity+@Table(+ indexes={@Index(columnList="o_user_id"), @Index(columnList="o_dashboard_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_user_id", "o_dashboard_id"})+})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+public class DashboardVisit extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public static String PROP_DASHBOARD = "dashboard";++ public static String PROP_USER = "user";++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Dashboard dashboard;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private User user;++ @Column(nullable=false)+ private Date date = new Date();++ public Dashboard getDashboard() {+ return dashboard;+ }++ public void setDashboard(Dashboard dashboard) {+ this.dashboard = dashboard;+ }++ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++ public Date getDate() {+ return date;+ }++ public void setDate(Date date) {+ this.date = date;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/Group.java b/server-core/src/main/java/io/onedev/server/model/Group.javaindex 20a09b13a5..23a7ecd73d 100644--- a/server-core/src/main/java/io/onedev/server/model/Group.java+++ b/server-core/src/main/java/io/onedev/server/model/Group.java@@ -44,6 +44,10 @@ public class Group extends AbstractEntity implements Permission {@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<GroupAuthorization> authorizations = new ArrayList<>();+ @OneToMany(mappedBy="group", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+ private Collection<DashboardGroupShare> dashboardShares = new ArrayList<>();+@OneToMany(mappedBy="group", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<Membership> memberships = new ArrayList<>();@@ -112,6 +116,14 @@ public class Group extends AbstractEntity implements Permission {this.authorizations = authorizations;}+ public Collection<DashboardGroupShare> getDashboardShares() {+ return dashboardShares;+ }++ public void setDashboardShares(Collection<DashboardGroupShare> dashboardShares) {+ this.dashboardShares = dashboardShares;+ }+public Collection<Membership> getMemberships() {return memberships;}diff --git a/server-core/src/main/java/io/onedev/server/model/Membership.java b/server-core/src/main/java/io/onedev/server/model/Membership.javaindex 867007ef64..214ecef662 100644--- a/server-core/src/main/java/io/onedev/server/model/Membership.java+++ b/server-core/src/main/java/io/onedev/server/model/Membership.java@@ -20,6 +20,10 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;public class Membership extends AbstractEntity {private static final long serialVersionUID = 1L;++ public static final String PROP_USER = "user";++ public static final String PROP_GROUP = "group";@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex 761707ef74..ed7f7d8ea4 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -128,6 +128,18 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<UserAuthorization> projectAuthorizations = new ArrayList<>();+ @OneToMany(mappedBy="owner", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+ private Collection<Dashboard> dashboards = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+ private Collection<DashboardVisit> dashboardVisits = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+ private Collection<DashboardUserShare> dashboardShares = new ArrayList<>();+@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<IssueAuthorization> issueAuthorizations = new ArrayList<>();@@ -657,6 +669,39 @@ public class User extends AbstractEntity implements AuthenticationInfo {}}+ public Collection<Dashboard> getDashboards() {+ return dashboards;+ }++ public void setDashboards(Collection<Dashboard> dashboards) {+ this.dashboards = dashboards;+ }++ public Collection<DashboardVisit> getDashboardVisits() {+ return dashboardVisits;+ }++ public void setDashboardVisits(Collection<DashboardVisit> dashboardVisits) {+ this.dashboardVisits = dashboardVisits;+ }++ @Nullable+ public DashboardVisit getDashboardVisit(Dashboard dashboard) {+ for (DashboardVisit visit: getDashboardVisits()) {+ if (visit.getDashboard().equals(dashboard))+ return visit;+ }+ return null;+ }++ public Collection<DashboardUserShare> getDashboardShares() {+ return dashboardShares;+ }++ public void setDashboardShares(Collection<DashboardUserShare> dashboardShares) {+ this.dashboardShares = dashboardShares;+ }+public Collection<PullRequestReview> getPullRequestReviews() {return pullRequestReviews;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/Widget.java b/server-core/src/main/java/io/onedev/server/model/support/Widget.javanew file mode 100644index 0000000000..dd559c8fd4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/Widget.java@@ -0,0 +1,114 @@+package io.onedev.server.model.support;++import java.io.Serializable;++import org.apache.wicket.Component;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.basic.Label;+import org.hibernate.validator.constraints.NotEmpty;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import org.unbescape.html.HtmlEscape;++import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public abstract class Widget implements Serializable {++ private static final long serialVersionUID = 1L;++ private static final Logger logger = LoggerFactory.getLogger(Widget.class);++ private String title;++ private int left;++ private int top;++ private int right;++ private int bottom;++ @Editable(order=10)+ @NotEmpty+ public String getTitle() {+ return title;+ }++ public void setTitle(String title) {+ this.title = title;+ }++ public int getLeft() {+ return left;+ }++ public void setLeft(int left) {+ this.left = left;+ }++ public int getTop() {+ return top;+ }++ public void setTop(int top) {+ this.top = top;+ }++ public int getRight() {+ return right;+ }++ public void setRight(int right) {+ this.right = right;+ }++ public int getBottom() {+ return bottom;+ }++ public void setBottom(int bottom) {+ this.bottom = bottom;+ }++ public int getDefaultWidth() {+ return 12;+ }++ public int getDefaultHeight() {+ return 12;+ }++ public Component render(String componentId, boolean failsafe) {+ if (failsafe) {+ return new Label(componentId, "Not rendered in failsafe mode")+ .add(AttributeAppender.append("class", "text-info font-italic"));+ } else {+ try {+ return doRender(componentId);+ } catch (Exception e) {+ logger.error("Error rendering widget '" + getTitle() + "'", e);+ ExplicitException explicitException = ExceptionUtils.find(e, ExplicitException.class);++ String message;+ if (explicitException != null)+ message = HtmlEscape.escapeHtml5(explicitException.getMessage());+ else+ message = "Error rendering widget, check server log for details";++ message = "<div class='alert alert-notice alert-light-danger mb-0'>" + message + "</div>";++ return new Label(componentId, message).setEscapeModelStrings(false);+ }+ }+ }++ protected abstract Component doRender(String componentId);++ public boolean isIntersectedWith(Widget widget) {+ return !(widget.left >= right || widget.right <= left || widget.top >= bottom || widget.bottom <= top);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/WebApplication.java b/server-core/src/main/java/io/onedev/server/web/WebApplication.javaindex ba43fc4247..e1c6172dbf 100644--- a/server-core/src/main/java/io/onedev/server/web/WebApplication.java+++ b/server-core/src/main/java/io/onedev/server/web/WebApplication.java@@ -65,8 +65,8 @@ import io.onedev.server.util.usage.InUseException;import io.onedev.server.web.component.svg.SpriteImageResolver;import io.onedev.server.web.mapper.BaseResourceMapper;import io.onedev.server.web.mapper.BaseUrlMapper;+import io.onedev.server.web.page.HomePage;import io.onedev.server.web.page.base.BasePage;-import io.onedev.server.web.page.layout.MainMenuCustomization;import io.onedev.server.web.page.simple.error.GeneralErrorPage;import io.onedev.server.web.page.simple.error.InUseErrorPage;import io.onedev.server.web.resource.SpriteResourceReference;@@ -80,13 +80,9 @@ public class WebApplication extends org.apache.wicket.protocol.http.WebApplicatiprivate final Set<WebApplicationConfigurator> applicationConfigurators;- private final MainMenuCustomization uiCustomization;-@Inject- public WebApplication(Set<WebApplicationConfigurator> applicationConfigurators,- MainMenuCustomization uiCustomization) {+ public WebApplication(Set<WebApplicationConfigurator> applicationConfigurators) {this.applicationConfigurators = applicationConfigurators;- this.uiCustomization = uiCustomization;}@Override@@ -286,7 +282,7 @@ public class WebApplication extends org.apache.wicket.protocol.http.WebApplicati@Overridepublic Class<? extends Page> getHomePage() {- return uiCustomization.getHomePage();+ return HomePage.class;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.cssindex 39b43906c6..f0446029cc 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css@@ -357,14 +357,15 @@ pre code {}.card {- box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1);+ box-shadow: 0px 0px 4px 0px rgba(0,0,0,0.1);border: none;border-radius: 0.42rem;}.dark-mode .card {- box-shadow: 0 0 30px rgb(0 0 0 / 50%);+ box-shadow: 0 0 12px rgb(0 0 0 / 50%);background-color: var(--dark-mode-dark);}+.card-header:first-child {border-radius: calc(0.42rem - 1px) calc(0.42rem - 1px) 0 0;}@@ -2582,10 +2583,10 @@ h6, .h6 {}.shadow {- box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1) !important;+ box-shadow: 0px 0px 4px 0px rgba(0,0,0,0.1) !important;}.dark-mode .shadow {- box-shadow: 0 0 30px rgb(0 0 0 / 50%) !important;+ box-shadow: 0 0 12px rgb(0 0 0 / 50%) !important;}.popover {diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/dashboard.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/dashboard.svgnew file mode 100644index 0000000000..06816db718--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/dashboard.svg@@ -0,0 +1,63 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<svg+ xmlns:dc="http://purl.org/dc/elements/1.1/"+ xmlns:cc="http://creativecommons.org/ns#"+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"+ xmlns:svg="http://www.w3.org/2000/svg"+ xmlns="http://www.w3.org/2000/svg"+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"+ inkscape:version="1.0 (4035a4f, 2020-05-01)"+ sodipodi:docname="dashboard.svg"+ id="svg839"+ height="200"+ width="200"+ p-id="2258"+ version="1.1"+ viewBox="0 0 1024 1024"+ class="icon"+ t="1659153202055">+ <metadata+ id="metadata843">+ <rdf:RDF>+ <cc:Work+ rdf:about="">+ <dc:format>image/svg+xml</dc:format>+ <dc:type+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />+ </cc:Work>+ </rdf:RDF>+ </metadata>+ <sodipodi:namedview+ inkscape:current-layer="svg839"+ inkscape:window-maximized="1"+ inkscape:window-y="25"+ inkscape:window-x="58"+ inkscape:cy="100"+ inkscape:cx="100"+ inkscape:zoom="3.34"+ showgrid="false"+ id="namedview841"+ inkscape:window-height="1027"+ inkscape:window-width="1862"+ inkscape:pageshadow="2"+ inkscape:pageopacity="0"+ guidetolerance="10"+ gridtolerance="10"+ objecttolerance="10"+ borderopacity="1"+ bordercolor="#666666"+ pagecolor="#ffffff" />+ <defs+ id="defs835">+ <style+ id="style833"+ type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }+</style>+ </defs>+ <path+ style="stroke-width:1.0479"+ id="path837"+ p-id="2259"+ d="M 271.54916,151.23469 A 435.94492,435.94499 0 1 1 755.89831,876.21602 435.95418,435.95423 0 0 1 271.61623,151.16762 Z m 37.22151,669.18257 A 368.86186,368.86191 0 0 0 513.72375,882.58727 369.26426,369.26431 0 0 0 882.5856,513.72535 368.86186,368.86191 0 1 0 308.77067,820.41726 Z M 701.10556,278.99505 748.45401,326.41056 604.26256,470.60204 A 101.53761,101.53763 0 1 1 556.84704,423.18652 L 701.0385,278.99505 Z M 495.01238,541.62472 a 33.555691,33.555696 0 1 0 37.28859,-55.79874 33.555691,33.555696 0 0 0 -37.28859,55.79874 z m 287.444,-164.24415 -51.17121,51.17121 c 11.13292,27.02752 16.96765,55.93289 17.10178,85.17357 a 232.24884,232.24887 0 0 1 -33.53289,119.17593 l 49.29335,49.29336 a 300.25356,300.2536 0 0 0 18.37603,-304.81407 z m -186.04053,-82.1556 a 226.21292,226.21296 0 0 0 -82.6921,-16.22992 234.73028,234.73031 0 0 0 -234.73029,234.7303 c 0.20121,42.05026 11.73652,83.1616 33.5329,119.17593 l -49.22629,49.29336 A 301.79607,301.79611 0 0 1 647.85533,243.65136 Z" />+</svg>diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/refresh2.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/refresh2.svgnew file mode 100644index 0000000000..da7f659d52--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/refresh2.svg@@ -0,0 +1,2 @@+<?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="1661335615183" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7048" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }+</style></defs><path d="M132.650667 563.114667A46.506667 46.506667 0 0 1 85.333333 515.84c0-182.954667 149.845333-334.336 334.378667-334.336h410.026667c26.837333 0 47.36 20.48 47.36 47.317333a46.506667 46.506667 0 0 1-47.36 47.317334h-410.026667c-132.48 0-239.786667 108.8-239.786667 239.701333A46.506667 46.506667 0 0 1 132.693333 563.2z" p-id="7049"></path><path d="M708.309333 416.426667a43.093333 43.093333 0 0 1-29.952-12.586667 42.837333 42.837333 0 0 1 0-61.525333L790.314667 230.4 678.4 118.357333a42.837333 42.837333 0 0 1 0-61.482666 42.837333 42.837333 0 0 1 61.482667 0l143.530666 143.488a42.837333 42.837333 0 0 1 0 61.525333L739.84 405.418667c-9.429333 6.314667-20.48 11.050667-31.530667 11.050666zM561.621333 851.754667h-410.026666a46.506667 46.506667 0 0 1-47.36-47.317334c0-26.794667 20.522667-47.317333 47.36-47.317333h410.026666a239.616 239.616 0 0 0 239.786667-239.744c0-26.794667 20.48-47.274667 47.274667-47.274667 26.794667 0 47.317333 20.48 47.317333 47.274667a334.506667 334.506667 0 0 1-334.378667 334.378667z" p-id="7050"></path><path d="M273.024 990.549333a43.093333 43.093333 0 0 1-29.994667-12.629333l-143.488-143.530667a42.837333 42.837333 0 0 1 0-61.482666l143.488-143.530667a42.837333 42.837333 0 0 1 61.525334 0 42.837333 42.837333 0 0 1 0 61.525333l-111.957334 111.957334 111.957334 112a42.837333 42.837333 0 0 1 0 61.482666c-9.472 9.472-20.48 14.208-31.573334 14.208z" p-id="7051"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/share.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/share.svgnew file mode 100644index 0000000000..2e7c1b6b64--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/share.svg@@ -0,0 +1,2 @@+<?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="1659183005123" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2260" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }+</style></defs><path d="M736 608a127.776 127.776 0 0 0-115.232 73.28l-204.896-117.056a30.848 30.848 0 0 0-9.696-3.2A127.68 127.68 0 0 0 416 512c0-6.656-0.992-13.088-1.984-19.456 0.608-0.32 1.28-0.416 1.856-0.768l219.616-125.472A127.328 127.328 0 0 0 736 416c70.592 0 128-57.408 128-128s-57.408-128-128-128-128 57.408-128 128c0 6.72 0.992 13.152 1.984 19.616-0.608 0.288-1.28 0.256-1.856 0.608l-219.616 125.472A127.328 127.328 0 0 0 288 384c-70.592 0-128 57.408-128 128s57.408 128 128 128a126.912 126.912 0 0 0 84.544-32.64 31.232 31.232 0 0 0 11.584 12.416l224 128c0.352 0.224 0.736 0.256 1.12 0.448C615.488 812.992 669.6 864 736 864c70.592 0 128-57.408 128-128s-57.408-128-128-128" p-id="2261"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/widget.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/widget.svgnew file mode 100644index 0000000000..d0b993bd01--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/widget.svg@@ -0,0 +1,2 @@+<?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="1659237219878" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1843" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }+</style></defs><path d="M426.666667 128H170.666667a42.666667 42.666667 0 0 0-42.666667 42.666667v256a42.666667 42.666667 0 0 0 42.666667 42.666666h256a42.666667 42.666667 0 0 0 42.666666-42.666666V170.666667a42.666667 42.666667 0 0 0-42.666666-42.666667zM384 384H213.333333V213.333333h170.666667v170.666667zM128 853.333333a42.666667 42.666667 0 0 0 42.666667 42.666667h256a42.666667 42.666667 0 0 0 42.666666-42.666667v-256a42.666667 42.666667 0 0 0-42.666666-42.666666H170.666667a42.666667 42.666667 0 0 0-42.666667 42.666666v256z m85.333333-213.333333h170.666667v170.666667H213.333333v-170.666667z m640 256a42.666667 42.666667 0 0 0 42.666667-42.666667v-256a42.666667 42.666667 0 0 0-42.666667-42.666666h-256a42.666667 42.666667 0 0 0-42.666666 42.666666v256a42.666667 42.666667 0 0 0 42.666666 42.666667h256z m-213.333333-256h170.666667v170.666667h-170.666667v-170.666667z m115.498667-542.165333a42.624 42.624 0 0 0-60.330667 0l-170.666667 170.666666a42.624 42.624 0 0 0 0 60.330667l170.666667 170.666667a42.538667 42.538667 0 0 0 60.330667 0l170.666666-170.666667a42.624 42.624 0 0 0 0-60.330667l-170.666666-170.666666zM725.333333 409.002667L614.997333 298.666667 725.333333 188.330667 835.669333 298.666667 725.333333 409.002667z" fill="" p-id="1844"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_444444_256x240.png b/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_444444_256x240.pngnew file mode 100644index 0000000000..56d546beb3Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_444444_256x240.png differdiff --git a/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_555555_256x240.png b/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_555555_256x240.pngnew file mode 100644index 0000000000..607e4362a6Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_555555_256x240.png differdiff --git a/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_777620_256x240.png b/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_777620_256x240.pngnew file mode 100644index 0000000000..b0482f8695Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_777620_256x240.png differdiff --git a/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_777777_256x240.png b/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_777777_256x240.pngnew file mode 100644index 0000000000..96c5d2222fBinary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_777777_256x240.png differdiff --git a/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_cc0000_256x240.png b/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_cc0000_256x240.pngnew file mode 100644index 0000000000..1f96135a16Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_cc0000_256x240.png differdiff --git a/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_ffffff_256x240.png b/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_ffffff_256x240.pngnew file mode 100644index 0000000000..d5cdbf43caBinary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/asset/jqueryui/images/ui-icons_ffffff_256x240.png differdiff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CtrlAwareOnClickAjaxBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CtrlAwareOnClickAjaxBehavior.javaindex 5112f28e0d..ce13237de4 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CtrlAwareOnClickAjaxBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CtrlAwareOnClickAjaxBehavior.java@@ -2,13 +2,22 @@ package io.onedev.server.web.behavior;import org.apache.wicket.Component;import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+public abstract class CtrlAwareOnClickAjaxBehavior extends AbstractDefaultAjaxBehavior {private static final long serialVersionUID = 1L;+ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }+@Overridepublic void renderHead(Component component, IHeaderResponse response) {super.renderHead(component, response);diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.htmlindex 6bd35f09df..028af442bf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html@@ -5,6 +5,7 @@<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button></div><div class="modal-body">+ <div wicket:id="description" class="alert alert-light alert-notice"></div><div wicket:id="feedback"></div><div wicket:id="editor"></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.javaindex dbfbdc9bb4..c910d7f1b8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java@@ -9,11 +9,13 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.feedback.FencedFeedbackPanel;+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.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.EditableUtils;@@ -45,6 +47,13 @@ abstract class BeanEditContentPanel extends Panel {elseform.add(new Label("title", EditableUtils.getDisplayName(getBean().getClass())));+ String description = StringUtils.trimToNull(StringUtils.stripStart(+ EditableUtils.getDescription(getBean().getClass()), "."));+ if (description != null)+ form.add(new Label("description", description).setEscapeModelStrings(false));+ else+ form.add(new WebMarkupContainer("description").setVisible(false));+form.add(new FencedFeedbackPanel("feedback", form));BeanEditor editor = BeanContext.edit("editor", getBean(), getPropertyNames(), isExclude());diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.javaindex 2ee0ce0bb5..135252aeb0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java@@ -13,9 +13,9 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import io.onedev.server.web.component.modal.ModalPanel;@SuppressWarnings("serial")-public abstract class BeanEditModalPanel extends ModalPanel {+public abstract class BeanEditModalPanel<T extends Serializable> extends ModalPanel {- private final Serializable bean;+ private final T bean;private final Collection<String> propertyNames;@@ -23,11 +23,11 @@ public abstract class BeanEditModalPanel extends ModalPanel {private final String title;- public BeanEditModalPanel(IPartialPageRequestHandler handler, Serializable bean) {+ public BeanEditModalPanel(IPartialPageRequestHandler handler, T bean) {this(handler, bean, new HashSet<>(), true, null);}- public BeanEditModalPanel(IPartialPageRequestHandler handler, Serializable bean,+ public BeanEditModalPanel(IPartialPageRequestHandler handler, T bean,Collection<String> propertyNames, boolean exclude, @Nullable String title) {super(handler);this.bean = bean;@@ -74,7 +74,7 @@ public abstract class BeanEditModalPanel extends ModalPanel {};}- protected abstract void onSave(AjaxRequestTarget target, Serializable bean);+ protected abstract void onSave(AjaxRequestTarget target, T bean);protected void onCancel(AjaxRequestTarget target) {}diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPicker.html b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.htmlsimilarity index 72%rename from server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPicker.htmlrename to server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.htmlindex 6ab05e5232..1d9c0f7c0c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPicker.html+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.html@@ -1,5 +1,5 @@<wicket:panel>- <div wicket:id="tree" class="blob-folder-picker"></div>+ <div wicket:id="tree" class="blob-selector"></div><wicket:fragment wicket:id="contentFrag"><a wicket:id="link"><wicket:svg href="folder" class="icon"></wicket:svg> <span wicket:id="label"></span></a></wicket:fragment>diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPicker.java b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPicker.javarename to server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.javaindex 165038a36d..0ca89dd98c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobFolderSelector.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.blob.folderpicker;+package io.onedev.server.web.component.blob;import java.util.ArrayList;import java.util.Iterator;@@ -30,11 +30,11 @@ import io.onedev.server.model.Project;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;@SuppressWarnings("serial")-public abstract class BlobFolderPicker extends Panel {+public abstract class BlobFolderSelector extends Panel {private final ObjectId commitId;- public BlobFolderPicker(String id, @Nullable ObjectId commitId) {+ public BlobFolderSelector(String id, @Nullable ObjectId commitId) {super(id);this.commitId = commitId;@@ -108,7 +108,7 @@ public abstract class BlobFolderPicker extends Panel {@Overrideprotected Component newContentComponent(String id, IModel<BlobIdent> node) {BlobIdent blobIdent = node.getObject();- Fragment fragment = new Fragment(id, "contentFrag", BlobFolderPicker.this);+ Fragment fragment = new Fragment(id, "contentFrag", BlobFolderSelector.this);AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {@Override@@ -129,7 +129,7 @@ public abstract class BlobFolderPicker extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new BlobFolderPickerResourceReference()));+ response.render(CssHeaderItem.forReference(new BlobResourceReference()));}protected void onStateChange() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.java b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.javanew file mode 100644index 0000000000..6b5926b6cd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.java@@ -0,0 +1,115 @@+package io.onedev.server.web.component.blob;++import java.util.HashSet;+import java.util.Set;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.unbescape.html.HtmlEscape;++import io.onedev.server.git.BlobIdent;+import io.onedev.server.git.BlobIdentFilter;+import io.onedev.server.model.Project;+import io.onedev.server.util.ProjectScopedCommit;+import io.onedev.server.web.asset.icon.IconScope;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.component.svg.SpriteImage;++@SuppressWarnings("serial")+public abstract class BlobPicker extends DropdownLink {++ private final IModel<ProjectScopedCommit> commitModel;++ private String blobPath;++ public BlobPicker(String id, IModel<ProjectScopedCommit> commitModel, @Nullable String blobPath) {+ super(id);+ this.commitModel = commitModel;+ this.blobPath = blobPath;+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ if (commitModel.getObject() != null) {+ IModel<Project> projectModel = new AbstractReadOnlyModel<Project>() {++ @Override+ public Project getObject() {+ return commitModel.getObject().getProject();+ }++ };++ Set<BlobIdent> state = new HashSet<>();+ return new BlobSelector(id, projectModel, commitModel.getObject().getCommitId()) {++ @Override+ protected Set<BlobIdent> getState() {+ return state;+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, String blobPath) {+ dropdown.close();+ BlobPicker.this.blobPath = blobPath;+ target.add(BlobPicker.this);++ BlobPicker.this.onSelect(target, blobPath);+ }++ @Override+ protected BlobIdentFilter getBlobIdentFilter() {+ return BlobPicker.this.getBlobIdentFilter();+ }++ };+ } else {+ return new Label(id, "Project or revision not specified yet").add(AttributeAppender.append("class", "m-3 text-danger font-italic"));+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ setEscapeModelStrings(false);+ }++ @Override+ public IModel<?> getBody() {+ if (commitModel.getObject() != null) {+ return Model.of(String.format(""+ + "<span class='blob-picker text-nowrap'>"+ + " %s"+ + " <span>%s</span>"+ + " <svg class='icon rotate-90'><use xlink:href='%s'/></svg>"+ + "</span>",+ "<svg class='icon'><use xlink:href='" + SpriteImage.getVersionedHref(IconScope.class, "file") + "'/></svg>",+ blobPath!=null?HtmlEscape.escapeHtml5(blobPath):"Choose file",+ SpriteImage.getVersionedHref(IconScope.class, "arrow")));+ } else {+ return Model.of("<i>Select project and revision first</i>");+ }+ }++ protected BlobIdentFilter getBlobIdentFilter() {+ return BlobIdentFilter.ALL;+ }++ @Override+ protected void onDetach() {+ commitModel.detach();+ super.onDetach();+ }++ protected abstract void onSelect(AjaxRequestTarget target, String blobPath);++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobResourceReference.javanew file mode 100644index 0000000000..7ba6fd6f57--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobResourceReference.java@@ -0,0 +1,12 @@+package io.onedev.server.web.component.blob;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++@SuppressWarnings("serial")+public class BlobResourceReference extends BaseDependentCssResourceReference {++ public BlobResourceReference() {+ super(BlobResourceReference.class, "blob.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPicker.html b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.htmlsimilarity index 82%rename from server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPicker.htmlrename to server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.htmlindex 10137d3f29..7f3946a5fe 100644--- a/server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPicker.html+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.html@@ -1,5 +1,5 @@<wicket:panel>- <div wicket:id="tree" class="blob-picker"></div>+ <div wicket:id="tree" class="blob-selector"></div><wicket:fragment wicket:id="folderFrag"><svg wicket:id="icon" class="icon"></svg> <span wicket:id="label"></span></wicket:fragment>diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPicker.java b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPicker.javarename to server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.javaindex 153aa89f62..242f897ebc 100644--- a/server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.blob.picker;+package io.onedev.server.web.component.blob;import java.util.ArrayList;import java.util.Iterator;@@ -27,17 +27,18 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.BlobIdentFilter;import io.onedev.server.model.Project;-import io.onedev.server.web.component.blob.BlobIcon;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;@SuppressWarnings("serial")-public abstract class BlobPicker extends Panel {+public abstract class BlobSelector extends Panel {+ private final IModel<Project> projectModel;+private final ObjectId commitId;- public BlobPicker(String id, @Nullable ObjectId commitId) {+ public BlobSelector(String id, IModel<Project> projectModel, @Nullable ObjectId commitId) {super(id);-+ this.projectModel = projectModel;this.commitId = commitId;}@@ -66,7 +67,7 @@ public abstract class BlobPicker extends Panel {@Overridepublic Iterator<? extends BlobIdent> getChildren(BlobIdent node) {- return getProject().getChildren(node, getBlobIdentFilter(), commitId).iterator();+ return projectModel.getObject().getChildren(node, getBlobIdentFilter(), commitId).iterator();}@Override@@ -99,7 +100,8 @@ public abstract class BlobPicker extends Panel {public void expand(BlobIdent blobIdent) {super.expand(blobIdent);- List<BlobIdent> children = getProject().getChildren(blobIdent, getBlobIdentFilter(), commitId);+ List<BlobIdent> children = projectModel.getObject().getChildren(+ blobIdent, getBlobIdentFilter(), commitId);if (children.size() == 1 && children.get(0).isTree())expand(children.get(0));@@ -110,17 +112,17 @@ public abstract class BlobPicker extends Panel {protected Component newContentComponent(String id, IModel<BlobIdent> node) {BlobIdent blobIdent = node.getObject();if (blobIdent.isTree()) {- Fragment fragment = new Fragment(id, "folderFrag", BlobPicker.this);+ Fragment fragment = new Fragment(id, "folderFrag", BlobSelector.this);fragment.add(new BlobIcon("icon", node));fragment.add(new Label("label", blobIdent.getName()));return fragment;} else {- Fragment fragment = new Fragment(id, "fileFrag", BlobPicker.this);+ Fragment fragment = new Fragment(id, "fileFrag", BlobSelector.this);AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {@Overridepublic void onClick(AjaxRequestTarget target) {- onSelect(target, blobIdent);+ onSelect(target, blobIdent.path);}};@@ -138,18 +140,22 @@ public abstract class BlobPicker extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new BlobPickerResourceReference()));+ response.render(CssHeaderItem.forReference(new BlobResourceReference()));}+ @Override+ protected void onDetach() {+ projectModel.detach();+ super.onDetach();+ }+protected void onStateChange() {}- protected abstract Project getProject();-protected abstract Set<BlobIdent> getState();- protected abstract void onSelect(AjaxRequestTarget target, BlobIdent blobIdent);+ protected abstract void onSelect(AjaxRequestTarget target, String blobPath);protected BlobIdentFilter getBlobIdentFilter() {return BlobIdentFilter.ALL;diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/picker/blob-picker.css b/server-core/src/main/java/io/onedev/server/web/component/blob/blob-selector.csssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/blob/picker/blob-picker.cssrename to server-core/src/main/java/io/onedev/server/web/component/blob/blob-selector.cssdiff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/blob-folder-picker.css b/server-core/src/main/java/io/onedev/server/web/component/blob/blob.csssimilarity index 75%rename from server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/blob-folder-picker.cssrename to server-core/src/main/java/io/onedev/server/web/component/blob/blob.cssindex 52f8761a10..11bd1013fb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/blob-folder-picker.css+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/blob.css@@ -1,5 +1,5 @@-.blob-folder-picker {+.blob-selector {padding: 8px 24px 8px 4px;max-width: 800px;min-width: 180px;-}\ No newline at end of file+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPickerResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPickerResourceReference.javadeleted file mode 100644index 3cd93acd98..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPickerResourceReference.java+++ /dev/null@@ -1,12 +0,0 @@-package io.onedev.server.web.component.blob.folderpicker;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--@SuppressWarnings("serial")-public class BlobFolderPickerResourceReference extends BaseDependentCssResourceReference {-- public BlobFolderPickerResourceReference() {- super(BlobFolderPickerResourceReference.class, "blob-folder-picker.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPickerResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPickerResourceReference.javadeleted file mode 100644index 0d5491752f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPickerResourceReference.java+++ /dev/null@@ -1,12 +0,0 @@-package io.onedev.server.web.component.blob.picker;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--@SuppressWarnings("serial")-public class BlobPickerResourceReference extends BaseDependentCssResourceReference {-- public BlobPickerResourceReference() {- super(BlobPickerResourceReference.class, "blob-picker.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex ba32ffb96b..14cd1459bb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -55,7 +55,6 @@ import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.BlobIdent;-import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;@@ -84,8 +83,6 @@ import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.job.JobDefLink;import io.onedev.server.web.component.link.ActionablePageLink;import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.component.modal.ModalLink;@@ -98,8 +95,6 @@ import io.onedev.server.web.component.stringchoice.StringMultiChoice;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;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.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;@@ -110,6 +105,10 @@ public abstract class BuildListPanel extends Panel {private final IModel<String> queryStringModel;+ private final boolean showJob;++ private final boolean showRef;+private final int expectedCount;private final IModel<BuildQuery> queryModel = new LoadableDetachableModel<BuildQuery>() {@@ -135,9 +134,11 @@ public abstract class BuildListPanel extends Panel {private boolean querySubmitted = true;- public BuildListPanel(String id, IModel<String> queryModel, int expectedCount) {+ public BuildListPanel(String id, IModel<String> queryModel, boolean showJob, boolean showRef, int expectedCount) {super(id);this.queryStringModel = queryModel;+ this.showJob = showJob;+ this.showRef = showRef;this.expectedCount = expectedCount;}@@ -1005,138 +1006,87 @@ public abstract class BuildListPanel extends Panel {}});- columns.add(new AbstractColumn<Build, Void>(Model.of(Build.NAME_JOB)) {-- @Override- public String getCssClass() {- return "job";- }-- @Override- public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,- IModel<Build> rowModel) {- Build build = rowModel.getObject();- if (SecurityUtils.canReadCode(build.getProject())) {- Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);- Link<Void> link = new JobDefLink("link", build.getCommitId(), build.getJobName()) {-- @Override- protected Project getProject() {- return rowModel.getObject().getProject();- }-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(isEnabled() && build.getJob() != null);- }-- };- link.add(new Label("label", build.getJobName()));- fragment.add(link);- cellItem.add(fragment);- } else {- cellItem.add(new Label(componentId, build.getJobName()));+ if (showJob) {+ columns.add(new AbstractColumn<Build, Void>(Model.of(Build.NAME_JOB)) {++ @Override+ public String getCssClass() {+ return "job";}- }- });-- columns.add(new AbstractColumn<Build, Void>(Model.of("Branch/Tag")) {-- @Override- public String getCssClass() {- return "branch-tag d-none d-lg-table-cell";- }-- @Override- public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,- IModel<Build> rowModel) {- Build build = rowModel.getObject();- if (SecurityUtils.canReadCode(build.getProject())) {- if (build.getBranch() != null) {- Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);- PageParameters params = ProjectBlobPage.paramsOf(build.getProject(),- new BlobIdent(build.getBranch(), null, FileMode.TREE.getBits()));- Link<Void> link = new BookmarkablePageLink<Void>("link", ProjectBlobPage.class, params);- link.add(new Label("label", build.getBranch()));- fragment.add(link);- cellItem.add(fragment);- } else if (build.getTag() != null) {++ @Override+ public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,+ IModel<Build> rowModel) {+ Build build = rowModel.getObject();+ if (SecurityUtils.canReadCode(build.getProject())) {Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);- PageParameters params = ProjectBlobPage.paramsOf(build.getProject(),- new BlobIdent(build.getTag(), null, FileMode.TREE.getBits()));- Link<Void> link = new BookmarkablePageLink<Void>("link", ProjectBlobPage.class, params);- link.add(new Label("label", build.getTag()));+ Link<Void> link = new JobDefLink("link", build.getCommitId(), build.getJobName()) {++ @Override+ protected Project getProject() {+ return rowModel.getObject().getProject();+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(isEnabled() && build.getJob() != null);+ }++ };+ link.add(new Label("label", build.getJobName()));fragment.add(link);cellItem.add(fragment);- } else {- cellItem.add(new Label(componentId, "<i>n/a</i>").setEscapeModelStrings(false));+ } else {+ cellItem.add(new Label(componentId, build.getJobName()));}- } else {- if (build.getBranch() != null)- cellItem.add(new Label(componentId, build.getBranch()));- else if (build.getTag() != null)- cellItem.add(new Label(componentId, build.getTag()));- else- cellItem.add(new Label(componentId, "<i>n/a</i>").setEscapeModelStrings(false));}- }- });-- columns.add(new AbstractColumn<Build, Void>(Model.of(Build.NAME_COMMIT)) {-- @Override- public String getCssClass() {- return "commit d-none d-lg-table-cell";- }-- @Override- public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,- IModel<Build> rowModel) {- Build build = rowModel.getObject();- if (SecurityUtils.canReadCode(build.getProject())) {- Fragment fragment = new Fragment(componentId, "commitFrag", BuildListPanel.this);- CommitDetailPage.State commitState = new CommitDetailPage.State();- commitState.revision = build.getCommitHash();- PageParameters params = CommitDetailPage.paramsOf(build.getProject(), commitState);- Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);- fragment.add(hashLink);- hashLink.add(new Label("hash", GitUtils.abbreviateSHA(build.getCommitHash())));- fragment.add(new CopyToClipboardLink("copyHash", Model.of(build.getCommitHash())));- cellItem.add(fragment);- } else {- cellItem.add(new Label(componentId, GitUtils.abbreviateSHA(build.getCommitHash())));+ });+ }++ if (showRef) {+ columns.add(new AbstractColumn<Build, Void>(Model.of("Branch/Tag")) {++ @Override+ public String getCssClass() {+ return "branch-tag d-none d-lg-table-cell";}- }- });-- columns.add(new AbstractColumn<Build, Void>(Model.of(Build.NAME_PULL_REQUEST)) {-- @Override- public String getCssClass() {- return "pull-request d-none d-xl-table-cell";- }-- @Override- public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,- IModel<Build> rowModel) {- Build build = rowModel.getObject();- if (build.getRequest() != null) {++ @Override+ public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,+ IModel<Build> rowModel) {+ Build build = rowModel.getObject();if (SecurityUtils.canReadCode(build.getProject())) {- Fragment fragment = new Fragment(componentId, "pullRequestFrag", BuildListPanel.this);- Link<Void> link = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class,- PullRequestActivitiesPage.paramsOf(build.getRequest()));- link.add(new Label("label", "#" + build.getRequest().getNumber()));- fragment.add(link);- cellItem.add(fragment);+ if (build.getBranch() != null) {+ Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);+ PageParameters params = ProjectBlobPage.paramsOf(build.getProject(),+ new BlobIdent(build.getBranch(), null, FileMode.TREE.getBits()));+ Link<Void> link = new BookmarkablePageLink<Void>("link", ProjectBlobPage.class, params);+ link.add(new Label("label", build.getBranch()));+ fragment.add(link);+ cellItem.add(fragment);+ } else if (build.getTag() != null) {+ Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);+ PageParameters params = ProjectBlobPage.paramsOf(build.getProject(),+ new BlobIdent(build.getTag(), null, FileMode.TREE.getBits()));+ Link<Void> link = new BookmarkablePageLink<Void>("link", ProjectBlobPage.class, params);+ link.add(new Label("label", build.getTag()));+ fragment.add(link);+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "<i>n/a</i>").setEscapeModelStrings(false));+ }} else {- cellItem.add(new Label(componentId, "#" + build.getRequest().getNumber()));+ if (build.getBranch() != null)+ cellItem.add(new Label(componentId, build.getBranch()));+ else if (build.getTag() != null)+ cellItem.add(new Label(componentId, build.getTag()));+ else+ cellItem.add(new Label(componentId, "<i>n/a</i>").setEscapeModelStrings(false));}- } else {- cellItem.add(new Label(componentId, "<i>n/a</i>").setEscapeModelStrings(false));}- }- });+ });+ }for (String paramName: getListParams()) {columns.add(new AbstractColumn<Build, Void>(Model.of(paramName)) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js b/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.jsindex 15b42841c8..cf9b5cf0c8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js@@ -97,7 +97,6 @@ onedev.server.lineChart = {let xAxisValue = lineSeries.xAxisValues[i];option.xAxis.data.push(xAxisValue);for (const j in lineSeries.lines) {- console.log(lineSeries.lines[j].yAxisValues[xAxisValue]);option.series[j].data.push(lineSeries.lines[j].yAxisValues[xAxisValue]);}};diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex a525b1789c..1ce472167f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -1,6 +1,5 @@package io.onedev.server.web.component.codecomment;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Date;@@ -213,7 +212,7 @@ public abstract class CodeCommentListPanel extends Panel {private void changeStatus(AjaxRequestTarget target,Provider<Collection<CodeComment>> commentsProvider, boolean resolved) {- new BeanEditModalPanel(target, new StatusChangeOptionBean()) {+ new BeanEditModalPanel<StatusChangeOptionBean>(target, new StatusChangeOptionBean()) {@Overrideprotected String getCssClass() {@@ -221,7 +220,7 @@ public abstract class CodeCommentListPanel extends Panel {}@Override- protected void onSave(AjaxRequestTarget target, Serializable bean) {+ protected void onSave(AjaxRequestTarget target, StatusChangeOptionBean bean) {Collection<CodeCommentStatusChange> changes = new ArrayList<>();for (CodeComment comment: commentsProvider.get()) {@@ -234,7 +233,7 @@ public abstract class CodeCommentListPanel extends Panel {changes.add(change);}- String note = ((StatusChangeOptionBean) bean).getNote();+ String note = bean.getNote();OneDev.getInstance(CodeCommentStatusChangeManager.class).save(changes, note);selectionColumn.getSelections().clear();diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 765edf9a10..0cbc1b8629 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -1,6 +1,5 @@package io.onedev.server.web.component.diff.revision;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;@@ -489,11 +488,11 @@ public abstract class RevisionDiffPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- new BeanEditModalPanel(target, new SuggestionBatchApplyBean()) {+ new BeanEditModalPanel<SuggestionBatchApplyBean>(target, new SuggestionBatchApplyBean()) {@Override- protected void onSave(AjaxRequestTarget target, Serializable bean) {- String commitMessage = ((SuggestionBatchApplyBean) bean).getCommitMessage();+ protected void onSave(AjaxRequestTarget target, SuggestionBatchApplyBean bean) {+ String commitMessage = bean.getCommitMessage();PullRequest request = getPullRequest();ObjectId commitId = request.getLatestUpdate().getHeadCommit().copy();try {@@ -587,12 +586,11 @@ public abstract class RevisionDiffPanel extends Panel {DiffOption diffOption = new DiffOption();diffOption.setWhitespaceOption(whitespaceOptionModel.getObject());diffOption.setViewMode(diffMode);- new BeanEditModalPanel(target, diffOption) {+ new BeanEditModalPanel<DiffOption>(target, diffOption) {@Override- protected void onSave(AjaxRequestTarget target, Serializable bean) {- DiffOption diffOption = (DiffOption) bean;- diffMode = diffOption.getViewMode();+ protected void onSave(AjaxRequestTarget target, DiffOption bean) {+ diffMode = bean.getViewMode();WebResponse response = (WebResponse) RequestCycle.get().getResponse();Cookie cookie = new Cookie(COOKIE_VIEW_MODE, diffMode.name());@@ -600,7 +598,7 @@ public abstract class RevisionDiffPanel extends Panel {cookie.setPath("/");response.addCookie(cookie);- whitespaceOptionModel.setObject(diffOption.getWhitespaceOption());+ whitespaceOptionModel.setObject(bean.getWhitespaceOption());target.add(navs);target.add(body);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 92094fbe53..b5922bb824 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@@ -127,7 +127,8 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, Proif (hasVisibleEditableDependents) {Collection<String> propertyNames = FieldUtils.getEditablePropertyNames(getIssue().getProject(), bean.getClass(), dependentFields);- class DependentFieldsEditor extends BeanEditModalPanel implements ProjectAware, InputContext {+ class DependentFieldsEditor extends BeanEditModalPanel<Serializable>+ implements ProjectAware, InputContext {public DependentFieldsEditor(IPartialPageRequestHandler handler, Serializable bean,Collection<String> propertyNames, boolean exclude, String title) {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 23360b912e..34d849d107 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@@ -571,11 +571,6 @@ public abstract class IssueListPanel extends Panel {public WebMarkupContainer newLink(String id) {return new ModalLink(id) {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {dropdown.close();@@ -797,11 +792,6 @@ public abstract class IssueListPanel extends Panel {public WebMarkupContainer newLink(String id) {return new ModalLink(id) {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {dropdown.close();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.javaindex ba522d20f7..93f83c6f17 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java@@ -78,11 +78,6 @@ public abstract class TransitionMenuLink extends MenuLink {public WebMarkupContainer newLink(String id) {return new ModalLink(id) {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overridepublic void onClick(AjaxRequestTarget target) {super.onClick(target);diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.javaindex bd13049ea3..bb8b0f7c6d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java@@ -33,6 +33,7 @@ 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.html.panel.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -58,8 +59,8 @@ import io.onedev.server.util.FilenameUtils;import io.onedev.server.util.UrlUtils;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.behavior.ReferenceInputBehavior;-import io.onedev.server.web.component.blob.folderpicker.BlobFolderPicker;-import io.onedev.server.web.component.blob.picker.BlobPicker;+import io.onedev.server.web.component.blob.BlobFolderSelector;+import io.onedev.server.web.component.blob.BlobSelector;import io.onedev.server.web.component.dropzonefield.DropzoneField;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;@@ -230,11 +231,20 @@ abstract class InsertUrlPanel extends Panel {Set<BlobIdent> filePickerState = getPickerState(commitId, context.getBlobIdent(),WebSession.get().getMetaData(FILE_PICKER_STATE));- fragment.add(new BlobPicker("files", commitId) {+ IModel<Project> projectModel = new AbstractReadOnlyModel<Project>() {@Override- protected void onSelect(AjaxRequestTarget target, BlobIdent blobIdent) {- blobIdent = new BlobIdent(context.getBlobIdent().revision, blobIdent.path, blobIdent.mode);+ public Project getObject() {+ return markdownEditor.getBlobRenderContext().getProject();+ }++ };+ fragment.add(new BlobSelector("files", projectModel, commitId) {++ @Override+ protected void onSelect(AjaxRequestTarget target, String blobPath) {+ BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, blobPath,+ FileMode.REGULAR_FILE.getBits());String baseUrl = context.getDirectoryUrl();String referenceUrl = urlFor(ProjectBlobPage.class,ProjectBlobPage.paramsOf(context.getProject(), blobIdent)).toString();@@ -248,11 +258,6 @@ abstract class InsertUrlPanel extends Panel {return blobIdentFilter;}- @Override- protected Project getProject() {- return markdownEditor.getBlobRenderContext().getProject();- }-@Overrideprotected void onStateChange() {HashSet<String> expandedPaths = new HashSet<>();@@ -478,7 +483,7 @@ abstract class InsertUrlPanel extends Panel {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new BlobFolderPicker(id, commitId) {+ return new BlobFolderSelector(id, commitId) {@Overrideprotected void onSelect(AjaxRequestTarget target, BlobIdent blobIdent) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex d5e2959e37..954e87bd2c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -84,16 +84,23 @@ public class MarkdownViewer extends GenericPanel<String> {protected BlobRenderContext getRenderContext() {return null;}++ @Nullable+ private Project getProject() {+ if (getRenderContext() != null)+ return getRenderContext().getProject();+ else if (getPage() instanceof ProjectPage)+ return ((ProjectPage) getPage()).getProject();+ else+ return null;+ }@Nullableprivate String renderMarkdown() {String markdown = getModelObject();if (markdown != null) {- Project project = null;- if (getPage() instanceof ProjectPage)- project = ((ProjectPage) getPage()).getProject();MarkdownManager manager = AppLoader.getInstance(MarkdownManager.class);- return manager.process(manager.render(markdown), project,+ return manager.process(manager.render(markdown), getProject(),getRenderContext(), getSuggestionSupport(), false);} else {return null;@@ -242,9 +249,8 @@ public class MarkdownViewer extends GenericPanel<String> {}break;case "commit":- ProjectPage page = (ProjectPage) getPage();- RevCommit commit = page.getProject().getRevCommit(ObjectId.fromString(referenceId), false);- if (commit != null && SecurityUtils.canReadCode(page.getProject())) {+ RevCommit commit = getProject().getRevCommit(ObjectId.fromString(referenceId), false);+ if (commit != null && SecurityUtils.canReadCode(getProject())) {String script = String.format("onedev.server.markdown.renderCommitTooltip('%s', '%s', '%s');",JavaScriptEscape.escapeJavaScript(commit.getAuthorIdent().getName()),JavaScriptEscape.escapeJavaScript(DateUtils.formatAge(commit.getCommitterIdent().getWhen())),diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.cssindex 41e0a574a0..19ae578a03 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css@@ -351,21 +351,27 @@.markdown-rendered h1 .header-link {margin-left: -24px;+ margin-top: -4px;}.markdown-rendered h2 .header-link {margin-left: -22px;+ margin-top: -4px;}.markdown-rendered h3 .header-link {margin-left: -20px;+ margin-top: -3px;}.markdown-rendered h4 .header-link {margin-left: -18px;+ margin-top: -2px;}.markdown-rendered h5 .header-link {margin-left: -16px;+ margin-top: -2px;}.markdown-rendered h6 .header-link {margin-left: -14px;+ margin-top: -2px;}.markdown-rendered h1 {@@ -463,3 +469,7 @@color: inherit !important;background-color: inherit !important;}++.markdown-rendered>p:last-child {+ margin-bottom: 0;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/milestone/actions/MilestoneActionsPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/milestone/actions/MilestoneActionsPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/actions/MilestoneActionsPanel.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/milestone/actions/MilestoneActionsPanel.javaindex fc614f9365..1e040e8dd3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/actions/MilestoneActionsPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.issues.milestones;+package io.onedev.server.web.component.milestone.actions;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;@@ -11,9 +11,10 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;+import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;@SuppressWarnings("serial")-abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {+public abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {public MilestoneActionsPanel(String id, IModel<Milestone> model) {super(id, model);diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/burndown/MilestoneBurndownPanel.html b/server-core/src/main/java/io/onedev/server/web/component/milestone/burndown/MilestoneBurndownPanel.htmlnew file mode 100644index 0000000000..37b6257010--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/burndown/MilestoneBurndownPanel.html@@ -0,0 +1,9 @@+<wicket:panel>+ <div wicket:id="content" class="milestone-burndown"></div>+ <wicket:fragment wicket:id="chartFrag">+ <div class="d-flex align-items-center flex-nowrap mb-4">+ <span class="font-size-lg mr-3">Show States By</span> <div class="flex-shrink-1"><select wicket:id="by" class="form-control" placeholder="Issue Count"></select></div>+ </div>+ <div wicket:id="chart" class="border-dashed border-secondary rounded pt-5 px-3"></div>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/burndown/MilestoneBurndownPanel.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/burndown/MilestoneBurndownPanel.javanew file mode 100644index 0000000000..3bbe51e21e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/burndown/MilestoneBurndownPanel.java@@ -0,0 +1,257 @@+package io.onedev.server.web.component.milestone.burndown;++import java.util.ArrayList;+import java.util.Date;+import java.util.HashMap;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.stream.Collectors;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.DropDownChoice;+import org.apache.wicket.markup.html.form.IChoiceRenderer;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.infomanager.IssueInfoManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueSchedule;+import io.onedev.server.model.Milestone;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.inputspec.InputSpec;+import io.onedev.server.model.support.issue.StateSpec;+import io.onedev.server.model.support.issue.field.spec.WorkingPeriodField;+import io.onedev.server.util.Day;+import io.onedev.server.web.component.chart.line.Line;+import io.onedev.server.web.component.chart.line.LineChartPanel;+import io.onedev.server.web.component.chart.line.LineSeries;+import io.onedev.server.web.page.base.BasePage;++@SuppressWarnings("serial")+public class MilestoneBurndownPanel extends GenericPanel<Milestone> {++ private static final int MAX_DAYS = 365;++ public static final String NULL_FIELD = "<$Null Field$>";++ private String field;++ public MilestoneBurndownPanel(String id, IModel<Milestone> milestoneModel) {+ super(id, milestoneModel);+ }++ private GlobalIssueSetting getIssueSetting() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ String message = null;+ if (getMilestone().getStartDate() != null && getMilestone().getDueDate() != null) {+ if (getMilestone().getStartDate().before(getMilestone().getDueDate())) {+ int currentDay = new Day(getMilestone().getStartDate()).getValue();+ int toDay = new Day(getMilestone().getDueDate()).getValue();++ int dayCount = 0;+ while (currentDay <= toDay) {+ currentDay = new Day(new Day(currentDay).getDate().plusDays(1)).getValue();+ if (++dayCount > MAX_DAYS) {+ message = "Milestone spans too long to show burndown chart";+ break;+ }+ }+ } else {+ message = "Milestone start date should be before due date";+ }+ } else {+ message = "Milestone start and due date should be specified to show burndown chart";+ }+ if (message != null) {+ String messageCssClasses = "alert alert-notice alert-light-warning";+ add(new Label("content", message).add(AttributeAppender.append("class", messageCssClasses)));+ } else {+ Fragment fragment = new Fragment("content", "chartFrag", this);++ List<String> choices = getIssueSetting().getFieldSpecs().stream()+ .filter(it -> it.getType().equals(InputSpec.INTEGER) || it.getType().equals(InputSpec.WORKING_PERIOD))+ .map(it->it.getName())+ .collect(Collectors.toList());++ choices.add(0, NULL_FIELD);++ DropDownChoice<String> dropDownChoice = new DropDownChoice<String>("by", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ if (field != null)+ return field;+ else+ return NULL_FIELD;+ }++ @Override+ public void setObject(String object) {+ if (!object.equals(NULL_FIELD))+ field = object;+ else+ field = null;+ }++ }, choices, new IChoiceRenderer<String>() {++ @Override+ public Object getDisplayValue(String object) {+ if (!object.equals(NULL_FIELD))+ return object;+ else+ return "Issue Count";+ }++ @Override+ public String getIdValue(String object, int index) {+ return object;+ }++ @Override+ public String getObject(String id, IModel<? extends List<? extends String>> choices) {+ return id;+ }++ });+ dropDownChoice.add(new OnChangeAjaxBehavior() {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ target.add(fragment.get("chart"));+ }++ });+ dropDownChoice.setRequired(true);++ fragment.add(dropDownChoice);++ fragment.add(new LineChartPanel("chart", new LoadableDetachableModel<LineSeries>() {++ private String getXAxisValue(Day day) {+ return String.format("%02d-%02d", day.getMonthOfYear()+1, day.getDayOfMonth());+ }++ @Override+ protected LineSeries load() {+ int startDayValue = new Day(getMilestone().getStartDate()).getValue();+ int dueDayValue = new Day(getMilestone().getDueDate()).getValue();++ Map<Integer, Map<String, Integer>> dailyStateWeights = new LinkedHashMap<>();+ for (IssueSchedule schedule: getMilestone().getSchedules()) {+ Issue issue = schedule.getIssue();+ int issueWeight = getFieldValue(issue);+ int scheduleDayValue = new Day(schedule.getDate()).getValue();+ Map<Integer, String> dailyStates = OneDev.getInstance(IssueInfoManager.class)+ .getDailyStates(issue.getId(), Math.max(startDayValue, scheduleDayValue), dueDayValue);+ for (Map.Entry<Integer, String> entry: dailyStates.entrySet()) {+ Map<String, Integer> stateWeights = dailyStateWeights.get(entry.getKey());+ if (stateWeights == null) {+ stateWeights = new HashMap<>();+ dailyStateWeights.put(entry.getKey(), stateWeights);+ }+ if (entry.getValue() != null) {+ Integer weight = stateWeights.get(entry.getValue());+ if (weight == null)+ weight = 0;+ weight += issueWeight;+ stateWeights.put(entry.getValue(), weight);+ }+ }+ }++ List<String> xAxisValues = new ArrayList<>();+ for (Integer dayValue: dailyStateWeights.keySet())+ xAxisValues.add(getXAxisValue(new Day(dayValue)));++ List<Line> lines = new ArrayList<>();++ int initialIssueWeight = 0;+ int todayValue = new Day(new Date()).getValue();+ for (StateSpec spec: OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpecs()) {+ Map<String, Integer> yAxisValues = new HashMap<>();+ for (Map.Entry<Integer, Map<String, Integer>> entry: dailyStateWeights.entrySet()) {+ if (entry.getKey() <= todayValue) {+ Day day = new Day(entry.getKey());+ Integer weight = entry.getValue().get(spec.getName());+ if (weight == null)+ weight = 0;+ yAxisValues.put(getXAxisValue(day), weight);+ }+ }+ Integer stateWeight = yAxisValues.get(getXAxisValue(new Day(startDayValue)));+ if (stateWeight == null)+ stateWeight = 0;+ initialIssueWeight += stateWeight;+ lines.add(new Line(spec.getName(), yAxisValues, spec.getColor(), "States", null));+ }++ Map<String, Integer> guidelineYAxisValues = new HashMap<>();+ if (!xAxisValues.isEmpty()) {+ guidelineYAxisValues.put(xAxisValues.get(0), initialIssueWeight);+ guidelineYAxisValues.put(xAxisValues.get(xAxisValues.size()-1), 0);+ }++ String color = ((BasePage)getPage()).isDarkMode()?"white":"black";+ lines.add(new Line("Guide Line", guidelineYAxisValues, color, null, "dashed"));++ String yAxisValueFormatter;+ if (field != null && getIssueSetting().getFieldSpec(field) instanceof WorkingPeriodField) {+ yAxisValueFormatter = ""+ + "function(value) {"+ + " if (value != undefined) "+ + " return onedev.server.util.formatWorkingPeriod(value);"+ + " else "+ + " return '-';"+ + "}";+ } else {+ yAxisValueFormatter = null;+ }+ return new LineSeries(null, xAxisValues, lines, yAxisValueFormatter, 0, null);+ }++ }).setOutputMarkupId(true));++ add(fragment);+ }+ }++ private int getFieldValue(Issue issue) {+ if (field != null) {+ Object value = issue.getFieldValue(field);+ if (value != null) {+ if (value instanceof Integer)+ return (int) value;+ else+ return 0;+ } else {+ return 0;+ }+ } else {+ return 1;+ }+ }++ private Milestone getMilestone() {+ return getModelObject();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/list/MilestoneListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/milestone/list/MilestoneListPanel.htmlnew file mode 100644index 0000000000..570c2cd5dc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/list/MilestoneListPanel.html@@ -0,0 +1,24 @@+<wicket:panel>+ <div class="card milestone-list">+ <div class="card-body">+ <div class="d-flex align-items-center flex-wrap">+ <span wicket:id="states" class="btn-group mr-4 mb-4">+ <a wicket:id="open" class="btn btn-outline-secondary">Open</a>+ <a wicket:id="closed" class="btn btn-outline-secondary">Closed</a>+ </span>+ <div class="mr-4 mb-4">+ <a wicket:id="sort" class="btn btn-outline-secondary">Sort <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a>+ </div>+ <a wicket:id="newMilestone" class="btn btn-primary btn-icon mb-4"><wicket:svg href="plus" class="icon mr-1"></wicket:svg></a>+ </div>+ <table wicket:id="milestones" class="table"></table>+ </div>+ </div>+ <wicket:fragment wicket:id="issueStatsFrag">+ <div wicket:id="content"></div>+ </wicket:fragment>+ <wicket:fragment wicket:id="nameFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ <span wicket:id="inherited" class="badge badge-info badge-sm ml-2">Inherited</span>+ </wicket:fragment>+</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/list/MilestoneListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/list/MilestoneListPanel.javanew file mode 100644index 0000000000..c3677d3ff0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/list/MilestoneListPanel.java@@ -0,0 +1,407 @@+package io.onedev.server.web.component.milestone.list;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.Iterator;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+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.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.markup.repeater.Item;+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 org.hibernate.criterion.Restrictions;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.MilestoneManager;+import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.search.entity.issue.IssueQueryLexer;+import io.onedev.server.search.entity.issue.StateCriteria;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.MilestoneAndIssueState;+import io.onedev.server.util.MilestoneSort;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.WebSession;+import io.onedev.server.web.component.datatable.DefaultDataTable;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.issue.statestats.StateStatsBar;+import io.onedev.server.web.component.link.ActionablePageLink;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.menu.MenuItem;+import io.onedev.server.web.component.menu.MenuLink;+import io.onedev.server.web.component.milestone.MilestoneDateLabel;+import io.onedev.server.web.component.milestone.actions.MilestoneActionsPanel;+import io.onedev.server.web.page.project.issues.milestones.MilestoneIssuesPage;+import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;+import io.onedev.server.web.util.LoadableDetachableDataProvider;+import io.onedev.server.web.util.PagingHistorySupport;++@SuppressWarnings("serial")+public class MilestoneListPanel extends GenericPanel<Project> {++ private boolean closed;++ private MilestoneSort sort;++ private final PagingHistorySupport pagingHistorySupport;++ private final IModel<Collection<MilestoneAndIssueState>> milestoneAndStatesModel =+ new LoadableDetachableModel<Collection<MilestoneAndIssueState>>() {++ @Override+ protected Collection<MilestoneAndIssueState> load() {+ List<Milestone> milestones = new ArrayList<>();+ for (Component row: (WebMarkupContainer)milestonesTable.get("body").get("rows")) {+ Milestone milestone = (Milestone) row.getDefaultModelObject();+ milestones.add(milestone);+ }+ return OneDev.getInstance(IssueManager.class).queryMilestoneAndIssueStates(getProject(), milestones);+ }++ };++ private DataTable<Milestone, Void> milestonesTable;++ private EntityCriteria<Milestone> getCriteria(boolean closed) {+ EntityCriteria<Milestone> criteria = EntityCriteria.of(Milestone.class);+ criteria.add(Restrictions.in("project", getProject().getSelfAndAncestors()));+ criteria.add(Restrictions.eq("closed", closed));+ return criteria;+ }++ public MilestoneListPanel(String id, IModel<Project> model, boolean closed, MilestoneSort sort,+ @Nullable PagingHistorySupport pagingHistorySupport) {+ super(id, model);++ this.closed = closed;+ this.sort = sort;+ this.pagingHistorySupport = pagingHistorySupport;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ WebMarkupContainer statesContainer = new WebMarkupContainer("states");+ statesContainer.setOutputMarkupId(true);+ add(statesContainer);++ AjaxLink<Void> openLink = new AjaxLink<Void>("open") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ closed = false;+ target.add(statesContainer);+ target.add(milestonesTable);+ onStateChanged(target, closed);+ }++ };+ openLink.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return !closed? "active": "";+ }++ }));+ statesContainer.add(openLink);++ AjaxLink<Void> closedLink = new AjaxLink<Void>("closed") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ closed = true;+ target.add(statesContainer);+ target.add(milestonesTable);+ onStateChanged(target, closed);+ }++ };+ closedLink.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return closed? "active": "";+ }++ }));+ statesContainer.add(closedLink);++ add(new MenuLink("sort") {++ @Override+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {+ List<MenuItem> menuItems = new ArrayList<>();+ for (MilestoneSort sort: MilestoneSort.values()) {+ menuItems.add(new MenuItem() {++ @Override+ public String getLabel() {+ return sort.toString();+ }++ @Override+ public String getIconHref() {+ if (sort == MilestoneListPanel.this.sort)+ return "tick";+ else+ return null;+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ AjaxLink<Void> link = new AjaxLink<Void>(id) {++ @Override+ public void onClick(AjaxRequestTarget target) {+ dropdown.close();+ target.add(milestonesTable);+ MilestoneListPanel.this.sort = sort;+ onSortChanged(target, sort);+ }++ };+ link.add(AttributeAppender.append("class", "milestone-sort"));+ if (sort == MilestoneListPanel.this.sort)+ link.add(AttributeAppender.append("class", "active"));+ return link;+ }++ });+ }+ return menuItems;+ }++ });++ add(new BookmarkablePageLink<Void>("newMilestone", NewMilestonePage.class, NewMilestonePage.paramsOf(getProject())) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManageIssues(getProject()));+ }++ });++ List<IColumn<Milestone, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<Milestone, Void>(Model.of("Name")) {++ @Override+ public String getCssClass() {+ return "name align-middle";+ }++ @Override+ public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,+ IModel<Milestone> rowModel) {+ Milestone milestone = rowModel.getObject();+ Fragment fragment = new Fragment(componentId, "nameFrag", MilestoneListPanel.this);+ WebMarkupContainer link = new ActionablePageLink("link", MilestoneIssuesPage.class,+ MilestoneIssuesPage.paramsOf(getProject(), milestone, null)) {++ @Override+ protected void doBeforeNav(AjaxRequestTarget target) {+ String redirectUrlAfterDelete = RequestCycle.get().urlFor(+ getPage().getClass(), getPage().getPageParameters()).toString();+ WebSession.get().setRedirectUrlAfterDelete(Milestone.class, redirectUrlAfterDelete);+ }++ };+ link.add(new Label("label", milestone.getName()));+ fragment.add(link);+ fragment.add(new WebMarkupContainer("inherited") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!rowModel.getObject().getProject().equals(getProject()));+ }++ });+ cellItem.add(fragment);+ }++ });++ columns.add(new AbstractColumn<Milestone, Void>(Model.of("Due Date")) {++ @Override+ public String getCssClass() {+ return "due-date d-none d-lg-table-cell align-middle";+ }++ @Override+ public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,+ IModel<Milestone> rowModel) {+ cellItem.add(new MilestoneDateLabel(componentId, rowModel));+ }++ });++ columns.add(new AbstractColumn<Milestone, Void>(Model.of("Issue Stats")) {++ @Override+ public String getCssClass() {+ return "issue-stats align-middle";+ }++ @Override+ public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,+ IModel<Milestone> rowModel) {+ Fragment fragment = new Fragment(componentId, "issueStatsFrag", MilestoneListPanel.this) {++ @Override+ protected void onBeforeRender() {+ /*+ * Create StateStatsBar here as it requires to access the milestoneAndStatsModel which can+ * only be calculated correctly after the milestone table is initialized+ */+ addOrReplace(new StateStatsBar("content", new LoadableDetachableModel<Map<String, Integer>>() {++ @Override+ protected Map<String, Integer> load() {+ Map<String, Integer> stateStats = new HashMap<>();+ for (MilestoneAndIssueState milestoneAndState: milestoneAndStatesModel.getObject()) {+ if (milestoneAndState.getMilestoneId().equals(rowModel.getObject().getId())) {+ Integer count = stateStats.get(milestoneAndState.getIssueState());+ if (count != null)+ count ++;+ else+ count = 1;+ stateStats.put(milestoneAndState.getIssueState(), count);+ }+ }+ return stateStats;+ }++ }) {++ @Override+ protected Link<Void> newStateLink(String componentId, String state) {+ String query = new IssueQuery(new StateCriteria(state, IssueQueryLexer.Is)).toString();+ PageParameters params = MilestoneIssuesPage.paramsOf(getProject(), rowModel.getObject(), query);+ return new ViewStateAwarePageLink<Void>(componentId, MilestoneIssuesPage.class, params);+ }++ });+ super.onBeforeRender();+ }++ };+ cellItem.add(fragment);+ }++ });++ if (SecurityUtils.canManageIssues(getProject())) {+ columns.add(new AbstractColumn<Milestone, Void>(Model.of("")) {++ @Override+ public String getCssClass() {+ return "d-none d-lg-table-cell actions align-middle";+ }++ @Override+ public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,+ IModel<Milestone> rowModel) {+ if (rowModel.getObject().getProject().equals(getProject())) {+ cellItem.add(new MilestoneActionsPanel(componentId, rowModel) {++ @Override+ protected void onUpdated(AjaxRequestTarget target) {+ target.add(milestonesTable);+ }++ @Override+ protected void onDeleted(AjaxRequestTarget target) {+ target.add(milestonesTable);+ }++ });+ } else {+ cellItem.add(new Label(componentId, " ").setEscapeModelStrings(false));+ }+ }++ });+ }++ SortableDataProvider<Milestone, Void> dataProvider = new LoadableDetachableDataProvider<Milestone, Void>() {++ @Override+ public Iterator<? extends Milestone> iterator(long first, long count) {+ EntityCriteria<Milestone> criteria = getCriteria(closed);+ criteria.addOrder(sort.getOrder(closed));+ return OneDev.getInstance(Dao.class).query(criteria, (int)first, (int)count).iterator();+ }++ @Override+ public long calcSize() {+ return OneDev.getInstance(Dao.class).count(getCriteria(closed));+ }++ @Override+ public IModel<Milestone> model(Milestone object) {+ Long id = object.getId();+ return new LoadableDetachableModel<Milestone>() {++ @Override+ protected Milestone load() {+ return OneDev.getInstance(MilestoneManager.class).load(id);+ }++ };+ }+ };++ add(milestonesTable = new DefaultDataTable<Milestone, Void>("milestones", columns, dataProvider,+ WebConstants.PAGE_SIZE, pagingHistorySupport));+ milestonesTable.setOutputMarkupId(true);+ }++ @Override+ protected void onDetach() {+ milestoneAndStatesModel.detach();+ super.onDetach();+ }++ private Project getProject() {+ return getModelObject();+ }++ protected void onSortChanged(AjaxRequestTarget target, MilestoneSort sort) {+ }++ protected void onStateChanged(AjaxRequestTarget target, boolean closed) {+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/ModalLink.java b/server-core/src/main/java/io/onedev/server/web/component/modal/ModalLink.javaindex e90419a951..812c72793a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/modal/ModalLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/ModalLink.java@@ -1,7 +1,5 @@package io.onedev.server.web.component.modal;-import javax.annotation.Nullable;-import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -42,9 +40,8 @@ public abstract class ModalLink extends AjaxLink<Void> {}}- @Nullableprotected String getModalCssClass() {- return null;+ return "modal-lg";}protected abstract Component newContent(String id, ModalPanel modal);diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.javaindex 4a6c2d838b..3332ced656 100644--- a/server-core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java@@ -1,7 +1,5 @@package io.onedev.server.web.component.modal;-import javax.annotation.Nullable;-import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;@@ -45,9 +43,7 @@ public abstract class ModalPanel extends Panel {dialog.add(newContent(CONTENT_ID));- String cssClass = getCssClass();- if (cssClass != null)- dialog.add(AttributeAppender.append("class", cssClass));+ dialog.add(AttributeAppender.append("class", getCssClass()));inited = true;}@@ -85,9 +81,8 @@ public abstract class ModalPanel extends Panel {protected abstract Component newContent(String id);- @Nullableprotected String getCssClass() {- return null;+ return "modal-lg";}public Component getContent() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.java b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.javaindex a179304e0a..76bc52637b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pagenavigator/OnePagingNavigator.java@@ -3,6 +3,10 @@ package io.onedev.server.web.component.pagenavigator;import javax.annotation.Nullable;import org.apache.wicket.AttributeModifier;+import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigation;+import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigationIncrementLink;+import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigationLink;+import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -10,18 +14,16 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.link.AbstractLink;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.DisabledAttributeLinkBehavior;+import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.LoopItem;import org.apache.wicket.markup.html.navigation.paging.IPageable;import org.apache.wicket.markup.html.navigation.paging.IPagingLabelProvider;import org.apache.wicket.markup.html.navigation.paging.PagingNavigation;-import org.apache.wicket.markup.html.navigation.paging.PagingNavigationIncrementLink;-import org.apache.wicket.markup.html.navigation.paging.PagingNavigationLink;-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;import io.onedev.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")-public class OnePagingNavigator extends PagingNavigator {+public class OnePagingNavigator extends AjaxPagingNavigator {private final PagingHistorySupport pagingHistorySupport;@@ -52,11 +54,12 @@ public class OnePagingNavigator extends PagingNavigator {@Overrideprotected PagingNavigation newNavigation(String id, IPageable pageable, IPagingLabelProvider labelProvider) {- return new PagingNavigation(id, pageable, labelProvider) {+ return new AjaxPagingNavigation(id, pageable, labelProvider) {+private final AttributeModifier activeAttribute = AttributeModifier.append("class", "active");@Override- protected AbstractLink newPagingNavigationLink(String id, IPageable pageable, long pageIndex) {+ protected Link<?> newPagingNavigationLink(String id, IPageable pageable, long pageIndex) {if (pagingHistorySupport != null) {return new BookmarkablePageLink<Void>(id, getPage().getClass(),pagingHistorySupport.newPageParameters((int) pageIndex));@@ -92,7 +95,7 @@ public class OnePagingNavigator extends PagingNavigator {};link.add(new DisabledAttributeLinkBehavior());} else {- link = new PagingNavigationIncrementLink<Void>(id, pageable, increment);+ link = new AjaxPagingNavigationIncrementLink(id, pageable, increment);}return link;}@@ -118,7 +121,7 @@ public class OnePagingNavigator extends PagingNavigator {};link.add(new DisabledAttributeLinkBehavior());} else {- link = new PagingNavigationLink<Void>(id, pageable, pageNumber);+ link = new AjaxPagingNavigationLink(id, pageable, pageNumber);}return link;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.javaindex 862411a10d..678bb81c6f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.project.info;+package io.onedev.server.web.component.project.forkoption;import static io.onedev.server.model.Project.PROP_DESCRIPTION;import static io.onedev.server.model.Project.PROP_ISSUE_MANAGEMENT;@@ -30,7 +30,7 @@ import io.onedev.server.web.page.project.setting.general.DefaultRoleBean;import io.onedev.server.web.page.project.setting.general.ParentBean;@SuppressWarnings("serial")-abstract class ForkOptionPanel extends Panel {+public abstract class ForkOptionPanel extends Panel {private final IModel<Project> projectModel;@@ -49,6 +49,7 @@ abstract class ForkOptionPanel extends Panel {Project editProject = new Project();editProject.setName(getProject().getName());+ editProject.setDescription(getProject().getDescription());ParentBean parentBean = new ParentBean();diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.javaindex 536988d249..e3bc3f10b8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java@@ -25,6 +25,7 @@ import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.project.forkoption.ForkOptionPanel;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@@ -75,11 +76,6 @@ public abstract class ProjectInfoPanel extends Panel {forkInfo.add(new ModalLink("forkNow") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overridepublic void onClick(AjaxRequestTarget target) {super.onClick(target);diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectCssResourceReference.javadeleted file mode 100644index 635e92e2d1..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.project.list;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class ProjectCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public ProjectCssResourceReference() {- super(ProjectCssResourceReference.class, "project-list.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListCssResourceReference.javanew file mode 100644index 0000000000..d08891b178--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.project.list;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class ProjectListCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public ProjectListCssResourceReference() {+ super(ProjectListCssResourceReference.class, "project-list.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.htmlindex a04b66b56b..4b59cfb57f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html@@ -41,42 +41,15 @@<span wicket:id="lastUpdate" class="text-muted font-size-sm"></span></div><div class="d-flex flex-wrap project-summary">- <div wicket:id="codeInfo" class="code-info mt-2 d-flex align-items-center flex-wrap mr-3"></div>- <div wicket:id="pullRequestInfo" class="pull-request-info mt-2 d-flex align-items-center flex-wrap"></div>+ <div wicket:id="codeStats" class="code-stats mt-2 d-flex align-items-center flex-wrap mr-3"></div>+ <div wicket:id="pullRequestStats" class="pull-request-stats mt-2 d-flex align-items-center flex-wrap"></div></div><div class="d-flex flex-wrap project-summary">- <div wicket:id="issueInfo" class="issue-info mt-2 d-flex align-items-center flex-wrap mr-3"></div>- <div wicket:id="buildInfo" class="build-info mt-2 d-flex align-items-center flex-wrap"></div>+ <div wicket:id="issueStats" class="issue-stats mt-2 d-flex align-items-center flex-wrap mr-3"></div>+ <div wicket:id="buildStats" class="build-stats mt-2 d-flex align-items-center flex-wrap"></div></div><div wicket:id="children" class="project-summary"></div></wicket:fragment>- <wicket:fragment wicket:id="codeInfoFrag">- <wicket:svg href="files" class="icon mr-2"></wicket:svg>- <a wicket:id="commits" class="mr-2"><span wicket:id="label"></span></a>- <a wicket:id="branches" class="mr-2"><span wicket:id="label"></span></a>- <a wicket:id="tags" class="mr-2"><span wicket:id="label"></span></a>- </wicket:fragment>- <wicket:fragment wicket:id="issueInfoFrag">- <wicket:svg href="bug" class="icon mr-2"></wicket:svg>- <a wicket:id="issues" class="mr-2"><span wicket:id="label"></span></a>- <wicket:container wicket:id="states">- <a wicket:id="link" class="mr-2"><span wicket:id="label"></span></a>- </wicket:container>- </wicket:fragment>- <wicket:fragment wicket:id="buildInfoFrag">- <wicket:svg href="play-circle" class="icon mr-2"></wicket:svg>- <a wicket:id="builds" class="mr-2"><span wicket:id="label"></span></a>- <wicket:container wicket:id="statuses">- <a wicket:id="link" class="mr-2"><span wicket:id="label"></span></a>- </wicket:container>- </wicket:fragment>- <wicket:fragment wicket:id="pullRequestInfoFrag">- <wicket:svg href="pull-request" class="icon mr-2"></wicket:svg>- <a wicket:id="pullRequests" class="mr-2"><span wicket:id="label"></span></a>- <wicket:container wicket:id="statuses">- <a wicket:id="link" class="mr-2"><span wicket:id="label"></span></a>- </wicket:container>- </wicket:fragment><wicket:fragment wicket:id="childrenFrag"><div class="d-flex flex-nowrap align-items-center mt-2"><wicket:svg href="project" class="icon mr-1"/>diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 88a41d4bea..bb8a0a57b3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -1,12 +1,13 @@package io.onedev.server.web.component.project.list;-import java.io.IOException;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;import java.util.Comparator;import java.util.Iterator;+import java.util.LinkedHashMap;import java.util.List;+import java.util.Map;import java.util.Set;import javax.annotation.Nullable;@@ -35,19 +36,14 @@ 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.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;-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 org.eclipse.jgit.lib.Constants;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;@@ -59,29 +55,23 @@ import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.imports.ProjectImporter;import io.onedev.server.imports.ProjectImporterContribution;-import io.onedev.server.infomanager.CommitInfoManager;+import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.build.BuildQuery;-import io.onedev.server.search.entity.build.StatusCriteria;-import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.search.entity.issue.IssueQueryLexer;-import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.search.entity.project.ChildrenOfCriteria;import io.onedev.server.search.entity.project.NameCriteria;import io.onedev.server.search.entity.project.PathCriteria;import io.onedev.server.search.entity.project.ProjectQuery;-import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.CreateChildren;import io.onedev.server.util.DateUtils;import io.onedev.server.util.ProjectBuildStats;import io.onedev.server.util.ProjectIssueStats;import io.onedev.server.util.ProjectPullRequestStats;-import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.ProjectCache;+import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.ProjectQueryBehavior;@@ -97,18 +87,16 @@ import io.onedev.server.web.component.orderedit.OrderEditPanel;import io.onedev.server.web.component.project.avatar.ProjectAvatar;import io.onedev.server.web.component.project.childrentree.ProjectChildrenTree;import io.onedev.server.web.component.project.selector.ProjectSelector;+import io.onedev.server.web.component.project.stats.build.BuildStatsPanel;+import io.onedev.server.web.component.project.stats.code.CodeStatsPanel;+import io.onedev.server.web.component.project.stats.issue.IssueStatsPanel;+import io.onedev.server.web.component.project.stats.pullrequest.PullRequestStatsPanel;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.page.project.NewProjectPage;-import io.onedev.server.web.page.project.branches.ProjectBranchesPage;-import io.onedev.server.web.page.project.builds.ProjectBuildsPage;import io.onedev.server.web.page.project.children.ProjectChildrenPage;-import io.onedev.server.web.page.project.commits.ProjectCommitsPage;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.list.ProjectIssueListPage;-import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;-import io.onedev.server.web.page.project.tags.ProjectTagsPage;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;@@ -124,11 +112,9 @@ public class ProjectListPanel extends Panel {@Overrideprotected ProjectQuery load() {- ProjectQuery baseQuery;+ ProjectQuery baseQuery = getBaseQuery();if (getParentProject() != null)- baseQuery = new ProjectQuery(new ChildrenOfCriteria(getParentProject().getPath()));- else- baseQuery = new ProjectQuery();+ baseQuery = ProjectQuery.merge(baseQuery, new ProjectQuery(new ChildrenOfCriteria(getParentProject().getPath())));return parse(queryStringModel.getObject(), baseQuery);}@@ -1064,280 +1050,64 @@ public class ProjectListPanel extends Panel {fragment.add(new Label("lastUpdate", "Updated " + DateUtils.formatAge(project.getUpdateDate())));- int commitCount;- if (project.isCodeManagement() && SecurityUtils.canReadCode(project)- && (commitCount=OneDev.getInstance(CommitInfoManager.class).getCommitCount(project)) != 0) {- Fragment commitInfoFrag = new Fragment("codeInfo", "codeInfoFrag", ProjectListPanel.this);- PageParameters params = ProjectCommitsPage.paramsOf(project, null);- Link<Void> commitsLink = new BookmarkablePageLink<Void>("commits", ProjectCommitsPage.class, params);- commitsLink.add(new Label("label", commitCount + " commits"));- commitInfoFrag.add(commitsLink);-- params = ProjectBranchesPage.paramsOf(project);- Link<Void> branchesLink = new BookmarkablePageLink<Void>("branches", ProjectBranchesPage.class, params);- try {- int branchCount = project.getRepository().getRefDatabase().getRefsByPrefix(Constants.R_HEADS).size();- branchesLink.add(new Label("label", branchCount + " branches"));- } catch (IOException e) {- throw new RuntimeException(e);- }- commitInfoFrag.add(branchesLink);-- params = ProjectTagsPage.paramsOf(project);- Link<Void> tagsLink = new BookmarkablePageLink<Void>("tags", ProjectTagsPage.class, params);- try {- int tagCount = project.getRepository().getRefDatabase().getRefsByPrefix(Constants.R_TAGS).size();- tagsLink.add(new Label("label", tagCount + " tags"));- } catch (IOException e) {- throw new RuntimeException(e);- }- commitInfoFrag.add(tagsLink);-- fragment.add(commitInfoFrag);-- IModel<Integer> totalCountModel = new LoadableDetachableModel<Integer>() {-- @Override- protected Integer load() {- int totalCount = 0;- for (ProjectPullRequestStats stats: pullRequestStatsModel.getObject()) {- if (stats.getProjectId().equals(projectId))- totalCount += stats.getStatusCount();- }- return totalCount;- }-- };- Fragment pullRequestInfoFrag = new Fragment("pullRequestInfo", "pullRequestInfoFrag", ProjectListPanel.this) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(totalCountModel.getObject() != 0);- }-- };- pullRequestInfoFrag.setDefaultModel(totalCountModel);+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project)) {+ fragment.add(new CodeStatsPanel("codeStats", rowModel));- params = ProjectPullRequestsPage.paramsOf(project);- Link<Void> pullRequestsLink = new BookmarkablePageLink<Void>("pullRequests", ProjectPullRequestsPage.class, params);- pullRequestsLink.add(new Label("label", new AbstractReadOnlyModel<String>() {+ fragment.add(new PullRequestStatsPanel("pullRequestStats", rowModel, new LoadableDetachableModel<Map<PullRequest.Status, Long>>() {@Override- public String getObject() {- return totalCountModel.getObject() + " pull requests";- }-- }));- pullRequestInfoFrag.add(pullRequestsLink);-- pullRequestInfoFrag.add(new ListView<ProjectPullRequestStats>("statuses",- new LoadableDetachableModel<List<ProjectPullRequestStats>>() {-- @Override- protected List<ProjectPullRequestStats> load() {- List<ProjectPullRequestStats> listOfPullRequestStats = new ArrayList<>();+ protected Map<PullRequest.Status, Long> load() {+ Map<PullRequest.Status, Long> statusCounts = new LinkedHashMap<>();for (ProjectPullRequestStats stats: pullRequestStatsModel.getObject()) {if (stats.getProjectId().equals(projectId))- listOfPullRequestStats.add(stats);- }- return listOfPullRequestStats;- }-- }) {-- @Override- protected void populateItem(ListItem<ProjectPullRequestStats> item) {- ProjectPullRequestStats stats = item.getModelObject();- PullRequestQuery query = new PullRequestQuery(- new io.onedev.server.search.entity.pullrequest.StatusCriteria(stats.getPullRequestStatus()));- PageParameters params = ProjectPullRequestsPage.paramsOf(rowModel.getObject(), query.toString(), 0);- Link<Void> statusLink = new BookmarkablePageLink<Void>("link", ProjectPullRequestsPage.class, params);- String statusName = stats.getPullRequestStatus().toString();- statusLink.add(new Label("label", stats.getStatusCount() + " " + statusName));-- String cssClass;- switch (stats.getPullRequestStatus()) {- case OPEN:- cssClass = "link-warning";- break;- case MERGED:- cssClass = "link-success";- break;- default:- cssClass = "link-danger";- break;+ statusCounts.put(stats.getPullRequestStatus(), stats.getStatusCount());}- statusLink.add(AttributeAppender.append("class", cssClass));- item.add(statusLink);+ return statusCounts;}- });-- fragment.add(pullRequestInfoFrag);+ }));} else {- fragment.add(new WebMarkupContainer("codeInfo").setVisible(false));- fragment.add(new WebMarkupContainer("pullRequestInfo").setVisible(false));+ fragment.add(new WebMarkupContainer("codeStats").setVisible(false));+ fragment.add(new WebMarkupContainer("pullRequestStats").setVisible(false));}if (project.isIssueManagement()) {- IModel<Integer> totalCountModel = new LoadableDetachableModel<Integer>() {-- @Override- protected Integer load() {- int totalCount = 0;- for (ProjectIssueStats stats: issueStatsModel.getObject()) {- if (stats.getProjectId().equals(projectId))- totalCount += stats.getStateCount();- }- return totalCount;- }-- };- Fragment issueInfoFrag = new Fragment("issueInfo", "issueInfoFrag", ProjectListPanel.this) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(totalCountModel.getObject() != 0);- }-- };- issueInfoFrag.setDefaultModel(totalCountModel);-- PageParameters params = ProjectIssueListPage.paramsOf(project, null, 0);- Link<Void> issuesLink = new BookmarkablePageLink<Void>("issues", ProjectIssueListPage.class, params);- issuesLink.add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return totalCountModel.getObject() + " issues";- }-- }));- issueInfoFrag.add(issuesLink);-- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();-- issueInfoFrag.add(new ListView<ProjectIssueStats>("states", new LoadableDetachableModel<List<ProjectIssueStats>>() {+ fragment.add(new IssueStatsPanel("issueStats", rowModel, new LoadableDetachableModel<Map<Integer, Long>>() {@Override- protected List<ProjectIssueStats> load() {- List<ProjectIssueStats> listOfIssueStats = new ArrayList<>();+ protected Map<Integer, Long> load() {+ Map<Integer, Long> stateCounts = new LinkedHashMap<>();+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();for (ProjectIssueStats stats: issueStatsModel.getObject()) {if (stats.getProjectId().equals(projectId)&& stats.getStateOrdinal() < issueSetting.getStateSpecs().size()) {- listOfIssueStats.add(stats);+ stateCounts.put(stats.getStateOrdinal(), stats.getStateCount());}}- return listOfIssueStats;- }-- }) {-- @Override- protected void populateItem(ListItem<ProjectIssueStats> item) {- Project project = rowModel.getObject();- ProjectIssueStats stats = item.getModelObject();- StateSpec stateSpec = issueSetting.getStateSpecs().get(stats.getStateOrdinal());- IssueQuery query = new IssueQuery(new StateCriteria(stateSpec.getName(), IssueQueryLexer.Is));- PageParameters params = ProjectIssueListPage.paramsOf(project, query.toString(), 0);- Link<Void> stateLink = new BookmarkablePageLink<Void>("link", ProjectIssueListPage.class, params);- stateLink.add(new Label("label", stats.getStateCount() + " " + stateSpec.getName()));- stateLink.add(AttributeAppender.append("style", "color:" + stateSpec.getColor()));- item.add(stateLink);+ return stateCounts;}- });-- fragment.add(issueInfoFrag);+ }));} else {- fragment.add(new WebMarkupContainer("issueInfo").setVisible(false));+ fragment.add(new WebMarkupContainer("issueStats").setVisible(false));}if (project.isCodeManagement()) {- IModel<Integer> totalCountModel = new LoadableDetachableModel<Integer>() {+ fragment.add(new BuildStatsPanel("buildStats", rowModel, new LoadableDetachableModel<Map<Build.Status, Long>>() {@Override- protected Integer load() {- int totalCount = 0;+ protected Map<Build.Status, Long> load() {+ Map<Build.Status, Long> statusCounts = new LinkedHashMap<>();for (ProjectBuildStats stats: buildStatsModel.getObject()) {if (stats.getProjectId().equals(projectId))- totalCount += stats.getStatusCount();+ statusCounts.put(stats.getBuildStatus(), stats.getStatusCount());}- return totalCount;- }-- };- Fragment buildInfoFrag = new Fragment("buildInfo", "buildInfoFrag", ProjectListPanel.this) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(totalCountModel.getObject() != 0);- }-- };- buildInfoFrag.setDefaultModel(totalCountModel);-- PageParameters params = ProjectBuildsPage.paramsOf(project);- Link<Void> buildsLink = new BookmarkablePageLink<Void>("builds", ProjectBuildsPage.class, params);- buildsLink.add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return totalCountModel.getObject() + " builds";+ return statusCounts;}}));- buildInfoFrag.add(buildsLink);-- buildInfoFrag.add(new ListView<ProjectBuildStats>("statuses",- new LoadableDetachableModel<List<ProjectBuildStats>>() {-- @Override- protected List<ProjectBuildStats> load() {- List<ProjectBuildStats> listOfBuildStats = new ArrayList<>();- for (ProjectBuildStats stats: buildStatsModel.getObject()) {- if (stats.getProjectId().equals(projectId))- listOfBuildStats.add(stats);- }- return listOfBuildStats;- }-- }) {-- @Override- protected void populateItem(ListItem<ProjectBuildStats> item) {- ProjectBuildStats stats = item.getModelObject();- BuildQuery query = new BuildQuery(new StatusCriteria(stats.getBuildStatus()));- PageParameters params = ProjectBuildsPage.paramsOf(rowModel.getObject(), query.toString(), 0);- Link<Void> statusLink = new BookmarkablePageLink<Void>("link", ProjectBuildsPage.class, params);- String statusName = stats.getBuildStatus().toString();- statusLink.add(new Label("label", stats.getStatusCount() + " " + statusName));-- String cssClass;- switch (stats.getBuildStatus()) {- case SUCCESSFUL:- cssClass = "link-success";- break;- case FAILED:- case TIMED_OUT:- case CANCELLED:- cssClass = "link-danger";- break;- default:- cssClass = "link-warning";- }- statusLink.add(AttributeAppender.append("class", cssClass));- item.add(statusLink);- }-- });-- fragment.add(buildInfoFrag);} else {- fragment.add(new WebMarkupContainer("buildInfo").setVisible(false));+ fragment.add(new WebMarkupContainer("buildStats").setVisible(false));}List<ProjectFacade> children = getProjectManager().getChildren(projectId);@@ -1426,11 +1196,15 @@ public class ProjectListPanel extends Panel {protected Project getParentProject() {return null;}++ protected ProjectQuery getBaseQuery() {+ return new ProjectQuery();+ }@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new ProjectCssResourceReference()));+ response.render(CssHeaderItem.forReference(new ProjectListCssResourceReference()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/build/BuildStatsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/stats/build/BuildStatsPanel.htmlnew file mode 100644index 0000000000..c0955b21f7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/build/BuildStatsPanel.html@@ -0,0 +1,7 @@+<wicket:panel>+ <wicket:svg href="play-circle" class="icon mr-2"></wicket:svg>+ <a wicket:id="builds" class="mr-2"><span wicket:id="label"></span></a>+ <wicket:container wicket:id="statuses">+ <a wicket:id="link" class="mr-2"><span wicket:id="label"></span></a>+ </wicket:container>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/build/BuildStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/build/BuildStatsPanel.javanew file mode 100644index 0000000000..1fc501008e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/build/BuildStatsPanel.java@@ -0,0 +1,119 @@+package io.onedev.server.web.component.project.stats.build;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;+import java.util.stream.Collectors;++import org.apache.wicket.behavior.AttributeAppender;+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.Panel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.model.Build.Status;+import io.onedev.server.model.Project;+import io.onedev.server.search.entity.build.BuildQuery;+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;++@SuppressWarnings("serial")+public class BuildStatsPanel extends Panel {++ private final IModel<Project> projectModel;++ private final IModel<Map<Status, Long>> statsModel;++ public BuildStatsPanel(String id, IModel<Project> projectModel, IModel<Map<Status, Long>> statsModel) {+ super(id);++ this.projectModel = projectModel;+ this.statsModel = statsModel;+ }++ private long getTotalCount() {+ return getStats().values().stream().collect(Collectors.summingLong(Long::longValue));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ PageParameters params = ProjectBuildsPage.paramsOf(getProject());+ Link<Void> pullRequestsLink = new BookmarkablePageLink<Void>("builds", ProjectBuildsPage.class, params);+ pullRequestsLink.add(new Label("label", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return getTotalCount() + " builds";+ }++ }));+ add(pullRequestsLink);++ add(new ListView<Map.Entry<Status, Long>>("statuses",+ new LoadableDetachableModel<List<Map.Entry<Status, Long>>>() {++ @Override+ protected List<Map.Entry<Status, Long>> load() {+ return new ArrayList<>(getStats().entrySet());+ }++ }) {++ @Override+ protected void populateItem(ListItem<Map.Entry<Status, Long>> item) {+ Map.Entry<Status, Long> entry = item.getModelObject();+ BuildQuery query = new BuildQuery(+ new io.onedev.server.search.entity.build.StatusCriteria(entry.getKey()));+ PageParameters params = ProjectBuildsPage.paramsOf(getProject(), query.toString(), 0);+ Link<Void> statusLink = new BookmarkablePageLink<Void>("link", ProjectBuildsPage.class, params);+ String statusName = entry.getKey().toString();+ statusLink.add(new Label("label", entry.getValue() + " " + statusName));++ String cssClass;+ switch (entry.getKey()) {+ case SUCCESSFUL:+ cssClass = "link-success";+ break;+ case FAILED:+ case TIMED_OUT:+ case CANCELLED:+ cssClass = "link-danger";+ break;+ default:+ cssClass = "link-warning";+ }+ statusLink.add(AttributeAppender.append("class", cssClass));+ item.add(statusLink);+ }++ });+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getTotalCount() != 0);+ }++ @Override+ protected void onDetach() {+ projectModel.detach();+ statsModel.detach();+ super.onDetach();+ }++ private Project getProject() {+ return projectModel.getObject();+ }++ private Map<Status, Long> getStats() {+ return statsModel.getObject();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.htmlnew file mode 100644index 0000000000..b1352cca9f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.html@@ -0,0 +1,7 @@+<wicket:panel>+ <wicket:svg href="files" class="icon mr-2"></wicket:svg>+ <a wicket:id="files" class="mr-2"><span wicket:id="label"></span></a>+ <a wicket:id="commits" class="mr-2"><span wicket:id="label"></span></a>+ <a wicket:id="branches" class="mr-2"><span wicket:id="label"></span></a>+ <a wicket:id="tags" class="mr-2"><span wicket:id="label"></span></a>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.javanew file mode 100644index 0000000000..428657a646--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/code/CodeStatsPanel.java@@ -0,0 +1,119 @@+package io.onedev.server.web.component.project.stats.code;++import java.io.IOException;++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.panel.GenericPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.Constants;++import io.onedev.server.OneDev;+import io.onedev.server.infomanager.CommitInfoManager;+import io.onedev.server.model.Project;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.branches.ProjectBranchesPage;+import io.onedev.server.web.page.project.commits.ProjectCommitsPage;+import io.onedev.server.web.page.project.tags.ProjectTagsPage;++@SuppressWarnings("serial")+public class CodeStatsPanel extends GenericPanel<Project> {++ private final IModel<Integer> commitCountModel = new LoadableDetachableModel<Integer>() {++ @Override+ protected Integer load() {+ return getCommitInfoManager().getCommitCount(getProject());+ }++ };++ public CodeStatsPanel(String id, IModel<Project> projectModel) {+ super(id, projectModel);+ }++ private CommitInfoManager getCommitInfoManager() {+ return OneDev.getInstance(CommitInfoManager.class);+ }++ private Project getProject() {+ return getModelObject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ PageParameters params = ProjectBlobPage.paramsOf(getProject());+ Link<Void> filesLink = new BookmarkablePageLink<Void>("files", ProjectBlobPage.class, params);+ filesLink.add(new Label("label", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return getCommitInfoManager().getFileCount(getProject()) + " files";+ }++ }));+ add(filesLink);++ params = ProjectCommitsPage.paramsOf(getProject(), null);+ Link<Void> commitsLink = new BookmarkablePageLink<Void>("commits", ProjectCommitsPage.class, params);+ commitsLink.add(new Label("label", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return commitCountModel.getObject() + " commits";+ }++ }));+ add(commitsLink);++ params = ProjectBranchesPage.paramsOf(getProject());+ Link<Void> branchesLink = new BookmarkablePageLink<Void>("branches", ProjectBranchesPage.class, params);+ branchesLink.add(new Label("label", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ try {+ return getProject().getRepository().getRefDatabase().getRefsByPrefix(Constants.R_HEADS).size() + " branches";+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ }));+ add(branchesLink);++ params = ProjectTagsPage.paramsOf(getProject());+ Link<Void> tagsLink = new BookmarkablePageLink<Void>("tags", ProjectTagsPage.class, params);+ tagsLink.add(new Label("label", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ try {+ return getProject().getRepository().getRefDatabase().getRefsByPrefix(Constants.R_TAGS).size() + " tags";+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ }));+ add(tagsLink);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(commitCountModel.getObject() != 0);+ }++ @Override+ protected void onDetach() {+ commitCountModel.detach();+ super.onDetach();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.htmlnew file mode 100644index 0000000000..2a04b7dab2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.html@@ -0,0 +1,7 @@+<wicket:panel>+ <wicket:svg href="bug" class="icon mr-2"></wicket:svg>+ <a wicket:id="issues" class="mr-2"><span wicket:id="label"></span></a>+ <wicket:container wicket:id="states">+ <a wicket:id="link" class="mr-2"><span wicket:id="label"></span></a>+ </wicket:container>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.javanew file mode 100644index 0000000000..35499ac6f3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.java@@ -0,0 +1,116 @@+package io.onedev.server.web.component.project.stats.issue;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;+import java.util.stream.Collectors;++import org.apache.wicket.behavior.AttributeAppender;+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.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.StateSpec;+import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.search.entity.issue.IssueQueryLexer;+import io.onedev.server.search.entity.issue.StateCriteria;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;++@SuppressWarnings("serial")+public class IssueStatsPanel extends Panel {++ private final IModel<Project> projectModel;++ private final IModel<Map<Integer, Long>> statsModel;++ public IssueStatsPanel(String id, IModel<Project> projectModel, IModel<Map<Integer, Long>> statsModel) {+ super(id);++ this.projectModel = projectModel;+ this.statsModel = statsModel;+ }++ private long getTotalCount() {+ return getStats().values().stream().collect(Collectors.summingLong(Long::longValue));+ }++ private GlobalIssueSetting getIssueSetting() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ PageParameters params = ProjectIssueListPage.paramsOf(getProject(), null, 0);+ Link<Void> issuesLink = new BookmarkablePageLink<Void>("issues", ProjectIssueListPage.class, params);+ issuesLink.add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {++ return getTotalCount() + " issues";+ }++ }));+ add(issuesLink);++ add(new ListView<Map.Entry<Integer, Long>>("states", new LoadableDetachableModel<List<Map.Entry<Integer, Long>>>() {++ @Override+ protected List<Map.Entry<Integer, Long>> load() {+ return new ArrayList<>(getStats().entrySet());+ }++ }) {++ @Override+ protected void populateItem(ListItem<Map.Entry<Integer, Long>> item) {+ Project project = getProject();+ Map.Entry<Integer, Long> entry = item.getModelObject();+ StateSpec stateSpec = getIssueSetting().getStateSpecs().get(entry.getKey());+ IssueQuery query = new IssueQuery(new StateCriteria(stateSpec.getName(), IssueQueryLexer.Is));+ PageParameters params = ProjectIssueListPage.paramsOf(project, query.toString(), 0);+ Link<Void> stateLink = new BookmarkablePageLink<Void>("link", ProjectIssueListPage.class, params);+ stateLink.add(new Label("label", entry.getValue() + " " + stateSpec.getName()));+ stateLink.add(AttributeAppender.append("style", "color:" + stateSpec.getColor()));+ item.add(stateLink);+ }++ });++ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getTotalCount() != 0);+ }++ @Override+ protected void onDetach() {+ projectModel.detach();+ statsModel.detach();+ super.onDetach();+ }++ private Project getProject() {+ return projectModel.getObject();+ }++ private Map<Integer, Long> getStats() {+ return statsModel.getObject();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.htmlnew file mode 100644index 0000000000..4a6107505c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.html@@ -0,0 +1,7 @@+<wicket:panel>+ <wicket:svg href="pull-request" class="icon mr-2"></wicket:svg>+ <a wicket:id="pullRequests" class="mr-2"><span wicket:id="label"></span></a>+ <wicket:container wicket:id="statuses">+ <a wicket:id="link" class="mr-2"><span wicket:id="label"></span></a>+ </wicket:container>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.javanew file mode 100644index 0000000000..34c33a0620--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.java@@ -0,0 +1,118 @@+package io.onedev.server.web.component.project.stats.pullrequest;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;+import java.util.stream.Collectors;++import org.apache.wicket.behavior.AttributeAppender;+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.Panel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest.Status;+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;+import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;++@SuppressWarnings("serial")+public class PullRequestStatsPanel extends Panel {++ private final IModel<Project> projectModel;++ private final IModel<Map<Status, Long>> statsModel;++ public PullRequestStatsPanel(String id, IModel<Project> projectModel, IModel<Map<Status, Long>> statsModel) {+ super(id);++ this.projectModel = projectModel;+ this.statsModel = statsModel;+ }++ private long getTotalCount() {+ return getStats().values().stream().collect(Collectors.summingLong(Long::longValue));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ PageParameters params = ProjectPullRequestsPage.paramsOf(getProject());+ Link<Void> pullRequestsLink = new BookmarkablePageLink<Void>("pullRequests", ProjectPullRequestsPage.class, params);+ pullRequestsLink.add(new Label("label", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return getTotalCount() + " pull requests";+ }++ }));+ add(pullRequestsLink);++ add(new ListView<Map.Entry<Status, Long>>("statuses",+ new LoadableDetachableModel<List<Map.Entry<Status, Long>>>() {++ @Override+ protected List<Map.Entry<Status, Long>> load() {+ return new ArrayList<>(getStats().entrySet());+ }++ }) {++ @Override+ protected void populateItem(ListItem<Map.Entry<Status, Long>> item) {+ Map.Entry<Status, Long> entry = item.getModelObject();+ PullRequestQuery query = new PullRequestQuery(+ new io.onedev.server.search.entity.pullrequest.StatusCriteria(entry.getKey()));+ PageParameters params = ProjectPullRequestsPage.paramsOf(getProject(), query.toString(), 0);+ Link<Void> statusLink = new BookmarkablePageLink<Void>("link", ProjectPullRequestsPage.class, params);+ String statusName = entry.getKey().toString();+ statusLink.add(new Label("label", entry.getValue() + " " + statusName));++ String cssClass;+ switch (entry.getKey()) {+ case OPEN:+ cssClass = "link-warning";+ break;+ case MERGED:+ cssClass = "link-success";+ break;+ default:+ cssClass = "link-danger";+ break;+ }+ statusLink.add(AttributeAppender.append("class", cssClass));+ item.add(statusLink);+ }++ });+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getTotalCount() != 0);+ }++ @Override+ protected void onDetach() {+ projectModel.detach();+ statsModel.detach();+ super.onDetach();+ }++ private Project getProject() {+ return projectModel.getObject();+ }++ private Map<Status, Long> getStats() {+ return statsModel.getObject();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.htmlindex 31a31534d9..f38e664078 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html@@ -33,7 +33,7 @@</div></div><wicket:fragment wicket:id="contentFrag">- <div class="primary d-flex flex-wrap mb-3">+ <div class="primary d-flex mb-3"><div class="flex-grow-1 mr-4"><a wicket:id="number" class="number h6 mr-2"></a><span wicket:id="title" class="title h6"></span>@@ -46,11 +46,6 @@<div class="status flex-shrink-0 mr-3 mb-2"><span wicket:id="status"></span></div><div class="review mr-3 mb-2" wicket:id="reviews"></div><div class="jobs mr-3" wicket:id="jobs"></div>- <div class="branches flex-shrink-0 d-none d-lg-block mr-3">- <a wicket:id="target" title="Target"></a>- <wicket:svg href="arrow2" class="text-gray icon rotate-180"/>- <a wicket:id="source" title="Source"></a>- </div><div class="last-update ml-auto d-none d-lg-block text-muted font-size-sm"><a wicket:id="user" class="link-gray"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex fe22a5ee58..9d6f937efe 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -66,7 +66,6 @@ import io.onedev.server.web.WebSession;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.behavior.PullRequestQueryBehavior;-import io.onedev.server.web.component.branch.BranchLink;import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.ActionablePageLink;@@ -771,22 +770,6 @@ public abstract class PullRequestListPanel extends Panel {fragment.add(new RequestStatusBadge("status", rowModel));- fragment.add(new BranchLink("target", request.getTarget()));-- if (request.getSource() != null) {- fragment.add(new BranchLink("source", request.getSource()));- } else {- fragment.add(new Label("source", "<i>unknown</i>") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("span");- }-- }.setEscapeModelStrings(false));- }-LastUpdate lastUpdate = request.getLastUpdate();if (lastUpdate.getUser() != null)fragment.add(new UserIdentPanel("user", lastUpdate.getUser(), Mode.NAME));diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.html b/server-core/src/main/java/io/onedev/server/web/component/revision/AffinalRevisionPicker.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.htmlrename to server-core/src/main/java/io/onedev/server/web/component/revision/AffinalRevisionPicker.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revision/AffinalRevisionPicker.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.javarename to server-core/src/main/java/io/onedev/server/web/component/revision/AffinalRevisionPicker.javaindex 51fd7619c6..a16ca15049 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revision/AffinalRevisionPicker.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.revisionpicker;+package io.onedev.server.web.component.revision;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionPicker.javanew file mode 100644index 0000000000..7a175e405f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionPicker.java@@ -0,0 +1,139 @@+package io.onedev.server.web.component.revision;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.eclipse.jgit.lib.ObjectId;+import org.unbescape.html.HtmlEscape;++import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Project;+import io.onedev.server.util.ProjectAndRevision;+import io.onedev.server.web.asset.icon.IconScope;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.svg.SpriteImage;++@SuppressWarnings("serial")+public abstract class RevisionPicker extends DropdownLink {++ private final IModel<Project> projectModel;++ private String revision;++ private final boolean canCreateRef;++ public RevisionPicker(String id, IModel<Project> projectModel, String revision, boolean canCreateRef) {+ super(id);++ this.projectModel = projectModel;+ this.revision = revision;+ this.canCreateRef = canCreateRef;+ }++ public RevisionPicker(String id, IModel<Project> projectModel, String revision) {+ this(id, projectModel, revision, false);+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ if (projectModel.getObject() != null) {+ return new RevisionSelector(id, projectModel, revision, canCreateRef) {++ @Override+ protected void onSelect(AjaxRequestTarget target, String revision) {+ dropdown.close();+ RevisionPicker.this.revision = revision;+ target.add(RevisionPicker.this);++ RevisionPicker.this.onSelect(target, revision);+ }++ @Override+ protected void onModalOpened(AjaxRequestTarget target, ModalPanel modal) {+ super.onModalOpened(target, modal);+ dropdown.close();+ }++ @Override+ protected String getRevisionUrl(String revision) {+ return RevisionPicker.this.getRevisionUrl(revision);+ }++ };+ } else {+ return new Label(id, "Project not specified yet").add(AttributeAppender.append("class", "m-3 text-danger font-italic"));+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ setEscapeModelStrings(false);+ }++ @Override+ public IModel<?> getBody() {+ if (projectModel.getObject() != null) {+ String icon;+ String label;+ if ("master".equals(revision)) { // default to use master branch when project is empty+ label = "master";+ icon = "branch";+ } else if (revision != null) {+ ProjectAndRevision projectAndRevision = new ProjectAndRevision(projectModel.getObject(), revision);+ label = projectAndRevision.getBranch();+ if (label != null) {+ icon = "branch";+ } else {+ label = projectAndRevision.getTag();+ if (label != null) {+ icon = "tag";+ } else {+ label = revision;+ if (ObjectId.isId(label))+ label = GitUtils.abbreviateSHA(label);+ icon = "commit";+ }+ }+ label = HtmlEscape.escapeHtml5(label);+ } else {+ label = "Choose Revision";+ icon = "";+ }++ return Model.of(String.format(""+ + "<span class='revision-picker text-nowrap'>"+ + " %s"+ + " <span>%s</span>"+ + " <svg class='icon rotate-90'><use xlink:href='%s'/></svg>"+ + "</span>",+ icon.length()!=0?"<svg class='icon'><use xlink:href='" + SpriteImage.getVersionedHref(IconScope.class, icon) + "'/></svg>":"",+ label,+ SpriteImage.getVersionedHref(IconScope.class, "arrow")));+ } else {+ return Model.of("<i>Select project first</i>");+ }+ }++ @Override+ protected void onDetach() {+ projectModel.detach();+ super.onDetach();+ }++ protected abstract void onSelect(AjaxRequestTarget target, String revision);++ @Nullable+ protected String getRevisionUrl(String revision) {+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.html b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.htmlrename to server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.javarename to server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.javaindex b4d8b59a3a..0b7c582660 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.revisionpicker;+package io.onedev.server.web.component.revision;import java.io.IOException;import java.util.ArrayList;@@ -43,7 +43,6 @@ import io.onedev.server.git.RefInfo;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.InputChangeBehavior;import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;import io.onedev.server.web.component.createtag.CreateTagPanel;@@ -307,6 +306,10 @@ public abstract class RevisionSelector extends Panel {}+ protected void updateSelectLinkAjaxAttributes(AjaxRequestAttributes attributes) {++ }+private Component newItem(String itemId, String itemValue) {String ref;if (itemValue.startsWith(COMMIT_FLAG))@@ -318,12 +321,6 @@ public abstract class RevisionSelector extends Panel {AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- }-@Overridepublic void onClick(AjaxRequestTarget target) {if (itemValue.startsWith(ADD_FLAG)) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelectorResourceReference.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelectorResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelectorResourceReference.javaindex 37094c358f..b71fafa239 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelectorResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.revisionpicker;+package io.onedev.server.web.component.revision;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css b/server-core/src/main/java/io/onedev/server/web/component/revision/revision-selector.csssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.cssrename to server-core/src/main/java/io/onedev/server/web/component/revision/revision-selector.cssdiff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js b/server-core/src/main/java/io/onedev/server/web/component/revision/revision-selector.jssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.jsrename to server-core/src/main/java/io/onedev/server/web/component/revision/revision-selector.jsdiff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/search.gif b/server-core/src/main/java/io/onedev/server/web/component/revision/search.gifsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/revisionpicker/search.gifrename to server-core/src/main/java/io/onedev/server/web/component/revision/search.gifdiff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.javadeleted file mode 100644index 65d7863f65..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java+++ /dev/null@@ -1,129 +0,0 @@-package io.onedev.server.web.component.revisionpicker;--import javax.annotation.Nullable;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.eclipse.jgit.lib.ObjectId;-import org.unbescape.html.HtmlEscape;--import io.onedev.server.git.GitUtils;-import io.onedev.server.model.Project;-import io.onedev.server.util.ProjectAndRevision;-import io.onedev.server.web.asset.icon.IconScope;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.svg.SpriteImage;--@SuppressWarnings("serial")-public abstract class RevisionPicker extends DropdownLink {-- private final IModel<Project> projectModel;-- private String revision;-- private final boolean canCreateRef;-- public RevisionPicker(String id, IModel<Project> projectModel, String revision, boolean canCreateRef) {- super(id);-- this.projectModel = projectModel;- this.revision = revision;- this.canCreateRef = canCreateRef;- }-- public RevisionPicker(String id, IModel<Project> projectModel, String revision) {- this(id, projectModel, revision, false);- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new RevisionSelector(id, projectModel, revision, canCreateRef) {-- @Override- protected void onSelect(AjaxRequestTarget target, String revision) {- dropdown.close();- RevisionPicker.this.revision = revision;- target.add(RevisionPicker.this);-- RevisionPicker.this.onSelect(target, revision);- }-- @Override- protected void onModalOpened(AjaxRequestTarget target, ModalPanel modal) {- super.onModalOpened(target, modal);- dropdown.close();- }-- @Override- protected String getRevisionUrl(String revision) {- return RevisionPicker.this.getRevisionUrl(revision);- }-- };- }-- @Override- protected void onInitialize() {- super.onInitialize();-- setEscapeModelStrings(false);- }-- @Override- public IModel<?> getBody() {- String icon;- String label;- if ("master".equals(revision)) { // default to use master branch when project is empty- label = "master";- icon = "branch";- } else if (revision != null) {- ProjectAndRevision projectAndRevision = new ProjectAndRevision(projectModel.getObject(), revision);- label = projectAndRevision.getBranch();- if (label != null) {- icon = "branch";- } else {- label = projectAndRevision.getTag();- if (label != null) {- icon = "tag";- } else {- label = revision;- if (ObjectId.isId(label))- label = GitUtils.abbreviateSHA(label);- icon = "commit";- }- }- label = HtmlEscape.escapeHtml5(label);- } else {- label = "Choose Revision";- icon = "";- }-- return Model.of(String.format(""- + "<span class='revision-picker text-nowrap'>"- + " %s"- + " <span>%s</span>"- + " <svg class='icon rotate-90'><use xlink:href='%s'/></svg>"- + "</span>",- icon.length()!=0?"<svg class='icon'><use xlink:href='" + SpriteImage.getVersionedHref(IconScope.class, icon) + "'/></svg>":"",- label,- SpriteImage.getVersionedHref(IconScope.class, "arrow")));- }-- @Override- protected void onDetach() {- projectModel.detach();- super.onDetach();- }-- protected abstract void onSelect(AjaxRequestTarget target, String revision);-- @Nullable- protected String getRevisionUrl(String revision) {- return null;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.javaindex 01540de3d0..014331fdf9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java@@ -146,11 +146,6 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {setVisible(SecurityUtils.getUser() != null && (getQueryPersonalization() != null || canEditCommonQueries()));}- @Override- protected String getModalCssClass() {- return "modal-lg";- }-private Component newPersonalQueriesEditor(String componentId, ModalPanel modal) {ArrayList<T> personalQueries = getQueryPersonalization().getQueries();return new NamedQueriesEditor(componentId, personalQueries, null) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.javaindex 368c3ecc39..1d976ed6cf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.java@@ -1,6 +1,5 @@package io.onedev.server.web.component.suggestionapply;-import java.io.Serializable;import java.util.List;import javax.annotation.Nullable;@@ -37,19 +36,18 @@ import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;@SuppressWarnings("serial")-public abstract class SuggestionApplyModalPanel extends BeanEditModalPanel {+public abstract class SuggestionApplyModalPanel extends BeanEditModalPanel<SuggestionApplyBean> {public SuggestionApplyModalPanel(IPartialPageRequestHandler handler, SuggestionApplyBean bean) {super(handler, bean);}@Override- protected void onSave(AjaxRequestTarget target, Serializable bean) {- SuggestionApplyBean suggestionApplyBean = (SuggestionApplyBean) bean;+ protected void onSave(AjaxRequestTarget target, SuggestionApplyBean bean) {CodeComment comment = getComment();BlobEdits blobEdits = new BlobEdits();- String branch = suggestionApplyBean.getBranch();+ String branch = bean.getBranch();Project project;PullRequest request = getPullRequest();@@ -62,7 +60,7 @@ public abstract class SuggestionApplyModalPanel extends BeanEditModalPanel {ObjectId commitId = project.getObjectId(branch, true);try {blobEdits.applySuggestion(project, mark, getSuggestion(), commitId);- String commitMessage = suggestionApplyBean.getCommitMessage();+ String commitMessage = bean.getCommitMessage();GpgSetting gpgSetting = OneDev.getInstance(SettingManager.class).getGpgSetting();ObjectId newCommitId = blobEdits.commit(diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.javaindex d9ee305bc9..d9c20c3fd1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java@@ -214,11 +214,6 @@ public abstract class TaskButton extends AjaxButton {}}- @Override- protected String getCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id) {return new TaskFeedbackPanel(id, StringUtils.capitalize(title)) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectCssResourceReference.javanew file mode 100644index 0000000000..19c335dec1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.typeselect;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class TypeSelectCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public TypeSelectCssResourceReference() {+ super(TypeSelectCssResourceReference.class, "type-select.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.html b/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.htmlnew file mode 100644index 0000000000..7321589d74--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.html@@ -0,0 +1,15 @@+<wicket:panel>+ <div class="type-select">+ <input wicket:id="input" class="form-control" placeholder="Type to filter">+ <div wicket:id="content" class="content mt-3"></div>+ </div>+ <wicket:fragment wicket:id="groupNodeFrag">+ <a wicket:id="link" class="selectable"><span wicket:id="label"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="typeNodeFrag">+ <a wicket:id="link" class="selectable">+ <span wicket:id="label"></span>+ <div wicket:id="description" class="font-size-sm text-muted text-wrap"></div>+ </a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.java b/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.javanew file mode 100644index 0000000000..fa4e85c680--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.java@@ -0,0 +1,359 @@+package io.onedev.server.web.component.typeselect;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.HashSet;+import java.util.Iterator;+import java.util.List;+import java.util.Set;++import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxChannel;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;+import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;++import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.loader.ImplementationRegistry;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.util.Similarities;+import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;+import io.onedev.server.web.behavior.OnTypingDoneBehavior;+import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;+import io.onedev.server.web.editable.EditableUtils;++@SuppressWarnings("serial")+public abstract class TypeSelectPanel<T extends Serializable> extends Panel {++ private final List<Class<? extends T>> types;++ @SuppressWarnings("unchecked")+ public TypeSelectPanel(String id) {+ super(id);++ List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(TypeSelectPanel.class, getClass());+ Class<? extends T> baseType = (Class<T>) typeArguments.get(0);++ ImplementationRegistry registry = AppLoader.getInstance(ImplementationRegistry.class);+ types = new ArrayList<>(registry.getImplementations(baseType));+ EditableUtils.sortAnnotatedElements(types);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField = new TextField<>("input", Model.of(""));+ add(searchField);++ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.setChannel(new AjaxChannel("type-choice", AjaxChannel.Type.DROP));+ }++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ String searchInput = StringUtils.trimToNull(searchField.getInput());++ List<TreeNode> nodes = getNodes();++ NestedTree<TreeNode> tree;+ if (searchInput != null) {+ List<TreeNode> similarNodes = new Similarities<TreeNode>(nodes) {++ @Override+ protected double getSimilarScore(TreeNode item) {+ String fullName = item.getName();+ if (item instanceof TypeNode) {+ TypeNode<?> typeNode = (TypeNode<?>) item;+ String groupName = EditableUtils.getGroup(typeNode.type);+ if (groupName != null)+ fullName = groupName + "/" + fullName;+ }+ return Similarities.getSimilarScore(+ StringUtils.deleteWhitespace(fullName),+ StringUtils.deleteWhitespace(searchInput));+ }++ };++ List<TreeNode> filteredNodes = new ArrayList<>();++ Set<String> addedGroups = new HashSet<>();+ for (TreeNode matchNode: similarNodes) {+ if (matchNode instanceof TypeNode) {+ @SuppressWarnings("unchecked")+ TypeNode<T> currentNode = (TypeNode<T>) matchNode;+ filteredNodes.add(currentNode);+ String group = EditableUtils.getGroup(currentNode.type);+ if (group != null && addedGroups.add(group))+ filteredNodes.add(new GroupNode(group));+ }+ }+ tree = newTree(filteredNodes, new HashSet<>(filteredNodes));+ } else {+ tree = newTree(nodes, new HashSet<>());+ }++ replace(tree);+ target.add(tree);+ }++ });++ add(newTree(getNodes(), new HashSet<>()));+ setOutputMarkupId(true);+ }++ @SuppressWarnings({ "rawtypes", "unchecked" })+ private List<TreeNode> getNodes() {+ List<TreeNode> nodes = new ArrayList<>();++ Set<String> addedGroups = new HashSet<>();+ for (Class<? extends T> type: types) {+ String group = EditableUtils.getGroup(type);+ if (group != null && addedGroups.add(group))+ nodes.add(new GroupNode(group));+ nodes.add(new TypeNode(type));+ }++ return nodes;+ }++ protected List<TreeNode> getChildNodes(List<TreeNode> nodes, TreeNode parentNode) {+ List<TreeNode> childNodes = new ArrayList<>();+ if (parentNode == null) {+ for (TreeNode node: nodes) {+ if (node instanceof GroupNode) {+ childNodes.add(node);+ } else {+ @SuppressWarnings("unchecked")+ TypeNode<T> typeNode = (TypeNode<T>) node;+ if (EditableUtils.getGroup(typeNode.type) == null)+ childNodes.add(node);+ }+ }+ } else {+ for (TreeNode node: nodes) {+ if (node instanceof TypeNode) {+ @SuppressWarnings("unchecked")+ TypeNode<T> typeNode = (TypeNode<T>) node;+ if (parentNode.getName().equals(EditableUtils.getGroup(typeNode.type)))+ childNodes.add(node);+ }+ }+ }+ return childNodes;+ }++ private NestedTree<TreeNode> newTree(List<TreeNode> nodes, Set<TreeNode> state) {+ NestedTree<TreeNode> tree = new NestedTree<TreeNode>("content", new ITreeProvider<TreeNode>() {++ @Override+ public void detach() {+ }++ @Override+ public Iterator<? extends TreeNode> getRoots() {+ return getChildNodes(nodes, null).iterator();+ }++ @Override+ public boolean hasChildren(TreeNode node) {+ return node instanceof GroupNode;+ }++ @Override+ public Iterator<? extends TreeNode> getChildren(TreeNode node) {+ return getChildNodes(nodes, node).iterator();+ }++ @Override+ public IModel<TreeNode> model(TreeNode object) {+ return Model.of(object);+ }++ }, Model.ofSet(state)) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new HumanTheme());+ }++ @Override+ protected Component newContentComponent(String id, IModel<TreeNode> nodeModel) {+ TreeNode node = nodeModel.getObject();++ if (node instanceof GroupNode) {+ Fragment fragment = new Fragment(id, "groupNodeFrag", TypeSelectPanel.this);++ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (getState(node) == State.COLLAPSED)+ expand(node);+ else+ collapse(node);+ }++ };+ link.add(new Label("label", node.getName()));+ fragment.add(link);++ return fragment;+ } else {+ Fragment fragment = new Fragment(id, "typeNodeFrag", TypeSelectPanel.this);++ @SuppressWarnings("unchecked")+ TypeNode<T> typeNode = (TypeNode<T>) node;+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onSelect(target, typeNode.type);+ }++ };+ link.add(new Label("label", EditableUtils.getDisplayName(typeNode.type)));++ for (TreeNode each: nodes) {+ if (each instanceof TypeNode) {+ if (node.equals(each))+ link.add(AttributeAppender.append("class", "active"));+ break;+ }+ }+ fragment.add(link);++ String description = StringUtils.trimToNull(StringUtils.substringBefore(+ EditableUtils.getDescription(typeNode.type), "."));+ if (description != null)+ link.add(new Label("description", description).setEscapeModelStrings(false));+ else+ link.add(new WebMarkupContainer("description").setVisible(false));++ return fragment;+ }+ }++ };++ tree.setOutputMarkupId(true);++ return tree;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(CssHeaderItem.forReference(new TypeSelectCssResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new SelectByTypingResourceReference()));++ String script = String.format("$('#%s>.type-select>input').selectByTyping('#%s>.type-select>div');",+ getMarkupId(), getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ protected abstract void onSelect(AjaxRequestTarget target, Class<? extends T> type);++ private static interface TreeNode extends Serializable {++ String getName();++ }++ private static class GroupNode implements TreeNode {++ private final String name;++ public GroupNode(String name) {+ this.name = name;+ }++ @Override+ public String getName() {+ return name;+ }++ @Override+ public boolean equals(Object other) {+ if (this == other) {+ return true;+ } else if (other instanceof GroupNode) {+ GroupNode otherNode = (GroupNode) other;+ return new EqualsBuilder().append(getName(), otherNode.getName()).isEquals();+ } else {+ return false;+ }+ }++ @Override+ public int hashCode() {+ if (getName() == null)+ return super.hashCode();+ else+ return new HashCodeBuilder(17, 37).append(getName()).toHashCode();+ }++ }++ private static class TypeNode<T> implements TreeNode {++ private final Class<T> type;++ public TypeNode(Class<T> type) {+ this.type = type;+ }++ @Override+ public String getName() {+ return EditableUtils.getDisplayName(type);+ }++ @Override+ public boolean equals(Object other) {+ if (this == other) {+ return true;+ } else if (other instanceof TypeNode) {+ @SuppressWarnings("unchecked")+ TypeNode<T> otherNode = (TypeNode<T>) other;+ return new EqualsBuilder().append(type, otherNode.type).isEquals();+ } else {+ return false;+ }+ }++ @Override+ public int hashCode() {+ if (getName() == null)+ return super.hashCode();+ else+ return new HashCodeBuilder(17, 37).append(type).toHashCode();+ }++ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/typeselect/type-select.css b/server-core/src/main/java/io/onedev/server/web/component/typeselect/type-select.cssnew file mode 100644index 0000000000..4591be7743--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/typeselect/type-select.css@@ -0,0 +1,4 @@+.type-select {+ padding: 24px 18px 24px 18px;+}+diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.javaindex 30368526fb..cb1c97ec37 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java@@ -183,4 +183,12 @@ public class EditableUtils {annotatedElements.sort((element1, element2) -> getOrder(element1) - getOrder(element2));}+ public static String getGroupedType(Class<?> clazz) {+ Editable editable = clazz.getAnnotation(Editable.class);+ if (editable != null && editable.group().length() != 0)+ return editable.group() + " / " + getDisplayName(clazz);+ else+ return getDisplayName(clazz);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BlobChoice.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BlobChoice.javanew file mode 100644index 0000000000..75ce78927b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BlobChoice.java@@ -0,0 +1,16 @@+package io.onedev.server.web.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Target(ElementType.METHOD)+@Retention(RetentionPolicy.RUNTIME)+public @interface BlobChoice {++ String commitProvider();++ String patterns() default "**";++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/RevisionPick.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/RevisionChoice.javasimilarity index 81%rename from server-core/src/main/java/io/onedev/server/web/editable/annotation/RevisionPick.javarename to server-core/src/main/java/io/onedev/server/web/editable/annotation/RevisionChoice.javaindex 2fda02b5a4..eaf1cf3bf2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/RevisionPick.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/RevisionChoice.java@@ -7,5 +7,6 @@ import java.lang.annotation.Target;@Target(ElementType.METHOD)@Retention(RetentionPolicy.RUNTIME)-public @interface RevisionPick {+public @interface RevisionChoice {+ String value() default "";}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditSupport.javasimilarity index 80%rename from server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditSupport.javaindex 7895fc5d09..2b8a06a9a6 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.revisionpick;+package io.onedev.server.web.editable.blobchoice;import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Method;@@ -13,15 +13,15 @@ import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;-import io.onedev.server.web.editable.annotation.RevisionPick;+import io.onedev.server.web.editable.annotation.BlobChoice;@SuppressWarnings("serial")-public class RevisionPickEditSupport implements EditSupport {+public class BlobChoiceEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {Method propertyGetter = descriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(RevisionPick.class) != null) {+ if (propertyGetter.getAnnotation(BlobChoice.class) != null) {if (propertyGetter.getReturnType() == String.class) {return new PropertyContext<String>(descriptor) {@@ -50,12 +50,12 @@ public class RevisionPickEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new RevisionPickEditor(componentId, descriptor, model);+ return new BlobChoiceEditor(componentId, descriptor, model);}};} else {- throw new RuntimeException("Annotation 'RevisionPick' should be applied to property with type 'String'");+ throw new RuntimeException("Annotation 'BlobChoice' should be applied to property with type 'String'");}} else {return null;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditor.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditor.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditor.javanew file mode 100644index 0000000000..8916b41f1f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditor.java@@ -0,0 +1,114 @@+package io.onedev.server.web.editable.blobchoice;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.git.BlobIdent;+import io.onedev.server.git.BlobIdentFilter;+import io.onedev.server.util.ComponentContext;+import io.onedev.server.util.ProjectScopedCommit;+import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.util.match.PathMatcher;+import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.web.component.blob.BlobPicker;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.annotation.BlobChoice;++@SuppressWarnings("serial")+public class BlobChoiceEditor extends PropertyEditor<String> {++ private final IModel<ProjectScopedCommit> commitModel = new LoadableDetachableModel<ProjectScopedCommit>() {++ @Override+ protected ProjectScopedCommit load() {+ ComponentContext.push(new ComponentContext(BlobChoiceEditor.this));+ try {+ BlobChoice blobChoice = descriptor.getPropertyGetter().getAnnotation(BlobChoice.class);+ return (ProjectScopedCommit) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), blobChoice.commitProvider());+ } finally {+ ComponentContext.pop();+ }+ }++ };++ private final IModel<PatternSet> patternsModel = new LoadableDetachableModel<PatternSet>() {++ @Override+ protected PatternSet load() {+ ComponentContext.push(new ComponentContext(BlobChoiceEditor.this));+ try {+ BlobChoice blobChoice = descriptor.getPropertyGetter().getAnnotation(BlobChoice.class);+ return PatternSet.parse(blobChoice.patterns());+ } finally {+ ComponentContext.pop();+ }+ }++ };++ private String blobPath;++ public BlobChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ IModel<String> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ blobPath = propertyModel.getObject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(newBlobPicker());+ }++ private BlobPicker newBlobPicker() {+ return new BlobPicker("picker", commitModel, blobPath) {++ @Override+ protected void onSelect(AjaxRequestTarget target, String blobPath) {+ BlobChoiceEditor.this.blobPath = blobPath;+ BlobPicker blobPicker = newBlobPicker();+ getParent().replace(blobPicker);+ target.add(blobPicker);+ onPropertyUpdating(target);+ }++ @Override+ protected BlobIdentFilter getBlobIdentFilter() {++ return new BlobIdentFilter() {++ @Override+ public boolean filter(BlobIdent blobIdent) {+ return blobIdent.isTree() || patternsModel.getObject().matches(new PathMatcher(), blobIdent.path);+ }++ };+ }++ };+ }++ @Override+ protected void onDetach() {+ commitModel.detach();+ patternsModel.detach();+ super.onDetach();+ }++ @Override+ protected String convertInputToValue() throws ConversionException {+ return blobPath;+ }++ @Override+ public boolean needExplicitSubmit() {+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.htmldeleted file mode 100644index a217ecc33d..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.html+++ /dev/null@@ -1,30 +0,0 @@-<wicket:panel>- <form wicket:id="form" class="step-edit leave-confirm">- <div class="modal-header">- <h5 id="modal-title" class="modal-title">Step</h5>- <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>- </div>- <div class="modal-body">- <a wicket:id="type" class="btn btn-outline-secondary"><span wicket:id="label"></span> <wicket:svg href="arrow" class="icon rotate-90"/></a>- <div wicket:id="description" class="text-muted font-size-sm mt-2"></div>- <div wicket:id="editor" class="mt-3"></div>- </div>- <div class="modal-footer">- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>- </div>- </form>- <wicket:fragment wicket:id="stepTypeChoiceFrag">- <input wicket:id="input" class="form-control" placeholder="Type to filter">- <div wicket:id="content" class="content mt-3"></div>- </wicket:fragment>- <wicket:fragment wicket:id="groupNodeFrag">- <a wicket:id="link" class="selectable"><span wicket:id="label"></span></a>- </wicket:fragment>- <wicket:fragment wicket:id="stepNodeFrag">- <a wicket:id="link" class="selectable">- <span wicket:id="label"></span>- <div wicket:id="description" class="font-size-sm text-muted text-wrap"></div>- </a>- </wicket:fragment>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.javaindex 800ebf91b3..00e4a06c42 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java@@ -1,512 +1,36 @@package io.onedev.server.web.editable.buildspec.step;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.HashSet;-import java.util.Iterator;import java.util.List;-import java.util.Set;-import org.apache.commons.lang3.builder.EqualsBuilder;-import org.apache.commons.lang3.builder.HashCodeBuilder;-import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxChannel;+import javax.annotation.Nullable;+import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;-import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;-import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.commons.loader.AppLoader;-import io.onedev.commons.loader.ImplementationRegistry;-import io.onedev.commons.utils.StringUtils;+import com.google.common.collect.Sets;+import io.onedev.server.buildspec.BuildSpecAware;import io.onedev.server.buildspec.ParamSpecAware;import io.onedev.server.buildspec.step.Step;-import io.onedev.server.util.Similarities;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;-import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.editable.EditableUtils;@SuppressWarnings("serial")-abstract class StepEditPanel extends Panel implements BuildSpecAware, ParamSpecAware {+abstract class StepEditPanel extends BeanEditModalPanel<Step> implements BuildSpecAware, ParamSpecAware {- private static final List<Class<? extends Step>> stepClasses = new ArrayList<>();-- static {- ImplementationRegistry registry = AppLoader.getInstance(ImplementationRegistry.class);- stepClasses.addAll(registry.getImplementations(Step.class));- EditableUtils.sortAnnotatedElements(stepClasses);+ public StepEditPanel(AjaxRequestTarget target, Step step) {+ super(target, step, Sets.newHashSet(), true, EditableUtils.getGroupedType(step.getClass()));}-- private final List<Step> steps;-- private final int stepIndex;-- private Step step;-- public StepEditPanel(String id, List<Step> steps, int stepIndex) {- super(id);-- this.steps = steps;- this.stepIndex = stepIndex;-- if (stepIndex != -1)- step = steps.get(stepIndex);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onError() {- super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);- }-- };-- form.add(new AjaxLink<Void>("close") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(StepEditPanel.this));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });-- form.add(new DropdownLink("type") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- if (step != null)- return Step.getGroupedType(step.getClass());- else- return "Please select type";- }-- }));- }-- @Override- protected void onInitialize(FloatingPanel dropdown) {- super.onInitialize(dropdown);- dropdown.add(AttributeAppender.append("class", "step-type-choice"));- }-- private List<TreeNode> getNodes() {- List<TreeNode> nodes = new ArrayList<>();-- Set<String> addedGroups = new HashSet<>();- for (Class<? extends Step> stepClass: stepClasses) {- String group = EditableUtils.getGroup(stepClass);- if (group != null && addedGroups.add(group))- nodes.add(new GroupNode(group));- nodes.add(new StepNode(stepClass));- }-- return nodes;- }-- protected List<TreeNode> getChildNodes(List<TreeNode> nodes, TreeNode parentNode) {- List<TreeNode> childNodes = new ArrayList<>();- if (parentNode == null) {- for (TreeNode node: nodes) {- if (node instanceof GroupNode) {- childNodes.add(node);- } else {- StepNode stepNode = (StepNode) node;- if (EditableUtils.getGroup(stepNode.stepClass) == null)- childNodes.add(node);- }- }- } else {- for (TreeNode node: nodes) {- if (node instanceof StepNode) {- StepNode stepNode = (StepNode) node;- if (parentNode.getName().equals(EditableUtils.getGroup(stepNode.stepClass)))- childNodes.add(node);- }- }- }- return childNodes;- }-- private NestedTree<TreeNode> newTree(FloatingPanel dropdown, List<TreeNode> nodes, Set<TreeNode> state) {- NestedTree<TreeNode> tree = new NestedTree<TreeNode>("content", new ITreeProvider<TreeNode>() {-- @Override- public void detach() {- }-- @Override- public Iterator<? extends TreeNode> getRoots() {- return getChildNodes(nodes, null).iterator();- }-- @Override- public boolean hasChildren(TreeNode node) {- return node instanceof GroupNode;- }-- @Override- public Iterator<? extends TreeNode> getChildren(TreeNode node) {- return getChildNodes(nodes, node).iterator();- }-- @Override- public IModel<TreeNode> model(TreeNode object) {- return Model.of(object);- }-- }, Model.ofSet(state)) {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new HumanTheme());- }-- @Override- protected Component newContentComponent(String id, IModel<TreeNode> nodeModel) {- TreeNode node = nodeModel.getObject();-- if (node instanceof GroupNode) {- Fragment fragment = new Fragment(id, "groupNodeFrag", StepEditPanel.this);-- AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {- @Override- public void onClick(AjaxRequestTarget target) {- if (getState(node) == State.COLLAPSED)- expand(node);- else- collapse(node);- }-- };- link.add(new Label("label", node.getName()));- fragment.add(link);-- return fragment;- } else {- Fragment fragment = new Fragment(id, "stepNodeFrag", StepEditPanel.this);-- StepNode stepNode = (StepNode) node;- AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {-- @Override- public void onClick(AjaxRequestTarget target) {- try {- Step newStep = stepNode.stepClass.newInstance();- if (step != null) {- newStep.setName(step.getName());- newStep.setCondition(step.getCondition());- }- step = newStep;-- String description = getDescription();- if (description != null)- form.replace(new Label("description", description).setEscapeModelStrings(false));- else- form.replace(new WebMarkupContainer("description").setVisible(false));-- BeanEditor editor = BeanContext.edit("editor", step);- form.replace(editor);- target.add(form);-- String script = String.format("onedev.server.form.markDirty($('#%s'));",- form.getMarkupId());- target.appendJavaScript(script);- } catch (InstantiationException | IllegalAccessException e) {- throw new RuntimeException(e);- }- dropdown.close();- }-- };- link.add(new Label("label", EditableUtils.getDisplayName(stepNode.stepClass)));-- for (TreeNode each: nodes) {- if (each instanceof StepNode) {- if (node.equals(each))- link.add(AttributeAppender.append("class", "active"));- break;- }- }- fragment.add(link);-- String description = StringUtils.trimToNull(StringUtils.substringBefore(- EditableUtils.getDescription(stepNode.stepClass), "."));- if (description != null)- link.add(new Label("description", description).setEscapeModelStrings(false));- else- link.add(new WebMarkupContainer("description").setVisible(false));-- return fragment;- }- }-- };-- tree.setOutputMarkupId(true);-- return tree;- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- Fragment fragment = new Fragment(id, "stepTypeChoiceFrag", StepEditPanel.this) {-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new SelectByTypingResourceReference()));-- String script = String.format("$('#%s>input').selectByTyping('#%s>div');",- getMarkupId(), getMarkupId());- response.render(OnDomReadyHeaderItem.forScript(script));- }-- };-- TextField<String> searchField = new TextField<>("input", Model.of(""));- fragment.add(searchField);-- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.setChannel(new AjaxChannel("step-choice", AjaxChannel.Type.DROP));- }-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- String searchInput = StringUtils.trimToNull(searchField.getInput());-- List<TreeNode> nodes = getNodes();-- NestedTree<TreeNode> tree;- if (searchInput != null) {- List<TreeNode> similarNodes = new Similarities<TreeNode>(nodes) {-- @Override- protected double getSimilarScore(TreeNode item) {- String fullName = item.getName();- if (item instanceof StepNode) {- StepNode stepNode = (StepNode) item;- String groupName = EditableUtils.getGroup(stepNode.stepClass);- if (groupName != null)- fullName = groupName + "/" + fullName;- }- return Similarities.getSimilarScore(- StringUtils.deleteWhitespace(fullName),- StringUtils.deleteWhitespace(searchInput));- }-- };-- List<TreeNode> filteredNodes = new ArrayList<>();-- Set<String> addedGroups = new HashSet<>();- for (TreeNode matchNode: similarNodes) {- if (matchNode instanceof StepNode) {- StepNode currentNode = (StepNode) matchNode;- filteredNodes.add(currentNode);- String group = EditableUtils.getGroup(currentNode.stepClass);- if (group != null && addedGroups.add(group))- filteredNodes.add(new GroupNode(group));- }- }- tree = newTree(dropdown, filteredNodes, new HashSet<>(filteredNodes));- } else {- tree = newTree(dropdown, nodes, new HashSet<>());- }-- fragment.replace(tree);- target.add(tree);- }-- });-- fragment.add(newTree(dropdown, getNodes(), new HashSet<>()));- fragment.setOutputMarkupId(true);-- return fragment;- }-- });-- String description = getDescription();- if (description != null)- form.add(new Label("description", description).setEscapeModelStrings(false));- else- form.add(new WebMarkupContainer("description").setVisible(false));-- if (step != null)- form.add(BeanContext.edit("editor", step));+ @Nullable+ private static Step getStep(List<Step> steps, int stepIndex) {+ if (stepIndex != -1)+ return steps.get(stepIndex);else- form.add(new WebMarkupContainer("editor").setOutputMarkupPlaceholderTag(true).setVisible(false));-- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- if (stepIndex != -1)- steps.set(stepIndex, step);- else- steps.add(step);-- onSave(target);- }-- });-- form.add(new AjaxLink<Void>("cancel") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(StepEditPanel.this));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });- form.setOutputMarkupId(true);-- add(form);- }-- private String getDescription() {- if (step != null) {- return StringUtils.trimToNull(StringUtils.stripStart(- EditableUtils.getDescription(step.getClass()), "."));- } else {return null;- }}- protected abstract void onSave(AjaxRequestTarget target);-- protected abstract void onCancel(AjaxRequestTarget target);-- private static interface TreeNode extends Serializable {-- String getName();-- }-- private static class GroupNode implements TreeNode {-- private final String name;-- public GroupNode(String name) {- this.name = name;- }-- @Override- public String getName() {- return name;- }-- @Override- public boolean equals(Object other) {- if (this == other) {- return true;- } else if (other instanceof GroupNode) {- GroupNode otherNode = (GroupNode) other;- return new EqualsBuilder().append(getName(), otherNode.getName()).isEquals();- } else {- return false;- }- }-- @Override- public int hashCode() {- if (getName() == null)- return super.hashCode();- else- return new HashCodeBuilder(17, 37).append(getName()).toHashCode();- }-+ @Override+ protected void onCancel(AjaxRequestTarget target) {}-- private static class StepNode implements TreeNode {-- private final Class<? extends Step> stepClass;-- public StepNode(Class<? extends Step> stepClass) {- this.stepClass = stepClass;- }- @Override- public String getName() {- return EditableUtils.getDisplayName(stepClass);- }-- @Override- public boolean equals(Object other) {- if (this == other) {- return true;- } else if (other instanceof StepNode) {- StepNode otherNode = (StepNode) other;- return new EqualsBuilder().append(stepClass, otherNode.stepClass).isEquals();- } else {- return false;- }- }-- @Override- public int hashCode() {- if (getName() == null)- return super.hashCode();- else- return new HashCodeBuilder(17, 37).append(stepClass).toHashCode();- }-- }}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.javaindex 5fb54b9dfb..8118f5e4c6 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java@@ -37,9 +37,11 @@ import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;-import io.onedev.server.web.component.modal.ModalLink;-import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.floating.AlignPlacement;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.svg.SpriteImage;+import io.onedev.server.web.component.typeselect.TypeSelectPanel;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@@ -61,40 +63,48 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected void onInitialize() {super.onInitialize();- add(new ModalLink("addNew") {++ add(new DropdownLink("addNew", false, AlignPlacement.bottom(0), true) {@Override- protected String getModalCssClass() {- return "modal-lg";- }-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new StepEditPanel(id, steps, -1) {+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new TypeSelectPanel<Step>(id) {@Override- public BuildSpec getBuildSpec() {- return StepListEditPanel.this.getBuildSpec();- }+ protected void onSelect(AjaxRequestTarget target, Class<? extends Step> type) {+ dropdown.close();++ Step step;+ try {+ step = type.newInstance();+ } catch (InstantiationException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }++ new StepEditPanel(target, step) {- @Override- public List<ParamSpec> getParamSpecs() {- return StepListEditPanel.this.getParamSpecs();- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }+ @Override+ protected void onSave(AjaxRequestTarget target, Step bean) {+ steps.add(bean);+ markFormDirty(target);+ close();+ onPropertyUpdating(target);+ target.add(StepListEditPanel.this);+ }- @Override- protected void onSave(AjaxRequestTarget target) {- markFormDirty(target);- modal.close();- onPropertyUpdating(target);- target.add(StepListEditPanel.this);- }+ @Override+ public BuildSpec getBuildSpec() {+ return StepListEditPanel.this.getBuildSpec();+ }+ @Override+ public List<ParamSpec> getParamSpecs() {+ return StepListEditPanel.this.getParamSpecs();+ }++ };+ }+};}@@ -148,35 +158,26 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> rowModel) {Fragment fragment = new Fragment(componentId, "actionColumnFrag", StepListEditPanel.this);- fragment.add(new ModalLink("edit") {+ fragment.add(new AjaxLink<Void>("edit") {@Override- protected String getModalCssClass() {- return "modal-lg";- }-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new StepEditPanel(id, steps, cellItem.findParent(Item.class).getIndex()) {-- @Override- public BuildSpec getBuildSpec() {- return StepListEditPanel.this.getBuildSpec();- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }+ public void onClick(AjaxRequestTarget target) {+ Step step = steps.get(cellItem.findParent(Item.class).getIndex());+ new StepEditPanel(target, step) {@Override- protected void onSave(AjaxRequestTarget target) {+ protected void onSave(AjaxRequestTarget target, Step bean) {markFormDirty(target);- modal.close();+ close();onPropertyUpdating(target);target.add(StepListEditPanel.this);}+ @Override+ public BuildSpec getBuildSpec() {+ return StepListEditPanel.this.getBuildSpec();+ }+@Overridepublic List<ParamSpec> getParamSpecs() {return StepListEditPanel.this.getParamSpecs();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.cssindex 82c4edf9a0..e8be9c3770 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css@@ -3,13 +3,3 @@width: 600px;}}--.floating.step-type-choice {- padding: 24px 18px 24px 18px;- width: 480px !important;-}-.floating.step-type-choice>.content>.content {- overflow: auto;- max-height: 480px;-}-diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.javaindex 13b56c9590..03614c2619 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java@@ -14,22 +14,31 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import io.onedev.server.util.ReflectionUtils;import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.web.component.project.choice.ProjectMultiChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.annotation.ProjectChoice;@SuppressWarnings("serial")public class ProjectMultiChoiceEditor extends PropertyEditor<List<String>> {private final IModel<List<Project>> choicesModel = new LoadableDetachableModel<List<Project>>() {+ @SuppressWarnings("unchecked")@Overrideprotected List<Project> load() {- ProjectCache cache = getProjectManager().cloneCache();- List<Project> projects = new ArrayList<>(cache.getProjects());- projects.sort(cache.comparingPath());- return projects;+ ProjectChoice projectChoice = descriptor.getPropertyGetter().getAnnotation(ProjectChoice.class);+ if (projectChoice.value().length() != 0) {+ return (List<Project>) ReflectionUtils.invokeStaticMethod(+ descriptor.getPropertyGetter().getDeclaringClass(), projectChoice.value());+ } else {+ ProjectCache cache = getProjectManager().cloneCache();+ List<Project> projects = new ArrayList<>(cache.getProjects());+ projects.sort(cache.comparingPath());+ return projects;+ }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.javaindex 8e46128af1..bc68c89e8d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java@@ -13,22 +13,31 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import io.onedev.server.util.ReflectionUtils;import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.web.component.project.choice.ProjectSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.annotation.ProjectChoice;@SuppressWarnings("serial")public class ProjectSingleChoiceEditor extends PropertyEditor<String> {private final IModel<List<Project>> choicesModel = new LoadableDetachableModel<List<Project>>() {+ @SuppressWarnings("unchecked")@Overrideprotected List<Project> load() {- ProjectCache cache = getProjectManager().cloneCache();- List<Project> projects = new ArrayList<>(cache.getProjects());- projects.sort(cache.comparingPath());- return projects;+ ProjectChoice projectChoice = descriptor.getPropertyGetter().getAnnotation(ProjectChoice.class);+ if (projectChoice.value().length() != 0) {+ return (List<Project>) ReflectionUtils.invokeStaticMethod(+ descriptor.getPropertyGetter().getDeclaringClass(), projectChoice.value());+ } else {+ ProjectCache cache = getProjectManager().cloneCache();+ List<Project> projects = new ArrayList<>(cache.getProjects());+ projects.sort(cache.comparingPath());+ return projects;+ }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/revisionchoice/RevisionChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/revisionchoice/RevisionChoiceEditSupport.javanew file mode 100644index 0000000000..c3499233e7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/revisionchoice/RevisionChoiceEditSupport.java@@ -0,0 +1,70 @@+package io.onedev.server.web.editable.revisionchoice;++import java.lang.reflect.AnnotatedElement;+import java.lang.reflect.Method;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;++import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;+import io.onedev.server.web.editable.annotation.RevisionChoice;++@SuppressWarnings("serial")+public class RevisionChoiceEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ Method propertyGetter = descriptor.getPropertyGetter();+ if (propertyGetter.getAnnotation(RevisionChoice.class) != null) {+ if (propertyGetter.getReturnType() == String.class) {+ return new PropertyContext<String>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null) {+ return new Label(id, model.getObject());+ } else {+ return new EmptyValueLabel(id) {++ @Override+ protected AnnotatedElement getElement() {+ return propertyDescriptor.getPropertyGetter();+ }++ };+ }+ }++ };+ }++ @Override+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {+ return new RevisionChoiceEditor(componentId, descriptor, model);+ }++ };+ } else {+ throw new RuntimeException("Annotation 'RevisionChoice' should be applied to property with type 'String'");+ }+ } else {+ return null;+ }+ }++ @Override+ public int getPriority() {+ return DEFAULT_PRIORITY;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/revisionchoice/RevisionChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/revisionchoice/RevisionChoiceEditor.htmlnew file mode 100644index 0000000000..beb519132c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/revisionchoice/RevisionChoiceEditor.html@@ -0,0 +1,3 @@+<wicket:panel>+ <a wicket:id="picker" class="btn btn-outline-secondary"></a>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/revisionchoice/RevisionChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/revisionchoice/RevisionChoiceEditor.javanew file mode 100644index 0000000000..f703c66b35--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/revisionchoice/RevisionChoiceEditor.java@@ -0,0 +1,75 @@+package io.onedev.server.web.editable.revisionchoice;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.model.Project;+import io.onedev.server.util.ComponentContext;+import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.web.component.revision.RevisionPicker;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.annotation.RevisionChoice;++@SuppressWarnings("serial")+public class RevisionChoiceEditor extends PropertyEditor<String> {++ private String revision;++ public RevisionChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ IModel<String> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ revision = propertyModel.getObject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(newRevisionPicker());+ }++ private RevisionPicker newRevisionPicker() {+ return new RevisionPicker("picker", new LoadableDetachableModel<Project>() {++ @Override+ protected Project load() {+ ComponentContext.push(new ComponentContext(RevisionChoiceEditor.this));+ try {+ RevisionChoice revisionChoice = descriptor.getPropertyGetter().getAnnotation(RevisionChoice.class);+ if (revisionChoice.value().length() != 0)+ return (Project) ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), revisionChoice.value());+ else+ return Project.get();+ } finally {+ ComponentContext.pop();+ }+ }++ }, revision) {++ @Override+ protected void onSelect(AjaxRequestTarget target, String revision) {+ RevisionChoiceEditor.this.revision = revision;+ RevisionPicker revisionPicker = newRevisionPicker();+ getParent().replace(revisionPicker);+ target.add(revisionPicker);+ onPropertyUpdating(target);+ }++ };+ }++ @Override+ protected String convertInputToValue() throws ConversionException {+ return revision;+ }++ @Override+ public boolean needExplicitSubmit() {+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.javadeleted file mode 100644index 7bcef14f95..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/revisionpick/RevisionPickEditor.java+++ /dev/null@@ -1,61 +0,0 @@-package io.onedev.server.web.editable.revisionpick;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.util.convert.ConversionException;--import io.onedev.server.model.Project;-import io.onedev.server.web.component.revisionpicker.RevisionPicker;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;--@SuppressWarnings("serial")-public class RevisionPickEditor extends PropertyEditor<String> {-- private String revision;-- public RevisionPickEditor(String id, PropertyDescriptor propertyDescriptor,- IModel<String> propertyModel) {- super(id, propertyDescriptor, propertyModel);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(newRevisionPicker());- }-- private RevisionPicker newRevisionPicker() {- return new RevisionPicker("picker", new AbstractReadOnlyModel<Project>() {-- @Override- public Project getObject() {- return Project.get();- }-- }, revision) {-- @Override- protected void onSelect(AjaxRequestTarget target, String revision) {- RevisionPickEditor.this.revision = revision;- RevisionPicker revisionPicker = newRevisionPicker();- getParent().replace(revisionPicker);- target.add(revisionPicker);- }-- };- }-- @Override- protected String convertInputToValue() throws ConversionException {- return revision;- }-- @Override- public boolean needExplicitSubmit() {- return false;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/img/resize-dark.png b/server-core/src/main/java/io/onedev/server/web/img/resize-dark.pngnew file mode 100644index 0000000000..b07bcc5fe1Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/img/resize-dark.png differdiff --git a/server-core/src/main/java/io/onedev/server/web/img/resize.png b/server-core/src/main/java/io/onedev/server/web/img/resize.pngnew file mode 100644index 0000000000..78e1ccfff8Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/img/resize.png differdiff --git a/server-core/src/main/java/io/onedev/server/web/page/DashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/HomePage.javasimilarity index 57%rename from server-core/src/main/java/io/onedev/server/web/page/DashboardPage.javarename to server-core/src/main/java/io/onedev/server/web/page/HomePage.javaindex 00d9cea28e..85e5a906e9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/DashboardPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/HomePage.java@@ -7,22 +7,29 @@ import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPimport org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.OneDev;import io.onedev.server.web.page.layout.LayoutPage;-import io.onedev.server.web.page.project.ProjectListPage;+import io.onedev.server.web.page.layout.MainMenuCustomization;@SuppressWarnings("serial")-public class DashboardPage extends LayoutPage {+public class HomePage extends LayoutPage {- public DashboardPage(PageParameters params) {+ public static final String PARAM_FAILSAFE = "failsafe";++ private final boolean failsafe;++ public HomePage(PageParameters params) {super(params);- PageProvider pageProvider = new PageProvider(ProjectListPage.class, ProjectListPage.paramsOf(0, 0));+ failsafe = params.get(PARAM_FAILSAFE).toBoolean(false);++ PageProvider pageProvider = OneDev.getInstance(MainMenuCustomization.class).getHomePage(failsafe);throw new RestartResponseException(pageProvider, RedirectPolicy.NEVER_REDIRECT);}@Overrideprotected Component newTopbarTitle(String componentId) {- return new Label(componentId, "Dashboard");+ return new Label(componentId, "Home");}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.javaindex 52bce544e5..120a2033c5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java@@ -58,7 +58,7 @@ public class AgentBuildsPage extends AgentDetailPage {pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);}- }, 0) {+ }, true, true, 0) {@Overrideprotected BuildQuery getBaseQuery() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.javaindex 33f04a240e..3d7e86678b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java@@ -171,7 +171,7 @@ abstract class JobExecutorEditPanel extends Panel {if (editor.isValid()) {if (testData != null) {String title = EditableUtils.getDisplayName(testData.getClass());- new BeanEditModalPanel(target, testData, Sets.newHashSet(), true, title) {+ new BeanEditModalPanel<Serializable>(target, testData, Sets.newHashSet(), true, title) {@Overrideprotected void onSave(AjaxRequestTarget target, Serializable bean) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.javaindex d3f0c797b1..c5590f8787 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgtrustedkeys/GpgTrustedKeysPage.java@@ -60,11 +60,6 @@ public class GpgTrustedKeysPage extends AdministrationPage {add(new ModalLink("newKey") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {Fragment fragment = new Fragment(id, "addKeyFrag", GpgTrustedKeysPage.this);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.javaindex 1593ec1b8e..751c5797ef 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java@@ -78,11 +78,6 @@ public class GroovyScriptListPage extends AdministrationPage {};}- @Override- protected String getModalCssClass() {- return "modal-lg";- }-});List<IColumn<GroovyScript, Void>> columns = new ArrayList<>();@@ -150,11 +145,6 @@ public class GroovyScriptListPage extends AdministrationPage {};}- @Override- protected String getModalCssClass() {- return "modal-lg";- }-});fragment.add(new AjaxLink<Void>("delete") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.javaindex 54700fe237..b43399ccb8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java@@ -59,11 +59,6 @@ public class IssueFieldListPage extends IssueSettingPage {add(new ModalLink("addNew") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new FieldEditPanel(id, -1) {@@ -139,11 +134,6 @@ public class IssueFieldListPage extends IssueSettingPage {Fragment fragment = new Fragment(componentId, "actionColumnFrag", IssueFieldListPage.this);fragment.add(new ModalLink("edit") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new FieldEditPanel(id, fieldIndex) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.javaindex 0158066fdd..c5fb647795 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issuetemplate/IssueTemplateListPage.java@@ -56,11 +56,6 @@ public class IssueTemplateListPage extends IssueSettingPage {add(new ModalLink("addNew") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new IssueTemplateEditPanel(id, -1) {@@ -133,11 +128,6 @@ public class IssueTemplateListPage extends IssueSettingPage {Fragment fragment = new Fragment(componentId, "actionColumnFrag", IssueTemplateListPage.this);fragment.add(new ModalLink("edit") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new IssueTemplateEditPanel(id, templateIndex) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.javaindex e635b385be..595bcab88b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java@@ -52,11 +52,6 @@ public class LinkSpecListPage extends IssueSettingPage {add(new ModalLink("addNew") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new LinkSpecEditPanel(id, Model.of(new LinkSpec())) {@@ -131,11 +126,6 @@ public class LinkSpecListPage extends IssueSettingPage {Fragment fragment = new Fragment(componentId, "linkActionsFrag", LinkSpecListPage.this);fragment.add(new ModalLink("edit") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new LinkSpecEditPanel(id, rowModel) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.javaindex 4f05b46aa2..8100fdaa8e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java@@ -54,11 +54,6 @@ public class StateTransitionListPage extends IssueSettingPage {add(new ModalLink("addNew") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new TransitionEditPanel(id, -1) {@@ -142,11 +137,6 @@ public class StateTransitionListPage extends IssueSettingPage {Fragment fragment = new Fragment(componentId, "actionColumnFrag", StateTransitionListPage.this);fragment.add(new ModalLink("edit") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new TransitionEditPanel(id, transitionIndex) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProcessPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProcessPage.javaindex 3630f3f35a..1ed02329d0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProcessPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProcessPage.java@@ -19,7 +19,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.sso.SsoAuthenticated;import io.onedev.server.model.support.administration.sso.SsoConnector;import io.onedev.server.web.WebSession;-import io.onedev.server.web.page.DashboardPage;+import io.onedev.server.web.page.HomePage;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.simple.security.LoginPage;@@ -66,7 +66,7 @@ public class SsoProcessPage extends BasePage {if (url != null && url.toString().length() != 0)redirectUrlAfterLogin = url.toString();else- redirectUrlAfterLogin = RequestCycle.get().urlFor(DashboardPage.class, new PageParameters()).toString();+ redirectUrlAfterLogin = RequestCycle.get().urlFor(HomePage.class, new PageParameters()).toString();Session.get().bind();Session.get().setAttribute(SESSION_ATTR_REDIRECT_URL, redirectUrlAfterLogin);connector.initiateLogin();diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.javaindex 9b26fef471..2673047fdd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java@@ -47,10 +47,10 @@ import io.onedev.server.web.component.EmailAddressVerificationStatusBadge;import io.onedev.server.web.component.datatable.DefaultDataTable;import io.onedev.server.web.component.link.ActionablePageLink;import io.onedev.server.web.component.user.UserAvatar;+import io.onedev.server.web.page.HomePage;import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.page.admin.user.create.NewUserPage;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;-import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;@@ -302,7 +302,7 @@ public class UserListPage extends AdministrationPage {@Overridepublic void onClick() {SecurityUtils.getSubject().runAs(rowModel.getObject().getPrincipals());- setResponsePage(ProjectListPage.class, ProjectListPage.paramsOf(0, 0));+ setResponsePage(HomePage.class);}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/gpgkeys/UserGpgKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/gpgkeys/UserGpgKeysPage.javaindex 03947d5554..9b78527a29 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/gpgkeys/UserGpgKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/gpgkeys/UserGpgKeysPage.java@@ -33,11 +33,6 @@ public class UserGpgKeysPage extends UserPage {add(new ModalLink("newKey") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new InsertGpgKeyPanel(id) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.javaindex 9145c7c0b2..d32a19d43b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.java@@ -41,11 +41,6 @@ public class UserSshKeysPage extends UserPage {add(new ModalLink("newKey") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new InsertSshKeyPanel(id) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex 6965a8b023..a537f314c9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -598,7 +598,7 @@ pre>code {height: 100%;}.side-main>.side {- margin-right: 2rem;+ margin-right: 0.5rem;flex: 0 0 auto;max-width: 300px;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.javaindex 7f8ef506ae..6eea158215 100644--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java@@ -119,7 +119,7 @@ public class BuildListPage extends LayoutPage {pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);}- }, expectedCount) {+ }, true, true, expectedCount) {@Overrideprotected PagingHistorySupport getPagingHistorySupport() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultMainMenuCustomization.java b/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultMainMenuCustomization.javaindex 217197ad1d..20c9278134 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultMainMenuCustomization.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultMainMenuCustomization.java@@ -3,10 +3,10 @@ package io.onedev.server.web.page.layout;import java.util.ArrayList;import java.util.List;+import org.apache.wicket.core.request.handler.PageProvider;+import com.google.common.collect.Lists;-import io.onedev.server.web.page.DashboardPage;-import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.builds.BuildListPage;import io.onedev.server.web.page.issues.IssueListPage;import io.onedev.server.web.page.project.NewProjectPage;@@ -18,8 +18,8 @@ public class DefaultMainMenuCustomization implements MainMenuCustomization {private static final long serialVersionUID = 1L;@Override- public Class<? extends BasePage> getHomePage() {- return DashboardPage.class;+ public PageProvider getHomePage(boolean failsafe) {+ return new PageProvider(ProjectListPage.class, ProjectListPage.paramsOf(0, 0));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex bdec5889b2..8a3854b60b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -50,6 +50,7 @@ import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.component.user.UserAvatar;import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.page.HomePage;import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;import io.onedev.server.web.page.admin.brandingsetting.BrandingSettingPage;import io.onedev.server.web.page.admin.buildsetting.agent.AgentDetailPage;@@ -97,7 +98,6 @@ import io.onedev.server.web.page.my.password.MyPasswordPage;import io.onedev.server.web.page.my.profile.MyProfilePage;import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;import io.onedev.server.web.page.my.twofactorauthentication.MyTwoFactorAuthenticationPage;-import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.simple.security.LoginPage;import io.onedev.server.web.page.simple.security.LogoutPage;import io.onedev.server.web.util.WicketUtils;@@ -125,7 +125,7 @@ public abstract class LayoutPage extends BasePage {MainMenuCustomization customization = OneDev.getInstance(MainMenuCustomization.class);- sidebar.add(new BookmarkablePageLink<Void>("brandLink", customization.getHomePage()) {+ sidebar.add(new BookmarkablePageLink<Void>("brandLink", HomePage.class) {@Overrideprotected void onInitialize() {@@ -365,11 +365,6 @@ public abstract class LayoutPage extends BasePage {};}- @Override- protected String getModalCssClass() {- return "modal-lg";- }-});topbar.add(new Link<Void>("darkMode") {@@ -408,7 +403,7 @@ public abstract class LayoutPage extends BasePage {}.setVisible(loginUser == null));- topbar.add(new BookmarkablePageLink<Void>("brandLink", customization.getHomePage()) {+ topbar.add(new BookmarkablePageLink<Void>("brandLink", HomePage.class) {@Overrideprotected void onInitialize() {@@ -483,7 +478,7 @@ public abstract class LayoutPage extends BasePage {public void onClick() {SecurityUtils.getSubject().releaseRunAs();Session.get().warn("Exited impersonation");- setResponsePage(ProjectListPage.class, ProjectListPage.paramsOf(0, 0));+ setResponsePage(HomePage.class);}};@@ -520,11 +515,6 @@ public abstract class LayoutPage extends BasePage {};}- @Override- protected String getCssClass() {- return "modal-lg";- }-};}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/MainMenuCustomization.java b/server-core/src/main/java/io/onedev/server/web/page/layout/MainMenuCustomization.javaindex 862da54ed4..976807dcf3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/MainMenuCustomization.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/MainMenuCustomization.java@@ -3,11 +3,11 @@ package io.onedev.server.web.page.layout;import java.io.Serializable;import java.util.List;-import io.onedev.server.web.page.base.BasePage;+import org.apache.wicket.core.request.handler.PageProvider;public interface MainMenuCustomization extends Serializable {- Class<? extends BasePage> getHomePage();+ PageProvider getHomePage(boolean failsafe);List<SidebarMenuItem> getMainMenuItems();diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.cssindex d4fa71b11b..3cf93e42df 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css@@ -210,12 +210,12 @@background: white;padding: 0 0.8rem 0 1.2rem;z-index: 1030;- box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1);+ box-shadow: 0px 0px 4px 0px rgba(0,0,0,0.1);transition: all var(--transition-duration) ease;}.dark-mode .topbar {background: var(--dark-mode-dark);- box-shadow: 0 0 30px rgb(0 0 0 / 50%);+ box-shadow: 0 0 12px rgb(0 0 0 / 50%);color: white;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.javaindex ad3a88069e..b070ddca1a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/gpgkeys/MyGpgKeysPage.java@@ -33,11 +33,6 @@ public class MyGpgKeysPage extends MyPage {add(new ModalLink("newKey") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new InsertGpgKeyPanel(id) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.javaindex 53787a7199..094569d874 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java@@ -42,11 +42,6 @@ public class MySshKeysPage extends MyPage {add(new ModalLink("newKey") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new InsertSshKeyPanel(id) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 7f6a5a4533..b466694a5d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -112,7 +112,7 @@ import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.revisionpicker.RevisionPicker;+import io.onedev.server.web.component.revision.RevisionPicker;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.navigator.BlobNavigator;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;@@ -1615,6 +1615,10 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,@Overridepublic String appendRaw(String url) {+ return doAppendRaw(url);+ }++ public static String doAppendRaw(String url) {try {URIBuilder builder;builder = new URIBuilder(url);@@ -1627,7 +1631,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,throw new RuntimeException(e);}}-+@Overrideprotected String getPageTitle() {if (state.blobIdent.revision == null)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/BranchBeanWithRevision.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/BranchBeanWithRevision.javaindex 778dba7bad..a443298c1d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/BranchBeanWithRevision.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/BranchBeanWithRevision.java@@ -5,7 +5,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.web.component.branch.create.BranchBean;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.RevisionPick;+import io.onedev.server.web.editable.annotation.RevisionChoice;@Editablepublic class BranchBeanWithRevision extends BranchBean {@@ -15,7 +15,7 @@ public class BranchBeanWithRevision extends BranchBean {private String revision;@Editable(order=1000)- @RevisionPick+ @RevisionChoice@NotEmpty(message="Please choose revision to create branch from")@OmitNamepublic String getRevision() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.javaindex c7aa9c9544..b9fb0698fc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java@@ -127,7 +127,7 @@ public class ProjectBuildsPage extends ProjectPage {pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);}- }, 0) {+ }, true, true, 0) {@Overrideprotected PagingHistorySupport getPagingHistorySupport() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 2a684a3d31..5e239d03c2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -60,7 +60,7 @@ import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.component.commit.list.CommitListPanel;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.revisionpicker.AffinalRevisionPicker;+import io.onedev.server.web.component.revision.AffinalRevisionPicker;import io.onedev.server.web.component.tabbable.AjaxActionTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex ce1ad0a03c..3264057ce0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -90,11 +90,6 @@ abstract class BacklogColumnPanel extends Panel {add(new ModalLink("addCard") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new NewCardPanel(id) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 35dcd32319..104b0c13db 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -285,11 +285,6 @@ abstract class BoardColumnPanel extends Panel implements EditContext {head.add(new ModalLink("addCard") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id, ModalPanel modal) {return new NewCardPanel(id) {@@ -438,7 +433,8 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (hasVisibleEditableDependents) {Collection<String> propertyNames = FieldUtils.getEditablePropertyNames(issue.getProject(), fieldBean.getClass(), dependentFields);- class DependentFieldsEditor extends BeanEditModalPanel implements ProjectAware, InputContext {+ class DependentFieldsEditor extends BeanEditModalPanel<Serializable>+ implements ProjectAware, InputContext {public DependentFieldsEditor(IPartialPageRequestHandler handler, Serializable bean,Collection<String> propertyNames, boolean exclude, String title) {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 dedeaff36b..6c6b5d4cc7 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@@ -163,7 +163,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component content = new BuildListPanel(TAB_CONTENT_ID, Model.of((String)null), 0) {+ Component content = new BuildListPanel(TAB_CONTENT_ID, Model.of((String)null), true, true, 0) {@Overrideprotected BuildQuery getBaseQuery() {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 983ad81724..9b397cfd2e 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@@ -28,10 +28,6 @@border-bottom-color: var(--dark-mode-lighter-dark);border-top-color: var(--dark-mode-lighter-dark);}-.issue-boards>.body>.columns>.column {- margin-left: 2rem;- min-width: 300px;-}.issue-boards>.body>.columns .column:first-child {margin-left: 0;}@@ -48,7 +44,7 @@background: var(--dark-mode-lighter-dark);}.issue-boards>.body>.columns>.column {- margin-left: 2rem;+ margin-left: 0.5rem;min-width: 256px;}.issue-boards>.head .milestone-selector.btn-danger {diff --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.javaindex 9939441d51..5519a742e1 100644--- 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.java@@ -57,7 +57,7 @@ public class IssueBuildsPage extends IssueDetailPage {pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);}- }, 0) {+ }, true, true, 0) {@Overrideprotected BuildQuery getBaseQuery() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneBurndownPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneBurndownPage.htmlindex 2b54b61842..446f4be90a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneBurndownPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneBurndownPage.html@@ -1,9 +1,3 @@<wicket:extend>- <div wicket:id="content" class="milestone-burndown"></div>- <wicket:fragment wicket:id="chartFrag">- <div class="d-flex align-items-center justify-content-center flex-nowrap mb-4">- <span class="font-size-lg mr-3">Show States By</span> <div class="flex-shrink-1"><select wicket:id="by" class="form-control" placeholder="Issue Count"></select></div>- </div>- <div wicket:id="chart"></div>- </wicket:fragment>+ <div wicket:id="burndown"></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneBurndownPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneBurndownPage.javaindex df10c6f869..7b2ebe414b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneBurndownPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneBurndownPage.java@@ -1,281 +1,20 @@package io.onedev.server.web.page.project.issues.milestones;-import java.util.ArrayList;-import java.util.Date;-import java.util.HashMap;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;-import java.util.stream.Collectors;--import javax.annotation.Nullable;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.DropDownChoice;-import org.apache.wicket.markup.html.form.IChoiceRenderer;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.infomanager.IssueInfoManager;-import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueSchedule;-import io.onedev.server.model.Milestone;-import io.onedev.server.model.Project;-import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.issue.StateSpec;-import io.onedev.server.model.support.issue.field.spec.FieldSpec;-import io.onedev.server.model.support.issue.field.spec.WorkingPeriodField;-import io.onedev.server.util.Day;-import io.onedev.server.web.component.chart.line.Line;-import io.onedev.server.web.component.chart.line.LineChartPanel;-import io.onedev.server.web.component.chart.line.LineSeries;+import io.onedev.server.web.component.milestone.burndown.MilestoneBurndownPanel;@SuppressWarnings("serial")public class MilestoneBurndownPage extends MilestoneDetailPage {- private static final int MAX_DAYS = 365;-- private static final String PARAM_FIELD = "field";-- private static final String NULL_FIELD = "<$Null Field$>";-- private String field;-public MilestoneBurndownPage(PageParameters params) {super(params);-- field = params.get(PARAM_FIELD).toOptionalString();- if (StringUtils.isBlank(field))- field = null;- if (field != null) {- FieldSpec fieldSpec = getIssueSetting().getFieldSpec(field);- if (fieldSpec == null)- throw new ExplicitException("Unable to show states by field '" + field + "': field not found");- if (!fieldSpec.getType().equals(InputSpec.INTEGER)- && !fieldSpec.getType().equals(InputSpec.WORKING_PERIOD)) {- throw new ExplicitException("Can only show states by field of type 'Integer' or 'Working Period'");- }- }}- private GlobalIssueSetting getIssueSetting() {- return OneDev.getInstance(SettingManager.class).getIssueSetting();- }-@Overrideprotected void onInitialize() {super.onInitialize();-- String message = null;- if (getMilestone().getStartDate() != null && getMilestone().getDueDate() != null) {- if (getMilestone().getStartDate().before(getMilestone().getDueDate())) {- int currentDay = new Day(getMilestone().getStartDate()).getValue();- int toDay = new Day(getMilestone().getDueDate()).getValue();-- int dayCount = 0;- while (currentDay <= toDay) {- currentDay = new Day(new Day(currentDay).getDate().plusDays(1)).getValue();- if (++dayCount > MAX_DAYS) {- message = "Milestone spans too long to show burndown chart";- break;- }- }- } else {- message = "Milestone start date should be before due date";- }- } else {- message = "Milestone start and due date should be specified to show burndown chart";- }- if (message != null) {- String messageCssClasses = "alert alert-notice alert-light-warning";- add(new Label("content", message).add(AttributeAppender.append("class", messageCssClasses)));- } else {- Fragment fragment = new Fragment("content", "chartFrag", this);-- List<String> choices = getIssueSetting().getFieldSpecs().stream()- .filter(it -> it.getType().equals(InputSpec.INTEGER) || it.getType().equals(InputSpec.WORKING_PERIOD))- .map(it->it.getName())- .collect(Collectors.toList());-- choices.add(0, NULL_FIELD);-- DropDownChoice<String> dropDownChoice = new DropDownChoice<String>("by", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- if (field != null)- return field;- else- return NULL_FIELD;- }-- @Override- public void setObject(String object) {- if (!object.equals(NULL_FIELD))- field = object;- else- field = null;- }-- }, choices, new IChoiceRenderer<String>() {-- @Override- public Object getDisplayValue(String object) {- if (!object.equals(NULL_FIELD))- return object;- else- return "Issue Count";- }-- @Override- public String getIdValue(String object, int index) {- return object;- }-- @Override- public String getObject(String id, IModel<? extends List<? extends String>> choices) {- return id;- }-- }) {-- @Override- protected boolean wantOnSelectionChangedNotifications() {- return true;- }-- @Override- protected void onSelectionChanged(String newSelection) {- PageParameters params = MilestoneBurndownPage.paramsOf(getProject(), getMilestone(), field);- setResponsePage(MilestoneBurndownPage.class, params);- }-- };- dropDownChoice.setRequired(true);- fragment.add(dropDownChoice);-- fragment.add(new LineChartPanel("chart", new LoadableDetachableModel<LineSeries>() {-- private String getXAxisValue(Day day) {- return String.format("%02d-%02d", day.getMonthOfYear()+1, day.getDayOfMonth());- }-- @Override- protected LineSeries load() {- int startDayValue = new Day(getMilestone().getStartDate()).getValue();- int dueDayValue = new Day(getMilestone().getDueDate()).getValue();-- Map<Integer, Map<String, Integer>> dailyStateWeights = new LinkedHashMap<>();- for (IssueSchedule schedule: getMilestone().getSchedules()) {- Issue issue = schedule.getIssue();- int issueWeight = getFieldValue(issue);- int scheduleDayValue = new Day(schedule.getDate()).getValue();- Map<Integer, String> dailyStates = OneDev.getInstance(IssueInfoManager.class)- .getDailyStates(issue.getId(), Math.max(startDayValue, scheduleDayValue), dueDayValue);- for (Map.Entry<Integer, String> entry: dailyStates.entrySet()) {- Map<String, Integer> stateWeights = dailyStateWeights.get(entry.getKey());- if (stateWeights == null) {- stateWeights = new HashMap<>();- dailyStateWeights.put(entry.getKey(), stateWeights);- }- if (entry.getValue() != null) {- Integer weight = stateWeights.get(entry.getValue());- if (weight == null)- weight = 0;- weight += issueWeight;- stateWeights.put(entry.getValue(), weight);- }- }- }-- List<String> xAxisValues = new ArrayList<>();- for (Integer dayValue: dailyStateWeights.keySet())- xAxisValues.add(getXAxisValue(new Day(dayValue)));-- List<Line> lines = new ArrayList<>();-- int initialIssueWeight = 0;- int todayValue = new Day(new Date()).getValue();- for (StateSpec spec: OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpecs()) {- Map<String, Integer> yAxisValues = new HashMap<>();- for (Map.Entry<Integer, Map<String, Integer>> entry: dailyStateWeights.entrySet()) {- if (entry.getKey() <= todayValue) {- Day day = new Day(entry.getKey());- Integer weight = entry.getValue().get(spec.getName());- if (weight == null)- weight = 0;- yAxisValues.put(getXAxisValue(day), weight);- }- }- Integer stateWeight = yAxisValues.get(getXAxisValue(new Day(startDayValue)));- if (stateWeight == null)- stateWeight = 0;- initialIssueWeight += stateWeight;- lines.add(new Line(spec.getName(), yAxisValues, spec.getColor(), "States", null));- }-- Map<String, Integer> guidelineYAxisValues = new HashMap<>();- if (!xAxisValues.isEmpty()) {- guidelineYAxisValues.put(xAxisValues.get(0), initialIssueWeight);- guidelineYAxisValues.put(xAxisValues.get(xAxisValues.size()-1), 0);- }-- String color = isDarkMode()?"white":"black";- lines.add(new Line("Guide Line", guidelineYAxisValues, color, null, "dashed"));-- String yAxisValueFormatter;- if (field != null && getIssueSetting().getFieldSpec(field) instanceof WorkingPeriodField) {- yAxisValueFormatter = ""- + "function(value) {"- + " if (value != undefined) "- + " return onedev.server.util.formatWorkingPeriod(value);"- + " else "- + " return '-';"- + "}";- } else {- yAxisValueFormatter = null;- }- return new LineSeries(null, xAxisValues, lines, yAxisValueFormatter, 0, null);- }-- }));- add(fragment);- }- }-- private int getFieldValue(Issue issue) {- if (field != null) {- Object value = issue.getFieldValue(field);- if (value != null) {- if (value instanceof Integer)- return (int) value;- else- return 0;- } else {- return 0;- }- } else {- return 1;- }- }-- public static PageParameters paramsOf(Project project, Milestone milestone, @Nullable String field) {- PageParameters params = paramsOf(project, milestone);- if (field != null)- params.add(PARAM_FIELD, field);- return params;- }+ add(new MilestoneBurndownPanel("burndown", milestoneModel));+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex 6f57afc928..17d098cf94 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -34,6 +34,7 @@ import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.milestone.MilestoneDateLabel;import io.onedev.server.web.component.milestone.MilestoneStatusLabel;+import io.onedev.server.web.component.milestone.actions.MilestoneActionsPanel;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.PageTabHead;import io.onedev.server.web.component.tabbable.Tab;@@ -46,7 +47,7 @@ public abstract class MilestoneDetailPage extends ProjectPage implements ScriptIpublic static final String PARAM_MILESTONE = "milestone";- private final IModel<Milestone> milestoneModel;+ protected final IModel<Milestone> milestoneModel;public MilestoneDetailPage(PageParameters params) {super(params);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.htmlindex 123ddbc35a..96d4af4a23 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html@@ -1,24 +1,3 @@<wicket:extend>- <div class="card m-2 m-sm-5 milestone-list">- <div class="card-body">- <div class="d-flex align-items-center flex-wrap">- <span class="btn-group mr-4 mb-4">- <a wicket:id="open" class="btn btn-outline-secondary">Open</a>- <a wicket:id="closed" class="btn btn-outline-secondary">Closed</a>- </span>- <div class="mr-4 mb-4">- <a wicket:id="sort" class="btn btn-outline-secondary">Sort <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a>- </div>- <a wicket:id="newMilestone" class="btn btn-primary btn-icon mb-4"><wicket:svg href="plus" class="icon mr-1"></wicket:svg></a>- </div>- <table wicket:id="milestones" class="table"></table>- </div>- </div>- <wicket:fragment wicket:id="issueStatsFrag">- <div wicket:id="content"></div>- </wicket:fragment>- <wicket:fragment wicket:id="nameFrag">- <a wicket:id="link"><span wicket:id="label"></span></a>- <span wicket:id="inherited" class="badge badge-info badge-sm ml-2">Inherited</span>- </wicket:fragment>+ <div wicket:id="milestones" class="m-2 m-sm-5"></div></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.javaindex 105f743b80..dcfce477c6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java@@ -1,61 +1,17 @@package io.onedev.server.web.page.project.issues.milestones;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashMap;-import java.util.Iterator;-import java.util.List;-import java.util.Map;-import javax.annotation.Nullable;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-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.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-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 org.hibernate.criterion.Restrictions;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.entitymanager.MilestoneManager;-import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.search.entity.issue.IssueQueryLexer;-import io.onedev.server.search.entity.issue.StateCriteria;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.MilestoneAndIssueState;import io.onedev.server.util.MilestoneSort;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.WebSession;-import io.onedev.server.web.component.datatable.DefaultDataTable;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.issue.statestats.StateStatsBar;-import io.onedev.server.web.component.link.ActionablePageLink;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.menu.MenuItem;-import io.onedev.server.web.component.menu.MenuLink;-import io.onedev.server.web.component.milestone.MilestoneDateLabel;+import io.onedev.server.web.component.milestone.list.MilestoneListPanel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;-import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")@@ -71,30 +27,6 @@ public class MilestoneListPage extends ProjectPage {private final MilestoneSort sort;- private final IModel<Collection<MilestoneAndIssueState>> milestoneAndStatesModel =- new LoadableDetachableModel<Collection<MilestoneAndIssueState>>() {-- @Override- protected Collection<MilestoneAndIssueState> load() {- List<Milestone> milestones = new ArrayList<>();- for (Component row: (WebMarkupContainer)milestonesTable.get("body").get("rows")) {- Milestone milestone = (Milestone) row.getDefaultModelObject();- milestones.add(milestone);- }- return OneDev.getInstance(IssueManager.class).queryMilestoneAndIssueStates(getProject(), milestones);- }-- };-- private DataTable<Milestone, Void> milestonesTable;-- private EntityCriteria<Milestone> getCriteria(boolean closed) {- EntityCriteria<Milestone> criteria = EntityCriteria.of(Milestone.class);- criteria.add(Restrictions.in("project", getProject().getSelfAndAncestors()));- criteria.add(Restrictions.eq("closed", closed));- return criteria;- }-public MilestoneListPage(PageParameters params) {super(params);@@ -115,240 +47,6 @@ public class MilestoneListPage extends ProjectPage {protected void onInitialize() {super.onInitialize();- Link<Void> openLink = new BookmarkablePageLink<Void>("open",- MilestoneListPage.class, paramsOf(getProject(), false, sort));- openLink.setOutputMarkupId(true);- if (!closed)- openLink.add(AttributeAppender.append("class", "active"));- add(openLink);-- Link<Void> closeLink = new BookmarkablePageLink<Void>("closed",- MilestoneListPage.class, paramsOf(getProject(), true, sort));- closeLink.setOutputMarkupId(true);- if (closed)- closeLink.add(AttributeAppender.append("class", "active"));- add(closeLink);-- add(new MenuLink("sort") {-- @Override- protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {- List<MenuItem> menuItems = new ArrayList<>();- for (MilestoneSort sort: MilestoneSort.values()) {- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return sort.toString();- }-- @Override- public String getIconHref() {- if (sort == MilestoneListPage.this.sort)- return "tick";- else- return null;- }-- @Override- public WebMarkupContainer newLink(String id) {- PageParameters params = paramsOf(getProject(), closed, sort);- Link<Void> link = new BookmarkablePageLink<Void>(id, MilestoneListPage.class, params);- link.add(AttributeAppender.append("class", "milestone-sort"));- if (sort == MilestoneListPage.this.sort)- link.add(AttributeAppender.append("class", "active"));- return link;- }-- });- }- return menuItems;- }-- });-- add(new BookmarkablePageLink<Void>("newMilestone", NewMilestonePage.class, NewMilestonePage.paramsOf(getProject())) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManageIssues(getProject()));- }-- });-- List<IColumn<Milestone, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<Milestone, Void>(Model.of("Name")) {-- @Override- public String getCssClass() {- return "name align-middle";- }-- @Override- public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,- IModel<Milestone> rowModel) {- Milestone milestone = rowModel.getObject();- Fragment fragment = new Fragment(componentId, "nameFrag", MilestoneListPage.this);- WebMarkupContainer link = new ActionablePageLink("link", MilestoneIssuesPage.class,- MilestoneIssuesPage.paramsOf(getProject(), milestone, null)) {-- @Override- protected void doBeforeNav(AjaxRequestTarget target) {- String redirectUrlAfterDelete = RequestCycle.get().urlFor(- MilestoneListPage.class, getPageParameters()).toString();- WebSession.get().setRedirectUrlAfterDelete(Milestone.class, redirectUrlAfterDelete);- }-- };- link.add(new Label("label", milestone.getName()));- fragment.add(link);- fragment.add(new WebMarkupContainer("inherited") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!rowModel.getObject().getProject().equals(getProject()));- }-- });- cellItem.add(fragment);- }-- });-- columns.add(new AbstractColumn<Milestone, Void>(Model.of("Due Date")) {-- @Override- public String getCssClass() {- return "due-date d-none d-lg-table-cell align-middle";- }-- @Override- public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,- IModel<Milestone> rowModel) {- cellItem.add(new MilestoneDateLabel(componentId, rowModel));- }-- });-- columns.add(new AbstractColumn<Milestone, Void>(Model.of("Issue Stats")) {-- @Override- public String getCssClass() {- return "issue-stats align-middle";- }-- @Override- public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,- IModel<Milestone> rowModel) {- Fragment fragment = new Fragment(componentId, "issueStatsFrag", MilestoneListPage.this) {-- @Override- protected void onBeforeRender() {- /*- * Create StateStatsBar here as it requires to access the milestoneAndStatsModel which can- * only be calculated correctly after the milestone table is initialized- */- addOrReplace(new StateStatsBar("content", new LoadableDetachableModel<Map<String, Integer>>() {-- @Override- protected Map<String, Integer> load() {- Map<String, Integer> stateStats = new HashMap<>();- for (MilestoneAndIssueState milestoneAndState: milestoneAndStatesModel.getObject()) {- if (milestoneAndState.getMilestoneId().equals(rowModel.getObject().getId())) {- Integer count = stateStats.get(milestoneAndState.getIssueState());- if (count != null)- count ++;- else- count = 1;- stateStats.put(milestoneAndState.getIssueState(), count);- }- }- return stateStats;- }-- }) {-- @Override- protected Link<Void> newStateLink(String componentId, String state) {- String query = new IssueQuery(new StateCriteria(state, IssueQueryLexer.Is)).toString();- PageParameters params = MilestoneIssuesPage.paramsOf(getProject(), rowModel.getObject(), query);- return new ViewStateAwarePageLink<Void>(componentId, MilestoneIssuesPage.class, params);- }-- });- super.onBeforeRender();- }-- };- cellItem.add(fragment);- }-- });-- if (SecurityUtils.canManageIssues(getProject())) {- columns.add(new AbstractColumn<Milestone, Void>(Model.of("")) {-- @Override- public String getCssClass() {- return "d-none d-lg-table-cell actions align-middle";- }-- @Override- public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,- IModel<Milestone> rowModel) {- if (rowModel.getObject().getProject().equals(getProject())) {- cellItem.add(new MilestoneActionsPanel(componentId, rowModel) {-- @Override- protected void onUpdated(AjaxRequestTarget target) {- target.add(milestonesTable);- }-- @Override- protected void onDeleted(AjaxRequestTarget target) {- target.add(milestonesTable);- }-- });- } else {- cellItem.add(new Label(componentId, " ").setEscapeModelStrings(false));- }- }-- });- }-- SortableDataProvider<Milestone, Void> dataProvider = new LoadableDetachableDataProvider<Milestone, Void>() {-- @Override- public Iterator<? extends Milestone> iterator(long first, long count) {- EntityCriteria<Milestone> criteria = getCriteria(closed);- criteria.addOrder(sort.getOrder(closed));- return OneDev.getInstance(Dao.class).query(criteria, (int)first, (int)count).iterator();- }-- @Override- public long calcSize() {- return OneDev.getInstance(Dao.class).count(getCriteria(closed));- }-- @Override- public IModel<Milestone> model(Milestone object) {- Long id = object.getId();- return new LoadableDetachableModel<Milestone>() {-- @Override- protected Milestone load() {- return OneDev.getInstance(MilestoneManager.class).load(id);- }-- };- }- };-PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {@Override@@ -364,16 +62,19 @@ public class MilestoneListPage extends ProjectPage {}};-- add(milestonesTable = new DefaultDataTable<Milestone, Void>("milestones", columns, dataProvider,- WebConstants.PAGE_SIZE, pagingHistorySupport));- milestonesTable.setOutputMarkupId(true);- }+ add(new MilestoneListPanel("milestones", projectModel, closed, sort, pagingHistorySupport) {- @Override- protected void onDetach() {- milestoneAndStatesModel.detach();- super.onDetach();+ @Override+ protected void onSortChanged(AjaxRequestTarget target, MilestoneSort sort) {+ setResponsePage(MilestoneListPage.class, paramsOf(getProject(), closed, sort));+ }++ @Override+ protected void onStateChanged(AjaxRequestTarget target, boolean closed) {+ setResponsePage(MilestoneListPage.class, paramsOf(getProject(), closed, sort));+ }++ });}public static PageParameters paramsOf(Project project, boolean closed, @Nullable MilestoneSort sort) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 4cf3c4901d..54d52d0a70 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -1204,11 +1204,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRoperationsContainer.add(new ModalLink("approve") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-private boolean canOperate() {PullRequest request = getPullRequest();if (request.isOpen()) {@@ -1251,11 +1246,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRoperationsContainer.add(new ModalLink("requestForChanges") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-private boolean canOperate() {PullRequest request = getPullRequest();if (request.isOpen()) {@@ -1330,11 +1320,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRoperationsContainer.add(new ModalLink("discard") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-private boolean canOperate() {return getPullRequest().isOpen() && SecurityUtils.canModify(getPullRequest());}@@ -1370,11 +1355,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRoperationsContainer.add(new ModalLink("reopen") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-private boolean canOperate() {PullRequest request = getPullRequest();return SecurityUtils.canModify(request) && request.checkReopen() == null;@@ -1411,11 +1391,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRoperationsContainer.add(new ModalLink("deleteSourceBranch") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-private boolean canOperate() {PullRequest request = getPullRequest();return request.checkDeleteSourceBranch() == null@@ -1455,11 +1430,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRoperationsContainer.add(new ModalLink("restoreSourceBranch") {- @Override- protected String getModalCssClass() {- return "modal-lg";- }-private boolean canOperate() {PullRequest request = getPullRequest();return request.checkRestoreSourceBranch() == nulldiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.javaindex cd9a2c4a77..71276701ac 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java@@ -59,11 +59,6 @@ public class JobSecretsPage extends ProjectBuildSettingPage {public void onClick(AjaxRequestTarget target) {new ModalPanel(target) {- @Override- protected String getCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id) {return new JobSecretEditPanel(id, -1) {@@ -131,11 +126,6 @@ public class JobSecretsPage extends ProjectBuildSettingPage {public void onClick(AjaxRequestTarget target) {new ModalPanel(target) {- @Override- protected String getCssClass() {- return "modal-lg";- }-@Overrideprotected Component newContent(String id) {return new JobSecretEditPanel(id, index) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/TagBeanWithRevision.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/TagBeanWithRevision.javaindex 91f2464d11..d09d81768d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/TagBeanWithRevision.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/TagBeanWithRevision.java@@ -5,7 +5,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.web.component.createtag.TagBean;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.editable.annotation.RevisionPick;+import io.onedev.server.web.editable.annotation.RevisionChoice;@Editablepublic class TagBeanWithRevision extends TagBean {@@ -15,7 +15,7 @@ public class TagBeanWithRevision extends TagBean {private String revision;@Editable(order=1000, name="Revision")- @RevisionPick+ @RevisionChoice@NotEmpty(message = "Please select revision to create tag from")@OmitNamepublic String getRevision() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.javaindex bbd9619ffb..52b2cfd8b9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java@@ -24,7 +24,7 @@ import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;import io.onedev.server.web.component.svg.SpriteImage;-import io.onedev.server.web.page.project.ProjectListPage;+import io.onedev.server.web.page.HomePage;import io.onedev.server.web.page.simple.SimplePage;@SuppressWarnings("serial")@@ -64,7 +64,7 @@ public class GeneralErrorPage extends SimplePage {container.setOutputMarkupId(true);add(container);- container.add(new ViewStateAwarePageLink<Void>("home", ProjectListPage.class));+ container.add(new ViewStateAwarePageLink<Void>("home", HomePage.class));container.add(new AjaxLink<Void>("showDetail") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.javaindex 43eb726321..91bd43bedb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java@@ -21,8 +21,8 @@ import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.page.HomePage;import io.onedev.server.web.page.my.avatar.MyAvatarPage;-import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.simple.SimplePage;import io.onedev.server.web.util.editablebean.NewUserBean;@@ -98,7 +98,7 @@ public class SignUpPage extends SimplePage {@Overridepublic void onClick() {- setResponsePage(ProjectListPage.class);+ setResponsePage(HomePage.class);}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.javaindex d44952cd28..7aea915cbd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.java@@ -20,7 +20,7 @@ import io.onedev.server.util.init.ManualConfig;import io.onedev.server.web.WebSession;import io.onedev.server.web.component.wizard.DefaultEndActionsPanel;import io.onedev.server.web.component.wizard.WizardPanel;-import io.onedev.server.web.page.project.ProjectListPage;+import io.onedev.server.web.page.HomePage;import io.onedev.server.web.page.simple.SimplePage;@SuppressWarnings("serial")@@ -83,7 +83,7 @@ public class ServerInitPage extends SimplePage {WebSession.get().logout();User root = OneDev.getInstance(UserManager.class).getRoot();SecurityUtils.getSubject().runAs(root.getPrincipals());- throw new RestartResponseException(ProjectListPage.class);+ throw new RestartResponseException(HomePage.class);}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex c331d117bb..c77e7929a5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -6,6 +6,12 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.request.mapper.parameter.PageParameters;+import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -23,8 +29,14 @@ public class TestPage extends BasePage {@Overridepublic void onClick() {+ Project project = OneDev.getInstance(ProjectManager.class).findByPath("onedev/server");++ long time = System.currentTimeMillis();+ for (int i=0; i<2000; i++)+ OneDev.getInstance(IssueManager.class).queryStats(Lists.newArrayList(project));+ System.out.println(System.currentTimeMillis()-time);}-+});}diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportModule.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportModule.javaindex c0dc59acee..d1e47aa22c 100644--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportModule.java+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportModule.java@@ -85,7 +85,6 @@ public class UnitTestReportModule extends AbstractPluginModule {});- // put your guice bindings herecontribute(WebApplicationConfigurator.class, new WebApplicationConfigurator() {@Overridediff --git a/server-product/pom.xml b/server-product/pom.xmlindex c5dc1cc0de..ebe49b57ce 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -169,4 +169,4 @@<executables>bin/*.sh, boot/wrapper-*</executables><moduleClass>io.onedev.server.product.ProductModule</moduleClass></properties>-</project>\ No newline at end of file+</project>