fix: consolidate some props

dhis2 · Jan 8, 2024 · 5bfa309 · 5bfa309
1 parent 8558cbf
commit 5bfa309
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/src/components/Interpretations/InterpretationModal/Comment.js b/src/components/Interpretations/InterpretationModal/Comment.js
@@ -18,8 +18,7 @@ const Comment = ({
     onThreadUpdated,
     canComment,
     fetching,
-    setRemoveInProgress,
-    setUpdateInProgress,
+    setCommentActionInProgress,
 }) => {
     const [isUpdateMode, setIsUpdateMode] = useState(false)
 
@@ -34,7 +33,7 @@ const Comment = ({
             text={comment.text}
             currentUser={currentUser}
             fetching={fetching}
-            setUpdateInProgress={setUpdateInProgress}
+            setUpdateInProgress={setCommentActionInProgress}
         />
     ) : (
         <Message
@@ -56,7 +55,7 @@ const Comment = ({
                             interpretationId={interpretationId}
                             onComplete={() => onThreadUpdated(true)}
                             fetching={fetching}
-                            setRemoveInProgress={setRemoveInProgress}
+                            setRemoveInProgress={setCommentActionInProgress}
                         />
                     )}
                 </MessageStatsBar>

diff --git a/src/components/Interpretations/InterpretationModal/CommentAddForm.js b/src/components/Interpretations/InterpretationModal/CommentAddForm.js
@@ -49,7 +49,7 @@ export const CommentAddForm = ({ currentUser, focusRef, fetching, save }) => {
                             primary
                             small
                             onClick={saveComment}
-                            loading={fetching}
+                            disabled={fetching}
                         >
                             {i18n.t('Post reply')}
                         </Button>

diff --git a/src/components/Interpretations/InterpretationModal/CommentUpdateForm.js b/src/components/Interpretations/InterpretationModal/CommentUpdateForm.js
@@ -66,7 +66,7 @@ export const CommentUpdateForm = ({
                 />
                 <MessageButtonStrip>
                     <Button
-                        loading={isDisabled}
+                        disabled={isDisabled}
                         primary
                         small
                         onClick={updateComment}

diff --git a/src/components/Interpretations/InterpretationModal/InterpretationThread.js b/src/components/Interpretations/InterpretationModal/InterpretationThread.js
@@ -22,10 +22,9 @@ const InterpretationThread = ({
     initialFocus,
     onThreadUpdated,
     downloadMenuComponent: DownloadMenu,
-    fetchingComplete,
 }) => {
-    const [removeInProgress, setRemoveInProgress] = useState(false)
-    const [updateInProgress, setUpdateInProgress] = useState(false)
+    const [commentActionInProgress, setCommentActionInProgress] =
+        useState(false)
 
     const { toggleLike, isLikedByCurrentUser, toggleLikeInProgress } = useLike({
         interpretation,
@@ -66,11 +65,9 @@ const InterpretationThread = ({
     return (
         <div className="container">
             {fetching ||
-            !fetchingComplete ||
             toggleLikeInProgress ||
             loadingNewComment ||
-            removeInProgress ||
-            updateInProgress ? (
+            commentActionInProgress ? (
                 <Cover>
                     <CenteredContent>
                         <CircularLoader />
@@ -108,14 +105,10 @@ const InterpretationThread = ({
                             interpretationId={interpretation.id}
                             onThreadUpdated={onThreadUpdated}
                             canComment={interpretationAccess.comment}
-                            fetching={
-                                fetching ||
-                                !fetchingComplete ||
-                                removeInProgress ||
-                                updateInProgress
+                            fetching={fetching || commentActionInProgress}
+                            setCommentActionInProgress={
+                                setCommentActionInProgress
                             }
-                            setRemoveInProgress={setRemoveInProgress}
-                            setUpdateInProgress={setUpdateInProgress}
                         />
                     ))}
                 </div>
@@ -125,7 +118,9 @@ const InterpretationThread = ({
                     currentUser={currentUser}
                     interpretationId={interpretation.id}
                     focusRef={focusRef}
-                    fetching={fetching || loadingNewComment}
+                    fetching={
+                        fetching || loadingNewComment || commentActionInProgress
+                    }
                     save={save}
                 />
             )}
@@ -178,7 +173,6 @@ const InterpretationThread = ({
 InterpretationThread.propTypes = {
     currentUser: PropTypes.object.isRequired,
     fetching: PropTypes.bool.isRequired,
-    fetchingComplete: PropTypes.bool.isRequired,
     interpretation: PropTypes.object.isRequired,
     onInterpretationDeleted: PropTypes.func.isRequired,
     downloadMenuComponent: PropTypes.oneOfType([