Merge pull request #537 from marcussfu/master

adjust 'Make editing comments (reply requests) easier'
cofacts · Apr 19, 2023 · cc7fe81 · cc7fe81
2 parents 9ef4cbd + 52eac6b
commit cc7fe81
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/components/CreateReplyRequestForm/CreateReplyRequestForm.js b/components/CreateReplyRequestForm/CreateReplyRequestForm.js
@@ -139,7 +139,7 @@ const SubmitButton = ({
 };
 
 const CreateReplyRequestForm = React.memo(
-  ({ articleId, articleUserId, requestedForReply, onNewReplyButtonClick }) => {
+  ({ articleId, articleUserId, ownReplyRequest, onNewReplyButtonClick }) => {
     const buttonRef = useRef(null);
     const [disabled, setDisabled] = useState(false);
     const [showForm, setShowForm] = useState(false);
@@ -160,6 +160,10 @@ const CreateReplyRequestForm = React.memo(
       // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
+    useEffect(() => {
+      setText(t => (ownReplyRequest ? ownReplyRequest.reason : t));
+    }, [ownReplyRequest]);
+
     // event scroll listener
     useEffect(() => {
       const observer = new IntersectionObserver(
@@ -190,6 +194,7 @@ const CreateReplyRequestForm = React.memo(
     const handleReasonSubmitted = () => {
       setText('');
       setDisabled(false);
+      setShowForm(!showForm);
       requestAnimationFrame(() => (localStorage.text = ''));
     };
 
@@ -249,7 +254,7 @@ const CreateReplyRequestForm = React.memo(
                 onClick={() => setShowForm(!showForm)}
                 disableElevation
               >
-                {requestedForReply === true ? t`Update comment` : t`Comment`}
+                {ownReplyRequest ? t`Update comment` : t`Comment`}
               </Button>
               <Button
                 type="button"

diff --git a/pages/article/[id].js b/pages/article/[id].js
@@ -364,6 +364,10 @@ function ArticlePage() {
       (currentUser ? true : positiveFeedbackCount - negativeFeedbackCount > 0)
   );
 
+  const ownReplyRequest = replyRequestsWithComments.find(
+    element => element.user && currentUser && element.user.id === currentUser.id
+  );
+
   return (
     <AppLayout>
       <Head>
@@ -475,8 +479,8 @@ function ArticlePage() {
               </>
             ) : null}
             <CreateReplyRequestForm
-              requestedForReply={article.requestedForReply}
               articleId={article.id}
+              ownReplyRequest={ownReplyRequest}
               articleUserId={article.user?.id || 'N/A'}
               onNewReplyButtonClick={() => {
                 setShowForm(true);