π₯π₯π₯ 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
[WIKI-519] regression: page creator and version info #7341
Aaryan Khandelwalb909416c748e
diff --git a/apps/web/core/components/pages/navigation-pane/tab-panels/info/actors-info.tsx b/apps/web/core/components/pages/navigation-pane/tab-panels/info/actors-info.tsxindex d4c166ddff..d0bd1b907b 100644--- a/apps/web/core/components/pages/navigation-pane/tab-panels/info/actors-info.tsx+++ b/apps/web/core/components/pages/navigation-pane/tab-panels/info/actors-info.tsx@@ -21,9 +21,9 @@ export const PageNavigationPaneInfoTabActorsInfo: React.FC<Props> = observer((pr// store hooksconst { getUserDetails } = useMember();// derived values- const { created_by, updated_by } = page;+ const { owned_by, updated_by } = page;const editorInformation = updated_by ? getUserDetails(updated_by) : undefined;- const creatorInformation = created_by ? getUserDetails(created_by) : undefined;+ const creatorInformation = owned_by ? getUserDetails(owned_by) : undefined;// translationconst { t } = useTranslation();diff --git a/apps/web/core/components/pages/navigation-pane/tab-panels/info/version-history.tsx b/apps/web/core/components/pages/navigation-pane/tab-panels/info/version-history.tsxindex 31069299f3..d1454b12c0 100644--- a/apps/web/core/components/pages/navigation-pane/tab-panels/info/version-history.tsx+++ b/apps/web/core/components/pages/navigation-pane/tab-panels/info/version-history.tsx@@ -34,7 +34,7 @@ const VersionHistoryItem = observer((props: VersionHistoryItemProps) => {// store hooksconst { getUserDetails } = useMember();// derived values- const versionCreator = getUserDetails(version.created_by);+ const versionCreator = getUserDetails(version.owned_by);// translationconst { t } = useTranslation();diff --git a/packages/editor/src/core/components/editors/document/collaborative-editor.tsx b/packages/editor/src/core/components/editors/document/collaborative-editor.tsxindex e20ac3f5f9..daaa561773 100644--- a/packages/editor/src/core/components/editors/document/collaborative-editor.tsx+++ b/packages/editor/src/core/components/editors/document/collaborative-editor.tsx@@ -3,7 +3,7 @@ import React from "react";// plane importsimport { cn } from "@plane/utils";// components-import { DocumentContentLoader, PageRenderer } from "@/components/editors";+import { PageRenderer } from "@/components/editors";// constantsimport { DEFAULT_DISPLAY_CONFIG } from "@/constants/config";// extensions@@ -82,12 +82,6 @@ const CollaborativeDocumentEditor: React.FC<ICollaborativeDocumentEditorProps> =if (!editor) return null;- const blockWidthClassName = cn("w-full max-w-[720px] mx-auto transition-all duration-200 ease-in-out", {- "max-w-[1152px]": displayConfig.wideLayout,- });-- if (!hasServerSynced && !hasServerConnectionFailed) return <DocumentContentLoader className={blockWidthClassName} />;-return (<PageRendereraiHandler={aiHandler}@@ -96,6 +90,7 @@ const CollaborativeDocumentEditor: React.FC<ICollaborativeDocumentEditorProps> =editor={editor}editorContainerClassName={cn(editorContainerClassNames, "document-editor")}id={id}+ isLoading={!hasServerSynced && !hasServerConnectionFailed}tabIndex={tabIndex}/>);diff --git a/packages/editor/src/core/components/editors/document/page-renderer.tsx b/packages/editor/src/core/components/editors/document/page-renderer.tsxindex 62613b0a13..1316d2d724 100644--- a/packages/editor/src/core/components/editors/document/page-renderer.tsx+++ b/packages/editor/src/core/components/editors/document/page-renderer.tsx@@ -1,6 +1,8 @@import { Editor } from "@tiptap/react";+// plane imports+import { cn } from "@plane/utils";// components-import { EditorContainer, EditorContentWrapper } from "@/components/editors";+import { DocumentContentLoader, EditorContainer, EditorContentWrapper } from "@/components/editors";import { AIFeaturesMenu, BlockMenu, EditorBubbleMenu } from "@/components/menus";// typesimport { TAIHandler, TDisplayConfig } from "@/types";@@ -12,29 +14,39 @@ type Props = {editor: Editor;editorContainerClassName: string;id: string;+ isLoading?: boolean;tabIndex?: number;};export const PageRenderer = (props: Props) => {- const { aiHandler, bubbleMenuEnabled, displayConfig, editor, editorContainerClassName, id, tabIndex } = props;+ const { aiHandler, bubbleMenuEnabled, displayConfig, editor, editorContainerClassName, id, isLoading, tabIndex } =+ props;return (- <div className="frame-renderer flex-grow w-full">- <EditorContainer- displayConfig={displayConfig}- editor={editor}- editorContainerClassName={editorContainerClassName}- id={id}- >- <EditorContentWrapper editor={editor} id={id} tabIndex={tabIndex} />- {editor.isEditable && (- <div>- {bubbleMenuEnabled && <EditorBubbleMenu editor={editor} />}- <BlockMenu editor={editor} />- <AIFeaturesMenu menu={aiHandler?.menu} />- </div>- )}- </EditorContainer>+ <div+ className={cn("frame-renderer flex-grow w-full", {+ "wide-layout": displayConfig.wideLayout,+ })}+ >+ {isLoading ? (+ <DocumentContentLoader />+ ) : (+ <EditorContainer+ displayConfig={displayConfig}+ editor={editor}+ editorContainerClassName={editorContainerClassName}+ id={id}+ >+ <EditorContentWrapper editor={editor} id={id} tabIndex={tabIndex} />+ {editor.isEditable && (+ <div>+ {bubbleMenuEnabled && <EditorBubbleMenu editor={editor} />}+ <BlockMenu editor={editor} />+ <AIFeaturesMenu menu={aiHandler?.menu} />+ </div>+ )}+ </EditorContainer>+ )}</div>);};diff --git a/packages/editor/src/styles/variables.css b/packages/editor/src/styles/variables.cssindex 8d4e41a3c4..f03808c1a1 100644--- a/packages/editor/src/styles/variables.css+++ b/packages/editor/src/styles/variables.css@@ -169,27 +169,34 @@#page-content-container {container-name: page-content-container;container-type: inline-size;-}-.editor-container.document-editor {- --editor-content-width: var(--normal-content-width);+ .frame-renderer {+ --editor-content-width: var(--normal-content-width);- &.wide-layout {- --editor-content-width: var(--wide-content-width);- }+ &.wide-layout {+ --editor-content-width: var(--wide-content-width);+ }- .ProseMirror {- & > *:not(.editor-full-width-block) {+ .editor-container.page-title-editor .ProseMirror,+ .document-editor-loader {max-width: var(--editor-content-width);- margin-left: auto !important;- margin-right: auto !important;+ margin: 0 auto;transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);}- & > .editor-full-width-block {- max-width: 100%;- padding-inline-start: calc((100% - var(--editor-content-width)) / 2);- padding-inline-end: var(--wide-content-margin);+ .editor-container.document-editor .ProseMirror {+ & > *:not(.editor-full-width-block) {+ max-width: var(--editor-content-width);+ margin-left: auto !important;+ margin-right: auto !important;+ transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);+ }++ & > .editor-full-width-block {+ max-width: 100%;+ padding-inline-start: calc((100% - var(--editor-content-width)) / 2);+ padding-inline-end: var(--wide-content-margin);+ }}}}@@ -219,7 +226,8 @@/* keep a static padding of 96px for wide layouts for container width >912px and <1344px */@container page-content-container (min-width: 912px) and (max-width: 1344px) {- .editor-container.wide-layout,+ #page-content-container .frame-renderer.wide-layout .editor-container,+ #page-content-container .frame-renderer.wide-layout .document-editor-loader,.page-header-container {padding-left: var(--wide-content-margin);padding-right: var(--wide-content-margin);@@ -228,7 +236,8 @@/* keep a static padding of 20px for wide layouts for container width <912px */@container page-content-container (max-width: 912px) {- .editor-container.wide-layout,+ #page-content-container .frame-renderer.wide-layout .editor-container,+ #page-content-container .frame-renderer.wide-layout .document-editor-loader,.page-header-container {padding-left: var(--normal-content-margin);padding-right: var(--normal-content-margin);@@ -237,7 +246,8 @@/* keep a static padding of 20px for normal layouts for container width <760px */@container page-content-container (max-width: 760px) {- .editor-container:not(.wide-layout),+ #page-content-container .frame-renderer:not(.wide-layout) .editor-container,+ #page-content-container .frame-renderer:not(.wide-layout) .document-editor-loader,.page-header-container {padding-left: var(--normal-content-margin);padding-right: var(--normal-content-margin);