Merge pull request #329 from SELab-2/last_last_bugs

remove project
SELab-2 · May 23, 2024 · 6bb8f8a · 6bb8f8a
2 parents a21ab44 + c80eb44
commit 6bb8f8a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/frontend/frontend/src/pages/subjectsPage/ProjectsView.tsx b/frontend/frontend/src/pages/subjectsPage/ProjectsView.tsx
@@ -329,7 +329,8 @@ export function ProjectsView({
                                                     }
                                                     deleteEvent={() =>
                                                         deleteAssignment(
-                                                            project.index
+                                                            project.assignment
+                                                                .project_id
                                                         )
                                                     }
                                                     archiveEvent={() =>

diff --git a/frontend/frontend/src/pages/subjectsPage/SubjectsPage.tsx b/frontend/frontend/src/pages/subjectsPage/SubjectsPage.tsx
@@ -164,19 +164,20 @@ export function SubjectsPage() {
     }
 
     const [openDeletePopup, setOpenDeletePopup] = useState(false)
-    const [deleteIndex, setDeleteIndex] = useState(0)
+    const [deleteId, setDeleteId] = useState(0)
     const [openArchivePopup, setOpenArchivePopup] = useState(false)
     const [archiveIndex, setArchiveIndex] = useState(0)
 
-    const deleteAssignment = (index: number) => {
-        setDeleteIndex(index)
+    const deleteAssignment = (id: number) => {
+        setDeleteId(id)
         setOpenDeletePopup(true)
     }
     const doDelete = async () => {
-        setAssignments(assignments.filter((_, i) => i !== deleteIndex))
+        setAssignments(
+            assignments.filter((project) => project.project_id !== deleteId)
+        )
         try {
-            const deletedAssignment = assignments[deleteIndex]
-            await instance.delete(`/projecten/${deletedAssignment.project_id}/`)
+            await instance.delete(`/projecten/${deleteId}/`)
         } catch (error) {
             console.error('Error deleting data:', error)
         }