From ab5489a3c52ae16806bb7e4ecdbeed52d05fe682 Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <boubaker.khanfir@exoplatform.com>
Date: Tue, 19 Sep 2023 04:13:07 +0100
Subject: [PATCH] fix: Fix Note WYSIWYG style - MEED-2534 - Meeds-io/meeds#1102
 Prior to this change, the Note editor content wasn't using the reset style
 classes for displaying Rich editor contents. This change will add those
 classes to ensure hamonizing the display of reach editors with other tools.

---
 .../javascript/eXo/wiki/ckeditor/plugins/ExoWikiPage.vue      | 2 +-
 .../{ExoNotesFavoriteAction.vue => NoteFavoriteAction.vue}    | 0
 .../main/webapp/vue-app/notes/components/NotesOverview.vue    | 4 ++--
 notes-webapp/src/main/webapp/vue-app/notes/initComponents.js  | 4 ++--
 .../webapp/vue-app/wikiSearch/components/WikiSearchCard.vue   | 4 ++--
 .../src/main/webapp/vue-app/wikiSearch/initComponents.js      | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename notes-webapp/src/main/webapp/vue-app/notes/components/{ExoNotesFavoriteAction.vue => NoteFavoriteAction.vue} (100%)

diff --git a/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/ExoWikiPage.vue b/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/ExoWikiPage.vue
index da78e0fe0f..ab5db54883 100644
--- a/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/ExoWikiPage.vue
+++ b/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/ExoWikiPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="wiki-include-page" v-html="pageContent"></div>
+  <div class="wiki-include-page reset-style-box rich-editor-content" v-sanitized-html="pageContent"></div>
 </template>
 
 <script>
diff --git a/notes-webapp/src/main/webapp/vue-app/notes/components/ExoNotesFavoriteAction.vue b/notes-webapp/src/main/webapp/vue-app/notes/components/NoteFavoriteAction.vue
similarity index 100%
rename from notes-webapp/src/main/webapp/vue-app/notes/components/ExoNotesFavoriteAction.vue
rename to notes-webapp/src/main/webapp/vue-app/notes/components/NoteFavoriteAction.vue
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 501dac468f..c5d575efd3 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
@@ -60,7 +60,7 @@
                 </v-tooltip>
               </div>
 
-              <exo-notes-favorite-action
+              <note-favorite-action
                 :note="note"
                 :activity-id="note.activityId" />
               <div
@@ -357,7 +357,7 @@ export default {
   computed: {
     notesContentProcessor() {
       return {
-        template: `<div>${this.formatContent(this.noteContent)}</div>`,
+        template: `<div class='reset-style-box rich-editor-content'>${this.formatContent(this.noteContent)}</div>`,
         data() {
           return {
             vTreeComponent: {
diff --git a/notes-webapp/src/main/webapp/vue-app/notes/initComponents.js b/notes-webapp/src/main/webapp/vue-app/notes/initComponents.js
index e396ab06d1..17f7faae89 100644
--- a/notes-webapp/src/main/webapp/vue-app/notes/initComponents.js
+++ b/notes-webapp/src/main/webapp/vue-app/notes/initComponents.js
@@ -6,7 +6,7 @@ import NoteImportDrawer from './components/NoteImportDrawer.vue';
 import AttachmentsNotesUploadInput from './components/importNotes/AttachmentsNotesUploadInput.vue';
 import AttachmentsUploadedNotes from './components/importNotes/AttachmentsNotesUploaded.vue';
 import AttachmentsNotesItem from './components/importNotes/AttachmentsNotesItem.vue';
-import ExoNotesFavoriteAction from './components/ExoNotesFavoriteAction.vue';
+import NoteFavoriteAction from './components/NoteFavoriteAction.vue';
 
 const components = {
   'notes-overview': NotesOverview,
@@ -17,7 +17,7 @@ const components = {
   'attachments-notes-upload-input': AttachmentsNotesUploadInput,
   'attachments-uploaded-notes': AttachmentsUploadedNotes,
   'attachments-notes-item': AttachmentsNotesItem,
-  'exo-notes-favorite-action': ExoNotesFavoriteAction
+  'note-favorite-action': NoteFavoriteAction
 };
 
 for (const key in components) {
diff --git a/notes-webapp/src/main/webapp/vue-app/wikiSearch/components/WikiSearchCard.vue b/notes-webapp/src/main/webapp/vue-app/wikiSearch/components/WikiSearchCard.vue
index e150305b99..044af8a239 100644
--- a/notes-webapp/src/main/webapp/vue-app/wikiSearch/components/WikiSearchCard.vue
+++ b/notes-webapp/src/main/webapp/vue-app/wikiSearch/components/WikiSearchCard.vue
@@ -3,7 +3,7 @@
     class="wikiSearchCard d-flex flex-column border-radius box-shadow"
     flat
     min-height="227">
-    <exo-notes-favorite-action
+    <note-favorite-action
       :note="result"
       absolute
       top="0"
@@ -35,7 +35,7 @@
             <a
               :title="wikiTitleText"
               class="wikiTitle px-3 pt-2 pb-1 ps-0 text-start text-truncate"
-              v-html="wikiTitle">
+              v-sanitized-html="wikiTitle">
             </a>
           </v-list-item-title>
           <v-list-item-subtitle>
diff --git a/notes-webapp/src/main/webapp/vue-app/wikiSearch/initComponents.js b/notes-webapp/src/main/webapp/vue-app/wikiSearch/initComponents.js
index 4aaf5e1187..0f878b98cf 100644
--- a/notes-webapp/src/main/webapp/vue-app/wikiSearch/initComponents.js
+++ b/notes-webapp/src/main/webapp/vue-app/wikiSearch/initComponents.js
@@ -1,9 +1,9 @@
 import WikiSearchCard from './components/WikiSearchCard.vue';
-import ExoNotesFavoriteAction from '../notes/components/ExoNotesFavoriteAction.vue';
+import NoteFavoriteAction from '../notes/components/NoteFavoriteAction.vue';
 
 const components = {
   'wiki-search-card': WikiSearchCard,
-  'exo-notes-favorite-action': ExoNotesFavoriteAction,
+  'note-favorite-action': NoteFavoriteAction,
 };
 
 for (const key in components) {