Merge branch 'fix-question-edit-bug' into test-updated-merge

CS3219-AY2324S1 · Nov 16, 2023 · a19655c · a19655c
2 parents e6e5af7 + 831215c
commit a19655c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/Frontend/src/Components/QuestionList/QuestionEdit.jsx b/Frontend/src/Components/QuestionList/QuestionEdit.jsx
@@ -42,19 +42,22 @@ export const QuestionEdit = ({ q, index, updateQ, setEdit }) => {
         }
     };
 
-    const handleSubmit = (toggleEdit, editQ) => async e => {
-        e.preventDefault();
+    const handleSubmit = async (toggleEdit, editQ) => {
+        // e.preventDefault();
         if(isEmpty(title) || isEmpty(difficulty) || isEmpty(topic) || isEmpty(description)) {
-        setIsMissingField(true);
+            setIsMissingField(true);
         } else {
-        setIsMissingField(false);
-        const response = await editQ(q._id, title, description, difficulty, topic, language);
-        if(response.status === 200) {
-            toggleEdit(false);
-        } else {
-            let res = await response.json();
-            setErrorVar(res.errors)
-        }
+
+            setIsMissingField(false);
+
+            const response = await editQ(q._id, title, description, difficulty, topic, language);
+
+            if(response.status === 200) {
+                toggleEdit(false);
+            } else {
+                let res = await response.json();
+                setErrorVar(res.errors)
+            }
         }
     }
 
@@ -94,6 +97,7 @@ export const QuestionEdit = ({ q, index, updateQ, setEdit }) => {
             <div className="btn-container">
                     <button type = "cancel" className="cancel-btn" onClick = {(e)=> {setEdit(false)}}>Cancel</button>
                     <button className="submit-btn" onClick = {(e) => {
+                        e.preventDefault();
                         handleSubmit(setEdit, updateQ);
                     }}>Submit
                     </button> 

diff --git a/Frontend/src/Components/QuestionList/QuestionList.jsx b/Frontend/src/Components/QuestionList/QuestionList.jsx
@@ -86,8 +86,8 @@ export const Questions = () => {
 
       if (response.status === 200) {
         setFilterApplied(false);
-        fetchQuestions();
-        return [];
+        await fetchQuestions();
+        return response;
       } else {
         return ['Unable to edit question'];
       }