From f01777c603c58632a017b88817f92c71660b8932 Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal Date: Fri, 20 Dec 2024 16:49:14 +0530 Subject: [PATCH 1/2] fix: mentions in space app --- space/core/components/editor/embeds/mentions/user.tsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/space/core/components/editor/embeds/mentions/user.tsx b/space/core/components/editor/embeds/mentions/user.tsx index 106f4b1767c..418623f98cf 100644 --- a/space/core/components/editor/embeds/mentions/user.tsx +++ b/space/core/components/editor/embeds/mentions/user.tsx @@ -1,6 +1,4 @@ import { observer } from "mobx-react"; -import Link from "next/link"; -import { useParams } from "next/navigation"; // helpers import { cn } from "@/helpers/common.helper"; // hooks @@ -12,14 +10,11 @@ type Props = { export const EditorUserMention: React.FC = observer((props) => { const { id } = props; - // params - const { workspaceSlug } = useParams(); // store hooks const { data: currentUser } = useUser(); const { getMemberById } = useMember(); // derived values const userDetails = getMemberById(id); - const profileLink = `/${workspaceSlug}/profile/${id}`; if (!userDetails) { return ( @@ -35,7 +30,7 @@ export const EditorUserMention: React.FC = observer((props) => { "bg-custom-primary-100/20 text-custom-primary-100": id === currentUser?.id, })} > - @{userDetails?.member__display_name} + @{userDetails?.member__display_name} ); }); From 2fe40d4aa4704254f90c7ac6f2e30ce08cc00762 Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal Date: Fri, 20 Dec 2024 16:51:28 +0530 Subject: [PATCH 2/2] fix: user entity filter --- apiserver/plane/app/views/search/base.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/apiserver/plane/app/views/search/base.py b/apiserver/plane/app/views/search/base.py index 3af588b408c..c0ef59aa743 100644 --- a/apiserver/plane/app/views/search/base.py +++ b/apiserver/plane/app/views/search/base.py @@ -274,11 +274,7 @@ def get(self, request, slug, project_id): q |= Q(**{f"{field}__icontains": query}) users = ( ProjectMember.objects.filter( - q, - member=self.request.user, - is_active=True, - project_id=project_id, - workspace__slug=slug, + q, is_active=True, project_id=project_id, workspace__slug=slug ) .annotate( member__avatar_url=Case(