diff --git a/content-webapp/src/main/webapp/WEB-INF/conf/news/news-configuration.xml b/content-webapp/src/main/webapp/WEB-INF/conf/news/news-configuration.xml index 62ca23c5e..ff5e5e0d4 100644 --- a/content-webapp/src/main/webapp/WEB-INF/conf/news/news-configuration.xml +++ b/content-webapp/src/main/webapp/WEB-INF/conf/news/news-configuration.xml @@ -53,6 +53,18 @@ + + + NewsScheduleAndFilterDisplayingFeatureProperties + org.exoplatform.container.ExtendedPropertyConfigurator + + + NewsScheduleAndFilterDisplayingFeatureProperties + Schedule and filter options displaying Feature enablement flag + + + + org.exoplatform.services.resources.ResourceBundleService diff --git a/content-webapp/src/main/webapp/news/components/NewsApp.vue b/content-webapp/src/main/webapp/news/components/NewsApp.vue index 6a8c7b1aa..8e319942e 100644 --- a/content-webapp/src/main/webapp/news/components/NewsApp.vue +++ b/content-webapp/src/main/webapp/news/components/NewsApp.vue @@ -46,12 +46,9 @@
{ + this.NewsScheduleAndFilterDisplaying = enabled; + const filterQueryParam = this.getQueryParam('filter'); + const searchQueryParam = this.getQueryParam('search'); + const spacesFilterParam = this.getQueryParam('spaces')?.split('_'); + if (filterQueryParam || searchQueryParam || spacesFilterParam) { + if (filterQueryParam) { + // set filter value, which will trigger news fetching + this.newsFilter = filterQueryParam; + } + if (searchQueryParam) { + // set search value + this.searchText = searchQueryParam; + } + if (spacesFilterParam) { + // set search value + this.spacesFilter = spacesFilterParam; + } + + } else if (filterQueryParam === null) { + this.newsFilter = enabled ? 'all' : this.filterOptions[0].value; + } else { + this.fetchNews(); } - - } else if (filterQueryParam === null) { - this.newsFilter = 'all'; - } else { - this.fetchNews(); - } + }); + this.$root.$on('activity-shared', (activityId, spaces, selectedApps) => { if (selectedApps === 'newsApp' && activityId && spaces && spaces.length > 0) { const spacesList = spaces.map(space => space.displayName); diff --git a/content-webapp/src/main/webapp/schedule-news-drawer/components/ExoScheduleNewsDrawer.vue b/content-webapp/src/main/webapp/schedule-news-drawer/components/ExoScheduleNewsDrawer.vue index 067f0068e..64d85975b 100644 --- a/content-webapp/src/main/webapp/schedule-news-drawer/components/ExoScheduleNewsDrawer.vue +++ b/content-webapp/src/main/webapp/schedule-news-drawer/components/ExoScheduleNewsDrawer.vue @@ -149,6 +149,7 @@ {{ $t('news.composer.postImmediately') }} {{ $t('news.composer.postLater') }} @@ -302,6 +303,7 @@ export default { audience: null, selectedAudience: null, disabled: true, + NewsScheduleAndFilterDisplaying: false, }), watch: { postDate(newVal, oldVal) { @@ -419,6 +421,7 @@ export default { } }, created() { + this.$featureService.isFeatureEnabled('NewsScheduleAndFilterDisplaying').then(enabled => this.NewsScheduleAndFilterDisplaying = enabled); this.selectedAudience= this.$t('news.composer.stepper.audienceSection.allUsers'); this.disabled = true; this.getAllowedTargets();