Merge branch 'main' of https://github.com/CS3219-AY2425S1/cs3219-ay2425s1-project-g04

Author: rayyan35p

Frontend/src/components/Sidebar.jsx

@@ -56,6 +56,13 @@ function Sidebar() {
 
         fetchUser();
 
+        // Custom event listener for category updates
+        const handleCategoryChange = () => {
+            fetchCategories();
+        };
+        window.addEventListener("categoryChange", handleCategoryChange);
+
+
         console.log("categories: ", categories)
 
         const matchingServiceHost = '34.126.114.137' || 'localhost';
@@ -87,6 +94,7 @@ function Sidebar() {
 
         return () => {
             websocket.close();
+            window.removeEventListener("categoryChange", handleCategoryChange);
         };
     }, []);
 

Frontend/src/components/question/EditQn.jsx

@@ -61,7 +61,10 @@ function EditQn({ question, handleClose, editQuestion }) {
         console.log(`newCategories are ${newCategories}`);
 
         categoryService.createCategories(newCategories)
-            .then(result => console.log(result.data))
+            .then(result => {
+                console.log(result.data)
+                window.dispatchEvent(new Event("categoryChange"));
+            })
             .catch(e => {
                 if (e.response && e.response.status === 400) {
                 setError(e.response.data.error);
@@ -71,7 +74,26 @@ function EditQn({ question, handleClose, editQuestion }) {
 
         questionService.updateQuestion(question._id, updatedQuestion)
             .then(result => {
-                
+                const initialCategories = question.category;
+                const categoriesRemoved = initialCategories.filter(item => !categories.includes(item));
+
+                // check each category to see if it should be deleted
+                categoriesRemoved.forEach(async (category) => {
+                    try {
+                        const remainingQuestions = await questionService.getQuestionsByCategory(category);
+                        
+                        // if no other questions have this category, delete the category
+                        if (remainingQuestions.length === 0) {
+                            await categoryService.deleteCategory(category);
+                            console.log(`Category ${category} deleted.`);
+                            // dispatch the event here
+                            window.dispatchEvent(new Event("categoryChange"));
+                        }
+                    } catch (err) {
+                        console.error(`Error processing category ${category}:`, err);
+                    }
+                });
+
                 editQuestion(question._id, updatedQuestion);
                 console.log('Question edited successfully:', result)
                 handleClose(); 

Frontend/src/components/question/Question.jsx

@@ -29,6 +29,7 @@ function Question() {
         .then(result => {
             setQuestions(result.data);
         })
+        
         .catch(err => console.log(err));
     }, []);
 
@@ -199,7 +200,7 @@ function Question() {
         return (
             <div
                 className="container-fluid ag-theme-quartz"
-                style={{ height: 500 }}
+                style={{ height: '80vh' }}
             >
                 <AgGridReact
                     rowData={questions}