From 8b3afa6e1ebb557116b59edf97117a5110a6ce11 Mon Sep 17 00:00:00 2001 From: Sofien Haj Chedhli Date: Mon, 14 Oct 2024 11:11:26 +0100 Subject: [PATCH 1/2] feat: Update notes overview to realy on the overview extensions - EXO-73250 - Meeds-io/meeds#2478 (#1158) --- .../wiki/service/impl/NoteServiceImpl.java | 5 ++ .../wiki/service/rest/NotesRestService.java | 3 ++ .../components/NoteFullRichEditor.vue | 2 +- .../notes/components/NotesOverview.vue | 50 +++++++++++++++---- .../notes/components/NotesTranslationMenu.vue | 2 +- .../src/main/webapp/vue-app/notes/main.js | 4 ++ 6 files changed, 54 insertions(+), 12 deletions(-) diff --git a/notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java b/notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java index 1f0c864e66..82bb615e86 100644 --- a/notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java +++ b/notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java @@ -1436,6 +1436,11 @@ public Page getNoteByIdAndLang(Long pageId, Identity userIdentity, String source page.setMetadatas(retrieveMetadataItems(pageId + "-" + lang, userIdentity.getUserId())); } } + if (publishedVersion == null && lang != null) { + //no version with lang, set the latest version without lang id + publishedVersion = dataStorage.getPublishedVersionByPageIdAndLang(pageId, null); + page.setLatestVersionId(publishedVersion == null ? null : publishedVersion.getId()); + } return page; } diff --git a/notes-service/src/main/java/org/exoplatform/wiki/service/rest/NotesRestService.java b/notes-service/src/main/java/org/exoplatform/wiki/service/rest/NotesRestService.java index 3c78e38359..6887961a58 100644 --- a/notes-service/src/main/java/org/exoplatform/wiki/service/rest/NotesRestService.java +++ b/notes-service/src/main/java/org/exoplatform/wiki/service/rest/NotesRestService.java @@ -226,6 +226,9 @@ public Response getNote(@Parameter(description = "NoteBook Type", required = tru } if (StringUtils.isNotBlank(lang)) { note = noteService.getNoteByIdAndLang(Long.valueOf(note.getId()), identity, source, lang); + } else { + PageVersion pageVersion = noteService.getPublishedVersionByPageIdAndLang(Long.valueOf(note.getId()), null); + note.setLatestVersionId(pageVersion == null ? null : pageVersion.getId()); } String content = note.getContent(); if (content.contains(Utils.NOTE_LINK)) { 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 6293029094..c493ba1f00 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 @@ -293,7 +293,7 @@ export default { this.$root.$on('close-featured-image-byOverlay', this.closeFeaturedImageDrawerByOverlay); document.addEventListener('note-custom-plugins', this.openCustomPluginsDrawer); - document.addEventListener('notes-editor-extensions-updated', this.refreshEditorExtensions); + document.addEventListener('notes-extensions-updated', this.refreshEditorExtensions); }, methods: { metadataUpdated(properties) { 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 689b9c440d..fd1f7e3aa9 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 @@ -133,16 +133,26 @@ width="100%" max-height="400" />
- +

+ {{ noteTitle }} - - + + + + + +

0) { + components.push(...overviewComponents); + } if (components && components.length > 0) { components.forEach(cmp => { Vue.component(cmp.componentName, cmp.componentOptions); From 7b75e597c5752d84db968aa93bd0621b5e7ad4a3 Mon Sep 17 00:00:00 2001 From: Sofien Haj Chedhli Date: Mon, 14 Oct 2024 16:17:08 +0100 Subject: [PATCH 2/2] feat: Update note editor config to hide unnecessary extensions in single note view - EXO-74712 - Meeds-io/MIPs#161 (#1164) --- .../src/main/webapp/WEB-INF/conf/wiki/ckeditor/config.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/ckeditor/config.js b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/ckeditor/config.js index 6231ce7741..80a91a367e 100644 --- a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/ckeditor/config.js +++ b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/ckeditor/config.js @@ -35,6 +35,7 @@ CKEDITOR.editorConfig = function (config) { if (webPageNote) { blocksToolbarGroup.splice(blocksToolbarGroup.indexOf('tagSuggester'), 1); blocksToolbarGroup.splice(blocksToolbarGroup.indexOf('InsertOptions'), 1); + blocksToolbarGroup.splice(blocksToolbarGroup.indexOf('attachFile'), 1); } const toolbar = [ {name: 'accessibility', items: ['A11ychecker']}, @@ -69,9 +70,12 @@ CKEDITOR.editorConfig = function (config) { }, { name: 'blocks', - items: ['Blockquote', 'attachFile'] + items: ['Blockquote'] }, ]; + if (!webPageNote) { + mobileToolbar[mobileToolbar.findIndex(item => item.name ==='blocks')].items.push('attachFile'); + } let extraPlugins = `a11ychecker,balloonpanel,indent,indentblock,indentlist,codesnippet,sharedspace,copyformatting,table,tabletools,embedsemantic,autolink,colordialog${!webPageNote && ',tagSuggester' || ''},emoji,link,font,justify,widget,${!webPageNote && ',insertOptions' || ''},contextmenu,tabletools,tableresize,toc,linkBalloon,suggester`; let removePlugins = `image,confirmBeforeReload,maximize,resize,autoembed${webPageNote && ',tagSuggester' || ''}`;