fix: merge conflicts resolved from develop

web/components/pages/editor/editor-body.tsx

@@ -12,12 +12,15 @@ import {
 } from "@plane/document-editor";
 // types
 import { IUserLite, TPage } from "@plane/types";
+// ui
+import { Spinner } from "@plane/ui";
 // components
 import { PageContentBrowser, PageEditorTitle } from "@/components/pages";
 // helpers
 import { cn } from "@/helpers/common.helper";
 // hooks
 import { useMember, useMention, useUser, useWorkspace } from "@/hooks/store";
+import { useIssueEmbeds } from "@/hooks/use-issue-embeds";
 import useReloadConfirmations from "@/hooks/use-reload-confirmation";
 // services
 import { FileService } from "@/services/file.service";
@@ -79,6 +82,8 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {
     members: projectMemberDetails,
     user: currentUser ?? undefined,
   });
+  // issue-embed
+  const { issues, fetchIssue, issueWidgetClickAction, issuesLoading } = useIssueEmbeds();
 
   const { setShowAlert } = useReloadConfirmations(isSubmitting === "submitting");
 
@@ -86,6 +91,13 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {
     updateMarkings(description_html ?? "<p></p>");
   }, [description_html, updateMarkings]);
 
+  if (!issues && issuesLoading)
+    return (
+      <div className="h-full w-full grid place-items-center">
+        <Spinner />
+      </div>
+    );
+
   return (
     <div className="flex items-center h-full w-full overflow-y-auto">
       <div
@@ -145,6 +157,13 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {
                     highlights: mentionHighlights,
                     suggestions: mentionSuggestions,
                   }}
+                  embedConfig={{
+                    issueEmbedConfig: {
+                      issues,
+                      fetchIssue,
+                      clickAction: issueWidgetClickAction,
+                    },
+                  }}
                 />
               )}
             />
@@ -158,6 +177,13 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {
               mentionHandler={{
                 highlights: mentionHighlights,
               }}
+              embedConfig={{
+                issueEmbedConfig: {
+                  issues,
+                  fetchIssue,
+                  clickAction: issueWidgetClickAction,
+                },
+              }}
             />
           )}
         </div>

web/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx

@@ -4,7 +4,7 @@ import { useRouter } from "next/router";
 import { useForm } from "react-hook-form";
 import useSWR from "swr";
 // document-editor
-// import { EditorRefApi, useEditorMarkings } from "@plane/document-editor";
+import { EditorRefApi, useEditorMarkings } from "@plane/document-editor";
 // types
 import { TPage } from "@plane/types";
 // ui