The Unified and Autonomous Development Platform
Filter off undesired searches for command palette
Robin Shenc1d9f339aa30
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.javaindex b8700a6074..5e55355991 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java@@ -31,9 +31,10 @@ import io.onedev.server.model.Project;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=60, name="Pull from Remote", group=StepGroup.REPOSITORY_MIRRORING,- description="For security reason, this step is only allowed to run from default branch")-public class PullRepository extends MirrorRepository {+@Editable(order=60, name="Pull from Remote", group=StepGroup.REPOSITORY_SYNC, description=""+ + "This step pulls specified refs from remote. For security reason, it is only allowed "+ + "to run from default branch")+public class PullRepository extends SyncRepository {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.javaindex def8b3802f..e28c9b7c5e 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PushRepository.java@@ -16,8 +16,9 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=70, name="Push to Remote", group=StepGroup.REPOSITORY_MIRRORING)-public class PushRepository extends MirrorRepository {+@Editable(order=70, name="Push to Remote", group=StepGroup.REPOSITORY_SYNC,+ description="This step pushes current commit to same ref on remote")+public class PushRepository extends SyncRepository {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/StepGroup.java b/server-core/src/main/java/io/onedev/server/buildspec/step/StepGroup.javaindex e03c1e7545..7c8ecb44ec 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/StepGroup.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/StepGroup.java@@ -4,6 +4,6 @@ public class StepGroup {public static final String PUBLISH_REPORTS = "Publish Reports";- public static final String REPOSITORY_MIRRORING = "Repository Mirroring";+ public static final String REPOSITORY_SYNC = "Repository Sync";}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/MirrorRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/buildspec/step/MirrorRepository.javarename to server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.javaindex bb777d4b4d..b883069e8d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/MirrorRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java@@ -24,7 +24,7 @@ import io.onedev.server.web.editable.annotation.Editable;@Editable@ClassValidating-public abstract class MirrorRepository extends ServerSideStep implements Validatable {+public abstract class SyncRepository extends ServerSideStep implements Validatable {private static final long serialVersionUID = 1L;diff --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.javaindex db0bc966a7..c651d9afc2 100644--- 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.java@@ -6,7 +6,6 @@ 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;@@ -27,8 +26,8 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.IRequestMapper;import org.apache.wicket.request.mapper.ICompoundRequestMapper;+import com.google.common.base.Joiner;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;@@ -37,6 +36,8 @@ 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.util.match.PathMatcher;+import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.WebApplication;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.behavior.SelectByTypingBehavior;@@ -50,11 +51,13 @@ public abstract class CommandPalettePanel extends Panel {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");+ private static final PatternSet excludedUrlPatterns = PatternSet.parse(""+ + "test/** errors/** sso/** verify-email-address/** reset-password/** signup/** "+ + "logout/** login/** loading/** init/** help/** builds/** issues/** "+ + "pull-requests/** **/invalid **/blob **/${issue}/** -**/${issue} "+ + "**/${request}/** -**/${request} **/${build}/** -**/${build} "+ + "**/${milestone}/** -**/${milestone} **/${agent}/** -**/${agent} "+ + "**/${group}/** -**/${group}");static {for (IRequestMapper mapper: OneDev.getInstance(WebApplication.class).getRequestMappers())@@ -82,11 +85,11 @@ public abstract class CommandPalettePanel extends Panel {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);- }+ if (mountSegments != null) {+ String url = Joiner.on("/").join(mountSegments);+ if (!excludedUrlPatterns.matches(new PathMatcher(), url))+ mountedPaths.add(mountSegments);+ }return mountedPaths;} catch (SecurityException | IllegalArgumentException | IllegalAccessException e) {throw new RuntimeException(e);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.javaindex 1a70ef4174..050e640724 100644--- 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.java@@ -153,30 +153,6 @@ public abstract class ParsedUrl implements Serializable {}}- 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<>();@@ -212,16 +188,6 @@ public abstract class ParsedUrl implements Serializable {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);