self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

Electron: Fixed issue with conflict folder and fixed sync tests

Browse Source
This commit is contained in:
Laurent Cozic
2017-11-12 18:57:59 +00:00
parent f8bcb56964
commit be77f15ef7
10 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ReactNativeClient/lib/reducer.js
View File

@ -1,4 +1,5 @@
const { Note } = require('lib/models/note.js');
const { Folder } = require('lib/models/folder.js');
const defaultState = {
notes: [],
@ -160,6 +161,12 @@ const reducer = (state = defaultState, action) => {
const modNote = action.note;
const noteIsInFolder = function(note, folderId) {
if (note.is_conflict) return folderId === Folder.conflictFolderId();
if (!('parent_id' in modNote) || note.parent_id == folderId) return true;
return false;
}
let noteFolderHasChanged = false;
let newNotes = state.notes.slice();
var found = false;
@ -168,7 +175,7 @@ const reducer = (state = defaultState, action) => {
if (n.id == modNote.id) {
// Note is still in the same folder
if (!('parent_id' in modNote) || modNote.parent_id == n.parent_id) {
if (noteIsInFolder(modNote, n.parent_id)) {
// Merge the properties that have changed (in modNote) into
// the object we already have.
newNotes[i] = Object.assign({}, newNotes[i]);
@ -187,7 +194,13 @@ const reducer = (state = defaultState, action) => {
}
}
if (!found && ('parent_id' in modNote) && modNote.parent_id == state.selectedFolderId) newNotes.push(modNote);
// Note was not found - if the current folder is the same as the note folder,
// add it to it.
if (!found) {
if (noteIsInFolder(modNote, state.selectedFolderId)) {
newNotes.push(modNote);
}
}
newNotes = Note.sortNotes(newNotes, state.notesOrder, newState.settings.uncompletedTodosOnTop);
newState = Object.assign({}, state);