From 3ca6b6f3493811d297d711c9efaddc17f1444c48 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Mon, 8 Jul 2024 10:17:00 +0100 Subject: [PATCH] fix: Avoid error message display on page display when session timeout - MEED-7171 - Meeds-io/meeds#2249 (#509) Prior to this change, when displaying a page while the session timed out, an alert message is displayed. This change ensures to display the alert message only when the user makes an action on Kudos module and not on loading time. --- .../src/main/resources/locale/addon/Kudos_en.properties | 2 ++ .../src/main/webapp/vue-app/kudos/components/KudosApp.vue | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kudos-services/src/main/resources/locale/addon/Kudos_en.properties b/kudos-services/src/main/resources/locale/addon/Kudos_en.properties index dd6019c96..a05f27719 100644 --- a/kudos-services/src/main/resources/locale/addon/Kudos_en.properties +++ b/kudos-services/src/main/resources/locale/addon/Kudos_en.properties @@ -103,3 +103,5 @@ kudos.administration.label=Decide number of kudos available for a period kudos.administration.apply=Apply kudos.administration.cancel=Cancel kudos.administration.reset=Reset + +kudos.unkownErrorWhileRetrievingSettings=An unknown error happened while retrieving kudos settings. Please try again later or contact the administrator. diff --git a/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue b/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue index 2b659a802..1a4e38ff8 100644 --- a/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue +++ b/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosApp.vue @@ -455,9 +455,7 @@ export default { this.allKudosSent = allKudos && allKudos.kudos || []; }); }) - .catch(e => { - this.error = e; - }); + .catch(e => console.debug(e)); }, closeDrawer() { this.resetAudienceChoice(); @@ -533,7 +531,7 @@ export default { this.entityOwner = null; }) .catch(e => { - this.error = String(e); + this.error = this.$te(e?.message) ? this.$t(e.message) : this.$t('kudos.unkownErrorWhileRetrievingSettings'); console.error('Error retrieving entity details with type and id', this.entityType, this.entityId, e); }); }