π₯π₯π₯ 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
[WEB-2293] refactor: version editor (#5454)
Aaryan Khandelwalde273dd618d8
diff --git a/web/ce/components/pages/index.ts b/web/ce/components/pages/index.tsindex 715386d0d0..6f3d30c9a9 100644--- a/web/ce/components/pages/index.ts+++ b/web/ce/components/pages/index.ts@@ -1,3 +1,2 @@export * from "./editor";-export * from "./version";export * from "./extra-actions";diff --git a/web/ce/components/pages/version/index.ts b/web/ce/components/pages/version/index.tsdeleted file mode 100644index 8b1fd904bb..0000000000--- a/web/ce/components/pages/version/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./editor";diff --git a/web/core/components/pages/editor/page-root.tsx b/web/core/components/pages/editor/page-root.tsxindex 45ca62e3df..37acdd5b0c 100644--- a/web/core/components/pages/editor/page-root.tsx+++ b/web/core/components/pages/editor/page-root.tsx@@ -8,7 +8,7 @@ import { TPage } from "@plane/types";// plane uiimport { setToast, TOAST_TYPE } from "@plane/ui";// components-import { PageEditorHeaderRoot, PageEditorBody, PageVersionsOverlay } from "@/components/pages";+import { PageEditorHeaderRoot, PageEditorBody, PageVersionsOverlay, PagesVersionEditor } from "@/components/pages";// hooksimport { useProjectPages } from "@/hooks/store";import { useAppRouter } from "@/hooks/use-app-router";@@ -102,6 +102,7 @@ export const PageRoot = observer((props: TPageRootProps) => {<><PageVersionsOverlayactiveVersion={version}+ editorComponent={PagesVersionEditor}fetchAllVersions={async (pageId) => {if (!workspaceSlug || !projectId) return;return await projectPageVersionService.fetchAllVersions(diff --git a/web/ce/components/pages/version/editor.tsx b/web/core/components/pages/version/editor.tsxsimilarity index 100%rename from web/ce/components/pages/version/editor.tsxrename to web/core/components/pages/version/editor.tsxdiff --git a/web/core/components/pages/version/index.ts b/web/core/components/pages/version/index.tsindex f0570ebecd..8e04e4de9e 100644--- a/web/core/components/pages/version/index.ts+++ b/web/core/components/pages/version/index.ts@@ -1,3 +1,4 @@+export * from "./editor";export * from "./main-content";export * from "./root";export * from "./sidebar-list-item";diff --git a/web/core/components/pages/version/main-content.tsx b/web/core/components/pages/version/main-content.tsxindex f729556792..51cfc8aaef 100644--- a/web/core/components/pages/version/main-content.tsx+++ b/web/core/components/pages/version/main-content.tsx@@ -8,11 +8,15 @@ import { TPageVersion } from "@plane/types";import { Button, setToast, TOAST_TYPE } from "@plane/ui";// helpersimport { renderFormattedDate, renderFormattedTime } from "@/helpers/date-time.helper";-// plane web components-import { PagesVersionEditor } from "@/plane-web/components/pages";type Props = {activeVersion: string | null;+ editorComponent: React.FC<{+ activeVersion: string | null;+ isCurrentVersionActive: boolean;+ pageId: string;+ versionDetails: TPageVersion | undefined;+ }>;fetchVersionDetails: (pageId: string, versionId: string) => Promise<TPageVersion | undefined>;handleClose: () => void;handleRestore: (descriptionHTML: string) => Promise<void>;@@ -21,7 +25,8 @@ type Props = {};export const PageVersionsMainContent: React.FC<Props> = observer((props) => {- const { activeVersion, fetchVersionDetails, handleClose, handleRestore, pageId, restoreEnabled } = props;+ const { activeVersion, editorComponent, fetchVersionDetails, handleClose, handleRestore, pageId, restoreEnabled } =+ props;// statesconst [isRestoring, setIsRestoring] = useState(false);const [isRetrying, setIsRetrying] = useState(false);@@ -63,6 +68,8 @@ export const PageVersionsMainContent: React.FC<Props> = observer((props) => {setIsRetrying(false);};+ const VersionEditor = editorComponent;+return (<div className="flex-grow flex flex-col">{versionDetailsError ? (@@ -103,7 +110,7 @@ export const PageVersionsMainContent: React.FC<Props> = observer((props) => {)}</div><div className="pt-8 h-full overflow-y-scroll vertical-scrollbar scrollbar-sm">- <PagesVersionEditor+ <VersionEditoractiveVersion={activeVersion}isCurrentVersionActive={isCurrentVersionActive}pageId={pageId}diff --git a/web/core/components/pages/version/root.tsx b/web/core/components/pages/version/root.tsxindex 9cec13c2d7..06729d3d11 100644--- a/web/core/components/pages/version/root.tsx+++ b/web/core/components/pages/version/root.tsx@@ -8,6 +8,12 @@ import { cn } from "@/helpers/common.helper";type Props = {activeVersion: string | null;+ editorComponent: React.FC<{+ activeVersion: string | null;+ isCurrentVersionActive: boolean;+ pageId: string;+ versionDetails: TPageVersion | undefined;+ }>;fetchAllVersions: (pageId: string) => Promise<TPageVersion[] | undefined>;fetchVersionDetails: (pageId: string, versionId: string) => Promise<TPageVersion | undefined>;handleRestore: (descriptionHTML: string) => Promise<void>;@@ -20,6 +26,7 @@ type Props = {export const PageVersionsOverlay: React.FC<Props> = observer((props) => {const {activeVersion,+ editorComponent,fetchAllVersions,fetchVersionDetails,handleRestore,@@ -44,6 +51,7 @@ export const PageVersionsOverlay: React.FC<Props> = observer((props) => {><PageVersionsMainContentactiveVersion={activeVersion}+ editorComponent={editorComponent}fetchVersionDetails={fetchVersionDetails}handleClose={handleClose}handleRestore={handleRestore}diff --git a/yarn.lock b/yarn.lockindex c06e1c0233..d48e9c50dc 100644--- a/yarn.lock+++ b/yarn.lock@@ -4382,7 +4382,7 @@dependencies:"@types/react" "*"-"@types/react@*", "@types/react@^16.8.0 || ^17.0.0 || ^18.0.0", "@types/react@^18.2.42", "@types/react@^18.2.48":+"@types/react@*", "@types/[email protected]", "@types/react@^16.8.0 || ^17.0.0 || ^18.0.0", "@types/react@^18.2.42", "@types/react@^18.2.48":version "18.2.48"resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.48.tgz#11df5664642d0bd879c1f58bc1d37205b064e8f1"integrity sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==@@ -11951,6 +11951,7 @@ string-argv@~0.3.2:integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q=="string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:+ name string-width-cjsversion "4.2.3"resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==@@ -13322,6 +13323,7 @@ wordwrap@^1.0.0:integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:+ name wrap-ansi-cjsversion "7.0.0"resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==