The Unified and Autonomous Development Platform
feat: Only mention/prompt user in same group (OD-2381)
Robin Shen714aa46fd9ee
diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex caa62e239b..2a795d8c60 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -4,6 +4,8 @@ import static io.onedev.server.model.User.PROP_FULL_NAME;import static io.onedev.server.model.User.PROP_NAME;import static io.onedev.server.security.SecurityUtils.asPrincipals;import static io.onedev.server.security.SecurityUtils.asUserPrincipal;+import static java.util.stream.Collectors.toList;+import static java.util.stream.Collectors.toSet;import java.util.ArrayList;import java.util.Collection;@@ -12,7 +14,6 @@ import java.util.LinkedHashSet;import java.util.List;import java.util.Optional;import java.util.Stack;-import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.persistence.CascadeType;@@ -260,6 +261,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {private transient Optional<EmailAddress> primaryEmailAddress;private transient Optional<EmailAddress> gitEmailAddress;++ private transient Collection<User> collaborators;public QueryPersonalization<NamedProjectQuery> getProjectQueryPersonalization() {return new QueryPersonalization<NamedProjectQuery>() {@@ -698,7 +701,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {public Collection<Group> getGroups() {if (groups == null)- groups = getMemberships().stream().map(it->it.getGroup()).collect(Collectors.toList());+ groups = getMemberships().stream().map(it->it.getGroup()).collect(toList());return groups;}@@ -1066,6 +1069,13 @@ public class User extends AbstractEntity implements AuthenticationInfo {return gitEmailAddress.orElse(null);}+ public Collection<User> getCollaborators() {+ if (collaborators == null) {+ collaborators = getGroups().stream().flatMap(it->it.getMembers().stream()).filter(it -> !it.isDisabled()).collect(toSet());+ }+ return collaborators;+ }+@Overridepublic UserFacade getFacade() {return new UserFacade(getId(), getName(), getFullName(), isServiceAccount(), isDisabled());diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.javaindex 2cd46d7b8e..51ff119346 100644--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java@@ -35,7 +35,11 @@ public abstract class CommentInput extends MarkdownEditor {return (query, count) -> {var cache = getUserManager().cloneCache();var participants = getParticipants();- var otherUsers = new ArrayList<>(cache.getUsers());+ List<User> otherUsers;+ if (SecurityUtils.isAdministrator())+ otherUsers = new ArrayList<>(cache.getUsers());+ else+ otherUsers = new ArrayList<>(SecurityUtils.getUser().getCollaborators());otherUsers.removeAll(participants);var similarities = new Similarities<>(participants) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.javaindex 0e64106e3e..ee620cb560 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java@@ -84,7 +84,11 @@ class MarkdownBlobEditor extends FormComponentPanel<byte[]> {@Overridepublic List<User> findUsers(String query, int count) {UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());+ List<User> users;+ if (SecurityUtils.isAdministrator())+ users = new ArrayList<>(cache.getUsers());+ else+ users = new ArrayList<>(SecurityUtils.getUser().getCollaborators());users.sort(cache.comparingDisplayName(Sets.newHashSet()));users = new Similarities<User>(users) {diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex bbfbca771b..a86c997773 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -335,7 +335,15 @@ public class SuggestionUtils {List<InputSuggestion> suggestions = new ArrayList<>();UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();- var users = cache.values().stream().filter(it -> !it.isDisabled()).collect(toList());++ List<UserFacade> users;+ if (SecurityUtils.isAdministrator())+ users = cache.values().stream().filter(it -> !it.isDisabled()).collect(toList());+ else if (SecurityUtils.getUser() != null)+ users = SecurityUtils.getUser().getCollaborators().stream().map(it -> it.getFacade()).collect(toList());+ else+ users = new ArrayList<>();+users.sort(Comparator.comparing(it -> it.getDisplayName()));for (UserFacade user: users) {LinearRange match = LinearRange.match(user.getName(), matchWith);@@ -353,7 +361,11 @@ public class SuggestionUtils {}}- return sortAndTruncate(suggestions, matchWith);+ suggestions = sortAndTruncate(suggestions, matchWith);+ if (!suggestions.isEmpty())+ return suggestions;+ else+ return null;}public static List<InputSuggestion> suggestLinkSpecs(String matchWith) {diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.javaindex c30cb89e40..ee91fea2b7 100644--- a/server-product/src/test/java/io/onedev/server/product/Test.java+++ b/server-product/src/test/java/io/onedev/server/product/Test.java@@ -5,5 +5,5 @@ public class Test {@org.junit.Testpublic void test() {}-+}\ No newline at end of file