Rename realId to orderId

Author: Komediruzecki

src/lib/db/FSNoteDb.ts

@@ -92,8 +92,8 @@ class FSNoteDb implements NoteDb {
     const allFolders = await this.getAllFolders()
     let anyFolderDocUpdated = false
     allFolders.forEach((folderDoc) => {
-      if (folderDoc._realId === undefined) {
-        folderDoc._realId = generateFolderId()
+      if (folderDoc.orderId === undefined) {
+        folderDoc.orderId = generateFolderId()
         anyFolderDocUpdated = true
       }
     })
@@ -122,7 +122,7 @@ class FSNoteDb implements NoteDb {
   async upsertFolder(
     pathname: string,
     props?: Partial<FolderDocEditibleProps>,
-    oldRealId?: string,
+    oldOrderId?: string,
     skipParentFolderCreation?: boolean
   ): Promise<FolderDoc> {
     if (!isFolderPathnameValid(pathname)) {
@@ -139,15 +139,15 @@ class FSNoteDb implements NoteDb {
       return folder
     }
     const now = getNow()
-    const newRealId =
-      folder != null && folder._realId != null ? folder._realId : oldRealId
+    const newOrderId =
+      folder != null && folder.orderId != null ? folder.orderId : oldOrderId
     const newFolderDoc = {
       ...(folder || {
         _id: getFolderId(pathname),
         createdAt: now, // todo: [komediruzecki-10/07/2021] FIXME: should be updated at when renaming folder!
         data: {},
       }),
-      _realId: newRealId != null ? newRealId : generateFolderId(),
+      orderId: newOrderId != null ? newOrderId : generateFolderId(),
       ...props,
       orderedIds: removeDuplicates([
         ...(props != null ? props.orderedIds || [] : []),
@@ -185,7 +185,7 @@ class FSNoteDb implements NoteDb {
     const folderToDelete = await this.getFolder(pathname)
     if (parentFolder != null && folderToDelete != null) {
       const newParentOrderedIds = (parentFolder.orderedIds || []).filter(
-        (orderId) => orderId != folderToDelete._realId
+        (orderId) => orderId != folderToDelete.orderId
       )
       newFolderMap[getParentFolderPathname(pathname)] = {
         ...parentFolder,
@@ -597,14 +597,14 @@ class FSNoteDb implements NoteDb {
     for (const folderPathname of allFoldersToRename) {
       const newFolderPathname = replacePathname(folderPathname)
       const oldFolderDoc = await this.getFolder(folderPathname)
-      const oldRealId = oldFolderDoc != null ? oldFolderDoc._realId : undefined
+      const oldOrderId = oldFolderDoc != null ? oldFolderDoc.orderId : undefined
       const newFolder = await this.upsertFolder(
         newFolderPathname,
         {
           orderedIds:
             oldFolderDoc != null ? oldFolderDoc.orderedIds : undefined,
         },
-        oldRealId,
+        oldOrderId,
         true
       )
       updatedFolderMap.set(newFolderPathname, {
@@ -625,7 +625,7 @@ class FSNoteDb implements NoteDb {
       if (previousParentFolder != null && newParentFolder != null) {
         const newPreviousParentOrderedIds = removeDuplicates(
           (previousParentFolder.orderedIds || []).filter(
-            (orderId) => folder._realId != orderId
+            (orderId) => folder.orderId != orderId
           )
         )
 
@@ -634,7 +634,7 @@ class FSNoteDb implements NoteDb {
         // new parent folder update
         const newParentOrderedIds = removeDuplicates([
           ...(newParentFolder.orderedIds || []),
-          folder._realId,
+          folder.orderId,
         ])
         const newParentFolderPathname = getParentFolderPathname(newPathname)
 
@@ -694,15 +694,15 @@ class FSNoteDb implements NoteDb {
     )
     updatedFolderMap.forEach((updatedFolderDoc) => {
       const {
-        _realId,
+        orderId,
         _id,
         createdAt,
         updatedAt,
         data,
         orderedIds,
       } = updatedFolderDoc
       newFolderMap[updatedFolderDoc.pathname] = {
-        _realId,
+        orderId: orderId,
         _id,
         createdAt,
         updatedAt,

src/lib/db/createStore.ts

@@ -345,7 +345,7 @@ export function createDbStoreCreator(
           const previousOrderedIds = parentFolder.orderedIds || []
           const newOrderedIds = removeDuplicates([
             ...previousOrderedIds,
-            aFolder._realId,
+            aFolder.orderId,
           ])
           const updatedFolder = await storage.db.upsertFolder(
             parentFolder.pathname,
@@ -905,7 +905,7 @@ export function createDbStoreCreator(
           const previousOrderedIds = parentFolder.orderedIds || []
           const newOrderedIds = removeDuplicates([
             ...previousOrderedIds,
-            folder._realId,
+            folder.orderId,
           ])
 
           const updatedParentFolder = await storage.db.updateFolderOrderedIds(
@@ -1407,7 +1407,7 @@ async function prepareStorage(
         const subFolderDoc = populatedFolderMap[subFolderPathname]
         if (subFolderDoc != null) {
           populatedFolderMap[parentFolderPathname]!.orderedIds!.push(
-            subFolderDoc._realId
+            subFolderDoc.orderId
           )
         }
       })

src/lib/db/patterns.ts

@@ -4,7 +4,7 @@ import { DraggedTo, SidebarDragState } from '../../shared/lib/dnd'
 
 export function getResourceId(source: NavResource) {
   if (source.type == 'folder') {
-    return source.result._realId
+    return source.result.orderId
   } else {
     return source.result._id
   }

src/lib/db/types.ts

@@ -37,7 +37,7 @@ export type NoteDoc = {
 
 export type FolderDoc = {
   _id: string // folder:${FOLDER_PATHNAME}
-  _realId: string // identification for reordering (unique across any property change)
+  orderId: string // identification for reordering (unique across any property change)
   createdAt: string
   updatedAt: string
   _rev?: string

src/lib/v2/mappers/local/sidebarTree.tsx

@@ -130,7 +130,7 @@ function getFolderChildrenOrderedIds(
   folders.forEach((folder) => {
     const folderPathname = getFolderPathname(folder._id)
     if (isDirectSubPathname(parentFolderPathname, folderPathname)) {
-      children.push(folder._realId)
+      children.push(folder.orderId)
     }
   })
 
@@ -218,7 +218,7 @@ export function mapTree(
   const items = new Map<string, LocalTreeItem>()
   const [notes, folders] = [values(docMap), values(folderMap)]
   folders.forEach((folder) => {
-    const folderRealId = folder._realId
+    const folderOrderId = folder.orderId
     const folderId = folder._id
     const folderPathname = getFolderPathname(folderId)
     if (folderPathname == '/') {
@@ -230,14 +230,14 @@ export function mapTree(
     const parentFolderDoc = folderMap[parentFolderPathname]
     const parentFolderId =
       parentFolderDoc != null && parentFolderPathname != '/'
-        ? parentFolderDoc._realId
+        ? parentFolderDoc.orderId
         : workspace.id
-    items.set(folderRealId, {
-      id: folderRealId,
+    items.set(folderOrderId, {
+      id: folderOrderId,
       lastUpdated: folder.updatedAt,
       label: folderName,
-      folded: !sideBarOpenedFolderIdsSet.has(folderRealId),
-      folding: getFoldEvents('folders', folderRealId),
+      folded: !sideBarOpenedFolderIdsSet.has(folderOrderId),
+      folding: getFoldEvents('folders', folderOrderId),
       href,
       active: href === currentPathWithWorkspace,
       navigateTo: () => push(href),
@@ -341,7 +341,7 @@ export function mapTree(
       parentFolderDoc != null
         ? parentFolderDoc.pathname == '/'
           ? workspace.id
-          : parentFolderDoc._realId
+          : parentFolderDoc.orderId
         : workspace.id
     items.set(noteId, {
       id: noteId,