chore: image node type spelling fix

* removed header links for project bread crumb inside project detail

* Add total issue count while syncing project to telemetry

---------

Co-authored-by: Satish Gandham <satish.iitg@gmail.com>

admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "admin",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "private": true,
   "scripts": {
     "dev": "turbo run develop",

apiserver/package.json

@@ -1,4 +1,4 @@
 {
   "name": "plane-api",
-  "version": "0.23.1"
+  "version": "0.24.0"
 }

apiserver/plane/api/views/project.py

@@ -258,9 +258,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                 ProjectSerializer(project).data, cls=DjangoJSONEncoder
             )
 
-            intake_view = request.data.get(
-                "inbox_view", request.data.get("intake_view", False)
-            )
+            intake_view = request.data.get("inbox_view", project.intake_view)
 
             if project.archived_at:
                 return Response(

apiserver/plane/app/views/project/base.py

@@ -384,11 +384,9 @@ class ProjectViewSet(BaseViewSet):
                 )
 
             workspace = Workspace.objects.get(slug=slug)
-            intake_view = request.data.get(
-                "inbox_view", request.data.get("intake_view", False)
-            )
 
             project = Project.objects.get(pk=pk)
+            intake_view = request.data.get("inbox_view", project.intake_view)
             current_instance = json.dumps(
                 ProjectSerializer(project).data, cls=DjangoJSONEncoder
             )

live/package.json

@@ -1,6 +1,6 @@
 {
   "name": "live",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "description": "",
   "main": "./src/server.ts",
   "private": true,

package.json

@@ -1,6 +1,6 @@
 {
   "repository": "https://github.com/makeplane/plane.git",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": [
@@ -22,7 +22,7 @@
   "devDependencies": {
     "prettier": "latest",
     "prettier-plugin-tailwindcss": "^0.5.4",
-    "turbo": "^2.3.2"
+    "turbo": "^2.3.3"
   },
   "packageManager": "yarn@1.22.22",
   "name": "plane"

packages/constants/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/constants",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "private": true,
   "main": "./index.ts"
 }

packages/editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/editor",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "description": "Core Editor that powers Plane",
   "private": true,
   "main": "./dist/index.mjs",

packages/editor/src/core/extensions/custom-image/components/image-block.tsx

@@ -1,7 +1,7 @@
 import React, { useRef, useState, useCallback, useLayoutEffect, useEffect } from "react";
 import { NodeSelection } from "@tiptap/pm/state";
 // extensions
-import { CustoBaseImageNodeViewProps, ImageToolbarRoot } from "@/extensions/custom-image";
+import { CustomBaseImageNodeViewProps, ImageToolbarRoot } from "@/extensions/custom-image";
 // helpers
 import { cn } from "@/helpers/common";
 
@@ -37,7 +37,7 @@ const ensurePixelString = <TDefault,>(value: Pixel | TDefault | number | undefin
   return value;
 };
 
-type CustomImageBlockProps = CustoBaseImageNodeViewProps & {
+type CustomImageBlockProps = CustomBaseImageNodeViewProps & {
   imageFromFileSystem: string;
   setFailedToLoadImage: (isError: boolean) => void;
   editorContainer: HTMLDivElement | null;

packages/editor/src/core/extensions/custom-image/components/image-node.tsx

@@ -3,7 +3,7 @@ import { Editor, NodeViewProps, NodeViewWrapper } from "@tiptap/react";
 // extensions
 import { CustomImageBlock, CustomImageUploader, ImageAttributes } from "@/extensions/custom-image";
 
-export type CustoBaseImageNodeViewProps = {
+export type CustomBaseImageNodeViewProps = {
   getPos: () => number;
   editor: Editor;
   node: NodeViewProps["node"] & {
@@ -13,7 +13,7 @@ export type CustoBaseImageNodeViewProps = {
   selected: boolean;
 };
 
-export type CustomImageNodeProps = NodeViewProps & CustoBaseImageNodeViewProps;
+export type CustomImageNodeProps = NodeViewProps & CustomBaseImageNodeViewProps;
 
 export const CustomImageNode = (props: CustomImageNodeProps) => {
   const { getPos, editor, node, updateAttributes, selected } = props;

packages/editor/src/core/extensions/custom-image/components/image-uploader.tsx

@@ -5,9 +5,9 @@ import { cn } from "@/helpers/common";
 // hooks
 import { useUploader, useDropZone, uploadFirstImageAndInsertRemaining } from "@/hooks/use-file-upload";
 // extensions
-import { CustoBaseImageNodeViewProps, getImageComponentImageFileMap } from "@/extensions/custom-image";
+import { CustomBaseImageNodeViewProps, getImageComponentImageFileMap } from "@/extensions/custom-image";
 
-type CustomImageUploaderProps = CustoBaseImageNodeViewProps & {
+type CustomImageUploaderProps = CustomBaseImageNodeViewProps & {
   maxFileSize: number;
   loadImageFromFileSystem: (file: string) => void;
   failedToLoadImage: boolean;

packages/eslint-config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@plane/eslint-config",
   "private": true,
-  "version": "0.23.1",
+  "version": "0.24.0",
   "files": [
     "library.js",
     "next.js",

packages/helpers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/helpers",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "description": "Helper functions shared across multiple apps internally",
   "private": true,
   "main": "./dist/index.js",

packages/tailwind-config-custom/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind-config-custom",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "description": "common tailwind configuration across monorepo",
   "main": "index.js",
   "private": true,

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/types",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "private": true,
   "types": "./src/index.d.ts",
   "main": "./src/index.d.ts"

packages/types/src/issues/issue.d.ts

@@ -95,6 +95,7 @@ export type TIssuesResponse = {
   total_pages: number;
   extra_stats: null;
   results: TIssueResponseResults;
+  total_results: number;
 };
 
 export type TBulkIssueProperties = Pick<

packages/types/src/pages.d.ts

@@ -49,7 +49,7 @@ export type TPageFilters = {
 
 export type TPageEmbedType = "mention" | "issue";
 
-export type TEditorVersion = {
+export type TPageVersion = {
   created_at: string;
   created_by: string;
   deleted_at: string | null;
@@ -59,6 +59,7 @@ export type TEditorVersion = {
   id: string;
   last_saved_at: string;
   owned_by: string;
+  page: string;
   updated_at: string;
   updated_by: string;
   workspace: string;

packages/typescript-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plane/typescript-config",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "private": true,
   "files": [
     "base.json",

packages/ui/package.json

@@ -2,7 +2,7 @@
   "name": "@plane/ui",
   "description": "UI components shared across multiple apps internally",
   "private": true,
-  "version": "0.23.1",
+  "version": "0.24.0",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

space/package.json

@@ -1,6 +1,6 @@
 {
   "name": "space",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "private": true,
   "scripts": {
     "dev": "turbo run develop",

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/header.tsx

@@ -46,7 +46,6 @@ export const ProjectArchivesHeader: FC<TProps> = observer((props: TProps) => {
               type="text"
               link={
                 <BreadcrumbLink
-                  href={`/${workspaceSlug}/projects`}
                   label={currentProjectDetails?.name ?? "Project"}
                   icon={
                     currentProjectDetails && (

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/issues/(detail)/header.tsx

@@ -38,7 +38,6 @@ export const ProjectArchivedIssueDetailsHeader = observer(() => {
             type="text"
             link={
               <BreadcrumbLink
-                href={`/${workspaceSlug}/projects`}
                 label={currentProjectDetails?.name ?? "Project"}
                 icon={
                   currentProjectDetails && (

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx

@@ -172,7 +172,6 @@ export const CycleIssuesHeader: React.FC = observer(() => {
                     <span className="hidden md:block">
                       <BreadcrumbLink
                         label={currentProjectDetails?.name ?? "Project"}
-                        href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/issues`}
                         icon={
                           currentProjectDetails && (
                             <span className="grid h-4 w-4 flex-shrink-0 place-items-center">

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/header.tsx

@@ -38,7 +38,6 @@ export const CyclesListHeader: FC = observer(() => {
             link={
               <BreadcrumbLink
                 label={currentProjectDetails?.name ?? "Project"}
-                href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/issues`}
                 icon={
                   currentProjectDetails && (
                     <span className="grid place-items-center flex-shrink-0 h-4 w-4">

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx

@@ -99,7 +99,6 @@ export const ProjectDraftIssueHeader: FC = observer(() => {
               type="text"
               link={
                 <BreadcrumbLink
-                  href={`/${workspaceSlug}/projects`}
                   label={currentProjectDetails?.name ?? "Project"}
                   icon={
                     currentProjectDetails && (

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(detail)/header.tsx

@@ -32,7 +32,6 @@ export const ProjectIssueDetailsHeader = observer(() => {
               type="text"
               link={
                 <BreadcrumbLink
-                  href={`/${workspaceSlug}/projects`}
                   label={currentProjectDetails?.name ?? "Project"}
                   icon={
                     currentProjectDetails && (

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsx

@@ -54,7 +54,6 @@ export const ProjectIssuesHeader = observer(() => {
               type="text"
               link={
                 <BreadcrumbLink
-                  href={`/${workspaceSlug}/projects`}
                   label={currentProjectDetails?.name ?? "Project"}
                   icon={
                     currentProjectDetails ? (

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx

@@ -171,7 +171,6 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
                   <span className="hidden md:block">
                     <BreadcrumbLink
                       label={currentProjectDetails?.name ?? "Project"}
-                      href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/issues`}
                       icon={
                         currentProjectDetails && (
                           <span className="grid h-4 w-4 flex-shrink-0 place-items-center">

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(list)/header.tsx

@@ -39,7 +39,6 @@ export const ModulesListHeader: React.FC = observer(() => {
               type="text"
               link={
                 <BreadcrumbLink
-                  href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/issues`}
                   label={currentProjectDetails?.name ?? "Project"}
                   icon={
                     currentProjectDetails && (

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/header.tsx

@@ -77,7 +77,6 @@ export const PageDetailsHeader = observer(() => {
                 <span>
                   <span className="hidden md:block">
                     <BreadcrumbLink
-                      href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/issues`}
                       label={currentProjectDetails?.name ?? "Project"}
                       icon={
                         currentProjectDetails && (

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/header.tsx

@@ -69,7 +69,6 @@ export const PagesListHeader = observer(() => {
               type="text"
               link={
                 <BreadcrumbLink
-                  href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/issues`}
                   label={currentProjectDetails?.name ?? "Project"}
                   icon={
                     currentProjectDetails && (

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/header.tsx

@@ -34,7 +34,6 @@ export const ProjectSettingHeader: FC = observer(() => {
                 type="text"
                 link={
                   <BreadcrumbLink
-                    href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/issues`}
                     label={currentProjectDetails?.name ?? "Project"}
                     icon={
                       currentProjectDetails && (

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx

@@ -144,7 +144,6 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
             type="text"
             link={
               <BreadcrumbLink
-                href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/issues`}
                 label={currentProjectDetails?.name ?? "Project"}
                 icon={
                   currentProjectDetails && (

web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx

@@ -27,7 +27,6 @@ export const ProjectViewsHeader = observer(() => {
               type="text"
               link={
                 <BreadcrumbLink
-                  href={`/${workspaceSlug}/projects/${currentProjectDetails?.id}/issues`}
                   label={currentProjectDetails?.name ?? "Project"}
                   icon={
                     currentProjectDetails && (

web/ce/components/projects/settings/intake/header.tsx

@@ -39,7 +39,6 @@ export const ProjectInboxHeader: FC = observer(() => {
               type="text"
               link={
                 <BreadcrumbLink
-                  href={`/${workspaceSlug}/projects`}
                   label={currentProjectDetails?.name ?? "Project"}
                   icon={
                     currentProjectDetails && (

web/core/components/editor/index.ts

@@ -1,4 +1,3 @@
 export * from "./lite-text-editor";
 export * from "./pdf";
 export * from "./rich-text-editor";
-export * from "./version-history";

web/core/components/editor/version-history/editors/index.ts

@@ -1,11 +0,0 @@
-import { TEditorVersion } from "@plane/types";
-
-export type TVersionEditorProps = {
-  activeVersion: string | null;
-  currentVersionDescription: string | null;
-  isCurrentVersionActive: boolean;
-  versionDetails: TEditorVersion | undefined;
-};
-
-export * from "./issue-version-editor";
-export * from "./page-version-editor";

web/core/components/editor/version-history/editors/issue-version-editor.tsx

@@ -1,70 +0,0 @@
-import { observer } from "mobx-react";
-import { useParams } from "next/navigation";
-// plane ui
-import { Loader } from "@plane/ui";
-// components
-import { RichTextReadOnlyEditor } from "@/components/editor";
-// local types
-import { TVersionEditorProps } from ".";
-
-export const IssueVersionEditor: React.FC<TVersionEditorProps> = observer((props) => {
-  const { activeVersion, currentVersionDescription, isCurrentVersionActive, versionDetails } = props;
-  // params
-  const { workspaceSlug, projectId } = useParams();
-
-  if (!isCurrentVersionActive && !versionDetails)
-    return (
-      <div className="size-full px-5">
-        <Loader className="relative space-y-4">
-          <Loader.Item width="50%" height="36px" />
-          <div className="space-y-2">
-            <div className="py-2">
-              <Loader.Item width="100%" height="36px" />
-            </div>
-            <Loader.Item width="80%" height="22px" />
-            <div className="relative flex items-center gap-2">
-              <Loader.Item width="30px" height="30px" />
-              <Loader.Item width="30%" height="22px" />
-            </div>
-            <div className="py-2">
-              <Loader.Item width="60%" height="36px" />
-            </div>
-            <Loader.Item width="70%" height="22px" />
-            <Loader.Item width="30%" height="22px" />
-            <div className="relative flex items-center gap-2">
-              <Loader.Item width="30px" height="30px" />
-              <Loader.Item width="30%" height="22px" />
-            </div>
-            <div className="py-2">
-              <Loader.Item width="50%" height="30px" />
-            </div>
-            <Loader.Item width="100%" height="22px" />
-            <div className="py-2">
-              <Loader.Item width="30%" height="30px" />
-            </div>
-            <Loader.Item width="30%" height="22px" />
-            <div className="relative flex items-center gap-2">
-              <div className="py-2">
-                <Loader.Item width="30px" height="30px" />
-              </div>
-              <Loader.Item width="30%" height="22px" />
-            </div>
-          </div>
-        </Loader>
-      </div>
-    );
-
-  const description = isCurrentVersionActive ? currentVersionDescription : versionDetails?.description_html;
-  if (description === undefined || description?.trim() === "") return null;
-
-  return (
-    <RichTextReadOnlyEditor
-      id={activeVersion ?? ""}
-      initialValue={description ?? "<p></p>"}
-      containerClassName="p-0 pb-64 border-none"
-      editorClassName="pl-10"
-      workspaceSlug={workspaceSlug?.toString() ?? ""}
-      projectId={projectId?.toString() ?? ""}
-    />
-  );
-});

web/core/components/issues/issue-detail/index.ts

@@ -4,7 +4,6 @@ export * from "./links";
 export * from "./parent";
 export * from "./reactions";
 export * from "./cycle-select";
-export * from "./issue-detail-quick-actions";
 export * from "./main-content";
 export * from "./module-select";
 export * from "./parent-select";
@@ -12,4 +11,4 @@ export * from "./relation-select";
 export * from "./root";
 export * from "./sidebar";
 export * from "./subscription";
-export * from "./version-history";
+export * from "./issue-detail-quick-actions";

web/core/components/issues/issue-detail/root.tsx

@@ -175,7 +175,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
             },
             path: pathname,
           });
-        } catch {
+        } catch (error) {
           setToast({
             type: TOAST_TYPE.ERROR,
             title: "Error!",
@@ -204,7 +204,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
             },
             path: pathname,
           });
-        } catch {
+        } catch (error) {
           setToast({
             type: TOAST_TYPE.ERROR,
             title: "Error!",
@@ -245,7 +245,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
             },
             path: pathname,
           });
-        } catch {
+        } catch (error) {
           captureIssueEvent({
             eventName: ISSUE_UPDATED,
             payload: { state: "FAILED", element: "Issue detail page" },
@@ -281,7 +281,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
             },
             path: pathname,
           });
-        } catch {
+        } catch (error) {
           captureIssueEvent({
             eventName: ISSUE_UPDATED,
             payload: { id: issueId, state: "FAILED", element: "Issue detail page" },
@@ -373,6 +373,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
           </div>
         </div>
       )}
+
       {/* peek overview */}
       <IssuePeekOverview />
     </>

web/core/components/issues/issue-detail/version-history.tsx

@@ -1,82 +0,0 @@
-"use client";
-
-import { useEffect, useState } from "react";
-import { useParams, useRouter, useSearchParams } from "next/navigation";
-// plane editor
-import { EditorReadOnlyRefApi, EditorRefApi } from "@plane/editor";
-// components
-import { EditorVersionHistoryOverlay, IssueVersionEditor } from "@/components/editor";
-// hooks
-import { useQueryParams } from "@/hooks/use-query-params";
-// services
-import { IssueVersionService } from "@/services/issue";
-const issueVersionService = new IssueVersionService();
-
-type Props = {
-  disabled: boolean;
-  editorRef: EditorRefApi;
-  issueId: string;
-  readOnlyEditorRef: EditorReadOnlyRefApi;
-};
-
-export const IssueVersionHistory: React.FC<Props> = (props) => {
-  const { disabled, editorRef, issueId, readOnlyEditorRef } = props;
-  // states
-  const [isVersionsOverlayOpen, setIsVersionsOverlayOpen] = useState(false);
-  // search params
-  const searchParams = useSearchParams();
-  // params
-  const { projectId, workspaceSlug } = useParams();
-  // router
-  const router = useRouter();
-  // update query params
-  const { updateQueryParams } = useQueryParams();
-
-  const version = searchParams.get("version");
-  useEffect(() => {
-    if (!version) {
-      setIsVersionsOverlayOpen(false);
-      return;
-    }
-    setIsVersionsOverlayOpen(true);
-  }, [version]);
-
-  const handleCloseVersionsOverlay = () => {
-    const updatedRoute = updateQueryParams({
-      paramsToRemove: ["version"],
-    });
-    router.push(updatedRoute);
-  };
-
-  const handleRestoreVersion = async (descriptionHTML: string) => {
-    editorRef?.clearEditor();
-    editorRef?.setEditorValue(descriptionHTML);
-  };
-  const currentVersionDescription = disabled ? readOnlyEditorRef?.getDocument().html : editorRef?.getDocument().html;
-
-  return (
-    <EditorVersionHistoryOverlay
-      activeVersion={version}
-      currentVersionDescription={currentVersionDescription ?? null}
-      editorComponent={IssueVersionEditor}
-      entityId={issueId}
-      fetchAllVersions={async (issueId) => {
-        if (!workspaceSlug || !projectId) return;
-        return await issueVersionService.fetchAllVersions(workspaceSlug.toString(), projectId.toString(), issueId);
-      }}
-      fetchVersionDetails={async (issueId, versionId) => {
-        if (!workspaceSlug || !projectId) return;
-        return await issueVersionService.fetchVersionById(
-          workspaceSlug.toString(),
-          projectId.toString(),
-          issueId,
-          versionId
-        );
-      }}
-      handleRestore={handleRestoreVersion}
-      isOpen={isVersionsOverlayOpen}
-      onClose={handleCloseVersionsOverlay}
-      restoreEnabled={!disabled}
-    />
-  );
-};

web/core/components/pages/editor/page-root.tsx

@@ -8,8 +8,7 @@ import { TPage } from "@plane/types";
 // ui
 import { setToast, TOAST_TYPE } from "@plane/ui";
 // components
-import { EditorVersionHistoryOverlay, PageVersionEditor } from "@/components/editor";
-import { PageEditorHeaderRoot, PageEditorBody } from "@/components/pages";
+import { PageEditorHeaderRoot, PageEditorBody, PageVersionsOverlay, PagesVersionEditor } from "@/components/pages";
 // hooks
 import { useProjectPages } from "@/hooks/store";
 import { useAppRouter } from "@/hooks/use-app-router";
@@ -106,11 +105,10 @@ export const PageRoot = observer((props: TPageRootProps) => {
 
   return (
     <>
-      <EditorVersionHistoryOverlay
+      <PageVersionsOverlay
         activeVersion={version}
         currentVersionDescription={currentVersionDescription ?? null}
-        editorComponent={PageVersionEditor}
-        entityId={page.id ?? ""}
+        editorComponent={PagesVersionEditor}
         fetchAllVersions={async (pageId) => {
           if (!workspaceSlug || !projectId) return;
           return await projectPageVersionService.fetchAllVersions(
@@ -131,6 +129,7 @@ export const PageRoot = observer((props: TPageRootProps) => {
         handleRestore={handleRestoreVersion}
         isOpen={isVersionsOverlayOpen}
         onClose={handleCloseVersionsOverlay}
+        pageId={page.id ?? ""}
         restoreEnabled={isContentEditable}
       />
       <PageEditorHeaderRoot

web/core/components/pages/version/editor.tsx

@@ -1,21 +1,27 @@
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // plane editor
-import { DocumentReadOnlyEditorWithRef } from "@plane/editor";
+import { DocumentReadOnlyEditorWithRef, TDisplayConfig } from "@plane/editor";
 // plane types
-import { IUserLite } from "@plane/types";
+import { IUserLite, TPageVersion } from "@plane/types";
 // plane ui
 import { Loader } from "@plane/ui";
 // helpers
 import { getReadOnlyEditorFileHandlers } from "@/helpers/editor.helper";
 // hooks
 import { useMember, useMention, useUser } from "@/hooks/store";
+import { usePageFilters } from "@/hooks/use-page-filters";
 // plane web hooks
 import { useIssueEmbed } from "@/plane-web/hooks/use-issue-embed";
-// local types
-import { TVersionEditorProps } from ".";
 
-export const PageVersionEditor: React.FC<TVersionEditorProps> = observer((props) => {
+export type TVersionEditorProps = {
+  activeVersion: string | null;
+  currentVersionDescription: string | null;
+  isCurrentVersionActive: boolean;
+  versionDetails: TPageVersion | undefined;
+};
+
+export const PagesVersionEditor: React.FC<TVersionEditorProps> = observer((props) => {
   const { activeVersion, currentVersionDescription, isCurrentVersionActive, versionDetails } = props;
   // params
   const { workspaceSlug, projectId } = useParams();
@@ -37,6 +43,13 @@ export const PageVersionEditor: React.FC<TVersionEditorProps> = observer((props)
     members: projectMemberDetails,
     user: currentUser ?? undefined,
   });
+  // page filters
+  const { fontSize, fontStyle } = usePageFilters();
+
+  const displayConfig: TDisplayConfig = {
+    fontSize,
+    fontStyle,
+  };
 
   if (!isCurrentVersionActive && !versionDetails)
     return (
@@ -88,6 +101,7 @@ export const PageVersionEditor: React.FC<TVersionEditorProps> = observer((props)
       id={activeVersion ?? ""}
       initialValue={description ?? "<p></p>"}
       containerClassName="p-0 pb-64 border-none"
+      displayConfig={displayConfig}
       editorClassName="pl-10"
       fileHandler={getReadOnlyEditorFileHandlers({
         projectId: projectId?.toString() ?? "",

web/core/components/pages/version/index.ts

@@ -1,4 +1,4 @@
-export * from "./editors";
+export * from "./editor";
 export * from "./main-content";
 export * from "./root";
 export * from "./sidebar-list-item";

web/core/components/pages/version/main-content.tsx

@@ -3,34 +3,34 @@ import { observer } from "mobx-react";
 import useSWR from "swr";
 import { TriangleAlert } from "lucide-react";
 // plane types
-import { TEditorVersion } from "@plane/types";
+import { TPageVersion } from "@plane/types";
 // plane ui
 import { Button, setToast, TOAST_TYPE } from "@plane/ui";
+// components
+import { TVersionEditorProps } from "@/components/pages";
 // helpers
 import { renderFormattedDate, renderFormattedTime } from "@/helpers/date-time.helper";
-// local types
-import { TVersionEditorProps } from ".";
 
 type Props = {
   activeVersion: string | null;
   currentVersionDescription: string | null;
   editorComponent: React.FC<TVersionEditorProps>;
-  entityId: string;
-  fetchVersionDetails: (entityId: string, versionId: string) => Promise<TEditorVersion | undefined>;
+  fetchVersionDetails: (pageId: string, versionId: string) => Promise<TPageVersion | undefined>;
   handleClose: () => void;
   handleRestore: (descriptionHTML: string) => Promise<void>;
+  pageId: string;
   restoreEnabled: boolean;
 };
 
-export const EditorVersionHistoryMainContent: React.FC<Props> = observer((props) => {
+export const PageVersionsMainContent: React.FC<Props> = observer((props) => {
   const {
     activeVersion,
     currentVersionDescription,
     editorComponent,
-    entityId,
     fetchVersionDetails,
     handleClose,
     handleRestore,
+    pageId,
     restoreEnabled,
   } = props;
   // states
@@ -42,8 +42,8 @@ export const EditorVersionHistoryMainContent: React.FC<Props> = observer((props)
     error: versionDetailsError,
     mutate: mutateVersionDetails,
   } = useSWR(
-    entityId && activeVersion && activeVersion !== "current" ? `EDITOR_VERSION_${activeVersion}` : null,
-    entityId && activeVersion && activeVersion !== "current" ? () => fetchVersionDetails(entityId, activeVersion) : null
+    pageId && activeVersion && activeVersion !== "current" ? `PAGE_VERSION_${activeVersion}` : null,
+    pageId && activeVersion && activeVersion !== "current" ? () => fetchVersionDetails(pageId, activeVersion) : null
   );
 
   const isCurrentVersionActive = activeVersion === "current";
@@ -55,14 +55,14 @@ export const EditorVersionHistoryMainContent: React.FC<Props> = observer((props)
       .then(() => {
         setToast({
           type: TOAST_TYPE.SUCCESS,
-          title: "Version restored.",
+          title: "Page version restored.",
         });
         handleClose();
       })
       .catch(() =>
         setToast({
           type: TOAST_TYPE.ERROR,
-          title: "Failed to restore version.",
+          title: "Failed to restore page version.",
         })
       )
       .finally(() => setIsRestoring(false));

web/core/components/pages/version/root.tsx

@@ -1,35 +1,35 @@
 import { observer } from "mobx-react";
 // plane types
-import { TEditorVersion } from "@plane/types";
+import { TPageVersion } from "@plane/types";
+// components
+import { PageVersionsMainContent, PageVersionsSidebarRoot, TVersionEditorProps } from "@/components/pages";
 // helpers
 import { cn } from "@/helpers/common.helper";
-// local components
-import { EditorVersionHistoryMainContent, EditorVersionHistorySidebarRoot, TVersionEditorProps } from ".";
 
 type Props = {
   activeVersion: string | null;
   currentVersionDescription: string | null;
   editorComponent: React.FC<TVersionEditorProps>;
-  entityId: string;
-  fetchAllVersions: (entityId: string) => Promise<TEditorVersion[] | undefined>;
-  fetchVersionDetails: (entityId: string, versionId: string) => Promise<TEditorVersion | undefined>;
+  fetchAllVersions: (pageId: string) => Promise<TPageVersion[] | undefined>;
+  fetchVersionDetails: (pageId: string, versionId: string) => Promise<TPageVersion | undefined>;
   handleRestore: (descriptionHTML: string) => Promise<void>;
   isOpen: boolean;
   onClose: () => void;
+  pageId: string;
   restoreEnabled: boolean;
 };
 
-export const EditorVersionHistoryOverlay: React.FC<Props> = observer((props) => {
+export const PageVersionsOverlay: React.FC<Props> = observer((props) => {
   const {
     activeVersion,
     currentVersionDescription,
     editorComponent,
-    entityId,
     fetchAllVersions,
     fetchVersionDetails,
     handleRestore,
     isOpen,
     onClose,
+    pageId,
     restoreEnabled,
   } = props;
 
@@ -46,22 +46,22 @@ export const EditorVersionHistoryOverlay: React.FC<Props> = observer((props) =>
         }
       )}
     >
-      <EditorVersionHistoryMainContent
+      <PageVersionsMainContent
         activeVersion={activeVersion}
         currentVersionDescription={currentVersionDescription}
         editorComponent={editorComponent}
-        entityId={entityId}
         fetchVersionDetails={fetchVersionDetails}
         handleClose={handleClose}
         handleRestore={handleRestore}
+        pageId={pageId}
         restoreEnabled={restoreEnabled}
       />
-      <EditorVersionHistorySidebarRoot
+      <PageVersionsSidebarRoot
         activeVersion={activeVersion}
-        entityId={entityId}
         fetchAllVersions={fetchAllVersions}
         handleClose={handleClose}
         isOpen={isOpen}
+        pageId={pageId}
       />
     </div>
   );

web/core/components/pages/version/sidebar-list-item.tsx

@@ -1,7 +1,7 @@
 import { observer } from "mobx-react";
 import Link from "next/link";
 // plane types
-import { TEditorVersion } from "@plane/types";
+import { TPageVersion } from "@plane/types";
 // plane ui
 import { Avatar } from "@plane/ui";
 // helpers
@@ -14,10 +14,10 @@ import { useMember } from "@/hooks/store";
 type Props = {
   href: string;
   isActive: boolean;
-  version: TEditorVersion;
+  version: TPageVersion;
 };
 
-export const EditorVersionHistorySidebarListItem: React.FC<Props> = observer((props) => {
+export const PlaneVersionsSidebarListItem: React.FC<Props> = observer((props) => {
   const { href, isActive, version } = props;
   // store hooks
   const { getUserDetails } = useMember();

web/core/components/pages/version/sidebar-list.tsx

@@ -3,25 +3,25 @@ import Link from "next/link";
 import useSWR from "swr";
 import { TriangleAlert } from "lucide-react";
 // plane types
-import { TEditorVersion } from "@plane/types";
+import { TPageVersion } from "@plane/types";
 // plane ui
 import { Button, Loader } from "@plane/ui";
+// components
+import { PlaneVersionsSidebarListItem } from "@/components/pages";
 // helpers
 import { cn } from "@/helpers/common.helper";
 // hooks
 import { useQueryParams } from "@/hooks/use-query-params";
-// local components
-import { EditorVersionHistorySidebarListItem } from ".";
 
 type Props = {
   activeVersion: string | null;
-  entityId: string;
-  fetchAllVersions: (entityId: string) => Promise<TEditorVersion[] | undefined>;
+  fetchAllVersions: (pageId: string) => Promise<TPageVersion[] | undefined>;
   isOpen: boolean;
+  pageId: string;
 };
 
-export const EditorVersionHistorySidebarList: React.FC<Props> = (props) => {
-  const { activeVersion, entityId, fetchAllVersions, isOpen } = props;
+export const PageVersionsSidebarList: React.FC<Props> = (props) => {
+  const { activeVersion, fetchAllVersions, isOpen, pageId } = props;
   // states
   const [isRetrying, setIsRetrying] = useState(false);
   // update query params
@@ -32,8 +32,8 @@ export const EditorVersionHistorySidebarList: React.FC<Props> = (props) => {
     error: versionsListError,
     mutate: mutateVersionsList,
   } = useSWR(
-    entityId && isOpen ? `EDITOR_VERSIONS_LIST_${entityId}` : null,
-    entityId && isOpen ? () => fetchAllVersions(entityId) : null
+    pageId && isOpen ? `PAGE_VERSIONS_LIST_${pageId}` : null,
+    pageId && isOpen ? () => fetchAllVersions(pageId) : null
   );
 
   const handleRetry = async () => {
@@ -78,7 +78,7 @@ export const EditorVersionHistorySidebarList: React.FC<Props> = (props) => {
         </div>
       ) : versionsList ? (
         versionsList.map((version) => (
-          <EditorVersionHistorySidebarListItem
+          <PlaneVersionsSidebarListItem
             key={version.id}
             href={getVersionLink(version.id)}
             isActive={activeVersion === version.id}

web/core/components/pages/version/sidebar-root.tsx

@@ -1,19 +1,19 @@
 import { X } from "lucide-react";
 // plane types
-import { TEditorVersion } from "@plane/types";
-// local components
-import { EditorVersionHistorySidebarList } from ".";
+import { TPageVersion } from "@plane/types";
+// components
+import { PageVersionsSidebarList } from "@/components/pages";
 
 type Props = {
   activeVersion: string | null;
-  entityId: string;
-  fetchAllVersions: (entityId: string) => Promise<TEditorVersion[] | undefined>;
+  fetchAllVersions: (pageId: string) => Promise<TPageVersion[] | undefined>;
   handleClose: () => void;
   isOpen: boolean;
+  pageId: string;
 };
 
-export const EditorVersionHistorySidebarRoot: React.FC<Props> = (props) => {
-  const { activeVersion, entityId, fetchAllVersions, handleClose, isOpen } = props;
+export const PageVersionsSidebarRoot: React.FC<Props> = (props) => {
+  const { activeVersion, fetchAllVersions, handleClose, isOpen, pageId } = props;
 
   return (
     <div className="flex-shrink-0 py-4 border-l border-custom-border-200 flex flex-col">
@@ -27,11 +27,11 @@ export const EditorVersionHistorySidebarRoot: React.FC<Props> = (props) => {
           <X className="size-4" />
         </button>
       </div>
-      <EditorVersionHistorySidebarList
+      <PageVersionsSidebarList
         activeVersion={activeVersion}
-        entityId={entityId}
         fetchAllVersions={fetchAllVersions}
         isOpen={isOpen}
+        pageId={pageId}
       />
     </div>
   );

web/core/local-db/storage.sqlite.ts

@@ -251,7 +251,7 @@ export class Storage {
 
     activeSpan?.setAttributes({
       projectId: projectId,
-      count: response.total_count,
+      count: response?.total_results,
     });
   };
 

web/core/services/issue/index.ts

@@ -7,5 +7,4 @@ export * from "./issue_attachment.service";
 export * from "./issue_activity.service";
 export * from "./issue_comment.service";
 export * from "./issue_relation.service";
-export * from "./issue_version.service";
 export * from "./workspace_draft.service";

web/core/services/issue/issue_version.service.ts

@@ -1,33 +0,0 @@
-// plane types
-import { TEditorVersion } from "@plane/types";
-// helpers
-import { API_BASE_URL } from "@/helpers/common.helper";
-// services
-import { APIService } from "@/services/api.service";
-
-export class IssueVersionService extends APIService {
-  constructor() {
-    super(API_BASE_URL);
-  }
-
-  async fetchAllVersions(workspaceSlug: string, projectId: string, issueId: string): Promise<TEditorVersion[]> {
-    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/versions/`)
-      .then((response) => response?.data)
-      .catch((error) => {
-        throw error?.response?.data;
-      });
-  }
-
-  async fetchVersionById(
-    workspaceSlug: string,
-    projectId: string,
-    issueId: string,
-    versionId: string
-  ): Promise<TEditorVersion> {
-    return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/issues/${issueId}/versions/${versionId}/`)
-      .then((response) => response?.data)
-      .catch((error) => {
-        throw error?.response?.data;
-      });
-  }
-}

web/core/services/page/project-page-version.service.ts

@@ -1,5 +1,5 @@
 // plane types
-import { TEditorVersion } from "@plane/types";
+import { TPageVersion } from "@plane/types";
 // helpers
 import { API_BASE_URL } from "@/helpers/common.helper";
 // services
@@ -10,7 +10,7 @@ export class ProjectPageVersionService extends APIService {
     super(API_BASE_URL);
   }
 
-  async fetchAllVersions(workspaceSlug: string, projectId: string, pageId: string): Promise<TEditorVersion[]> {
+  async fetchAllVersions(workspaceSlug: string, projectId: string, pageId: string): Promise<TPageVersion[]> {
     return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/pages/${pageId}/versions/`)
       .then((response) => response?.data)
       .catch((error) => {
@@ -23,7 +23,7 @@ export class ProjectPageVersionService extends APIService {
     projectId: string,
     pageId: string,
     versionId: string
-  ): Promise<TEditorVersion> {
+  ): Promise<TPageVersion> {
     return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/pages/${pageId}/versions/${versionId}/`)
       .then((response) => response?.data)
       .catch((error) => {

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "private": true,
   "scripts": {
     "dev": "turbo run develop",

yarn.lock

@@ -11952,47 +11952,47 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-turbo-darwin-64@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-2.3.2.tgz#e257f6b7911718b1d45b7fa129506b58e38daf62"
-  integrity sha512-B1lS/UqjXNsG+kx1uzJNwXMuw2i5wavcyNy8opvSLjfuECdsqQU9B1wPqkSTU+mZjFTJcEfiGKyJ/I2EVk8vdw==
+turbo-darwin-64@2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-2.3.3.tgz#875975cddf7abdb52b28e9cab234fc73ca001e80"
+  integrity sha512-bxX82xe6du/3rPmm4aCC5RdEilIN99VUld4HkFQuw+mvFg6darNBuQxyWSHZTtc25XgYjQrjsV05888w1grpaA==
 
-turbo-darwin-arm64@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-2.3.2.tgz#96e09af5c710a62196cd313bca83dbbfab84f50f"
-  integrity sha512-XHeuEdk9tHaw2Bsr3rTzFtZyldeSyagDZkOSPIJ1zioavMjWEFPA75vdgy4j8ns96EBpZMaPXVEnODuEHfiZfQ==
+turbo-darwin-arm64@2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-2.3.3.tgz#5e85d6dadac6560782bb91081fee56f9cfcd103e"
+  integrity sha512-DYbQwa3NsAuWkCUYVzfOUBbSUBVQzH5HWUFy2Kgi3fGjIWVZOFk86ss+xsWu//rlEAfYwEmopigsPYSmW4X15A==
 
-turbo-linux-64@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-2.3.2.tgz#7508f591c6874fdd6fab54658f55489363c20b0a"
-  integrity sha512-oKDsO5+flqpPx5tNLFGVUYpJ/sBc3KvaGpyNzXl2u3epzyafgblFKWMG5YsSiU1ruouPpcC6YG5SN5chA7Abfg==
+turbo-linux-64@2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-2.3.3.tgz#634f2053cff6ff056bec7f307c2fb4dd9a2bc86f"
+  integrity sha512-eHj9OIB0dFaP6BxB88jSuaCLsOQSYWBgmhy2ErCu6D2GG6xW3b6e2UWHl/1Ho9FsTg4uVgo4DB9wGsKa5erjUA==
 
-turbo-linux-arm64@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-2.3.2.tgz#15109394c077374fbe7657129c08b75ea5008c1c"
-  integrity sha512-luyvTl3wQ1hF+ljK7ljH4TL7rg4pmx5pQ2mzvfMvPo5eaLuKr/tImmbdH6/vr56iffUIISkIsLVhVxgZeAsUOw==
+turbo-linux-arm64@2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-2.3.3.tgz#284e26825f5d692bffb5b126a9aeccaae6a4533b"
+  integrity sha512-NmDE/NjZoDj1UWBhMtOPmqFLEBKhzGS61KObfrDEbXvU3lekwHeoPvAMfcovzswzch+kN2DrtbNIlz+/rp8OCg==
 
-turbo-windows-64@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-2.3.2.tgz#c15d3aa097b7396432360103b9e74991e3bb6cee"
-  integrity sha512-yw7BnTU5cE7GdUnZEW3jIAI98hh4dcWk+Jwza8X7CXpxpill2zteq7VPf+a/B3o/xm+oVXzLmP83YP91Bm0SaA==
+turbo-windows-64@2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-2.3.3.tgz#2900ac2c00d9609bc480d90564a98ca1cc7f4b17"
+  integrity sha512-O2+BS4QqjK3dOERscXqv7N2GXNcqHr9hXumkMxDj/oGx9oCatIwnnwx34UmzodloSnJpgSqjl8iRWiY65SmYoQ==
 
-turbo-windows-arm64@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-2.3.2.tgz#9c03ea846d706f9cf92e50ade43f8f67adf7d744"
-  integrity sha512-Hgp6V7jaIYlDcy5xpKN+XXyYCf5afT690GmXcEsMoUawd5dStvZe0QHWcGxuqho497BAlx0XGAWftm0KelNePA==
+turbo-windows-arm64@2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-2.3.3.tgz#395508cdf6b351d7dd324fb0b318c1b2cf1d66dd"
+  integrity sha512-dW4ZK1r6XLPNYLIKjC4o87HxYidtRRcBeo/hZ9Wng2XM/MqqYkAyzJXJGgRMsc0MMEN9z4+ZIfnSNBrA0b08ag==
 
-turbo@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/turbo/-/turbo-2.3.2.tgz#e914e7942b948f020e7629052b759d7936b9838c"
-  integrity sha512-vCJPoy8/3KkqY3W0cX2nrwhmtBQSZhEyrVgeJ4NlEXwGxu5vNRQDyV6se5VVAQMwfBsBJswlo87B7ai7Dr1MpQ==
+turbo@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/turbo/-/turbo-2.3.3.tgz#70736263c75f7c0c501278214dee49859e1c7fcd"
+  integrity sha512-DUHWQAcC8BTiUZDRzAYGvpSpGLiaOQPfYXlCieQbwUvmml/LRGIe3raKdrOPOoiX0DYlzxs2nH6BoWJoZrj8hA==
   optionalDependencies:
-    turbo-darwin-64 "2.3.2"
-    turbo-darwin-arm64 "2.3.2"
-    turbo-linux-64 "2.3.2"
-    turbo-linux-arm64 "2.3.2"
-    turbo-windows-64 "2.3.2"
-    turbo-windows-arm64 "2.3.2"
+    turbo-darwin-64 "2.3.3"
+    turbo-darwin-arm64 "2.3.3"
+    turbo-linux-64 "2.3.3"
+    turbo-linux-arm64 "2.3.3"
+    turbo-windows-64 "2.3.3"
+    turbo-windows-arm64 "2.3.3"
 
 tween-functions@^1.2.0:
   version "1.2.0"