diff --git a/notes-service/src/main/java/io/meeds/notes/rest/model/NoteReorder.java b/notes-service/src/main/java/io/meeds/notes/rest/model/NoteReorder.java
new file mode 100644
index 0000000000..6f86ec3f71
--- /dev/null
+++ b/notes-service/src/main/java/io/meeds/notes/rest/model/NoteReorder.java
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.notes.rest.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class NoteReorder {
+
+  private String       pageId;
+
+  private String       wikiType;
+
+  private String       wikiOwner;
+
+  private String       sourceParentId;
+
+  private String       targetParentId;
+
+  private List<String> sourceOrderedIds;
+
+  private List<String> targetOrderedIds;
+
+}
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageEntity.java b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageEntity.java
index c90cfa6802..81ec90cbf8 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageEntity.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/jpa/entity/PageEntity.java
@@ -23,22 +23,7 @@
 import java.util.List;
 import java.util.Set;
 
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.CollectionTable;
-import jakarta.persistence.Column;
-import jakarta.persistence.ElementCollection;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.SequenceGenerator;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -49,8 +34,8 @@
 @NamedQuery(name = "wikiPage.getPageOfWikiByName", query = "SELECT p FROM WikiPageEntity p JOIN p.wiki w WHERE p.name = :name AND w.type = :type AND w.owner = :owner AND p.deleted = false")
 @NamedQuery(name = "wikiPage.getAllPagesOfWiki", query = "SELECT p FROM WikiPageEntity p JOIN p.wiki w WHERE w.type = :type AND w.owner = :owner")
 @NamedQuery(name = "wikiPage.getPagesOfWiki", query = "SELECT p FROM WikiPageEntity p JOIN p.wiki w WHERE w.type = :type AND w.owner = :owner AND p.deleted = :deleted")
-@NamedQuery(name = "wikiPage.getChildrenPages", query = "SELECT p FROM WikiPageEntity p WHERE p.parentPage.id = :id AND p.deleted = false ORDER BY p.name")
-@NamedQuery(name = "wikiPage.getAllChildrenPages", query = "SELECT p FROM WikiPageEntity p WHERE p.parentPage.id = :id ORDER BY p.name")
+@NamedQuery(name = "wikiPage.getChildrenPages", query = "SELECT p FROM WikiPageEntity p WHERE p.parentPage.id = :id AND p.deleted = false ORDER BY p.position ASC, p.name ASC")
+@NamedQuery(name = "wikiPage.getAllChildrenPages", query = "SELECT p FROM WikiPageEntity p WHERE p.parentPage.id = :id ORDER BY p.position ASC, p.name ASC")
 @NamedQuery(name = "wikiPage.getRelatedPages", query = "SELECT p FROM WikiPageEntity p INNER JOIN p.relatedPages r where r.id = :pageId")
 @NamedQuery(name = "wikiPage.getAllPagesBySyntax", query = "SELECT p FROM WikiPageEntity p WHERE p.syntax = :syntax OR p.syntax IS NULL ORDER BY p.updatedDate DESC")
 @NamedQuery(name = "wikiPage.countPageChildrenById", query = "SELECT COUNT(*) FROM WikiPageEntity p WHERE p.parentPage.id = :id AND p.deleted = false")
@@ -75,6 +60,7 @@ public class PageEntity extends BasePageEntity {
   private PageEntity parentPage;
 
   @OneToMany(mappedBy = "parentPage")
+  @OrderBy("position ASC, name ASC")
   @EqualsAndHashCode.Exclude
   private List<PageEntity>        children;
 
@@ -126,4 +112,7 @@ public class PageEntity extends BasePageEntity {
   @Column(name = "DELETED")
   private boolean deleted;
 
+  @Column(name = "POSITION")
+  private Integer position;
+
 }
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/service/NoteService.java b/notes-service/src/main/java/org/exoplatform/wiki/service/NoteService.java
index 0e12d810ec..91b41dd34a 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/service/NoteService.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/service/NoteService.java
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.util.List;
 
+import io.meeds.notes.rest.model.NoteReorder;
 import org.gatein.api.EntityNotFoundException;
 
 import org.exoplatform.commons.utils.PageList;
@@ -997,4 +998,11 @@ default boolean canViewNote(String pageId, String username) {
    */
   boolean canViewNote(Page page, String username);
 
+  /**
+   * @param noteReorder the payload object encapsulating the reordering details.
+   * @param userIdentity user Identity
+   */
+  default void updateNotesPosition(NoteReorder noteReorder, Identity userIdentity) throws IllegalAccessException {
+    throw new UnsupportedOperationException();
+  }
 }
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 be1a7a8af1..2e80929a11 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
@@ -33,6 +33,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import io.meeds.notes.rest.model.NoteReorder;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.LocaleUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -1893,6 +1894,16 @@ public void markNoteAsViewed(Page note, Identity userIdentity) {
     }
   }
 
+  public void updateNotesPosition(NoteReorder noteReorder, Identity userIdentity) throws IllegalAccessException {
+    Page existingNote = getNoteById(noteReorder.getPageId());
+    if (existingNote == null) {
+      throw new EntityNotFoundException("Note to update not found");
+    } else if (userIdentity == null || !canEditNote(existingNote, userIdentity.getUserId())) {
+      throw new IllegalAccessException("User does not have edit the note.");
+    }
+    dataStorage.updateNotesPosition(noteReorder);
+  }
+
   /******* Private methods *******/
 
   private void deleteNoteMetadataProperties(Page note, String lang, String objectType) throws Exception {
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 a4908bad2b..8c28c61719 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
@@ -53,6 +53,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
+import io.meeds.notes.rest.model.NoteReorder;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.LocaleUtils;
@@ -1474,6 +1475,24 @@ public Response markNoteAsViewed(@Parameter(description = "News id") @PathParam(
     }
   }
 
+
+  @POST
+  @Path("/reorder")
+  @Operation(summary = "Reorder a note", method = "POST", description = "This reorder a note.")
+  @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Request fulfilled"),
+                          @ApiResponse(responseCode = "401", description = "User not authorized to get the note"),
+                          @ApiResponse(responseCode = "500", description = "Internal server error") })
+  public Response reorderNotes(@RequestBody NoteReorder request) {
+    try {
+      noteService.updateNotesPosition(request, ConversationState.getCurrent().getIdentity());
+      return Response.ok().build();
+    } catch (IllegalArgumentException e) {
+      return Response.status(Response.Status.BAD_REQUEST).build();
+    } catch (IllegalAccessException e) {
+      return Response.status(Response.Status.UNAUTHORIZED).build();
+    }
+  }
+
   private List<JsonNodeData> getJsonTree(WikiPageParams params, Map<String, Object> context, Identity identity, Locale locale) throws Exception {
     Wiki noteBook = noteBookService.getWikiByTypeAndOwner(params.getType(), params.getOwner());
     WikiTreeNode noteBookNode = new WikiTreeNode(noteBook);
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/storage/NoteDataStorage.java b/notes-service/src/main/java/org/exoplatform/wiki/storage/NoteDataStorage.java
index 5e7b3999a7..8dd658587d 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/storage/NoteDataStorage.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/storage/NoteDataStorage.java
@@ -34,6 +34,7 @@
 import java.util.List;
 import java.util.Set;
 
+import io.meeds.notes.rest.model.NoteReorder;
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.api.persistence.ExoTransactional;
@@ -991,6 +992,65 @@ public List<DraftPage> getDraftsOfWiki(String wikiOwner, String wikiType, String
     return convertDraftPageEntitiesToDraftPages(draftPageEntities);
   }
 
+  @ExoTransactional
+  public void updateNotesPosition(NoteReorder noteReorder) throws WikiException {
+    PageEntity pageToMove = pageDAO.find(Long.valueOf(noteReorder.getPageId()));
+
+    if (pageToMove == null) {
+      throw new WikiException("Cannot update note position: page does not exist.");
+    }
+    boolean isCrossFolderMove = noteReorder.getSourceParentId() != null
+        && !noteReorder.getSourceParentId().equals(noteReorder.getTargetParentId());
+
+    if (isCrossFolderMove) {
+      PageEntity destinationParentEntity = null;
+      if (noteReorder.getTargetParentId() != null && !noteReorder.getTargetParentId().isEmpty()) {
+        destinationParentEntity = pageDAO.find(Long.valueOf(noteReorder.getTargetParentId()));
+        if (destinationParentEntity == null) {
+          throw new WikiException("Destination parent page does not exist.");
+        }
+      }
+      List<PageMoveEntity> pageMoves = pageToMove.getMoves();
+      if (pageMoves == null) {
+        pageMoves = new ArrayList<>();
+      }
+      PageMoveEntity move = new PageMoveEntity(noteReorder.getWikiType(),
+                                               noteReorder.getWikiOwner(),
+                                               pageToMove.getName(),
+                                               Calendar.getInstance().getTime());
+      move.setPage(pageToMove);
+      pageMoveDAO.create(move);
+      pageToMove.setParentPage(destinationParentEntity);
+      if (destinationParentEntity != null) {
+        updateWikiOfPageTree(destinationParentEntity.getWiki(), pageToMove);
+      }
+
+      pageMoves.add(move);
+      pageToMove.setMoves(pageMoves);
+      pageDAO.update(pageToMove);
+    }
+    if (noteReorder.getTargetOrderedIds() != null && !noteReorder.getTargetOrderedIds().isEmpty()) {
+      int position = 1;
+      for (String id : noteReorder.getTargetOrderedIds()) {
+        PageEntity pageToUpdate = pageDAO.find(Long.valueOf(id));
+        if (pageToUpdate != null) {
+          pageToUpdate.setPosition(position++);
+          pageDAO.update(pageToUpdate);
+        }
+      }
+    }
+    if (isCrossFolderMove && noteReorder.getSourceOrderedIds() != null && !noteReorder.getSourceOrderedIds().isEmpty()) {
+      int position = 1;
+      for (String id : noteReorder.getSourceOrderedIds()) {
+        PageEntity pageToUpdate = pageDAO.find(Long.valueOf(id));
+        if (pageToUpdate != null) {
+          pageToUpdate.setPosition(position++);
+          pageDAO.update(pageToUpdate);
+        }
+      }
+    }
+  }
+
   private void getDraftsOfPage(PageEntity pageEntity, List<DraftPageEntity> drafts) {
     drafts.addAll(draftPageDAO.findDraftPagesByParentPage(pageEntity.getId()));
     List<PageEntity> childrenPages = pageDAO.getChildrenPages(pageEntity);
diff --git a/notes-service/src/main/java/org/exoplatform/wiki/tree/TreeNode.java b/notes-service/src/main/java/org/exoplatform/wiki/tree/TreeNode.java
index 7e5f2f83f3..95f5d11faa 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/tree/TreeNode.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/tree/TreeNode.java
@@ -190,7 +190,6 @@ public boolean equals(Object obj) {
   public void pushDescendants(Map<String, Object> context, String userId) throws Exception {
     addChildren(context, userId);
     pushChildren(context, userId);
-    this.children = this.children.stream().sorted((childItem1, childItem2) -> new NaturalComparator().compare(childItem1.getName(), childItem2.getName())).toList();
   }
   
   protected void addChildren(Map<String, Object> context, String userId) throws Exception {
diff --git a/notes-service/src/main/resources/db/changelog/wiki.db.changelog-1.0.0.xml b/notes-service/src/main/resources/db/changelog/wiki.db.changelog-1.0.0.xml
index 0dcd5e70f6..c505e012be 100644
--- a/notes-service/src/main/resources/db/changelog/wiki.db.changelog-1.0.0.xml
+++ b/notes-service/src/main/resources/db/changelog/wiki.db.changelog-1.0.0.xml
@@ -623,4 +623,10 @@
     <dropTable tableName="WIKI_DRAFT_ATTACHMENTS"/>
   </changeSet>
 
+  <changeSet author="notes" id="1.0.0-mip-235-01">
+    <addColumn tableName="WIKI_PAGES">
+      <column name="POSITION" type="int" defaultValueNumeric="0"/>
+    </addColumn>
+  </changeSet>
+
 </databaseChangeLog>
\ No newline at end of file
diff --git a/notes-service/src/test/java/org/exoplatform/wiki/service/TestNoteService.java b/notes-service/src/test/java/org/exoplatform/wiki/service/TestNoteService.java
index 4b6e4e488c..5015aa050b 100644
--- a/notes-service/src/test/java/org/exoplatform/wiki/service/TestNoteService.java
+++ b/notes-service/src/test/java/org/exoplatform/wiki/service/TestNoteService.java
@@ -30,6 +30,7 @@
 import java.util.Date;
 import java.util.List;
 
+import io.meeds.notes.rest.model.NoteReorder;
 import org.apache.commons.io.FileUtils;
 import org.junit.FixMethodOrder;
 import org.junit.runners.MethodSorters;
@@ -1212,6 +1213,48 @@ public void testProcessingNoteImportedContentImages() throws Exception {
     file1.delete();
   }
 
+  @SneakyThrows
+  public void testUpdateNotesPosition() {
+    Identity root = ROOT_IDENTITY;
+    Identity mary = USER_IDENTITY;
+
+    Wiki portalWiki = getOrCreateWiki(wikiService, PortalConfig.PORTAL_TYPE, PORTAL_NAME);
+
+    Page note1 = new Page("dragged_note", "dragged_note");
+    note1 = noteService.createNote(portalWiki, "Home", note1, root);
+
+    Page note2 = new Page("other_note", "other_note");
+    note2 = noteService.createNote(portalWiki, "Home", note2, root);
+
+    assertNotNull(noteService.getNoteById(note1.getId()));
+
+    NoteReorder validReorder = new NoteReorder();
+    validReorder.setPageId(note1.getId());
+    validReorder.setWikiType(PortalConfig.PORTAL_TYPE);
+    validReorder.setWikiOwner(PORTAL_NAME);
+    validReorder.setSourceParentId("1");
+    validReorder.setTargetParentId("1");
+    validReorder.setTargetOrderedIds(Arrays.asList(note2.getId(), note1.getId()));
+
+    noteService.updateNotesPosition(validReorder, root);
+
+    NoteReorder reorder1 = new NoteReorder();
+    reorder1.setPageId("10");
+
+    Exception notFoundException = assertThrows(Exception.class, () -> {
+      noteService.updateNotesPosition(reorder1, root);
+    });
+    assertEquals("Note to update not found", notFoundException.getMessage());
+
+    NoteReorder reorder2 = new NoteReorder();
+    reorder2.setPageId(note1.getId());
+
+    IllegalAccessException accessException = assertThrows(IllegalAccessException.class, () -> {
+      noteService.updateNotesPosition(reorder2, mary);
+    });
+    assertEquals("User does not have edit the note.", accessException.getMessage());
+  }
+
   private Long getIdentityId(String username) {
     return Long.parseLong(identityManager.getOrCreateUserIdentity(username).getId());
   }
diff --git a/notes-service/src/test/java/org/exoplatform/wiki/service/rest/NotesRestServiceTest.java b/notes-service/src/test/java/org/exoplatform/wiki/service/rest/NotesRestServiceTest.java
index db3f654fa9..d5927cebd0 100644
--- a/notes-service/src/test/java/org/exoplatform/wiki/service/rest/NotesRestServiceTest.java
+++ b/notes-service/src/test/java/org/exoplatform/wiki/service/rest/NotesRestServiceTest.java
@@ -364,11 +364,6 @@ public void testGetFullTreeData() throws Exception {
     assertEquals(5, ((JsonNodeData)((BeanToJsons) response3.getEntity()).getJsonList().getFirst()).getChildren().size());
     JsonNodeData jsonNodeData = ((JsonNodeData)((BeanToJsons) response3.getEntity()).getJsonList().getFirst());
     assertEquals(5, jsonNodeData.getChildren().size());
-    assertEquals("testPage", jsonNodeData.getChildren().get(0).getName());
-    assertEquals("testPage 1", jsonNodeData.getChildren().get(1).getName());
-    assertEquals("testPage 2", jsonNodeData.getChildren().get(2).getName());
-    assertEquals("testPage 10", jsonNodeData.getChildren().get(3).getName());
-    assertEquals("testPage 22", jsonNodeData.getChildren().get(4).getName());
 
     doThrow(new IllegalAccessException()).when(noteService)
                                          .getNoteOfNoteBookByName(pageParams.getType(),
diff --git a/notes-service/src/test/java/org/exoplatform/wiki/storage/NoteDataStorageTest.java b/notes-service/src/test/java/org/exoplatform/wiki/storage/NoteDataStorageTest.java
index c4845085aa..3e680011b6 100644
--- a/notes-service/src/test/java/org/exoplatform/wiki/storage/NoteDataStorageTest.java
+++ b/notes-service/src/test/java/org/exoplatform/wiki/storage/NoteDataStorageTest.java
@@ -18,11 +18,9 @@
  */
 package org.exoplatform.wiki.storage;
 
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
+import io.meeds.notes.rest.model.NoteReorder;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -1023,6 +1021,82 @@ public void testGetVersionById() throws Exception {
     assertNotNull(storage.getPageVersionById(Long.parseLong(pageVersion.getId())));
   }
 
+  @Test
+  public void testUpdateNotesPosition() {
+    Wiki wiki = new Wiki();
+    wiki.setType(WIKI_TYPE_PORTAL);
+    wiki.setOwner(WIKI_OWNER);
+    wiki = storage.createWiki(wiki);
+
+    Page homePage = wiki.getWikiHome();
+
+    Page folderA = new Page();
+    folderA.setName("folderA");
+    folderA.setTitle("Folder A");
+    folderA = storage.createPage(wiki, homePage, folderA);
+
+    Page note1 = new Page();
+    note1.setName("note1");
+    note1.setTitle("Note 1");
+    note1 = storage.createPage(wiki, homePage, note1);
+
+    Page note2 = new Page();
+    note2.setName("note2");
+    note2.setTitle("Note 2");
+    note2 = storage.createPage(wiki, homePage, note2);
+
+    assertNotNull(note1.getId());
+    assertNotNull(note2.getId());
+
+    NoteReorder sameFolderReorder = new NoteReorder();
+    sameFolderReorder.setPageId(note1.getId());
+    sameFolderReorder.setWikiType(WIKI_TYPE_PORTAL);
+    sameFolderReorder.setWikiOwner(WIKI_OWNER);
+    sameFolderReorder.setSourceParentId(homePage.getId());
+    sameFolderReorder.setTargetParentId(homePage.getId());
+    sameFolderReorder.setTargetOrderedIds(Arrays.asList(note2.getId(), note1.getId()));
+
+    storage.updateNotesPosition(sameFolderReorder);
+
+    restartTransaction();
+
+    PageEntity updatedNote1 = pageDAO.find(Long.valueOf(note1.getId()));
+    PageEntity updatedNote2 = pageDAO.find(Long.valueOf(note2.getId()));
+
+    assertEquals(Integer.valueOf(2), updatedNote1.getPosition());
+    assertEquals(Integer.valueOf(1), updatedNote2.getPosition());
+    assertEquals(Long.parseLong(homePage.getId()), updatedNote1.getParentPage().getId());
+
+    NoteReorder crossFolderReorder = new NoteReorder();
+    crossFolderReorder.setPageId(note1.getId());
+    crossFolderReorder.setWikiType(WIKI_TYPE_PORTAL);
+    crossFolderReorder.setWikiOwner(WIKI_OWNER);
+    crossFolderReorder.setSourceParentId(homePage.getId());
+    crossFolderReorder.setTargetParentId(folderA.getId());
+
+    crossFolderReorder.setTargetOrderedIds(Collections.singletonList(note1.getId()));
+    crossFolderReorder.setSourceOrderedIds(Collections.singletonList(note2.getId()));
+
+    storage.updateNotesPosition(crossFolderReorder);
+
+    restartTransaction();
+
+    PageEntity movedNote1 = pageDAO.find(Long.valueOf(note1.getId()));
+    PageEntity remainingNote2 = pageDAO.find(Long.valueOf(note2.getId()));
+
+    assertNotNull(movedNote1.getParentPage());
+    assertEquals(Long.parseLong(folderA.getId()), movedNote1.getParentPage().getId());
+
+    assertEquals(Integer.valueOf(1), movedNote1.getPosition());
+    assertEquals(Integer.valueOf(1), remainingNote2.getPosition());
+
+    assertNotNull(movedNote1.getMoves());
+    assertFalse(movedNote1.getMoves().isEmpty());
+    assertEquals(1, movedNote1.getMoves().size());
+    assertEquals(WIKI_OWNER, movedNote1.getMoves().getFirst().getWikiOwner());
+    assertEquals(note1.getName(), movedNote1.getMoves().getFirst().getPageName());
+  }
+
   protected void startSessionAs(String user, Collection<MembershipEntry> memberships) {
     Identity identity = new Identity(user, memberships);
     ConversationState state = new ConversationState(identity);
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ar.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ar.properties
index 8b6cf8c1cc..c89bb3a7f0 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ar.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ar.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=الفضاء:
 notes.label.movePageCurrentPosition=الموقع الحالي
 notes.label.movePageDestination=الوجهة:
 notes.label.movePagePosition=المهنة:
-notes.label.noteTreeview.tooltip=انقر لعرض شجرة المعلومات
 notes.label.historyVersions=الإصدارات
 notes.label.restoreVersions=استعادة
 notes.untitled.title=بدون عنوان
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_aro.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_aro.properties
index 6f9bfd4833..551868a01a 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_aro.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_aro.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=الفضاء:
 notes.label.movePageCurrentPosition=الموقع الحالي
 notes.label.movePageDestination=الوجهة:
 notes.label.movePagePosition=المهنة:
-notes.label.noteTreeview.tooltip=انقر لعرض شجرة الملاحظات
 notes.label.historyVersions=الإصدارات
 notes.label.restoreVersions=استعادة
 notes.untitled.title=بدون عنوان
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ca.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ca.properties
index 4628c617d5..d1dede22ec 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ca.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ca.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Espai:
 notes.label.movePageCurrentPosition=Posició actual:
 notes.label.movePageDestination=Destí:
 notes.label.movePagePosition=Posició:
-notes.label.noteTreeview.tooltip=Feu clic per mostrar l'arbre de notes
 notes.label.historyVersions=Versions
 notes.label.restoreVersions=Restaura
 notes.untitled.title=Sense títol
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_co.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_co.properties
index 6aaecfd387..329660d4eb 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_co.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_co.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Spaziu:
 notes.label.movePageCurrentPosition=Posizione attuale:
 notes.label.movePageDestination=Destination:
 notes.label.movePagePosition=Posizione:
-notes.label.noteTreeview.tooltip=Cliccate per vede l'arburu Notes
 notes.label.historyVersions=Versioni
 notes.label.restoreVersions=Risturà
 notes.untitled.title=Sans titre
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_cs.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_cs.properties
index ed09dae509..c8371926a8 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_cs.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_cs.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Skupina:
 notes.label.movePageCurrentPosition=Aktuální pozice:
 notes.label.movePageDestination=Cíl:
 notes.label.movePagePosition=Pozice:
-notes.label.noteTreeview.tooltip=Kliknutím zobrazíte strom poznámek
 notes.label.historyVersions=Verze
 notes.label.restoreVersions=Obnovit
 notes.untitled.title=Bez názvu
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_de.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_de.properties
index 6136601f76..a528df2886 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_de.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_de.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Projektraum
 notes.label.movePageCurrentPosition=Aktuelle Position:
 notes.label.movePageDestination=Ziel:
 notes.label.movePagePosition=Position:
-notes.label.noteTreeview.tooltip=Klicken, um Notizbaum anzuzeigen
 notes.label.historyVersions=Versionen
 notes.label.restoreVersions=Wiederherstellen
 notes.untitled.title=Ohne Titel
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_el.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_el.properties
index 107fb02a67..c99fc78fba 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_el.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_el.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Χώρος:
 notes.label.movePageCurrentPosition=Τρέχουσα θέση:
 notes.label.movePageDestination=Προορισμός:
 notes.label.movePagePosition=Θέση:
-notes.label.noteTreeview.tooltip=Κλικ για εμφάνιση δέντρου σημειώσεων
 notes.label.historyVersions=Εκδόσεις
 notes.label.restoreVersions=Επαναφορά
 notes.untitled.title=Χωρίς τίτλο
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties
index 327a7287d3..f9f72e5335 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties
@@ -41,6 +41,7 @@ notes.no.attachments=No attachments
 notes.attachments.delete=Delete
 
 notes.label.LastModifiedBy=Last modified by {0} at {1}
+notes.button.apply=Apply
 notes.button.cancel=Cancel
 notes.button.publish=Save
 notes.button.publishAndPost=Save and Post
@@ -55,6 +56,8 @@ notes.edit.editNotes=Edit
 notes.save.success.message=Note saved successfully
 notes.content.save.success.message=User Policy Successfully Saved
 notes.content.publish.success.message=User Policy successfully published
+notes.reorder.success.message=Note reordered successfully
+notes.reorder.error.message=Error when reordering note
 notes.view.label=View
 
 notes.metadata.properties.label=Properties
@@ -131,6 +134,7 @@ popup.confirmation.cancel=Are you sure you want to leave this page?
 notes.label.breadcrumbTitle=Notes Tree
 notes.label.breadcrumbs=Breadcrumb
 notes.label.filter=Filter by name
+notes.label.resetFilter=Reset
 notes.label.includePageTitle=Include Notes
 notes.label.movePageTitle=Move Page
 notes.label.exportNotesTitle=Export Notes
@@ -159,7 +163,6 @@ notes.label.movePageSpace=Space:
 notes.label.movePageCurrentPosition=Current position:
 notes.label.movePageDestination=Destination:
 notes.label.movePagePosition=Position:
-notes.label.noteTreeview.tooltip=Click to display Notes tree
 notes.label.historyVersions=Versions
 notes.label.restoreVersions=Restore
 notes.untitled.title=Untitled
@@ -175,6 +178,14 @@ notes.label.no-content.no-redactor.content.last=Or create a new note
 notes.label.noteNotFound=We could not find this note.
 notes.label.noteSearchNotFound=No notes found for:
 notes.label.noteNotFound.button=Back to Notes App
+notes.label.noResults.placeholder=No results found. please, Try again
+
+notes.label.tree=Treeview
+notes.tooltip.close.tree=Hide treeview
+notes.tooltip.open.tree=Display treeview
+notes.advanced.filter.button.title=Filter
+notes.advanced.filter.drawer.title=Filter notes
+
 notes.message.missingImportNotes=Import Notes is mandatory.
 import.drawer.maxFileSize.error=You can’t upload files larger than {0} MB
 import.drawer.fileType.error=You should upload a zip note
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_es_ES.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_es_ES.properties
index ea7b4e2d50..116f64f4b0 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_es_ES.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_es_ES.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Espacio:
 notes.label.movePageCurrentPosition=Posición actual:
 notes.label.movePageDestination=Destino:
 notes.label.movePagePosition=Posición:
-notes.label.noteTreeview.tooltip=Haz clic para mostrar el árbol de notas
 notes.label.historyVersions=Versiones
 notes.label.restoreVersions=Restaurar
 notes.untitled.title=Sin título
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_et.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_et.properties
index 005482dd6f..27029a64e4 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_et.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_et.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Tühik:
 notes.label.movePageCurrentPosition=Praegune positsioon:
 notes.label.movePageDestination=Sihtkoht:
 notes.label.movePagePosition=Asukoht:
-notes.label.noteTreeview.tooltip=Klõpsake märkmete puu kuvamiseks
 notes.label.historyVersions=Versioonid
 notes.label.restoreVersions=Taasta
 notes.untitled.title=Pealkirjata
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fa.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fa.properties
index 16c2e996ab..66991d62f9 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fa.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fa.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=فضا:
 notes.label.movePageCurrentPosition=موقعیت فعلی:
 notes.label.movePageDestination=مقصد:
 notes.label.movePagePosition=موقعیت:
-notes.label.noteTreeview.tooltip=برای نمایش درخت یادداشت ها کلیک کنید
 notes.label.historyVersions=نسخه ها
 notes.label.restoreVersions=بازيابي
 notes.untitled.title=بدون عنوان
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fi.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fi.properties
index 206def7767..7444e0ca5d 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fi.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fi.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Tila:
 notes.label.movePageCurrentPosition=Nykyinen sijainti:
 notes.label.movePageDestination=Kohde:
 notes.label.movePagePosition=Sijainti:
-notes.label.noteTreeview.tooltip=Klikkaa näyttääksesi muistiinpanojen puu
 notes.label.historyVersions=Versiot
 notes.label.restoreVersions=Palauta
 notes.untitled.title=Nimetön
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fil.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fil.properties
index ab8effd61e..0f2f5f6cb1 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fil.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fil.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Ang espasyo:
 notes.label.movePageCurrentPosition=Kasalukuyang posisyon:
 notes.label.movePageDestination=Ang destinasyon:
 notes.label.movePagePosition=Ang Posisyon:
-notes.label.noteTreeview.tooltip=I-click upang ipakita ang Notes tree
 notes.label.historyVersions=Ang mga bersyon
 notes.label.restoreVersions=Pagpapanumbalik
 notes.untitled.title=Walang Pamagat
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fr.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fr.properties
index 41673b6c3e..6b5b43399d 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fr.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fr.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Espace :
 notes.label.movePageCurrentPosition=Emplacement actuel : 
 notes.label.movePageDestination=Destination :
 notes.label.movePagePosition=Position :
-notes.label.noteTreeview.tooltip=Cliquer pour afficher l'arborescence des notes
 notes.label.historyVersions=Versions
 notes.label.restoreVersions=Restaurer
 notes.untitled.title=Sans titre
@@ -175,6 +174,11 @@ notes.label.no-content.no-redactor.content.last=Ou créer une nouvelle note
 notes.label.noteNotFound=Nous n'avons pas pu trouver cette note.
 notes.label.noteSearchNotFound=Aucune note trouvée pour :
 notes.label.noteNotFound.button=Revenir à l'appli Notes
+
+notes.label.tree=Arborescence
+notes.tooltip.close.tree=Masquer l'arborescence
+notes.tooltip.open.tree=Afficher treeview
+
 notes.message.missingImportNotes=Importer des notes est obligatoire.
 import.drawer.maxFileSize.error=Vous ne pouvez pas charger des fichiers de plus de {0} Mo
 import.drawer.fileType.error=Vous devez sélectionner un fichier au format zip
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_he.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_he.properties
index ae3ed3edf5..ddf373acf7 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_he.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_he.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=חלל:
 notes.label.movePageCurrentPosition=תפקיד נוכחי:
 notes.label.movePageDestination=יַעַד:
 notes.label.movePagePosition=מַצָב:
-notes.label.noteTreeview.tooltip=לחץ כדי להציג את עץ ההערות
 notes.label.historyVersions=גרסאות
 notes.label.restoreVersions=לְשַׁחְזֵר
 notes.untitled.title=ללא כותרת
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_hr.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_hr.properties
index 2cc136b7ad..4bd5b19bfe 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_hr.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_hr.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Prostor:
 notes.label.movePageCurrentPosition=Trenutačna pozicija:
 notes.label.movePageDestination=Odredište:
 notes.label.movePagePosition=Položaj:
-notes.label.noteTreeview.tooltip=Kliknite za prikaz stabla Bilješki
 notes.label.historyVersions=Verzije
 notes.label.restoreVersions=Vratiti
 notes.untitled.title=Bez naslova
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_hu.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_hu.properties
index 81cd27afb3..5cfda709ba 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_hu.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_hu.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Űr:
 notes.label.movePageCurrentPosition=Jelenlegi pozíció:
 notes.label.movePageDestination=Rendeltetési hely:
 notes.label.movePagePosition=Pozíció:
-notes.label.noteTreeview.tooltip=Kattintson a jegyzetfa megjelenítéséhez
 notes.label.historyVersions=Verziók
 notes.label.restoreVersions=Visszaállítás
 notes.untitled.title=Cím nélkül
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_id.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_id.properties
index a9af3491db..4f062f6d64 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_id.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_id.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Forum:
 notes.label.movePageCurrentPosition=Posisi saat ini:
 notes.label.movePageDestination=Tujuan:
 notes.label.movePagePosition=Posisi:
-notes.label.noteTreeview.tooltip=Klik untuk menampilkan pohon Catatan.
 notes.label.historyVersions=Versi
 notes.label.restoreVersions=Pulihan
 notes.untitled.title=Tanpa judul
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_in.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_in.properties
index 3c8c27d1c9..6da466b527 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_in.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_in.properties
@@ -88,7 +88,6 @@ notes.label.movePageSpace=Space:
 notes.label.movePageCurrentPosition=Current position:
 notes.label.movePageDestination=Destination:
 notes.label.movePagePosition=Position:
-notes.label.noteTreeview.tooltip=Click to display Notes tree
 notes.label.historyVersions=Versions
 notes.label.restoreVersions=Restore
 notes.untitled.title=Untitled
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_it.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_it.properties
index e06fd30922..9e71c7f64d 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_it.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_it.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Spazio:
 notes.label.movePageCurrentPosition=Posizione corrente:
 notes.label.movePageDestination=Destinazione:
 notes.label.movePagePosition=Posizione:
-notes.label.noteTreeview.tooltip=Cliccare per visualizzare l'albero delle Note
 notes.label.historyVersions=Gestisci Versioni
 notes.label.restoreVersions=Ripristina
 notes.untitled.title=Senza Titolo
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ja.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ja.properties
index c8d948127d..9bdf14d266 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ja.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ja.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=スペース:
 notes.label.movePageCurrentPosition=現在の位置:
 notes.label.movePageDestination=保存先：
 notes.label.movePagePosition=ポジション:
-notes.label.noteTreeview.tooltip=クリックしてメモツリーを表示する
 notes.label.historyVersions=バージョン管理
 notes.label.restoreVersions=リストア
 notes.untitled.title=タイトルなし
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ko.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ko.properties
index 3423c79fae..0681e547b8 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ko.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ko.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=공간:
 notes.label.movePageCurrentPosition=현재 위치:
 notes.label.movePageDestination=목적지:
 notes.label.movePagePosition=위치:
-notes.label.noteTreeview.tooltip=클릭하여 메모 트리를 표시합니다.
 notes.label.historyVersions=버전
 notes.label.restoreVersions=복원하다
 notes.untitled.title=제목 없음
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_lt.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_lt.properties
index 31483ba1a4..bde67dacfe 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_lt.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_lt.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Erdvė:
 notes.label.movePageCurrentPosition=Dabartinė padėtis:
 notes.label.movePageDestination=Paskirtis:
 notes.label.movePagePosition=Pozicija:
-notes.label.noteTreeview.tooltip=Spustelėkite, kad būtų rodomas užrašų medis
 notes.label.historyVersions=Versijos
 notes.label.restoreVersions=Atkurti
 notes.untitled.title=Be pavadinimo
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_nl.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_nl.properties
index 829a5f8940..7dabfc2085 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_nl.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_nl.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Ruimte:
 notes.label.movePageCurrentPosition=Huidige positie:
 notes.label.movePageDestination=Bestemming:
 notes.label.movePagePosition=Positie:
-notes.label.noteTreeview.tooltip=Klik om Notitieboom weer te geven
 notes.label.historyVersions=Versies beheren
 notes.label.restoreVersions=Herstellen
 notes.untitled.title=Naamloos
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_no.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_no.properties
index f50d7548d1..b099dbbf94 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_no.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_no.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Fellesskap:
 notes.label.movePageCurrentPosition=Nåværende posisjon:
 notes.label.movePageDestination=Destinasjon:
 notes.label.movePagePosition=Stilling:
-notes.label.noteTreeview.tooltip=Klikk for å vise Notattre
 notes.label.historyVersions=Versjoner
 notes.label.restoreVersions=Gjenopprett
 notes.untitled.title=Uten tittel
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_pl.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_pl.properties
index ef71bbd207..fb9e96ebc9 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_pl.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_pl.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Przestrzeń:
 notes.label.movePageCurrentPosition=Bieżąca pozycja:
 notes.label.movePageDestination=Cel:
 notes.label.movePagePosition=Stanowisko:
-notes.label.noteTreeview.tooltip=Kliknij, aby wyświetlić drzewo notatek
 notes.label.historyVersions=Wersje
 notes.label.restoreVersions=Przywracanie
 notes.untitled.title=Bez tytułu
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_pt_BR.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_pt_BR.properties
index 22cb15004f..1fa5d032b8 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_pt_BR.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_pt_BR.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Espaço:
 notes.label.movePageCurrentPosition=Posição atual:
 notes.label.movePageDestination=Destino:
 notes.label.movePagePosition=Cargo:
-notes.label.noteTreeview.tooltip=Clique para exibir a árvore de notas
 notes.label.historyVersions=Versões
 notes.label.restoreVersions=Restaurar
 notes.untitled.title=Sem título
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_pt_PT.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_pt_PT.properties
index b5102a7c31..18db98ee23 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_pt_PT.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_pt_PT.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Espaço:
 notes.label.movePageCurrentPosition=Posição atual:
 notes.label.movePageDestination=Destino:
 notes.label.movePagePosition=Cargo:
-notes.label.noteTreeview.tooltip=Clique para exibir a árvore de notas
 notes.label.historyVersions=Versões
 notes.label.restoreVersions=Restaurar
 notes.untitled.title=Sem título
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ro.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ro.properties
index 02df04ec55..0d8ea6aabd 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ro.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ro.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Spaţiu:
 notes.label.movePageCurrentPosition=Poziţia curentă:
 notes.label.movePageDestination=Destinație:
 notes.label.movePagePosition=Poziţie:
-notes.label.noteTreeview.tooltip=Click pentru a afişa note arborescente
 notes.label.historyVersions=Versiuni
 notes.label.restoreVersions=Restabilire
 notes.untitled.title=Fără Nume
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ru.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ru.properties
index 9cbdbd9f3c..7d095685b2 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ru.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_ru.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Область:
 notes.label.movePageCurrentPosition=Должность в настоящее время:
 notes.label.movePageDestination=Назначение:
 notes.label.movePagePosition=Должность:
-notes.label.noteTreeview.tooltip=Нажмите, чтобы отобразить дерево записей
 notes.label.historyVersions=Версии
 notes.label.restoreVersions=Восстановить
 notes.untitled.title=Без названия
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sk.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sk.properties
index 7a1c1500cc..ea01bc1b42 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sk.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sk.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Priestor:
 notes.label.movePageCurrentPosition=Aktuálna pozícia:
 notes.label.movePageDestination=Cieľ:
 notes.label.movePagePosition=Pozícia:
-notes.label.noteTreeview.tooltip=Kliknutím zobrazíte strom poznámok
 notes.label.historyVersions=Verzie
 notes.label.restoreVersions=Obnoviť
 notes.untitled.title=Bez názvu
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sl.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sl.properties
index 0a61ddeb94..75d46ab56f 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sl.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sl.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Prostor:
 notes.label.movePageCurrentPosition=Trenutni položaj:
 notes.label.movePageDestination=Cilj:
 notes.label.movePagePosition=Delovno mesto:
-notes.label.noteTreeview.tooltip=Kliknite za prikaz drevesa Notes
 notes.label.historyVersions=Različice
 notes.label.restoreVersions=Obnovi
 notes.untitled.title=Neimenovan
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sq.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sq.properties
index bca159faed..f699f2de93 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sq.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sq.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=crwdns44762:0crwdne44762:0
 notes.label.movePageCurrentPosition=crwdns44764:0crwdne44764:0
 notes.label.movePageDestination=crwdns44766:0crwdne44766:0
 notes.label.movePagePosition=crwdns44768:0crwdne44768:0
-notes.label.noteTreeview.tooltip=crwdns44770:0crwdne44770:0
 notes.label.historyVersions=crwdns44772:0crwdne44772:0
 notes.label.restoreVersions=crwdns44774:0crwdne44774:0
 notes.untitled.title=crwdns44776:0crwdne44776:0
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sv_SE.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sv_SE.properties
index 9a32ecff20..87996965b9 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sv_SE.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_sv_SE.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Webb-yta:
 notes.label.movePageCurrentPosition=Nuvarande befattning:
 notes.label.movePageDestination=Destination:
 notes.label.movePagePosition=Befattning:
-notes.label.noteTreeview.tooltip=Klicka för att visa Anteckningsträd
 notes.label.historyVersions=Versioner
 notes.label.restoreVersions=Återställ
 notes.untitled.title=Namnlös
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_th.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_th.properties
index d8028bc37c..d9c5b10675 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_th.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_th.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=อวกาศ:
 notes.label.movePageCurrentPosition=ตำแหน่งปัจจุบัน :
 notes.label.movePageDestination=ปลายทาง:
 notes.label.movePagePosition=ตำแหน่ง:
-notes.label.noteTreeview.tooltip=คลิกเพื่อแสดงแผนผังบันทึก
 notes.label.historyVersions=เวอร์ชันต่างๆ
 notes.label.restoreVersions=คืนค่า
 notes.untitled.title=ไม่มีชื่อ
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_tr.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_tr.properties
index ac75eeffd9..6afc3c9501 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_tr.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_tr.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Alan:
 notes.label.movePageCurrentPosition=Şu anki pozisyonu:
 notes.label.movePageDestination=Hedef:
 notes.label.movePagePosition=Pozisyon:
-notes.label.noteTreeview.tooltip=Notlar ağacını görüntülemek için tıklayın
 notes.label.historyVersions=Sürümler
 notes.label.restoreVersions=Geri Yükle
 notes.untitled.title=Başlıksız
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_uk.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_uk.properties
index 09d1542a90..4ac0d20508 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_uk.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_uk.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Область:
 notes.label.movePageCurrentPosition=Поточна позиція:
 notes.label.movePageDestination=Призначення:
 notes.label.movePagePosition=Посада:
-notes.label.noteTreeview.tooltip=Натисніть, щоб відобразити дерево нотаток
 notes.label.historyVersions=Версії
 notes.label.restoreVersions=Відновити
 notes.untitled.title=Без назви
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_vi.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_vi.properties
index 07013250e2..15a92d149b 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_vi.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_vi.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=Không gian Nhóm:
 notes.label.movePageCurrentPosition=Vị trí hiện tại:
 notes.label.movePageDestination=Điểm đến:
 notes.label.movePagePosition=Vị trí:
-notes.label.noteTreeview.tooltip=Nhấp để hiển thị cây Ghi chú
 notes.label.historyVersions=Phiên bản
 notes.label.restoreVersions=Khôi phục
 notes.untitled.title=Không có Tiêu đề
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_zh_CN.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_zh_CN.properties
index 5ae5a51847..11e94b68da 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_zh_CN.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_zh_CN.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=空间:
 notes.label.movePageCurrentPosition=现任职务：
 notes.label.movePageDestination=目的地：
 notes.label.movePagePosition=位置：
-notes.label.noteTreeview.tooltip=点击显示笔记树
 notes.label.historyVersions=版本
 notes.label.restoreVersions=恢复
 notes.untitled.title=无标题
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_zh_TW.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_zh_TW.properties
index 417580090d..e618dfee2c 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_zh_TW.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_zh_TW.properties
@@ -159,7 +159,6 @@ notes.label.movePageSpace=空間:
 notes.label.movePageCurrentPosition=目前位置：
 notes.label.movePageDestination=目的地：
 notes.label.movePagePosition=位置：
-notes.label.noteTreeview.tooltip=按一下可顯示註釋樹
 notes.label.historyVersions=版本
 notes.label.restoreVersions=還原
 notes.untitled.title=無標題
diff --git a/notes-webapp/src/main/webapp/WEB-INF/gatein-resources.xml b/notes-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
index 8a839abeb9..d22dd78f41 100644
--- a/notes-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
+++ b/notes-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -90,6 +90,9 @@
       <depends>
         <module>vuetify</module>
       </depends>
+      <depends>
+        <module>vueDraggable</module>
+      </depends>
       <depends>
         <module>eXoVueI18n</module>
       </depends>
diff --git a/notes-webapp/src/main/webapp/javascript/eXo/wiki/notesService.js b/notes-webapp/src/main/webapp/javascript/eXo/wiki/notesService.js
index d63ed0546a..96d04d1367 100644
--- a/notes-webapp/src/main/webapp/javascript/eXo/wiki/notesService.js
+++ b/notes-webapp/src/main/webapp/javascript/eXo/wiki/notesService.js
@@ -456,3 +456,20 @@ export function markNoteAsViewed(noteId, lang){
     }
   });
 }
+
+export function updateNotesOrder(payload) {
+  return fetch(`${notesConstants.PORTAL}/${notesConstants.PORTAL_REST}/notes/reorder`, {
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    method: 'POST',
+    credentials: 'include',
+    body: JSON.stringify(payload)
+  }).then((resp) => {
+    if (resp?.ok) {
+      return true;
+    } else {
+      throw new Error('Error updating notes order');
+    }
+  });
+}
diff --git a/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewFilterDrawer.vue b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewFilterDrawer.vue
new file mode 100644
index 0000000000..276a4d48e5
--- /dev/null
+++ b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewFilterDrawer.vue
@@ -0,0 +1,119 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <exo-drawer
+    id="NoteTreeViewFilterDrawer"
+    ref="drawer"
+    v-model="drawer"
+    allow-expand
+    right>
+    <template #title>
+      {{ $t('notes.advanced.filter.drawer.title') }}
+    </template>
+    <template v-if="drawer" #content>
+      <div class="d-flex flex-column">
+        <v-radio-group
+          v-model="filter"
+          class="mt-2 ms-3"
+          mandatory
+          inset>
+          <v-radio
+            v-for="noteFilter in notesFilters"
+            :key="noteFilter.value"
+            :value="noteFilter.value"
+            class="mt-0">
+            <template #label>
+              <div class="text-body">
+                {{ noteFilter.text }}
+              </div>
+            </template>
+          </v-radio>
+        </v-radio-group>
+      </div>
+    </template>
+    <template #footer>
+      <div class="d-flex">
+        <v-btn
+          class="btn ms-auto me-2"
+          @click="resetFilter()">
+          <template>
+            <i class="fas fa-redo me-3"></i>
+            {{ $t('notes.label.resetFilter') }}
+          </template>
+        </v-btn>
+        <v-spacer />
+        <v-btn
+          class="btn ms-auto me-2"
+          @click="close">
+          {{ $t('notes.button.cancel') }}
+        </v-btn>
+        <v-btn
+          color="primary"
+          elevation="0"
+          @click="apply">
+          {{ $t('notes.button.apply') }}
+        </v-btn>
+      </div>
+    </template>
+  </exo-drawer>
+</template>
+<script>
+export default {
+  data: () => ({
+    drawer: false,
+    filter: null,
+  }),
+  computed: {
+    notesFilters() {
+      return [{
+        text: this.$t('notes.filter.label.published.notes'),
+        value: 'published',
+      },{
+        text: this.$t('notes.filter.label.drafts'),
+        value: 'drafts',
+      }];
+    },
+  },
+  created() {
+    this.$root.$on('notes-filter-open', this.open);
+  },
+  beforeDestroy() {
+    this.$root.$off('notes-filter-open', this.open);
+  },
+  methods: {
+    open(filter) {
+      this.filter = filter;
+      this.$refs.drawer.open();
+    },
+    close() {
+      this.$refs.drawer.close();
+    },
+    apply() {
+      this.$root.$emit('notes-filter-update', this.filter);
+      this.close();
+    },
+    resetFilter() {
+      this.filter = 'published';
+      this.apply();
+    }
+  },
+};
+</script>
\ No newline at end of file
diff --git a/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewItem.vue b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewItem.vue
new file mode 100644
index 0000000000..8068ba305b
--- /dev/null
+++ b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewItem.vue
@@ -0,0 +1,209 @@
+<!--
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-->
+<template>
+  <div>
+    <v-hover
+      v-model="hover">
+      <v-list-item
+        :class="[
+          'tree-item rounded mx-1 my-1',
+          { 'v-list-item--active primary--text': isActive(item) },
+          { 'ps-1': level === 0 }
+        ]"
+        :style="{ paddingLeft: `${level * 20 + 8}px` }"
+        :ripple="false"
+        dense
+        @click="handleOpenNote($event, item)">
+        <v-list-item-icon
+          v-if="!isDraftFilter && !isHomePage"
+          class="drag-handle my-auto mr-1">
+          <v-icon
+            v-if="hover"
+            small
+            color="grey lighten-1">
+            fas fa-grip-vertical
+          </v-icon>
+        </v-list-item-icon>
+        <v-list-item-avatar
+          size="30"
+          class="my-auto me-0 expand-icon align-center"
+          @click.stop="toggle($event, item)">
+          <template>
+            <note-treeview-sidebar-item-prepend
+              :note="item"
+              :space-note="spaceNote"
+              :note-wiki-owner="noteWikiOwner"
+              :space-group-id="spaceGroupId"
+              :open="isOpen(item.noteId)"
+              :is-draft-filter="isDraftFilter"
+              class="align-center" />
+          </template>
+        </v-list-item-avatar>
+        <v-list-item-content>
+          <v-list-item-title
+            :class="[
+              'text-truncate d-flex align-center',
+              { 'font-weight-medium primary--text': isActive(item) }
+            ]">
+            <exo-user-avatar
+              v-if="isHomePage && !spaceNote"
+              :profile-id="noteWikiOwner"
+              :size="24"
+              :popover="false"
+              extra-class="me-2 flex-shrink-0 not-clickable"
+              avatar />
+            <span class="text-truncate">{{ name }}</span>
+          </v-list-item-title>
+        </v-list-item-content>
+      </v-list-item>
+    </v-hover>
+    <div
+      v-show="isOpen(item.noteId) && item.hasChild"
+      class="tree-children">
+      <note-treeview-item-list
+        v-if="item.children"
+        :items="item.children"
+        :opened-items="openedItems"
+        :active-item="activeItem"
+        :space-note="spaceNote"
+        :note-wiki-owner="noteWikiOwner"
+        :space-group-id="spaceGroupId"
+        :parent-id="item.noteId"
+        :is-draft-filter="isDraftFilter"
+        :level="level + 1"
+        @fetch-children="$emit('fetch-children', $event)"
+        @open-note="handleChildOpenNote"
+        @toggle-open="$emit('toggle-open', $event)"
+        @reorder="$emit('reorder', $event)"
+        @action="$emit('action', $event)" />
+      <v-list-item
+        v-else-if="item.isLoading"
+        :style="{ paddingLeft: `${(level + 1) * 20 + 8}px` }"
+        class="mx-1">
+        <v-list-item-icon class="my-auto mr-3">
+          <v-progress-circular
+            indeterminate
+            size="16"
+            width="2"
+            color="grey" />
+        </v-list-item-icon>
+      </v-list-item>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    item: {
+      type: Object,
+      default: () => ({})
+    },
+    openedItems: {
+      type: Array,
+      default: () => []
+    },
+    activeItem: {
+      type: Array,
+      default: () => []
+    },
+    spaceNote: {
+      type: Boolean,
+      default: false
+    },
+    noteWikiOwner: {
+      type: String,
+      default: ''
+    },
+    spaceGroupId: {
+      type: String,
+      default: null
+    },
+    isDraftFilter: {
+      type: Boolean,
+      default: false
+    },
+    level: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      isDragging: false,
+      hover: false,
+    };
+  },
+  computed: {
+    isHomePage() {
+      return this.item?.nodeType === 'WIKIHOME';
+    },
+    name() {
+      return this.item?.name;
+    }
+  },
+  watch: {
+    'item.children.length'(newLength) {
+      this.$set(this.item, 'hasChild', newLength > 0);
+      if (newLength === 0 && this.isOpen(this.item.noteId)) {
+        this.$emit('toggle-open', { item: this.item, open: false });
+      }
+    }
+  },
+
+  methods: {
+    isOpen(noteId) {
+      return this.openedItems && this.openedItems.includes(noteId);
+    },
+    isActive(item) {
+      return this.activeItem && this.activeItem.includes(item.noteId);
+    },
+    toggle(event, item) {
+      if (event) {
+        event.preventDefault();
+        event.stopPropagation();
+      }
+      if (!item.hasChild) {return;}
+
+      if (this.isOpen(item.noteId)) {
+        this.$emit('toggle-open', { item, open: false });
+      } else {
+        if (!item.children || !item.children.length) {
+          this.$emit('fetch-children', item);
+        } else {
+          this.$emit('toggle-open', { item, open: true });
+        }
+      }
+    },
+    handleOpenNote(event, note) {
+      if (event.target.closest('.expand-icon') || event.target.closest('.drag-handle')) {
+        return;
+      }
+      this.$emit('open-note', { event, note });
+      if (event) {
+        event.preventDefault();
+        event.stopPropagation();
+      }
+    },
+    handleChildOpenNote(payload) {
+      this.$emit('open-note', payload);
+    },
+  }
+};
+</script>
\ No newline at end of file
diff --git a/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewItemList.vue b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewItemList.vue
new file mode 100644
index 0000000000..22bf819271
--- /dev/null
+++ b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewItemList.vue
@@ -0,0 +1,145 @@
+<!--
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-->
+
+<template>
+  <v-list
+    dense
+    class="py-0 note-tree-list">
+    <draggable
+      :list="items"
+      :group="{ name: 'notes-tree' }"
+      :animation="200"
+      :disabled="isDraftFilter"
+      :data-level="level"
+      :move="checkMove"
+      ghost-class="ghost-note"
+      drag-class="dragging-note"
+      chosen-class="chosen-note"
+      handle=".drag-handle"
+      class="draggable-list"
+      @start="onDragStart"
+      @end="onDragEnd"
+      @change="onDragChange">
+      <note-treeview-item
+        v-for="item in items"
+        :key="item.noteId"
+        :item="item"
+        :opened-items="openedItems"
+        :active-item="activeItem"
+        :space-note="spaceNote"
+        :parent-id="item.noteId"
+        :note-wiki-owner="noteWikiOwner"
+        :space-group-id="spaceGroupId"
+        :is-draft-filter="isDraftFilter"
+        :show-actions="showActions"
+        :level="level"
+        @fetch-children="$emit('fetch-children', $event)"
+        @open-note="handleChildOpenNote"
+        @toggle-open="$emit('toggle-open', $event)"
+        @reorder="$emit('reorder', $event)"
+        @action="$emit('action', $event)" />
+    </draggable>
+  </v-list>
+</template>
+
+<script>
+export default {
+  props: {
+    items: {
+      type: Array,
+      default: () => []
+    },
+    openedItems: {
+      type: Array,
+      default: () => []
+    },
+    activeItem: {
+      type: Array,
+      default: () => []
+    },
+    spaceNote: {
+      type: Boolean,
+      default: false
+    },
+    noteWikiOwner: {
+      type: String,
+      default: ''
+    },
+    spaceGroupId: {
+      type: String,
+      default: null
+    },
+    isDraftFilter: {
+      type: Boolean,
+      default: false
+    },
+    showActions: {
+      type: Boolean,
+      default: false
+    },
+    level: {
+      type: Number,
+      default: 0
+    },
+    parentId: {
+      type: String,
+      default: null
+    },
+  },
+  data() {
+    return {
+      isDragging: false
+    };
+  },
+  methods: {
+    isOpen(noteId) {
+      return this.openedItems && this.openedItems.includes(noteId);
+    },
+    handleChildOpenNote(payload) {
+      this.$emit('open-note', payload);
+    },
+    checkMove(evt) {
+      const fromLevel = parseInt(evt.from.dataset.level || 0, 10);
+      const toLevel = parseInt(evt.to.dataset.level || 0, 10);
+      if (fromLevel > 0 && toLevel === 0) {
+        return false;
+      }
+      return !(fromLevel === 0 && toLevel > 0);
+    },
+    onDragStart() {
+      this.isDragging = true;
+      document.body.classList.add('is-dragging-note');
+    },
+    onDragEnd() {
+      this.isDragging = false;
+      document.body.classList.remove('is-dragging-note');
+    },
+    onDragChange(evt) {
+      if (evt.added || evt.moved || evt.removed) {
+        this.$emit('reorder', {
+          event: evt,
+          items: this.items,
+          level: this.level,
+          parentId: this.parentId
+        });
+      }
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewSideBar.vue b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewSideBar.vue
new file mode 100644
index 0000000000..51b7b64113
--- /dev/null
+++ b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewSideBar.vue
@@ -0,0 +1,568 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+
+<template>
+  <aside v-if="treeViewExpended" class="sidebar pb-5 ps-5 d-contents">
+    <v-card
+      flat
+      class="border-right-color no-border-radius full-height">
+      <note-treeview-toolbar
+        :filter="filter"
+        class="border-bottom-color"
+        compact-display
+        @keyword-changed="search = $event" />
+      <v-card-text class="px-0 py-2 notes-tree-container">
+        <div v-if="isLoading" class="d-flex justify-center py-4">
+          <v-progress-circular
+            indeterminate
+            color="primary"
+            size="32" />
+        </div>
+        <note-treeview-item-list
+          v-else
+          :items="items"
+          :opened-items="openedItems"
+          :active-item="activeItem"
+          :space-note="isSpaceNote"
+          :note-wiki-owner="noteWikiOwner"
+          :space-group-id="spaceGroupId"
+          :is-draft-filter="isDraftFilter"
+          :parent-id="home.noteId"
+          :show-actions="note && note.canManage"
+          :level="0"
+          @update:items="items = $event"
+          @fetch-children="fetchChildren"
+          @open-note="handleOpenNote"
+          @toggle-open="handleToggleOpen"
+          @reorder="handleReorder" />
+        <template v-if="!resultSearch">
+          <v-card
+            flat
+            class="d-flex align-center justify-center"
+            height="60vh">
+            <div class="d-flex flex-column text-subtitle align-center">
+              <v-icon
+                class="my-auto"
+                size="60">
+                fas fa-search
+              </v-icon>
+              <span class="text-body mt-3">{{ $t('notes.label.noResults.placeholder') }}</span>
+            </div>
+          </v-card>
+        </template>
+      </v-card-text>
+    </v-card>
+  </aside>
+</template>
+
+<script>
+export default {
+  props: {
+    activeNoteId: {
+      type: String,
+      default: ''
+    },
+    treeViewExpended: {
+      type: Boolean,
+      default: true
+    },
+  },
+  data: () => ({
+    note: {},
+    items: [],
+    allItems: [],
+    allItemsHome: [],
+    home: {},
+    noteBookType: '',
+    noteBookOwnerTree: '',
+    openNotes: [],
+    activeItem: [],
+    isIncludePage: false,
+    movePage: false,
+    exportNotes: false,
+    selectionNotes: [],
+    spaceId: eXo.env.portal.spaceId,
+    spaceDisplayName: eXo.env.portal.spaceDisplayName,
+    breadcrumb: [],
+    destinationNote: {},
+    displayArrow: true,
+    closeAll: true,
+    drawer: false,
+    filter: 'published',
+    filterOptions: [],
+    checkbox: false,
+    showTree: true,
+    search: '',
+    exportStatus: {status: '', action: {}},
+    exporting: false,
+    started: false,
+    notesGetted: false,
+    parentUpdated: false,
+    jsonCreated: false,
+    imageUrlsUpdated: false,
+    zipCreated: false,
+    tempCleaned: false,
+    dataCreated: false,
+    isLoading: false,
+    selectionType: 'independent',
+    inProgressTreeFetches: [],
+    filterItems: [],
+    filterItemsDraft: [],
+    limit: 20,
+    timeout: 1000,
+    searchTimer: null,
+    enableMove: false,
+    currentPath: window.location.pathname,
+    lang: eXo.env.portal.language,
+    dragTimer: null,
+    dndPayload: null
+  }),
+  computed: {
+    homeLabel() {
+      return this.home?.name === 'Home' && this.noteHomeTitle || this.home.name;
+    },
+    isSpaceNote() {
+      return this.noteWikiType === 'group';
+    },
+    noteHomeTitle() {
+      return this.spaceId ? this.$t('notes.label.noteHome') : this.$t('notes.label.myNotes');
+    },
+    noteWikiType() {
+      return this.note?.wikiType;
+    },
+    noteWikiOwner() {
+      return this.isSpaceNote ? this.note?.wikiOwner?.substring(1) : this.note?.wikiOwner;
+    },
+    spaceGroupId() {
+      return this.isSpaceNote && this.note?.wikiOwner?.startsWith?.('/spaces/') ? this.note?.wikiOwner : null;
+    },
+    openedItems() {
+      return this.openNotes;
+    },
+    includePage() {
+      return this.isIncludePage;
+    },
+    isDraftFilter() {
+      return this.filter === 'drafts';
+    },
+    notesPageName() {
+      if (this.currentPath?.endsWith(eXo.env.portal.selectedNodeUri) || this.currentPath.endsWith(`${eXo.env.portal.selectedNodeUri}/`)){
+        return 'homeNote';
+      } else {
+        const noteId = this.currentPath?.split(`${eXo.env.portal.selectedNodeUri}/`)[1];
+        if (noteId) {
+          return noteId;
+        } else {
+          return 'homeNote';
+        }
+      }
+    },
+    resultSearch() {
+      return this.showTree;
+    },
+  },
+  watch: {
+    inProgressTreeFetches() {
+      this.isLoading = this.inProgressTreeFetches?.length;
+    },
+    search() {
+      clearTimeout(this.searchTimer);
+      this.showTree = true;
+      if (this.search) {
+        this.searchTerm();
+      } else {
+        this.retrieveNoteTree(this.noteWikiType, this.noteWikiOwner, this.note.name);
+      }
+    },
+    filter() {
+      if (!this.search) {
+        this.items = [];
+        if (this.note && this.note.id) {
+          if (this.note.draftPage) {
+            this.getDraftNote(this.note.id);
+          } else {
+            this.getNoteById(this.note.id);
+          }
+        }
+      } else {
+        this.searchTerm();
+      }
+    },
+  },
+  created() {
+    this.$root.$on('notes-filter-update', this.updateFilter);
+    this.getNoteById(this.activeNoteId);
+  },
+  beforeDestroy() {
+    this.$root.$off('notes-filter-update', this.updateFilter);
+  },
+  methods: {
+    updateFilter(filter) {
+      this.filter = filter;
+    },
+    handleOpenNote(payload) {
+      const { event, note } = payload;
+      this.openNote(event, note);
+    },
+    isOpen(item) {
+      return this.openNotes.includes(item.noteId);
+    },
+    fetchChildrenInParallel(children, level = 0) {
+      if (level >= 2) {
+        return;
+      }
+      children.forEach(item => {
+        if (item.hasChild && !item?.children?.length) {
+          this.inProgressTreeFetches.push(item.noteId);
+          return this.$notesService.getNoteTreeLevel(item.path).then((data) => {
+            item.children = this.mapItems(data?.jsonList);
+            this.fetchChildrenInParallel(item.children, level + 1);
+            const inProgressFetch = this.inProgressTreeFetches.indexOf(item.noteId);
+            this.inProgressTreeFetches.splice(inProgressFetch, 1);
+          });
+        }
+      });
+    },
+    selectChildren(item) {
+      if (item.hasChild && !item?.children?.length) {
+        this.inProgressTreeFetches.push(item.noteId);
+        return this.$notesService.getNoteTreeLevel(item.path).then((data) => {
+          item.children = this.mapItems(data?.jsonList);
+          this.selectionNotes.push(
+            ...item.children.map(item => item.noteId).filter(id => !this.selectionNotes.includes(id)));
+          item.children.forEach(child => this.selectChildren(child));
+          this.openItem(item);
+          this.inProgressTreeFetches.splice(this.inProgressTreeFetches.indexOf(item.noteId), 1);
+        });
+      } else if (item?.children?.length) {
+        this.selectionNotes.push(
+          ...item.children.map(item => item.noteId).filter(id => !this.selectionNotes.includes(id)));
+        this.openItem(item);
+        item.children.forEach(item => this.selectChildren(item));
+      }
+    },
+    deselectChildren(item) {
+      if (item.children) {
+        item.children.forEach((child) => {
+          const index = this.selectionNotes.indexOf(child.noteId);
+          if (index !== -1) {
+            this.selectionNotes.splice(index, 1);
+          }
+          this.deselectChildren(child);
+        });
+      }
+    },
+    open(note, source, includeDisplay,filter) {
+      if (note.draftPage) {
+        this.filter = filter === 'published';
+        this.getDraftNote(note.id);
+      } else {
+        this.filter = filter === 'drafts';
+        this.getNoteById(note.id);
+      }
+      this.isIncludePage = source === 'includePages';
+      this.displayArrow = !includeDisplay;
+      if (source === 'movePage') {
+        this.enableMove = false;
+        this.movePage = true;
+        this.exportNotes = false;
+      }
+      else if (source === 'exportNotes') {
+        this.exportNotes = true;
+        this.movePage = false;
+      } else {
+        this.movePage = false;
+        this.exportNotes = false;
+      }
+      this.$nextTick().then(() => {
+        this.$forceUpdate();
+        this.$refs.breadcrumbDrawer.open();
+      });
+      const draftFilterValue = this.$t('notes.filter.label.drafts');
+      if ((this.note.canManage || note.canManage) && !this.filterOptions.includes(draftFilterValue)) {
+        this.filterOptions.push(draftFilterValue);
+      }
+    },
+    getNoteById(id) {
+      if (id || !isNaN(Number(this.notesPageName))) {
+        id = id || this.notesPageName;
+        return this.$notesService.getNoteById(id).then(data => {
+          this.note = data || [];
+          this.note.breadcrumb[0].title = this.noteHomeTitle;
+          this.breadcrumb = this.note.breadcrumb;
+        }).then(() => {
+          this.retrieveNoteTree(this.noteWikiType, this.noteWikiOwner , this.note.name);
+        });
+      } else {
+        return this.$notesService.getNote(this.$root.noteBookType, this.$root.noteBookOwner, this.notesPageName, '', this.lang).then(data => {
+          this.note = data || [];
+          this.note.breadcrumb[0].title = this.noteHomeTitle;
+          this.breadcrumb = this.note.breadcrumb;
+        }).then(() => {
+          this.retrieveNoteTree(this.noteWikiType, this.noteWikiOwner , this.note.name);
+        });
+      }
+    },
+    getDraftNote(id) {
+      if (id) {
+        return this.$notesService.getDraftNoteById(id).then(data => {
+          this.note = data || [];
+          this.note.breadcrumb[0].title = this.noteHomeTitle;
+          this.breadcrumb = this.note.breadcrumb;
+        }).then(() => {
+          this.retrieveNoteTree(this.noteWikiType, this.noteWikiOwner, this.note.parentPageName);
+        });
+      }
+    },
+    mapItems(itemsArray) {
+      if (!itemsArray) {
+        return [];
+      }
+      for (let i = 0; i < itemsArray.length; i++) {
+        const item = itemsArray[i];
+        if (!item.hasChild && item.children) {
+          delete item.children;
+        }
+      }
+      return itemsArray;
+    },
+    naturalSort(items) {
+      if (items?.length) {
+        const collator = new Intl.Collator(eXo.env.portal.language, {numeric: true, sensitivity: 'base'});
+        items.sort((a, b) => collator.compare(a.name, b.name));
+      }
+    },
+    retrieveNoteTree(noteBookType, noteOwner, noteName, treeType) {
+      if (this.isDraftFilter) {
+        noteName = this.note?.breadcrumb[0]?.id;
+        treeType = 'all';
+      }
+      this.isLoading = true;
+      this.items = [];
+
+      this.$notesService.getNoteTree(noteBookType, noteOwner, noteName, treeType, this.filter).then(data => {
+        if (data?.jsonList?.length) {
+          this.home = data.jsonList[0];
+          this.home.name = this.homeLabel;
+          this.items = this.isDraftFilter ? this.home.children : [this.home];
+          if (this.isDraftFilter) {
+            this.naturalSort(this.items);
+            this.filterItems = this.items;
+            this.filterItemsDraft = [];
+            this.filterItemsForSearch(this.filterItems);
+          }
+          this.allItems = data.treeNodeData;
+          this.allItemsHome = this.items;
+        }
+        this.isLoading = false;
+        const openedTreeViewItems = this.getOpenedTreeViewItems(this.note.breadcrumb);
+        this.openNotes = [...new Set([...this.openNotes, ...openedTreeViewItems])];
+        this.activeItem = [openedTreeViewItems[openedTreeViewItems.length-1]];
+        this.noteBookType = noteBookType;
+        this.noteBookOwnerTree = noteOwner;
+      });
+    },
+    getOpenedTreeViewItems(breadCrumbArray) {
+      const activatedNotes = [];
+      if (this.isDraftFilter) {
+        const nodesToOpen = this.allItems.filter(item => !item.draftPage);
+        const nodesToOpenIds = nodesToOpen.map(node => String(node.noteId));
+        activatedNotes.push(...nodesToOpenIds);
+      } else {
+        if (breadCrumbArray && breadCrumbArray.length > 0) {
+          for (let index = 0; index < breadCrumbArray.length; index++) {
+            const nodeId = breadCrumbArray[index].noteId || breadCrumbArray[index].id;
+            if (nodeId) {
+              activatedNotes.push(String(nodeId));
+            }
+          }
+        }
+      }
+      return activatedNotes;
+    },
+    searchTerm() {
+      this.items = [];
+      this.isLoading = true;
+      this.searchTimer = setTimeout(() => {
+        if (this.isDraftFilter) {
+          this.items = this.filterItemsDraft.filter(item => item.name.includes(this.search));
+        } else {
+          this.$notesService.searchNotes(this.search, `/${this.noteWikiOwner}`, this.limit).then(data => {
+            this.items = data?.jsonList.length ? this.toListNotes(data?.jsonList) : [];
+            this.showTree = !!this.items.length;
+          });
+        }
+        this.isLoading = false;
+      }, this.timeout);
+    },
+    filterItemsForSearch(filterItems){
+      filterItems.forEach(filterItem => {
+        if (filterItem.draftPage) {
+          this.filterItemsDraft.push(filterItem);
+        }
+        if (filterItem.hasChild) {
+          this.filterItemsForSearch(filterItem.children);
+        }
+      });
+    },
+    toListNotes(items) {
+      const itemsNotes = [];
+      items.forEach(item => itemsNotes.push(this.toNote(item)));
+      return itemsNotes;
+    },
+    toNote(note) {
+      return {
+        children: [],
+        disabled: false,
+        draftPage: false,
+        name: note.title,
+        nodeType: note.type,
+        noteId: note.id,
+        url: note.url,
+        path: note.pageName,
+        parentPageId: ''
+      };
+    },
+    handleToggleOpen(payload) {
+      const { item, open } = payload;
+      if (open) {
+        if (!this.openNotes.includes(item.noteId)) {
+          this.openNotes = [...this.openNotes, item.noteId];
+        }
+      } else {
+        const index = this.openNotes.indexOf(item.noteId);
+        if (index > -1) {
+          this.openNotes.splice(index, 1);
+        }
+      }
+    },
+    handleReorder(payload) {
+      const { event, items, parentId } = payload;
+      if (!this.dragPayload) {
+        this.dragPayload = {
+          pageId: null,
+          wikiType: this.noteWikiType,
+          wikiOwner: this.noteWikiOwner,
+          sourceParentId: null,
+          targetParentId: null,
+          sourceOrderedIds: [],
+          targetOrderedIds: []
+        };
+      }
+      if (event.moved) {
+        this.dragPayload.pageId = event.moved.element.noteId;
+        this.dragPayload.sourceParentId = parentId;
+        this.dragPayload.targetParentId = parentId;
+        this.dragPayload.targetOrderedIds = items.map(item => item.noteId);
+      }
+      else if (event.added) {
+        this.dragPayload.pageId = event.added.element.noteId;
+        this.dragPayload.targetParentId = parentId;
+        this.dragPayload.targetOrderedIds = items.map(item => item.noteId);
+      }
+      else if (event.removed) {
+        this.dragPayload.pageId = event.removed.element.noteId;
+        this.dragPayload.sourceParentId = parentId;
+        this.dragPayload.sourceOrderedIds = items.map(item => item.noteId);
+      }
+      clearTimeout(this.dragTimer);
+      this.dragTimer = setTimeout(() => {
+        const requestData = { ...this.dragPayload };
+        if (requestData.sourceParentId === this.home.noteId) {requestData.sourceParentId = null;}
+        if (requestData.targetParentId === this.home.noteId) {requestData.targetParentId = null;}
+        this.executeDragAndDropApi(requestData);
+        this.dragPayload = null;
+      }, 100);
+    },
+    executeDragAndDropApi() {
+      const requestData = { ...this.dragPayload };
+      this.$notesService.updateNotesOrder(requestData)
+        .then(() => {
+          this.$root.$emit('alert-message', this.$t('notes.reorder.success.message'), 'success');
+          if (requestData.sourceParentId !== requestData.targetParentId) {
+            this.parentUpdated = true;
+          }
+        })
+        .catch(() => {
+          this.$root.$emit('alert-message', this.$t('notes.reorder.error.message'), 'error');
+          this.refreshTree();
+        });
+    },
+    fetchChildren(item) {
+      if (!item.hasChild) {return;}
+      if (this.openNotes.includes(item.noteId)) {
+        this.closeItem(item);
+        return;
+      }
+      if (item.children && item.children.length) {
+        this.openItem(item);
+        return;
+      }
+      this.$set(item, 'isLoading', true);
+      this.$notesService.getNoteTreeLevel(item.path)
+        .then(data => {
+          this.$set(item, 'children', data?.jsonList || []);
+          this.openItem(item);
+        })
+        .catch(error => {
+          console.error('Error fetching children:', error);
+        })
+        .finally(() => {
+          this.$set(item, 'isLoading', false);
+        });
+    },
+    openItem(item) {
+      if (!this.openNotes.includes(item.noteId)) {
+        this.openNotes = [...this.openNotes, item.noteId];
+      }
+    },
+    closeItem(item) {
+      const index = this.openNotes.indexOf(item.noteId);
+      if (index > -1) {
+        this.openNotes.splice(index, 1);
+      }
+    },
+    openNote(event, note) {
+      if (event.defaultPrevented) {
+        return;
+      }
+      const noteIdParam = new URLSearchParams(window.location.search).get('noteId');
+      const isEditDifferentNote = this.isEditMode && noteIdParam !== note.noteId;
+      const isNotCurrentNote = (this.note.id !== note.noteId) || (this.note.name !== note.name);
+      const canOpenNote = (!this.isDraftFilter || (this.isDraftFilter && note.draftPage))
+          && (isEditDifferentNote || isNotCurrentNote);
+      if (canOpenNote) {
+        this.activeItem = [note.noteId];
+        if (this.includePage) {
+          this.$root.$emit('include-page', note);
+        } else {
+          const noteName = note.draftPage ? note.noteId : note.path.split('%2F').pop();
+          this.$root.$emit('open-note-by-name', noteName, note.draftPage);
+        }
+        document.dispatchEvent(new CustomEvent('note-navigation-updated', { detail: note }));
+      }
+    },
+    refreshTree() {
+      this.retrieveNoteTree(this.noteWikiType, this.noteWikiOwner, this.note.name);
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewSideBarItemLabel.vue b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewSideBarItemLabel.vue
new file mode 100644
index 0000000000..ed1a90e43c
--- /dev/null
+++ b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewSideBarItemLabel.vue
@@ -0,0 +1,80 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-list-item-title class="body-2">
+    <div
+      v-if="isDraftFilter && !draftPage"
+      class="not-clickable">
+      {{ noteLabel }}
+    </div>
+    <a
+      v-else
+      :href="draftPage ? `${noteId}/draft` : noteId"
+      :class="{'text-color': (isDraftFilter && draftPage) || !draftPage}"
+      :aria-current="(noteId === activeItem[0] && !draftPage) ? 'page' : null"
+      @click.prevent="$emit('open-note', $event, note)">
+      {{ noteLabel }}
+    </a>
+  </v-list-item-title>
+</template>
+
+<script>
+export default {
+  props: {
+    note: {
+      type: Object,
+      default: null
+    },
+    isDraftFilter: {
+      type: Boolean,
+      default: false
+    },
+    spaceNote: {
+      type: Boolean,
+      default: false
+    },
+    activeItem: {
+      type: Array,
+      default: () => []
+    }
+  },
+  computed: {
+    noteId() {
+      return this.note.noteId;
+    },
+    noteName() {
+      return this.note.name;
+    },
+    noteLabel() {
+      return this.isHomePage ? this.noteHomeTitle : this.noteName;
+    },
+    draftPage() {
+      return this.note.draftPage;
+    },
+    isHomePage() {
+      return this.note.nodeType === 'WIKIHOME';
+    },
+    noteHomeTitle() {
+      return this.spaceNote ? this.$t('notes.label.noteHome') : this.$t('notes.label.myNotes');
+    },
+  }
+};
+</script>
\ No newline at end of file
diff --git a/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewSideBarItemPrepend.vue b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewSideBarItemPrepend.vue
new file mode 100644
index 0000000000..ee9802d2df
--- /dev/null
+++ b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeViewSideBarItemPrepend.vue
@@ -0,0 +1,60 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-btn
+    v-if="hasChild"
+    :loading="isLoading"
+    icon
+    small
+    @click="$emit('fetch-children', note)">
+    <v-icon size="20">
+      {{ open ? 'mdi-menu-down' : 'mdi-menu-right' }}
+    </v-icon>
+  </v-btn>
+</template>
+
+<script>
+export default {
+  props: {
+    note: {
+      type: Object,
+      default: null
+    },
+    open: {
+      type: Boolean,
+      default: false
+    },
+  },
+  data() {
+    return {
+      hover: false,
+    };
+  },
+  computed: {
+    hasChild() {
+      return this.note.hasChild;
+    },
+    isLoading() {
+      return this.note.isLoading;
+    },
+  }
+};
+</script>
\ No newline at end of file
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 a8ced99f4d..e7e2f68e27 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
@@ -644,6 +644,7 @@ export default {
     },
   },
   created() {
+    this.$root.$on('open-note-tree-view-drawer', this.open);
     this.$root.$on('refresh-treeView-items', (note)=> {
       if (note.draftPage) {
         this.getDraftNote(note.id);
diff --git a/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewToolbar.vue b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewToolbar.vue
new file mode 100644
index 0000000000..ef1e01d3a7
--- /dev/null
+++ b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewToolbar.vue
@@ -0,0 +1,95 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <div class="row no-gutters align-center">
+    <application-toolbar
+      id="noteTreeviewToolbar"
+      :right-text-filter="{
+        minCharacters: 3,
+        placeholder: $t('notes.label.filter'),
+        tooltip: $t('notes.label.filter')
+      }"
+      :right-filter-button=" {
+        text: $t('notes.advanced.filter.button.title'),
+        displayText: false,
+      }"
+      :compact="compactDisplay || $root.isMobile"
+      class="px-0 height-auto"
+      no-text-truncate
+      dense
+      @filter-text-input-end-typing="$emit('keyword-changed', $event)"
+      @filter-button-click="$root.$emit('notes-filter-open', filter)"
+      @filter-expand="filterExpand = $event"
+      @loading="$emit('loading', $event)">
+      <template #left>
+        <span class="text-header">{{ $t('notes.label.tree') }}</span>
+      </template>
+    </application-toolbar>
+    <v-tooltip v-if="!filterExpand" bottom>
+      <template #activator="{ on, attrs }">
+        <v-btn
+          icon
+          v-bind="attrs"
+          v-on="on"
+          @click.stop.prevent="$root.$emit('sidebar-tree-view-expend', false)">
+          <img
+            src="/social/images/sidebar.svg"
+            class="icon-default-color"
+            height="20px"
+            width="20px">
+        </v-btn>
+      </template>
+      <span class="caption">
+        {{ $t('notes.tooltip.close.tree') }}
+      </span>
+    </v-tooltip>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    filter: {
+      type: String,
+      default: null,
+    },
+    filtersCount: {
+      type: Number,
+      default: () => 0,
+    },
+    compactDisplay: {
+      type: Boolean,
+      default: false
+    },
+    filterMessage: {
+      type: String,
+      default: null
+    },
+    canCreateSpace: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data: () => ({
+    loading: 0,
+    filterExpand: false,
+  }),
+};
+</script>
diff --git a/notes-webapp/src/main/webapp/vue-app/notes-treeview/initComponents.js b/notes-webapp/src/main/webapp/vue-app/notes-treeview/initComponents.js
index 0c21c529a2..e7bb5a0ae1 100644
--- a/notes-webapp/src/main/webapp/vue-app/notes-treeview/initComponents.js
+++ b/notes-webapp/src/main/webapp/vue-app/notes-treeview/initComponents.js
@@ -1,8 +1,22 @@
 import NoteBreadcrumb from '../notes/components/NoteBreadcrumb.vue';
 import NoteTreeviewDrawer from './components/NoteTreeviewDrawer.vue';
+import NoteTreeViewSideBar from './components/NoteTreeViewSideBar.vue';
+import NoteTreeViewSideBarItemLabel from './components/NoteTreeViewSideBarItemLabel.vue';
+import NoteTreeViewSideBarItemPrepend from './components/NoteTreeViewSideBarItemPrepend.vue';
+import NoteTreeviewToolbar from './components/NoteTreeviewToolbar.vue';
+import NoteTreeViewFilterDrawer from './components/NoteTreeViewFilterDrawer.vue';
+import NoteTreeViewItemList from './components/NoteTreeViewItemList.vue';
+import NoteTreeViewItem from './components/NoteTreeViewItem.vue';
 
 const components = {
   'note-treeview-drawer': NoteTreeviewDrawer,
+  'note-treeview-sideBar': NoteTreeViewSideBar,
+  'note-treeview-sidebar-item-label': NoteTreeViewSideBarItemLabel,
+  'note-treeview-sidebar-item-prepend': NoteTreeViewSideBarItemPrepend,
+  'note-treeview-toolbar': NoteTreeviewToolbar,
+  'note-treeview-filter-drawer': NoteTreeViewFilterDrawer,
+  'note-treeview-item-list': NoteTreeViewItemList,
+  'note-treeview-item': NoteTreeViewItem,
   'note-breadcrumb': NoteBreadcrumb
 };
 
diff --git a/notes-webapp/src/main/webapp/vue-app/notes/components/NotePage.vue b/notes-webapp/src/main/webapp/vue-app/notes/components/NotePage.vue
new file mode 100644
index 0000000000..d693bac8ea
--- /dev/null
+++ b/notes-webapp/src/main/webapp/vue-app/notes/components/NotePage.vue
@@ -0,0 +1,1300 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-app
+    class="transparent"
+    role="main"
+    flat>
+    <div>
+      <div
+        v-if="isAvailableNote"
+        class="notes-application notes-application-content application-body overflow-hidden"
+        :class="treeViewExpended && 'ps-3'"
+        ref="content">
+        <div class="notes-application-header">
+          <v-row
+            no-gutters
+            class="mb-5 align-center">
+            <v-col
+              xl="10"
+              lg="10"
+              md="9"
+              sm="8"
+              cols="6">
+              <div v-if="!hideElementsForSavingPDF" class="notes-treeview d-flex flex-grow-1">
+                <v-tooltip v-if="!treeViewExpended || isMobile" bottom>
+                  <template #activator="{ on, attrs }">
+                    <v-btn
+                      icon
+                      v-bind="attrs"
+                      v-on="on"
+                      class="pa-0 me-2"
+                      @click.stop.prevent="openSidebarTreeView">
+                      <img
+                        src="/social/images/sidebar.svg"
+                        class="icon-default-color"
+                        height="20px"
+                        width="20px">
+                    </v-btn>
+                  </template>
+                  <span class="caption">
+                    {{ $t('notes.tooltip.open.tree') }}
+                  </span>
+                </v-tooltip>
+                <note-breadcrumb
+                  class="my-auto"
+                  :note-breadcrumb="notebreadcrumb"
+                  :actual-note-id="note.id"
+                  @open-note="getNoteByName($event, 'breadCrumb', true)" />
+              </div>
+            </v-col>
+            <v-col
+              xl="2"
+              lg="2"
+              md="3"
+              sm="4"
+              cols="6">
+              <div
+                id="note-actions-menu"
+                v-if="loadData && !hideElementsForSavingPDF"
+                class="notes-header-icons text-right d-flex justify-end">
+                <div
+                  class="d-inline-flex">
+                  <v-tooltip bottom v-if="!hasDraft && isManager">
+                    <template #activator="{ on, attrs }">
+                      <v-btn
+                        v-on="on"
+                        v-bind="attrs"
+                        class="pa-0 mt-0"
+                        @click="addNote"
+                        icon>
+                        <v-icon
+                          size="20"
+                          class="clickable add-note-click">
+                          fas fa-plus
+                        </v-icon>
+                      </v-btn>
+                    </template>
+                    <span class="caption">{{ $t('notes.label.addPage') }}</span>
+                  </v-tooltip>
+                </div>
+                <div
+                  class="d-inline-flex ms-2">
+                  <v-tooltip bottom v-if="isManager">
+                    <template #activator="{ on, attrs }">
+                      <v-btn
+                        icon
+                        v-on="on"
+                        v-bind="attrs"
+                        class="pa-0 mt-0"
+                        @click="editNote">
+                        <v-icon
+                          size="20"
+                          class="clickable edit-note-click">
+                          fas fa-edit
+                        </v-icon>
+                      </v-btn>
+                    </template>
+                    <span class="caption">{{ $t('notes.label.editPage') }}</span>
+                  </v-tooltip>
+                </div>
+                <extension-registry-components
+                  :params="params"
+                  name="NotesDetails"
+                  type="notes-toolbar"
+                  parent-element="div"
+                  element="div"
+                  class="d-flex" />
+                <note-favorite-action
+                  :icon-size="20"
+                  :note="note"
+                  :activity-id="note.activityId"
+                  class="ms-2" />
+                <div
+                  class="d-inline-flex ms-2">
+                  <v-tooltip bottom>
+                    <template #activator="{ on, attrs }">
+                      <v-btn
+                        v-on="on"
+                        @click="$root.$emit('display-action-menu')"
+                        v-bind="attrs"
+                        class="pa-0 mt-0"
+                        icon>
+                        <v-icon
+                          size="20"
+                          class="clickable">
+                          fas fa-ellipsis-v
+                        </v-icon>
+                      </v-btn>
+                    </template>
+                    <span class="caption">{{ $t('notes.label.openMenu') }}</span>
+                  </v-tooltip>
+                </div>
+              </div>
+            </v-col>
+          </v-row>
+          <v-card flat class="d-sm-grid">
+            <v-img
+              v-if="hasFeaturedImage"
+              :lazy-src="featuredImageLink"
+              :alt="featuredImageAltText"
+              :src="featuredImageLink"
+              contain
+              class="mb-5"
+              width="100%"
+              max-height="400" />
+          </v-card>
+          <div class="notes-title">
+            <p ref="noteTitle" class="title text-color text-break">
+              <span>
+                {{ noteTitle }}
+              </span>
+              <span>
+                <notes-translation-menu
+                  :note="note"
+                  :translations="translations"
+                  :selected-translation="selectedTranslation"
+                  @change-translation="changeTranslation" />
+              </span>
+              <extension-registry-components
+                name="NotesDetailTitle"
+                type="notes-overview-extensions"
+                element-class="ms-3"
+                parent-element="span"
+                element="span" />
+            </p>
+          </div>
+          <p
+            v-if="hasSummary"
+            class="note-summary text-break text-sub-title mt-4 mb-0">
+            {{ noteSummary }}
+          </p>
+        </div>
+        <div class="note-content mt-8 my-4" v-if="!hasEmptyContent && !isHomeNoteDefaultContent">
+          <div
+            class="text-color">
+            <component :is="notesContentProcessor" />
+          </div>
+        </div>
+        <div v-else-if="!hasChildren || hasDraft && hasEmptyContent">
+          <div v-if="isManager" class="d-flex flex-column justify-center text-center">
+            <v-img
+              :src="emptyNoteNoManager"
+              class="mx-auto mb-4"
+              max-height="150"
+              max-width="250"
+              contain
+              eager />
+            <div>
+              <p class="notes-welcome-patragraph">
+                <span>{{ $t('notes.label.no-content-no-redactor.content.first') }}</span>
+                <v-tooltip bottom>
+                  <template #activator="{ on, attrs }">
+                    <v-btn
+                      class="pa-0"
+                      icon
+                      v-on="on"
+                      v-bind="attrs"
+                      @click="editNote">
+                      <v-icon
+                        size="16"
+                        class="clickable edit-note-click">
+                        mdi-square-edit-outline
+                      </v-icon>
+                    </v-btn>
+                  </template>
+                  <span class="caption">{{ $t('notes.label.editPage') }}</span>
+                </v-tooltip>
+                <span v-if="!hasDraft">{{ $t('notes.label.no-content.no-redactor.content.last') }}</span>
+                <v-tooltip bottom v-if="!hasDraft">
+                  <template #activator="{ on, attrs }">
+                    <v-btn
+                      class="pa-0"
+                      v-on="on"
+                      v-bind="attrs"
+                      @click="addNote"
+                      icon>
+                      <v-icon
+                        size="16"
+                        class="clickable add-note-click">
+                        fas fa-plus
+                      </v-icon>
+                    </v-btn>
+                  </template>
+                  <span class="caption">{{ $t('notes.label.addPage') }}</span>
+                </v-tooltip>
+              </p>
+            </div>
+          </div>
+          <div v-else class="d-flex flex-column justify-center text-center text-color">
+            <v-img
+              :src="emptyNoteWithManager"
+              class="mx-auto mb-4"
+              max-height="150"
+              max-width="250"
+              contain
+              eager />
+            <div>
+              <h4 class="notes-welcome-title font-weight-bold text-color">
+                {{ $t('notes.label.no-content-redactor-title').replace('{0}', spaceDisplayName) }}
+              </h4>
+              <p class="notes-welcome-patragraph">
+                <span>{{ $t('notes.label.no-content.redactor.content.first') }}</span>
+                <a :href="spaceMembersUrl" class="text-decoration-underline">{{ $t('notes.label.no-content-manager') }}</a>
+                <span>{{ $t('notes.label.or') }}</span>
+                <a :href="spaceMembersUrl" class="text-decoration-underline">{{ $t('notes.label.no-content-redactor') }}</a>
+                <span>{{ $t('notes.label.no-content.redactor.content.last') }}</span>
+              </p>
+            </div>
+          </div>
+        </div>
+
+        <div v-else>
+          <v-treeview
+            v-if="noteChildren?.length"
+            ref="noteTreeview"
+            :items="noteChildren"
+            class="ps-1 notes-custom-treeview"
+            item-key="noteId"
+            expand-icon=""
+            dense>
+            <template #prepend="{ item, open }">
+              <note-treeview-item-prepend
+                :item="item"
+                :open="open"
+                @click="fetchChildren(item, $refs.noteTreeview)" />
+            </template>
+            <template #label="{ item }">
+              <note-content-table-item
+                :note="item"
+                @open-note="openNoteChild" />
+            </template>
+          </v-treeview>
+        </div>
+        <extension-registry-components
+          :params="extensionParams"
+          name="NotesDetailsFooter"
+          type="notes-attachment-list"
+          element-class="ms-3" />
+      </div>
+      <div v-else class="note-not-found-wrapper text-center mt-6">
+        <v-img
+          :src="noteNotFountImage"
+          class="mx-auto"
+          max-height="150"
+          max-width="250"
+          contain
+          eager />
+        <p class="title mt-3 text-light-color">{{ $t('notes.label.noteNotFound') }}</p>
+        <a
+          class="btn btn-primary"
+          :href="defaultPath">
+          {{ $t('notes.label.noteNotFound.button') }}
+        </a>
+      </div>
+    </div>
+    <exo-confirm-dialog
+      ref="DeleteNoteDialog"
+      :message="confirmMessage"
+      :title="hasDraft ? $t('popup.confirmation.delete.draft') : $t('popup.confirmation.delete')"
+      :ok-label="$t('notes.button.delete')"
+      :cancel-label="$t('notes.button.cancel')"
+      persistent
+      @ok="deleteNote()"
+      @dialog-opened="$emit('confirmDialogOpened')"
+      @dialog-closed="$emit('confirmDialogClosed')" />
+    <notes-actions-menu
+      v-if="!isMobile"
+      :note="note" />
+    <notes-mobile-action-menu
+      v-else
+      ref="notesMobileActionMenu"
+      :note="note" />
+    <note-treeview-drawer
+      ref="notesBreadcrumb" />
+    <version-history-drawer
+      :versions="noteVersionsArray"
+      :can-manage="this.note.canManage"
+      :show-load-more="hasMoreVersions"
+      @open-version="displayVersion($event)"
+      @restore-version="restoreVersion($event)"
+      @load-more="loadMoreVersions"
+      ref="noteVersionsHistoryDrawer" />
+    <note-import-drawer
+      ref="noteImportDrawer" />
+    <note-featured-image-drawer
+      ref="featuredImageDrawer"
+      :note="note"
+      :has-featured-image="hasFeaturedImage" />
+    <note-publication-target-drawer />
+    <note-publication-drawer
+      ref="publicationDrawer"
+      :has-featured-image="hasFeaturedImage"
+      :is-publishing="isPublishing"
+      :params="{
+        spaceId: spaceId,
+        allowedTargets: publishTargets,
+        canPublish: canPublish,
+        canSchedule: canScheduleNotePublication
+      }"
+      :edit-mode="published"
+      @publish="publishNote" />
+  </v-app>
+</template>
+<script>
+
+import {notesConstants} from '../../../javascript/eXo/wiki/notesConstants.js';
+import html2canvas from 'html2canvas';
+import JSPDF from 'jspdf';
+
+export default {
+  props: {
+    treeViewExpended: {
+      type: Boolean,
+      default: true
+    },
+  },
+  data() {
+    return {
+      versionsPageSize: null,
+      note: {},
+      lastUpdatedTime: '',
+      lang: eXo.env.portal.language,
+      dateTimeFormat: {
+        year: 'numeric',
+        month: 'long',
+        day: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
+      },
+      dateTimeFormatZip: {
+        year: 'numeric',
+        month: 'numeric',
+        day: 'numeric',
+      },
+      confirmMessage: '',
+      spaceDisplayName: eXo.env.portal.spaceDisplayName,
+      spaceId: eXo.env.portal.spaceId,
+      noteBookType: eXo.env.portal.spaceName ? 'group' : 'user',
+      noteBookOwner: eXo.env.portal.spaceGroup ? `/spaces/${eXo.env.portal.spaceGroup}` : eXo.env.portal.profileOwner,
+      noteNotFountImage: '/notes/skin/images/notes_not_found.png',
+      emptyNoteWithManager: '/notes/images/no-content-with-manager.png',
+      emptyNoteNoManager: '/notes/images/no-content-no-manager.png',
+      defaultPath: 'Home',
+      existingNote: true,
+      currentPath: window.location.pathname,
+      currentNoteBreadcrumb: [],
+      loadData: false,
+      openTreeView: false,
+      hideElementsForSavingPDF: false,
+      noteVersions: [],
+      actualVersion: {},
+      noteContent: '',
+      displayLastVersion: true,
+      noteChildren: [],
+      isDraft: false,
+      noteTitle: '',
+      noteSummary: '',
+      spaceMembersUrl: `${eXo.env.portal.context}/g/:spaces:${eXo.env.portal.spaceGroup}/${eXo.env.portal.spaceUrl}/members`,
+      childNodes: [],
+      exportStatus: '',
+      exportId: 0,
+      iframelyOriginRegex: /^https?:\/\/if-cdn.com/,
+      selectedTranslation: { value: null, text: this.$t('notes.label.translation.originalVersion') },
+      translations: [],
+      languages: [],
+      slectedLanguage: null,
+      translationsMenu: false,
+      originalVersion: { value: '', text: this.$t('notes.label.translation.originalVersion') },
+      illustrationBaseUrl: `${eXo.env.portal.context}/${eXo.env.portal.rest}/notes/illustration/`,
+      initialized: false,
+      isPublishing: false,
+      publishTargets: [],
+      canPublish: false,
+      canSchedule: false,
+      published: false,
+      ascending: false,
+      sortMenu: false,
+      sortField: 'lastUpdated',
+    };
+  },
+  computed: {
+    sortFields() {
+      return [
+        {value: 'lastUpdated', label: this.$t('documents.label.lastUpdated')},
+        {value: 'name', label: this.$t('documents.label.name')},
+        {value: 'size', label: this.$t('documents.label.size')}
+      ];
+    },
+    selectedSort() {
+      const item = this.sortFields.find(i => i.value === this.sortField);
+      return item ? item : null;
+    },
+    sortDirectionIcon() {
+      return this.ascending ? 'fa-arrow-down' : 'fa-arrow-up';
+    },
+    extensionParams() {
+      return {
+        entityId: this.entityId,
+        entityType: this.entityType,
+      };
+    },
+    noteHomeTitle() {
+      return this.spaceId ? this.$t('notes.label.noteHome') : this.$t('notes.label.myNotes');
+    },
+    entityId() {
+      return this.note?.draftPage && this.note?.id || this.note.latestVersionId;
+    },
+    entityType() {
+      return this.note.draftPage && 'WIKI_DRAFT_PAGES' || 'WIKI_PAGE_VERSIONS';
+    },
+    params() {
+      return {
+        note: this.note,
+      };
+    },
+    hasSummary() {
+      return this.note?.properties?.summary?.length;
+    },
+    langParam() {
+      return this.note?.lang && `&lang=${this.note?.lang}` || '';
+    },
+    noteFeatureImageUpdatedDate() {
+      return this.note?.properties?.featuredImage?.lastUpdated || 0;
+    },
+    hasFeaturedImage() {
+      return !!this.note?.properties?.featuredImage?.id;
+    },
+    featuredImageAltText() {
+      return this.note?.properties?.featuredImage?.altText;
+    },
+    featuredImageLink() {
+      return `${this.illustrationBaseUrl}${this.note?.id}?v=${this.noteFeatureImageUpdatedDate}&isDraft=${this.isDraft}${this.langParam}&versionNumber=${this.actualVersion?.versionNumber}&size=0x400`;
+    },
+    notesContentProcessor() {
+      return {
+        template: `<div class='rich-editor-content extended-rich-content'>${this.$noteUtils.getContentToDisplay(this.noteContent, this.note?.id, this.noteBookType, this.noteBookOwner, true)}</div>`,
+        data() {
+          return {
+            vTreeComponent: {
+              template: `
+                <v-treeview
+                  ref="noteTreeview"
+                  :items="noteChildItems"
+                  class="ps-1 notes-custom-treeview"
+                  item-key="noteId"
+                  expand-icon=""
+                  dense>
+                  <template #prepend="{ item, open }" >
+                    <note-treeview-item-prepend
+                       :item="item"
+                       :open="open"
+                       @click="fetchChildren(item, $refs.noteTreeview)" />
+                  </template>
+                  <template #label="{ item }">
+                    <note-content-table-item
+                      :note="item"
+                      @open-note="openNoteChild"/>
+                  </template>
+                </v-treeview >`,
+              props: {
+                noteId: 0,
+                source: '',
+                noteBookType: '',
+                noteBookOwner: ''
+              },
+              data: function () {
+                return {
+                  noteChildItems: [],
+                  selectedTranslation: {value: eXo.env.portal.language},
+                  note: null
+                };
+              },
+              created: function () {
+                this.$nextTick().then(() => {
+                  this.getNodeById(this.noteId, this.source, this.noteBookType, this.noteBookOwner);
+                });
+              },
+              methods: {
+                openNoteChild(item) {
+                  return this.$root.$children[0].openNoteChild(item);
+                },
+                fetchChildren(item, treeview) {
+                  return this.$root.$children[0].fetchChildren(item, treeview);
+                },
+                getNoteLanguages(noteId) {
+                  return this.$root.$children[0].getNoteLanguages(noteId);
+                },
+                getNodeById(noteId, source, noteBookType, noteBookOwner) {
+                  return this.$notesService.getNoteById(noteId,this.selectedTranslation.value, source, noteBookType, noteBookOwner).then(data => {
+                    this.note = data || {};
+                    this.getNoteLanguages(noteId);
+                    this.$notesService.getNoteTree(data.wikiType, data.wikiOwner, data.name, 'children').then(data => {
+                      if (data?.jsonList?.length) {
+                        this.noteChildItems = data.jsonList;
+                      }
+                    });
+                  }).catch(e => {
+                    console.error('Error when getting note', e);
+                  });
+                }
+              }
+            }
+          };
+        }
+      };
+    },
+    noteVersionsArray() {
+      return this.noteVersions.slice(0, this.versionsPageSize);
+    },
+    allNoteVersionsCount() {
+      return this.noteVersions.length;
+    },
+    hasMoreVersions() {
+      return this.allNoteVersionsCount > this.versionsPageSize;
+    },
+    isHomeNoteDefaultContent() {
+      return !this.note.parentPageId && ( this.noteContent===`<h1> Welcome to Space ${this.spaceDisplayName} Notes Home </h1>` || this.noteContent === '');
+    },
+    isMobile() {
+      return this.$root.isMobile;
+    },
+    isAvailableNote() {
+      return this.existingNote;
+    },
+    notebreadcrumb() {
+      return this.currentNoteBreadcrumb;
+    },
+    hasDraft(){
+      return !!this.note?.draftPage;
+    },
+    hasEmptyContent(){
+      return !this.note?.content;
+    },
+    hasChildren(){
+      return this.noteChildren?.length;
+    },
+    isManager(){
+      return this.note?.canManage;
+    },
+    notesPageName() {
+      if (this.currentPath.endsWith(eXo.env.portal.selectedNodeUri)||this.currentPath.endsWith(`${eXo.env.portal.selectedNodeUri}/`)){
+        return 'homeNote';
+      } else {
+        const noteId = this.currentPath.split(`${eXo.env.portal.selectedNodeUri}/`)[1];
+        if (noteId) {
+          return noteId;
+        } else {
+          return 'homeNote';
+        }
+
+      }
+    },
+    noteId() {
+      const pathParams = this.currentPath.split('/');
+      const noteId = this.isDraft ? this.currentPath.split('/')[pathParams.length - 2] : this.currentPath.split('/')[pathParams.length - 1];
+      if (!isNaN(noteId)) {
+        return noteId;
+      } else {
+        return 0;
+      }
+    },
+    appName() {
+      const uris = eXo.env.portal.selectedNodeUri.split('/');
+      return uris[uris.length - 1];
+    },
+    canScheduleNotePublication() {
+      return this.note?.canManage || this.canSchedule;
+    },
+    targetLang() {
+      return this.selectedTranslation?.value || this.lang;
+    },
+    parentPageId() {
+      return this.note?.parentPageId;
+    },
+  },
+  watch: {
+    note() {
+      if (!this.note.draftPage) {
+        this.getNoteVersionByNoteId(this.note.id);
+      }
+      if ( this.note && this.note.breadcrumb && this.note.breadcrumb.length ) {
+        this.note.breadcrumb[0].title = this.getHomeTitle(this.note.breadcrumb[0].title);
+        this.currentNoteBreadcrumb = this.note.breadcrumb;
+      }
+      this.noteTitle = !this.note.parentPageId && this.note.title==='Home' ? this.noteHomeTitle : this.note.title;
+      this.noteContent = this.note.content;
+      this.noteSummary = this.note?.properties?.summary;
+      if (this.hasEmptyContent || this.isHomeNoteDefaultContent) {
+        this.retrieveNoteTreeById();
+      }
+    },
+    actualVersion() {
+      if (!this.isDraft && this.actualVersion) {
+        this.noteContent = this.actualVersion.content;
+        this.displayLastVersion = false;
+      }
+    },
+    exportStatus(){
+      if (this.exportStatus.status==='ZIP_CREATED'){
+        this.stopGetStatus();
+        this.getExportedZip();
+        this.exportStatus={};
+      }
+      if (this.exportStatus.status===null){
+        this.stopGetStatus();
+        this.exportStatus={};
+      }
+    },
+    initialized() {
+      if (this.initialized) {
+        Vue.prototype.$utils.includeExtensions('NotesExtension');
+        const urlHash = window.location.hash;
+        if (urlHash) {
+          const elementId = urlHash.substring(1);
+          const targetElement = document.getElementById(elementId);
+          if (targetElement) {
+            targetElement.scrollIntoView({ behavior: 'smooth' });
+          }
+        }
+      }
+    },
+    noteTitle() {
+      const companyName = eXo.env.portal.companyName;
+      const spaceDisplayName = eXo.env.portal.spaceDisplayName;
+      window.document.title = `Note: ${this.noteTitle} - ${spaceDisplayName} - ${companyName}`;
+    }
+  },
+  created() {
+    this.getAvailableLanguages();
+    const queryPath = window.location.search;
+    const urlParams = new URLSearchParams(queryPath);
+    if (urlParams.has('translation')) {
+      this.updateSelectedTranslation({value: urlParams.get('translation')});
+    }
+    if (this.currentPath.endsWith('draft')) {
+      this.isDraft = true;
+    }
+    this.$root.$on('open-note-by-name', (noteName, isDraft) => {
+      if (!isDraft) {
+        this.noteId = noteName;
+        this.getNoteByName(noteName,'tree',true);
+      } else {
+        this.getDraftNote(noteName);
+      }
+    });
+    this.$root.$on('confirmDeleteNote', () => {
+      this.confirmDeleteNote();
+    });
+    this.$root.$on('show-alert', this.displayMessage);
+    this.$root.$on('delete-note', () => {
+      this.confirmDeleteNote();
+    });
+    this.$root.$on('move-page', (note, newParentNote) => {
+      this.moveNote(note, newParentNote);
+    });
+    this.$root.$on('export-notes', (notesSelected,importAll,homeNoteId) => {
+      this.exportNotes(notesSelected,importAll,homeNoteId);
+    });
+    this.$root.$on('cancel-export-notes', () => {
+      this.cancelExportNotes();
+    });
+    this.$root.$on('import-notes', (uploadId,overrideMode) => {
+      this.importNotes(uploadId,overrideMode);
+    });
+    window.addEventListener('popstate', this.handlePopstate);
+    this.$root.$on('update-note-title', this.updateNoteTitle);
+    this.$root.$on('update-note-content', this.updateNoteContent);
+    this.$root.$on('update-note-summary', this.updateNoteSummary);
+    this.$root.$on('update-selected-translation', this.updateSelectedTranslation);
+    window.addEventListener('message', (event) => {
+      if (this.iframelyOriginRegex.exec(event.origin)) {
+        const data = JSON.parse(event.data);
+        if (data.method === 'open-href') {
+          window.open(data.href, '_blank');
+        }
+      }
+    });
+
+    this.$root.$on('open-note-treeview', this.openNoteTreeView);
+    this.$root.$on('note-export-pdf', this.createPDF);
+    this.$root.$on('open-note-history', this.openNoteVersionsHistoryDrawer);
+    this.$root.$on('open-note-treeview-export', this.openNoteTreeView);
+    this.$root.$on('open-note-import-drawer', this.openImportDrawer);
+    this.$root.$on('open-publish-drawer', this.openPublishDrawer);
+    this.$root.$on('duplicate-note', this.duplicateNote);
+    document.addEventListener('note-published', this.handleNotePublished);
+  },
+  mounted() {
+    this.handleChangePages();
+  },
+  beforeDestroy() {
+    window.removeEventListener('popstate', this.handlePopstate);
+    document.removeEventListener('note-published', this.handleNotePublished);
+  },
+  methods: {
+    publishNote(publicationSettings, note) {
+      const scheduleSettings = publicationSettings?.scheduleSettings;
+      const noteArticle = structuredClone(note || this.note);
+      noteArticle.schedulePostDate = scheduleSettings?.postDate;
+      noteArticle.scheduleUnpublishDate = scheduleSettings?.unpublishDate;
+      noteArticle.activityPosted = publicationSettings?.post;
+      noteArticle.published = publicationSettings?.publish;
+      noteArticle.targets = publicationSettings?.selectedTargets;
+      noteArticle.audience = publicationSettings?.selectedAudience;
+      noteArticle.isHomeDefaultContent = this.isHomeNoteDefaultContent;
+      noteArticle.hasChildren = this.hasChildren;
+      this.isPublishing = true;
+      if (note) {
+        this.$notesService.updateNoteById(note).then(() => {
+          document.dispatchEvent(new CustomEvent('publish-note', {
+            detail: {
+              editPublication: false,
+              article: noteArticle
+            }
+          }));
+        });
+      } else {
+        document.dispatchEvent(new CustomEvent('publish-note', {
+          detail: {
+            editPublication: true,
+            article: noteArticle,
+            scheduleSettings: scheduleSettings,
+          }
+        }));
+      }
+    },
+    openPublishDrawer(publicationParams) {
+      const savedSettings = publicationParams?.savedSettings;
+      this.published = !!savedSettings;
+      this.publishTargets = publicationParams.targets;
+      this.canPublish = publicationParams?.canPublish;
+      this.canSchedule = publicationParams?.canSchedule;
+      this.note = Object.assign(this.note, savedSettings);
+      setTimeout(() => {
+        this.$refs.publicationDrawer.open(this.note);
+      },200);
+    },
+    closeMobileActionMenu() {
+      setTimeout(() => {
+        this.$refs.notesMobileActionMenu?.close();
+      }, 200);
+    },
+    openNoteTreeView(note, action) {
+      this.$refs.notesBreadcrumb.open(note, action);
+      this.closeMobileActionMenu();
+    },
+    openImportDrawer() {
+      this.$refs.noteImportDrawer.open();
+      this.closeMobileActionMenu();
+    },
+    updateNoteTitle(title) {
+      this.noteTitle = title;
+    },
+    updateNoteContent(content) {
+      this.noteContent = content;
+    },
+    updateNoteSummary(summary) {
+      this.noteSummary = summary;
+    },
+    updateSelectedTranslation(translation) {
+      if (!this.initialized) {
+        return;
+      }
+      this.selectedTranslation = translation;
+    },
+    getNoteLink(noteId) {
+      const baseUrl = window.location.href;
+      return `${baseUrl.substring(0, baseUrl.lastIndexOf('/') + 1)}${noteId}`;
+    },
+    loadMoreVersions() {
+      this.versionsPageSize += this.versionsPageSize;
+    },
+    handlePopstate(event) {
+      this.currentPath = window.location.pathname;
+      if (event?.state?.translation) {
+        this.updateSelectedTranslation(event?.state?.translation);
+      }
+      this.handleChangePages();
+    },
+    handleChangePages() {
+      if (this.noteId) {
+        if (this.isDraft) {
+          this.getDraftNote(this.noteId);
+        } else {
+          this.getNoteById(this.noteId,'',true);
+        }
+      } else {
+        this.getNoteByName(this.notesPageName,'',true);
+      }
+    },
+    getHomeTitle(title) {
+      return title === 'Home' && this.noteHomeTitle || title;
+    },
+    addNote() {
+      if (!this.hasDraft) {
+        window.open(`${eXo.env.portal.context}/${eXo.env.portal.portalName}/notes-editor?spaceId=${eXo.env.portal.spaceId}&parentNoteId=${this.note.id}&spaceGroupId=${eXo.env.portal?.spaceGroup}`, '_blank');
+      }
+    },
+    editNote() {
+      let translation = '';
+      if (this.selectedTranslation.value){
+        translation = `&translation=${this.selectedTranslation.value}`;
+      }
+      window.open(`${eXo.env.portal.context}/${eXo.env.portal.portalName}/notes-editor?noteId=${this.note.id}${translation}&spaceGroupId=${eXo.env.portal?.spaceGroup}&isDraft=${this.isDraft}&parentNoteId=${this.parentPageId}`, '_blank');
+    },
+    deleteNote() {
+      if (this.hasDraft) {
+        this.$notesService.deleteDraftNote(this.note).then(() => {
+          this.getNoteByName(this.notebreadcrumb[this.notebreadcrumb.length - 2].id);
+        }).catch(e => {
+          console.error('Error when deleting draft note', e);
+        });
+      } else {
+        this.$notesService.deleteNotes(this.note).then(() => {
+          this.getNoteByName(this.notebreadcrumb[this.notebreadcrumb.length - 2].id);
+        }).catch(e => {
+          console.error('Error when deleting note', e);
+        });
+      }
+    },
+    moveNote(note, newParentNote){
+      note.parentPageId=newParentNote.id;
+      this.$notesService.moveNotes(note, newParentNote).then(() => {
+        this.getNoteByName(note.name);
+        this.$root.$emit('close-note-tree-drawer');
+        this.$root.$emit('show-alert', {type: 'success',message: this.$t('notes.alert.success.label.noteMoved')});
+      }).catch(e => {
+        console.error('Error when move note page', e);
+        this.$root.$emit('show-alert', {
+          type: 'error',
+          message: this.$t(`notes.message.${e.message}`)
+        });
+      });
+    },
+    exportNotes(notesSelected, exportAll, homeNoteId) {
+      const maxExportId = 10000;
+      this.exportId = Math.floor(Math.random() * maxExportId);
+      if (exportAll) {
+        notesSelected = homeNoteId;
+      }
+      this.$notesService.exportNotes(notesSelected, exportAll,this.exportId);
+      this.getExportStatus();
+    },
+    cancelExportNotes() {
+      this.stopGetStatus();
+      this.$notesService.cancelExportNotes(this.exportId).then(() => {
+        this.$root.$emit('show-alert', {type: 'success', message: this.$t('notes.alert.success.label.export.canceled')});
+      }).catch(e => {
+        this.$root.$emit('show-alert', {
+          type: 'error',
+          message: this.$t(`notes.message.${e.message}`)
+        });
+      });
+    },
+    getExportedZip() {
+      const date = this.$dateUtil.formatDateObjectToDisplay(Date.now(), this.dateTimeFormatZip, this.lang);
+      this.$notesService.getExportedZip(this.exportId).then((transfer) => {
+        return transfer.blob();
+      }).then((bytes) => {
+        const elm = document.createElement('a');
+        elm.href = URL.createObjectURL(bytes);
+        elm.setAttribute('download', `${date}_notes_${this.spaceDisplayName}.zip`);
+        elm.click();
+        this.exportId=0;
+        this.$root.$emit('show-alert', {type: 'success', message: this.$t('notes.alert.success.label.exported')});
+      }).catch(e => {
+        console.error('Error when export note page', e);
+        this.$root.$emit('show-alert', {
+          type: 'error',
+          message: this.$t(`notes.message.${e.message}`)
+        });
+      });
+    },
+    getExportStatus() {
+      this.intervalId = window.setInterval(() =>{
+        return this.$notesService.getExportStatus(this.exportId).then(data => {
+          this.exportStatus = data;
+          this.$refs.notesBreadcrumb.setExportStaus(this.exportStatus);
+        }).catch(() => {
+          this.stopGetStatus();
+        });
+      }, 500);
+    },
+    stopGetStatus(){
+      clearInterval(this.intervalId);
+    },
+    getNoteById(noteId, source, viewNote) {
+      return this.$notesService.getNoteById(noteId,this.targetLang, source, this.noteBookType, this.noteBookOwner).then(data => {
+        this.note = data || {};
+        this.isDraft = data.draftPage;
+        this.loadData = true;
+        this.currentNoteBreadcrumb = this.note.breadcrumb;
+        this.getNoteLanguages(noteId);
+        this.selectedTranslation = this.note.lang ? { value: this.targetLang } : this.originalVersion;
+        this.updateURL();
+        if (viewNote){
+          this.viewNoteStatistics(this.note);
+        }
+        return this.$nextTick();
+      }).catch(e => {
+        console.error('Error when getting note', e);
+        this.existingNote = false;
+      }).finally(() => {
+        this.$root.$applicationLoaded();
+        this.refreshTreeView();
+        this.initialized = true;
+      });
+    },
+    importNotes(uploadId,overrideMode){
+      this.$notesService.importZipNotes(this.note.id,uploadId,overrideMode).then(() => {
+        this.$root.$emit('close-note-tree-drawer');
+        this.$root.$emit('show-alert', {type: 'success',message: this.$t('notes.alert.success.label.notes.imported')});
+      }).catch(e => {
+        console.error('Error when import notese', e);
+        this.$root.$emit('show-alert', {
+          type: 'error',
+          message: this.$t(`notes.message.${e.message}`)
+        });
+      });
+    },
+    getNoteByName(noteName, source, viewNote) {
+      return this.$notesService.getNote(this.noteBookType, this.noteBookOwner, noteName, source, this.targetLang).then(data => {
+        this.note = data || {};
+        this.isDraft = data.draftPage;
+        this.loadData = true;
+        this.currentNoteBreadcrumb = this.note.breadcrumb;
+        this.getNoteLanguages(this.note.id);
+        const translation = this.note.lang ? { value: this.targetLang } : this.originalVersion;
+        this.updateSelectedTranslation(translation);
+        this.updateURL();
+        if (viewNote){
+          this.viewNoteStatistics(this.note);
+        }
+        return this.$nextTick();
+      }).catch(e => {
+        console.error('Error when getting note', e);
+        this.existingNote = false;
+      }).finally(() => {
+        this.$root.$applicationLoaded();
+        this.refreshTreeView();
+        this.initialized = true;
+      });
+    },
+    getDraftNote(noteId) {
+      return this.$notesService.getDraftNoteById(noteId,this.selectedTranslation.value).then(data => {
+        this.note = {};
+        this.note = data || {};
+        this.isDraft = true;
+        this.loadData = true;
+        this.currentNoteBreadcrumb = this.note.breadcrumb;
+        this.updateURL();
+        return this.$nextTick();
+      }).catch(e => {
+        console.error('Error when getting note', e);
+        this.existingNote = false;
+      }).finally(() => {
+        this.$root.$applicationLoaded();
+        this.refreshTreeView();
+        this.initialized = true;
+      });
+    },
+    confirmDeleteNote: function () {
+      let parentsBreadcrumb = '';
+      for (let index = 0; index < this.notebreadcrumb.length - 1; index++) {
+        parentsBreadcrumb = parentsBreadcrumb.concat(this.notebreadcrumb[index].title);
+        if (index < this.notebreadcrumb.length - 2) {
+          parentsBreadcrumb = parentsBreadcrumb.concat('>');
+        }
+      }
+      this.confirmMessage = `${this.note.draftPage ? this.$t('popup.msg.confirmation.DeleteDraftInfo1', { 0: `<b>${this.note && this.note.title}</b>` }) :
+        this.$t('popup.msg.confirmation.DeleteInfo1', { 0: `<b>${this.note && this.note.title}</b>` })}`
+          + `<p>${this.$t('popup.msg.confirmation.DeleteInfo2')}</p>`
+          + `<li>${this.$t('popup.msg.confirmation.DeleteInfo4')}</li>`
+          + `<li>${this.note.draftPage ? this.$t('popup.msg.confirmation.DeleteDraftInfo5', {
+            0: `<b>${parentsBreadcrumb}</b>`
+          }) : this.$t('popup.msg.confirmation.DeleteInfo5', {
+            0: `<b>${parentsBreadcrumb}</b>`
+          })}</li>`;
+      this.$refs.DeleteNoteDialog.open();
+    },
+    createPDF(note) {
+      this.hideElementsForSavingPDF = true;
+      this.closeMobileActionMenu();
+      window.setTimeout(() => {
+        const title = `${this.noteTitle}`;
+        if (note.title !== title) {
+          this.noteTitle = note.title;
+        }
+        const self = this;
+        this.$nextTick(() => {
+          const element = this.$refs.content;
+          this.hideElementsForSavingPDF = false;
+          html2canvas(element, {
+            useCORS: true
+          }).then(function (canvas) {
+            if (note.title !== title) {
+              self.noteTitle = title;
+            }
+            const pdf = new JSPDF('p', 'mm', 'a4');
+            const ctx = canvas.getContext('2d');
+            const a4w = 170;
+            const a4h = 257;
+            const imgHeight = Math.floor(a4h * canvas.width / a4w);
+            let renderedHeight = 0;
+
+            while (renderedHeight < canvas.height) {
+              const page = document.createElement('canvas');
+              page.width = canvas.width;
+              page.height = Math.min(imgHeight, canvas.height - renderedHeight);
+
+              page.getContext('2d').putImageData(ctx.getImageData(0, renderedHeight, canvas.width, Math.min(imgHeight, canvas.height - renderedHeight)), 0, 0);
+              pdf.addImage(page.toDataURL('image/jpeg', 1.0), 'JPEG', 10, 10, a4w, Math.min(a4h, a4w * page.height / page.width));
+              renderedHeight += imgHeight;
+              if (renderedHeight < canvas.height) {
+                pdf.addPage();
+              }
+            }
+            const filename = `${note.title}.pdf`;
+            pdf.save(filename);
+          }).catch(e => {
+            this.displayMessage({
+              type: 'error',
+              message: this.$t('notes.message.export.error')
+            });
+            console.error('Error when exporting note: ', e);
+          });
+        });
+      }, 200);
+    },
+    displayMessage(message) {
+      this.$root.$emit('alert-message', message?.message, message?.type || 'success');
+    },
+    getNoteVersionByNoteId(noteId) {
+      this.noteVersionsArray = [];
+      this.noteVersions = [];
+      return this.$notesService.getNoteVersionsByNoteId(noteId, this.selectedTranslation?.value).then(data => {
+        this.noteVersions = data && data.reverse() || [];
+        if (this.noteVersions.length) {
+          this.displayVersion(this.noteVersions[0]);
+          this.$root.$emit('version-restored', this.noteVersions[0]);
+        }
+      });
+    },
+    displayVersion(version) {
+      this.actualVersion = version;
+      this.actualVersion.current = true;
+      this.note.content = version?.content;
+      this.note.title = version?.title;
+      this.noteSummary = version?.properties?.summary;
+      this.note.properties = version?.properties;
+      this.noteTitle = version?.title;
+    },
+    restoreVersion(version) {
+      const note = {
+        id: this.note.id,
+        name: version.name,
+        title: version.title,
+        content: version.content,
+        updatedDate: version.updatedDate,
+        owner: version.author,
+        properties: version.properties
+      };
+      this.note.content = version.content;
+      this.note.title = version.title;
+      this.noteSummary = version.properties.summary;
+      this.note.properties = version.properties;
+      this.$notesService.restoreNoteVersion(note,version.versionNumber)
+        .catch(e => {
+          console.error('Error when restore note version', e);
+          this.$root.$emit('version-restore-error');
+        })
+        .finally(() => {
+          this.getNoteVersionByNoteId(this.note.id);
+        });
+    },
+    openNoteVersionsHistoryDrawer() {
+      if (!this.isDraft) {
+        if ( this.note.canManage ) {
+          this.versionsPageSize = Math.round((window.innerHeight-79)/80);
+        } else {
+          this.versionsPageSize = Math.round((window.innerHeight-79)/60);
+        }
+        this.$refs.noteVersionsHistoryDrawer.open();
+      }
+      this.closeMobileActionMenu();
+    },
+    fetchChildren(item, treeview) {
+      if (item.isOpen) {
+        treeview.updateOpen(item.noteId, false);
+        item.isOpen = false;
+        return;
+      }
+      item.isLoading = true;
+      return this.$notesService.getNoteTreeLevel(item.path).then(data => {
+        item.children = data?.jsonList;
+        treeview.updateOpen(item.noteId, true);
+        item.isOpen = true;
+        item.isLoading = false;
+      });
+    },
+    retrieveNoteTreeById() {
+      this.note.wikiOwner = this.spaceId ? this.note.wikiOwner.substring(1) : this.note.wikiOwner;
+      this.$notesService.getNoteTree(this.note.wikiType, this.note.wikiOwner, this.note.name, 'children').then(data => {
+        if (data?.jsonList?.length) {
+          this.noteChildren = data?.jsonList;
+        }
+        else {
+          this.noteChildren = [];
+        }
+      });
+    },
+    openNoteChild(item) {
+      const noteName = item.path.split('%2F').pop();
+      this.$root.$emit('open-note-by-name', noteName);
+      document.dispatchEvent(new CustomEvent('note-navigation-updated', {detail: item}));
+    },
+    updateNote(noteParam) {
+      const note = {
+        id: noteParam.id,
+        title: noteParam.title,
+        name: noteParam.name,
+        wikiType: noteParam.wikiType,
+        wikiOwner: noteParam.wikiOwner,
+        content: '',
+        parentPageId: null,
+      };
+      if (note.id) {
+        this.$notesService.updateNoteById(note).catch(e => {
+          console.error('Error when update note page', e);
+        });
+      }
+    },
+    updateURL(){
+      const urlHash = window.location.hash;
+      const charsToRemove = notesConstants.PORTAL_BASE_URL.length-notesConstants.PORTAL_BASE_URL.lastIndexOf(`/${this.appName}`);
+      let translation = '';
+      if (this.selectedTranslation.value) {
+        translation = `?translation=${this.selectedTranslation.value}`;
+      }
+      notesConstants.PORTAL_BASE_URL = `${notesConstants.PORTAL_BASE_URL.slice(0,-charsToRemove)}/${this.appName}/${this.note.id}${translation}${urlHash}`;
+      window.history.pushState({'translation': this.selectedTranslation}, window.document.title, notesConstants.PORTAL_BASE_URL);
+    },
+    getNoteLanguages(noteId){
+      this.translations = [];
+      return this.$notesService.getNoteLanguages(noteId).then(data => {
+        this.translations =  data || [];
+        if (this.translations.length>0) {
+          this.translations = this.languages.filter(item1 => this.translations.some(item2 => item2 === item1.value));
+          this.translations.sort((a, b) => a.text.localeCompare(b.text));
+        }
+        this.translations.unshift(this.originalVersion);
+      });
+    },
+    getAvailableLanguages(){
+      return this.$notesService.getAvailableLanguages().then(data => {
+        this.languages = data || [];
+      });
+    },
+    changeTranslation(translation){
+      this.selectedTranslation = translation;
+      return this.$notesService.getNoteById(this.note.id,this.selectedTranslation.value).then(data => {
+        const note = data || {};
+        if (note) {
+          this.note.content = note.content;
+          this.note.metadatas = note.metadatas;
+          this.note.lang = note.lang;
+          this.noteContent = note.content;
+          this.note.title = note.title;
+          this.note.latestVersionId = note.latestVersionId;
+          this.noteTitle = !this.note.parentPageId && this.note.title==='Home' ? this.noteHomeTitle : this.note.title;
+          this.note.properties = note?.properties;
+          this.noteSummary = note?.properties?.summary;
+        }
+        this.updateURL();
+        this.getNoteVersionByNoteId(this.note.id);
+        this.viewNoteStatistics();
+        return this.$nextTick();
+      }).catch(e => {
+        console.error('Error when getting note', e);
+      });
+    },
+    viewNoteStatistics() {
+      if (this.isDraft) {
+        return;
+      }
+      this.$notesService.markNoteAsViewed(this.note.id || this.noteId, this.selectedTranslation?.value);
+    },
+    refreshTreeView() {
+      if (this.initialized) {
+        this.$root.$emit('refresh-treeView-items', this.note);
+      }
+    },
+    handleNotePublished(event) {
+      const {editPublication, isPublishSchedule, link} = event.detail;
+      this.isPublishing = false;
+      this.$refs.publicationDrawer.close();
+      document.dispatchEvent(new CustomEvent('alert-message-html', {detail: {
+        alertType: 'success',
+        alertMessage: isPublishSchedule && this.$t('notes.schedule.success.message')
+              || editPublication && this.$t('notes.publication.settings.update.success')
+              || this.$t('notes.publication.success.message'),
+        alertLink: link,
+        alertLinkText: this.$t('notes.view.label')
+      }}));
+    },
+    duplicateNote() {
+      const properties = this.note?.properties;
+      if (properties) {
+        properties.draft = this.note?.draftPage;
+      }
+      const note = {
+        title: `${this.$t('notes.menu.label.copyOf')} ${this.note.title}`,
+        name: `${this.$t('notes.menu.label.copyOf')} ${this.note.name}`,
+        lang: this.note.lang,
+        wikiType: this.note.wikiType,
+        wikiOwner: this.note.wikiOwner,
+        content: this.note.content,
+        parentPageId: this.note?.draftPage && this.note?.targetPageId === this.parentPageId ? null : this.parentPageId,
+        toBePublished: false,
+        appName: this.appName,
+        properties: properties,
+        extensionDataUpdated: false
+      };
+      this.$notesService.createNote(note).then(duplicated => {
+        window.open(`${eXo.env.portal.context}/${eXo.env.portal.portalName}/notes-editor?noteId=${duplicated.id}&translation=${this.selectedTranslation.value}&spaceGroupId=${eXo.env.portal?.spaceGroup}`, '_blank');
+      }).catch(e => {
+        this.$root.$emit('show-alert', {
+          type: 'error',
+          message: this.$t(`notes.message.${e.message}`)
+        });
+      });
+    },
+    openSidebarTreeView() {
+      if (this.isMobile) {
+        this.$root.$emit('open-note-tree-view-drawer', this.note);
+      } else {
+        this.$root.$emit('sidebar-tree-view-expend', true);
+      }
+    },
+  }
+};
+</script>
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 8d451ef19f..31fe4a6896 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
@@ -1,1249 +1,123 @@
-<template>
-  <v-app
-    class="transparent"
-    role="main"
-    flat>
-    <div>
-      <div
-        v-if="isAvailableNote"
-        class="notes-application notes-application-content  application-body pa-5"
-        ref="content">
-        <div class="notes-application-header">
-          <v-row
-            no-gutters
-            class="mb-5">
-            <v-col
-              xl="10"
-              lg="10"
-              md="9"
-              sm="8"
-              cols="6">
-              <div v-if="!hideElementsForSavingPDF" class="notes-treeview d-flex flex-grow-1">
-                <v-tooltip bottom>
-                  <template #activator="{ on, attrs }">
-                    <v-btn
-                      v-on="on"
-                      v-bind="attrs"
-                      class="pa-0 me-2"
-                      width="36"
-                      min-width="36"
-                      height="36"
-                      icon
-                      @click="$refs.notesBreadcrumb.open(note, 'displayNote')">
-                      <v-icon
-                        class="icon-default-color"
-                        size="20">
-                        fas fa-sitemap
-                      </v-icon>
-                    </v-btn>
-                  </template>
-                  <span class="caption">{{ $t('notes.label.noteTreeview.tooltip') }}</span>
-                </v-tooltip>
-                <note-breadcrumb
-                  class="my-auto"
-                  :note-breadcrumb="notebreadcrumb"
-                  :actual-note-id="note.id"
-                  @open-note="getNoteByName($event, 'breadCrumb', true)" />
-              </div>
-            </v-col>
-            <v-col
-              xl="2"
-              lg="2"
-              md="3"
-              sm="4"
-              cols="6">
-              <div
-                id="note-actions-menu"
-                v-if="loadData && !hideElementsForSavingPDF"
-                class="notes-header-icons text-right d-flex justify-end">
-                <div
-                  class="d-inline-flex">
-                  <v-tooltip bottom v-if="!hasDraft && isManager">
-                    <template #activator="{ on, attrs }">
-                      <v-btn
-                        v-on="on"
-                        v-bind="attrs"
-                        class="pa-0 mt-0"
-                        @click="addNote"
-                        icon>
-                        <v-icon
-                          size="20"
-                          class="clickable add-note-click">
-                          fas fa-plus
-                        </v-icon>
-                      </v-btn>
-                    </template>
-                    <span class="caption">{{ $t('notes.label.addPage') }}</span>
-                  </v-tooltip>
-                </div>
-                <div
-                  class="d-inline-flex ms-2">
-                  <v-tooltip bottom v-if="isManager">
-                    <template #activator="{ on, attrs }">
-                      <v-btn
-                        icon
-                        v-on="on"
-                        v-bind="attrs"
-                        class="pa-0 mt-0"
-                        @click="editNote">
-                        <v-icon
-                          size="20"
-                          class="clickable edit-note-click">
-                          fas fa-edit
-                        </v-icon>
-                      </v-btn>
-                    </template>
-                    <span class="caption">{{ $t('notes.label.editPage') }}</span>
-                  </v-tooltip>
-                </div>
-                <extension-registry-components
-                  :params="params"
-                  name="NotesDetails"
-                  type="notes-toolbar"
-                  parent-element="div"
-                  element="div"
-                  class="d-flex" />
-                <note-favorite-action
-                  :icon-size="20"
-                  :note="note"
-                  :activity-id="note.activityId" 
-                  class="ms-2" />
-                <div
-                  class="d-inline-flex ms-2">
-                  <v-tooltip bottom>
-                    <template #activator="{ on, attrs }">
-                      <v-btn
-                        v-on="on"
-                        @click="$root.$emit('display-action-menu')"
-                        v-bind="attrs"
-                        class="pa-0 mt-0"
-                        icon>
-                        <v-icon
-                          size="20"
-                          class="clickable">
-                          fas fa-ellipsis-v
-                        </v-icon>
-                      </v-btn>
-                    </template>
-                    <span class="caption">{{ $t('notes.label.openMenu') }}</span>
-                  </v-tooltip>
-                </div>
-              </div>
-            </v-col>
-          </v-row>
-          <v-img
-            v-if="hasFeaturedImage"
-            :lazy-src="featuredImageLink"
-            :alt="featuredImageAltText"
-            :src="featuredImageLink"
-            contain
-            class="mb-5"
-            width="100%"
-            max-height="400" />
-          <div class="notes-title">
-            <p ref="noteTitle" class="title text-color text-break">
-              <span>
-                {{ noteTitle }}
-              </span>
-              <span>
-                <notes-translation-menu
-                  :note="note"
-                  :translations="translations"
-                  :selected-translation="selectedTranslation"
-                  @change-translation="changeTranslation" />
-              </span>
-              <extension-registry-components
-                name="NotesDetailTitle"
-                type="notes-overview-extensions"
-                element-class="ms-3"
-                parent-element="span"
-                element="span" />
-            </p>
-          </div>
-          <p
-            v-if="hasSummary"
-            class="note-summary text-break text-sub-title mt-4 mb-0">
-            {{ noteSummary }}
-          </p>
-        </div>
-        <div class="note-content mt-8 my-4" v-if="!hasEmptyContent && !isHomeNoteDefaultContent">
-          <div
-            class="text-color">
-            <component :is="notesContentProcessor" />
-          </div>
-        </div>
-        <div v-else-if="!hasChildren || hasDraft && hasEmptyContent">
-          <div v-if="isManager" class="d-flex flex-column justify-center text-center">
-            <v-img
-              :src="emptyNoteNoManager"
-              class="mx-auto mb-4"
-              max-height="150"
-              max-width="250"
-              contain
-              eager />
-            <div>
-              <p class="notes-welcome-patragraph">
-                <span>{{ $t('notes.label.no-content-no-redactor.content.first') }}</span>
-                <v-tooltip bottom>
-                  <template #activator="{ on, attrs }">
-                    <v-btn
-                      class="pa-0"
-                      icon
-                      v-on="on"
-                      v-bind="attrs"
-                      @click="editNote">
-                      <v-icon
-                        size="16"
-                        class="clickable edit-note-click">
-                        mdi-square-edit-outline
-                      </v-icon>
-                    </v-btn>
-                  </template>
-                  <span class="caption">{{ $t('notes.label.editPage') }}</span>
-                </v-tooltip>
-                <span v-if="!hasDraft">{{ $t('notes.label.no-content.no-redactor.content.last') }}</span>
-                <v-tooltip bottom v-if="!hasDraft">
-                  <template #activator="{ on, attrs }">
-                    <v-btn
-                      class="pa-0"
-                      v-on="on"
-                      v-bind="attrs"
-                      @click="addNote"
-                      icon>
-                      <v-icon
-                        size="16"
-                        class="clickable add-note-click">
-                        fas fa-plus
-                      </v-icon>
-                    </v-btn>
-                  </template>
-                  <span class="caption">{{ $t('notes.label.addPage') }}</span>
-                </v-tooltip>
-              </p>
-            </div>
-          </div>
-          <div v-else class="d-flex flex-column justify-center text-center text-color">
-            <v-img
-              :src="emptyNoteWithManager"
-              class="mx-auto mb-4"
-              max-height="150"
-              max-width="250"
-              contain
-              eager />
-            <div>
-              <h4 class="notes-welcome-title font-weight-bold text-color">
-                {{ $t('notes.label.no-content-redactor-title').replace('{0}', spaceDisplayName) }}
-              </h4>
-              <p class="notes-welcome-patragraph">
-                <span>{{ $t('notes.label.no-content.redactor.content.first') }}</span>
-                <a :href="spaceMembersUrl" class="text-decoration-underline">{{ $t('notes.label.no-content-manager') }}</a>
-                <span>{{ $t('notes.label.or') }}</span>
-                <a :href="spaceMembersUrl" class="text-decoration-underline">{{ $t('notes.label.no-content-redactor') }}</a>
-                <span>{{ $t('notes.label.no-content.redactor.content.last') }}</span>
-              </p>
-            </div>
-          </div>
-        </div>
+<!--
 
-        <div v-else>
-          <v-treeview
-            v-if="noteChildren?.length"
-            ref="noteTreeview"
-            :items="noteChildren"
-            class="ps-1 notes-custom-treeview"
-            item-key="noteId"
-            expand-icon=""
-            dense>
-            <template #prepend="{ item, open }">
-              <note-treeview-item-prepend
-                :item="item"
-                :open="open"
-                @click="fetchChildren(item, $refs.noteTreeview)" />
-            </template>
-            <template #label="{ item }">
-              <note-content-table-item
-                :note="item"
-                @open-note="openNoteChild" />
-            </template>
-          </v-treeview>
-        </div>
-        <extension-registry-components
-          :params="extensionParams"
-          name="NotesDetailsFooter"
-          type="notes-attachment-list"
-          element-class="ms-3" />
-      </div>
-      <div v-else class="note-not-found-wrapper text-center mt-6">
-        <v-img
-          :src="noteNotFountImage"
-          class="mx-auto"
-          max-height="150"
-          max-width="250"
-          contain
-          eager />
-        <p class="title mt-3 text-light-color">{{ $t('notes.label.noteNotFound') }}</p>
-        <a
-          class="btn btn-primary"
-          :href="defaultPath">
-          {{ $t('notes.label.noteNotFound.button') }}
-        </a>
-      </div>
-    </div>
-    <exo-confirm-dialog
-      ref="DeleteNoteDialog"
-      :message="confirmMessage"
-      :title="hasDraft ? $t('popup.confirmation.delete.draft') : $t('popup.confirmation.delete')"
-      :ok-label="$t('notes.button.delete')"
-      :cancel-label="$t('notes.button.cancel')"
-      persistent
-      @ok="deleteNote()"
-      @dialog-opened="$emit('confirmDialogOpened')"
-      @dialog-closed="$emit('confirmDialogClosed')" />
-    <notes-actions-menu
-      v-if="!isMobile"
-      :note="note" />
-    <notes-mobile-action-menu
-      v-else
-      ref="notesMobileActionMenu"
-      :note="note" />
-    <note-treeview-drawer
-      ref="notesBreadcrumb" />
-    <version-history-drawer
-      :versions="noteVersionsArray"
-      :can-manage="this.note.canManage"
-      :show-load-more="hasMoreVersions"
-      @open-version="displayVersion($event)"
-      @restore-version="restoreVersion($event)"
-      @load-more="loadMoreVersions"
-      ref="noteVersionsHistoryDrawer" />
-    <note-import-drawer
-      ref="noteImportDrawer" />
-    <note-featured-image-drawer
-      ref="featuredImageDrawer"
-      :note="note"
-      :has-featured-image="hasFeaturedImage" />
-    <note-publication-target-drawer />
-    <note-publication-drawer
-      ref="publicationDrawer"
-      :has-featured-image="hasFeaturedImage"
-      :is-publishing="isPublishing"
-      :params="{
-        spaceId: spaceId,
-        allowedTargets: publishTargets,
-        canPublish: canPublish,
-        canSchedule: canScheduleNotePublication
-      }"
-      :edit-mode="published"
-      @publish="publishNote" />
-  </v-app>
-</template>
-<script>
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io
 
-import {notesConstants} from '../../../javascript/eXo/wiki/notesConstants.js';
-import html2canvas from 'html2canvas';
-import JSPDF from 'jspdf';
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-container fluid class="pa-0">
+    <v-row no-gutters class="pa-5 flex-nowrap">
+      <v-sheet
+        v-if="treeViewExpended && !$root.isMobile"
+        :width="sidebarWidth"
+        class="overflow-auto">
+        <note-treeview-sideBar
+          :tree-view-expended="treeViewExpended"
+          :active-note-id="currentNoteId"
+          @note-selected="onSelectNote" />
+      </v-sheet>
+      <v-sheet
+        v-if="treeViewExpended"
+        width="8"
+        class="d-flex align-center justify-center"
+        style="cursor: col-resize;"
+        @mousedown="startResize" />
+      <v-col class="pa-0">
+        <notes-page
+          :tree-view-expended="treeViewExpended"
+          :note-id="currentNoteId" />
+      </v-col>
+    </v-row>
+    <note-treeview-filter-drawer />
+  </v-container>
+</template>
 
+<script>
 export default {
   data() {
     return {
-      versionsPageSize: null,
-      note: {},
-      lastUpdatedTime: '',
-      lang: eXo.env.portal.language,
-      dateTimeFormat: {
-        year: 'numeric',
-        month: 'long',
-        day: 'numeric',
-        hour: '2-digit',
-        minute: '2-digit',
-      },
-      dateTimeFormatZip: {
-        year: 'numeric',
-        month: 'numeric',
-        day: 'numeric',
-      },
-      confirmMessage: '',
-      spaceDisplayName: eXo.env.portal.spaceDisplayName,
-      spaceId: eXo.env.portal.spaceId,
-      noteBookType: eXo.env.portal.spaceName ? 'group' : 'user',
-      noteBookOwner: eXo.env.portal.spaceGroup ? `/spaces/${eXo.env.portal.spaceGroup}` : eXo.env.portal.profileOwner,
-      noteNotFountImage: '/notes/skin/images/notes_not_found.png',
-      emptyNoteWithManager: '/notes/images/no-content-with-manager.png',
-      emptyNoteNoManager: '/notes/images/no-content-no-manager.png',
-      defaultPath: 'Home',
-      existingNote: true,
-      currentPath: window.location.pathname,
-      currentNoteBreadcrumb: [],
-      loadData: false,
-      openTreeView: false,
-      hideElementsForSavingPDF: false,
-      noteVersions: [],
-      actualVersion: {},
-      noteContent: '',
-      displayLastVersion: true,
-      noteChildren: [],
-      isDraft: false,
-      noteTitle: '',
-      noteSummary: '',
-      spaceMembersUrl: `${eXo.env.portal.context}/g/:spaces:${eXo.env.portal.spaceGroup}/${eXo.env.portal.spaceUrl}/members`,
-      childNodes: [],
-      exportStatus: '',
-      exportId: 0,
-      iframelyOriginRegex: /^https?:\/\/if-cdn.com/,
-      selectedTranslation: { value: null, text: this.$t('notes.label.translation.originalVersion') },
-      translations: [],
-      languages: [],
-      slectedLanguage: null,
-      translationsMenu: false,
-      originalVersion: { value: '', text: this.$t('notes.label.translation.originalVersion') },
-      illustrationBaseUrl: `${eXo.env.portal.context}/${eXo.env.portal.rest}/notes/illustration/`,
-      initialized: false,
-      isPublishing: false,
-      publishTargets: [],
-      canPublish: false,
-      canSchedule: false,
-      published: false
+      currentNoteId: null,
+      treeViewExpended: true,
+      sidebarWidth: 320,
+      minWidth: 240,
+      maxWidth: 480,
+      isResizing: false,
+      startX: 0,
+      startWidth: 0
     };
   },
-  computed: {
-    extensionParams() {
-      return {
-        entityId: this.entityId,
-        entityType: this.entityType,
-      };
-    },
-    noteHomeTitle() {
-      return this.spaceId ? this.$t('notes.label.noteHome') : this.$t('notes.label.myNotes');
-    },
-    entityId() {
-      return this.note?.draftPage && this.note?.id || this.note.latestVersionId;
-    },
-    entityType() {
-      return this.note.draftPage && 'WIKI_DRAFT_PAGES' || 'WIKI_PAGE_VERSIONS';
-    },
-    params() {
-      return {
-        note: this.note,
-      };
-    },
-    hasSummary() {
-      return this.note?.properties?.summary?.length;
-    },
-    langParam() {
-      return this.note?.lang && `&lang=${this.note?.lang}` || '';
-    },
-    noteFeatureImageUpdatedDate() {
-      return this.note?.properties?.featuredImage?.lastUpdated || 0;
-    },
-    hasFeaturedImage() {
-      return !!this.note?.properties?.featuredImage?.id;
-    },
-    featuredImageAltText() {
-      return this.note?.properties?.featuredImage?.altText;
-    },
-    featuredImageLink() {
-      return `${this.illustrationBaseUrl}${this.note?.id}?v=${this.noteFeatureImageUpdatedDate}&isDraft=${this.isDraft}${this.langParam}&versionNumber=${this.actualVersion?.versionNumber}&size=0x400`;
-    },
-    notesContentProcessor() {
-      return {
-        template: `<div class='rich-editor-content extended-rich-content'>${this.$noteUtils.getContentToDisplay(this.noteContent, this.note?.id, this.noteBookType, this.noteBookOwner, true)}</div>`,
-        data() {
-          return {
-            vTreeComponent: {
-              template: `
-                <v-treeview
-                  ref="noteTreeview"
-                  :items="noteChildItems"
-                  class="ps-1 notes-custom-treeview"
-                  item-key="noteId"
-                  expand-icon=""
-                  dense>
-                  <template #prepend="{ item, open }" >
-                    <note-treeview-item-prepend
-                       :item="item"
-                       :open="open"
-                       @click="fetchChildren(item, $refs.noteTreeview)" />
-                  </template>
-                  <template #label="{ item }">
-                    <note-content-table-item
-                      :note="item"
-                      @open-note="openNoteChild"/>
-                  </template>
-                </v-treeview >`,
-              props: {
-                noteId: 0,
-                source: '',
-                noteBookType: '',
-                noteBookOwner: ''
-              },
-              data: function () {
-                return {
-                  noteChildItems: [],
-                  selectedTranslation: {value: eXo.env.portal.language},
-                  note: null
-                };
-              },
-              created: function () {
-                this.$nextTick().then(() => {
-                  this.getNodeById(this.noteId, this.source, this.noteBookType, this.noteBookOwner);
-                });
-              },
-              methods: {
-                openNoteChild(item) {
-                  return this.$root.$children[0].openNoteChild(item);
-                },
-                fetchChildren(item, treeview) {
-                  return this.$root.$children[0].fetchChildren(item, treeview);
-                },
-                getNoteLanguages(noteId) {
-                  return this.$root.$children[0].getNoteLanguages(noteId);
-                },
-                getNodeById(noteId, source, noteBookType, noteBookOwner) {
-                  return this.$notesService.getNoteById(noteId,this.selectedTranslation.value, source, noteBookType, noteBookOwner).then(data => {
-                    this.note = data || {};
-                    this.getNoteLanguages(noteId);
-                    this.$notesService.getNoteTree(data.wikiType, data.wikiOwner, data.name, 'children').then(data => {
-                      if (data?.jsonList?.length) {
-                        this.noteChildItems = data.jsonList;
-                      }
-                    });
-                  }).catch(e => {
-                    console.error('Error when getting note', e);
-                  });
-                }
-              }
-            }
-          };
-        }
-      };
-    },
-    noteVersionsArray() {
-      return this.noteVersions.slice(0, this.versionsPageSize);
-    },
-    allNoteVersionsCount() {
-      return this.noteVersions.length;
-    },
-    hasMoreVersions() {
-      return this.allNoteVersionsCount > this.versionsPageSize;
-    },
-    isHomeNoteDefaultContent() {
-      return !this.note.parentPageId && ( this.noteContent===`<h1> Welcome to Space ${this.spaceDisplayName} Notes Home </h1>` || this.noteContent === '');
-    },
-    isMobile() {
-      return this.$vuetify?.breakpoint?.smAndDown;
-    },
-    isAvailableNote() {
-      return this.existingNote;
-    },
-    notebreadcrumb() {
-      return this.currentNoteBreadcrumb;
-    },
-    hasDraft(){
-      return !!this.note?.draftPage;
-    },
-    hasEmptyContent(){
-      return !this.note?.content;
-    },
-    hasChildren(){
-      return this.noteChildren?.length;
-    },
-    isManager(){
-      return this.note?.canManage;
-    },
-    notesPageName() {
-      if (this.currentPath.endsWith(eXo.env.portal.selectedNodeUri)||this.currentPath.endsWith(`${eXo.env.portal.selectedNodeUri}/`)){
-        return 'homeNote';
-      } else {
-        const noteId = this.currentPath.split(`${eXo.env.portal.selectedNodeUri}/`)[1];
-        if (noteId) {
-          return noteId;
-        } else {
-          return 'homeNote';
-        }
-
-      }
-    },
-    noteId() {
-      const pathParams = this.currentPath.split('/');
-      const noteId = this.isDraft ? this.currentPath.split('/')[pathParams.length - 2] : this.currentPath.split('/')[pathParams.length - 1];
-      if (!isNaN(noteId)) {
-        return noteId;
-      } else {
-        return 0;
-      }
-    },
-    appName() {
-      const uris = eXo.env.portal.selectedNodeUri.split('/');
-      return uris[uris.length - 1];
-    },
-    canScheduleNotePublication() {
-      return this.note?.canManage || this.canSchedule;
-    },
-    targetLang() {
-      return this.selectedTranslation?.value || this.lang;
-    },
-    parentPageId() {
-      return this.note?.parentPageId;
-    },
-  },
-  watch: {
-    note() {
-      if (!this.note.draftPage) {
-        this.getNoteVersionByNoteId(this.note.id);
-      }
-      if ( this.note && this.note.breadcrumb && this.note.breadcrumb.length ) {
-        this.note.breadcrumb[0].title = this.getHomeTitle(this.note.breadcrumb[0].title);
-        this.currentNoteBreadcrumb = this.note.breadcrumb;
-      }
-      this.noteTitle = !this.note.parentPageId && this.note.title==='Home' ? this.noteHomeTitle : this.note.title;
-      this.noteContent = this.note.content;
-      this.noteSummary = this.note?.properties?.summary;
-      if (this.hasEmptyContent || this.isHomeNoteDefaultContent) {
-        this.retrieveNoteTreeById();
-      }
-    },
-    actualVersion() {
-      if (!this.isDraft && this.actualVersion) {
-        this.noteContent = this.actualVersion.content;
-        this.displayLastVersion = false;
-      }
-    },
-    exportStatus(){
-      if (this.exportStatus.status==='ZIP_CREATED'){
-        this.stopGetStatus();
-        this.getExportedZip();
-        this.exportStatus={};
-      }
-      if (this.exportStatus.status===null){
-        this.stopGetStatus();
-        this.exportStatus={};
-      }
-    },
-    initialized() {
-      if (this.initialized) {
-        Vue.prototype.$utils.includeExtensions('NotesExtension');
-        const urlHash = window.location.hash;
-        if (urlHash) {
-          const elementId = urlHash.substring(1);
-          const targetElement = document.getElementById(elementId);
-          if (targetElement) {
-            targetElement.scrollIntoView({ behavior: 'smooth' });
-          }
-        }
-      }
-    },
-    noteTitle() {
-      const companyName = eXo.env.portal.companyName;
-      const spaceDisplayName = eXo.env.portal.spaceDisplayName;
-      window.document.title = `Note: ${this.noteTitle} - ${spaceDisplayName} - ${companyName}`;
-    }
-  },
   created() {
-    this.getAvailableLanguages();
-    const queryPath = window.location.search;
-    const urlParams = new URLSearchParams(queryPath);
-    if (urlParams.has('translation')) {
-      this.updateSelectedTranslation({value: urlParams.get('translation')});
-    } 
-    if (this.currentPath.endsWith('draft')) {
-      this.isDraft = true;
-    }
-    this.$root.$on('open-note-by-name', (noteName, isDraft) => {
-      if (!isDraft) {
-        this.noteId = noteName;
-        this.getNoteByName(noteName,'tree',true);
-      } else {
-        this.getDraftNote(noteName);
-      }
-    });
-    this.$root.$on('confirmDeleteNote', () => {
-      this.confirmDeleteNote();
-    });
-    this.$root.$on('show-alert', this.displayMessage);
-    this.$root.$on('delete-note', () => {
-      this.confirmDeleteNote();
-    });
-    this.$root.$on('move-page', (note, newParentNote) => {
-      this.moveNote(note, newParentNote);
-    });
-    this.$root.$on('export-notes', (notesSelected,importAll,homeNoteId) => {
-      this.exportNotes(notesSelected,importAll,homeNoteId);
-    });
-    this.$root.$on('cancel-export-notes', () => {
-      this.cancelExportNotes();
-    });
-    this.$root.$on('import-notes', (uploadId,overrideMode) => {
-      this.importNotes(uploadId,overrideMode);
-    });
-    window.addEventListener('popstate', this.handlePopstate);
-    this.$root.$on('update-note-title', this.updateNoteTitle);
-    this.$root.$on('update-note-content', this.updateNoteContent);
-    this.$root.$on('update-note-summary', this.updateNoteSummary);
-    this.$root.$on('update-selected-translation', this.updateSelectedTranslation);
-    window.addEventListener('message', (event) => {
-      if (this.iframelyOriginRegex.exec(event.origin)) {
-        const data = JSON.parse(event.data);
-        if (data.method === 'open-href') {
-          window.open(data.href, '_blank');
-        }
-      }
-    });
-
-    this.$root.$on('open-note-treeview', this.openNoteTreeView);
-    this.$root.$on('note-export-pdf', this.createPDF);
-    this.$root.$on('open-note-history', this.openNoteVersionsHistoryDrawer);
-    this.$root.$on('open-note-treeview-export', this.openNoteTreeView);
-    this.$root.$on('open-note-import-drawer', this.openImportDrawer);
-    this.$root.$on('open-publish-drawer', this.openPublishDrawer);
-    this.$root.$on('duplicate-note', this.duplicateNote);
-
-    document.addEventListener('note-published', this.handleNotePublished);
+    this.currentNoteId = this.getNoteIdFromUrl();
+    this.$root.$on('sidebar-tree-view-expend', this.extendTreeView);
   },
   mounted() {
-    this.handleChangePages();
+    window.addEventListener('popstate', this.onPopState);
+    window.addEventListener('mousemove', this.resize);
+    window.addEventListener('mouseup', this.stopResize);
   },
+
   beforeDestroy() {
-    window.removeEventListener('popstate', this.handlePopstate);
-    document.removeEventListener('note-published', this.handleNotePublished);
+    this.$root.$off('sidebar-tree-view-expend', this.extendTreeView);
+    window.removeEventListener('mousemove', this.resize);
+    window.removeEventListener('mouseup', this.stopResize);
+    window.removeEventListener('popstate', this.onPopState);
   },
+
   methods: {
-    publishNote(publicationSettings, note) {
-      const scheduleSettings = publicationSettings?.scheduleSettings;
-      const noteArticle = structuredClone(note || this.note);
-      noteArticle.schedulePostDate = scheduleSettings?.postDate;
-      noteArticle.scheduleUnpublishDate = scheduleSettings?.unpublishDate;
-      noteArticle.activityPosted = publicationSettings?.post;
-      noteArticle.published = publicationSettings?.publish;
-      noteArticle.targets = publicationSettings?.selectedTargets;
-      noteArticle.audience = publicationSettings?.selectedAudience;
-      noteArticle.isHomeDefaultContent = this.isHomeNoteDefaultContent;
-      noteArticle.hasChildren = this.hasChildren;
-      this.isPublishing = true;
-      if (note) {
-        this.$notesService.updateNoteById(note).then(() => {
-          document.dispatchEvent(new CustomEvent('publish-note', {
-            detail: {
-              editPublication: false,
-              article: noteArticle
-            }
-          }));
-        });
-      } else {
-        document.dispatchEvent(new CustomEvent('publish-note', {
-          detail: {
-            editPublication: true,
-            article: noteArticle,
-            scheduleSettings: scheduleSettings,
-          }
-        }));
-      }
-    },
-    openPublishDrawer(publicationParams) {
-      const savedSettings = publicationParams?.savedSettings;
-      this.published = !!savedSettings;
-      this.publishTargets = publicationParams.targets;
-      this.canPublish = publicationParams?.canPublish;
-      this.canSchedule = publicationParams?.canSchedule;
-      this.note = Object.assign(this.note, savedSettings);
-      setTimeout(() => {
-        this.$refs.publicationDrawer.open(this.note);
-      },200);
-    },
-    closeMobileActionMenu() {
-      setTimeout(() => {
-        this.$refs.notesMobileActionMenu?.close();
-      }, 200);
-    },
-    openNoteTreeView(note, action) {
-      this.$refs.notesBreadcrumb.open(note, action);
-      this.closeMobileActionMenu();
-    },
-    openImportDrawer() {
-      this.$refs.noteImportDrawer.open();
-      this.closeMobileActionMenu();
-    },
-    updateNoteTitle(title) {
-      this.noteTitle = title;
-    },
-    updateNoteContent(content) {
-      this.noteContent = content;
-    },
-    updateNoteSummary(summary) {
-      this.noteSummary = summary;
-    },
-    updateSelectedTranslation(translation) {
-      if (!this.initialized) {
+    getNoteIdFromUrl() {
+      const match = location.pathname.match(/\/notes\/(.+)/);
+      return match ? match[1] : null;
+    },
+    startResize(e) {
+      this.isResizing = true;
+      this.startX = e.clientX;
+      this.startWidth = this.sidebarWidth;
+      document.body.style.userSelect = 'none';
+      document.body.style.cursor = 'col-resize';
+    },
+    resize(e) {
+      if (!this.isResizing) {
         return;
       }
-      this.selectedTranslation = translation;
-    },
-    getNoteLink(noteId) {
-      const baseUrl = window.location.href;
-      return `${baseUrl.substring(0, baseUrl.lastIndexOf('/') + 1)}${noteId}`;
-    },
-    loadMoreVersions() {
-      this.versionsPageSize += this.versionsPageSize;
-    },
-    handlePopstate(event) {
-      this.currentPath = window.location.pathname;
-      if (event?.state?.translation) {
-        this.updateSelectedTranslation(event?.state?.translation);
-      }
-      this.handleChangePages();
-    },
-    handleChangePages() {
-      if (this.noteId) {
-        if (this.isDraft) {
-          this.getDraftNote(this.noteId);
-        } else {
-          this.getNoteById(this.noteId,'',true);
-        }
-      } else {
-        this.getNoteByName(this.notesPageName,'',true);
-      }
-    },
-    getHomeTitle(title) {
-      return title === 'Home' && this.noteHomeTitle || title;
-    },
-    addNote() {
-      if (!this.hasDraft) {
-        window.open(`${eXo.env.portal.context}/${eXo.env.portal.portalName}/notes-editor?spaceId=${eXo.env.portal.spaceId}&parentNoteId=${this.note.id}&spaceGroupId=${eXo.env.portal?.spaceGroup}`, '_blank');
-      }
-    },
-    editNote() {
-      let translation = '';
-      if (this.selectedTranslation.value){
-        translation = `&translation=${this.selectedTranslation.value}`;
-      }
-      window.open(`${eXo.env.portal.context}/${eXo.env.portal.portalName}/notes-editor?noteId=${this.note.id}${translation}&spaceGroupId=${eXo.env.portal?.spaceGroup}&isDraft=${this.isDraft}&parentNoteId=${this.parentPageId}`, '_blank');
-    },
-    deleteNote() {
-      if (this.hasDraft) {
-        this.$notesService.deleteDraftNote(this.note).then(() => {
-          this.getNoteByName(this.notebreadcrumb[this.notebreadcrumb.length - 2].id);
-        }).catch(e => {
-          console.error('Error when deleting draft note', e);
-        });
-      } else {
-        this.$notesService.deleteNotes(this.note).then(() => {
-          this.getNoteByName(this.notebreadcrumb[this.notebreadcrumb.length - 2].id);
-        }).catch(e => {
-          console.error('Error when deleting note', e);
-        });
-      }
-    },
-    moveNote(note, newParentNote){
-      note.parentPageId=newParentNote.id;
-      this.$notesService.moveNotes(note, newParentNote).then(() => {
-        this.getNoteByName(note.name);
-        this.$root.$emit('close-note-tree-drawer');
-        this.$root.$emit('show-alert', {type: 'success',message: this.$t('notes.alert.success.label.noteMoved')});
-      }).catch(e => {
-        console.error('Error when move note page', e);
-        this.$root.$emit('show-alert', {
-          type: 'error',
-          message: this.$t(`notes.message.${e.message}`)
-        });
-      });
-    },
-    exportNotes(notesSelected, exportAll, homeNoteId) {
-      const maxExportId = 10000;
-      this.exportId = Math.floor(Math.random() * maxExportId);
-      if (exportAll) {
-        notesSelected = homeNoteId;
-      }
-      this.$notesService.exportNotes(notesSelected, exportAll,this.exportId);
-      this.getExportStatus();
-    },
-    cancelExportNotes() {
-      this.stopGetStatus();
-      this.$notesService.cancelExportNotes(this.exportId).then(() => {
-        this.$root.$emit('show-alert', {type: 'success', message: this.$t('notes.alert.success.label.export.canceled')});
-      }).catch(e => {
-        this.$root.$emit('show-alert', {
-          type: 'error',
-          message: this.$t(`notes.message.${e.message}`)
-        });
-      });
-    },
-    getExportedZip() {
-      const date = this.$dateUtil.formatDateObjectToDisplay(Date.now(), this.dateTimeFormatZip, this.lang);
-      this.$notesService.getExportedZip(this.exportId).then((transfer) => {
-        return transfer.blob();
-      }).then((bytes) => {
-        const elm = document.createElement('a');
-        elm.href = URL.createObjectURL(bytes);
-        elm.setAttribute('download', `${date}_notes_${this.spaceDisplayName}.zip`);
-        elm.click();
-        this.exportId=0;
-        this.$root.$emit('show-alert', {type: 'success', message: this.$t('notes.alert.success.label.exported')});
-      }).catch(e => {
-        console.error('Error when export note page', e);
-        this.$root.$emit('show-alert', {
-          type: 'error',
-          message: this.$t(`notes.message.${e.message}`)
-        });
-      });
-    },
-    getExportStatus() {
-      this.intervalId = window.setInterval(() =>{
-        return this.$notesService.getExportStatus(this.exportId).then(data => {
-          this.exportStatus = data;
-          this.$refs.notesBreadcrumb.setExportStaus(this.exportStatus);
-        }).catch(() => {
-          this.stopGetStatus();
-        });
-      }, 500);
-    },
-    stopGetStatus(){
-      clearInterval(this.intervalId);
-    },
-    getNoteById(noteId, source, viewNote) {
-      return this.$notesService.getNoteById(noteId,this.targetLang, source, this.noteBookType, this.noteBookOwner).then(data => {
-        this.note = data || {};
-        this.isDraft = data.draftPage;
-        this.loadData = true;
-        this.currentNoteBreadcrumb = this.note.breadcrumb;
-        this.getNoteLanguages(noteId);
-        this.selectedTranslation = this.note.lang ? { value: this.targetLang } : this.originalVersion;
-        this.updateURL();
-        if (viewNote){
-          this.viewNoteStatistics(this.note);
-        }
-        return this.$nextTick();
-      }).catch(e => {
-        console.error('Error when getting note', e);
-        this.existingNote = false;
-      }).finally(() => {
-        this.$root.$applicationLoaded();
-        this.refreshTreeView();
-        this.initialized = true;
-      });
-    },
-    importNotes(uploadId,overrideMode){
-      this.$notesService.importZipNotes(this.note.id,uploadId,overrideMode).then(() => {
-        this.$root.$emit('close-note-tree-drawer');
-        this.$root.$emit('show-alert', {type: 'success',message: this.$t('notes.alert.success.label.notes.imported')});
-      }).catch(e => {
-        console.error('Error when import notese', e);
-        this.$root.$emit('show-alert', {
-          type: 'error',
-          message: this.$t(`notes.message.${e.message}`)
-        });
-      });
-    },
-    getNoteByName(noteName, source, viewNote) {
-      return this.$notesService.getNote(this.noteBookType, this.noteBookOwner, noteName, source, this.targetLang).then(data => {
-        this.note = data || {};
-        this.isDraft = data.draftPage;
-        this.loadData = true;
-        this.currentNoteBreadcrumb = this.note.breadcrumb;
-        this.getNoteLanguages(this.note.id);
-        const translation = this.note.lang ? { value: this.targetLang } : this.originalVersion;
-        this.updateSelectedTranslation(translation);
-        this.updateURL();
-        if (viewNote){
-          this.viewNoteStatistics(this.note);
-        }
-        return this.$nextTick();
-      }).catch(e => {
-        console.error('Error when getting note', e);
-        this.existingNote = false;
-      }).finally(() => {
-        this.$root.$applicationLoaded();
-        this.refreshTreeView();
-        this.initialized = true;
-      });
-    },
-    getDraftNote(noteId) {
-      return this.$notesService.getDraftNoteById(noteId,this.selectedTranslation.value).then(data => {
-        this.note = {};
-        this.note = data || {};
-        this.isDraft = true;
-        this.loadData = true;
-        this.currentNoteBreadcrumb = this.note.breadcrumb;
-        this.updateURL();
-        return this.$nextTick();
-      }).catch(e => {
-        console.error('Error when getting note', e);
-        this.existingNote = false;
-      }).finally(() => {
-        this.$root.$applicationLoaded();
-        this.refreshTreeView();
-        this.initialized = true;
-      });
-    },
-    confirmDeleteNote: function () {
-      let parentsBreadcrumb = '';
-      for (let index = 0; index < this.notebreadcrumb.length - 1; index++) {
-        parentsBreadcrumb = parentsBreadcrumb.concat(this.notebreadcrumb[index].title);
-        if (index < this.notebreadcrumb.length - 2) {
-          parentsBreadcrumb = parentsBreadcrumb.concat('>');
-        }
-      }
-      this.confirmMessage = `${this.note.draftPage ? this.$t('popup.msg.confirmation.DeleteDraftInfo1', { 0: `<b>${this.note && this.note.title}</b>` }) :
-        this.$t('popup.msg.confirmation.DeleteInfo1', { 0: `<b>${this.note && this.note.title}</b>` })}`
-          + `<p>${this.$t('popup.msg.confirmation.DeleteInfo2')}</p>`
-          + `<li>${this.$t('popup.msg.confirmation.DeleteInfo4')}</li>`
-          + `<li>${this.note.draftPage ? this.$t('popup.msg.confirmation.DeleteDraftInfo5', {
-            0: `<b>${parentsBreadcrumb}</b>`
-          }) : this.$t('popup.msg.confirmation.DeleteInfo5', {
-            0: `<b>${parentsBreadcrumb}</b>`
-          })}</li>`;
-      this.$refs.DeleteNoteDialog.open();
+      const delta = e.clientX - this.startX;
+      this.sidebarWidth = Math.min(
+        Math.max(this.startWidth + delta, this.minWidth),
+        this.maxWidth
+      );
     },
-    createPDF(note) {
-      this.hideElementsForSavingPDF = true;
-      this.closeMobileActionMenu();
-      window.setTimeout(() => {
-        const title = `${this.noteTitle}`;
-        if (note.title !== title) {
-          this.noteTitle = note.title;
-        }
-        const self = this;
-        this.$nextTick(() => {
-          const element = this.$refs.content;
-          this.hideElementsForSavingPDF = false;
-          html2canvas(element, {
-            useCORS: true
-          }).then(function (canvas) {
-            if (note.title !== title) {
-              self.noteTitle = title;
-            }
-            const pdf = new JSPDF('p', 'mm', 'a4');
-            const ctx = canvas.getContext('2d');
-            const a4w = 170;
-            const a4h = 257;
-            const imgHeight = Math.floor(a4h * canvas.width / a4w);
-            let renderedHeight = 0;
-
-            while (renderedHeight < canvas.height) {
-              const page = document.createElement('canvas');
-              page.width = canvas.width;
-              page.height = Math.min(imgHeight, canvas.height - renderedHeight);
-
-              page.getContext('2d').putImageData(ctx.getImageData(0, renderedHeight, canvas.width, Math.min(imgHeight, canvas.height - renderedHeight)), 0, 0);
-              pdf.addImage(page.toDataURL('image/jpeg', 1.0), 'JPEG', 10, 10, a4w, Math.min(a4h, a4w * page.height / page.width));
-              renderedHeight += imgHeight;
-              if (renderedHeight < canvas.height) {
-                pdf.addPage();
-              }
-            }
-            const filename = `${note.title}.pdf`;
-            pdf.save(filename);
-          }).catch(e => {
-            this.displayMessage({
-              type: 'error',
-              message: this.$t('notes.message.export.error')
-            });
-            console.error('Error when exporting note: ', e);
-          });
-        });
-      }, 200);
-    },
-    displayMessage(message) {
-      this.$root.$emit('alert-message', message?.message, message?.type || 'success');
-    },
-    getNoteVersionByNoteId(noteId) {
-      this.noteVersionsArray = [];
-      this.noteVersions = [];
-      return this.$notesService.getNoteVersionsByNoteId(noteId, this.selectedTranslation?.value).then(data => {
-        this.noteVersions = data && data.reverse() || [];
-        if (this.noteVersions.length) {
-          this.displayVersion(this.noteVersions[0]);
-          this.$root.$emit('version-restored', this.noteVersions[0]);
-        }
-      });
-    },
-    displayVersion(version) {
-      this.actualVersion = version;
-      this.actualVersion.current = true;
-      this.note.content = version.content;
-      this.note.title = version.title;
-      this.noteSummary = version?.properties?.summary;
-      this.note.properties = version.properties;
-      this.noteTitle = version.title;
-    },
-    restoreVersion(version) {
-      const note = {
-        id: this.note.id,
-        name: version.name,
-        title: version.title,
-        content: version.content,
-        updatedDate: version.updatedDate,
-        owner: version.author,
-        properties: version.properties
-      };
-      this.note.content = version.content;
-      this.note.title = version.title;
-      this.noteSummary = version.properties.summary;
-      this.note.properties = version.properties;
-      this.$notesService.restoreNoteVersion(note,version.versionNumber)
-        .catch(e => {
-          console.error('Error when restore note version', e);
-          this.$root.$emit('version-restore-error');
-        })
-        .finally(() => {
-          this.getNoteVersionByNoteId(this.note.id);
-        });
-    },
-    openNoteVersionsHistoryDrawer() {
-      if (!this.isDraft) {
-        if ( this.note.canManage ) {
-          this.versionsPageSize = Math.round((window.innerHeight-79)/80);
-        } else {
-          this.versionsPageSize = Math.round((window.innerHeight-79)/60);
-        }
-        this.$refs.noteVersionsHistoryDrawer.open();
-      }
-      this.closeMobileActionMenu();
-    },
-    fetchChildren(item, treeview) {
-      if (item.isOpen) {
-        treeview.updateOpen(item.noteId, false);
-        item.isOpen = false;
+    stopResize() {
+      if (!this.isResizing) {
         return;
       }
-      item.isLoading = true;
-      return this.$notesService.getNoteTreeLevel(item.path).then(data => {
-        item.children = data?.jsonList;
-        treeview.updateOpen(item.noteId, true);
-        item.isOpen = true;
-        item.isLoading = false;
-      });
-    },
-    retrieveNoteTreeById() {
-      this.note.wikiOwner = this.spaceId ? this.note.wikiOwner.substring(1) : this.note.wikiOwner;
-      this.$notesService.getNoteTree(this.note.wikiType, this.note.wikiOwner, this.note.name, 'children').then(data => {
-        if (data?.jsonList?.length) {
-          this.noteChildren = data?.jsonList;
-        }
-        else {
-          this.noteChildren = [];
-        }
-      });
-    },
-    openNoteChild(item) {
-      const noteName = item.path.split('%2F').pop();
-      this.$root.$emit('open-note-by-name', noteName);
-      document.dispatchEvent(new CustomEvent('note-navigation-updated', {detail: item}));
-    },
-    updateNote(noteParam) {
-      const note = {
-        id: noteParam.id,
-        title: noteParam.title,
-        name: noteParam.name,
-        wikiType: noteParam.wikiType,
-        wikiOwner: noteParam.wikiOwner,
-        content: '',
-        parentPageId: null,
-      };
-      if (note.id) {
-        this.$notesService.updateNoteById(note).catch(e => {
-          console.error('Error when update note page', e);
-        });
-      }
-    },
-    updateURL(){
-      const urlHash = window.location.hash;
-      const charsToRemove = notesConstants.PORTAL_BASE_URL.length-notesConstants.PORTAL_BASE_URL.lastIndexOf(`/${this.appName}`);
-      let translation = '';
-      if (this.selectedTranslation.value) {
-        translation = `?translation=${this.selectedTranslation.value}`;
-      }
-      notesConstants.PORTAL_BASE_URL = `${notesConstants.PORTAL_BASE_URL.slice(0,-charsToRemove)}/${this.appName}/${this.note.id}${translation}${urlHash}`;
-      window.history.pushState({'translation': this.selectedTranslation}, window.document.title, notesConstants.PORTAL_BASE_URL);
+      this.isResizing = false;
+      document.body.style.userSelect = '';
+      document.body.style.cursor = '';
     },
-    getNoteLanguages(noteId){
-      this.translations = [];
-      return this.$notesService.getNoteLanguages(noteId).then(data => {
-        this.translations =  data || [];
-        if (this.translations.length>0) {
-          this.translations = this.languages.filter(item1 => this.translations.some(item2 => item2 === item1.value));
-          this.translations.sort((a, b) => a.text.localeCompare(b.text));
-        }
-        this.translations.unshift(this.originalVersion);
-      });
+    onSelectNote(id) {
+      history.pushState({}, '', `/notes/${id}`);
+      this.currentNoteId = id;
     },
-    getAvailableLanguages(){
-      return this.$notesService.getAvailableLanguages().then(data => {
-        this.languages = data || [];
-      });
+    onPopState() {
+      this.currentNoteId = this.getNoteIdFromUrl();
     },
-    changeTranslation(translation){
-      this.selectedTranslation = translation;
-      return this.$notesService.getNoteById(this.note.id,this.selectedTranslation.value).then(data => {
-        const note = data || {};
-        if (note) {
-          this.note.content = note.content;
-          this.note.metadatas = note.metadatas;
-          this.note.lang = note.lang;
-          this.noteContent = note.content;
-          this.note.title = note.title;
-          this.note.latestVersionId = note.latestVersionId;
-          this.noteTitle = !this.note.parentPageId && this.note.title==='Home' ? this.noteHomeTitle : this.note.title;
-          this.note.properties = note?.properties;
-          this.noteSummary = note?.properties?.summary;
-        }
-        this.updateURL();
-        this.getNoteVersionByNoteId(this.note.id);
-        this.viewNoteStatistics();
-        return this.$nextTick();
-      }).catch(e => {
-        console.error('Error when getting note', e);
-      });
+    extendTreeView(value) {
+      this.treeViewExpended = value;
+      localStorage.setItem('expendedTreeView', value);
     },
-    viewNoteStatistics() {
-      if (this.isDraft) {
-        return;
-      }
-      this.$notesService.markNoteAsViewed(this.note.id || this.noteId, this.selectedTranslation?.value);
-    },
-    refreshTreeView() {
-      if (this.initialized) {
-        this.$root.$emit('refresh-treeView-items', this.note);
-      }
-    },
-    handleNotePublished(event) {
-      const {editPublication, isPublishSchedule, link} = event.detail;
-      this.isPublishing = false;
-      this.$refs.publicationDrawer.close();
-      document.dispatchEvent(new CustomEvent('alert-message-html', {detail: {
-        alertType: 'success',
-        alertMessage: isPublishSchedule && this.$t('notes.schedule.success.message')
-                                   || editPublication && this.$t('notes.publication.settings.update.success')
-                                   || this.$t('notes.publication.success.message'),
-        alertLink: link,
-        alertLinkText: this.$t('notes.view.label')
-      }}));
-    },
-    duplicateNote() {
-      const properties = this.note?.properties;
-      if (properties) {
-        properties.draft = this.note?.draftPage;
-      }
-      const note = {
-        title: `${this.$t('notes.menu.label.copyOf')} ${this.note.title}`,
-        name: `${this.$t('notes.menu.label.copyOf')} ${this.note.name}`,
-        lang: this.note.lang,
-        wikiType: this.note.wikiType,
-        wikiOwner: this.note.wikiOwner,
-        content: this.note.content,
-        parentPageId: this.note?.draftPage && this.note?.targetPageId === this.parentPageId ? null : this.parentPageId,
-        toBePublished: false,
-        appName: this.appName,
-        properties: properties,
-        extensionDataUpdated: false
-      };
-      this.$notesService.createNote(note).then(duplicated => {
-        window.open(`${eXo.env.portal.context}/${eXo.env.portal.portalName}/notes-editor?noteId=${duplicated.id}&translation=${this.selectedTranslation.value}&spaceGroupId=${eXo.env.portal?.spaceGroup}`, '_blank');
-      }).catch(e => {
-        this.$root.$emit('show-alert', {
-          type: 'error',
-          message: this.$t(`notes.message.${e.message}`)
-        });
-      });
-    }
   }
 };
-</script>
+</script>
\ No newline at end of file
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 118285d85e..72008ce01e 100644
--- a/notes-webapp/src/main/webapp/vue-app/notes/initComponents.js
+++ b/notes-webapp/src/main/webapp/vue-app/notes/initComponents.js
@@ -12,9 +12,11 @@ import NotesActionMenuItems from './components/menu/NotesActionMenuItems.vue';
 import NotesMobileActionMenu from './components/menu/NotesMobileActionMenu.vue';
 import NoteTreeviewItemPrepend from './components/NoteTreeviewItemPrepend.vue';
 import NoteEditorFeaturedImageDrawer from '../notes-rich-editor/components/note-properties/NoteEditorFeaturedImageDrawer.vue';
+import NotePage from './components/NotePage.vue';
 
 const components = {
   'notes-overview': NotesOverview,
+  'notes-page': NotePage,
   'notes-actions-menu': NotesActionsMenu,
   'note-breadcrumb': NoteBreadcrumb,
   'note-import-drawer': NoteImportDrawer,
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 9e31f21d0b..c29e7b884c 100644
--- a/notes-webapp/src/main/webapp/vue-app/notes/main.js
+++ b/notes-webapp/src/main/webapp/vue-app/notes/main.js
@@ -25,8 +25,6 @@ for (const index in objects) {
   }
 }
 
-Vue.use(Vuetify);
-const vuetify = new Vuetify(eXo.env.portal.vuetifyPreset);
 const appId = 'notesOverviewApplication';
 
 //getting language of the PLF
@@ -43,13 +41,22 @@ if (!Vue.prototype.$notesService) {
 
 export function init() {
   exoi18n.loadLanguageAsync(lang, url).then(i18n => {
-    const appElement = document.createElement('div');
-    appElement.id = appId;
     // init Vue app when locale ressources are ready
     Vue.createApp({
-      template: `<notes-overview v-cacheable id="${appId}" />`,
-      vuetify,
-      i18n
-    }, appElement, 'Notes Overview');
+      template: `<notes-overview id="${appId}" />`,
+      vuetify: Vue.prototype.vuetifyOptions,
+      i18n,
+      computed: {
+        isMobile() {
+          return this.$vuetify.breakpoint.smAndDown;
+        },
+        noteBookType() {
+          return eXo.env.portal.spaceName ? 'group' : 'user';
+        },
+        noteBookOwner() {
+          return eXo.env.portal.spaceGroup ? `/spaces/${eXo.env.portal.spaceGroup}` : eXo.env.portal.profileOwner;
+        }
+      },
+    }, `#${appId}`, 'Notes Overview');
   });
 }