Desktop: Made the same spellcheck languages more specific in the titl…

…e bar

- Fixed the issue laurent22#7834

- added "spellCheckerMenu.test.ts" to test the changes and the expected behavior: all passed!

- added jest.mock in "jest.setup.js" to mock the Menu from @electron/remote.

-  modified "buildScriptIndexes" to ignore ".test.ts" files so it does not include them in index.ts. That caused some issues with duplicate identifiers and more errors.

.eslintignore

@@ -230,6 +230,7 @@ packages/app-desktop/gui/MainScreen/commands/showNoteProperties.js
 packages/app-desktop/gui/MainScreen/commands/showPrompt.js
 packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.js
 packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.js
+packages/app-desktop/gui/MainScreen/commands/showSpellCheckerMenu.test.js
 packages/app-desktop/gui/MainScreen/commands/showSpellCheckerMenu.js
 packages/app-desktop/gui/MainScreen/commands/toggleEditors.js
 packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js

.gitignore

@@ -210,6 +210,7 @@ packages/app-desktop/gui/MainScreen/commands/showNoteProperties.js
 packages/app-desktop/gui/MainScreen/commands/showPrompt.js
 packages/app-desktop/gui/MainScreen/commands/showShareFolderDialog.js
 packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.js
+packages/app-desktop/gui/MainScreen/commands/showSpellCheckerMenu.test.js
 packages/app-desktop/gui/MainScreen/commands/showSpellCheckerMenu.js
 packages/app-desktop/gui/MainScreen/commands/toggleEditors.js
 packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js

package.json

@@ -97,7 +97,8 @@
     "eslint-plugin-github": "4.10.1",
     "http-server": "14.1.1",
     "node-gyp": "9.4.1",
-    "nodemon": "3.0.3"
+    "nodemon": "3.0.3",
+    "sharp": "0.33.2"
   },
   "packageManager": "yarn@3.6.4",
   "resolutions": {

packages/app-desktop/gui/MainScreen/commands/showSpellCheckerMenu.test.ts

@@ -0,0 +1,40 @@
+import { runtime } from './showSpellCheckerMenu';
+import { AppState } from '../../../app.reducer';
+
+describe('mapStateTotitle', () => {
+
+	test('should return null if spellchecker.enabled is false', () => {
+
+		const mockState: Partial<AppState> = {
+			settings: {
+				'spellChecker.enabled': false,
+				'spellChecker.languages': ['en-GB'],
+			},
+		};
+		const result = runtime().mapStateToTitle(mockState);
+		expect(result).toBeNull();
+	});
+
+	test('should return null if spellChecker.languages is empty', () => {
+		const mockState: Partial<AppState> = {
+			settings: {
+				'spellChecker.enabled': true,
+				'spellChecker.languages': [],
+			},
+		};
+		const result = runtime().mapStateToTitle(mockState);
+		expect(result).toBeNull();
+	});
+
+	test('should return list of countryDisplayName with correct format', () => {
+		const mockState: Partial<AppState> = {
+			settings: {
+				'spellChecker.enabled': true,
+				'spellChecker.languages': ['en-GB', 'en-US', 'en-CA', 'es-ES', 'es-MX'],
+			},
+		};
+		const result = runtime().mapStateToTitle(mockState);
+		expect(result).toBe('en-GB, en-US, en-CA, es-ES, es-MX');
+
+	});
+});

packages/app-desktop/gui/MainScreen/commands/showSpellCheckerMenu.ts

@@ -30,8 +30,9 @@ export const runtime = (): CommandRuntime => {
 			const s: string[] = [];
 			// eslint-disable-next-line github/array-foreach -- Old code before rule was applied
 			languages.forEach((language: string) => {
-				s.push(language.split('-')[0]);
+				s.push(language);
 			});
+
 			return s.join(', ');
 		},
 	};

packages/app-desktop/jest.setup.js

@@ -22,6 +22,18 @@ jest.mock('@electron/remote', () => {
 	};
 });
 
+// Mocking bridge().Menu for showSpellCheckerMenu.test.ts
+jest.mock('./services/bridge', () => ({
+	__esModule: true,
+	default: () => ({
+		Menu: {
+			buildFromTemplate: jest.fn().mockReturnValue({
+				popup: jest.fn(),
+			}),
+		},
+	}),
+}));
+
 // Import after mocking problematic libraries
 const { afterEachCleanUp, afterAllCleanUp } = require('@joplin/lib/testing/test-utils.js');
 

packages/tools/gulp/tasks/buildScriptIndexes.js

@@ -12,7 +12,7 @@ async function processDirectory(dir, indexFilePath = null, typeScriptType = null
 
 	const tsFiles = glob.sync('{**/*.ts,**/*.tsx}', {
 		cwd: dir,
-	}).filter(f => `${dir}/${f}` !== indexFilePath);
+	}).filter(f => `${dir}/${f}` !== indexFilePath && !f.endsWith('.test.ts'));
 
 	tsFiles.sort();
 

yarn.lock

@@ -37327,6 +37327,7 @@ __metadata:
     node-gyp: 9.4.1
     nodemon: 3.0.3
     npm-package-json-lint: 7.1.0
+    sharp: ^0.33.2
     typescript: 5.2.2
   languageName: unknown
   linkType: soft
@@ -38055,7 +38056,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sharp@npm:0.33.2":
+"sharp@npm:0.33.2, sharp@npm:^0.33.2":
   version: 0.33.2
   resolution: "sharp@npm:0.33.2"
   dependencies: