github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: issue comment edit validation (#3817)

Browse Source
This commit is contained in:
Anmol Singh Bhatia 2024-02-28 15:19:54 +05:30 committed by GitHub
parent 7e46cbcb52
commit 895ff03cf2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/components/issues/issue-detail/issue-activity/comments/comment-card.tsx
View File

@ -14,6 +14,8 @@ import { FileService } from "services/file.service";
// types // types
import { TIssueComment } from "@plane/types"; import { TIssueComment } from "@plane/types";
import { TActivityOperations } from "../root"; import { TActivityOperations } from "../root";
// helpers
import { isEmptyHtmlString } from "helpers/string.helper";
const fileService = new FileService(); const fileService = new FileService();
@ -67,6 +69,12 @@ export const IssueCommentCard: FC<TIssueCommentCard> = (props) => {
isEditing && setFocus("comment_html"); isEditing && setFocus("comment_html");
}, [isEditing, setFocus]); }, [isEditing, setFocus]);
const isEmpty =
watch("comment_html") === "" ||
watch("comment_html")?.trim() === "" ||
watch("comment_html") === "<p></p>" ||
isEmptyHtmlString(watch("comment_html") ?? "");
if (!comment || !currentUser) return <></>; if (!comment || !currentUser) return <></>;
return ( return (
<IssueCommentBlock <IssueCommentBlock
@ -115,9 +123,14 @@ export const IssueCommentCard: FC<TIssueCommentCard> = (props) => {
> >
<> <>
<form className={`flex-col gap-2 ${isEditing ? "flex" : "hidden"}`}> <form className={`flex-col gap-2 ${isEditing ? "flex" : "hidden"}`}>
<div> <div
onKeyDown={(e) => {
if (e.key === "Enter" && !e.shiftKey && !isEmpty) {
handleSubmit(onEnter)(e);
}
}}
>
<LiteTextEditorWithRef <LiteTextEditorWithRef
onEnterKeyPress={handleSubmit(onEnter)}
cancelUploadImage={fileService.cancelUpload} cancelUploadImage={fileService.cancelUpload}
uploadFile={fileService.getUploadFileFunction(comment?.workspace_detail?.slug as string)} uploadFile={fileService.getUploadFileFunction(comment?.workspace_detail?.slug as string)}
deleteFile={fileService.getDeleteImageFunction(workspaceId)} deleteFile={fileService.getDeleteImageFunction(workspaceId)}
@ -135,7 +148,7 @@ export const IssueCommentCard: FC<TIssueCommentCard> = (props) => {
<button <button
type="button" type="button"
onClick={handleSubmit(onEnter)} onClick={handleSubmit(onEnter)}
disabled={isSubmitting} disabled={isSubmitting || isEmpty}
className="group rounded border border-green-500 bg-green-500/20 p-2 shadow-md duration-300 hover:bg-green-500" className="group rounded border border-green-500 bg-green-500/20 p-2 shadow-md duration-300 hover:bg-green-500"
> >
<Check className="h-3 w-3 text-green-500 duration-300 group-hover:text-white" /> <Check className="h-3 w-3 text-green-500 duration-300 group-hover:text-white" />