self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-12-02 22:49:09 +02:00
Code Issues Releases Activity

Desktop: Multiple window support (#11181)

Browse Source 
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
This commit is contained in:
Henry Heino
2024-11-08 07:32:05 -08:00
committed by GitHub
parent cbef725cc8
commit 4a88d6ff7a
163 changed files with 3303 additions and 1475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
packages/lib/reducer.test.ts
View File

@@ -1,5 +1,5 @@
import { setupDatabaseAndSynchronizer, switchClient, createNTestNotes, createNTestFolders, createNTestTags } from './testing/test-utils';
import reducer, { defaultState, MAX_HISTORY, State } from './reducer';
import reducer, { defaultState, defaultWindowId, MAX_HISTORY, State } from './reducer';
import { BaseItemEntity, FolderEntity, NoteEntity, TagEntity } from './services/database/types';
import Note from './models/Note';
import BaseModel from './BaseModel';
@@ -73,6 +73,32 @@ function createExpectedState(items: BaseItemEntity[], keepIndexes: number[], sel
return expected;
}
const createBackgroundWindow = (state: State, windowId: string, selectedNote: NoteEntity, notes: NoteEntity[]) => {
state = reducer(state, {
type: 'WINDOW_OPEN',
windowId,
folderId: selectedNote.parent_id,
noteId: selectedNote.id,
});
const previousWindowId = state.windowId;
state = reducer(state, {
type: 'WINDOW_FOCUS',
windowId,
});
state = reducer(state, {
type: 'NOTE_UPDATE_ALL',
notes: notes,
notesSource: 'test',
});
state = reducer(state, {
type: 'WINDOW_FOCUS',
windowId: previousWindowId,
});
return state;
};
function getIds(items: BaseItemEntity[], indexes: number[]|null = null) {
const ids = [];
for (let i = 0; i < items.length; i++) {
@@ -256,6 +282,30 @@ describe('reducer', () => {
expect(state.selectedNoteIds).toEqual(expected.selectedIds);
}));
it('should delete notes from background window states', (async () => {
const folders = await createNTestFolders(1);
const notes = await createNTestNotes(5, folders[0]);
let state = initTestState(folders, 0, notes, [0, 2, 4]);
const backgroundWindowId = 'window1';
state = createBackgroundWindow(state, backgroundWindowId, notes[2], notes);
state = reducer(state, { type: 'NOTE_DELETE', id: notes[2].id });
state = reducer(state, { type: 'NOTE_DELETE', id: notes[0].id });
let expected = createExpectedState(notes, [1, 3, 4], [1]);
expect(getIds(state.notes)).toEqual(getIds(expected.items));
expect(state.selectedNoteIds).toEqual(expected.selectedIds);
state = reducer(state, {
type: 'WINDOW_FOCUS',
windowId: backgroundWindowId,
});
expected = createExpectedState(notes, [1, 3, 4], [3]);
expect(getIds(state.notes)).toEqual(getIds(expected.items));
expect(state.selectedNoteIds).toEqual(expected.selectedIds);
}));
// tests for FOLDER_DELETE
it('should delete selected notebook', (async () => {
const folders = await createNTestFolders(5);
@@ -389,6 +439,30 @@ describe('reducer', () => {
expect(getIds(state.backwardHistoryNotes)).not.toContain(notes[2].id);
}));
it('should remove deleted note from history in background window', async () => {
const folders = await createNTestFolders(1);
const notes = await createNTestNotes(5, folders[0]);
let state = initTestState(folders, 0, notes, [0]);
const windowId1 = 'window1';
state = createBackgroundWindow(state, windowId1, notes[0], notes);
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([notes[0].id, notes[1].id, notes[2].id, notes[3].id]);
// Remove a note in another window
state = reducer(state, { type: 'WINDOW_FOCUS', windowId: windowId1 });
state = reducer(state, { type: 'NOTE_DELETE', id: notes[2].id });
state = reducer(state, { type: 'WINDOW_FOCUS', windowId: defaultWindowId });
// should have removed the note from history in the unfocused window
expect(getIds(state.backwardHistoryNotes)).toEqual([notes[0].id, notes[1].id, notes[3].id]);
});
it('should remove all notes of a deleted notebook from history', (async () => {
const folders = await createNTestFolders(2);
const notes = [];
@@ -668,4 +742,45 @@ describe('reducer', () => {
expect(state.notes.every(n => n.id !== notes[0].id)).toBe(true);
expect(state.selectedFolderId).toBe(folders[0].id);
});
// window tests
test('switching windows should move state from background to the foreground', async () => {
const folders = await createNTestFolders(2);
const notes1 = await createNTestNotes(3, folders[0]);
const noteIds1 = getIds(notes1);
const notes2 = await createNTestNotes(4, folders[1]);
const noteIds2 = getIds(notes2);
let state = initTestState(folders, 0, notes1, [0]);
const window1Id = 'window1';
const window2Id = 'window2';
state = createBackgroundWindow(state, window1Id, notes1[2], notes1);
state = createBackgroundWindow(state, window2Id, notes2[1], notes2);
const checkCurrentState = (windowId: string) => {
expect(state.windowId).toBe(windowId);
expect(getIds(state.notes)).toEqual(windowId === window2Id ? noteIds2 : noteIds1);
expect(state.selectedFolderId).toBe(windowId === window2Id ? folders[1].id : folders[0].id);
let expectedSelectedNoteIds = [notes1[0].id];
if (windowId === window2Id) {
expectedSelectedNoteIds = [notes2[1].id];
} else if (windowId === window1Id) {
expectedSelectedNoteIds = [notes1[2].id];
}
expect(state.selectedNoteIds).toEqual(expectedSelectedNoteIds);
};
const navigationPattern = [
window1Id, window2Id, defaultWindowId, defaultWindowId, window2Id, window1Id, defaultWindowId,
];
for (const windowId of navigationPattern) {
state = reducer(state, {
type: 'WINDOW_FOCUS',
windowId,
});
checkCurrentState(windowId);
}
});
});