From a9fb28757c732ff7af04c30dc2c3892ee9941fd6 Mon Sep 17 00:00:00 2001 From: amel Date: Fri, 4 Oct 2024 17:20:21 +0800 Subject: [PATCH] upd: user Deskripsi: - update validasi tambah anggota - loading buttom save tambah anggota - update validasi edit anggota - loading buttom save edit anggota No Issues --- src/module/user/member/ui/create_member.tsx | 152 +++++++++++++------- src/module/user/member/ui/edit_member.tsx | 69 +++++---- 2 files changed, 136 insertions(+), 85 deletions(-) diff --git a/src/module/user/member/ui/create_member.tsx b/src/module/user/member/ui/create_member.tsx index 9f8ceca..060b197 100644 --- a/src/module/user/member/ui/create_member.tsx +++ b/src/module/user/member/ui/create_member.tsx @@ -1,25 +1,26 @@ "use client"; -import { globalRole, TEMA, WARNA } from "@/module/_global"; +import { globalRole, TEMA } from "@/module/_global"; import LayoutModal from "@/module/_global/layout/layout_modal"; +import { funGetUserByCookies } from "@/module/auth"; import { funGetAllGroup, IDataGroup } from "@/module/group"; +import { funGetAllPosition } from "@/module/position/lib/api_position"; +import { useHookstate } from "@hookstate/core"; import { Avatar, Box, Button, Indicator, rem, Select, Stack, Text, TextInput } from "@mantine/core"; +import { Dropzone } from "@mantine/dropzone"; +import { useShallowEffect } from "@mantine/hooks"; +import _ from "lodash"; import { useRouter } from "next/navigation"; import { useRef, useState } from "react"; import toast from "react-hot-toast"; -import { IDataPositionMember, IDataROleMember } from "../lib/type_member"; -import { funGetAllPosition } from "@/module/position/lib/api_position"; -import { funCreateMember } from "../lib/api_member"; -import _ from "lodash"; -import { useHookstate } from "@hookstate/core"; -import { useShallowEffect } from "@mantine/hooks"; -import { funGetUserByCookies } from "@/module/auth"; -import { valueRoleUser } from "../../lib/val_user"; import { FaCamera } from "react-icons/fa6"; -import { Dropzone } from "@mantine/dropzone"; +import { valueRoleUser } from "../../lib/val_user"; +import { funCreateMember } from "../lib/api_member"; +import { IDataPositionMember, IDataROleMember } from "../lib/type_member"; export default function CreateMember() { const router = useRouter(); const [isModal, setModal] = useState(false); + const [loadingKonfirmasi, setLoadingKonfirmasi] = useState(false); const [listGroup, setListGorup] = useState([]); const [listPosition, setListPosition] = useState([]); const [listUserRole, setListUserRole] = useState([]); @@ -100,37 +101,33 @@ export default function CreateMember() { async function onSubmit(val: boolean) { try { - if (_.isEmpty(listData)) { - return; - } - if (val) { - const fd = new FormData() - fd.append("file", imgForm) - fd.append("data", JSON.stringify( - { - nik: listData.nik, - name: listData.name, - phone: listData.phone, - email: listData.email, - gender: listData.gender, - idGroup: listData.idGroup, - idPosition: listData.idPosition, - idUserRole: listData.idUserRole, - } - )) - const res = await funCreateMember(fd); - if (res.success) { - toast.success(res.message); - setModal(false); - router.push("/member?active=true"); - } else { - toast.error(res.message); + setLoadingKonfirmasi(true) + const fd = new FormData() + fd.append("file", imgForm) + fd.append("data", JSON.stringify( + { + nik: listData.nik, + name: listData.name, + phone: listData.phone, + email: listData.email, + gender: listData.gender, + idGroup: listData.idGroup, + idPosition: listData.idPosition, + idUserRole: listData.idUserRole, } + )) + const res = await funCreateMember(fd); + if (res.success) { + toast.success(res.message); + router.push("/member?active=true"); + } else { + toast.error(res.message); } setModal(false); } catch (error) { toast.error("Error"); } finally { + setLoadingKonfirmasi(false) setModal(false); } } @@ -142,12 +139,61 @@ export default function CreateMember() { }, []); function onCheck() { - if (Object.values(touched).some((v) => v == true)) + const cek = checkAll() + if (!cek) return false setModal(true) } - function onValidation(kategori: string, val: string) { + function checkAll() { + let nilai = true + + if (listData.nik === "" || listData.nik.length !== 16) { + setTouched(touched => ({ ...touched, nik: true })) + nilai = false + } + + if (listData.name === "") { + setTouched(touched => ({ ...touched, name: true })) + nilai = false + } + + if (listData.phone == "" || !(listData.phone.length >= 10 && listData.phone.length <= 15)) { + setTouched(touched => ({ ...touched, phone: true })) + nilai = false + } + + if (listData.email == "" || !/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/.test(listData.email)) { + setTouched(touched => ({ ...touched, email: true })) + nilai = false + } + + if (listData.gender == "" || String(listData.gender) == "null") { + setTouched(touched => ({ ...touched, gender: true })) + nilai = false + } + + if (roleLogin.get() == "supadmin" && (listData.idGroup == "" || String(listData.idGroup) == "null")) { + setTouched(touched => ({ ...touched, idGroup: true })) + nilai = false + } + + if (listData.idPosition === "" || String(listData.idPosition) == "null") { + setTouched(touched => ({ ...touched, idPosition: true })) + nilai = false + } + + if (listData.idUserRole === "" || String(listData.idUserRole) == "null") { + setTouched(touched => ({ ...touched, idUserRole: true })) + nilai = false + } + + return nilai + + } + + + function onValidation(kategori: string, val: any) { if (kategori == 'nik') { setListData({ ...listData, nik: val }) if (val === "" || val.length !== 16) { @@ -178,28 +224,28 @@ export default function CreateMember() { } } else if (kategori == 'gender') { setListData({ ...listData, gender: val }) - if (val == "" || val == "null") { + if (val == "" || String(val) == "null") { setTouched({ ...touched, gender: true }) } else { setTouched({ ...touched, gender: false }) } } else if (kategori == 'idGroup') { - setListData({ ...listData, idGroup: val, idPosition: "", }) - if (val === "") { - setTouched({ ...touched, idGroup: true }) + setListData(listData => ({ ...listData, idGroup: val, })) + if (val === "" || String(val) == "null") { + setTouched(touched => ({ ...touched, idGroup: true })) } else { setTouched({ ...touched, idGroup: false }) } } else if (kategori == 'idPosition') { - setListData({ ...listData, idPosition: val }) - if (val === "") { - setTouched({ ...touched, idPosition: true }) + setListData(listData => ({ ...listData, idPosition: val })) + if (val === "" || String(val) == "null") { + setTouched(touched => ({ ...touched, idPosition: true })) } else { setTouched({ ...touched, idPosition: false }) } } else if (kategori == 'idUserRole') { setListData({ ...listData, idUserRole: val }) - if (val === "") { + if (val === "" || String(val) == "null") { setTouched({ ...touched, idUserRole: true }) } else { setTouched({ ...touched, idUserRole: false }) @@ -210,6 +256,7 @@ export default function CreateMember() { async function changeGrup(val: any) { setListPosition([]); onValidation('idGroup', val) + onValidation('idPosition', '') getAllPosition(val); } @@ -269,7 +316,7 @@ export default function CreateMember() { onChange={(val: any) => { changeGrup(val) }} error={ touched.idGroup && ( - listData.idGroup == "" ? "Grup Tidak Boleh Kosong" : null + listData.idGroup == "" || String(listData.idGroup) == "null" ? "Grup Tidak Boleh Kosong" : null ) } /> @@ -301,7 +348,7 @@ export default function CreateMember() { value={listData.idPosition == "" ? null : listData.idPosition} error={ touched.idPosition && ( - listData.idPosition == "" ? "Jabatan Tidak Boleh Kosong" : null + listData.idPosition == "" || String(listData.idPosition) == "null" ? "Jabatan Tidak Boleh Kosong" : null ) } /> @@ -331,7 +378,7 @@ export default function CreateMember() { onChange={(val: any) => { onValidation('idUserRole', val) }} error={ touched.idUserRole && ( - listData.idUserRole == "" ? "Role Tidak Boleh Kosong" : null + listData.idUserRole == "" || String(listData.idUserRole) == "null" ? "Role Tidak Boleh Kosong" : null ) } /> @@ -449,7 +496,7 @@ export default function CreateMember() { onChange={(val: any) => { onValidation('gender', val) }} error={ touched.gender && ( - listData.gender == "" ? "Jenis Kelamin Tidak Boleh Kosong" : null + listData.gender == "" || String(listData.gender == "null") ? "Jenis Kelamin Tidak Boleh Kosong" : null ) } /> @@ -471,11 +518,16 @@ export default function CreateMember() { setModal(false)} description="Apakah Anda yakin ingin menambahkan data?" onYes={(val) => { - onSubmit(val); + if (val) { + onSubmit(val); + } else { + setModal(false); + } }} /> diff --git a/src/module/user/member/ui/edit_member.tsx b/src/module/user/member/ui/edit_member.tsx index 9033b7a..1d69a5a 100644 --- a/src/module/user/member/ui/edit_member.tsx +++ b/src/module/user/member/ui/edit_member.tsx @@ -1,25 +1,25 @@ 'use client' -import { globalRole, TEMA, WARNA } from "@/module/_global"; +import { globalRole, TEMA } from "@/module/_global"; import LayoutModal from "@/module/_global/layout/layout_modal"; import { funGetAllGroup, IDataGroup } from "@/module/group"; import { funGetAllPosition } from "@/module/position/lib/api_position"; +import { useHookstate } from "@hookstate/core"; import { Avatar, Box, Button, Indicator, rem, Select, Skeleton, Stack, Text, TextInput } from "@mantine/core"; +import { Dropzone } from "@mantine/dropzone"; import { useShallowEffect } from "@mantine/hooks"; +import _ from "lodash"; import { useRouter } from "next/navigation"; import { useRef, useState } from "react"; import toast from "react-hot-toast"; -import { HiUser } from "react-icons/hi2"; -import { IDataPositionMember, IDataROleMember, IEditDataMember, IFormMember } from "../lib/type_member"; -import { funEditMember, funGetOneMember, funGetRoleUser } from "../lib/api_member"; -import _ from "lodash"; -import { Dropzone } from "@mantine/dropzone"; import { FaCamera } from "react-icons/fa6"; -import { useHookstate } from "@hookstate/core"; import { valueRoleUser } from "../../lib/val_user"; +import { funEditMember, funGetOneMember } from "../lib/api_member"; +import { IDataPositionMember, IDataROleMember, IEditDataMember } from "../lib/type_member"; export default function EditMember({ id }: { id: string }) { const [isModal, setModal] = useState(false) + const [loadingKonfirmasi, setLoadingKonfirmasi] = useState(false) const router = useRouter() const [listGroup, setListGorup] = useState([]) const [listPosition, setListPosition] = useState([]) @@ -111,26 +111,24 @@ export default function EditMember({ id }: { id: string }) { async function onSubmit(val: boolean) { try { - if (_.isEmpty(data)) { - return + setLoadingKonfirmasi(true) + const fd = new FormData() + fd.append("file", imgForm) + fd.append("data", JSON.stringify(data)) + + const res = await funEditMember(id, fd) + + if (res.success) { + toast.success(res.message) + router.push(`/member?active=true`) + } else { + toast.error(res.message) } - if (val) { - const fd = new FormData() - fd.append("file", imgForm) - fd.append("data", JSON.stringify(data)) - - const res = await funEditMember(id, fd) - - if (res.success) { - toast.success(res.message) - router.push(`/member?active=true`) - } else { - toast.error(res.message) - } - } - } catch (error) { toast.error('Error'); + } finally { + setLoadingKonfirmasi(false) + setModal(false) } } @@ -171,21 +169,21 @@ export default function EditMember({ id }: { id: string }) { } } else if (kategori == 'gender') { setData({ ...data, gender: val }) - if (val == "" || val == "null") { + if (val == "" || String(val) == "null") { setTouched({ ...touched, gender: true }) } else { setTouched({ ...touched, gender: false }) } } else if (kategori == 'idPosition') { setData({ ...data, idPosition: val }) - if (val === "") { + if (val === "" || String(val) == "null") { setTouched({ ...touched, idPosition: true }) } else { setTouched({ ...touched, idPosition: false }) } } else if (kategori == 'idUserRole') { setData({ ...data, idUserRole: val }) - if (val === "") { + if (val === "" || String(val) == "null") { setTouched({ ...touched, idUserRole: true }) } else { setTouched({ ...touched, idUserRole: false }) @@ -267,7 +265,7 @@ export default function EditMember({ id }: { id: string }) { value={(data?.idPosition == "") ? null : data.idPosition} error={ touched.idPosition && ( - data.idPosition == "" ? "Jabatan Tidak Boleh Kosong" : null + data.idPosition == "" || String(data.idPosition) == "null" ? "Jabatan Tidak Boleh Kosong" : null ) } /> @@ -292,7 +290,7 @@ export default function EditMember({ id }: { id: string }) { value={data?.idUserRole} error={ touched.idUserRole && ( - data.idUserRole == "" ? "Role Tidak Boleh Kosong" : null + data.idUserRole == "" || String(data.idUserRole) == "null" ? "Role Tidak Boleh Kosong" : null ) } /> @@ -325,7 +323,6 @@ export default function EditMember({ id }: { id: string }) { }} onChange={(e) => { onValidation('name', e.target.value) }} value={data.name} - onBlur={() => setTouched({ ...touched, name: true })} error={ touched.name && ( data.name == "" ? "Nama Tidak Boleh Kosong" : null @@ -366,7 +363,7 @@ export default function EditMember({ id }: { id: string }) { error={ touched.phone && ( data.phone == "" ? "Nomor Telepon Tidak Boleh Kosong" : - data.phone.length < 10 ? "Nomor Telepon harus 10 digit" : null + data.phone.length < 10 ? "Nomor Telepon Tidak Valid" : null ) } /> @@ -395,7 +392,7 @@ export default function EditMember({ id }: { id: string }) { value={data.gender} error={ touched.gender && ( - data.gender == "" ? "Gender Tidak Boleh Kosong" : null + data.gender == "" || String(data.gender) == "null" ? "Gender Tidak Boleh Kosong" : null ) } /> @@ -422,12 +419,14 @@ export default function EditMember({ id }: { id: string }) { } - setModal(false)} + setModal(false)} description="Apakah Anda yakin ingin mengubah data?" onYes={(val) => { - if (val) + if (val) { onSubmit(val) - setModal(false) + } else { + setModal(false) + } } } />