From 8bb34859de98bd71ce06b7de3c1f801026d678d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20D=C3=A9nari=C3=A9?= Date: Tue, 4 Feb 2025 18:26:06 +0100 Subject: [PATCH 1/4] fix : when closing notes move drawer, there is a js error in console - MEEDS-8345 Before this fix, the notes move drawer use $ for jquery in closing event This is no more needed, so this commit removes it Resolves meeds-io/meeds#2876 --- .../vue-app/notes-treeview/components/NoteTreeviewDrawer.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewDrawer.vue b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewDrawer.vue index 159de9c955..1c3dac4fac 100644 --- a/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewDrawer.vue +++ b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewDrawer.vue @@ -961,7 +961,6 @@ export default { }, closeAllDrawer() { this.checkbox = false; - $('.spaceButtomNavigation').removeClass('hidden'); this.search = ''; if (this.exporting) { this.$root.$emit('cancel-export-notes'); From 59d806a14632523e35c987181314ff2747abef56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20D=C3=A9nari=C3=A9?= Date: Tue, 4 Feb 2025 18:28:37 +0100 Subject: [PATCH 2/4] fix : When trying to move a note to his parent, the "move" button is not disabled - MEED-8344 Before this fix, when moving a note, and choosing the parent of the current note, the move button is enabled This commit add a check to let this button deactivated in this case. In addition we update the target breadcrumb to empty it when the parent note is selected Resolves meeds-io/meeds#2879 --- .../vue-app/notes-treeview/components/NoteTreeviewDrawer.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewDrawer.vue b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewDrawer.vue index 1c3dac4fac..c84265f4bc 100644 --- a/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewDrawer.vue +++ b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewDrawer.vue @@ -771,7 +771,7 @@ export default { this.$root.$emit('include-page', note); this.$refs.breadcrumbDrawer.close(); } else if (this.movePage) { - if (note.noteId !== this.note.id) { + if (note.noteId !== this.note.id && note.noteId !== this.note.parentPageId) { this.$notesService.getNoteById(note.noteId,'', '', '', '', true).then(data => { this.breadcrumb = data?.breadcrumb || []; this.enableMove = true; @@ -779,6 +779,8 @@ export default { this.destinationNote = data; }); } else { + this.enableMove=false; + this.breadcrumb = []; Object.assign(this.destinationNote, this.note); } } else { From 4b894bd23bb4bb825f167eface3326efecb91e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20D=C3=A9nari=C3=A9?= Date: Tue, 4 Feb 2025 18:31:19 +0100 Subject: [PATCH 3/4] fix : error when creating the wiki in a space - MEED-8343 Before this fix, when accessing to the note app of a space the first time, 2 request getNotePage are launched in parallel. As the wiki not exists, 2 requests to create it are launched It make the note app not accessible This commit move the publish extension load after the NotesOverview is not instead of in parallel Resolves meeds-io/meeds#2880 --- .../src/main/webapp/vue-app/notes/components/NotesOverview.vue | 1 + notes-webapp/src/main/webapp/vue-app/notes/main.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 f491330203..1e0df07ce1 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 @@ -679,6 +679,7 @@ export default { }, mounted() { this.handleChangePages(); + Vue.prototype.$utils.includeExtensions('NotesExtension'); $(document).on('click', () => { this.translationsMenu = false; }); diff --git a/notes-webapp/src/main/webapp/vue-app/notes/main.js b/notes-webapp/src/main/webapp/vue-app/notes/main.js index 38c5653715..9e31f21d0b 100644 --- a/notes-webapp/src/main/webapp/vue-app/notes/main.js +++ b/notes-webapp/src/main/webapp/vue-app/notes/main.js @@ -51,5 +51,5 @@ export function init() { vuetify, i18n }, appElement, 'Notes Overview'); - }).finally(() => Vue.prototype.$utils.includeExtensions('NotesExtension')); + }); } From 0a69c8f8bc5a820a5dec64d53d9bdc725b712065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20D=C3=A9nari=C3=A9?= Date: Tue, 4 Feb 2025 18:36:08 +0100 Subject: [PATCH 4/4] fix : Error when first openinig notes page - MEED-8346 Before this fix, when opening a note not published, there is 2 requests resulting in 404 error. This create also errors logs in server log. This problem is due to the fact that, as the note is not published, there is no metadata associated. This issue ensure to take care of this case. Resolves meeds-io/meeds#2868 --- .../src/main/webapp/vue-app/notes/components/NotesOverview.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1e0df07ce1..e458ea0587 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 @@ -324,7 +324,7 @@ canPublish: canPublish, canSchedule: canScheduleNotePublication }" - :edit-mode="published" + :edit-mode="false" @publish="publishNote" />