Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[WEB-5520] fix: comments UI in space app #8189

Aaryan Khandelwala0da806a79a9
diff --git a/apps/space/core/components/editor/lite-text-editor.tsx b/apps/space/core/components/editor/lite-text-editor.tsx
index 0a6c50ddbe..d6d487dd7c 100644
--- a/apps/space/core/components/editor/lite-text-editor.tsx
+++ b/apps/space/core/components/editor/lite-text-editor.tsx
@@ -79,21 +79,23 @@ export const LiteTextEditor = React.forwardRef(function LiteTextEditor(
// overriding the containerClassName to add relative class passed
containerClassName={cn(containerClassName, "relative")}
/>
- <IssueCommentToolbar
- executeCommand={(item) => {
- // TODO: update this while toolbar homogenization
- // @ts-expect-error type mismatch here
- editorRef?.executeMenuItemCommand({
- itemKey: item.itemKey,
- ...item.extraProps,
- });
- }}
- isSubmitting={isSubmitting}
- showSubmitButton={showSubmitButton}
- handleSubmit={(e) => rest.onEnterKeyPress?.(e)}
- isCommentEmpty={isEmpty}
- editorRef={editorRef}
- />
+ {editable && (
+ <IssueCommentToolbar
+ executeCommand={(item) => {
+ // TODO: update this while toolbar homogenization
+ // @ts-expect-error type mismatch here
+ editorRef?.executeMenuItemCommand({
+ itemKey: item.itemKey,
+ ...item.extraProps,
+ });
+ }}
+ isSubmitting={isSubmitting}
+ showSubmitButton={showSubmitButton}
+ handleSubmit={(e) => rest.onEnterKeyPress?.(e)}
+ isCommentEmpty={isEmpty}
+ editorRef={editorRef}
+ />
+ )}
</div>
);
});
diff --git a/apps/space/core/components/issues/peek-overview/comment/add-comment.tsx b/apps/space/core/components/issues/peek-overview/comment/add-comment.tsx
index 9d90b6f734..f0e91d8b40 100644
--- a/apps/space/core/components/issues/peek-overview/comment/add-comment.tsx
+++ b/apps/space/core/components/issues/peek-overview/comment/add-comment.tsx
@@ -96,6 +96,9 @@ export const AddComment = observer(function AddComment(props: Props) {
setUploadAssetIds((prev) => [...prev, asset_id]);
return asset_id;
}}
+ displayConfig={{
+ fontSize: "small-font",
+ }}
/>
)}
/>
diff --git a/apps/space/core/components/issues/peek-overview/comment/comment-detail-card.tsx b/apps/space/core/components/issues/peek-overview/comment/comment-detail-card.tsx
index 91d8f66862..7d5538ba6d 100644
--- a/apps/space/core/components/issues/peek-overview/comment/comment-detail-card.tsx
+++ b/apps/space/core/components/issues/peek-overview/comment/comment-detail-card.tsx
@@ -42,7 +42,7 @@ export const CommentCard = observer(function CommentCard(props: Props) {
control,
formState: { isSubmitting },
handleSubmit,
- } = useForm<any>({
+ } = useForm<TIssuePublicComment>({
defaultValues: { comment_html: comment.comment_html },
});
@@ -120,6 +120,9 @@ export const CommentCard = observer(function CommentCard(props: Props) {
const { asset_id } = await uploadCommentAsset(file, anchor, comment.id);
return asset_id;
}}
+ displayConfig={{
+ fontSize: "small-font",
+ }}
/>
)}
/>
diff --git a/apps/web/ce/components/comments/comment-block.tsx b/apps/web/ce/components/comments/comment-block.tsx
index 384c65b9c2..9ac3f04b41 100644
--- a/apps/web/ce/components/comments/comment-block.tsx
+++ b/apps/web/ce/components/comments/comment-block.tsx
@@ -1,10 +1,9 @@
-import type { FC, ReactNode } from "react";
+import type { ReactNode } from "react";
import { useRef } from "react";
import { observer } from "mobx-react";
// plane imports
import { useTranslation } from "@plane/i18n";
import type { TIssueComment } from "@plane/types";
-import { EIssueCommentAccessSpecifier } from "@plane/types";
import { Avatar, Tooltip } from "@plane/ui";
import { calculateTimeAgo, cn, getFileURL, renderFormattedDate, renderFormattedTime } from "@plane/utils";
// hooks
@@ -56,9 +55,7 @@ export const CommentBlock = observer(function CommentBlock(props: TCommentBlock)
<div className="flex w-full gap-2">
<div className="flex-1 flex flex-wrap items-center gap-1">
<div className="flex items-center gap-1">
- <span className="text-xs font-medium">
- {`${displayName}${comment.access === EIssueCommentAccessSpecifier.EXTERNAL ? " (External User)" : ""}`}
- </span>
+ <span className="text-xs font-medium">{displayName}</span>
</div>
<div className="text-xs text-custom-text-300">
commented{" "}