Skip to content

[PE-93] regression: mentions in space app, entity search #6250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pushya22 merged 2 commits into from
Dec 20, 2024
Merged

[PE-93] regression: mentions in space app, entity search #6250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f01777c
fix: mentions in space app
aaryan610 Dec 20, 2024
2fe40d4
fix: user entity filter
aaryan610 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions apiserver/plane/app/views/search/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
7 changes: 1 addition & 6 deletions space/core/components/editor/embeds/mentions/user.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,14 +10,11 @@ type Props = {

export const EditorUserMention: React.FC<Props> = 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 (
Expand All @@ -35,7 +30,7 @@ export const EditorUserMention: React.FC<Props> = observer((props) => {
"bg-custom-primary-100/20 text-custom-primary-100": id === currentUser?.id,
})}
>
<Link href={profileLink}>@{userDetails?.member__display_name}</Link>
@{userDetails?.member__display_name}
</div>
);
});
Loading