1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +00:00

Refactoring changing of folder

This commit is contained in:
bimlas
2018-05-25 20:07:38 +02:00
parent 06f33d9a63
commit 53728a0f4a

View File

@@ -87,21 +87,7 @@ function data (state = defaultDataMap(), action) {
} }
// Update foldermap if folder changed or post created // Update foldermap if folder changed or post created
if (oldNote == null || oldNote.folder !== note.folder) { updateFolderChange(oldNote, note, state, folderKey, uniqueKey)
state.folderNoteMap = new Map(state.folderNoteMap)
let folderNoteSet = state.folderNoteMap.get(folderKey)
folderNoteSet = new Set(folderNoteSet)
folderNoteSet.add(uniqueKey)
state.folderNoteMap.set(folderKey, folderNoteSet)
if (oldNote != null) {
const oldFolderKey = oldNote.storage + '-' + oldNote.folder
let oldFolderNoteList = state.folderNoteMap.get(oldFolderKey)
oldFolderNoteList = new Set(oldFolderNoteList)
oldFolderNoteList.delete(uniqueKey)
state.folderNoteMap.set(oldFolderKey, oldFolderNoteList)
}
}
if (oldNote != null) { if (oldNote != null) {
updateTagChanges(oldNote, note, state, uniqueKey) updateTagChanges(oldNote, note, state, uniqueKey)
@@ -178,21 +164,7 @@ function data (state = defaultDataMap(), action) {
} }
// Update foldermap if folder changed or post created // Update foldermap if folder changed or post created
if (oldNote == null || oldNote.folder !== note.folder) { updateFolderChange(oldNote, note, state, folderKey, uniqueKey)
state.folderNoteMap = new Map(state.folderNoteMap)
let folderNoteList = state.folderNoteMap.get(folderKey)
folderNoteList = new Set(folderNoteList)
folderNoteList.add(uniqueKey)
state.folderNoteMap.set(folderKey, folderNoteList)
if (oldNote != null) {
const oldFolderKey = oldNote.storage + '-' + oldNote.folder
let oldFolderNoteList = state.folderNoteMap.get(oldFolderKey)
oldFolderNoteList = new Set(oldFolderNoteList)
oldFolderNoteList.delete(uniqueKey)
state.folderNoteMap.set(oldFolderKey, oldFolderNoteList)
}
}
// Remove from old folder map // Remove from old folder map
if (oldNote != null) { if (oldNote != null) {
@@ -441,6 +413,24 @@ function updateStarredChange (oldNote, note, state, uniqueKey) {
} }
} }
function updateFolderChange (oldNote, note, state, folderKey, uniqueKey) {
if (oldNote == null || oldNote.folder !== note.folder) {
state.folderNoteMap = new Map(state.folderNoteMap)
let folderNoteList = state.folderNoteMap.get(folderKey)
folderNoteList = new Set(folderNoteList)
folderNoteList.add(uniqueKey)
state.folderNoteMap.set(folderKey, folderNoteList)
if (oldNote != null) {
const oldFolderKey = oldNote.storage + '-' + oldNote.folder
let oldFolderNoteList = state.folderNoteMap.get(oldFolderKey)
oldFolderNoteList = new Set(oldFolderNoteList)
oldFolderNoteList.delete(uniqueKey)
state.folderNoteMap.set(oldFolderKey, oldFolderNoteList)
}
}
}
function updateTagChanges (oldNote, note, state, uniqueKey) { function updateTagChanges (oldNote, note, state, uniqueKey) {
const discardedTags = _.difference(oldNote.tags, note.tags) const discardedTags = _.difference(oldNote.tags, note.tags)
const addedTags = _.difference(note.tags, oldNote.tags) const addedTags = _.difference(note.tags, oldNote.tags)