From 256f9b12dfc90e4e26fc8c40b76dfeebe2863983 Mon Sep 17 00:00:00 2001 From: Ayoub Zayati Date: Mon, 30 Sep 2024 13:16:42 +0200 Subject: [PATCH] fix: Fix displaying content detail for public sites - EXO-74419 - Meeds-io/MIPs#129 (#242) --- .../components/ContentRichEditor.vue | 2 +- .../components/ExoNewsDetailsApp.vue | 2 +- .../components/ExoNewsDetailsActivity.vue | 2 +- .../main/webapp/vue-app/services/newsServices.js | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/content-webapp/src/main/webapp/vue-app/news-activity-composer-app/components/ContentRichEditor.vue b/content-webapp/src/main/webapp/vue-app/news-activity-composer-app/components/ContentRichEditor.vue index afb13bebc..fd5531c97 100644 --- a/content-webapp/src/main/webapp/vue-app/news-activity-composer-app/components/ContentRichEditor.vue +++ b/content-webapp/src/main/webapp/vue-app/news-activity-composer-app/components/ContentRichEditor.vue @@ -659,7 +659,7 @@ export default { this.$refs.editor.closePluginsDrawer(); }, getAvailableLanguages() { - return this.$notesService.getAvailableLanguages().then(data => { + return this.$newsServices.getAvailableLanguages().then(data => { this.languages = data || []; this.languages.sort((a, b) => a.text.localeCompare(b.text)); this.allLanguages = this.languages; diff --git a/content-webapp/src/main/webapp/vue-app/news-details-app/components/ExoNewsDetailsApp.vue b/content-webapp/src/main/webapp/vue-app/news-details-app/components/ExoNewsDetailsApp.vue index d389be6d7..2a1f03f66 100644 --- a/content-webapp/src/main/webapp/vue-app/news-details-app/components/ExoNewsDetailsApp.vue +++ b/content-webapp/src/main/webapp/vue-app/news-details-app/components/ExoNewsDetailsApp.vue @@ -68,7 +68,7 @@ export default { }, methods: { getAvailableLanguages() { - return this.$notesService.getAvailableLanguages().then(data => { + return this.$newsServices.getAvailableLanguages().then(data => { this.languages = data || []; }); }, diff --git a/content-webapp/src/main/webapp/vue-app/news-details/components/ExoNewsDetailsActivity.vue b/content-webapp/src/main/webapp/vue-app/news-details/components/ExoNewsDetailsActivity.vue index d05e91d28..bfefe235c 100644 --- a/content-webapp/src/main/webapp/vue-app/news-details/components/ExoNewsDetailsActivity.vue +++ b/content-webapp/src/main/webapp/vue-app/news-details/components/ExoNewsDetailsActivity.vue @@ -101,7 +101,7 @@ export default { }, methods: { getAvailableLanguages() { - return this.$notesService.getAvailableLanguages().then(data => { + return this.$newsServices.getAvailableLanguages().then(data => { this.languages = data || []; }); }, diff --git a/content-webapp/src/main/webapp/vue-app/services/newsServices.js b/content-webapp/src/main/webapp/vue-app/services/newsServices.js index ca5639052..4dea4d5f4 100644 --- a/content-webapp/src/main/webapp/vue-app/services/newsServices.js +++ b/content-webapp/src/main/webapp/vue-app/services/newsServices.js @@ -277,6 +277,20 @@ export function deleteArticleTranslation(newsId, lang) { }); } +export function getAvailableLanguages() { + const lang = eXo?.env.portal.language || 'en'; + return fetch(`${newsConstants.PORTAL}/${newsConstants.PORTAL_REST}/notes/languages?lang=${lang}`, { + method: 'GET', + credentials: 'include', + }).then(resp => { + if (!resp || !resp.ok) { + throw new Error('Response code indicates a server error', resp); + } else { + return resp.json(); + } + }); +} + export function getArticleLanguages(articleId, withDrafts) { return fetch(`${newsConstants.CONTENT_API}/contents/translation/${articleId}?withDrafts=${withDrafts}`, { credentials: 'include',