diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/feature-flags-configuration.xml b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/feature-flags-configuration.xml deleted file mode 100644 index d7f415e4a..000000000 --- a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/feature-flags-configuration.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - NoteFeatureProperties - org.exoplatform.container.ExtendedPropertyConfigurator - - - NoteFeatureProperties - Note Feature enablement flag - - - - - - org.exoplatform.groovyscript.text.TemplateService - - UIPortalApplication-head - addTemplateExtension - org.exoplatform.groovyscript.text.TemplateExtensionPlugin - - - templates - The list of templates to include in HTML Page Header with UIPortalApplication.gtmpl - war:/groovy/webui/workspace/UINotesHeadTemplate.gtmpl - - - - - diff --git a/notes-webapp/src/main/webapp/groovy/webui/workspace/UINotesHeadTemplate.gtmpl b/notes-webapp/src/main/webapp/groovy/webui/workspace/UINotesHeadTemplate.gtmpl deleted file mode 100644 index 180a6e0e5..000000000 --- a/notes-webapp/src/main/webapp/groovy/webui/workspace/UINotesHeadTemplate.gtmpl +++ /dev/null @@ -1,10 +0,0 @@ -<% - import org.exoplatform.commons.api.settings.ExoFeatureService; - def rcontext = _ctx.getRequestContext(); - ExoFeatureService featureService = uicomponent.getApplicationComponent(ExoFeatureService.class); - def userName = rcontext.getRemoteUser(); -%> - - diff --git a/notes-webapp/src/main/webapp/vue-app/notes-publication/initComponents.js b/notes-webapp/src/main/webapp/vue-app/notes-publication/initComponents.js index 0a52aa0c1..f1e6cbca0 100644 --- a/notes-webapp/src/main/webapp/vue-app/notes-publication/initComponents.js +++ b/notes-webapp/src/main/webapp/vue-app/notes-publication/initComponents.js @@ -6,6 +6,8 @@ import NotePublicationTargetList from './components/publish-option/NotePublicati import NoteScheduleOption from './components/schedule-option/NoteScheduleOption.vue'; import NotePublicationAdvancedOption from './components/advanced-option/NotePublicationAdvancedOption.vue'; +import * as notesService from '../../javascript/eXo/wiki/notesService.js'; + const components = { 'note-publication-drawer': NotePublicationDrawer, 'note-metadata-properties-form': NoteMetadataPropertiesForm, @@ -19,3 +21,10 @@ const components = { for (const key in components) { Vue.component(key, components[key]); } + + +if (!Vue.prototype.$notesService) { + window.Object.defineProperty(Vue.prototype, '$notesService', { + value: notesService, + }); +} diff --git a/notes-webapp/src/main/webapp/vue-app/notes-rich-editor/components/NoteFullRichEditor.vue b/notes-webapp/src/main/webapp/vue-app/notes-rich-editor/components/NoteFullRichEditor.vue index 791134120..b44a8b900 100644 --- a/notes-webapp/src/main/webapp/vue-app/notes-rich-editor/components/NoteFullRichEditor.vue +++ b/notes-webapp/src/main/webapp/vue-app/notes-rich-editor/components/NoteFullRichEditor.vue @@ -284,9 +284,6 @@ export default { }, isTranslation() { return !!this.noteObject?.lang; - }, - newPublicationDrawerEnabled() { - return eXo?.env?.portal?.newPublicationDrawerEnabled; } }, created() { @@ -402,15 +399,14 @@ export default { } }, postNote() { - if (this.newPublicationDrawerEnabled && this.publicationParams - && !this.isTranslation && !this.editMode) { + if (this.publicationParams && !this.isTranslation && !this.editMode) { this.openPublicationDrawer(this.noteObject); return; } this.postAndPublishNote(); }, postAndPublishNote(publicationSettings, note) { - if (this.newPublicationDrawerEnabled && this.publicationParams) { + if (this.publicationParams) { this.noteObject = note; this.updateData(); } diff --git a/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue b/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue index 45d051545..ff74163f3 100644 --- a/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue +++ b/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue @@ -314,7 +314,6 @@ :has-featured-image="hasFeaturedImage" />