Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

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

Aaryan Khandelwald54c1bae0388
diff --git a/apiserver/plane/app/views/search/base.py b/apiserver/plane/app/views/search/base.py
index c0ef59aa74..3736d8f81a 100644
--- a/apiserver/plane/app/views/search/base.py
+++ b/apiserver/plane/app/views/search/base.py
@@ -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(
diff --git a/space/core/components/editor/embeds/mentions/user.tsx b/space/core/components/editor/embeds/mentions/user.tsx
index 418623f98c..5a178396b8 100644
--- a/space/core/components/editor/embeds/mentions/user.tsx
+++ b/space/core/components/editor/embeds/mentions/user.tsx
@@ -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>
diff --git a/web/core/components/editor/embeds/mentions/user.tsx b/web/core/components/editor/embeds/mentions/user.tsx
index 8952e44d57..20cfeb2baa 100644
--- a/web/core/components/editor/embeds/mentions/user.tsx
+++ b/web/core/components/editor/embeds/mentions/user.tsx
@@ -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,
}
)}
>