mirror of
https://github.com/laurent22/joplin.git
synced 2024-11-24 08:12:24 +02:00
Fixing merge issue...
This reverts commit d049b8846c
.
This commit is contained in:
parent
d049b8846c
commit
9e66219690
@ -1,138 +0,0 @@
|
|||||||
require('app-module-path').addPath(__dirname);
|
|
||||||
const { asyncTest, id, ids, createNTestFolders, createNTestNotes, TestApp } = require('test-utils.js');
|
|
||||||
|
|
||||||
const { time } = require('lib/time-utils.js');
|
|
||||||
|
|
||||||
|
|
||||||
let testApp = null;
|
|
||||||
|
|
||||||
const goBackWard = (state) => {
|
|
||||||
let lastItem = state.backwardHistoryNotes[state.backwardHistoryNotes.length - 1];
|
|
||||||
testApp.dispatch({ type: 'FOLDER_AND_NOTE_SELECT', noteId: lastItem.id, folderId: lastItem.parent_id, historyAction: 'pop' });
|
|
||||||
};
|
|
||||||
|
|
||||||
const goForward = (state) => {
|
|
||||||
let lastItem = state.forwardHistoryNotes[state.forwardHistoryNotes.length - 1];
|
|
||||||
testApp.dispatch({ type: 'FOLDER_AND_NOTE_SELECT', noteId: lastItem.id, folderId: lastItem.parent_id, historyAction: 'push' });
|
|
||||||
};
|
|
||||||
|
|
||||||
describe('integration_ForwardBackwardNoteHistory', function() {
|
|
||||||
|
|
||||||
beforeEach(async (done) => {
|
|
||||||
testApp = new TestApp();
|
|
||||||
await testApp.start(['--no-welcome']);
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(async (done) => {
|
|
||||||
if (testApp !== null) await testApp.destroy();
|
|
||||||
testApp = null;
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should save history when navigating through notes', asyncTest(async () => {
|
|
||||||
// setup
|
|
||||||
let folders = await createNTestFolders(2);
|
|
||||||
await time.msleep(100);
|
|
||||||
let notes0 = await createNTestNotes(5, folders[0]);
|
|
||||||
// let notes1 = await createNTestNotes(5, folders[1]);
|
|
||||||
await time.msleep(100);
|
|
||||||
|
|
||||||
testApp.dispatch({ type: 'FOLDER_SELECT', id: id(folders[0]) });
|
|
||||||
await time.msleep(100);
|
|
||||||
|
|
||||||
let state = testApp.store().getState();
|
|
||||||
expect(state.backwardHistoryNotes).toEqual([]);
|
|
||||||
expect(state.forwardHistoryNotes).toEqual([]);
|
|
||||||
|
|
||||||
testApp.dispatch({ type: 'NOTE_SELECT', id: notes0[3].id, historyAction: 'goto' });
|
|
||||||
await time.msleep(100);
|
|
||||||
testApp.dispatch({ type: 'NOTE_SELECT', id: notes0[2].id, historyAction: 'goto' });
|
|
||||||
await time.msleep(100);
|
|
||||||
testApp.dispatch({ type: 'NOTE_SELECT', id: notes0[1].id, historyAction: 'goto' });
|
|
||||||
await time.msleep(100);
|
|
||||||
testApp.dispatch({ type: 'NOTE_SELECT', id: notes0[0].id, historyAction: 'goto' });
|
|
||||||
await time.msleep(100);
|
|
||||||
|
|
||||||
state = testApp.store().getState();
|
|
||||||
expect(ids(state.backwardHistoryNotes)).toEqual(ids([notes0[4], notes0[3], notes0[2], notes0[1]]));
|
|
||||||
expect(ids(state.forwardHistoryNotes)).toEqual([]);
|
|
||||||
|
|
||||||
goBackWard(state);
|
|
||||||
await time.msleep(100);
|
|
||||||
|
|
||||||
state = testApp.store().getState();
|
|
||||||
expect(ids(state.backwardHistoryNotes)).toEqual(ids([notes0[4], notes0[3], notes0[2]]));
|
|
||||||
expect(ids(state.forwardHistoryNotes)).toEqual(ids([notes0[0]]));
|
|
||||||
|
|
||||||
goBackWard(state);
|
|
||||||
await time.msleep(100);
|
|
||||||
|
|
||||||
state = testApp.store().getState();
|
|
||||||
expect(ids(state.backwardHistoryNotes)).toEqual(ids([notes0[4], notes0[3]]));
|
|
||||||
expect(ids(state.forwardHistoryNotes)).toEqual(ids([notes0[0], notes0[1]]));
|
|
||||||
|
|
||||||
goForward(state);
|
|
||||||
await time.msleep(100);
|
|
||||||
|
|
||||||
state = testApp.store().getState();
|
|
||||||
expect(ids(state.backwardHistoryNotes)).toEqual(ids([notes0[4], notes0[3], notes0[2]]));
|
|
||||||
expect(ids(state.forwardHistoryNotes)).toEqual(ids([notes0[0]]));
|
|
||||||
|
|
||||||
testApp.dispatch({ type: 'NOTE_SELECT', id: notes0[4].id, historyAction: 'goto' });
|
|
||||||
await time.msleep(100);
|
|
||||||
|
|
||||||
state = testApp.store().getState();
|
|
||||||
expect(ids(state.backwardHistoryNotes)).toEqual(ids([notes0[4], notes0[3], notes0[2], notes0[1]]));
|
|
||||||
expect(ids(state.forwardHistoryNotes)).toEqual([]);
|
|
||||||
|
|
||||||
|
|
||||||
}));
|
|
||||||
|
|
||||||
|
|
||||||
it('should save history when navigating through notebooks', asyncTest(async () => {
|
|
||||||
let folders = await createNTestFolders(2);
|
|
||||||
await time.msleep(100);
|
|
||||||
let notes0 = await createNTestNotes(5, folders[0]);
|
|
||||||
let notes1 = await createNTestNotes(5, folders[1]);
|
|
||||||
await time.msleep(100);
|
|
||||||
|
|
||||||
testApp.dispatch({ type: 'FOLDER_SELECT', id: id(folders[0]) });
|
|
||||||
await time.msleep(100);
|
|
||||||
|
|
||||||
let state = testApp.store().getState();
|
|
||||||
expect(state.backwardHistoryNotes).toEqual([]);
|
|
||||||
expect(state.forwardHistoryNotes).toEqual([]);
|
|
||||||
|
|
||||||
testApp.dispatch({ type: 'FOLDER_SELECT', id: id(folders[1]), historyAction: 'goto' });
|
|
||||||
await time.msleep(100);
|
|
||||||
|
|
||||||
state = testApp.store().getState();
|
|
||||||
expect(ids(state.backwardHistoryNotes)).toEqual(ids([notes0[4]])); // notes0[4] was last created
|
|
||||||
expect(ids(state.forwardHistoryNotes)).toEqual([]);
|
|
||||||
|
|
||||||
testApp.dispatch({ type: 'FOLDER_SELECT', id: id(folders[0]), historyAction: 'goto' });
|
|
||||||
await time.msleep(100);
|
|
||||||
|
|
||||||
state = testApp.store().getState();
|
|
||||||
expect(ids(state.backwardHistoryNotes)).toEqual(ids([notes0[4], notes1[4]]));
|
|
||||||
expect(state.forwardHistoryNotes).toEqual([]);
|
|
||||||
|
|
||||||
goBackWard(state);
|
|
||||||
await time.msleep(100);
|
|
||||||
|
|
||||||
state = testApp.store().getState();
|
|
||||||
expect(ids(state.backwardHistoryNotes)).toEqual(ids([notes0[4]]));
|
|
||||||
expect(ids(state.forwardHistoryNotes)).toEqual(ids([notes0[4]]));
|
|
||||||
|
|
||||||
goForward(state);
|
|
||||||
await time.msleep(100);
|
|
||||||
|
|
||||||
state = testApp.store().getState();
|
|
||||||
expect(ids(state.backwardHistoryNotes)).toEqual(ids([notes0[4], notes1[4]]));
|
|
||||||
expect(state.forwardHistoryNotes).toEqual([]);
|
|
||||||
|
|
||||||
|
|
||||||
}));
|
|
||||||
|
|
||||||
});
|
|
@ -36,41 +36,6 @@ function initTestState(folders, selectedFolderIndex, notes, selectedNoteIndexes,
|
|||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
||||||
function goToNote(notes, selectedNoteIndexes, state) {
|
|
||||||
if (selectedNoteIndexes != null) {
|
|
||||||
let selectedIds = [];
|
|
||||||
for (let i = 0; i < selectedNoteIndexes.length; i++) {
|
|
||||||
selectedIds.push(notes[selectedNoteIndexes[i]].id);
|
|
||||||
}
|
|
||||||
state = reducer(state, { type: 'NOTE_SELECT', ids: selectedIds, historyAction: 'goto' });
|
|
||||||
}
|
|
||||||
return state;
|
|
||||||
}
|
|
||||||
|
|
||||||
function goBackWard(state) {
|
|
||||||
if (!state.backwardHistoryNotes.length) return state;
|
|
||||||
const lastItem = state.backwardHistoryNotes[state.backwardHistoryNotes.length - 1];
|
|
||||||
state = reducer(state, {
|
|
||||||
type: 'FOLDER_AND_NOTE_SELECT',
|
|
||||||
noteId: lastItem.id ,
|
|
||||||
folderId: lastItem.parent_id ,
|
|
||||||
historyAction: 'pop',
|
|
||||||
});
|
|
||||||
return state;
|
|
||||||
}
|
|
||||||
|
|
||||||
function goForward(state) {
|
|
||||||
if (!state.forwardHistoryNotes.length) return state;
|
|
||||||
const nextItem = state.forwardHistoryNotes[state.forwardHistoryNotes.length - 1];
|
|
||||||
state = reducer(state, {
|
|
||||||
type: 'FOLDER_AND_NOTE_SELECT',
|
|
||||||
noteId: nextItem.id ,
|
|
||||||
folderId: nextItem.parent_id ,
|
|
||||||
historyAction: 'push',
|
|
||||||
});
|
|
||||||
return state;
|
|
||||||
}
|
|
||||||
|
|
||||||
function createExpectedState(items, keepIndexes, selectedIndexes) {
|
function createExpectedState(items, keepIndexes, selectedIndexes) {
|
||||||
const expected = { items: [], selectedIds: [] };
|
const expected = { items: [], selectedIds: [] };
|
||||||
|
|
||||||
@ -380,88 +345,4 @@ describe('Reducer', function() {
|
|||||||
expect(state.selectedNoteIds).toEqual(expected.selectedIds);
|
expect(state.selectedNoteIds).toEqual(expected.selectedIds);
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('should remove deleted note from history', asyncTest(async () => {
|
|
||||||
|
|
||||||
// create 1 folder
|
|
||||||
let folders = await createNTestFolders(1);
|
|
||||||
// create 5 notes
|
|
||||||
let notes = await createNTestNotes(5, folders[0]);
|
|
||||||
// select the 1st folder and the 1st note
|
|
||||||
let state = initTestState(folders, 0, notes, [0]);
|
|
||||||
|
|
||||||
// select second note
|
|
||||||
state = goToNote(notes, [1], state);
|
|
||||||
// select third note
|
|
||||||
state = goToNote(notes, [2], state);
|
|
||||||
// select fourth note
|
|
||||||
state = goToNote(notes, [3], state);
|
|
||||||
|
|
||||||
// expect history to contain first, second and third note
|
|
||||||
expect(state.backwardHistoryNotes.length).toEqual(3);
|
|
||||||
expect(getIds(state.backwardHistoryNotes)).toEqual(getIds(notes.slice(0, 3)));
|
|
||||||
|
|
||||||
// delete third note
|
|
||||||
state = reducer(state, { type: 'NOTE_DELETE', id: notes[2].id });
|
|
||||||
|
|
||||||
// expect history to not contain third note
|
|
||||||
expect(getIds(state.backwardHistoryNotes)).not.toContain(notes[2].id);
|
|
||||||
}));
|
|
||||||
|
|
||||||
it('should remove all notes of a deleted notebook from history', asyncTest(async () => {
|
|
||||||
let folders = await createNTestFolders(2);
|
|
||||||
let notes = [];
|
|
||||||
for (let i = 0; i < folders.length; i++) {
|
|
||||||
notes.push(...await createNTestNotes(3, folders[i]));
|
|
||||||
}
|
|
||||||
|
|
||||||
let state = initTestState(folders, 0, notes.slice(0,3), [0]);
|
|
||||||
state = goToNote(notes, [1], state);
|
|
||||||
state = goToNote(notes, [2], state);
|
|
||||||
|
|
||||||
|
|
||||||
// go to second folder
|
|
||||||
state = reducer(state, { type: 'FOLDER_SELECT', id: folders[1].id, historyAction: 'goto' });
|
|
||||||
expect(getIds(state.backwardHistoryNotes)).toEqual(getIds(notes.slice(0, 3)));
|
|
||||||
|
|
||||||
// delete the first folder
|
|
||||||
state = reducer(state, { type: 'FOLDER_DELETE', id: folders[0].id });
|
|
||||||
|
|
||||||
expect(getIds(state.backwardHistoryNotes)).toEqual([]);
|
|
||||||
}));
|
|
||||||
|
|
||||||
it('should maintain history correctly when going backward and forward', asyncTest(async () => {
|
|
||||||
let folders = await createNTestFolders(2);
|
|
||||||
let notes = [];
|
|
||||||
for (let i = 0; i < folders.length; i++) {
|
|
||||||
notes.push(...await createNTestNotes(5, folders[i]));
|
|
||||||
}
|
|
||||||
|
|
||||||
let state = initTestState(folders, 0, notes.slice(0,5), [0]);
|
|
||||||
state = goToNote(notes, [1], state);
|
|
||||||
state = goToNote(notes, [2], state);
|
|
||||||
state = goToNote(notes, [3], state);
|
|
||||||
state = goToNote(notes, [4], state);
|
|
||||||
|
|
||||||
expect(getIds(state.backwardHistoryNotes)).toEqual(getIds(notes.slice(0, 4)));
|
|
||||||
|
|
||||||
state = goBackWard(state);
|
|
||||||
expect(getIds(state.backwardHistoryNotes)).toEqual(getIds(notes.slice(0,3)));
|
|
||||||
expect(getIds(state.forwardHistoryNotes)).toEqual(getIds(notes.slice(4, 5)));
|
|
||||||
|
|
||||||
state = goBackWard(state);
|
|
||||||
expect(getIds(state.backwardHistoryNotes)).toEqual(getIds(notes.slice(0,2)));
|
|
||||||
// because we push the last seen note to stack.
|
|
||||||
expect(getIds(state.forwardHistoryNotes)).toEqual(getIds([notes[4], notes[3]]));
|
|
||||||
|
|
||||||
state = goForward(state);
|
|
||||||
expect(getIds(state.backwardHistoryNotes)).toEqual(getIds(notes.slice(0,3)));
|
|
||||||
expect(getIds(state.forwardHistoryNotes)).toEqual(getIds([notes[4]]));
|
|
||||||
|
|
||||||
state = goForward(state);
|
|
||||||
expect(getIds(state.backwardHistoryNotes)).toEqual(getIds(notes.slice(0,4)));
|
|
||||||
expect(getIds(state.forwardHistoryNotes)).toEqual([]);
|
|
||||||
}));
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
@ -146,7 +146,6 @@ class MainScreenComponent extends React.Component {
|
|||||||
this.props.dispatch({
|
this.props.dispatch({
|
||||||
type: 'FOLDER_SELECT',
|
type: 'FOLDER_SELECT',
|
||||||
id: folder.id,
|
id: folder.id,
|
||||||
historyAction: 'goto',
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -114,7 +114,6 @@ class NoteListComponent extends React.Component {
|
|||||||
this.props.dispatch({
|
this.props.dispatch({
|
||||||
type: 'NOTE_SELECT',
|
type: 'NOTE_SELECT',
|
||||||
id: item.id,
|
id: item.id,
|
||||||
historyAction: 'goto',
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -859,7 +859,10 @@ class NoteTextComponent extends React.Component {
|
|||||||
folderId: item.parent_id,
|
folderId: item.parent_id,
|
||||||
noteId: item.id,
|
noteId: item.id,
|
||||||
hash: resourceUrlInfo.hash,
|
hash: resourceUrlInfo.hash,
|
||||||
historyAction: 'goto',
|
historyNoteAction: {
|
||||||
|
id: this.state.note.id,
|
||||||
|
parent_id: this.state.note.parent_id,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
throw new Error(`Unsupported item type: ${item.type_}`);
|
throw new Error(`Unsupported item type: ${item.type_}`);
|
||||||
@ -1682,39 +1685,24 @@ class NoteTextComponent extends React.Component {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
toolbarItems.push({
|
if (this.props.historyNotes.length) {
|
||||||
tooltip: _('Back'),
|
toolbarItems.push({
|
||||||
iconName: 'fa-arrow-left',
|
tooltip: _('Back'),
|
||||||
enabled: (this.props.backwardHistoryNotes.length > 0),
|
iconName: 'fa-arrow-left',
|
||||||
onClick: () => {
|
onClick: () => {
|
||||||
if (!this.props.backwardHistoryNotes.length) return;
|
if (!this.props.historyNotes.length) return;
|
||||||
const lastItem = this.props.backwardHistoryNotes[this.props.backwardHistoryNotes.length - 1];
|
|
||||||
this.props.dispatch({
|
|
||||||
type: 'FOLDER_AND_NOTE_SELECT',
|
|
||||||
folderId: lastItem.parent_id,
|
|
||||||
noteId: lastItem.id,
|
|
||||||
|
|
||||||
historyAction: 'pop',
|
const lastItem = this.props.historyNotes[this.props.historyNotes.length - 1];
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
toolbarItems.push({
|
this.props.dispatch({
|
||||||
tooltip: _('Front'),
|
type: 'FOLDER_AND_NOTE_SELECT',
|
||||||
iconName: 'fa-arrow-right',
|
folderId: lastItem.parent_id,
|
||||||
enabled: (this.props.forwardHistoryNotes.length > 0),
|
noteId: lastItem.id,
|
||||||
onClick: () => {
|
historyNoteAction: 'pop',
|
||||||
if (!this.props.forwardHistoryNotes.length) return;
|
});
|
||||||
const nextItem = this.props.forwardHistoryNotes[this.props.forwardHistoryNotes.length - 1];
|
},
|
||||||
this.props.dispatch({
|
});
|
||||||
type: 'FOLDER_AND_NOTE_SELECT',
|
}
|
||||||
folderId: nextItem.parent_id,
|
|
||||||
noteId: nextItem.id,
|
|
||||||
|
|
||||||
historyAction: 'push',
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (note.markup_language === MarkupToHtml.MARKUP_LANGUAGE_MARKDOWN && editorIsVisible) {
|
if (note.markup_language === MarkupToHtml.MARKUP_LANGUAGE_MARKDOWN && editorIsVisible) {
|
||||||
toolbarItems.push({
|
toolbarItems.push({
|
||||||
@ -2290,8 +2278,7 @@ const mapStateToProps = state => {
|
|||||||
watchedNoteFiles: state.watchedNoteFiles,
|
watchedNoteFiles: state.watchedNoteFiles,
|
||||||
customCss: state.customCss,
|
customCss: state.customCss,
|
||||||
lastEditorScrollPercents: state.lastEditorScrollPercents,
|
lastEditorScrollPercents: state.lastEditorScrollPercents,
|
||||||
backwardHistoryNotes: state.backwardHistoryNotes,
|
historyNotes: state.historyNotes,
|
||||||
forwardHistoryNotes: state.forwardHistoryNotes,
|
|
||||||
templates: state.templates,
|
templates: state.templates,
|
||||||
provisionalNoteIds: state.provisionalNoteIds,
|
provisionalNoteIds: state.provisionalNoteIds,
|
||||||
};
|
};
|
||||||
|
@ -413,7 +413,6 @@ class SideBarComponent extends React.Component {
|
|||||||
this.props.dispatch({
|
this.props.dispatch({
|
||||||
type: 'FOLDER_SELECT',
|
type: 'FOLDER_SELECT',
|
||||||
id: folder ? folder.id : null,
|
id: folder ? folder.id : null,
|
||||||
historyAction: 'goto',
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -218,7 +218,6 @@ class Dialog extends React.PureComponent {
|
|||||||
type: 'FOLDER_AND_NOTE_SELECT',
|
type: 'FOLDER_AND_NOTE_SELECT',
|
||||||
folderId: item.parent_id,
|
folderId: item.parent_id,
|
||||||
noteId: item.id,
|
noteId: item.id,
|
||||||
historyAction: 'goto',
|
|
||||||
});
|
});
|
||||||
} else if (this.state.listType === BaseModel.TYPE_TAG) {
|
} else if (this.state.listType === BaseModel.TYPE_TAG) {
|
||||||
this.props.dispatch({
|
this.props.dispatch({
|
||||||
@ -229,7 +228,6 @@ class Dialog extends React.PureComponent {
|
|||||||
this.props.dispatch({
|
this.props.dispatch({
|
||||||
type: 'FOLDER_SELECT',
|
type: 'FOLDER_SELECT',
|
||||||
id: item.id,
|
id: item.id,
|
||||||
historyAction: 'goto',
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -49,8 +49,7 @@ const defaultState = {
|
|||||||
resourceFetcher: {
|
resourceFetcher: {
|
||||||
toFetchCount: 0,
|
toFetchCount: 0,
|
||||||
},
|
},
|
||||||
backwardHistoryNotes: [],
|
historyNotes: [],
|
||||||
forwardHistoryNotes: [],
|
|
||||||
plugins: {},
|
plugins: {},
|
||||||
provisionalNoteIds: [],
|
provisionalNoteIds: [],
|
||||||
editorNoteStatuses: {},
|
editorNoteStatuses: {},
|
||||||
@ -105,20 +104,6 @@ stateUtils.lastSelectedNoteIds = function(state) {
|
|||||||
return output ? output : [];
|
return output ? output : [];
|
||||||
};
|
};
|
||||||
|
|
||||||
stateUtils.getLastSeenNote = function(state) {
|
|
||||||
const selectedNoteIds = state.selectedNoteIds;
|
|
||||||
const notes = state.notes;
|
|
||||||
if (selectedNoteIds != null && selectedNoteIds.length>0) {
|
|
||||||
const currNote = notes.find(note => note.id === selectedNoteIds[0]);
|
|
||||||
if (currNote != null) {
|
|
||||||
return {
|
|
||||||
id: currNote.id,
|
|
||||||
parent_id: currNote.parent_id,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
function arrayHasEncryptedItems(array) {
|
function arrayHasEncryptedItems(array) {
|
||||||
for (let i = 0; i < array.length; i++) {
|
for (let i = 0; i < array.length; i++) {
|
||||||
if (array[i].encryption_applied) return true;
|
if (array[i].encryption_applied) return true;
|
||||||
@ -209,15 +194,6 @@ function handleItemDelete(state, action) {
|
|||||||
const newState = Object.assign({}, state);
|
const newState = Object.assign({}, state);
|
||||||
newState[listKey] = newItems;
|
newState[listKey] = newItems;
|
||||||
|
|
||||||
if (listKey === 'notes') {
|
|
||||||
newState.backwardHistoryNotes = newState.backwardHistoryNotes.filter(note => note.id != action.id);
|
|
||||||
newState.forwardHistoryNotes = newState.forwardHistoryNotes.filter(note => note.id != action.id);
|
|
||||||
}
|
|
||||||
if (listKey === 'folders') {
|
|
||||||
newState.backwardHistoryNotes = newState.backwardHistoryNotes.filter(note => note.parent_id != action.id);
|
|
||||||
newState.forwardHistoryNotes = newState.forwardHistoryNotes.filter(note => note.parent_id != action.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
const newIds = [];
|
const newIds = [];
|
||||||
for (let i = 0; i < newSelectedIndexes.length; i++) {
|
for (let i = 0; i < newSelectedIndexes.length; i++) {
|
||||||
newIds.push(newItems[newSelectedIndexes[i]].id);
|
newIds.push(newItems[newSelectedIndexes[i]].id);
|
||||||
@ -277,25 +253,9 @@ function defaultNotesParentType(state, exclusion) {
|
|||||||
|
|
||||||
function changeSelectedFolder(state, action, options = null) {
|
function changeSelectedFolder(state, action, options = null) {
|
||||||
if (!options) options = {};
|
if (!options) options = {};
|
||||||
|
if (!('clearNoteHistory' in options)) options.clearNoteHistory = true;
|
||||||
|
|
||||||
let newState = Object.assign({}, state);
|
const newState = Object.assign({}, state);
|
||||||
|
|
||||||
// Save the last seen note so that back will return to it.
|
|
||||||
if (action.type === 'FOLDER_SELECT' && action.historyAction == 'goto') {
|
|
||||||
const backwardHistoryNotes = newState.backwardHistoryNotes.slice();
|
|
||||||
let forwardHistoryNotes = newState.forwardHistoryNotes.slice();
|
|
||||||
|
|
||||||
// Don't update history if going to the same note again.
|
|
||||||
const lastSeenNote = stateUtils.getLastSeenNote(state);
|
|
||||||
if (lastSeenNote != null && action.id != lastSeenNote.id) {
|
|
||||||
forwardHistoryNotes = [];
|
|
||||||
backwardHistoryNotes.push(Object.assign({}, lastSeenNote));
|
|
||||||
}
|
|
||||||
|
|
||||||
newState.backwardHistoryNotes = backwardHistoryNotes;
|
|
||||||
newState.forwardHistoryNotes = forwardHistoryNotes;
|
|
||||||
}
|
|
||||||
|
|
||||||
newState.selectedFolderId = 'folderId' in action ? action.folderId : action.id;
|
newState.selectedFolderId = 'folderId' in action ? action.folderId : action.id;
|
||||||
if (!newState.selectedFolderId) {
|
if (!newState.selectedFolderId) {
|
||||||
newState.notesParentType = defaultNotesParentType(state, 'Folder');
|
newState.notesParentType = defaultNotesParentType(state, 'Folder');
|
||||||
@ -305,6 +265,7 @@ function changeSelectedFolder(state, action, options = null) {
|
|||||||
|
|
||||||
if (newState.selectedFolderId === state.selectedFolderId && newState.notesParentType === state.notesParentType) return state;
|
if (newState.selectedFolderId === state.selectedFolderId && newState.notesParentType === state.notesParentType) return state;
|
||||||
|
|
||||||
|
if (options.clearNoteHistory) newState.historyNotes = [];
|
||||||
if (options.clearSelectedNoteIds) newState.selectedNoteIds = [];
|
if (options.clearSelectedNoteIds) newState.selectedNoteIds = [];
|
||||||
|
|
||||||
return newState;
|
return newState;
|
||||||
@ -324,6 +285,7 @@ function recordLastSelectedNoteIds(state, noteIds) {
|
|||||||
|
|
||||||
function changeSelectedNotes(state, action, options = null) {
|
function changeSelectedNotes(state, action, options = null) {
|
||||||
if (!options) options = {};
|
if (!options) options = {};
|
||||||
|
if (!('clearNoteHistory' in options)) options.clearNoteHistory = true;
|
||||||
|
|
||||||
let noteIds = [];
|
let noteIds = [];
|
||||||
if (action.id) noteIds = [action.id];
|
if (action.id) noteIds = [action.id];
|
||||||
@ -333,39 +295,9 @@ function changeSelectedNotes(state, action, options = null) {
|
|||||||
let newState = Object.assign({}, state);
|
let newState = Object.assign({}, state);
|
||||||
|
|
||||||
if (action.type === 'NOTE_SELECT') {
|
if (action.type === 'NOTE_SELECT') {
|
||||||
|
if (JSON.stringify(newState.selectedNoteIds) === JSON.stringify(noteIds)) return state;
|
||||||
newState.selectedNoteIds = noteIds;
|
newState.selectedNoteIds = noteIds;
|
||||||
newState.selectedNoteHash = action.hash ? action.hash : '';
|
newState.selectedNoteHash = action.hash ? action.hash : '';
|
||||||
|
|
||||||
let backwardHistoryNotes = newState.backwardHistoryNotes.slice();
|
|
||||||
let forwardHistoryNotes = newState.forwardHistoryNotes.slice();
|
|
||||||
|
|
||||||
// The historyAction property is only used for user-initiated actions and tells how
|
|
||||||
// the history stack should be handled. That property should not be present for
|
|
||||||
// programmatic navigation. Possible values are:
|
|
||||||
// - "goto": When going to a note, but not via the back/forward arrows.
|
|
||||||
// - "pop": When clicking on the Back arrow
|
|
||||||
// - "push": When clicking on the Forward arrow
|
|
||||||
const lastSeenNote = stateUtils.getLastSeenNote(state);
|
|
||||||
if (action.historyAction == 'goto' && lastSeenNote != null && action.id != lastSeenNote.id) {
|
|
||||||
forwardHistoryNotes = [];
|
|
||||||
backwardHistoryNotes.push(Object.assign({}, lastSeenNote));
|
|
||||||
} else if (action.historyAction === 'pop' && lastSeenNote != null) {
|
|
||||||
if (forwardHistoryNotes.length === 0 || lastSeenNote.id != forwardHistoryNotes[forwardHistoryNotes.length-1].id) {
|
|
||||||
forwardHistoryNotes.push(Object.assign({}, lastSeenNote));
|
|
||||||
}
|
|
||||||
backwardHistoryNotes.pop();
|
|
||||||
} else if (action.historyAction === 'push' && lastSeenNote != null) {
|
|
||||||
if (backwardHistoryNotes.length === 0 || lastSeenNote.id != backwardHistoryNotes[backwardHistoryNotes.length-1].id) {
|
|
||||||
backwardHistoryNotes.push(Object.assign({}, lastSeenNote));
|
|
||||||
}
|
|
||||||
forwardHistoryNotes.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
newState.backwardHistoryNotes = backwardHistoryNotes;
|
|
||||||
newState.forwardHistoryNotes = forwardHistoryNotes;
|
|
||||||
|
|
||||||
return newState;
|
|
||||||
|
|
||||||
} else if (action.type === 'NOTE_SELECT_ADD') {
|
} else if (action.type === 'NOTE_SELECT_ADD') {
|
||||||
if (!noteIds.length) return state;
|
if (!noteIds.length) return state;
|
||||||
newState.selectedNoteIds = ArrayUtils.unique(newState.selectedNoteIds.concat(noteIds));
|
newState.selectedNoteIds = ArrayUtils.unique(newState.selectedNoteIds.concat(noteIds));
|
||||||
@ -394,6 +326,8 @@ function changeSelectedNotes(state, action, options = null) {
|
|||||||
|
|
||||||
newState = recordLastSelectedNoteIds(newState, newState.selectedNoteIds);
|
newState = recordLastSelectedNoteIds(newState, newState.selectedNoteIds);
|
||||||
|
|
||||||
|
if (options.clearNoteHistory) newState.historyNotes = [];
|
||||||
|
|
||||||
return newState;
|
return newState;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -482,9 +416,24 @@ const reducer = (state = defaultState, action) => {
|
|||||||
|
|
||||||
case 'FOLDER_AND_NOTE_SELECT':
|
case 'FOLDER_AND_NOTE_SELECT':
|
||||||
{
|
{
|
||||||
newState = changeSelectedFolder(state, action);
|
newState = changeSelectedFolder(state, action, { clearNoteHistory: false });
|
||||||
const noteSelectAction = Object.assign({}, action, { type: 'NOTE_SELECT' });
|
const noteSelectAction = Object.assign({}, action, { type: 'NOTE_SELECT' });
|
||||||
newState = changeSelectedNotes(newState, noteSelectAction);
|
newState = changeSelectedNotes(newState, noteSelectAction, { clearNoteHistory: false });
|
||||||
|
|
||||||
|
if (action.historyNoteAction) {
|
||||||
|
const historyNotes = newState.historyNotes.slice();
|
||||||
|
if (typeof action.historyNoteAction === 'object') {
|
||||||
|
historyNotes.push(Object.assign({}, action.historyNoteAction));
|
||||||
|
} else if (action.historyNoteAction === 'pop') {
|
||||||
|
historyNotes.pop();
|
||||||
|
}
|
||||||
|
newState.historyNotes = historyNotes;
|
||||||
|
} else if (newState !== state) {
|
||||||
|
// Clear the note history if folder and selected note have actually been changed. For example
|
||||||
|
// they won't change if they are already selected. That way, the "Back" button to go to the
|
||||||
|
// previous note wll stay.
|
||||||
|
newState.historyNotes = [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -792,15 +741,6 @@ const reducer = (state = defaultState, action) => {
|
|||||||
} else {
|
} else {
|
||||||
newState.notesParentType = 'Search';
|
newState.notesParentType = 'Search';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update history when searching
|
|
||||||
var lastSeenNote = stateUtils.getLastSeenNote(state);
|
|
||||||
if (lastSeenNote != null && (state.backwardHistoryNotes.length === 0 ||
|
|
||||||
state.backwardHistoryNotes[state.backwardHistoryNotes.length-1].id != lastSeenNote.id)) {
|
|
||||||
newState.forwardHistoryNotes = [];
|
|
||||||
newState.backwardHistoryNotes.push(Object.assign({},lastSeenNote));
|
|
||||||
}
|
|
||||||
|
|
||||||
newState.selectedNoteIds = [];
|
newState.selectedNoteIds = [];
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user