Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2025-12-24 23:59:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

[PE-93] regression: mention users highlight color, reomve bot users from search list (#6258)

Browse Source 
* chore: remove bot users in mention

* fix: user highlight color

---------

Co-authored-by: NarayanBavisetti <narayan3119@gmail.com>
This commit is contained in:
Aaryan Khandelwal
2024-12-23 15:25:40 +05:30
committed by GitHub
parent 9f5def3a6a
commit d54c1bae03
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apiserver/plane/app/views/search/base.py
View File

@@ -274,7 +274,7 @@ class SearchEndpoint(BaseAPIView):
q |= Q(**{f"{field}__icontains": query})
users = (
ProjectMember.objects.filter(
q, is_active=True, project_id=project_id, workspace__slug=slug
q, is_active=True, project_id=project_id, workspace__slug=slug, member__is_bot=False
)
.annotate(
member__avatar_url=Case(

9
space/core/components/editor/embeds/mentions/user.tsx
View File

@@ -26,9 +26,12 @@ export const EditorUserMention: React.FC<Props> = observer((props) => {
return (
<div
className={cn("not-prose inline px-1 py-0.5 rounded bg-yellow-500/20 text-yellow-500 no-underline", {
"bg-custom-primary-100/20 text-custom-primary-100": id === currentUser?.id,
})}
className={cn(
"not-prose inline px-1 py-0.5 rounded bg-custom-primary-100/20 text-custom-primary-100 no-underline",
{
"bg-yellow-500/20 text-yellow-500": id === currentUser?.id,
}
)}
>
@{userDetails?.member__display_name}
</div>

4
web/core/components/editor/embeds/mentions/user.tsx
View File

@@ -58,9 +58,9 @@ export const EditorUserMention: React.FC<Props> = observer((props) => {
return (
<div
className={cn(
"not-prose group/user-mention inline px-1 py-0.5 rounded bg-yellow-500/20 text-yellow-500 no-underline",
"not-prose group/user-mention inline px-1 py-0.5 rounded bg-custom-primary-100/20 text-custom-primary-100 no-underline",
{
"bg-custom-primary-100/20 text-custom-primary-100": id === currentUser?.id,
"bg-yellow-500/20 text-yellow-500": id === currentUser?.id,
}
)}
>