Per-Notebook Sort Order is refactored.

- renames commands and their labels:
	- notesSortOrderSwitch ->  toggleNotesSortOrderField
    - notesSortOrderToggleReverse -> toggleNotesSortOrderReverse
    - perFolderSortOrderSwitch -> togglePerFolderSortOrder
- moves the most of the commands' body to higher-layer services to clean-up module dependencies.
	- app-desktop/services/sortOrder/notesSortOrderUtils.ts
	- app-desktop/services/sortOrder/PerFolderSortOrderService.ts
- PerFolderSortOrderService is initialized in app.ts/start().

.eslintignore

@@ -268,12 +268,6 @@ packages/app-desktop/gui/MainScreen/commands/newSubFolder.js.map
 packages/app-desktop/gui/MainScreen/commands/newTodo.d.ts
 packages/app-desktop/gui/MainScreen/commands/newTodo.js
 packages/app-desktop/gui/MainScreen/commands/newTodo.js.map
-packages/app-desktop/gui/MainScreen/commands/notesSortOrderSwitch.d.ts
-packages/app-desktop/gui/MainScreen/commands/notesSortOrderSwitch.js
-packages/app-desktop/gui/MainScreen/commands/notesSortOrderSwitch.js.map
-packages/app-desktop/gui/MainScreen/commands/notesSortOrderToggleReverse.d.ts
-packages/app-desktop/gui/MainScreen/commands/notesSortOrderToggleReverse.js
-packages/app-desktop/gui/MainScreen/commands/notesSortOrderToggleReverse.js.map
 packages/app-desktop/gui/MainScreen/commands/openFolder.d.ts
 packages/app-desktop/gui/MainScreen/commands/openFolder.js
 packages/app-desktop/gui/MainScreen/commands/openFolder.js.map
@@ -283,9 +277,6 @@ packages/app-desktop/gui/MainScreen/commands/openNote.js.map
 packages/app-desktop/gui/MainScreen/commands/openTag.d.ts
 packages/app-desktop/gui/MainScreen/commands/openTag.js
 packages/app-desktop/gui/MainScreen/commands/openTag.js.map
-packages/app-desktop/gui/MainScreen/commands/perFolderSortOrder.d.ts
-packages/app-desktop/gui/MainScreen/commands/perFolderSortOrder.js
-packages/app-desktop/gui/MainScreen/commands/perFolderSortOrder.js.map
 packages/app-desktop/gui/MainScreen/commands/print.d.ts
 packages/app-desktop/gui/MainScreen/commands/print.js
 packages/app-desktop/gui/MainScreen/commands/print.js.map
@@ -331,6 +322,15 @@ packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js.map
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.d.ts
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js.map
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.d.ts
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js.map
+packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.d.ts
+packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js
+packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js.map
@@ -724,6 +724,12 @@ packages/app-desktop/services/plugins/hooks/useViewIsReady.js.map
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.d.ts
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js.map
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.d.ts
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js.map
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.d.ts
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.js
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.js.map
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map

.gitignore

@@ -253,12 +253,6 @@ packages/app-desktop/gui/MainScreen/commands/newSubFolder.js.map
 packages/app-desktop/gui/MainScreen/commands/newTodo.d.ts
 packages/app-desktop/gui/MainScreen/commands/newTodo.js
 packages/app-desktop/gui/MainScreen/commands/newTodo.js.map
-packages/app-desktop/gui/MainScreen/commands/notesSortOrderSwitch.d.ts
-packages/app-desktop/gui/MainScreen/commands/notesSortOrderSwitch.js
-packages/app-desktop/gui/MainScreen/commands/notesSortOrderSwitch.js.map
-packages/app-desktop/gui/MainScreen/commands/notesSortOrderToggleReverse.d.ts
-packages/app-desktop/gui/MainScreen/commands/notesSortOrderToggleReverse.js
-packages/app-desktop/gui/MainScreen/commands/notesSortOrderToggleReverse.js.map
 packages/app-desktop/gui/MainScreen/commands/openFolder.d.ts
 packages/app-desktop/gui/MainScreen/commands/openFolder.js
 packages/app-desktop/gui/MainScreen/commands/openFolder.js.map
@@ -268,9 +262,6 @@ packages/app-desktop/gui/MainScreen/commands/openNote.js.map
 packages/app-desktop/gui/MainScreen/commands/openTag.d.ts
 packages/app-desktop/gui/MainScreen/commands/openTag.js
 packages/app-desktop/gui/MainScreen/commands/openTag.js.map
-packages/app-desktop/gui/MainScreen/commands/perFolderSortOrder.d.ts
-packages/app-desktop/gui/MainScreen/commands/perFolderSortOrder.js
-packages/app-desktop/gui/MainScreen/commands/perFolderSortOrder.js.map
 packages/app-desktop/gui/MainScreen/commands/print.d.ts
 packages/app-desktop/gui/MainScreen/commands/print.js
 packages/app-desktop/gui/MainScreen/commands/print.js.map
@@ -316,6 +307,15 @@ packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js
 packages/app-desktop/gui/MainScreen/commands/toggleNoteList.js.map
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.d.ts
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderField.js.map
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.d.ts
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js
+packages/app-desktop/gui/MainScreen/commands/toggleNotesSortOrderReverse.js.map
+packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.d.ts
+packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js
+packages/app-desktop/gui/MainScreen/commands/togglePerFolderSortOrder.js.map
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.d.ts
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js
 packages/app-desktop/gui/MainScreen/commands/toggleSideBar.js.map
@@ -709,6 +709,12 @@ packages/app-desktop/services/plugins/hooks/useViewIsReady.js.map
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.d.ts
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js
 packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js.map
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.d.ts
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js
+packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js.map
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.d.ts
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.js
+packages/app-desktop/services/sortOrder/notesSortOrderUtils.js.map
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.d.ts
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js.map

packages/app-desktop/app.ts

@@ -59,6 +59,7 @@ import editorCommandDeclarations from './gui/NoteEditor/editorCommandDeclaration
 import ShareService from '@joplin/lib/services/share/ShareService';
 import checkForUpdates from './checkForUpdates';
 import { AppState } from './app.reducer';
+import PerFolderSortOrderService from './services/sortOrder/PerFolderSortOrderService';
 
 const pluginClasses = [
 	require('./plugins/GotoAnything').default,
@@ -364,6 +365,8 @@ class Application extends BaseApplication {
 
 		this.initRedux();
 
+		PerFolderSortOrderService.initialize();
+
 		CommandService.instance().initialize(this.store(), Setting.value('env') == 'dev', stateToWhenClauseContext);
 
 		for (const command of commands) {

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

@@ -9,12 +9,9 @@ import * as newFolder from './newFolder';
 import * as newNote from './newNote';
 import * as newSubFolder from './newSubFolder';
 import * as newTodo from './newTodo';
-import * as notesSortOrderSwitch from './notesSortOrderSwitch';
-import * as notesSortOrderToggleReverse from './notesSortOrderToggleReverse';
 import * as openFolder from './openFolder';
 import * as openNote from './openNote';
 import * as openTag from './openTag';
-import * as perFolderSortOrder from './perFolderSortOrder';
 import * as print from './print';
 import * as renameFolder from './renameFolder';
 import * as renameTag from './renameTag';
@@ -30,6 +27,9 @@ import * as showSpellCheckerMenu from './showSpellCheckerMenu';
 import * as toggleEditors from './toggleEditors';
 import * as toggleLayoutMoveMode from './toggleLayoutMoveMode';
 import * as toggleNoteList from './toggleNoteList';
+import * as toggleNotesSortOrderField from './toggleNotesSortOrderField';
+import * as toggleNotesSortOrderReverse from './toggleNotesSortOrderReverse';
+import * as togglePerFolderSortOrder from './togglePerFolderSortOrder';
 import * as toggleSideBar from './toggleSideBar';
 import * as toggleVisiblePanes from './toggleVisiblePanes';
 
@@ -44,12 +44,9 @@ const index:any[] = [
 	newNote,
 	newSubFolder,
 	newTodo,
-	notesSortOrderSwitch,
-	notesSortOrderToggleReverse,
 	openFolder,
 	openNote,
 	openTag,
-	perFolderSortOrder,
 	print,
 	renameFolder,
 	renameTag,
@@ -65,6 +62,9 @@ const index:any[] = [
 	toggleEditors,
 	toggleLayoutMoveMode,
 	toggleNoteList,
+	toggleNotesSortOrderField,
+	toggleNotesSortOrderReverse,
+	togglePerFolderSortOrder,
 	toggleSideBar,
 	toggleVisiblePanes,
 ];