The Unified and Autonomous Development Platform
Fix issue #691 - Command palette to quickly access different parts of OneDev
Robin Shen1ff836f09b69
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 543a8f8983..2cdecd8e01 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -320,7 +320,7 @@ import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EditSupportLocator;import io.onedev.server.web.editable.EditSupportRegistry;import io.onedev.server.web.exception.PageExpiredExceptionHandler;-import io.onedev.server.web.mapper.DynamicPathPageMapper;+import io.onedev.server.web.mapper.BasePageMapper;import io.onedev.server.web.page.layout.AdministrationSettingContribution;import io.onedev.server.web.page.layout.ContributedAdministrationSetting;import io.onedev.server.web.page.layout.DefaultMainMenuCustomization;@@ -659,7 +659,7 @@ public class CoreModule extends AbstractPluginModule {@Overridepublic void configure(org.apache.wicket.protocol.http.WebApplication application) {- application.mount(new DynamicPathPageMapper("/test", TestPage.class));+ application.mount(new BasePageMapper("/test", TestPage.class));}});diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.javaindex daa2e6c3f2..fa799752aa 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java@@ -1,5 +1,7 @@package io.onedev.server.entitymanager;+import java.util.List;+import javax.annotation.Nullable;import io.onedev.server.model.Group;@@ -22,4 +24,8 @@ public interface GroupManager extends EntityManager<Group> {@NullableGroup find(String name);+ int count(@Nullable String term);++ List<Group> query(@Nullable String term, int firstResult, int maxResults);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javaindex 35250d0288..84ee21a754 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java@@ -86,4 +86,6 @@ public interface ProjectManager extends EntityManager<Project> {void delete(Collection<Project> projects);+ int findLongestMatch(List<String> pathSegments);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.javaindex 216f2b92cc..4fae10b159 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java@@ -1,6 +1,7 @@package io.onedev.server.entitymanager;import java.util.Collection;+import java.util.List;import java.util.Map;import javax.annotation.Nullable;@@ -27,4 +28,8 @@ public interface RoleManager extends EntityManager<Role> {void fixUndefinedIssueFields(Map<String, UndefinedFieldResolution> resolutions);+ List<Role> query(@Nullable String term, int firstResult, int maxResult);++ int count(@Nullable String term);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.javaindex a50e2199e6..c367c5e753 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java@@ -2,9 +2,12 @@ package io.onedev.server.entitymanager.impl;import java.util.List;+import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import io.onedev.server.entitymanager.GroupManager;@@ -97,4 +100,27 @@ public class DefaultGroupManager extends BaseEntityManager<Group> implements Groreturn count(true);}+ private EntityCriteria<Group> getCriteria(@Nullable String term) {+ EntityCriteria<Group> criteria = EntityCriteria.of(Group.class);+ if (term != null)+ criteria.add(Restrictions.ilike("name", term, MatchMode.ANYWHERE));+ else+ criteria.setCacheable(true);+ return criteria;+ }++ @Sessional+ @Override+ public List<Group> query(String term, int firstResult, int maxResults) {+ EntityCriteria<Group> criteria = getCriteria(term);+ criteria.addOrder(Order.asc("name"));+ return query(criteria, firstResult, maxResults);+ }++ @Sessional+ @Override+ public int count(String term) {+ return count(getCriteria(term));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex 84da242c59..cf4f1909fb 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -682,24 +682,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>}private ProjectScope newProjectScope(Project project) {- return new ProjectScope() {-- @Override- public Project getProject() {- return project;- }-- @Override- public boolean isRecursive() {- return false;- }-- @Override- public RecursiveConfigurable getRecursiveConfigurable() {- return null;- }-- };+ return new ProjectScope(project, false, null);}@Sessionaldiff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 38bd39dcd9..48afc9639e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -971,6 +971,29 @@ public class DefaultProjectManager extends BaseEntityManager<Project>return null;}+ private int findLongestMatch(@Nullable Long parentId, List<String> pathSegments) {+ if (!pathSegments.isEmpty()) {+ String name = pathSegments.get(0);+ Long projectId = findProjectId(parentId, name);+ if (projectId != null)+ return findLongestMatch(projectId, pathSegments.subList(1, pathSegments.size())) + 1;+ else+ return 0;+ } else {+ return 0;+ }+ }++ @Override+ public int findLongestMatch(List<String> pathSegments) {+ cacheLock.readLock().lock();+ try {+ return findLongestMatch(null, pathSegments);+ } finally {+ cacheLock.readLock().unlock();+ }+ }+@Overridepublic List<ProjectFacade> getChildren(Long projectId) {cacheLock.readLock().lock();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.javaindex 33ab1d50cb..9e8af0ae87 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java@@ -6,10 +6,13 @@ import java.util.HashSet;import java.util.List;import java.util.Map;+import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import org.hibernate.ReplicationMode;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;@@ -216,4 +219,27 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM}}+ private EntityCriteria<Role> getCriteria(@Nullable String term) {+ EntityCriteria<Role> criteria = EntityCriteria.of(Role.class);+ if (term != null)+ criteria.add(Restrictions.ilike("name", term, MatchMode.ANYWHERE));+ else+ criteria.setCacheable(true);+ return criteria;+ }++ @Sessional+ @Override+ public List<Role> query(@Nullable String term, int firstResult, int maxResult) {+ EntityCriteria<Role> criteria = getCriteria(term);+ criteria.addOrder(Order.asc("name"));+ return query(criteria, firstResult, maxResult);+ }++ @Sessional+ @Override+ public int count(@Nullable String term) {+ return count(getCriteria(term));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.javaindex 1ab9b57a86..422c91587f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java@@ -364,6 +364,7 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserMRoot<User> root = criteriaQuery.from(User.class);criteriaQuery.where(getPredicates(builder, criteriaQuery, root, term));+ criteriaQuery.orderBy(builder.asc(root.get(User.PROP_NAME)));Query<User> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex cce21fdb23..dc18114c37 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -130,6 +130,7 @@ import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.model.support.build.NamedBuildQuery;import io.onedev.server.model.support.build.ProjectBuildSetting;import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.ProjectIssueSetting;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;@@ -2004,5 +2005,21 @@ public class Project extends AbstractEntity {return (ArrayList<NamedPullRequestQuery>) OneDev.getInstance(SettingManager.class).getPullRequestSetting().getNamedQueries();}++ public List<BoardSpec> getHierarchyBoards() {+ List<BoardSpec> boards = null;++ Project current = this;+ do {+ boards = current.getIssueSetting().getBoardSpecs();+ if (boards != null)+ break;+ current = current.getParent();+ } while (current != null);++ if (boards == null)+ boards = OneDev.getInstance(SettingManager.class).getIssueSetting().getBoardSpecs();+ return boards;+ }}diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScope.java b/server-core/src/main/java/io/onedev/server/util/ProjectScope.javaindex ad8b0c05f0..080a086db3 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectScope.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScope.java@@ -6,14 +6,32 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import io.onedev.server.model.Project;-public interface ProjectScope {+public class ProjectScope {++ private final Project project;++ private final boolean recursive;++ private final RecursiveConfigurable recursiveConfigurable;++ public ProjectScope(Project project, boolean recursive, RecursiveConfigurable recursiveConfigurable) {+ this.project = project;+ this.recursive = recursive;+ this.recursiveConfigurable = recursiveConfigurable;+ }- Project getProject();+ public Project getProject() {+ return project;+ }- boolean isRecursive();+ public boolean isRecursive() {+ return recursive;+ }@Nullable- RecursiveConfigurable getRecursiveConfigurable();+ public RecursiveConfigurable getRecursiveConfigurable() {+ return recursiveConfigurable;+ }public static interface RecursiveConfigurable {diff --git a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.javadeleted file mode 100644index 5126900189..0000000000--- a/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java+++ /dev/null@@ -1,357 +0,0 @@-package io.onedev.server.web;--import org.apache.wicket.core.request.mapper.ResourceMapper;-import org.apache.wicket.markup.html.pages.BrowserInfoPage;-import org.apache.wicket.protocol.http.WebApplication;-import org.apache.wicket.request.IRequestMapper;-import org.apache.wicket.request.mapper.CompoundRequestMapper;--import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.web.asset.icon.IconScope;-import io.onedev.server.web.mapper.BaseResourceMapper;-import io.onedev.server.web.mapper.DynamicPathPageMapper;-import io.onedev.server.web.mapper.DynamicPathResourceMapper;-import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;-import io.onedev.server.web.page.admin.buildsetting.agent.AgentBuildsPage;-import io.onedev.server.web.page.admin.buildsetting.agent.AgentListPage;-import io.onedev.server.web.page.admin.buildsetting.agent.AgentLogPage;-import io.onedev.server.web.page.admin.buildsetting.agent.AgentOverviewPage;-import io.onedev.server.web.page.admin.buildsetting.jobexecutor.JobExecutorsPage;-import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;-import io.onedev.server.web.page.admin.gpgsigningkey.GpgSigningKeyPage;-import io.onedev.server.web.page.admin.gpgtrustedkeys.GpgTrustedKeysPage;-import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;-import io.onedev.server.web.page.admin.group.GroupListPage;-import io.onedev.server.web.page.admin.group.authorization.GroupAuthorizationsPage;-import io.onedev.server.web.page.admin.group.create.NewGroupPage;-import io.onedev.server.web.page.admin.group.membership.GroupMembershipsPage;-import io.onedev.server.web.page.admin.group.profile.GroupProfilePage;-import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;-import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;-import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;-import io.onedev.server.web.page.admin.issuesetting.linkspec.LinkSpecListPage;-import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;-import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;-import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;-import io.onedev.server.web.page.admin.notificationtemplatesetting.IssueNotificationTemplatePage;-import io.onedev.server.web.page.admin.notificationtemplatesetting.PullRequestNotificationTemplatePage;-import io.onedev.server.web.page.admin.performancesetting.PerformanceSettingPage;-import io.onedev.server.web.page.admin.pluginsettings.ContributedAdministrationSettingPage;-import io.onedev.server.web.page.admin.role.NewRolePage;-import io.onedev.server.web.page.admin.role.RoleDetailPage;-import io.onedev.server.web.page.admin.role.RoleListPage;-import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;-import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;-import io.onedev.server.web.page.admin.serverlog.ServerLogPage;-import io.onedev.server.web.page.admin.servicedesk.ServiceDeskSettingPage;-import io.onedev.server.web.page.admin.sshserverkey.SshServerKeyPage;-import io.onedev.server.web.page.admin.ssosetting.SsoConnectorListPage;-import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;-import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;-import io.onedev.server.web.page.admin.user.UserListPage;-import io.onedev.server.web.page.admin.user.accesstoken.UserAccessTokenPage;-import io.onedev.server.web.page.admin.user.authorization.UserAuthorizationsPage;-import io.onedev.server.web.page.admin.user.avatar.UserAvatarPage;-import io.onedev.server.web.page.admin.user.create.NewUserPage;-import io.onedev.server.web.page.admin.user.emailaddresses.UserEmailAddressesPage;-import io.onedev.server.web.page.admin.user.gpgkeys.UserGpgKeysPage;-import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;-import io.onedev.server.web.page.admin.user.password.UserPasswordPage;-import io.onedev.server.web.page.admin.user.profile.UserProfilePage;-import io.onedev.server.web.page.admin.user.sshkeys.UserSshKeysPage;-import io.onedev.server.web.page.admin.user.twofactorauthentication.UserTwoFactorAuthenticationPage;-import io.onedev.server.web.page.builds.BuildListPage;-import io.onedev.server.web.page.help.IncompatibilitiesPage;-import io.onedev.server.web.page.help.MethodDetailPage;-import io.onedev.server.web.page.help.ResourceDetailPage;-import io.onedev.server.web.page.help.ResourceListPage;-import io.onedev.server.web.page.issues.IssueListPage;-import io.onedev.server.web.page.my.accesstoken.MyAccessTokenPage;-import io.onedev.server.web.page.my.avatar.MyAvatarPage;-import io.onedev.server.web.page.my.emailaddresses.MyEmailAddressesPage;-import io.onedev.server.web.page.my.gpgkeys.MyGpgKeysPage;-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.NewProjectPage;-import io.onedev.server.web.page.project.ProjectListPage;-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.builds.ProjectBuildsPage;-import io.onedev.server.web.page.project.builds.detail.InvalidBuildPage;-import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;-import io.onedev.server.web.page.project.builds.detail.changes.BuildChangesPage;-import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;-import io.onedev.server.web.page.project.builds.detail.issues.FixedIssuesPage;-import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;-import io.onedev.server.web.page.project.builds.detail.pipeline.BuildPipelinePage;-import io.onedev.server.web.page.project.children.ProjectChildrenPage;-import io.onedev.server.web.page.project.codecomments.InvalidCodeCommentPage;-import io.onedev.server.web.page.project.codecomments.ProjectCodeCommentsPage;-import io.onedev.server.web.page.project.commits.CommitDetailPage;-import io.onedev.server.web.page.project.commits.ProjectCommitsPage;-import io.onedev.server.web.page.project.compare.RevisionComparePage;-import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;-import io.onedev.server.web.page.project.imports.ProjectImportPage;-import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;-import io.onedev.server.web.page.project.issues.create.NewIssuePage;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;-import io.onedev.server.web.page.project.issues.detail.IssueBuildsPage;-import io.onedev.server.web.page.project.issues.detail.IssueCommitsPage;-import io.onedev.server.web.page.project.issues.detail.IssuePullRequestsPage;-import io.onedev.server.web.page.project.issues.imports.IssueImportPage;-import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;-import io.onedev.server.web.page.project.issues.milestones.MilestoneBurndownPage;-import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;-import io.onedev.server.web.page.project.issues.milestones.MilestoneIssuesPage;-import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;-import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;-import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;-import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;-import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;-import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;-import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;-import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;-import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;-import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionsPage;-import io.onedev.server.web.page.project.setting.build.ActionAuthorizationsPage;-import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;-import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPage;-import io.onedev.server.web.page.project.setting.build.JobSecretsPage;-import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;-import io.onedev.server.web.page.project.setting.pluginsettings.ContributedProjectSettingPage;-import io.onedev.server.web.page.project.setting.servicedesk.ProjectServiceDeskSettingPage;-import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionsPage;-import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;-import io.onedev.server.web.page.project.stats.ProjectContribsPage;-import io.onedev.server.web.page.project.stats.SourceLinesPage;-import io.onedev.server.web.page.project.tags.ProjectTagsPage;-import io.onedev.server.web.page.pullrequests.PullRequestListPage;-import io.onedev.server.web.page.simple.error.MethodNotAllowedErrorPage;-import io.onedev.server.web.page.simple.error.PageNotFoundErrorPage;-import io.onedev.server.web.page.simple.security.EmailAddressVerificationPage;-import io.onedev.server.web.page.simple.security.LoginPage;-import io.onedev.server.web.page.simple.security.LogoutPage;-import io.onedev.server.web.page.simple.security.PasswordResetPage;-import io.onedev.server.web.page.simple.security.SignUpPage;-import io.onedev.server.web.page.simple.serverinit.ServerInitPage;-import io.onedev.server.web.resource.AgentLibResourceReference;-import io.onedev.server.web.resource.AgentLogResourceReference;-import io.onedev.server.web.resource.AgentResourceReference;-import io.onedev.server.web.resource.ArchiveResourceReference;-import io.onedev.server.web.resource.ArtifactResourceReference;-import io.onedev.server.web.resource.AttachmentResourceReference;-import io.onedev.server.web.resource.BuildLogResourceReference;-import io.onedev.server.web.resource.RawBlobResourceReference;-import io.onedev.server.web.resource.ServerLogResourceReference;-import io.onedev.server.web.resource.SvgSpriteResourceReference;--public class BaseUrlMapper extends CompoundRequestMapper {-- @Override- public CompoundRequestMapper add(IRequestMapper mapper) {- if (mapper instanceof ResourceMapper && !(mapper instanceof BaseResourceMapper))- throw new ExplicitException("Base resource mapper should be used");- return super.add(mapper);- }-- public BaseUrlMapper(WebApplication app) {- add(new DynamicPathPageMapper("init", ServerInitPage.class));- add(new DynamicPathPageMapper("loading", BrowserInfoPage.class));- add(new DynamicPathPageMapper("issues", IssueListPage.class));- add(new DynamicPathPageMapper("pull-requests", PullRequestListPage.class));- add(new DynamicPathPageMapper("builds", BuildListPage.class));- addProjectPages();- addMyPages();- addAdministrationPages();- addSecurityPages();- addResources();- addHelpPages();- addErrorPages();- }-- private void addHelpPages() {- add(new DynamicPathPageMapper("help/incompatibilities", IncompatibilitiesPage.class));- add(new DynamicPathPageMapper("help/api", ResourceListPage.class));- add(new DynamicPathPageMapper("help/api/${resource}", ResourceDetailPage.class));- add(new DynamicPathPageMapper("help/api/${resource}/${method}", MethodDetailPage.class));- }-- private void addMyPages() {- add(new DynamicPathPageMapper("my/profile", MyProfilePage.class));- add(new DynamicPathPageMapper("my/email-addresses", MyEmailAddressesPage.class));- add(new DynamicPathPageMapper("my/avatar", MyAvatarPage.class));- add(new DynamicPathPageMapper("my/password", MyPasswordPage.class));- add(new DynamicPathPageMapper("my/ssh-keys", MySshKeysPage.class));- add(new DynamicPathPageMapper("my/gpg-keys", MyGpgKeysPage.class));- add(new DynamicPathPageMapper("my/access-token", MyAccessTokenPage.class));- add(new DynamicPathPageMapper("my/two-factor-authentication", MyTwoFactorAuthenticationPage.class));- }-- private void addResources() {- add(new BaseResourceMapper("downloads/server-log", new ServerLogResourceReference()));- add(new BaseResourceMapper("downloads/agent-log/${agent}", new AgentLogResourceReference()));- add(new BaseResourceMapper("downloads/agent.zip", new AgentResourceReference()));- add(new BaseResourceMapper("downloads/agent-lib", new AgentLibResourceReference()));- add(new BaseResourceMapper("downloads/projects/${project}/builds/${build}/log",- new BuildLogResourceReference()));- add(new BaseResourceMapper("projects/${project}/archive/${revision}",- new ArchiveResourceReference()));- add(new DynamicPathResourceMapper("projects/${project}/raw/${revision}/${path}",- new RawBlobResourceReference()));-- // Change AttachmentResource.authorizeGroup accordingly if change attachment url here- add(new BaseResourceMapper("projects/${project}/attachment/${group}/${attachment}",- new AttachmentResourceReference()));-- add(new DynamicPathResourceMapper("downloads/projects/${project}/builds/${build}/artifacts/${path}",- new ArtifactResourceReference()));- add(new BaseResourceMapper(SvgSpriteResourceReference.DEFAULT_MOUNT_PATH,- new SvgSpriteResourceReference(IconScope.class)));- }-- private void addErrorPages() {- add(new DynamicPathPageMapper("/errors/404", PageNotFoundErrorPage.class));- add(new DynamicPathPageMapper("/errors/405", MethodNotAllowedErrorPage.class));- }-- private void addSecurityPages() {- add(new DynamicPathPageMapper("login", LoginPage.class));- add(new DynamicPathPageMapper("logout", LogoutPage.class));- add(new DynamicPathPageMapper("signup", SignUpPage.class));- add(new DynamicPathPageMapper("reset-password", PasswordResetPage.class));- add(new DynamicPathPageMapper("verify-email-address/${emailAddress}/${verificationCode}",- EmailAddressVerificationPage.class));- add(new DynamicPathPageMapper(SsoProcessPage.MOUNT_PATH + "/${stage}/${connector}", SsoProcessPage.class));- }-- private void addAdministrationPages() {- add(new DynamicPathPageMapper("administration", UserListPage.class));- add(new DynamicPathPageMapper("administration/users", UserListPage.class));- add(new DynamicPathPageMapper("administration/users/new", NewUserPage.class));- add(new DynamicPathPageMapper("administration/users/${user}/profile", UserProfilePage.class));- add(new DynamicPathPageMapper("administration/users/${user}/email-setting", UserEmailAddressesPage.class));- add(new DynamicPathPageMapper("administration/users/${user}/groups", UserMembershipsPage.class));- add(new DynamicPathPageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));- add(new DynamicPathPageMapper("administration/users/${user}/avatar", UserAvatarPage.class));- add(new DynamicPathPageMapper("administration/users/${user}/password", UserPasswordPage.class));- add(new DynamicPathPageMapper("administration/users/${user}/ssh-keys", UserSshKeysPage.class));- add(new DynamicPathPageMapper("administration/users/${user}/gpg-keys", UserGpgKeysPage.class));- add(new DynamicPathPageMapper("administration/users/${user}/access-token", UserAccessTokenPage.class));- add(new DynamicPathPageMapper("administration/users/${user}/two-factor-authentication", UserTwoFactorAuthenticationPage.class));-- add(new DynamicPathPageMapper("administration/roles", RoleListPage.class));- add(new DynamicPathPageMapper("administration/roles/new", NewRolePage.class));- add(new DynamicPathPageMapper("administration/roles/${role}", RoleDetailPage.class));-- add(new DynamicPathPageMapper("administration/groups", GroupListPage.class));- add(new DynamicPathPageMapper("administration/groups/new", NewGroupPage.class));- add(new DynamicPathPageMapper("administration/groups/${group}/profile", GroupProfilePage.class));- add(new DynamicPathPageMapper("administration/groups/${group}/members", GroupMembershipsPage.class));- add(new DynamicPathPageMapper("administration/groups/${group}/authorizations", GroupAuthorizationsPage.class));-- add(new DynamicPathPageMapper("administration/settings/system", SystemSettingPage.class));- add(new DynamicPathPageMapper("administration/settings/mail", MailSettingPage.class));- add(new DynamicPathPageMapper("administration/settings/service-desk-setting",- ServiceDeskSettingPage.class));- add(new DynamicPathPageMapper("administration/settings/issue-notification-template",- IssueNotificationTemplatePage.class));- add(new DynamicPathPageMapper("administration/settings/pull-request-notification-template",- PullRequestNotificationTemplatePage.class));- add(new DynamicPathPageMapper("administration/settings/performance", PerformanceSettingPage.class));- add(new DynamicPathPageMapper("administration/settings/backup", DatabaseBackupPage.class));- add(new DynamicPathPageMapper("administration/settings/security", SecuritySettingPage.class));- add(new DynamicPathPageMapper("administration/settings/authenticator", AuthenticatorPage.class));- add(new DynamicPathPageMapper("administration/settings/sso-connectors", SsoConnectorListPage.class));- add(new DynamicPathPageMapper("administration/settings/ssh-server-key", SshServerKeyPage.class));- add(new DynamicPathPageMapper("administration/settings/gpg-signing-key", GpgSigningKeyPage.class));- add(new DynamicPathPageMapper("administration/settings/gpg-trusted-keys", GpgTrustedKeysPage.class));-- add(new DynamicPathPageMapper("administration/agents", AgentListPage.class));- add(new DynamicPathPageMapper("administration/agents/${agent}/overview", AgentOverviewPage.class));- add(new DynamicPathPageMapper("administration/agents/${agent}/builds", AgentBuildsPage.class));- add(new DynamicPathPageMapper("administration/agents/${agent}/log", AgentLogPage.class));- add(new DynamicPathPageMapper("administration/settings/job-executors", JobExecutorsPage.class));- add(new DynamicPathPageMapper("administration/settings/groovy-scripts", GroovyScriptListPage.class));-- add(new DynamicPathPageMapper("administration/settings/issue-fields", IssueFieldListPage.class));- add(new DynamicPathPageMapper("administration/settings/issue-states", IssueStateListPage.class));- add(new DynamicPathPageMapper("administration/settings/state-transitions", StateTransitionListPage.class));- add(new DynamicPathPageMapper("administration/settings/issue-boards", DefaultBoardListPage.class));- add(new DynamicPathPageMapper("administration/settings/issue-links", LinkSpecListPage.class));- add(new DynamicPathPageMapper("administration/settings/issue-templates", IssueTemplateListPage.class));-- add(new DynamicPathPageMapper("administration/settings/${setting}", ContributedAdministrationSettingPage.class));-- add(new DynamicPathPageMapper("administration/server-log", ServerLogPage.class));- add(new DynamicPathPageMapper("administration/server-information", ServerInformationPage.class));- }-- private void addProjectPages() {- add(new DynamicPathPageMapper("projects", ProjectListPage.class));- add(new DynamicPathPageMapper("projects/new", NewProjectPage.class));- add(new DynamicPathPageMapper("projects/import/${importer}", ProjectImportPage.class));- add(new DynamicPathPageMapper("projects/${project}", ProjectDashboardPage.class));-- add(new DynamicPathPageMapper("projects/${project}/blob/#{revision}/#{path}", ProjectBlobPage.class));- add(new DynamicPathPageMapper("projects/${project}/commits", ProjectCommitsPage.class));- add(new DynamicPathPageMapper("projects/${project}/commits/${revision}", CommitDetailPage.class));- add(new DynamicPathPageMapper("projects/${project}/compare", RevisionComparePage.class));- add(new DynamicPathPageMapper("projects/${project}/stats/contribs", ProjectContribsPage.class));- add(new DynamicPathPageMapper("projects/${project}/stats/lines", SourceLinesPage.class));-- add(new DynamicPathPageMapper("projects/${project}/branches", ProjectBranchesPage.class));- add(new DynamicPathPageMapper("projects/${project}/tags", ProjectTagsPage.class));- add(new DynamicPathPageMapper("projects/${project}/code-comments", ProjectCodeCommentsPage.class));- add(new DynamicPathPageMapper("projects/${project}/code-comments/${code-comment}/invalid", InvalidCodeCommentPage.class));-- add(new DynamicPathPageMapper("projects/${project}/pulls", ProjectPullRequestsPage.class));- add(new DynamicPathPageMapper("projects/${project}/pulls/new", NewPullRequestPage.class));- add(new DynamicPathPageMapper("projects/${project}/pulls/${request}", PullRequestActivitiesPage.class));- add(new DynamicPathPageMapper("projects/${project}/pulls/${request}/code-comments", PullRequestCodeCommentsPage.class));- add(new DynamicPathPageMapper("projects/${project}/pulls/${request}/changes", PullRequestChangesPage.class));- add(new DynamicPathPageMapper("projects/${project}/pulls/${request}/invalid", InvalidPullRequestPage.class));-- add(new DynamicPathPageMapper("projects/${project}/boards", IssueBoardsPage.class));- add(new DynamicPathPageMapper("projects/${project}/boards/${board}", IssueBoardsPage.class));- add(new DynamicPathPageMapper("projects/${project}/issues", ProjectIssueListPage.class));- add(new DynamicPathPageMapper("projects/${project}/issues/${issue}", IssueActivitiesPage.class));- add(new DynamicPathPageMapper("projects/${project}/issues/${issue}/commits", IssueCommitsPage.class));- add(new DynamicPathPageMapper("projects/${project}/issues/${issue}/pull-requests", IssuePullRequestsPage.class));- add(new DynamicPathPageMapper("projects/${project}/issues/${issue}/builds", IssueBuildsPage.class));- add(new DynamicPathPageMapper("projects/${project}/issues/new", NewIssuePage.class));- add(new DynamicPathPageMapper("projects/${project}/issues/import/${importer}", IssueImportPage.class));- add(new DynamicPathPageMapper("projects/${project}/milestones", MilestoneListPage.class));- add(new DynamicPathPageMapper("projects/${project}/milestones/${milestone}/issues", MilestoneIssuesPage.class));- add(new DynamicPathPageMapper("projects/${project}/milestones/${milestone}/burndown", MilestoneBurndownPage.class));- add(new DynamicPathPageMapper("projects/${project}/milestones/${milestone}/edit", MilestoneEditPage.class));- add(new DynamicPathPageMapper("projects/${project}/milestones/new", NewMilestonePage.class));-- add(new DynamicPathPageMapper("projects/${project}/builds", ProjectBuildsPage.class));- add(new DynamicPathPageMapper("projects/${project}/builds/${build}", BuildDashboardPage.class));- add(new DynamicPathPageMapper("projects/${project}/builds/${build}/pipeline", BuildPipelinePage.class));- add(new DynamicPathPageMapper("projects/${project}/builds/${build}/log", BuildLogPage.class));- add(new DynamicPathPageMapper("projects/${project}/builds/${build}/changes", BuildChangesPage.class));- add(new DynamicPathPageMapper("projects/${project}/builds/${build}/fixed-issues", FixedIssuesPage.class));- add(new DynamicPathPageMapper("projects/${project}/builds/${build}/artifacts", BuildArtifactsPage.class));- add(new DynamicPathPageMapper("projects/${project}/builds/${build}/invalid", InvalidBuildPage.class));-- add(new DynamicPathPageMapper("projects/${project}/children", ProjectChildrenPage.class));-- add(new DynamicPathPageMapper("projects/${project}/settings/general", GeneralProjectSettingPage.class));- add(new DynamicPathPageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));- add(new DynamicPathPageMapper("projects/${project}/settings/avatar-edit", AvatarEditPage.class));- add(new DynamicPathPageMapper("projects/${project}/settings/branch-protection", BranchProtectionsPage.class));- add(new DynamicPathPageMapper("projects/${project}/settings/tag-protection", TagProtectionsPage.class));- add(new DynamicPathPageMapper("projects/${project}/settings/build/job-secrets", JobSecretsPage.class));- add(new DynamicPathPageMapper("projects/${project}/settings/build/action-authorizations", ActionAuthorizationsPage.class));- add(new DynamicPathPageMapper("projects/${project}/settings/build/build-preserve-rules", BuildPreservationsPage.class));- add(new DynamicPathPageMapper("projects/${project}/settings/build/default-fixed-issues-filter", DefaultFixedIssueFiltersPage.class));- add(new DynamicPathPageMapper("projects/${project}/settings/service-desk", ProjectServiceDeskSettingPage.class));- add(new DynamicPathPageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));- add(new DynamicPathPageMapper("projects/${project}/settings/${setting}", ContributedProjectSettingPage.class));- }--}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 156c9f8763..aa177f7524 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@@ -64,6 +64,7 @@ import io.onedev.server.OneDev;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.base.BasePage;import io.onedev.server.web.page.layout.MainMenuCustomization;import io.onedev.server.web.page.simple.error.GeneralErrorPage;diff --git a/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js b/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.jsindex e8cc14f58e..9f3c7f9d02 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/selectbytyping/jquery.selectbytyping.js@@ -10,6 +10,17 @@$(container).find(".active.selectable").find("a").addBack("a").click();}+ function onTab() {+ var completion = $(container).find(".active.selectable").data("completion");+ if (completion == undefined)+ completion = $(container).find(".active.selectable").find("a").addBack("a").data("completion");+ if (completion != undefined) {+ $input.val(completion);+ $input.trigger("input");+ }+ return false;+ }+function onKeyup(e) {var $container = $(container);e.preventDefault();@@ -42,7 +53,8 @@$input.bind("keydown", "return", onReturn).bind("keydown", "up", onKeyup)- .bind("keydown", "down", onKeydown);+ .bind("keydown", "down", onKeydown)+ .bind("keydown", "tab", onTab);return this;};diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.javaindex 4fed3fb555..a9f440b45a 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java@@ -20,7 +20,7 @@ public abstract class OnTypingDoneBehavior extends AjaxFormComponentUpdatingBeha}public OnTypingDoneBehavior() {- this(350);+ this(250);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/SelectByTypingBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/SelectByTypingBehavior.javanew file mode 100644index 0000000000..32b82cca24--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/behavior/SelectByTypingBehavior.java@@ -0,0 +1,30 @@+package io.onedev.server.web.behavior;++import org.apache.wicket.Component;+import org.apache.wicket.behavior.Behavior;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;++import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;++@SuppressWarnings("serial")+public class SelectByTypingBehavior extends Behavior {++ private final Component container;++ public SelectByTypingBehavior(Component container) {+ this.container = container;+ }++ @Override+ public void renderHead(Component component, IHeaderResponse response) {+ super.renderHead(component, response);++ response.render(JavaScriptHeaderItem.forReference(new SelectByTypingResourceReference()));+ String script = String.format("$('#%s').selectByTyping('#%s');",+ component.getMarkupId(true), container.getMarkupId(true));+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.htmlindex 1ec6b869d1..c86ae7ab5d 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html@@ -10,7 +10,7 @@</ul><ul class="help list-unstyled rounded mt-3 mb-0 text-muted bg-light px-3 py-2"><li wicket:id="hints"></li>- <li><span class='complete'></span> ↑↓ to select item. Esc to close</li>+ <li><span class='complete'></span> <span class="keycap mr-1">↑</span><span class="keycap">↓</span> to navigate. <span class="keycap">Esc</span> to close</li></ul></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.jsindex 7491b64758..2b1565538b 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js@@ -196,9 +196,9 @@ onedev.server.inputassist = {updateHelp: function($dropdown) {if ($dropdown.find("li.active").length != 0) {- $dropdown.find(".help .complete").empty().append("Tab or ↵ to use selected item.");+ $dropdown.find(".help .complete").empty().append("<span class='keycap'>Tab</span> or <span class='keycap'>Enter</span> to complete.");} else {- $dropdown.find(".help .complete").empty().append("Tab to use first item.");+ $dropdown.find(".help .complete").empty().append("<span class='keycap'>Tab</span> to complete.");}}};\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/AgentParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/AgentParam.javanew file mode 100644index 0000000000..ac2cafa483--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/AgentParam.java@@ -0,0 +1,56 @@+package io.onedev.server.web.component.commandpalette;++import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.AgentManager;+import io.onedev.server.model.Agent;+import io.onedev.server.search.entity.agent.AgentQuery;+import io.onedev.server.search.entity.agent.NameCriteria;+import io.onedev.server.search.entity.agent.OsArchCriteria;+import io.onedev.server.search.entity.agent.OsCriteria;+import io.onedev.server.search.entity.agent.OsVersionCriteria;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.criteria.OrCriteria;+import io.onedev.server.web.page.admin.buildsetting.agent.AgentDetailPage;++public class AgentParam extends ParamSegment {++ private static final long serialVersionUID = 1L;++ public AgentParam(boolean optional) {+ super(AgentDetailPage.PARAM_AGENT, optional);+ }++ @Override+ public Map<String, String> suggest(String matchWith, Map<String, String> paramValues, int count) {+ Map<String, String> suggestions = new LinkedHashMap<>();+ AgentManager agentManager = OneDev.getInstance(AgentManager.class);+ AgentQuery query;+ if (matchWith.length() == 0) {+ query = new AgentQuery();+ } else {+ List<Criteria<Agent>> criterias = new ArrayList<>();+ criterias.add(new NameCriteria("*" + matchWith + "*"));+ criterias.add(new OsCriteria("*" + matchWith + "*"));+ criterias.add(new OsVersionCriteria("*" + matchWith + "*"));+ criterias.add(new OsArchCriteria("*" + matchWith + "*"));+ query = new AgentQuery(new OrCriteria<Agent>(criterias));+ }++ for (Agent agent: agentManager.query(query, 0, count))+ suggestions.put(agent.getName(), agent.getName());++ return suggestions;+ }++ @Override+ public boolean isExactMatch(String matchWith, Map<String, String> paramValues) {+ AgentManager agentManager = OneDev.getInstance(AgentManager.class);+ return agentManager.findByName(matchWith) != null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BoardParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BoardParam.javanew file mode 100644index 0000000000..be01b03315--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BoardParam.java@@ -0,0 +1,37 @@+package io.onedev.server.web.component.commandpalette;++import java.util.LinkedHashMap;+import java.util.Map;++import io.onedev.server.model.support.issue.BoardSpec;+import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;++public class BoardParam extends ParamSegment {++ private static final long serialVersionUID = 1L;++ public BoardParam(boolean optional) {+ super(IssueBoardsPage.PARAM_BOARD, optional);+ }++ @Override+ public Map<String, String> suggest(String matchWith,+ Map<String, String> paramValues, int count) {+ Map<String, String> suggestions = new LinkedHashMap<>();+ for (BoardSpec board: ParsedUrl.getProject(paramValues).getHierarchyBoards()) {+ if (board.getName().toLowerCase().contains(matchWith)) {+ suggestions.put(board.getName(), board.getName());+ if (--count == 0)+ break;+ }+ }+ return suggestions;+ }++ @Override+ public boolean isExactMatch(String matchWith, Map<String, String> paramValues) {+ return ParsedUrl.getProject(paramValues).getHierarchyBoards()+ .stream().anyMatch(it->it.getName().equals(matchWith));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BuildParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BuildParam.javanew file mode 100644index 0000000000..ad039ae0b8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BuildParam.java@@ -0,0 +1,66 @@+package io.onedev.server.web.component.commandpalette;++import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.model.Build;+import io.onedev.server.search.entity.build.BuildQuery;+import io.onedev.server.search.entity.build.JobCriteria;+import io.onedev.server.search.entity.build.VersionCriteria;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.criteria.OrCriteria;+import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;++public class BuildParam extends ParamSegment {++ private static final long serialVersionUID = 1L;++ public BuildParam(boolean optional) {+ super(BuildDetailPage.PARAM_BUILD, optional);+ }++ @Override+ public Map<String, String> suggest(String matchWith,+ Map<String, String> paramValues, int count) {+ Map<String, String> suggestions = new LinkedHashMap<>();+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);+ BuildQuery query;+ if (matchWith.length() == 0) {+ query = new BuildQuery();+ } else {+ List<Criteria<Build>> criterias = new ArrayList<>();+ criterias.add(new VersionCriteria("*" + matchWith + "*"));+ criterias.add(new JobCriteria("*" + matchWith + "*"));+ query = new BuildQuery(new OrCriteria<Build>(criterias));+ }+ List<Build> builds = buildManager.query(ParsedUrl.getProject(paramValues), query, 0, count);++ for (Build build: builds) {+ if (build.getVersion() != null) {+ suggestions.put("#" + build.getNumber() + " (" + build.getVersion() + ") - " + build.getJobName(),+ String.valueOf(build.getNumber()));+ } else {+ suggestions.put("#" + build.getNumber() + " - " + build.getJobName(),+ String.valueOf(build.getNumber()));+ }+ }+ return suggestions;+ }++ @Override+ public boolean isExactMatch(String matchWith, Map<String, String> paramValues) {+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);+ try {+ Long buildNumber = Long.valueOf(matchWith);+ if (buildManager.find(ParsedUrl.getProject(paramValues), buildNumber) != null)+ return true;+ } catch (NumberFormatException e) {+ }+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPaletteCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPaletteCssResourceReference.javanew file mode 100644index 0000000000..1ae9b0f008--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPaletteCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.commandpalette;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class CommandPaletteCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public CommandPaletteCssResourceReference() {+ super(CommandPaletteCssResourceReference.class, "command-palette.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.html b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.htmlnew file mode 100644index 0000000000..2cc9f12dad--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.html@@ -0,0 +1,24 @@+<wicket:panel>+ <div class="command-palette">+ <div class="modal-header">+ <h5 class="modal-title">Command Palette</h5>+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>+ </div>+ <div class="modal-body">+ <div class="clearable-wrapper">+ <input wicket:id="input" class="form-control" placeholder="Type to filter...">+ </div>+ <div wicket:id="suggestions" class="suggestions mt-3 overflow-auto">+ <a wicket:id="suggestions" class="suggestion d-flex justify-content-between selectable">+ <span wicket:id="label" class="text-break"></span>+ <span wicket:id="hint" class="hint ml-3 text-muted"></span>+ </a>+ </div>+ <div wicket:id="noSuggestions" class="no-suggestions alert alert-notice alert-light-warning mt-4 mb-0">No suggestions</div>+ </div>+ <div class="modal-footer justify-content-start text-muted">+ <span class="keycap mr-1">↑</span> <span class="keycap mr-1">↓</span> to move+ <span class="keycap ml-3 mr-1">esc</span> to close+ </div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.javanew file mode 100644index 0000000000..db0bc966a7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java@@ -0,0 +1,367 @@+package io.onedev.server.web.component.commandpalette;++import java.lang.reflect.Field;+import java.util.ArrayList;+import java.util.Comparator;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.Set;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.mapper.MountedMapper;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.IRequestMapper;+import org.apache.wicket.request.mapper.ICompoundRequestMapper;++import com.google.common.base.Preconditions;+import com.google.common.collect.Sets;++import edu.emory.mathcs.backport.java.util.Arrays;+import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.commons.utils.PathUtils;+import io.onedev.server.OneDev;+import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.web.WebApplication;+import io.onedev.server.web.behavior.OnTypingDoneBehavior;+import io.onedev.server.web.behavior.SelectByTypingBehavior;+import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;+import io.onedev.server.web.page.project.ProjectPage;++@SuppressWarnings("serial")+public abstract class CommandPalettePanel extends Panel {++ private static final int PAGE_SIZE = 100;++ private static final List<String[]> availableUrls = new ArrayList<>();++ private static final Set<String> excludedUrlPrefixes = Sets.newHashSet("test", "errors", "sso",+ "verify-email-address", "reset-password", "signup", "logout", "login", "loading", "init",+ "help", "builds", "issues", "pull-requests");++ private static final Set<String> excludedUrlSuffixes = Sets.newHashSet("invalid", "blob");++ static {+ for (IRequestMapper mapper: OneDev.getInstance(WebApplication.class).getRequestMappers())+ availableUrls.addAll(getMountedPaths(mapper));++ Collections.sort(availableUrls, new Comparator<String[]>() {++ @SuppressWarnings("unchecked")+ @Override+ public int compare(String[] o1, String[] o2) {+ return PathUtils.compare(Arrays.asList(o1), Arrays.asList(o2));+ }++ });++ }++ private static List<String[]> getMountedPaths(IRequestMapper mapper) {+ if (mapper instanceof MountedMapper) {+ try {+ Field field = ReflectionUtils.findField(mapper.getClass(), "mountSegments");+ Preconditions.checkNotNull(field);+ field.setAccessible(true);+ String[] mountSegments = (String[]) field.get(mapper);+ if (Arrays.equals(mountSegments, new String[] {"projects", "${project}", "files"}))+ mountSegments = new String[] {"projects", "${project}", "files", "#{revision-and-path}"};+ List<String[]> mountedPaths = new ArrayList<>();+ if (mountSegments != null && mountSegments.length != 0+ && !excludedUrlPrefixes.contains(mountSegments[0])+ && !excludedUrlSuffixes.contains(mountSegments[mountSegments.length-1])) {+ mountedPaths.add(mountSegments);+ }+ return mountedPaths;+ } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }+ } else if (mapper instanceof ICompoundRequestMapper) {+ List<String[]> mountedPaths = new ArrayList<>();+ ICompoundRequestMapper compoundMapper = (ICompoundRequestMapper) mapper;+ for (IRequestMapper childMapper: compoundMapper)+ mountedPaths.addAll(getMountedPaths(childMapper));+ return mountedPaths;+ } else {+ return new ArrayList<>();+ }+ }++ private final List<ParsedUrl> parsedUrls = new ArrayList<>();++ private int numSuggestionsToLoad = PAGE_SIZE;++ private TextField<String> input;++ private final IModel<List<CommandSuggestion>> suggestionsModel =+ new LoadableDetachableModel<List<CommandSuggestion>>() {++ @Override+ protected List<CommandSuggestion> load() {+ List<CommandSuggestion> suggestions = new ArrayList<>();+ String matchWith = input.getModelObject();+ if (matchWith != null)+ matchWith = matchWith.toLowerCase();+ else+ matchWith = "";++ Map<String, SuggestionContent> suggestionMap = new LinkedHashMap<>();++ for (ParsedUrl url: parsedUrls) {+ int leftOver = numSuggestionsToLoad - suggestionMap.size();+ if (leftOver > 0) {+ for (Map.Entry<String, SuggestionContent> entry: url.suggest(matchWith, leftOver).entrySet()) {+ SuggestionContent content = suggestionMap.get(entry.getKey());+ if (content != null)+ content = content.mergeWith(entry.getValue());+ else+ content = entry.getValue();+ suggestionMap.put(entry.getKey(), content);+ }+ } else {+ break;+ }+ }++ for (Map.Entry<String, SuggestionContent> entry: suggestionMap.entrySet())+ suggestions.add(new CommandSuggestion(entry.getKey(), entry.getValue()));++ return suggestions;+ }++ };++ public CommandPalettePanel(String id) {+ super(id);+ }++ private ParsedUrl newProjectAwareParsedUrl(String[] url) {+ return new ParsedUrl(url) {++ @Override+ protected Project getProject() {+ if (getPage() instanceof ProjectPage)+ return ((ProjectPage)getPage()).getProject();+ else+ return null;+ }++ };++ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (getPage() instanceof ProjectPage) {+ for (String[] url: availableUrls) {+ try {+ if (url.length > 2 && url[0].equals("projects") && url[1].equals("${project}")) {+ String[] relativeUrl = new String[url.length-2];+ System.arraycopy(url, 2, relativeUrl, 0, relativeUrl.length);+ parsedUrls.add(newProjectAwareParsedUrl(relativeUrl));+ }+ } catch (IgnoredUrlParam e) {+ }+ }+ }+ for (String[] url: availableUrls) {+ boolean applicable = false;+ if (SecurityUtils.isAdministrator()) {+ applicable = true;+ } else if (SecurityUtils.getUser() != null) {+ if (!url[0].equals("administration"))+ applicable = true;+ } else if (!url[0].equals("administration") && !url[0].equals("my")) {+ applicable = true;+ }+ if (applicable) {+ try {+ parsedUrls.add(new ParsedUrl(url) {++ @Override+ protected Project getProject() {+ return null;+ }+ });+ } catch (IgnoredUrlParam e) {+ }+ };+ }++ add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });++ input = new TextField<String>("input", Model.of(""));+ input.add(new OnTypingDoneBehavior() {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ WebMarkupContainer suggestions = newSuggestions();+ replace(suggestions);+ target.add(suggestions);++ target.add(get("noSuggestions"));+ }++ });+ input.add(new SelectByTypingBehavior(this));+ add(input);++ add(newSuggestions());++ add(new WebMarkupContainer("noSuggestions") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getSuggestions().isEmpty());+ }++ }.setOutputMarkupPlaceholderTag(true));++ }++ private WebMarkupContainer newSuggestions() {+ return new WebMarkupContainer("suggestions") {++ private WebMarkupContainer newSuggestionItem(+ RepeatingView suggestionsView, CommandSuggestion suggestion) {+ String url, searchBase;+ if (suggestion.getContent() != null) {+ url = suggestion.getContent().getUrl();+ searchBase = suggestion.getContent().getSearchBase();+ } else {+ url = null;+ searchBase = null;+ }+ WebMarkupContainer container = new WebMarkupContainer(suggestionsView.newChildId()) {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (url != null) {+ if (url.startsWith("/")) {+ tag.put("onclick", String.format("javascript:window.location='%s';", url));+ } else {+ Long projectId = ((ProjectPage)getPage()).getProject().getId();+ tag.put("onclick", String.format("javascript:window.location='/projects/%d/%s';", projectId, url));+ }+ }+ else+ tag.put("onclick", "javascript:void(0);");+ if (searchBase != null)+ tag.put("data-completion", searchBase);+ }++ };+ StringBuilder hintBuilder = new StringBuilder();++ if (searchBase != null)+ hintBuilder.append("<span class='text-nowrap'><span class='keycap'>Tab</span> to search</span>");+ if (url != null)+ hintBuilder.append("<span class='text-nowrap'><span class='keycap'>Enter</span> to go</span>");++ if (url != null || searchBase != null)+ container.add(new Label("label", suggestion.getLabel()));+ else+ container.add(new Label("label", "<i>" + suggestion.getLabel() + "</i>").setEscapeModelStrings(false));++ if (suggestionsView.size() == 0 && (url != null || searchBase != null))+ container.add(AttributeAppender.append("class", "active"));++ if (hintBuilder.length() != 0)+ container.add(new Label("hint", hintBuilder.toString()).setEscapeModelStrings(false));+ else+ container.add(new WebMarkupContainer("hint").setVisible(false));++ suggestionsView.add(container);++ return container;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ RepeatingView suggestionsView = new RepeatingView("suggestions");++ for (CommandSuggestion suggestion: suggestionsModel.getObject())+ newSuggestionItem(suggestionsView, suggestion);++ add(suggestionsView);++ add(new InfiniteScrollBehavior(PAGE_SIZE) {++ @Override+ protected void appendMore(AjaxRequestTarget target, int offset, int count) {+ numSuggestionsToLoad += PAGE_SIZE;+ for (int i=offset; i<offset+count; i++) {+ if (i < getSuggestions().size()) {+ CommandSuggestion suggestion = getSuggestions().get(i);+ Component suggestionItem = newSuggestionItem(suggestionsView, suggestion);+ String script = String.format("$('#%s').append('<li id=\"%s\"></li>');",+ getMarkupId(), suggestionItem.getMarkupId());+ target.prependJavaScript(script);+ target.add(suggestionItem);+ } else {+ break;+ }+ }+ }++ });++ setOutputMarkupPlaceholderTag(true);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getSuggestions().isEmpty());+ }++ };+ }++ @Override+ protected void onDetach() {+ suggestionsModel.detach();+ super.onDetach();+ }++ private List<CommandSuggestion> getSuggestions() {+ return suggestionsModel.getObject();+ }++ protected abstract void onCancel(AjaxRequestTarget target);++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new CommandPaletteCssResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandSuggestion.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandSuggestion.javanew file mode 100644index 0000000000..5d9eae3a09--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandSuggestion.java@@ -0,0 +1,26 @@+package io.onedev.server.web.component.commandpalette;++import java.io.Serializable;++public class CommandSuggestion implements Serializable {++ private static final long serialVersionUID = 1L;++ private final String label;++ private final SuggestionContent content;++ public CommandSuggestion(String label, SuggestionContent content) {+ this.label = label;+ this.content = content;+ }++ public String getLabel() {+ return label;+ }++ public SuggestionContent getContent() {+ return content;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommitParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommitParam.javanew file mode 100644index 0000000000..9017a5c320--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommitParam.java@@ -0,0 +1,35 @@+package io.onedev.server.web.component.commandpalette;++import java.util.LinkedHashMap;+import java.util.Map;++import org.eclipse.jgit.revwalk.RevCommit;++import io.onedev.server.web.page.project.commits.CommitDetailPage;++public class CommitParam extends ParamSegment {++ private static final long serialVersionUID = 1L;++ public CommitParam(boolean optional) {+ super(CommitDetailPage.PARAM_COMMIT, optional);+ }++ @Override+ public Map<String, String> suggest(String matchWith,+ Map<String, String> paramValues, int count) {+ Map<String, String> suggestions = new LinkedHashMap<>();+ RevCommit commit = ParsedUrl.getProject(paramValues).getRevCommit(matchWith, false);+ if (commit != null)+ suggestions.put(commit.getShortMessage(), matchWith);+ else+ suggestions.put("Input branch/tag/commit to show", null);+ return suggestions;+ }++ @Override+ public boolean isExactMatch(String matchWith, Map<String, String> paramValues) {+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/FixedSegment.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/FixedSegment.javanew file mode 100644index 0000000000..ee217d15a5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/FixedSegment.java@@ -0,0 +1,22 @@+package io.onedev.server.web.component.commandpalette;++public class FixedSegment implements UrlSegment {++ private static final long serialVersionUID = 1L;++ private final String path;++ public FixedSegment(String path) {+ this.path = path;+ }++ public String getPath() {+ return path;+ }++ @Override+ public String toString() {+ return path;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/GroupParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/GroupParam.javanew file mode 100644index 0000000000..7c9f5e4e06--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/GroupParam.java@@ -0,0 +1,42 @@+package io.onedev.server.web.component.commandpalette;++import java.util.LinkedHashMap;+import java.util.Map;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.model.Group;+import io.onedev.server.web.page.admin.group.GroupPage;++public class GroupParam extends ParamSegment {++ private static final long serialVersionUID = 1L;++ public GroupParam(boolean optional) {+ super(GroupPage.PARAM_GROUP, optional);+ }++ @Override+ public Map<String, String> suggest(String matchWith,+ Map<String, String> paramValues, int count) {+ Map<String, String> suggestions = new LinkedHashMap<>();+ if (matchWith.length() == 0)+ matchWith = null;+ for (Group group: OneDev.getInstance(GroupManager.class).query(matchWith, 0, count))+ suggestions.put(group.getName(), String.valueOf(group.getId()));+ return suggestions;+ }++ @Override+ public boolean isExactMatch(String matchWith, Map<String, String> paramValues) {+ GroupManager groupManager = OneDev.getInstance(GroupManager.class);+ try {+ Long groupId = Long.valueOf(matchWith);+ if (groupManager.get(groupId) != null)+ return true;+ } catch (NumberFormatException e) {+ }+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/IgnoredUrlParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/IgnoredUrlParam.javanew file mode 100644index 0000000000..c8728a17d6--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/IgnoredUrlParam.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.commandpalette;++import io.onedev.commons.utils.ExplicitException;++public class IgnoredUrlParam extends ExplicitException {++ private static final long serialVersionUID = 1L;++ public IgnoredUrlParam(String message) {+ super(message);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/IssueParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/IssueParam.javanew file mode 100644index 0000000000..ba08c93bb7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/IssueParam.java@@ -0,0 +1,55 @@+package io.onedev.server.web.component.commandpalette;++import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.model.Issue;+import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.search.entitytext.IssueTextManager;+import io.onedev.server.util.ProjectScope;+import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;++public class IssueParam extends ParamSegment {++ private static final long serialVersionUID = 1L;++ public IssueParam(boolean optional) {+ super(IssueDetailPage.PARAM_ISSUE, optional);+ }++ @Override+ public Map<String, String> suggest(String matchWith,+ Map<String, String> paramValues, int count) {+ Map<String, String> suggestions = new LinkedHashMap<>();+ List<Issue> issues;+ ProjectScope projectScope = new ProjectScope(ParsedUrl.getProject(paramValues), false, null);+ if (matchWith.length() == 0) {+ IssueManager issueManager = OneDev.getInstance(IssueManager.class);+ issues = issueManager.query(projectScope, new IssueQuery(), false, 0, count);+ } else {+ IssueTextManager issueTextManager = OneDev.getInstance(IssueTextManager.class);+ issues = issueTextManager.query(projectScope, matchWith, false, 0, count);+ }+ for (Issue issue: issues) {+ suggestions.put("#" + issue.getNumber() + " - " + issue.getTitle(),+ String.valueOf(issue.getNumber()));+ }+ return suggestions;+ }++ @Override+ public boolean isExactMatch(String matchWith, Map<String, String> paramValues) {+ IssueManager issueManager = OneDev.getInstance(IssueManager.class);+ try {+ Long issueNumber = Long.valueOf(matchWith);+ if (issueManager.find(ParsedUrl.getProject(paramValues), issueNumber) != null)+ return true;+ } catch (NumberFormatException e) {+ }+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/MilestoneParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/MilestoneParam.javanew file mode 100644index 0000000000..eb8906df46--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/MilestoneParam.java@@ -0,0 +1,43 @@+package io.onedev.server.web.component.commandpalette;++import java.util.LinkedHashMap;+import java.util.Map;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.MilestoneManager;+import io.onedev.server.model.Milestone;+import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;++public class MilestoneParam extends ParamSegment {++ private static final long serialVersionUID = 1L;++ public MilestoneParam(boolean optional) {+ super(MilestoneDetailPage.PARAM_MILESTONE, optional);+ }++ @Override+ public Map<String, String> suggest(String matchWith, Map<String, String> paramValues, int count) {+ Map<String, String> suggestions = new LinkedHashMap<>();+ for (Milestone milestone: ParsedUrl.getProject(paramValues).getSortedHierarchyMilestones()) {+ if (milestone.getName().toLowerCase().contains(matchWith)) {+ suggestions.put(milestone.getName(), String.valueOf(milestone.getId()));+ if (--count == 0)+ break;+ }+ }+ return suggestions;+ }++ @Override+ public boolean isExactMatch(String matchWith, Map<String, String> paramValues) {+ try {+ Long milestoneId = Long.valueOf(matchWith);+ if (OneDev.getInstance(MilestoneManager.class).get(milestoneId) != null)+ return true;+ } catch (NumberFormatException e) {+ }+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParamSegment.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParamSegment.javanew file mode 100644index 0000000000..5701baf1f4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParamSegment.java@@ -0,0 +1,38 @@+package io.onedev.server.web.component.commandpalette;++import java.util.Map;++public abstract class ParamSegment implements UrlSegment {++ private static final long serialVersionUID = 1L;++ private final String name;++ private final boolean optional;++ public ParamSegment(String name, boolean optional) {+ this.name = name;+ this.optional = optional;+ }++ public String getName() {+ return name;+ }++ public boolean isOptional() {+ return optional;+ }++ @Override+ public String toString() {+ if (optional)+ return "#{" + name + "}";+ else+ return "${" + name + "}";+ }++ public abstract boolean isExactMatch(String matchWith, Map<String, String> paramValues);++ public abstract Map<String, String> suggest(String matchWith, Map<String, String> paramValues, int count);++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParsedUrl.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParsedUrl.javanew file mode 100644index 0000000000..1a70ef4174--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParsedUrl.java@@ -0,0 +1,323 @@+package io.onedev.server.web.component.commandpalette;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.commons.lang3.StringUtils;++import com.google.common.base.Splitter;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.page.admin.buildsetting.agent.AgentDetailPage;+import io.onedev.server.web.page.admin.group.GroupPage;+import io.onedev.server.web.page.admin.role.RoleDetailPage;+import io.onedev.server.web.page.admin.user.UserPage;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;+import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;+import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;++public abstract class ParsedUrl implements Serializable {++ private static final long serialVersionUID = 1L;++ private final List<UrlSegment> parsedSegments;++ public ParsedUrl(String[] segments) {+ parsedSegments = new ArrayList<>();++ StringBuilder builder = new StringBuilder();+ for (String segment: segments) {+ if (segment.contains("$") || segment.contains("#")) {+ if (builder.length() != 0) {+ parsedSegments.add(new FixedSegment(builder.toString()));+ builder = new StringBuilder();+ }+ boolean optional = segment.contains("#");+ String paramName = StringUtils.strip(segment, "$#{}");+ switch (paramName) {+ case ProjectPage.PARAM_PROJECT:+ parsedSegments.add(new ProjectParam(optional));+ break;+ case IssueDetailPage.PARAM_ISSUE:+ parsedSegments.add(new IssueParam(optional));+ break;+ case PullRequestDetailPage.PARAM_REQUEST:+ parsedSegments.add(new PullRequestParam(optional));+ break;+ case BuildDetailPage.PARAM_BUILD:+ parsedSegments.add(new BuildParam(optional));+ break;+ case UserPage.PARAM_USER:+ parsedSegments.add(new UserParam(optional));+ break;+ case GroupPage.PARAM_GROUP:+ parsedSegments.add(new GroupParam(optional));+ break;+ case RoleDetailPage.PARAM_ROLE:+ parsedSegments.add(new RoleParam(optional));+ break;+ case RevisionAndPathParam.NAME:+ parsedSegments.add(new RevisionAndPathParam(optional));+ break;+ case CommitDetailPage.PARAM_COMMIT:+ parsedSegments.add(new CommitParam(optional));+ break;+ case IssueBoardsPage.PARAM_BOARD:+ parsedSegments.add(new BoardParam(optional));+ break;+ case AgentDetailPage.PARAM_AGENT:+ parsedSegments.add(new AgentParam(optional));+ break;+ case MilestoneDetailPage.PARAM_MILESTONE:+ parsedSegments.add(new MilestoneParam(optional));+ break;+ default:+ throw new IgnoredUrlParam(paramName);+ }+ } else {+ if (builder.length() != 0)+ builder.append("/");+ builder.append(segment);+ }+ }+ if (builder.length() != 0)+ parsedSegments.add(new FixedSegment(builder.toString()));+ }++ private boolean isApplicable(Project project, String path) {+ List<String> segments = Splitter.on("/").splitToList(path);+ String segment1 = segments.get(0);+ String segment2 = segments.size()>1? segments.get(1): "";+ switch (segment1) {+ case "settings":+ if (SecurityUtils.canManage(project)) {+ if (segment2.equals("service-desk")) {+ return OneDev.getInstance(SettingManager.class).getServiceDeskSetting() != null+ && project.isIssueManagement();+ } else {+ return true;+ }+ } else {+ return false;+ }+ case "files":+ case "commits":+ case "pulls":+ case "compare":+ case "branches":+ case "tags":+ case "code-comments":+ return project.isCodeManagement() && SecurityUtils.canReadCode(project);+ case "stats":+ switch (segment2) {+ case "contribs":+ case "lines":+ return project.isCodeManagement() && SecurityUtils.canReadCode(project);+ default:+ return true;+ }+ case "boards":+ case "issues":+ return project.isIssueManagement();+ case "milestones":+ if (project.isIssueManagement()) {+ if (segment2.equals("new"))+ return SecurityUtils.canManageIssues(project);+ else+ return true;+ } else {+ return false;+ }+ case "builds":+ return project.isCodeManagement();+ default:+ return true;+ }+ }++ private boolean isApplicable(Issue issue, String path) {+ switch (path) {+ case "commits":+ case "pull-requests":+ return SecurityUtils.canReadCode(issue.getProject());+ default:+ return true;+ }+ }++ private boolean isApplicable(Build build, String path) {+ switch (path) {+ case "changes":+ case "pipeline":+ return SecurityUtils.canReadCode(build.getProject());+ case "log":+ return SecurityUtils.canAccessLog(build);+ case "artifacts":+ return build.getArtifactsDir().exists();+ default:+ return true;+ }+ }++ public Map<String, SuggestionContent> suggest(String matchWith, int count) {+ Map<String, SuggestionContent> suggestions = new LinkedHashMap<>();+ Map<String, String> paramValues = new HashMap<>();+ if (getProject() != null) {+ paramValues.put(ProjectPage.PARAM_PROJECT, String.valueOf(getProject().getId()));+ if (matchWith.startsWith("/"))+ return suggestions;+ } else {+ matchWith = StringUtils.stripStart(matchWith, "/");+ }++ int index = 0;+ List<String> segments = new ArrayList<>();+ for (UrlSegment segment: parsedSegments) {+ boolean hasMoreSegments = parsedSegments.size() > index+1;+ boolean hasMoreRequiredSegments = false;+ for (int i=index+1; i<parsedSegments.size(); i++) {+ UrlSegment leftOverSegment = parsedSegments.get(i);+ if (leftOverSegment instanceof FixedSegment+ || !((ParamSegment) leftOverSegment).isOptional()) {+ hasMoreRequiredSegments = true;+ break;+ }+ }++ if (segment instanceof FixedSegment) {+ FixedSegment fixedSegment = (FixedSegment) segment;+ String path = fixedSegment.getPath();++ if ((index == 0 && getProject() != null+ || index != 0 && parsedSegments.get(index-1) instanceof ProjectParam)+ && !isApplicable(getProject(paramValues), path)) {+ break;+ }++ if (index != 0 && parsedSegments.get(index-1) instanceof IssueParam+ && !isApplicable(getIssue(paramValues), path)) {+ break;+ }++ if (index != 0 && parsedSegments.get(index-1) instanceof BuildParam+ && !isApplicable(getBuild(paramValues), path)) {+ break;+ }++ if (matchWith.startsWith(path)) {+ if (matchWith.length() == path.length()) {+ segments.add(path);+ addSuggestion(suggestions, segments, hasMoreSegments, hasMoreRequiredSegments);+ break;+ } else if (matchWith.charAt(path.length()) == '/') {+ matchWith = matchWith.substring(path.length()+1);+ segments.add(path);+ } else {+ suggestions.clear();+ break;+ }+ } else if (path.contains(matchWith)) {+ segments.add(fixedSegment.getPath());+ addSuggestion(suggestions, segments, hasMoreSegments, hasMoreRequiredSegments);+ break;+ } else {+ suggestions.clear();+ break;+ }+ } else {+ ParamSegment paramSegment = (ParamSegment) segment;+ String paramValue = StringUtils.substringBefore(matchWith, "/");+ if (paramSegment.isExactMatch(paramValue, paramValues)) {+ paramValues.put(paramSegment.getName(), paramValue);+ segments.add(paramValue);+ if (matchWith.contains("/")) {+ matchWith = StringUtils.substringAfter(matchWith, "/");+ } else {+ addSuggestion(suggestions, segments, hasMoreSegments, hasMoreRequiredSegments);+ break;+ }+ } else {+ Map<String, String> paramSuggestions = paramSegment.suggest(matchWith, paramValues, count);+ for (Map.Entry<String, String> entry: paramSuggestions.entrySet()) {+ if (entry.getValue() != null) {+ List<String> segmentsCopy = new ArrayList<>(segments);+ segmentsCopy.add(entry.getValue());+ String joined = StringUtils.join(segmentsCopy, "/");+ String url = !hasMoreRequiredSegments? makeAbsoluteIfNecessary(joined): null;+ String searchBase = hasMoreSegments? makeAbsoluteIfNecessary(joined + "/"): null;+ suggestions.put(entry.getKey(), new SuggestionContent(url, searchBase));+ } else {+ suggestions.put(entry.getKey(), null);+ }+ }+ break;+ }+ }+ index++;+ }++ if (index == parsedSegments.size() && matchWith.length() != 0)+ suggestions.clear();++ return suggestions;+ }++ private void addSuggestion(Map<String, SuggestionContent> suggestions, List<String> segments,+ boolean hasMoreSegments, boolean hasMoreRequiredSegments) {+ String joined = StringUtils.join(segments, "/");++ String url = !hasMoreRequiredSegments? makeAbsoluteIfNecessary(joined): null;+ String searchBase = hasMoreSegments? makeAbsoluteIfNecessary(joined + "/"): null;++ suggestions.put(makeAbsoluteIfNecessary(joined), new SuggestionContent(url, searchBase));+ }++ private String makeAbsoluteIfNecessary(String url) {+ if (getProject() != null)+ return url;+ else+ return "/" + url;+ }++ @Nullable+ protected abstract Project getProject();++ @Override+ public String toString() {+ return StringUtils.join(parsedSegments, "/");+ }++ static Project getProject(Map<String, String> paramValues) {+ Long projectId = Long.valueOf(paramValues.get(ProjectPage.PARAM_PROJECT));+ return OneDev.getInstance(ProjectManager.class).load(projectId);+ }++ static Build getBuild(Map<String, String> paramValues) {+ Long buildNumber = Long.valueOf(paramValues.get(BuildDetailPage.PARAM_BUILD));+ return OneDev.getInstance(BuildManager.class).find(getProject(paramValues), buildNumber);+ }++ static Issue getIssue(Map<String, String> paramValues) {+ Long issueNumber = Long.valueOf(paramValues.get(IssueDetailPage.PARAM_ISSUE));+ return OneDev.getInstance(IssueManager.class).find(getProject(paramValues), issueNumber);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ProjectParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ProjectParam.javanew file mode 100644index 0000000000..9be4b03733--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ProjectParam.java@@ -0,0 +1,48 @@+package io.onedev.server.web.component.commandpalette;++import java.util.LinkedHashMap;+import java.util.Map;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.search.entity.project.PathCriteria;+import io.onedev.server.search.entity.project.ProjectQuery;+import io.onedev.server.web.page.project.ProjectPage;++public class ProjectParam extends ParamSegment {++ private static final long serialVersionUID = 1L;++ public ProjectParam(boolean optional) {+ super(ProjectPage.PARAM_PROJECT, optional);+ }++ @Override+ public Map<String, String> suggest(String matchWith,+ Map<String, String> paramValues, int count) {+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);+ ProjectQuery query;+ if (matchWith.length() == 0)+ query = new ProjectQuery();+ else+ query = new ProjectQuery(new PathCriteria("**/*" + matchWith + "*/**"));+ Map<String, String> suggestions = new LinkedHashMap<>();+ for (Project project: projectManager.query(query, 0, count))+ suggestions.put(project.getPath(), String.valueOf(project.getId()));+ return suggestions;+ }++ @Override+ public boolean isExactMatch(String matchWith, Map<String, String> paramValues) {+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);+ try {+ Long projectId = Long.valueOf(matchWith);+ if (projectManager.get(projectId) != null)+ return true;+ } catch (NumberFormatException e) {+ }+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/PullRequestParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/PullRequestParam.javanew file mode 100644index 0000000000..bbcb508b48--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/PullRequestParam.java@@ -0,0 +1,55 @@+package io.onedev.server.web.component.commandpalette;++import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;+import io.onedev.server.search.entitytext.PullRequestTextManager;+import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;++public class PullRequestParam extends ParamSegment {++ private static final long serialVersionUID = 1L;++ public PullRequestParam(boolean optional) {+ super(PullRequestDetailPage.PARAM_REQUEST, optional);+ }++ @Override+ public Map<String, String> suggest(String matchWith,+ Map<String, String> paramValues, int count) {+ Map<String, String> suggestions = new LinkedHashMap<>();+ Project project = ParsedUrl.getProject(paramValues);+ List<PullRequest> requests;+ if (matchWith.length() == 0) {+ PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);+ requests = pullRequestManager.query(project, new PullRequestQuery(), false, 0, count);+ } else {+ PullRequestTextManager pullRequestTextManager = OneDev.getInstance(PullRequestTextManager.class);+ requests = pullRequestTextManager.query(project, matchWith, false, 0, count);+ }+ for (PullRequest request: requests) {+ suggestions.put("#" + request.getNumber() + " - " + request.getTitle(),+ String.valueOf(request.getNumber()));+ }+ return suggestions;+ }++ @Override+ public boolean isExactMatch(String matchWith, Map<String, String> paramValues) {+ PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);+ try {+ Long requestNumber = Long.valueOf(matchWith);+ if (pullRequestManager.find(ParsedUrl.getProject(paramValues), requestNumber) != null)+ return true;+ } catch (NumberFormatException e) {+ }+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.javanew file mode 100644index 0000000000..b5f1f1755b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java@@ -0,0 +1,60 @@+package io.onedev.server.web.component.commandpalette;++import java.util.LinkedHashMap;+import java.util.Map;++import org.eclipse.jgit.lib.ObjectId;++import io.onedev.server.OneDev;+import io.onedev.server.model.Project;+import io.onedev.server.search.code.CodeSearchManager;+import io.onedev.server.search.code.hit.QueryHit;+import io.onedev.server.search.code.query.FileQuery;+import io.onedev.server.search.code.query.TooGeneralQueryException;++public class RevisionAndPathParam extends ParamSegment {++ private static final long serialVersionUID = 1L;++ public static final String NAME = "revision-and-path";++ public RevisionAndPathParam(boolean optional) {+ super(NAME, optional);+ }++ @Override+ public Map<String, String> suggest(String matchWith,+ Map<String, String> paramValues, int count) {+ Map<String, String> suggestions = new LinkedHashMap<>();+ if (matchWith.length() == 0) {+ suggestions.put("Type to search in default branch", null);+ } else {+ Project project = ParsedUrl.getProject(paramValues);+ if (project.getDefaultBranch() != null) {+ CodeSearchManager codeSearchManager = OneDev.getInstance(CodeSearchManager.class);+ ObjectId commitId = project.getObjectId(project.getDefaultBranch(), true);+ FileQuery.Builder builder = new FileQuery.Builder();+ builder.fileNames("*" + matchWith + "*");+ builder.count(count);+ FileQuery query = builder.build();+ try {+ for (QueryHit hit: codeSearchManager.search(project, commitId, query)) {+ String revisionAndPath = project.getDefaultBranch() + "/" + hit.getBlobPath();+ suggestions.put(revisionAndPath, revisionAndPath);+ }+ } catch (TooGeneralQueryException e) {+ suggestions.put("Query is too general", null);+ } catch (InterruptedException e) {+ throw new RuntimeException(e);+ }+ }+ }+ return suggestions;+ }++ @Override+ public boolean isExactMatch(String matchWith, Map<String, String> paramValues) {+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RoleParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RoleParam.javanew file mode 100644index 0000000000..67403095ca--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RoleParam.java@@ -0,0 +1,42 @@+package io.onedev.server.web.component.commandpalette;++import java.util.LinkedHashMap;+import java.util.Map;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.RoleManager;+import io.onedev.server.model.Role;+import io.onedev.server.web.page.admin.role.RoleDetailPage;++public class RoleParam extends ParamSegment {++ private static final long serialVersionUID = 1L;++ public RoleParam(boolean optional) {+ super(RoleDetailPage.PARAM_ROLE, optional);+ }++ @Override+ public Map<String, String> suggest(String matchWith,+ Map<String, String> paramValues, int count) {+ Map<String, String> suggestions = new LinkedHashMap<>();+ if (matchWith.length() == 0)+ matchWith = null;+ for (Role role: OneDev.getInstance(RoleManager.class).query(matchWith, 0, count))+ suggestions.put(role.getName(), String.valueOf(role.getId()));+ return suggestions;+ }++ @Override+ public boolean isExactMatch(String matchWith, Map<String, String> paramValues) {+ RoleManager roleManager = OneDev.getInstance(RoleManager.class);+ try {+ Long roleId = Long.valueOf(matchWith);+ if (roleManager.get(roleId) != null)+ return true;+ } catch (NumberFormatException e) {+ }+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/SuggestionContent.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/SuggestionContent.javanew file mode 100644index 0000000000..bf1bd22d51--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/SuggestionContent.java@@ -0,0 +1,35 @@+package io.onedev.server.web.component.commandpalette;++import java.io.Serializable;++import javax.annotation.Nullable;++public class SuggestionContent implements Serializable {++ private static final long serialVersionUID = 1L;++ private final String url;++ private final String searchBase;++ public SuggestionContent(@Nullable String url, @Nullable String searchBase) {+ this.url = url;+ this.searchBase = searchBase;+ }++ @Nullable+ public String getUrl() {+ return url;+ }++ @Nullable+ public String getSearchBase() {+ return searchBase;+ }++ public SuggestionContent mergeWith(SuggestionContent content) {+ return new SuggestionContent(url!=null?url:content.url,+ searchBase!=null?searchBase:content.searchBase);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/UrlSegment.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/UrlSegment.javanew file mode 100644index 0000000000..695160e8e2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/UrlSegment.java@@ -0,0 +1,7 @@+package io.onedev.server.web.component.commandpalette;++import java.io.Serializable;++public interface UrlSegment extends Serializable {++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/UserParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/UserParam.javanew file mode 100644index 0000000000..163474009a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/UserParam.java@@ -0,0 +1,43 @@+package io.onedev.server.web.component.commandpalette;++import java.util.LinkedHashMap;+import java.util.Map;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;+import io.onedev.server.web.page.admin.user.UserPage;++public class UserParam extends ParamSegment {++ private static final long serialVersionUID = 1L;++ public UserParam(boolean optional) {+ super(UserPage.PARAM_USER, optional);+ }++ @Override+ public Map<String, String> suggest(String matchWith,+ Map<String, String> paramValues, int count) {+ Map<String, String> suggestions = new LinkedHashMap<>();+ if (matchWith.length() == 0)+ matchWith = null;+ UserManager userManager = OneDev.getInstance(UserManager.class);+ for (User user: userManager.query(matchWith, 0, count))+ suggestions.put(user.getDisplayName(), String.valueOf(user.getId()));+ return suggestions;+ }++ @Override+ public boolean isExactMatch(String matchWith, Map<String, String> paramValues) {+ UserManager userManager = OneDev.getInstance(UserManager.class);+ try {+ Long userId = Long.valueOf(matchWith);+ if (userManager.get(userId) != null)+ return true;+ } catch (NumberFormatException e) {+ }+ return false;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/command-palette.css b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/command-palette.cssnew file mode 100644index 0000000000..83ea209499--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/command-palette.css@@ -0,0 +1,12 @@+div.command-palette .suggestions {+ height: 400px;+}+div.command-palette .suggestion>.hint {+ visibility: hidden;+}+div.command-palette .active.suggestion>.hint {+ visibility: visible;+}+div.command-palette .active.suggestion>.hint>span+span {+ margin-left: 1rem;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex cd1dfe173e..67a7ab0ba9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -128,24 +128,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementString title = titleInput.getInput();if (StringUtils.isNotBlank(title)) {IssueTextManager issueTextManager = OneDev.getInstance(IssueTextManager.class);- return issueTextManager.query(new ProjectScope() {-- @Override- public Project getProject() {- return NewIssueEditor.this.getProject();- }-- @Override- public boolean isRecursive() {- return true;- }-- @Override- public RecursiveConfigurable getRecursiveConfigurable() {- return null;- }-- }, title, false, 0, 10);+ return issueTextManager.query(new ProjectScope(getProject(), true, null), title, false, 0, 10);} else {return new ArrayList<>();}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.htmlindex 711ac99cef..dd3d5cbf90 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html@@ -44,7 +44,7 @@<wicket:fragment wicket:id="contentFrag"><div class="primary d-flex mb-3"><div class="mr-4 flex-grow-1">- <wicket:container wicket:id="numberAndTitle" class="mr-1"></wicket:container>+ <wicket:container wicket:id="numberAndTitle"></wicket:container><a wicket:id="copy" title="Copy issue number and title" class="copy mr-3 btn btn-icon btn-xs btn-light btn-hover-primary"><wicket:svg href="copy" class="icon"></wicket:svg></a>diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.jsindex a6548f577d..f36895cda9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js@@ -1,8 +1,8 @@onedev.server.markdown = {shortcuts: { // cmd (Mac) or ctrl (non-Mac) plus below keys"b": ".do-bold",- "k": ".do-link",- ".": ".do-image",+ "shift-k": ".do-link",+ "shift-i": ".do-image","i": ".do-italic","e": ".do-code","shift-.": ".do-quote",diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BasePageMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BasePageMapper.javanew file mode 100644index 0000000000..3fbc64d165--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BasePageMapper.java@@ -0,0 +1,20 @@+package io.onedev.server.web.mapper;++import org.apache.wicket.core.request.mapper.MountedMapper;+import org.apache.wicket.request.Url;+import org.apache.wicket.request.component.IRequestablePage;+import org.apache.wicket.request.mapper.info.PageComponentInfo;++public class BasePageMapper extends MountedMapper {++ public BasePageMapper(String mountPath, Class<? extends IRequestablePage> pageClass) {+ super(mountPath, pageClass);+ }++ @Override+ protected void encodePageComponentInfo(Url url, PageComponentInfo info) {+ if (info.getComponentInfo() != null)+ super.encodePageComponentInfo(url, info);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.javanew file mode 100644index 0000000000..a614f1d9b0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java@@ -0,0 +1,355 @@+package io.onedev.server.web.mapper;++import org.apache.wicket.core.request.mapper.ResourceMapper;+import org.apache.wicket.markup.html.pages.BrowserInfoPage;+import org.apache.wicket.protocol.http.WebApplication;+import org.apache.wicket.request.IRequestMapper;+import org.apache.wicket.request.mapper.CompoundRequestMapper;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.web.asset.icon.IconScope;+import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;+import io.onedev.server.web.page.admin.buildsetting.agent.AgentBuildsPage;+import io.onedev.server.web.page.admin.buildsetting.agent.AgentListPage;+import io.onedev.server.web.page.admin.buildsetting.agent.AgentLogPage;+import io.onedev.server.web.page.admin.buildsetting.agent.AgentOverviewPage;+import io.onedev.server.web.page.admin.buildsetting.jobexecutor.JobExecutorsPage;+import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;+import io.onedev.server.web.page.admin.gpgsigningkey.GpgSigningKeyPage;+import io.onedev.server.web.page.admin.gpgtrustedkeys.GpgTrustedKeysPage;+import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;+import io.onedev.server.web.page.admin.group.GroupListPage;+import io.onedev.server.web.page.admin.group.authorization.GroupAuthorizationsPage;+import io.onedev.server.web.page.admin.group.create.NewGroupPage;+import io.onedev.server.web.page.admin.group.membership.GroupMembershipsPage;+import io.onedev.server.web.page.admin.group.profile.GroupProfilePage;+import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;+import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;+import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;+import io.onedev.server.web.page.admin.issuesetting.linkspec.LinkSpecListPage;+import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;+import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;+import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;+import io.onedev.server.web.page.admin.notificationtemplatesetting.IssueNotificationTemplatePage;+import io.onedev.server.web.page.admin.notificationtemplatesetting.PullRequestNotificationTemplatePage;+import io.onedev.server.web.page.admin.performancesetting.PerformanceSettingPage;+import io.onedev.server.web.page.admin.pluginsettings.ContributedAdministrationSettingPage;+import io.onedev.server.web.page.admin.role.NewRolePage;+import io.onedev.server.web.page.admin.role.RoleDetailPage;+import io.onedev.server.web.page.admin.role.RoleListPage;+import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;+import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;+import io.onedev.server.web.page.admin.serverlog.ServerLogPage;+import io.onedev.server.web.page.admin.servicedesk.ServiceDeskSettingPage;+import io.onedev.server.web.page.admin.sshserverkey.SshServerKeyPage;+import io.onedev.server.web.page.admin.ssosetting.SsoConnectorListPage;+import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;+import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;+import io.onedev.server.web.page.admin.user.UserListPage;+import io.onedev.server.web.page.admin.user.accesstoken.UserAccessTokenPage;+import io.onedev.server.web.page.admin.user.authorization.UserAuthorizationsPage;+import io.onedev.server.web.page.admin.user.avatar.UserAvatarPage;+import io.onedev.server.web.page.admin.user.create.NewUserPage;+import io.onedev.server.web.page.admin.user.emailaddresses.UserEmailAddressesPage;+import io.onedev.server.web.page.admin.user.gpgkeys.UserGpgKeysPage;+import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;+import io.onedev.server.web.page.admin.user.password.UserPasswordPage;+import io.onedev.server.web.page.admin.user.profile.UserProfilePage;+import io.onedev.server.web.page.admin.user.sshkeys.UserSshKeysPage;+import io.onedev.server.web.page.admin.user.twofactorauthentication.UserTwoFactorAuthenticationPage;+import io.onedev.server.web.page.builds.BuildListPage;+import io.onedev.server.web.page.help.IncompatibilitiesPage;+import io.onedev.server.web.page.help.MethodDetailPage;+import io.onedev.server.web.page.help.ResourceDetailPage;+import io.onedev.server.web.page.help.ResourceListPage;+import io.onedev.server.web.page.issues.IssueListPage;+import io.onedev.server.web.page.my.accesstoken.MyAccessTokenPage;+import io.onedev.server.web.page.my.avatar.MyAvatarPage;+import io.onedev.server.web.page.my.emailaddresses.MyEmailAddressesPage;+import io.onedev.server.web.page.my.gpgkeys.MyGpgKeysPage;+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.NewProjectPage;+import io.onedev.server.web.page.project.ProjectListPage;+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.builds.ProjectBuildsPage;+import io.onedev.server.web.page.project.builds.detail.InvalidBuildPage;+import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;+import io.onedev.server.web.page.project.builds.detail.changes.BuildChangesPage;+import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;+import io.onedev.server.web.page.project.builds.detail.issues.FixedIssuesPage;+import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;+import io.onedev.server.web.page.project.builds.detail.pipeline.BuildPipelinePage;+import io.onedev.server.web.page.project.children.ProjectChildrenPage;+import io.onedev.server.web.page.project.codecomments.InvalidCodeCommentPage;+import io.onedev.server.web.page.project.codecomments.ProjectCodeCommentsPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.commits.ProjectCommitsPage;+import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;+import io.onedev.server.web.page.project.imports.ProjectImportPage;+import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;+import io.onedev.server.web.page.project.issues.create.NewIssuePage;+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.page.project.issues.detail.IssueBuildsPage;+import io.onedev.server.web.page.project.issues.detail.IssueCommitsPage;+import io.onedev.server.web.page.project.issues.detail.IssuePullRequestsPage;+import io.onedev.server.web.page.project.issues.imports.IssueImportPage;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneBurndownPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneIssuesPage;+import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;+import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;+import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;+import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;+import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;+import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;+import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;+import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;+import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;+import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionsPage;+import io.onedev.server.web.page.project.setting.build.ActionAuthorizationsPage;+import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;+import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPage;+import io.onedev.server.web.page.project.setting.build.JobSecretsPage;+import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;+import io.onedev.server.web.page.project.setting.pluginsettings.ContributedProjectSettingPage;+import io.onedev.server.web.page.project.setting.servicedesk.ProjectServiceDeskSettingPage;+import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionsPage;+import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;+import io.onedev.server.web.page.project.stats.ProjectContribsPage;+import io.onedev.server.web.page.project.stats.SourceLinesPage;+import io.onedev.server.web.page.project.tags.ProjectTagsPage;+import io.onedev.server.web.page.pullrequests.PullRequestListPage;+import io.onedev.server.web.page.simple.error.MethodNotAllowedErrorPage;+import io.onedev.server.web.page.simple.error.PageNotFoundErrorPage;+import io.onedev.server.web.page.simple.security.EmailAddressVerificationPage;+import io.onedev.server.web.page.simple.security.LoginPage;+import io.onedev.server.web.page.simple.security.LogoutPage;+import io.onedev.server.web.page.simple.security.PasswordResetPage;+import io.onedev.server.web.page.simple.security.SignUpPage;+import io.onedev.server.web.page.simple.serverinit.ServerInitPage;+import io.onedev.server.web.resource.AgentLibResourceReference;+import io.onedev.server.web.resource.AgentLogResourceReference;+import io.onedev.server.web.resource.AgentResourceReference;+import io.onedev.server.web.resource.ArchiveResourceReference;+import io.onedev.server.web.resource.ArtifactResourceReference;+import io.onedev.server.web.resource.AttachmentResourceReference;+import io.onedev.server.web.resource.BuildLogResourceReference;+import io.onedev.server.web.resource.RawBlobResourceReference;+import io.onedev.server.web.resource.ServerLogResourceReference;+import io.onedev.server.web.resource.SvgSpriteResourceReference;++public class BaseUrlMapper extends CompoundRequestMapper {++ @Override+ public CompoundRequestMapper add(IRequestMapper mapper) {+ if (mapper instanceof ResourceMapper && !(mapper instanceof BaseResourceMapper))+ throw new ExplicitException("Base resource mapper should be used");+ return super.add(mapper);+ }++ public BaseUrlMapper(WebApplication app) {+ add(new BasePageMapper("init", ServerInitPage.class));+ add(new BasePageMapper("loading", BrowserInfoPage.class));+ addProjectPages();+ add(new BasePageMapper("issues", IssueListPage.class));+ add(new BasePageMapper("pull-requests", PullRequestListPage.class));+ add(new BasePageMapper("builds", BuildListPage.class));+ addAdministrationPages();+ addMyPages();+ addSecurityPages();+ addResources();+ addHelpPages();+ addErrorPages();+ }++ private void addHelpPages() {+ add(new BasePageMapper("help/incompatibilities", IncompatibilitiesPage.class));+ add(new BasePageMapper("help/api", ResourceListPage.class));+ add(new BasePageMapper("help/api/${resource}", ResourceDetailPage.class));+ add(new BasePageMapper("help/api/${resource}/${method}", MethodDetailPage.class));+ }++ private void addMyPages() {+ add(new BasePageMapper("my", MyProfilePage.class));+ add(new BasePageMapper("my/email-addresses", MyEmailAddressesPage.class));+ add(new BasePageMapper("my/avatar", MyAvatarPage.class));+ add(new BasePageMapper("my/password", MyPasswordPage.class));+ add(new BasePageMapper("my/ssh-keys", MySshKeysPage.class));+ add(new BasePageMapper("my/gpg-keys", MyGpgKeysPage.class));+ add(new BasePageMapper("my/access-token", MyAccessTokenPage.class));+ add(new BasePageMapper("my/two-factor-authentication", MyTwoFactorAuthenticationPage.class));+ }++ private void addResources() {+ add(new BaseResourceMapper("downloads/server-log", new ServerLogResourceReference()));+ add(new BaseResourceMapper("downloads/agent-log/${agent}", new AgentLogResourceReference()));+ add(new BaseResourceMapper("downloads/agent.zip", new AgentResourceReference()));+ add(new BaseResourceMapper("downloads/agent-lib", new AgentLibResourceReference()));+ add(new BaseResourceMapper("downloads/projects/${project}/builds/${build}/log",+ new BuildLogResourceReference()));+ add(new BaseResourceMapper("projects/${project}/archive/${revision}",+ new ArchiveResourceReference()));+ add(new BaseResourceMapper("projects/${project}/raw", new RawBlobResourceReference()));++ // Change AttachmentResource.authorizeGroup accordingly if change attachment url here+ add(new BaseResourceMapper("projects/${project}/attachment/${group}/${attachment}",+ new AttachmentResourceReference()));++ add(new BaseResourceMapper("downloads/projects/${project}/builds/${build}/artifacts",+ new ArtifactResourceReference()));+ add(new BaseResourceMapper(SvgSpriteResourceReference.DEFAULT_MOUNT_PATH,+ new SvgSpriteResourceReference(IconScope.class)));+ }++ private void addErrorPages() {+ add(new BasePageMapper("/errors/404", PageNotFoundErrorPage.class));+ add(new BasePageMapper("/errors/405", MethodNotAllowedErrorPage.class));+ }++ private void addSecurityPages() {+ add(new BasePageMapper("login", LoginPage.class));+ add(new BasePageMapper("logout", LogoutPage.class));+ add(new BasePageMapper("signup", SignUpPage.class));+ add(new BasePageMapper("reset-password", PasswordResetPage.class));+ add(new BasePageMapper("verify-email-address/${emailAddress}/${verificationCode}",+ EmailAddressVerificationPage.class));+ add(new BasePageMapper(SsoProcessPage.MOUNT_PATH + "/${stage}/${connector}", SsoProcessPage.class));+ }++ private void addAdministrationPages() {+ add(new BasePageMapper("administration/settings/system", SystemSettingPage.class));+ add(new BasePageMapper("administration/settings/security", SecuritySettingPage.class));+ add(new BasePageMapper("administration/users", UserListPage.class));+ add(new BasePageMapper("administration/users/new", NewUserPage.class));+ add(new BasePageMapper("administration/users/${user}", UserProfilePage.class));+ add(new BasePageMapper("administration/users/${user}/email-setting", UserEmailAddressesPage.class));+ add(new BasePageMapper("administration/users/${user}/groups", UserMembershipsPage.class));+ add(new BasePageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));+ add(new BasePageMapper("administration/users/${user}/avatar", UserAvatarPage.class));+ add(new BasePageMapper("administration/users/${user}/password", UserPasswordPage.class));+ add(new BasePageMapper("administration/users/${user}/ssh-keys", UserSshKeysPage.class));+ add(new BasePageMapper("administration/users/${user}/gpg-keys", UserGpgKeysPage.class));+ add(new BasePageMapper("administration/users/${user}/access-token", UserAccessTokenPage.class));+ add(new BasePageMapper("administration/users/${user}/two-factor-authentication", UserTwoFactorAuthenticationPage.class));++ add(new BasePageMapper("administration/roles", RoleListPage.class));+ add(new BasePageMapper("administration/roles/new", NewRolePage.class));+ add(new BasePageMapper("administration/roles/${role}", RoleDetailPage.class));++ add(new BasePageMapper("administration/groups", GroupListPage.class));+ add(new BasePageMapper("administration/groups/new", NewGroupPage.class));+ add(new BasePageMapper("administration/groups/${group}", GroupProfilePage.class));+ add(new BasePageMapper("administration/groups/${group}/members", GroupMembershipsPage.class));+ add(new BasePageMapper("administration/groups/${group}/authorizations", GroupAuthorizationsPage.class));++ add(new BasePageMapper("administration/settings/mail", MailSettingPage.class));+ add(new BasePageMapper("administration/settings/service-desk-setting",+ ServiceDeskSettingPage.class));+ add(new BasePageMapper("administration/settings/issue-notification-template",+ IssueNotificationTemplatePage.class));+ add(new BasePageMapper("administration/settings/pull-request-notification-template",+ PullRequestNotificationTemplatePage.class));+ add(new BasePageMapper("administration/settings/performance", PerformanceSettingPage.class));+ add(new BasePageMapper("administration/settings/backup", DatabaseBackupPage.class));+ add(new BasePageMapper("administration/settings/authenticator", AuthenticatorPage.class));+ add(new BasePageMapper("administration/settings/sso-connectors", SsoConnectorListPage.class));+ add(new BasePageMapper("administration/settings/ssh-server-key", SshServerKeyPage.class));+ add(new BasePageMapper("administration/settings/gpg-signing-key", GpgSigningKeyPage.class));+ add(new BasePageMapper("administration/settings/gpg-trusted-keys", GpgTrustedKeysPage.class));++ add(new BasePageMapper("administration/agents", AgentListPage.class));+ add(new BasePageMapper("administration/agents/${agent}", AgentOverviewPage.class));+ add(new BasePageMapper("administration/agents/${agent}/builds", AgentBuildsPage.class));+ add(new BasePageMapper("administration/agents/${agent}/log", AgentLogPage.class));+ add(new BasePageMapper("administration/settings/job-executors", JobExecutorsPage.class));+ add(new BasePageMapper("administration/settings/groovy-scripts", GroovyScriptListPage.class));++ add(new BasePageMapper("administration/settings/issue-fields", IssueFieldListPage.class));+ add(new BasePageMapper("administration/settings/issue-states", IssueStateListPage.class));+ add(new BasePageMapper("administration/settings/state-transitions", StateTransitionListPage.class));+ add(new BasePageMapper("administration/settings/issue-boards", DefaultBoardListPage.class));+ add(new BasePageMapper("administration/settings/issue-links", LinkSpecListPage.class));+ add(new BasePageMapper("administration/settings/issue-templates", IssueTemplateListPage.class));++ add(new BasePageMapper("administration/settings/${setting}", ContributedAdministrationSettingPage.class));++ add(new BasePageMapper("administration/server-log", ServerLogPage.class));+ add(new BasePageMapper("administration/server-information", ServerInformationPage.class));+ }++ private void addProjectPages() {+ add(new BasePageMapper("projects", ProjectListPage.class));+ add(new BasePageMapper("projects/new", NewProjectPage.class));+ add(new BasePageMapper("projects/import/${importer}", ProjectImportPage.class));+ add(new BasePageMapper("projects/${project}", ProjectDashboardPage.class));++ // keep this url here for backward compatibility+ add(new BasePageMapper("projects/${project}/blob", ProjectBlobPage.class));++ add(new BasePageMapper("projects/${project}/files", ProjectBlobPage.class));+ add(new BasePageMapper("projects/${project}/commits", ProjectCommitsPage.class));+ add(new BasePageMapper("projects/${project}/commits/${commit}", CommitDetailPage.class));+ add(new BasePageMapper("projects/${project}/compare", RevisionComparePage.class));+ add(new BasePageMapper("projects/${project}/stats/contribs", ProjectContribsPage.class));+ add(new BasePageMapper("projects/${project}/stats/lines", SourceLinesPage.class));++ add(new BasePageMapper("projects/${project}/branches", ProjectBranchesPage.class));+ add(new BasePageMapper("projects/${project}/tags", ProjectTagsPage.class));+ add(new BasePageMapper("projects/${project}/code-comments", ProjectCodeCommentsPage.class));+ add(new BasePageMapper("projects/${project}/code-comments/${code-comment}/invalid", InvalidCodeCommentPage.class));++ add(new BasePageMapper("projects/${project}/pulls", ProjectPullRequestsPage.class));+ add(new BasePageMapper("projects/${project}/pulls/new", NewPullRequestPage.class));+ add(new BasePageMapper("projects/${project}/pulls/${request}", PullRequestActivitiesPage.class));+ add(new BasePageMapper("projects/${project}/pulls/${request}/code-comments", PullRequestCodeCommentsPage.class));+ add(new BasePageMapper("projects/${project}/pulls/${request}/changes", PullRequestChangesPage.class));+ add(new BasePageMapper("projects/${project}/pulls/${request}/invalid", InvalidPullRequestPage.class));++ add(new BasePageMapper("projects/${project}/boards", IssueBoardsPage.class));+ add(new BasePageMapper("projects/${project}/boards/${board}", IssueBoardsPage.class));+ add(new BasePageMapper("projects/${project}/issues", ProjectIssueListPage.class));+ add(new BasePageMapper("projects/${project}/issues/${issue}", IssueActivitiesPage.class));+ add(new BasePageMapper("projects/${project}/issues/${issue}/commits", IssueCommitsPage.class));+ add(new BasePageMapper("projects/${project}/issues/${issue}/pull-requests", IssuePullRequestsPage.class));+ add(new BasePageMapper("projects/${project}/issues/${issue}/builds", IssueBuildsPage.class));+ add(new BasePageMapper("projects/${project}/issues/new", NewIssuePage.class));+ add(new BasePageMapper("projects/${project}/issues/import/${importer}", IssueImportPage.class));+ add(new BasePageMapper("projects/${project}/milestones", MilestoneListPage.class));+ add(new BasePageMapper("projects/${project}/milestones/${milestone}", MilestoneIssuesPage.class));+ add(new BasePageMapper("projects/${project}/milestones/${milestone}/burndown", MilestoneBurndownPage.class));+ add(new BasePageMapper("projects/${project}/milestones/${milestone}/edit", MilestoneEditPage.class));+ add(new BasePageMapper("projects/${project}/milestones/new", NewMilestonePage.class));++ add(new BasePageMapper("projects/${project}/builds", ProjectBuildsPage.class));+ add(new BasePageMapper("projects/${project}/builds/${build}", BuildDashboardPage.class));+ add(new BasePageMapper("projects/${project}/builds/${build}/pipeline", BuildPipelinePage.class));+ add(new BasePageMapper("projects/${project}/builds/${build}/log", BuildLogPage.class));+ add(new BasePageMapper("projects/${project}/builds/${build}/changes", BuildChangesPage.class));+ add(new BasePageMapper("projects/${project}/builds/${build}/fixed-issues", FixedIssuesPage.class));+ add(new BasePageMapper("projects/${project}/builds/${build}/artifacts", BuildArtifactsPage.class));+ add(new BasePageMapper("projects/${project}/builds/${build}/invalid", InvalidBuildPage.class));++ add(new BasePageMapper("projects/${project}/children", ProjectChildrenPage.class));++ add(new BasePageMapper("projects/${project}/settings/general", GeneralProjectSettingPage.class));+ add(new BasePageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));+ add(new BasePageMapper("projects/${project}/settings/avatar-edit", AvatarEditPage.class));+ add(new BasePageMapper("projects/${project}/settings/branch-protection", BranchProtectionsPage.class));+ add(new BasePageMapper("projects/${project}/settings/tag-protection", TagProtectionsPage.class));+ add(new BasePageMapper("projects/${project}/settings/build/job-secrets", JobSecretsPage.class));+ add(new BasePageMapper("projects/${project}/settings/build/action-authorizations", ActionAuthorizationsPage.class));+ add(new BasePageMapper("projects/${project}/settings/build/build-preserve-rules", BuildPreservationsPage.class));+ add(new BasePageMapper("projects/${project}/settings/build/default-fixed-issues-filter", DefaultFixedIssueFiltersPage.class));+ add(new BasePageMapper("projects/${project}/settings/service-desk", ProjectServiceDeskSettingPage.class));+ add(new BasePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));+ add(new BasePageMapper("projects/${project}/settings/${setting}", ContributedProjectSettingPage.class));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/DynamicPathPageMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/DynamicPathPageMapper.javadeleted file mode 100644index 36972d8554..0000000000--- a/server-core/src/main/java/io/onedev/server/web/mapper/DynamicPathPageMapper.java+++ /dev/null@@ -1,27 +0,0 @@-package io.onedev.server.web.mapper;--import org.apache.wicket.core.request.mapper.MountedMapper;-import org.apache.wicket.request.Url;-import org.apache.wicket.request.component.IRequestablePage;-import org.apache.wicket.request.mapper.info.PageComponentInfo;-import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;-import org.apache.wicket.request.mapper.parameter.PageParameters;--public class DynamicPathPageMapper extends MountedMapper {-- public DynamicPathPageMapper(String mountPath, Class<? extends IRequestablePage> pageClass) {- super(mountPath, pageClass);- }-- @Override- protected void encodePageComponentInfo(Url url, PageComponentInfo info) {- if (info.getComponentInfo() != null)- super.encodePageComponentInfo(url, info);- }-- @Override- protected Url encodePageParameters(Url url, PageParameters pageParameters, IPageParametersEncoder encoder) {- return new DynamicPathUrl(super.encodePageParameters(url, pageParameters, encoder));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/DynamicPathResourceMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/DynamicPathResourceMapper.javadeleted file mode 100644index 5e71cf45a6..0000000000--- a/server-core/src/main/java/io/onedev/server/web/mapper/DynamicPathResourceMapper.java+++ /dev/null@@ -1,19 +0,0 @@-package io.onedev.server.web.mapper;--import org.apache.wicket.request.Url;-import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.request.resource.ResourceReference;--public class DynamicPathResourceMapper extends BaseResourceMapper {-- public DynamicPathResourceMapper(String path, ResourceReference resourceReference) {- super(path, resourceReference);- }-- @Override- protected Url encodePageParameters(Url url, PageParameters pageParameters, IPageParametersEncoder encoder) {- return new DynamicPathUrl(super.encodePageParameters(url, pageParameters, encoder));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/DynamicPathUrl.java b/server-core/src/main/java/io/onedev/server/web/mapper/DynamicPathUrl.javadeleted file mode 100644index 0024ede155..0000000000--- a/server-core/src/main/java/io/onedev/server/web/mapper/DynamicPathUrl.java+++ /dev/null@@ -1,39 +0,0 @@-package io.onedev.server.web.mapper;--import java.nio.charset.Charset;-import java.nio.charset.StandardCharsets;--import org.apache.wicket.request.Url;-import org.apache.wicket.util.encoding.UrlEncoder;--import com.google.common.base.Splitter;--public class DynamicPathUrl extends Url {-- private static final long serialVersionUID = 1L;-- public DynamicPathUrl(Url url) {- super(url);- }-- @Override- public String getPath(Charset charset) {- StringBuilder path = new StringBuilder();- boolean slash = false;-- for (String segment : getSegments()) {- if (slash) {- path.append('/');- }- if (segment.indexOf('/') != -1) {- Url url = new Url(Splitter.on('/').splitToList(segment), StandardCharsets.UTF_8);- path.append(url.getPath());- } else {- path.append(UrlEncoder.PATH_INSTANCE.encode(segment, charset));- }- slash = true;- }- return path.toString();- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.javaindex afdf0740d5..576e6f2cd0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.java@@ -28,7 +28,7 @@ import io.onedev.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")public abstract class AgentDetailPage extends AdministrationPage {- private static final String PARAM_AGENT = "agent";+ public static final String PARAM_AGENT = "agent";protected final IModel<Agent> agentModel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.javaindex c8b843aaf0..c6b88a2ec6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java@@ -28,14 +28,10 @@ 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.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;-import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;@@ -68,15 +64,6 @@ public class GroupListPage extends AdministrationPage {query = params.get(PARAM_QUERY).toString();}- private EntityCriteria<Group> getCriteria() {- EntityCriteria<Group> criteria = EntityCriteria.of(Group.class);- if (query != null)- criteria.add(Restrictions.ilike("name", query, MatchMode.ANYWHERE));- else- criteria.setCacheable(true);- return criteria;- }-@Overrideprotected void onBeforeRender() {typing = false;@@ -244,14 +231,12 @@ public class GroupListPage extends AdministrationPage {@Overridepublic Iterator<? extends Group> iterator(long first, long count) {- EntityCriteria<Group> criteria = getCriteria();- criteria.addOrder(Order.asc("name"));- return OneDev.getInstance(GroupManager.class).query(criteria, (int)first, (int)count).iterator();+ return OneDev.getInstance(GroupManager.class).query(query, (int)first, (int)count).iterator();}@Overridepublic long size() {- return OneDev.getInstance(GroupManager.class).count(getCriteria());+ return OneDev.getInstance(GroupManager.class).count(query);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.javaindex c94b58d418..ad77754935 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java@@ -29,7 +29,7 @@ import io.onedev.server.web.page.admin.group.profile.GroupProfilePage;@SuppressWarnings("serial")public abstract class GroupPage extends AdministrationPage {- private static final String PARAM_GROUP = "group";+ public static final String PARAM_GROUP = "group";protected final IModel<Group> groupModel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.javaindex 1b870467d6..4dc7a6a670 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java@@ -37,7 +37,7 @@ import io.onedev.server.web.util.ConfirmClickModifier;@SuppressWarnings("serial")public class RoleDetailPage extends AdministrationPage {- private static final String PARAM_ROLE = "role";+ public static final String PARAM_ROLE = "role";protected final IModel<Role> roleModel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.javaindex 00ef63f087..3e4ae63e65 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java@@ -27,14 +27,10 @@ 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.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.model.Role;-import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;@@ -64,16 +60,7 @@ public class RoleListPage extends AdministrationPage {super(params);query = params.get(PARAM_QUERY).toString();}-- private EntityCriteria<Role> getCriteria() {- EntityCriteria<Role> criteria = EntityCriteria.of(Role.class);- if (query != null)- criteria.add(Restrictions.ilike("name", query, MatchMode.ANYWHERE));- else- criteria.setCacheable(true);- return criteria;- }-+@Overrideprotected void onBeforeRender() {typing = false;@@ -231,14 +218,12 @@ public class RoleListPage extends AdministrationPage {@Overridepublic Iterator<? extends Role> iterator(long first, long count) {- EntityCriteria<Role> criteria = getCriteria();- criteria.addOrder(Order.asc("name"));- return OneDev.getInstance(RoleManager.class).query(criteria, (int)first, (int)count).iterator();+ return OneDev.getInstance(RoleManager.class).query(query, (int)first, (int)count).iterator();}@Overridepublic long size() {- return OneDev.getInstance(RoleManager.class).count(getCriteria());+ return OneDev.getInstance(RoleManager.class).count(query);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex b805f08a9b..7c262a680d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -37,7 +37,7 @@ import io.onedev.server.web.page.admin.user.twofactorauthentication.UserTwoFacto@SuppressWarnings("serial")public abstract class UserPage extends AdministrationPage {- private static final String PARAM_USER = "user";+ public static final String PARAM_USER = "user";protected final IModel<User> userModel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.javaindex c60cadff3a..3dd701470a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java@@ -29,7 +29,8 @@ public class BaseResourceReference extends JavaScriptResourceReference {public List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = new ArrayList<HeaderItem>();- dependencies.add(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(Application.get()+ .getJavaScriptLibrarySettings().getJQueryReference()));dependencies.add(JavaScriptHeaderItem.forReference(new BootstrapResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new AlignResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new AutoSizeResourceReference()));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 71c8578155..3c58af5177 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@@ -262,17 +262,24 @@ li.selectable a, a.selectable {color: var(--dark-mode-light-gray);}-li.selectable:hover a, a.selectable:hover, li.selectable.active a, a.selectable.active {+li.selectable:hover a, a.selectable:hover {+ background-color: var(--light-warning);+ border-color: var(--light-warning);+}+li.selectable.active a, a.selectable.active {background-color: var(--light-primary);border-color: #BBDFF9;}.dark-mode li.selectable:hover a,-.dark-mode a.selectable:hover,+.dark-mode a.selectable:hover {+ background-color: var(--dark-mode-light-warning);+ border-color: var(--dark-mode-light-warning);+}.dark-mode li.selectable.active a,.dark-mode a.selectable.active {color: var(--primary);background-color: var(--dark-mode-light-primary);- border-color: var(--dark-mode-light-primary);+ border-color: rgb(48, 68, 107);}.hash {@@ -740,3 +747,21 @@ table>thead>tr>th.minimum:last-child, table>tbody>tr>td.minimum:last-child {overflow: hidden !important;min-height: inherit !important;}+span.keycap {+ white-space: nowrap;+ border: 1px solid #aaa;+ border-style: outset;+ border-radius: 4px;+ padding: 0px 3px 1px 3px;+ margin: 0px 0px 0px 0px;+ vertical-align: baseline;+ line-height: 1.8em;+ background: #fbfbfb;+ font-size: 12px;+ min-width: 24px;+ text-align: center;+}+.dark-mode span.keycap {+ border-color: var(--gray-dark);+ background: var(--dark-mode-dark);+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.jsindex 1558e50417..6ef4823662 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js@@ -861,7 +861,7 @@ onedev.server = {onedev.server.perfectScrollbar.setup();$(document).keydown(function(e) {- if (e.keyCode == 27)+ if (e.keyCode == 27) // ESCe.preventDefault();});},diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 39b77bbc8c..259ef6e42c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -40,6 +40,7 @@<div wicket:id="title" class="topbar-title"></div></div><div class="topbar-right text-nowrap">+ <a wicket:id="showCommandPalette" class="topbar-link command-palette"></a><a wicket:id="darkMode" class="topbar-link" title="Toggle dark mode"><svg wicket:id="icon" class="icon"/></a><a href="https://github.com/theonedev/onedev" class="github topbar-link d-none d-sm-inline" target="_blank"><wicket:svg href="github" class="icon"></wicket:svg>diff --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 ea74dc47a4..e4f03b6cc3 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@@ -10,6 +10,8 @@ import org.apache.shiro.subject.PrincipalCollection;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseAtInterceptPageException;import org.apache.wicket.Session;+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -38,9 +40,12 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.component.commandpalette.CommandPalettePanel;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.modal.ModalLink;+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;@@ -98,6 +103,8 @@ import io.onedev.server.web.util.WicketUtils;@SuppressWarnings("serial")public abstract class LayoutPage extends BasePage {+ private AbstractDefaultAjaxBehavior commandPaletteBehavior;+public LayoutPage(PageParameters params) {super(params);}@@ -322,6 +329,26 @@ public abstract class LayoutPage extends BasePage {topbar.add(newTopbarTitle("title"));+ topbar.add(new ModalLink("showCommandPalette") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new CommandPalettePanel(id) {++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ };+ }++ @Override+ protected String getModalCssClass() {+ return "modal-lg";+ }++ });topbar.add(new Link<Void>("darkMode") {@Override@@ -444,6 +471,34 @@ public abstract class LayoutPage extends BasePage {userInfo.add(AttributeAppender.append("class", "active"));topbar.add(userInfo);++ add(commandPaletteBehavior = new AbstractDefaultAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ return new CommandPalettePanel(id) {++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ close();+ }++ };+ }++ @Override+ protected String getCssClass() {+ return "modal-lg";+ }++ };+ }++ });}@Override@@ -455,7 +510,8 @@ public abstract class LayoutPage extends BasePage {public void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new LayoutResourceReference()));- response.render(OnDomReadyHeaderItem.forScript("onedev.server.layout.onDomReady();"));+ response.render(OnDomReadyHeaderItem.forScript(String.format("onedev.server.layout.onDomReady(%s);",+ commandPaletteBehavior.getCallbackFunction())));response.render(OnLoadHeaderItem.forScript("onedev.server.layout.onLoad();"));}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 174ecafb87..d1fe6c07ae 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@@ -423,3 +423,4 @@.dark-mode .sidebar-dropdown.ps.ps-scroll>.ps__rail-y>.ps__thumb-y {background: rgb(78, 82, 103);}+diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.jsindex 21322af195..a9247dce3d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.js@@ -1,5 +1,5 @@onedev.server.layout = {- onDomReady: function() {+ onDomReady: function(commandPaletteCallback) {var $body = $("body");var $sidebar = $(".sidebar");var $sidebarBody = $(".sidebar-body");@@ -134,6 +134,23 @@ onedev.server.layout = {}return false;});++ if (onedev.server.util.isMac())+ $("a.command-palette").attr("title", "cmd-k to show command palette").html("<span class='keycap'>⌘</span> <span class='keycap'>k</span>");+ else+ $("a.command-palette").attr("title", "ctrl-k to show command palette").html("<span class='keycap'>ctrl</span> <span class='keycap'>k</span>");+ $(document).keydown(function(e) {+ if (e.keyCode == 75 && (e.ctrlKey || e.metaKey) && !e.shiftKey && $('div.command-palette').length == 0) { // cmd+k+ setTimeout(function() {+ var $floating = $(".floating");+ if ($floating.length != 0)+ $floating.data("closeCallback")();+ }, 100);+ commandPaletteCallback();+ e.preventDefault();+ return false;+ }+ });},onLoad: function() {var $sidebarBody = $(".sidebar-body");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex e6555bb3f2..4bb293ef9b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -94,7 +94,7 @@ import io.onedev.server.web.util.ProjectAware;@SuppressWarnings("serial")public abstract class ProjectPage extends LayoutPage implements ProjectAware {- protected static final String PARAM_PROJECT = "project";+ public static final String PARAM_PROJECT = "project";protected final IModel<Project> projectModel;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 4e8acbf6ef..99e920cc81 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@@ -58,6 +58,7 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Objects;import com.google.common.base.Preconditions;+import com.google.common.base.Splitter;import com.google.common.collect.Sets;import io.onedev.commons.loader.ListenerRegistry;@@ -139,10 +140,6 @@ import io.onedev.server.web.websocket.WebSocketManager;public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,ScriptIdentityAware, EditParamsAware, JobSecretAuthorizationContextAware {- private static final String PARAM_REVISION = "revision";-- private static final String PARAM_PATH = "path";-private static final String PARAM_INITIAL_NEW_PATH = "initial-new-path";private static final String PARAM_REQUEST = "request";@@ -189,15 +186,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,super(params);List<String> revisionAndPathSegments = new ArrayList<>();- String segment = params.get(PARAM_REVISION).toString();- if (segment != null && segment.length() != 0)- revisionAndPathSegments.add(segment);- segment = params.get(PARAM_PATH).toString();- if (segment != null && segment.length() != 0)- revisionAndPathSegments.add(segment);-for (int i=0; i<params.getIndexedCount(); i++) {- segment = params.get(i).toString();+ String segment = params.get(i).toString();if (segment.length() != 0)revisionAndPathSegments.add(segment);}@@ -1078,10 +1068,19 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,}public static void fillParams(PageParameters params, State state) {- if (state.blobIdent.revision != null)- params.add(PARAM_REVISION, state.blobIdent.revision);- if (state.blobIdent.path != null)- params.add(PARAM_PATH, state.blobIdent.path);+ int index = 0;+ if (state.blobIdent.revision != null) {+ for (String segment: Splitter.on("/").split(state.blobIdent.revision)) {+ params.set(index, segment);+ index++;+ }+ }+ if (state.blobIdent.path != null) {+ for (String segment: Splitter.on("/").split(state.blobIdent.path)) {+ params.set(index, segment);+ index++;+ }+ }if (state.position != null)params.add(PARAM_POSITION, state.position.toString());if (state.requestId != null)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.javaindex 908b315286..eac324353d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java@@ -1,17 +1,22 @@package io.onedev.server.web.page.project.blob.render.renderers.gitlink;-import org.apache.wicket.AttributeModifier;+import java.nio.file.Paths;+import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.Blob;+import io.onedev.server.git.BlobIdent;import io.onedev.server.git.Submodule;+import io.onedev.server.model.Project;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;@@ -28,28 +33,37 @@ public class GitLinkPanel extends BlobViewPanel {Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);Submodule submodule = Submodule.fromString(blob.getText().getContent());- WebMarkupContainer link;+ WebMarkupContainer link = null;SettingManager settingManager = OneDev.getInstance(SettingManager.class);+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);String rootUrl = settingManager.getSystemSetting().getServerUrl() + "/";+ Project project = null;if (submodule.getUrl().startsWith(rootUrl)) {link = new WebMarkupContainer("link");- String projectName = submodule.getUrl().substring(rootUrl.length());- link.add(AttributeModifier.replace("href", rootUrl + "projects/" + projectName + "/blob/" + submodule.getCommitId()));+ String projectPath = submodule.getUrl().substring(rootUrl.length());+ project = projectManager.findByPath(projectPath);+ } else if (!submodule.getUrl().startsWith("http:")+ && !submodule.getUrl().startsWith("https:")+ && !submodule.getUrl().startsWith("ssh:")) { // relative url+ String projectPath = Paths.get(context.getProject().getPath())+ .resolve(submodule.getUrl()).normalize().toString();+ project = projectManager.findByPath(projectPath);+ }+ if (project != null) {+ BlobIdent blobIdent = new BlobIdent();+ blobIdent.revision = submodule.getCommitId();+ link = new BookmarkablePageLink<Void>("link",+ ProjectBlobPage.class, ProjectBlobPage.paramsOf(project, blobIdent));} else {- link = new Link<Void>("link") {+ link = new WebMarkupContainer("link") {@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);tag.setName("span");}-- @Override- public void onClick() {- }};- link.setEnabled(false);}link.add(new Label("label", submodule));add(link);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.htmlindex 877e4e2e99..c6bb952e70 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html@@ -15,14 +15,16 @@</div><ul class="body list-unstyled mb-0 px-3 py-2 overflow-auto flex-grow-1"><li wicket:id="blobs" class="blob text-nowrap border-0">- <a wicket:id="expandLink" class="expand"><svg wicket:id="icon" class="icon"></svg></a>- <a wicket:id="blobLink" class="blob selectable d-inline-block">- <wicket:svg href="file" class="icon"></wicket:svg>- <span wicket:id="label"></span>- </a>+ <div class="d-flex align-items-center flex-nowrap">+ <a wicket:id="expandLink" class="expand"><svg wicket:id="icon" class="icon"></svg></a>+ <a wicket:id="blobLink" class="blob selectable d-inline-block flex-grow-1 flex-shrink-1">+ <wicket:svg href="file" class="icon"></wicket:svg>+ <span wicket:id="label"></span>+ </a>+ </div><ul wicket:id="hits" class="list-unstyled"><li wicket:id="hits" class="hit">- <a wicket:id="hitLink" class="hit selectable d-inline-block">+ <a wicket:id="hitLink" class="hit selectable d-block"><img wicket:id="icon"></img><span wicket:id="lineNo" class="line-no"></span><span wicket:id="label"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.javaindex f16fd82102..40b0474717 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java@@ -15,7 +15,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.model.Build;-import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.FixedInBuildCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.ProjectScope;@@ -95,24 +94,7 @@ public class FixedIssuesPage extends BuildDetailPage {@Overrideprotected ProjectScope getProjectScope() {- return new ProjectScope() {-- @Override- public Project getProject() {- return FixedIssuesPage.this.getProject();- }-- @Override- public boolean isRecursive() {- return false;- }-- @Override- public RecursiveConfigurable getRecursiveConfigurable() {- return null;- }-- };+ return new ProjectScope(getProject(), false, null);}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.javaindex e96550ca95..9d32cf0339 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java@@ -9,6 +9,7 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.buildspec.job.Job;import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.job.jobinfo.JobInfoButton;import io.onedev.server.web.component.pipeline.PipelinePanel;import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;@@ -20,6 +21,11 @@ public class BuildPipelinePage extends BuildDetailPage {super(params);}+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getBuild().getProject());+ }+@Overrideprotected void onInitialize() {super.onInitialize();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex c177b8e345..735bbd6d21 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -92,7 +92,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annotaprivate static final Logger logger = LoggerFactory.getLogger(CommitDetailPage.class);- private static final String PARAM_REVISION = "revision";+ public static final String PARAM_COMMIT = "commit";// make sure to use a different value from wicket:id according to wicket bug:// https://issues.apache.org/jira/browse/WICKET-6069@@ -135,7 +135,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annotasuper(params);List<String> revisionSegments = new ArrayList<>();- String segment = params.get(PARAM_REVISION).toString();+ String segment = params.get(PARAM_COMMIT).toString();if (segment.length() != 0)revisionSegments.add(segment);for (int i=0; i<params.getIndexedCount(); i++) {@@ -562,7 +562,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annotapublic static void fillParams(PageParameters params, State state) {if (state.revision != null)- params.set(PARAM_REVISION, state.revision);+ params.set(PARAM_COMMIT, state.revision);if (state.compareWith != null)params.set(PARAM_COMPARE_WITH, state.compareWith);if (state.whitespaceOption != WhitespaceOption.DEFAULT)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.htmlindex 61c1767fcb..25522a0ccc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html@@ -2,7 +2,7 @@<div wicket:id="content"></div><wicket:fragment wicket:id="contentFrag"><div class="primary font-weight-bold mb-3">- <wicket:container wicket:id="numberAndTitle" class="mr-3"></wicket:container>+ <wicket:container wicket:id="numberAndTitle"></wicket:container><a wicket:id="links" class="link-info font-weight-normal link d-inline-flex align-items-center mr-2"><span wicket:id="label"></span><wicket:svg href="arrow" class="icon icon-sm"/></a><a wicket:id="showDetail" title="Click to show issue details" class="show-detail"><wicket:svg href="ellipsis" class="icon"/></a></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex 9c00c681f2..d633e31887 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -43,7 +43,6 @@ import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;@@ -57,6 +56,7 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectScope;+import io.onedev.server.util.ProjectScope.RecursiveConfigurable;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.asset.icon.IconScope;import io.onedev.server.web.behavior.IssueQueryBehavior;@@ -78,7 +78,7 @@ import io.onedev.server.web.util.ConfirmClickModifier;@SuppressWarnings("serial")public class IssueBoardsPage extends ProjectIssuesPage {- private static final String PARAM_BOARD = "board";+ public static final String PARAM_BOARD = "board";private static final String PARAM_MILESTONE = "milestone";@@ -172,16 +172,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {public IssueBoardsPage(PageParameters params) {super(params);- Project current = getProject();- do {- boards = current.getIssueSetting().getBoardSpecs();- if (boards != null)- break;- current = current.getParent();- } while (current != null);-- if (boards == null)- boards = OneDev.getInstance(SettingManager.class).getIssueSetting().getBoardSpecs();+ boards = getProject().getHierarchyBoards();String boardName = params.get(PARAM_BOARD).toString();if (StringUtils.isNotBlank(boardName)) {@@ -879,33 +870,16 @@ public class IssueBoardsPage extends ProjectIssuesPage {}private ProjectScope getProjectScope() {- return new ProjectScope() {-- @Override- public Project getProject() {- return IssueBoardsPage.this.getProject();- }-- @Override- public boolean isRecursive() {- return recursive;- }-- @Override- public RecursiveConfigurable getRecursiveConfigurable() {- return new RecursiveConfigurable() {+ return new ProjectScope(getProject(), recursive, new RecursiveConfigurable() {- @Override- public void setRecursive(AjaxRequestTarget target, boolean recursive) {- PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(),- getMilestone(), backlog, queryString, backlogQueryString, recursive);- setResponsePage(IssueBoardsPage.class, params);- }-- };+ @Override+ public void setRecursive(AjaxRequestTarget target, boolean recursive) {+ PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(),+ getMilestone(), backlog, queryString, backlogQueryString, recursive);+ setResponsePage(IssueBoardsPage.class, params);}- };+ });}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.javaindex 8a00750ab3..6fc78ed371 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java@@ -24,6 +24,7 @@ import io.onedev.server.model.support.QueryPersonalization;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.ProjectIssueSetting;import io.onedev.server.util.ProjectScope;+import io.onedev.server.util.ProjectScope.RecursiveConfigurable;import io.onedev.server.web.component.issue.list.IssueListPanel;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;@@ -214,31 +215,14 @@ public class ProjectIssueListPage extends ProjectIssuesPage {@Overrideprotected ProjectScope getProjectScope() {- return new ProjectScope() {-- @Override- public Project getProject() {- return ProjectIssueListPage.this.getProject();- }-+ return new ProjectScope(getProject(), recursive, new RecursiveConfigurable() {+@Override- public boolean isRecursive() {- return recursive;+ public void setRecursive(AjaxRequestTarget target, boolean recursive) {+ setResponsePage(ProjectIssueListPage.class, paramsOf(getProject(), query, recursive, 0));}-- @Override- public RecursiveConfigurable getRecursiveConfigurable() {- return new RecursiveConfigurable() {- @Override- public void setRecursive(AjaxRequestTarget target, boolean recursive) {- setResponsePage(ProjectIssueListPage.class, paramsOf(getProject(), query, recursive, 0));- }-- };- }-- };+ });}});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 306c195aa7..6f57afc928 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@@ -44,7 +44,7 @@ import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@SuppressWarnings("serial")public abstract class MilestoneDetailPage extends ProjectPage implements ScriptIdentityAware {- private static final String PARAM_MILESTONE = "milestone";+ public static final String PARAM_MILESTONE = "milestone";private final IModel<Milestone> milestoneModel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneIssuesPage.javaindex e68770bcf1..1ee16c47fb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneIssuesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneIssuesPage.java@@ -113,24 +113,7 @@ public class MilestoneIssuesPage extends MilestoneDetailPage {@Overrideprotected ProjectScope getProjectScope() {- return new ProjectScope() {-- @Override- public Project getProject() {- return MilestoneIssuesPage.this.getProject();- }-- @Override- public boolean isRecursive() {- return true;- }-- @Override- public RecursiveConfigurable getRecursiveConfigurable() {- return null;- }-- };+ return new ProjectScope(getProject(), true, null);}});diff --git a/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java b/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.javaindex bdcf340993..92f3af3443 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java@@ -20,6 +20,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;import com.google.common.base.Joiner;+import com.google.common.base.Splitter;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.LockUtils;@@ -39,8 +40,6 @@ public class ArtifactResource extends AbstractResource {private static final String PARAM_BUILD = "build";- private static final String PARAM_PATH = "path";-@Overrideprotected ResourceResponse newResourceResponse(Attributes attributes) {PageParameters params = attributes.getParameters();@@ -65,18 +64,16 @@ public class ArtifactResource extends AbstractResource {throw new UnauthorizedException();List<String> pathSegments = new ArrayList<>();- String pathSegment = params.get(PARAM_PATH).toString();- if (pathSegment.length() != 0)- pathSegments.add(pathSegment);- else- throw new ExplicitException("Artifact path has to be specified");for (int i = 0; i < params.getIndexedCount(); i++) {- pathSegment = params.get(i).toString();+ String pathSegment = params.get(i).toString();if (pathSegment.length() != 0)pathSegments.add(pathSegment);}+ if (pathSegments.isEmpty())+ throw new ExplicitException("Artifact path has to be specified");+String artifactPath = Joiner.on("/").join(pathSegments);File artifactsDir = build.getArtifactsDir();@@ -130,7 +127,12 @@ public class ArtifactResource extends AbstractResource {PageParameters params = new PageParameters();params.set(PARAM_PROJECT, project.getId());params.set(PARAM_BUILD, buildNumber);- params.set(PARAM_PATH, path);++ int index = 0;+ for (String segment: Splitter.on("/").split(path)) {+ params.set(index, segment);+ index++;+ }return params;}diff --git a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.javaindex 72a0b06b5b..39f91eb2d6 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java@@ -22,6 +22,8 @@ import org.eclipse.jgit.lib.ObjectId;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.google.common.base.Splitter;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.git.Blob;@@ -38,10 +40,6 @@ public class RawBlobResource extends AbstractResource {private static final String PARAM_PROJECT = "project";- private static final String PARAM_REVISION = "revision";-- private static final String PARAM_PATH = "path";-private static final int BUFFER_SIZE = 8*1024;@Override@@ -52,15 +50,8 @@ public class RawBlobResource extends AbstractResource {Project project = OneDev.getInstance(ProjectManager.class).load(projectId);List<String> revisionAndPathSegments = new ArrayList<>();- String segment = params.get(PARAM_REVISION).toString();- if (segment.length() != 0)- revisionAndPathSegments.add(segment);- segment = params.get(PARAM_PATH).toString();- if (segment.length() != 0)- revisionAndPathSegments.add(segment);-for (int i = 0; i < params.getIndexedCount(); i++) {- segment = params.get(i).toString();+ String segment = params.get(i).toString();if (segment.length() != 0)revisionAndPathSegments.add(segment);}@@ -69,8 +60,8 @@ public class RawBlobResource extends AbstractResource {String revision = blobIdent.revision;String path = blobIdent.path;- if (StringUtils.isBlank(path))- throw new IllegalArgumentException("path parameter has to be specified");+ if (StringUtils.isBlank(revision) || StringUtils.isBlank(path))+ throw new IllegalArgumentException("Revision and path should be specified");if (!SecurityUtils.canReadCode(project))throw new UnauthorizedException();@@ -173,8 +164,16 @@ public class RawBlobResource extends AbstractResource {public static PageParameters paramsOf(Project project, BlobIdent blobIdent) {PageParameters params = new PageParameters();params.set(PARAM_PROJECT, project.getId());- params.set(PARAM_REVISION, blobIdent.revision);- params.set(PARAM_PATH, blobIdent.path);++ int index = 0;+ for (String segment: Splitter.on("/").split(blobIdent.revision)) {+ params.set(index, segment);+ index++;+ }+ for (String segment: Splitter.on("/").split(blobIdent.path)) {+ params.set(index, segment);+ index++;+ }return params;}diff --git a/server-core/src/main/java/io/onedev/server/web/util/AbsoluteUrlRenderer.java b/server-core/src/main/java/io/onedev/server/web/util/AbsoluteUrlRenderer.javaindex f9e12c0f7d..e0fe1a8ef1 100644--- a/server-core/src/main/java/io/onedev/server/web/util/AbsoluteUrlRenderer.java+++ b/server-core/src/main/java/io/onedev/server/web/util/AbsoluteUrlRenderer.java@@ -2,14 +2,12 @@ package io.onedev.server.web.util;import org.apache.wicket.request.Request;import org.apache.wicket.request.Url;-import org.apache.wicket.request.UrlRenderer;import org.apache.wicket.request.Url.StringMode;+import org.apache.wicket.request.UrlRenderer;import org.apache.wicket.util.string.Strings;import com.google.common.collect.Lists;-import io.onedev.server.web.mapper.DynamicPathUrl;-public class AbsoluteUrlRenderer extends UrlRenderer {public AbsoluteUrlRenderer(Request request) {@@ -21,22 +19,16 @@ public class AbsoluteUrlRenderer extends UrlRenderer {if (url.isFull()) {return url.toString(StringMode.FULL);} else if (url.getSegments().isEmpty()) {- Url absolute = copy(url);+ Url absolute = new Url(url);absolute.prependLeadingSegments(Lists.newArrayList("", ""));return absolute.toString();} else if (Strings.isEmpty(url.getSegments().get(0))) {return url.toString();} else {- Url absolute = copy(url);+ Url absolute = new Url(url);absolute.prependLeadingSegments(Lists.newArrayList(""));return absolute.toString();}}- private Url copy(Url url) {- if (url instanceof DynamicPathUrl)- return new DynamicPathUrl(url);- else- return new Url(url);- }}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/util/Cursor.java b/server-core/src/main/java/io/onedev/server/web/util/Cursor.javaindex 844107d3b8..bee5e95aa1 100644--- a/server-core/src/main/java/io/onedev/server/web/util/Cursor.java+++ b/server-core/src/main/java/io/onedev/server/web/util/Cursor.java@@ -59,28 +59,10 @@ public class Cursor implements Serializable {@Nullablepublic ProjectScope getProjectScope() {- if (projectId != null) {- return new ProjectScope() {-- @Override- public Project getProject() {- return OneDev.getInstance(ProjectManager.class).load(projectId);- }-- @Override- public boolean isRecursive() {- return recursive;- }-- @Override- public RecursiveConfigurable getRecursiveConfigurable() {- return null;- }-- };- } else {+ if (projectId != null)+ return new ProjectScope(OneDev.getInstance(ProjectManager.class).load(projectId), recursive, null);+ elsereturn null;- }}@Nullablediff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportModule.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportModule.javaindex 0f8b53a891..ee4c80adfd 100644--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportModule.java+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportModule.java@@ -25,7 +25,7 @@ import io.onedev.server.model.CoverageMetric;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebApplicationConfigurator;-import io.onedev.server.web.mapper.DynamicPathPageMapper;+import io.onedev.server.web.mapper.BasePageMapper;import io.onedev.server.web.page.layout.SidebarMenuItem;import io.onedev.server.web.page.project.StatisticsMenuContribution;import io.onedev.server.web.page.project.builds.detail.BuildTab;@@ -133,8 +133,8 @@ public class CoverageReportModule extends AbstractPluginModule {@Overridepublic void configure(WebApplication application) {- application.mount(new DynamicPathPageMapper("projects/${project}/builds/${build}/coverage/${report}", CoverageReportPage.class));- application.mount(new DynamicPathPageMapper("projects/${project}/stats/coverage", CoverageStatsPage.class));+ application.mount(new BasePageMapper("projects/${project}/builds/${build}/coverage/${report}", CoverageReportPage.class));+ application.mount(new BasePageMapper("projects/${project}/stats/coverage", CoverageStatsPage.class));}});diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.javaindex 4edd6be8e3..0d290281fe 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.java@@ -41,8 +41,6 @@ public class MarkdownReportDownloadResource extends AbstractResource {private static final String PARAM_REPORT = "report";- private static final String PARAM_PATH = "path";-@Overrideprotected ResourceResponse newResourceResponse(Attributes attributes) {PageParameters params = attributes.getParameters();@@ -72,14 +70,8 @@ public class MarkdownReportDownloadResource extends AbstractResource {throw new UnauthorizedException();List<String> pathSegments = new ArrayList<>();- String pathSegment = params.get(PARAM_PATH).toString();- if (pathSegment.length() != 0)- pathSegments.add(pathSegment);- else- throw new ExplicitException("Markdown report path has to be specified");-for (int i = 0; i < params.getIndexedCount(); i++) {- pathSegment = params.get(i).toString();+ String pathSegment = params.get(i).toString();if (pathSegment.length() != 0)pathSegments.add(pathSegment);}@@ -132,13 +124,4 @@ public class MarkdownReportDownloadResource extends AbstractResource {return response;}- public static PageParameters paramsOf(Project project, Long buildNumber, String reportName, String path) {- PageParameters params = new PageParameters();- params.set(PARAM_PROJECT, project.getId());- params.set(PARAM_BUILD, buildNumber);- params.set(PARAM_REPORT, reportName);- params.set(PARAM_PATH, path);- return params;- }-}diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportModule.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportModule.javaindex 6c8ed156bc..e2ea7bc810 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportModule.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportModule.java@@ -18,7 +18,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebApplicationConfigurator;-import io.onedev.server.web.mapper.DynamicPathPageMapper;+import io.onedev.server.web.mapper.BasePageMapper;import io.onedev.server.web.page.project.builds.detail.BuildTab;import io.onedev.server.web.page.project.builds.detail.BuildTabContribution;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestSummaryContribution;@@ -115,7 +115,9 @@ public class MarkdownReportModule extends AbstractPluginModule {@Overridepublic void configure(WebApplication application) {- application.mount(new DynamicPathPageMapper("projects/${project}/builds/${build}/markdown/${report}/#{path}", MarkdownReportPage.class));+ application.mount(new BasePageMapper(+ "projects/${project}/builds/${build}/markdown/${report}",+ MarkdownReportPage.class));}});diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.javaindex fcdad4a877..ab54338284 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java@@ -15,6 +15,8 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;import org.apache.wicket.request.mapper.parameter.PageParameters;+import com.google.common.base.Splitter;+import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Build;@@ -27,8 +29,6 @@ public class MarkdownReportPage extends BuildDetailPage {private static final String PARAM_REPORT = "report";- private static final String PARAM_PATH = "path";-private final String reportName;private final String filePath;@@ -39,22 +39,18 @@ public class MarkdownReportPage extends BuildDetailPage {reportName = params.get(PARAM_REPORT).toString();List<String> pathSegments = new ArrayList<>();- String segment = params.get(PARAM_PATH).toString();- if (segment != null && segment.length() != 0)- pathSegments.add(segment);-for (int i=0; i<params.getIndexedCount(); i++) {- segment = params.get(i).toString();+ String segment = params.get(i).toString();if (segment.length() != 0)pathSegments.add(segment);}filePath = StringUtils.join(pathSegments, "/");+if (!filePath.endsWith(".md")) {RequestCycle.get().scheduleRequestHandlerAfterCurrent(new ResourceReferenceRequestHandler(new MarkdownReportDownloadResourceReference(), getPageParameters()));}-}@Override@@ -89,8 +85,13 @@ public class MarkdownReportPage extends BuildDetailPage {public static PageParameters paramsOf(Build build, String reportName, @Nullable String filePath) {PageParameters params = paramsOf(build);params.add(PARAM_REPORT, reportName);- if (filePath != null)- params.add(PARAM_PATH, filePath);+ int index = 0;+ if (filePath != null) {+ for (String segment: Splitter.on("/").split(filePath)) {+ params.set(index, segment);+ index++;+ }+ }return params;}}diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportModule.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportModule.javaindex ede41d155e..5214e9e58c 100644--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportModule.java+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportModule.java@@ -23,7 +23,7 @@ import io.onedev.server.model.ProblemMetric;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebApplicationConfigurator;-import io.onedev.server.web.mapper.DynamicPathPageMapper;+import io.onedev.server.web.mapper.BasePageMapper;import io.onedev.server.web.page.layout.SidebarMenuItem;import io.onedev.server.web.page.project.StatisticsMenuContribution;import io.onedev.server.web.page.project.builds.detail.BuildTab;@@ -129,9 +129,9 @@ public class ProblemReportModule extends AbstractPluginModule {@Overridepublic void configure(WebApplication application) {- application.mount(new DynamicPathPageMapper("projects/${project}/builds/${build}/problem/${report}",+ application.mount(new BasePageMapper("projects/${project}/builds/${build}/problem/${report}",ProblemReportPage.class));- application.mount(new DynamicPathPageMapper("projects/${project}/stats/problem", ProblemStatsPage.class));+ application.mount(new BasePageMapper("projects/${project}/stats/problem", ProblemStatsPage.class));}});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 08db2cc856..c0dc59acee 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@@ -17,7 +17,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.UnitTestMetric;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebApplicationConfigurator;-import io.onedev.server.web.mapper.DynamicPathPageMapper;+import io.onedev.server.web.mapper.BasePageMapper;import io.onedev.server.web.page.layout.SidebarMenuItem;import io.onedev.server.web.page.project.StatisticsMenuContribution;import io.onedev.server.web.page.project.builds.detail.BuildTab;@@ -90,9 +90,9 @@ public class UnitTestReportModule extends AbstractPluginModule {@Overridepublic void configure(WebApplication application) {- application.mount(new DynamicPathPageMapper("projects/${project}/builds/${build}/unit-test/${report}/test-suites", UnitTestSuitesPage.class));- application.mount(new DynamicPathPageMapper("projects/${project}/builds/${build}/unit-test/${report}/test-cases", UnitTestCasesPage.class));- application.mount(new DynamicPathPageMapper("projects/${project}/stats/unit-test", UnitTestStatsPage.class));+ application.mount(new BasePageMapper("projects/${project}/builds/${build}/unit-test/${report}/test-suites", UnitTestSuitesPage.class));+ application.mount(new BasePageMapper("projects/${project}/builds/${build}/unit-test/${report}/test-cases", UnitTestCasesPage.class));+ application.mount(new BasePageMapper("projects/${project}/stats/unit-test", UnitTestStatsPage.class));}});diff --git a/server-product/system/conf/logback.xml b/server-product/system/conf/logback.xmlindex e394a65e4a..cb725a9fb2 100644--- a/server-product/system/conf/logback.xml+++ b/server-product/system/conf/logback.xml@@ -22,6 +22,9 @@</appender><logger name="org.apache.wicket" level="WARN"/>+ <logger name="org.apache.wicket.request.cycle.RequestCycle" level="OFF"/>+ <logger name="RequestCycleExtra" level="OFF"/>+ <logger name="org.apache.wicket.DefaultExceptionMapper" level="OFF"/><logger name="org.apache.wicket.page.XmlPartialPageUpdate" level="ERROR"/><logger name="org.eclipse" level="WARN"/><logger name="org.hibernate" level="WARN"/>