diff --git a/javascript-practice/src/js/services/commonService.js b/javascript-practice/src/js/services/commonService.js index 23ca8ba..e4cdf98 100644 --- a/javascript-practice/src/js/services/commonService.js +++ b/javascript-practice/src/js/services/commonService.js @@ -104,6 +104,7 @@ export default class CommonService { } async deleteData(id, path = this.defaultPath) { + this.connectToDb(); await timeOutConnect(this.firebaseService.delete(id, path)); } } diff --git a/javascript-practice/src/js/services/firebaseService.js b/javascript-practice/src/js/services/firebaseService.js index bb180f6..9338325 100644 --- a/javascript-practice/src/js/services/firebaseService.js +++ b/javascript-practice/src/js/services/firebaseService.js @@ -30,9 +30,7 @@ class FirebaseService { } delete(id, path) { - const dbRef = ref(this.db, `${path}${id}/`); - - return remove(dbRef); + return remove(ref(this.db, path + id)); } /** diff --git a/javascript-practice/src/js/views/homeView.js b/javascript-practice/src/js/views/homeView.js index c22fefe..c6a7138 100644 --- a/javascript-practice/src/js/views/homeView.js +++ b/javascript-practice/src/js/views/homeView.js @@ -311,11 +311,20 @@ export default class HomeView extends CommonView { ); if (idEl.value) { - this.transactionDialog.close(); + try { + this.transactionDialog.close(); + this.toggleLoaderSpinner(); + + await this.deleteTransaction(idEl.value); + + this.showSuccessToast('Delete success!', MESSAGE.DEFAULT_MESSAGE); + + await this.loadData(); + this.addEventTransactionItem(); + } catch (error) { + this.showErrorToast(error); + } this.toggleLoaderSpinner(); - await this.deleteTransaction(idEl.value); - this.toggleLoaderSpinner(); - this.showSuccessToast('Delete success!', MESSAGE.DEFAULT_MESSAGE); } }); } @@ -389,7 +398,8 @@ export default class HomeView extends CommonView { this.clearInputTransactionForm(this.transactionForm); // Reload data - this.loadData(); + await this.loadData(); + this.addEventTransactionItem(); } catch (error) { this.showErrorToast(error); } @@ -503,7 +513,8 @@ export default class HomeView extends CommonView { await this.updateAmountWallet(+amount, this.saveWallet); // Update wallet - this.loadData(); + await this.loadData(); + this.addEventTransactionItem(); // Hide loader spinner this.toggleLoaderSpinner(); @@ -571,8 +582,7 @@ export default class HomeView extends CommonView { MESSAGE.DEFAULT_MESSAGE, ); - this.loadEvent(); // Load event page - this.loadData(); // Load data from database into page + await this.loadData(); // Load data from database into page } catch (error) { // Show toast error this.showErrorToast(error);