From 7e356d01781f18176901d46cad314b5fee78ba83 Mon Sep 17 00:00:00 2001 From: caturbgs Date: Wed, 22 Dec 2021 23:43:45 +0700 Subject: [PATCH] fix: add refresh after crd operation in membership contd --- src/pages/Membership/Membership.js | 50 ++++++++++++++++-------------- src/store/membership.js | 9 ------ 2 files changed, 26 insertions(+), 33 deletions(-) diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index 541fb69..2628ec4 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -71,13 +71,14 @@ export const Membership = observer(() => { const status = isActive ? "inactive" : "active"; const status2 = isActive ? "Inactivating" : "Activating"; try { - modalLoader.setLoading(true); - const response = await store.membership.changeStatus(id, status); - modalLoader.setLoading(false); + modalLoader.setLoading(true); + const response = await store.membership.changeStatus(id, status); + modalLoader.setLoading(false); - response?.body?.statusCode === 201 - ? message.success(`Success ${status2} Membership`) - : message.error(`Failed ${status2} Membership`); + response?.body?.statusCode === 201 + ? message.success(`Success ${status2} Membership`) + : message.error(`Failed ${status2} Membership`); + await getData(); } catch (err) { modalLoader.setLoading(false); message.error(`Failed ${status2} Membership`); @@ -92,26 +93,26 @@ export const Membership = observer(() => { const handleSubmitTransaction = async (data) => { modalLoader.setLoading(true); try { - data.destination = destination; - if (data.amount) { - data = { - ...data, - amount: Number(data.amount), - }; - } + data.destination = destination; + if (data.amount) { + data = { + ...data, + amount: Number(data.amount), + }; + } - let response = null; + let response = null; - (await store.authentication.userData.role) === "Admin" - ? (response = await store.transaction.distributeAdmin(data)) - : (response = await store.transaction.distribute(data)); + (await store.authentication.userData.role) === "Admin" + ? (response = await store.transaction.distributeAdmin(data)) + : (response = await store.transaction.distribute(data)); - response?.body?.statusCode === 201 - ? message.success("Success Top Up") - : message.error("Failed Top Up"); + response?.body?.statusCode === 201 + ? message.success("Success Top Up") + : message.error("Failed Top Up"); - modalLoader.setLoading(false); - //await store.supplier.getData() + modalLoader.setLoading(false); + await getData(); } catch (e) { console.log(e, "apa errornya"); modalLoader.setLoading(false); @@ -264,8 +265,9 @@ export const Membership = observer(() => { setConfirmLoading(true); modalLoader.setLoading(true); try { - await store.membership.create(data); - message.success("Success Add New Member"); + await store.membership.create(data); + message.success("Success Add New Member"); + await getData(); } catch (e) { console.log(e, "apa errornya"); message.error("Failed Add Member"); diff --git a/src/store/membership.js b/src/store/membership.js index af33099..7b2d44b 100644 --- a/src/store/membership.js +++ b/src/store/membership.js @@ -49,9 +49,6 @@ export class Membership { async create(data) { try { const response = await http.post('/users').send(data); - this.ctx.authentication.userData.role === "Admin" - ? await this.ctx.membership.getData() - : await this.ctx.membership.getDataBySuperior(); return response; } catch (e) { console.error(e); @@ -61,9 +58,6 @@ export class Membership { async update(id, data) { try { const response = await http.put('/users/' + id).send(data); - this.ctx.authentication.userData.role === "Admin" - ? await this.ctx.membership.getData() - : await this.ctx.membership.getDataBySuperior(); return response; } catch (e) { console.error(e); @@ -73,9 +67,6 @@ export class Membership { async delete(id) { try { const response = await http.del('/users/' + id); - this.ctx.authentication.userData.role === "Admin" - ? await this.ctx.membership.getData() - : await this.ctx.membership.getDataBySuperior(); return response; } catch (e) { console.error(e);