From 727f6b7a16c14f326be6d570b35a452bb5708332 Mon Sep 17 00:00:00 2001 From: Ayoub Zayati Date: Tue, 2 Apr 2024 16:39:09 +0200 Subject: [PATCH] feat: Update old news webapp paths to content webapp paths - EXO-69634 - Meeds-io/MIPs#119 (#5) --- .../provider/MailTemplateProvider.java | 2 +- .../provider/MailTemplateProviderTest.java | 2 +- .../latest-news/components/ExoLatestNews.vue | 2 +- .../components/ExoNewsActivityComposer.vue | 2 +- .../news-details/components/ExoNewsDetailsBody.vue | 2 +- .../mobile/ExoNewsDetailsToolBarMobile.vue | 2 +- .../activity-stream-extensions/extensions.js | 2 +- .../components/favorites/NewsFavoriteItem.vue | 2 +- .../components/settings/NewsSettingsDrawer.vue | 14 +++++++------- .../components/views/NewsCardsViewItem.vue | 2 +- .../components/views/NewsLatestViewItem.vue | 2 +- .../components/views/NewsListTemplateViewItem.vue | 2 +- .../components/views/NewsMosaicView.vue | 2 +- .../components/views/NewsSliderView.vue | 2 +- .../components/views/NewsStoriesViewItem.vue | 2 +- .../main/webapp/news/components/NewsAppItem.vue | 2 +- .../src/main/webapp/skin/less/newsExtensions.less | 2 +- .../src/main/webapp/skin/less/newsListView.less | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) diff --git a/content-service/src/main/java/io/meeds/news/notification/provider/MailTemplateProvider.java b/content-service/src/main/java/io/meeds/news/notification/provider/MailTemplateProvider.java index 75754ca2f..c8ce1fc2d 100644 --- a/content-service/src/main/java/io/meeds/news/notification/provider/MailTemplateProvider.java +++ b/content-service/src/main/java/io/meeds/news/notification/provider/MailTemplateProvider.java @@ -98,7 +98,7 @@ protected MessageInfo makeMessage(NotificationContext ctx) { String contentSpaceName = notification.getValueOwnerParameter(NotificationConstants.CONTENT_SPACE); String authorAvatarUrl = notification.getValueOwnerParameter(NotificationConstants.AUTHOR_AVATAR_URL); String baseUrl = PropertyManager.getProperty("gatein.email.domain.url"); - String illustrationUrl = baseUrl.concat("/news/images/newsImageDefault.png"); + String illustrationUrl = baseUrl.concat("/content/images/newsImageDefault.png"); String activityLink = notification.getValueOwnerParameter(NotificationConstants.ACTIVITY_LINK); String context = notification.getValueOwnerParameter(NotificationConstants.CONTEXT); diff --git a/content-service/src/test/java/io/meeds/news/notification/provider/MailTemplateProviderTest.java b/content-service/src/test/java/io/meeds/news/notification/provider/MailTemplateProviderTest.java index 781dc7317..62edf4edf 100644 --- a/content-service/src/test/java/io/meeds/news/notification/provider/MailTemplateProviderTest.java +++ b/content-service/src/test/java/io/meeds/news/notification/provider/MailTemplateProviderTest.java @@ -151,7 +151,7 @@ public void shouldInstantiateMailTemplate() { when(encoder.encode("title")).thenReturn("title"); when(encoder.encode("space1")).thenReturn("space1"); when(encoder.encode("jean")).thenReturn("jean"); - when(encoder.encode("http://localhost:8080/news/images/newsImageDefault.png")).thenReturn("http://localhost:8080/news/images/newsImageDefault.png"); + when(encoder.encode("http://localhost:8080/content/images/newsImageDefault.png")).thenReturn("http://localhost:8080/content/images/newsImageDefault.png"); when(encoder.encode("COMMENT MY NEWS")).thenReturn("COMMENT MY NEWS"); when(encoder.encode("http://localhost:8080/portal/intranet/activity?id=39")).thenReturn("http://localhost:8080/portal/intranet/activity?id=39"); when(notification.getValueOwnerParameter("read")).thenReturn("true"); diff --git a/content-webapp/src/main/webapp/latest-news/components/ExoLatestNews.vue b/content-webapp/src/main/webapp/latest-news/components/ExoLatestNews.vue index 91a13ad73..27f950f40 100644 --- a/content-webapp/src/main/webapp/latest-news/components/ExoLatestNews.vue +++ b/content-webapp/src/main/webapp/latest-news/components/ExoLatestNews.vue @@ -216,7 +216,7 @@ export default { for (let i=0; i - +
diff --git a/content-webapp/src/main/webapp/news-details/components/ExoNewsDetailsBody.vue b/content-webapp/src/main/webapp/news-details/components/ExoNewsDetailsBody.vue index 45e067fd4..2b635c657 100644 --- a/content-webapp/src/main/webapp/news-details/components/ExoNewsDetailsBody.vue +++ b/content-webapp/src/main/webapp/news-details/components/ExoNewsDetailsBody.vue @@ -23,7 +23,7 @@
- +

{{ $t('news.archive.text') }}

diff --git a/content-webapp/src/main/webapp/news-details/components/mobile/ExoNewsDetailsToolBarMobile.vue b/content-webapp/src/main/webapp/news-details/components/mobile/ExoNewsDetailsToolBarMobile.vue index a5093e1b2..2c468bf6d 100644 --- a/content-webapp/src/main/webapp/news-details/components/mobile/ExoNewsDetailsToolBarMobile.vue +++ b/content-webapp/src/main/webapp/news-details/components/mobile/ExoNewsDetailsToolBarMobile.vue @@ -89,7 +89,7 @@ export default { return this.news && this.news.spaceMember ? this.news.spaceUrl : `${eXo.env.portal.context}/${eXo.env.portal.metaPortalName}`; }, illustrationUrl() { - return this.news && this.news.illustrationURL ? this.news.illustrationURL.concat('&size=315x128').toString() : '/news/images/news.png'; + return this.news && this.news.illustrationURL ? this.news.illustrationURL.concat('&size=315x128').toString() : '/content/images/news.png'; }, publicationState() { return this.news && this.news.publicationState; diff --git a/content-webapp/src/main/webapp/news-extensions/activity-stream-extensions/extensions.js b/content-webapp/src/main/webapp/news-extensions/activity-stream-extensions/extensions.js index cac149f8f..d0cbe8111 100644 --- a/content-webapp/src/main/webapp/news-extensions/activity-stream-extensions/extensions.js +++ b/content-webapp/src/main/webapp/news-extensions/activity-stream-extensions/extensions.js @@ -51,7 +51,7 @@ const newsActivityTypeExtensionOptions = { hideOnDelete: true, supportsThumbnail: true, windowTitlePrefixKey: 'news.window.title', - getThumbnail: (activity) => activity?.news?.illustrationURL && `${activity?.news?.illustrationURL}&size=305x285` || '/news/images/news.png', + getThumbnail: (activity) => activity?.news?.illustrationURL && `${activity?.news?.illustrationURL}&size=305x285` || '/content/images/news.png', getThumbnailProperties: (activity) => !(activity?.news?.illustrationURL) && { height: '90px', width: '90px', diff --git a/content-webapp/src/main/webapp/news-extensions/favorite-drawer-extensions/components/favorites/NewsFavoriteItem.vue b/content-webapp/src/main/webapp/news-extensions/favorite-drawer-extensions/components/favorites/NewsFavoriteItem.vue index 70ebd06c3..18f47804f 100644 --- a/content-webapp/src/main/webapp/news-extensions/favorite-drawer-extensions/components/favorites/NewsFavoriteItem.vue +++ b/content-webapp/src/main/webapp/news-extensions/favorite-drawer-extensions/components/favorites/NewsFavoriteItem.vue @@ -31,7 +31,7 @@ + src="/content/images/news.png"> diff --git a/content-webapp/src/main/webapp/news-list-view/components/settings/NewsSettingsDrawer.vue b/content-webapp/src/main/webapp/news-list-view/components/settings/NewsSettingsDrawer.vue index 89cf542de..9467c08f0 100644 --- a/content-webapp/src/main/webapp/news-list-view/components/settings/NewsSettingsDrawer.vue +++ b/content-webapp/src/main/webapp/news-list-view/components/settings/NewsSettingsDrawer.vue @@ -227,19 +227,19 @@ export default { }, previewTemplate() { if ( this.viewTemplate === 'NewsLatest') { - return '/news/images/latestNews.png'; + return '/content/images/latestNews.png'; } else if ( this.viewTemplate === 'NewsSlider') { - return '/news/images/sliderNews.png'; + return '/content/images/sliderNews.png'; } else if ( this.viewTemplate === 'NewsAlert') { - return '/news/images/alertNews.png'; + return '/content/images/alertNews.png'; } else if ( this.viewTemplate === 'NewsList') { - return '/news/images/listNews.png'; + return '/content/images/listNews.png'; } else if ( this.viewTemplate === 'NewsMosaic') { - return '/news/images/mosaicNews.png'; + return '/content/images/mosaicNews.png'; } else if ( this.viewTemplate === 'NewsStories') { - return '/news/images/storiesNews.png'; + return '/content/images/storiesNews.png'; } else if ( this.viewTemplate === 'NewsCards') { - return '/news/images/cardsNews.png'; + return '/content/images/cardsNews.png'; } else { return ''; } diff --git a/content-webapp/src/main/webapp/news-list-view/components/views/NewsCardsViewItem.vue b/content-webapp/src/main/webapp/news-list-view/components/views/NewsCardsViewItem.vue index b41722d56..acca33fec 100644 --- a/content-webapp/src/main/webapp/news-list-view/components/views/NewsCardsViewItem.vue +++ b/content-webapp/src/main/webapp/news-list-view/components/views/NewsCardsViewItem.vue @@ -155,7 +155,7 @@ export default { return this.showArticleImage && this.item && this.item.illustrationURL && this.item.illustrationURL.concat('&size=235x140').toString() - || '/news/images/news.png'; + || '/content/images/news.png'; }, isHiddenSpace() { return this.item && !this.item.spaceMember && this.item.hiddenSpace; diff --git a/content-webapp/src/main/webapp/news-list-view/components/views/NewsLatestViewItem.vue b/content-webapp/src/main/webapp/news-list-view/components/views/NewsLatestViewItem.vue index f69eb2507..285163da0 100644 --- a/content-webapp/src/main/webapp/news-list-view/components/views/NewsLatestViewItem.vue +++ b/content-webapp/src/main/webapp/news-list-view/components/views/NewsLatestViewItem.vue @@ -114,7 +114,7 @@ export default { return this.showArticleImage || (!this.showArticleImage && !this.index ); }, img() { - return this.illustrationURL() || '/news/images/news.png'; + return this.illustrationURL() || '/content/images/news.png'; }, displayDate() { return this.item.publishDate && this.item.publishDate.time && new Date(this.item.publishDate.time); diff --git a/content-webapp/src/main/webapp/news-list-view/components/views/NewsListTemplateViewItem.vue b/content-webapp/src/main/webapp/news-list-view/components/views/NewsListTemplateViewItem.vue index 2c6710f64..230b55cd5 100644 --- a/content-webapp/src/main/webapp/news-list-view/components/views/NewsListTemplateViewItem.vue +++ b/content-webapp/src/main/webapp/news-list-view/components/views/NewsListTemplateViewItem.vue @@ -119,7 +119,7 @@ export default { return this.selectedOption?.showArticleReactions; }, articleImage() { - return this.item?.illustrationURL?.concat('&size=70x70').toString() || '/news/images/news.png'; + return this.item?.illustrationURL?.concat('&size=70x70').toString() || '/content/images/news.png'; }, extraClass() { return (!this.showArticleSummary || !this.showArticleTitle) && 'text-truncate-2' || 'article-title' ; diff --git a/content-webapp/src/main/webapp/news-list-view/components/views/NewsMosaicView.vue b/content-webapp/src/main/webapp/news-list-view/components/views/NewsMosaicView.vue index 6a3059667..fc30d800b 100644 --- a/content-webapp/src/main/webapp/news-list-view/components/views/NewsMosaicView.vue +++ b/content-webapp/src/main/webapp/news-list-view/components/views/NewsMosaicView.vue @@ -35,7 +35,7 @@ class="articleLink d-block" target="_self" :href="articleUrl(item)"> - +
diff --git a/content-webapp/src/main/webapp/news-list-view/components/views/NewsStoriesViewItem.vue b/content-webapp/src/main/webapp/news-list-view/components/views/NewsStoriesViewItem.vue index 8a2659723..8b0acdae0 100644 --- a/content-webapp/src/main/webapp/news-list-view/components/views/NewsStoriesViewItem.vue +++ b/content-webapp/src/main/webapp/news-list-view/components/views/NewsStoriesViewItem.vue @@ -112,7 +112,7 @@ export default { return this.selectedOption && this.selectedOption.showArticleImage; }, articleImage() { - return this.showArticleImage && this.item.illustrationURL !== null ? this.item.illustrationURL.concat('&size=140x210').toString() : '/news/images/news.png'; + return this.showArticleImage && this.item.illustrationURL !== null ? this.item.illustrationURL.concat('&size=140x210').toString() : '/content/images/news.png'; }, articleUrl() { return eXo.env.portal.userName !== '' ? this.item.url : `${eXo.env.portal.context}/${eXo.env.portal.portalName}/news-detail?newsId=${this.item.id}`; diff --git a/content-webapp/src/main/webapp/news/components/NewsAppItem.vue b/content-webapp/src/main/webapp/news/components/NewsAppItem.vue index 3e2687ec1..351c88ebc 100644 --- a/content-webapp/src/main/webapp/news/components/NewsAppItem.vue +++ b/content-webapp/src/main/webapp/news/components/NewsAppItem.vue @@ -167,7 +167,7 @@ export default { return this.news && this.news.authorProfileURL && this.news.authorProfileURL.split('/').pop(); }, illustrationUrl() { - return this.news?.illustrationURL ? this.news.illustrationURL.concat('&size=150x150').toString() : '/news/images/news.png'; + return this.news?.illustrationURL ? this.news.illustrationURL.concat('&size=150x150').toString() : '/content/images/news.png'; }, }, methods: { diff --git a/content-webapp/src/main/webapp/skin/less/newsExtensions.less b/content-webapp/src/main/webapp/skin/less/newsExtensions.less index 7f08bcf33..7c45a877b 100644 --- a/content-webapp/src/main/webapp/skin/less/newsExtensions.less +++ b/content-webapp/src/main/webapp/skin/less/newsExtensions.less @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -@images-path: "/news/images"; +@images-path: "/content/images"; .composerActions .actionItem .actionItemIcon .newsComposerIcon { background: url("@{images-path}/writeAnArticle.png") no-repeat; diff --git a/content-webapp/src/main/webapp/skin/less/newsListView.less b/content-webapp/src/main/webapp/skin/less/newsListView.less index 987f81cf5..20b7b09ac 100644 --- a/content-webapp/src/main/webapp/skin/less/newsListView.less +++ b/content-webapp/src/main/webapp/skin/less/newsListView.less @@ -1418,7 +1418,7 @@ p.caption-title:after { float: right ~'; /** orientation=lt */ '; float: left ~'; /** orientation=rt */ '; .bookImage { - content: url("/news/images/book.png"); + content: url("/content/images/book.png"); height: 12rem; float: right ~'; /** orientation=lt */ '; float: left ~'; /** orientation=rt */ ';