Merge pull request #320 from devnull-1337/fix/note-title-composer

chore(sidebar): use title from api instead of content-based

Author: e11sy

src/application/services/useNote.ts

@@ -340,29 +340,29 @@ export default function (options: UseNoteComposableOptions): UseNoteComposableSt
   }
 
   /**
-   * Recursively update the note hierarchy content
+   * Recursively update the note hierarchy title
    * @param hierarchy - The note hierarchy to update
-   * @param content - The new content to update in the hierarchy
+   * @param title - The new title to update in the hierarchy
    */
-  function updateNoteHierarchyContent(hierarchy: NoteHierarchy | null, content: NoteContent | null): void {
+  function updateNoteHierarchyContent(hierarchy: NoteHierarchy | null, title: string): void {
     // If hierarchy is null, there's nothing to update
     if (!hierarchy) {
       return;
     }
 
     // If content is null, we can't update the hierarchy content
-    if (!content) {
+    if (!title) {
       return;
     }
 
-    // Update the content of the current note in the hierarchy if it matches the currentId
-    if (hierarchy.id === currentId.value) {
-      hierarchy.content = content;
+    // Update the title of the current note in the hierarchy if it matches the currentId
+    if (hierarchy.noteId === currentId.value) {
+      hierarchy.noteTitle = title;
     }
 
     // Recursively update child notes
     if (hierarchy.childNotes) {
-      hierarchy.childNotes.forEach(child => updateNoteHierarchyContent(child, content));
+      hierarchy.childNotes.forEach(child => updateNoteHierarchyContent(child, title));
     }
   }
 
@@ -399,7 +399,7 @@ export default function (options: UseNoteComposableOptions): UseNoteComposableSt
           url: route.path,
         });
     }
-    updateNoteHierarchyContent(noteHierarchy.value, lastUpdateContent.value);
+    updateNoteHierarchyContent(noteHierarchy.value, currentNoteTitle);
   });
 
   return {

src/domain/entities/NoteHierarchy.ts

@@ -1,4 +1,4 @@
-import { type NoteContent, type NoteId } from './Note';
+import { type NoteId } from './Note';
 
 /**
  * Note Tree entity
@@ -8,12 +8,12 @@ export interface NoteHierarchy {
   /**
    * public note id
    */
-  id: NoteId;
+  noteId: NoteId;
 
   /**
-   * note content
+   * note title
    */
-  content: NoteContent | null;
+  noteTitle: string;
 
   /**
    * child notes

src/presentation/pages/Note.vue

@@ -16,6 +16,7 @@
               : t('note.lastEdit') + ' ' + 'a few seconds ago'
           }}
         </div>
+        <!-- @todo when user clicks on + button to add new note the user should see the previous note heirarchy -->
         <Button
           v-if="canEdit"
           secondary
@@ -76,7 +77,6 @@ import { useNoteEditor } from '@/application/services/useNoteEditor';
 import NoteHeader from '@/presentation/components/note-header/NoteHeader.vue';
 import BreadCrumbs from '@/presentation/components/breadcrumbs/BreadCrumbs.vue';
 import { NoteHierarchy } from '@/domain/entities/NoteHierarchy';
-import { getTitle } from '@/infrastructure/utils/note';
 import { getTimeFromNow } from '@/infrastructure/utils/date.ts';
 
 const { t } = useI18n();
@@ -192,15 +192,13 @@ function transformNoteHierarchy(noteHierarchyObj: NoteHierarchy | null, currentN
     };
   }
 
-  const title = noteHierarchyObj.content ? getTitle(noteHierarchyObj.content) : 'Untitled';
-
   // Transform the current note into a VerticalMenuItem
   return {
-    title: title,
-    isActive: route.path === `/note/${noteHierarchyObj.id}`,
+    title: noteHierarchyObj?.noteTitle || 'Untitled',
+    isActive: route.path === `/note/${noteHierarchyObj.noteId}`,
     items: noteHierarchyObj.childNotes ? noteHierarchyObj.childNotes.map(child => transformNoteHierarchy(child, currentNoteTitle)) : undefined,
     onActivate: () => {
-      void router.push(`/note/${noteHierarchyObj.id}`);
+      void router.push(`/note/${noteHierarchyObj.noteId}`);
     },
   };
 }