removed some debugging stuff and added a check to get cags on close modal

Author: dvcabiya

devU-client/src/components/pages/forms/assignments/assignmentUpdatePage.tsx

@@ -34,8 +34,6 @@ const AssignmentUpdatePage = () => {
   const currentAssignmentId = parseInt(assignmentId)
   const [assignmentProblems, setAssignmentProblems] = useState<AssignmentProblem[]>([])
   const [nonContainerAutograders, setNonContainerAutograders] = useState<NonContainerAutoGrader[]>([])
-  const [containerAutoGraderModal, setContainerAutoGraderModal] = useState(false);
-  const handleCloseContainerAutoGraderModal = () => setContainerAutoGraderModal(false);
   const [containerAutograders, setContainerAutograders] = useState<ContainerAutoGrader[]>([])
 
 
@@ -111,11 +109,18 @@ const AssignmentUpdatePage = () => {
   }
 
   const fetchAssignmentProblems = async () => {
-    await RequestService.get(`/api/course/${courseId}/assignment/${assignmentId}/non-container-auto-graders`)
-      .then((res) => { setNonContainerAutograders(res) })
     await RequestService.get(`/api/course/${courseId}/assignment/${currentAssignmentId}/assignment-problems`)
       .then((res) => { setAssignmentProblems(res) })
   }
+  const fetchNcags = async () => {
+    await RequestService.get(`/api/course/${courseId}/assignment/${assignmentId}/non-container-auto-graders`)
+      .then((res) => { setNonContainerAutograders(res) })
+  }
+  const fetchCags = async () => {
+    await RequestService.get(`/api/course/${courseId}/assignment/${assignmentId}/container-auto-graders`)
+    .then((res) => { setContainerAutograders(res) })
+  }
+  
 
 
 
@@ -210,20 +215,31 @@ const AssignmentUpdatePage = () => {
   const handleCloseTextModal = () => {
     setTextModal(false)
     fetchAssignmentProblems()
+    fetchNcags()
   }
+
   const [codeModal, setCodeModal] = useState(false);
   const handleCloseCodeModal = () => {
     setCodeModal(false)
     fetchAssignmentProblems()
   }
+
   const [mcqModal, setMcqModal] = useState(false);
   const handleCloseMcqModal = () => {
     setMcqModal(false)
     fetchAssignmentProblems()
+    fetchNcags()
+  }
+
+  const [containerAutoGraderModal, setContainerAutoGraderModal] = useState(false);
+  const handleCloseContainerAutoGraderModal = () => {
+    setContainerAutoGraderModal(false);
+    fetchCags();
   }
 
 
 
+
   const handleDeleteProblem = (problemId: number) => {
     //  const idsToDelete = nonContainerAutograders.filter(ncag => ncag.)
     RequestService.delete(`/api/course/${courseId}/assignment/${currentAssignmentId}/assignment-problems/${problemId}`)

devU-client/src/components/pages/forms/containers/containerAutoGraderModal.tsx

@@ -45,21 +45,21 @@ const ContainerAutoGraderForm = ({ open, onClose }: Props) => {
     }
     const handleJobFiles = (e: React.ChangeEvent<HTMLInputElement>) => {
         if (!e.target.files) {return}
-        console.log(e.target.files)
-        console.log(Array.from(e.target.files))
-
         setJobFiles(Array.from(e.target.files))
     }
     const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         const key = e.target.id;
         const value = e.target.value;
         setFormData(prevState => ({ ...prevState, [key]: value }));
     };
-
-
-
+    const isSubmittable = () => {
+        if (dockerfile && jobFiles && formData.timeout.length > 0){
+            return true;
+        }
+        return false;
+    }
     const handleSubmit = () => {
-        if (!dockerfile || !jobFiles) return;
+        if (!dockerfile || !jobFiles) {return}
 
         const body = new FormData
         body.append('assignmentId', formData.assignmentId)
@@ -98,7 +98,11 @@ const ContainerAutoGraderForm = ({ open, onClose }: Props) => {
     }
 
     return (
-        <Modal title="Add Container Auto Grader" buttonAction={handleSubmit} open={open} onClose={onClose}>
+        <Modal title="Add Container Auto Grader" 
+        buttonAction={handleSubmit} 
+        open={open} 
+        onClose={onClose} 
+        isSubmittable={isSubmittable}>
             <div className="input-group">
                 <label htmlFor="dockerfile">Dockerfile*:</label>
                 <input type="file" id="graderFile" onChange={handleDockerfile} />