From 62835da649c15957531a0ed776fa311a1b79d5a8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 15 Feb 2023 11:38:08 +0100 Subject: [PATCH] Bug 32939: Uniformize api calls We want to make the call easier and without less errors possible. Here, no need to async keyword, try-catch, etc. Only call the method and use the common then with the 2 success and error Promise arguments. We will certainly want to add later a parameter to prevent the display of the error in fetchJSON, in case the failure does not require a message for the end user. --- .../vue/components/ERM/AgreementsFormAdd.vue | 44 +++++++++---------- .../ERM/AgreementsFormConfirmDelete.vue | 29 +++++------- .../js/vue/components/ERM/AgreementsList.vue | 10 +++-- .../js/vue/components/ERM/AgreementsShow.vue | 12 +++-- .../prog/js/vue/fetch/http-client.js | 15 ++++--- 5 files changed, 55 insertions(+), 55 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue index 5c0932387eb..fefe29957d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue @@ -254,14 +254,13 @@ export default { methods: { async getAgreement(agreement_id) { const client = APIClient.erm - try { - await client.agreements.get(agreement_id).then(data => { + client.agreements.get(agreement_id).then( + data => { this.agreement = data this.initialized = true - }) - } catch (err) { - setError(err.message || err.statusText) - } + }, + error => {} + ) }, checkForm(agreement) { let errors = [] @@ -376,22 +375,23 @@ export default { delete agreement.agreement_packages const client = APIClient.erm - ;(async () => { - try { - if (agreement_id) { - await client.agreements - .update(agreement, agreement_id) - .then(setMessage(this.$__("Agreement updated"))) - } else { - await client.agreements - .create(agreement) - .then(setMessage(this.$__("Agreement created"))) - } - this.$router.push("/cgi-bin/koha/erm/agreements") - } catch (err) { - setError(err.message || err.statusText) - } - })() + if (agreement_id) { + client.agreements.update(agreement, agreement_id).then( + success => { + setMessage(this.$__("Agreement updated")) + this.$router.push("/cgi-bin/koha/erm/agreements") + }, + error => {} + ) + } else { + client.agreements.create(agreement).then( + success => { + setMessage(this.$__("Agreement created")) + this.$router.push("/cgi-bin/koha/erm/agreements") + }, + error => {} + ) + } }, onStatusChanged(e) { if (e.authorised_value != "closed") { diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormConfirmDelete.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormConfirmDelete.vue index 257a5de33f2..6fd85377913 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormConfirmDelete.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormConfirmDelete.vue @@ -37,7 +37,7 @@