diff --git a/src/pages/Membership/MembershipModal.js b/src/pages/Membership/MembershipModal.js index f506db8..169850f 100644 --- a/src/pages/Membership/MembershipModal.js +++ b/src/pages/Membership/MembershipModal.js @@ -32,11 +32,7 @@ export const MembershipModal = ({ form .validateFields() .then((values) => { - let input = values; - if (initialData.id) - input.username = initialData.username; - - onCreate(input); + onCreate(values); form.resetFields(); }) .catch((info) => { diff --git a/src/pages/Product/Product.js b/src/pages/Product/Product.js index ee4fd07..8b05cc7 100644 --- a/src/pages/Product/Product.js +++ b/src/pages/Product/Product.js @@ -72,17 +72,21 @@ export const Product = observer(() => { const uploadHandler = async (args) => { const file = args.file; - const responseUpload = await store.product.uploadExcel(file); + try { + const responseUpload = await store.product.uploadExcel(file); + + if (responseUpload.status === 201) { + message.success("Success upload excel!"); + } else { + message.error("Failed upload excel!"); + } - if (responseUpload.status === 201) { - message.success("Success upload excel!"); - } else { - message.error("Failed upload excel!"); setLoading(false); + const responseUploadProduct = await handleUploadProduct(responseUpload); + } catch (e) { + setLoading(false); + message.error("Failed upload excel!"); } - - const responseUploadProduct = await handleUploadProduct(responseUpload); - setLoading(false); }; const handleChange = (info) => { @@ -94,15 +98,21 @@ export const Product = observer(() => { }; const handleUploadProduct = async (data) => { - const response = await store.product.uploadProduct({fileName: data.body.filename}); + try { + const response = await store.product.uploadProduct({fileName: data.body.filename}); - if (response.status === 201) { - message.success("Success Create Product by Excel!"); - } else { - message.error("Failed Create Product by Excel!"); + if (response.status === 201) { + message.success("Success Create Product by Excel!"); + } else { + message.error("Failed Create Product by Excel!"); + } setLoading(false); + await store.product.getData(); + return response; + } catch (e) { + setLoading(false); + message.error("Failed Create Product by Excel!"); } - return response; } const loadingState = ( diff --git a/src/store/authentication.js b/src/store/authentication.js index 0edda9e..2d2ee4d 100644 --- a/src/store/authentication.js +++ b/src/store/authentication.js @@ -63,5 +63,6 @@ export class Authentication { TokenUtil.clearAccessToken(); TokenUtil.persistToken(); this.isLoggedIn = false; + window.location.reload(); } }