Merge branch 'dev' into spell-check

laurent22 · Nov 14, 2024 · 3a49e64 · 3a49e64
2 parents 26d3a9e + 11b3347
commit 3a49e64
Show file tree

Hide file tree

Showing 15 changed files with 1,972 additions and 1,386 deletions.
diff --git a/packages/app-desktop/gui/NoteEditor/utils/useDropHandler.ts b/packages/app-desktop/gui/NoteEditor/utils/useDropHandler.ts
@@ -2,6 +2,7 @@ import { useCallback } from 'react';
 import Note from '@joplin/lib/models/Note';
 import { DragEvent as ReactDragEvent } from 'react';
 import { DropCommandValue } from './types';
+import { webUtils } from 'electron';
 
 interface HookDependencies {
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
@@ -56,8 +57,9 @@ export default function useDropHandler(dependencies: HookDependencies): DropHand
 			const paths = [];
 			for (let i = 0; i < files.length; i++) {
 				const file = files[i];
-				if (!file.path) continue;
-				paths.push(file.path);
+				const path = webUtils.getPathForFile(file);
+				if (!path) continue;
+				paths.push(path);
 			}
 
 			const props: DropCommandValue = {

diff --git a/packages/app-desktop/integration-tests/models/MainScreen.ts b/packages/app-desktop/integration-tests/models/MainScreen.ts
@@ -33,9 +33,14 @@ export default class MainScreen {
 	public async createNewNote(title: string) {
 		await this.waitFor();
 
-		await this.newNoteButton.click();
-		await expect(this.noteEditor.noteTitleInput).toHaveValue('');
-		await expect(this.noteEditor.noteTitleInput).toHaveJSProperty('placeholder', 'Creating new note...');
+		// Create the new note. Retry this -- creating new notes can sometimes fail if done just after
+		// application startup.
+		await expect.poll(async () => {
+			await this.newNoteButton.click();
+			await expect(this.noteEditor.noteTitleInput).toHaveValue('', { timeout: 4_000 });
+			await expect(this.noteEditor.noteTitleInput).toHaveJSProperty('placeholder', 'Creating new note...', { timeout: 4_000 });
+			return true;
+		}, { timeout: 10_000 }).toBe(true);
 
 		// Fill the title
 		await this.noteEditor.noteTitleInput.click();

diff --git a/packages/app-mobile/components/screens/Note.tsx b/packages/app-mobile/components/screens/Note.tsx
@@ -235,7 +235,6 @@ class NoteScreenComponent extends BaseScreenComponent<Props, State> implements B
 				Keyboard.dismiss();
 
 				this.setState({
-					note: { ...this.state.lastSavedNote },
 					mode: 'view',
 				});
 

diff --git a/packages/app-mobile/pluginAssets/index.js b/packages/app-mobile/pluginAssets/index.js
diff --git a/packages/app-mobile/pluginAssets/index.web.js b/packages/app-mobile/pluginAssets/index.web.js
diff --git a/packages/app-mobile/pluginAssets/mermaid/mermaid.min.js.base64.js b/packages/app-mobile/pluginAssets/mermaid/mermaid.min.js.base64.js
diff --git a/packages/lib/Synchronizer.ts b/packages/lib/Synchronizer.ts
@@ -131,7 +131,6 @@ export default class Synchronizer {
 	public lockHandler() {
 		if (this.lockHandler_) return this.lockHandler_;
 		this.lockHandler_ = new LockHandler(this.api());
-		this.lockHandler_.enabled = Setting.value('featureFlag.syncLockEnabled');
 		return this.lockHandler_;
 	}
 

diff --git a/packages/lib/components/shared/note-screen-shared.ts b/packages/lib/components/shared/note-screen-shared.ts
@@ -153,7 +153,7 @@ shared.saveNoteButton_press = async function(comp: BaseNoteScreenComponent, fold
 
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	const newState: any = {
-		lastSavedNote: { ...note },
+		lastSavedNote: { ...note, ...savedNote },
 		note: note,
 	};
 

diff --git a/packages/lib/models/settings/builtInMetadata.ts b/packages/lib/models/settings/builtInMetadata.ts
@@ -1610,17 +1610,6 @@ const builtInMetadata = (Setting: typeof SettingType) => {
 			isGlobal: true,
 		},
 
-		'featureFlag.syncLockEnabled': {
-			value: true,
-			type: SettingItemType.Bool,
-			public: true,
-			storage: SettingStorage.File,
-			label: () => 'Enable sync locks',
-			description: () => 'This is an experimental setting to disable sync locks',
-			section: 'sync',
-			isGlobal: true,
-		},
-
 		'featureFlag.linuxKeychain': {
 			value: false,
 			type: SettingItemType.Bool,

diff --git a/packages/lib/services/synchronizer/LockHandler.ts b/packages/lib/services/synchronizer/LockHandler.ts
@@ -150,7 +150,7 @@ export default class LockHandler {
 	private refreshTimers_: RefreshTimers = {};
 	private autoRefreshInterval_: number = 1000 * 60;
 	private lockTtl_: number = defaultLockTtl;
-	private enabled_ = true;
+	private enabled_ = false;
 
 	public constructor(api: FileApi, options: LockHandlerOptions = null) {
 		if (!options) options = {};
@@ -206,6 +206,8 @@ export default class LockHandler {
 	public async locks(lockType: LockType = null): Promise<Lock[]> {
 		if (!this.enabled) return [];
 
+		if (this.enabled) throw new Error('Lock handler is enabled');
+
 		if (this.useBuiltInLocks) {
 			const locks = (await this.api_.listLocks()).items;
 			return locks;
@@ -227,6 +229,8 @@ export default class LockHandler {
 	}
 
 	private async saveLock(lock: Lock) {
+		if (!this.enabled) return;
+		if (this.enabled) throw new Error('Lock handler is enabled');
 		await this.api_.put(this.lockFilePath(lock), JSON.stringify(lock));
 	}
 
@@ -285,6 +289,10 @@ export default class LockHandler {
 	}
 
 	private async acquireExclusiveLock(clientType: LockClientType, clientId: string, options: AcquireLockOptions = null): Promise<Lock> {
+		if (!this.enabled) return nullLock();
+
+		if (this.enabled) throw new Error('Lock handler is enabled');
+
 		if (this.useBuiltInLocks) return this.api_.acquireLock(LockType.Exclusive, clientType, clientId);
 
 		// The logic to acquire an exclusive lock, while avoiding race conditions is as follow:
@@ -375,6 +383,8 @@ export default class LockHandler {
 	public startAutoLockRefresh(lock: Lock, errorHandler: Function): string {
 		if (!this.enabled) return '';
 
+		if (this.enabled) throw new Error('Lock handler is enabled');
+
 		const handle = this.autoLockRefreshHandle(lock);
 		if (this.refreshTimers_[handle]) {
 			throw new Error(`There is already a timer refreshing this lock: ${handle}`);
@@ -434,6 +444,8 @@ export default class LockHandler {
 	public stopAutoLockRefresh(lock: Lock) {
 		if (!this.enabled) return;
 
+		if (this.enabled) throw new Error('Lock handler is enabled');
+
 		const handle = this.autoLockRefreshHandle(lock);
 		if (!this.refreshTimers_[handle]) {
 			// Should not throw an error because lock may have been cleared in startAutoLockRefresh
@@ -449,6 +461,8 @@ export default class LockHandler {
 	public async acquireLock(lockType: LockType, clientType: LockClientType, clientId: string, options: AcquireLockOptions = null): Promise<Lock> {
 		if (!this.enabled) return nullLock();
 
+		if (this.enabled) throw new Error('Lock handler is enabled');
+
 		options = {
 			...defaultAcquireLockOptions(),
 			...options,
@@ -466,6 +480,8 @@ export default class LockHandler {
 	public async releaseLock(lockType: LockType, clientType: LockClientType, clientId: string) {
 		if (!this.enabled) return;
 
+		if (this.enabled) throw new Error('Lock handler is enabled');
+
 		if (this.useBuiltInLocks) {
 			await this.api_.releaseLock(lockType, clientType, clientId);
 			return;