π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
refactor: accept generic function to search mentions (#6249)
Aaryan Khandelwald2c0940f0465
diff --git a/web/core/components/editor/rich-text-editor/rich-text-editor.tsx b/web/core/components/editor/rich-text-editor/rich-text-editor.tsxindex 41d67a1c64..e3b5aa7a31 100644--- a/web/core/components/editor/rich-text-editor/rich-text-editor.tsx+++ b/web/core/components/editor/rich-text-editor/rich-text-editor.tsx@@ -1,6 +1,8 @@import React, { forwardRef } from "react";// editorimport { EditorRefApi, IRichTextEditor, RichTextEditorWithRef } from "@plane/editor";+// plane types+import { TSearchEntityRequestPayload, TSearchResponse } from "@plane/types";// componentsimport { EditorMentionsRoot } from "@/components/editor";// helpers@@ -11,12 +13,10 @@ import { useEditorMention } from "@/hooks/use-editor-mention";// plane web hooksimport { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";import { useFileSize } from "@/plane-web/hooks/use-file-size";-// services-import { ProjectService } from "@/services/project";-const projectService = new ProjectService();interface RichTextEditorWrapperPropsextends Omit<IRichTextEditor, "disabledExtensions" | "fileHandler" | "mentionHandler"> {+ searchMentionCallback: (payload: TSearchEntityRequestPayload) => Promise<TSearchResponse>;workspaceSlug: string;workspaceId: string;projectId?: string;@@ -24,13 +24,13 @@ interface RichTextEditorWrapperProps}export const RichTextEditor = forwardRef<EditorRefApi, RichTextEditorWrapperProps>((props, ref) => {- const { containerClassName, workspaceSlug, workspaceId, projectId, uploadFile, ...rest } = props;+ const { containerClassName, workspaceSlug, workspaceId, projectId, searchMentionCallback, uploadFile, ...rest } =+ props;// editor flaggingsconst { richTextEditor: disabledExtensions } = useEditorFlagging(workspaceSlug?.toString());// use editor mentionconst { fetchMentions } = useEditorMention({- searchEntity: async (payload) =>- await projectService.searchEntity(workspaceSlug?.toString() ?? "", projectId?.toString() ?? "", payload),+ searchEntity: async (payload) => await searchMentionCallback(payload),});// file sizeconst { maxFileSize } = useFileSize();diff --git a/web/core/components/inbox/modals/create-modal/issue-description.tsx b/web/core/components/inbox/modals/create-modal/issue-description.tsxindex b9bad6c11a..14816cbc0d 100644--- a/web/core/components/inbox/modals/create-modal/issue-description.tsx+++ b/web/core/components/inbox/modals/create-modal/issue-description.tsx@@ -21,7 +21,9 @@ import { useProjectInbox } from "@/hooks/store";import { usePlatformOS } from "@/hooks/use-platform-os";// servicesimport { FileService } from "@/services/file.service";+import { ProjectService } from "@/services/project";const fileService = new FileService();+const projectService = new ProjectService();type TInboxIssueDescription = {containerClassName?: string;@@ -72,6 +74,9 @@ export const InboxIssueDescription: FC<TInboxIssueDescription> = observer((propsdragDropEnabled={false}onChange={(_description: object, description_html: string) => handleData("description_html", description_html)}placeholder={getDescriptionPlaceholder}+ searchMentionCallback={async (payload) =>+ await projectService.searchEntity(workspaceSlug?.toString() ?? "", projectId?.toString() ?? "", payload)+ }containerClassName={containerClassName}onEnterKeyPress={onEnterKeyPress}tabIndex={getIndex("description_html")}diff --git a/web/core/components/issues/description-input.tsx b/web/core/components/issues/description-input.tsxindex 9b9abe0387..32964cec1f 100644--- a/web/core/components/issues/description-input.tsx+++ b/web/core/components/issues/description-input.tsx@@ -18,7 +18,9 @@ import { getDescriptionPlaceholder } from "@/helpers/issue.helper";import { useWorkspace } from "@/hooks/store";// servicesimport { FileService } from "@/services/file.service";+import { ProjectService } from "@/services/project";const fileService = new FileService();+const projectService = new ProjectService();export type IssueDescriptionInputProps = {containerClassName?: string;@@ -118,6 +120,13 @@ export const IssueDescriptionInput: FC<IssueDescriptionInputProps> = observer((pplaceholder={placeholder ? placeholder : (isFocused, value) => getDescriptionPlaceholder(isFocused, value)}+ searchMentionCallback={async (payload) =>+ await projectService.searchEntity(+ workspaceSlug?.toString() ?? "",+ projectId?.toString() ?? "",+ payload+ )+ }containerClassName={containerClassName}uploadFile={async (file) => {try {diff --git a/web/core/components/issues/issue-modal/components/description-editor.tsx b/web/core/components/issues/issue-modal/components/description-editor.tsxindex 316668d010..19ddbc1f40 100644--- a/web/core/components/issues/issue-modal/components/description-editor.tsx+++ b/web/core/components/issues/issue-modal/components/description-editor.tsx@@ -26,6 +26,7 @@ import { usePlatformOS } from "@/hooks/use-platform-os";// servicesimport { AIService } from "@/services/ai.service";import { FileService } from "@/services/file.service";+import { ProjectService } from "@/services/project";type TIssueDescriptionEditorProps = {control: Control<TIssue>;@@ -49,6 +50,7 @@ type TIssueDescriptionEditorProps = {// servicesconst aiService = new AIService();const fileService = new FileService();+const projectService = new ProjectService();export const IssueDescriptionEditor: React.FC<TIssueDescriptionEditorProps> = observer((props) => {const {@@ -188,6 +190,13 @@ export const IssueDescriptionEditor: React.FC<TIssueDescriptionEditorProps> = obref={editorRef}tabIndex={getIndex("description_html")}placeholder={getDescriptionPlaceholder}+ searchMentionCallback={async (payload) =>+ await projectService.searchEntity(+ workspaceSlug?.toString() ?? "",+ projectId?.toString() ?? "",+ payload+ )+ }containerClassName="pt-3 min-h-[120px]"uploadFile={async (file) => {try {