@@ -, +, @@ - Refactor fetch.js to call the same fetch method (myFetch) in order to - Have a new myFetchTotal JS function to get the X-Total-Count header - Rename fetchCountLocalPackages with fetchLocalPackagesCount to match fetchLocalTitleCount - Use fetchLocalPackagesCount on the Package list view - Use checkError from components using fetch directly. Ideally the could - checkError get a new flag in parameter to ask for the response instead - Make checkError throw a proper exception to stop propation. This - "Something went wrong: Internal Server Error" + "Something went wrong: Error: Internal Server Error" --- .../vue/components/ERM/AgreementsFormAdd.vue | 3 +- .../ERM/AgreementsFormConfirmDelete.vue | 3 +- .../ERM/EHoldingsEBSCOPackagesList.vue | 4 +- .../ERM/EHoldingsLocalPackagesFormAdd.vue | 15 +- ...HoldingsLocalPackagesFormConfirmDelete.vue | 3 +- .../ERM/EHoldingsLocalPackagesList.vue | 15 +- .../ERM/EHoldingsLocalTitlesFormAdd.vue | 9 +- .../EHoldingsLocalTitlesFormConfirmDelete.vue | 3 +- .../ERM/EHoldingsLocalTitlesList.vue | 8 +- .../js/vue/components/ERM/LicensesFormAdd.vue | 3 +- .../ERM/LicensesFormConfirmDelete.vue | 3 +- koha-tmpl/intranet-tmpl/prog/js/vue/fetch.js | 243 +++++------------- t/cypress/integration/Agreements_spec.ts | 6 +- t/cypress/integration/Licenses_spec.ts | 6 +- t/cypress/integration/Packages_spec.ts | 15 +- t/cypress/integration/Titles_spec.ts | 15 +- 16 files changed, 135 insertions(+), 219 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue +++ a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue @@ -190,7 +190,7 @@ import AgreementLicenses from "./AgreementLicenses.vue" import AgreementRelationships from "./AgreementRelationships.vue" import Documents from "./Documents.vue" import { setMessage, setError, setWarning } from "../../messages" -import { fetchAgreement } from "../../fetch" +import { fetchAgreement, checkError } from "../../fetch" import { storeToRefs } from "pinia" export default { @@ -384,6 +384,7 @@ export default { } fetch(apiUrl, options) + .then(response => checkError(response, 1)) .then(response => { if (response.status == 200) { this.$router.push("/cgi-bin/koha/erm/agreements") --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormConfirmDelete.vue +++ a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormConfirmDelete.vue @@ -36,7 +36,7 @@