@@ -859,7 +859,7 @@ export function createDbStoreCreator(
859
859
}
860
860
const noteDoc = await storage . db . untrashNote ( noteId )
861
861
862
- const folder : PopulatedFolderDoc =
862
+ const noteFolder : PopulatedFolderDoc =
863
863
storage . folderMap [ noteDoc . folderPathname ] == null
864
864
? ( {
865
865
...( await storage . db . upsertFolder ( noteDoc . folderPathname ) ) ,
@@ -878,11 +878,12 @@ export function createDbStoreCreator(
878
878
noteDoc . folderPathname
879
879
)
880
880
881
- const isRootFolder = folder . pathname == '/'
882
- const foldersToUpdate : PopulatedFolderDoc [ ] = [ folder ]
883
- const foldersToUpdateParentOrderedIds : PopulatedFolderDoc [ ] = isRootFolder
884
- ? [ ]
885
- : [ folder ]
881
+ const isFolderMissing =
882
+ storage . folderMap [ noteDoc . folderPathname ] == null
883
+ const foldersToUpdate : PopulatedFolderDoc [ ] = [ ]
884
+ const foldersToUpdateParentOrderedIds : PopulatedFolderDoc [ ] = isFolderMissing
885
+ ? [ noteFolder ]
886
+ : [ ]
886
887
for ( const parentFolderPathname of parentFolderPathnames ) {
887
888
if ( storage . folderMap [ parentFolderPathname ] == null ) {
888
889
const missingFolder = await storage . db . upsertFolder (
@@ -892,7 +893,7 @@ export function createDbStoreCreator(
892
893
const missingFolderPopulatedDoc = {
893
894
...missingFolder ,
894
895
pathname : parentFolderPathname ,
895
- noteIdSet : new Set ( ) ,
896
+ orderedIds : [ ] ,
896
897
} as PopulatedFolderDoc
897
898
foldersToUpdate . push ( missingFolderPopulatedDoc )
898
899
foldersToUpdateParentOrderedIds . push ( missingFolderPopulatedDoc )
@@ -946,10 +947,16 @@ export function createDbStoreCreator(
946
947
return acc
947
948
} , { } )
948
949
950
+ // update note doc folder ordered IDs
951
+ await storage . db . updateFolderOrderedIds (
952
+ noteFolder . _id ,
953
+ noteFolder . orderedIds || [ ]
954
+ )
955
+
949
956
setStorageMap (
950
957
produce ( ( draft : ObjectMap < NoteStorage > ) => {
951
958
draft [ storageId ] ! . noteMap [ noteDoc . _id ] = noteDoc
952
- draft [ storageId ] ! . folderMap [ noteDoc . folderPathname ] = folder
959
+ draft [ storageId ] ! . folderMap [ noteDoc . folderPathname ] = noteFolder
953
960
foldersToUpdate . forEach ( ( folderToUpdate ) => {
954
961
draft [ storageId ] ! . folderMap [
955
962
folderToUpdate . pathname
0 commit comments