From 248f8441157296b351d747264b54f7c3eb2eff95 Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Wed, 12 Jan 2022 17:10:08 +0700 Subject: [PATCH] Perbaikan PPOB --- src/pages/Membership/DetailUser.js | 4 ++ src/pages/Membership/Membership.js | 10 +++++ src/pages/Membership/MembershipModal.js | 58 +++++++++++++++---------- src/store/authentication.js | 3 ++ 4 files changed, 52 insertions(+), 23 deletions(-) diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index ce7ea45..aff0513 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -275,6 +275,10 @@ export const DetailUser = observer(() => { store.authentication.dataProfit.userDetail?.image_identity, "detail" ); + console.log( + store.authentication.listImage, + "detail gambar" + ); return (
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index d04e6e3..d6fd602 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -255,6 +255,16 @@ export const Membership = observer(() => { ]; const onSubmit = async (data, image, imageStore) => { data.superior = true; + console.log(imageStore, "Apa imageStore") + + if(!imageStore){ + imageStore = [] + } + + if (initialData.id) { + data.image_identity = image; + data.image_store = imageStore; + } if (initialData.id) { setConfirmLoading(true); diff --git a/src/pages/Membership/MembershipModal.js b/src/pages/Membership/MembershipModal.js index 6288ffc..6595ee5 100644 --- a/src/pages/Membership/MembershipModal.js +++ b/src/pages/Membership/MembershipModal.js @@ -38,19 +38,27 @@ export const MembershipModal = ({ const [loadingStore, setLoadingStore] = useState(false); useEffect(() => { - setFileList([{ - url : `${appConfig.apiUrl}/config/image/${initialData.image_identity}` - }]) - setFileStore([{ - url : `${appConfig.apiUrl}/config/image/${initialData.image_store}` - }]) - setImage(`${appConfig.apiUrl}/config/image/${initialData.image_identity}`) - setImageStore(`${appConfig.apiUrl}/config/image/${initialData.image_store}`) - return () => { - + if (initialData.id) { + setFileList([ + { + url: `${appConfig.apiUrl}/config/image/${initialData.image_identity}`, + }, + ]); + setFileStore([ + { + url: `${appConfig.apiUrl}/config/image/${initialData.image_store}`, + }, + ]); + setImage( + `${appConfig.apiUrl}/config/image/${initialData.image_identity}` + ); + setImageStore( + `${appConfig.apiUrl}/config/image/${initialData.image_store}` + ); } - }, [initialData]) - + return () => {}; + }, [initialData]); + const beforeUpload = (file) => { let isLt2M; let allowedFile = ["image/jpeg", "image/png"]; @@ -102,12 +110,15 @@ export const MembershipModal = ({ console.log(res, "ini respon 2"); setImageStore(`${appConfig.apiUrl}/config/image/${res.body.filename}`); setResponseFilenameStore([...responseFilenameStore, res.body.filename]); - setFileStore([...fileStore, { - uid: "-1", - name: res.body.filename, - status: "done", - url: `${appConfig.apiUrl}/config/image/${res.body.filename}`, - } ]); + setFileStore([ + ...fileStore, + { + uid: "-1", + name: res.body.filename, + status: "done", + url: `${appConfig.apiUrl}/config/image/${res.body.filename}`, + }, + ]); setLoadingStore(false); }; @@ -170,11 +181,12 @@ export const MembershipModal = ({ form .validateFields() .then((values) => { - values.image_identity = responseFilename - values.image_store = responseFilenameStore - onCreate(values,responseFilename,responseFilenameStore); + console.log(values, "apa valuesanya"); + values.image_identity = responseFilename; + values.image_store = responseFilenameStore; + onCreate(values, responseFilename, responseFilenameStore); form.resetFields(); - setFileStore([]) + setFileStore([]); setImage(""); setFileList([]); setPreviewImage(""); @@ -467,7 +479,7 @@ export const MembershipModal = ({ setFileStore([]); }} > - {fileStore.length >= 3 ? null:uploadButtonStore } + {fileStore.length >= 3 ? null : uploadButtonStore}