Merge pull request #285 from bipproduction/amalia/03-okt-24

Amalia/03 okt 24

src/module/project/ui/create_project.tsx

@@ -42,6 +42,7 @@ export default function CreateProject() {
   const roleLogin = useHookstate(globalRole)
   const isMobile = useMediaQuery('(max-width: 369px)');
   const tema = useHookstate(TEMA)
+  const [loadingModal, setLoadingModal] = useState(false)
 
   const [body, setBody] = useState<any>({
     idGroup: "",
@@ -102,6 +103,7 @@ export default function CreateProject() {
 
   async function onSubmit() {
     try {
+      setLoadingModal(true)
       const fd = new FormData();
       for (let i = 0; i < fileForm.length; i++) {
         fd.append(`file${i}`, fileForm[i]);
@@ -130,6 +132,9 @@ export default function CreateProject() {
     } catch (error) {
       console.error(error)
       toast.error("Gagal menambahkan kegiatan, coba lagi nanti");
+    } finally {
+      setLoadingModal(false)
+      setModal(false)
     }
   }
 
@@ -494,13 +499,15 @@ export default function CreateProject() {
       </LayoutDrawer>
 
 
-      <LayoutModal opened={isModal} onClose={() => setModal(false)}
+      <LayoutModal loading={loadingModal} opened={isModal} onClose={() => setModal(false)}
         description="Apakah Anda yakin ingin menambahkan data?"
         onYes={(val) => {
           if (val) {
             onSubmit()
+          }else{
+            setModal(false)
           }
-          setModal(false)
+          
         }} />
     </Box >
   );

src/module/task/ui/create_task.tsx

@@ -24,7 +24,7 @@ import { useWibuRealtime } from "wibu-realtime";
 export default function CreateTask() {
   const router = useRouter()
   const param = useParams<{ id: string }>()
-  const [openDrawer, setOpenDrawer] = useState(false)
+  const [loadingModal, setLoadingModal] = useState(false)
   const [openDrawerFile, setOpenDrawerFile] = useState(false)
   const [openDrawerTask, setOpenDrawerTask] = useState(false)
   const [openMember, setOpenMember] = useState(false)
@@ -66,6 +66,7 @@ export default function CreateTask() {
 
   async function onSubmit() {
     try {
+      setLoadingModal(true)
       const fd = new FormData();
       for (let i = 0; i < fileForm.length; i++) {
         fd.append(`file${i}`, fileForm[i]);
@@ -95,6 +96,9 @@ export default function CreateTask() {
     } catch (error) {
       console.error(error)
       toast.error("Gagal menambahkan tugas divisi, coba lagi nanti");
+    } finally {
+      setLoadingModal(false)
+      setOpenModal(false)
     }
   }
 
@@ -412,13 +416,14 @@ export default function CreateTask() {
 
 
 
-      <LayoutModal opened={openModal} onClose={() => setOpenModal(false)}
+      <LayoutModal loading={loadingModal} opened={openModal} onClose={() => setOpenModal(false)}
         description="Apakah Anda yakin ingin menambahkan data?"
         onYes={(val) => {
           if (val) {
             onSubmit()
+          } else {
+            setOpenModal(false)
           }
-          setOpenModal(false)
         }} />
     </Box >
   );

src/module/user/member/ui/create_member.tsx

@@ -423,7 +423,7 @@ export default function CreateMember() {
           error={
             touched.phone && (
               listData.phone == "" ? "Nomor Telepon Tidak Boleh Kosong" :
-                listData.phone.length < 10 ? "Nomor Telepon harus 10 digit" : null
+                listData.phone.length < 10 ? "Nomor Telepon Tidak Valid" : null
             )
           }
         />