Merge remote-tracking branch 'origin/develop' into test_simplify-data-dir

eliandoran · eliandoran · commit 55ce7aac10a1 · 2025-01-19T23:13:56.000+02:00
diff --git a/db/demo.zip b/db/demo.zip
diff --git a/dump-db/package-lock.json b/dump-db/package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -61,12 +61,12 @@
     "@mermaid-js/layout-elk": "0.1.7",
     "@mind-elixir/node-menu": "1.0.3",
     "@triliumnext/express-partial-content": "1.0.1",
-    "@types/react-dom": "18.3.1",
+    "@types/react-dom": "18.3.5",
     "archiver": "7.0.1",
     "async-mutex": "0.5.0",
     "autocomplete.js": "0.38.1",
     "axios": "1.7.9",
-    "better-sqlite3": "11.8.0",
+    "better-sqlite3": "11.8.1",
     "bootstrap": "5.3.3",
     "boxicons": "2.1.4",
     "cheerio": "1.0.0",
@@ -176,7 +176,7 @@
     "@types/mime-types": "2.1.4",
     "@types/multer": "1.4.12",
     "@types/node": "22.10.7",
-    "@types/react": "18.3.1",
+    "@types/react": "18.3.18",
     "@types/safe-compare": "1.1.2",
     "@types/sanitize-html": "2.13.0",
     "@types/sax": "1.2.7",
diff --git a/spec/etapi/notes.spec.ts b/spec/etapi/notes.spec.ts
diff --git a/spec/support/becca_mocking.ts b/spec/support/becca_mocking.ts
diff --git a/src/becca/entities/bnote.ts b/src/becca/entities/bnote.ts
@@ -1528,7 +1528,9 @@ class BNote extends AbstractBeccaEntity<BNote> {
     }
 
     isLaunchBarConfig() {
-        return this.type === "launcher" || ["_lbRoot", "_lbAvailableLaunchers", "_lbVisibleLaunchers"].includes(this.noteId);
+        return this.type === "launcher"
+            || ["_lbRoot", "_lbAvailableLaunchers", "_lbVisibleLaunchers"].includes(this.noteId)
+            || ["_lbMobileRoot", "_lbMobileAvailableLaunchers", "_lbMobileVisibleLaunchers"].includes(this.noteId);
     }
 
     isOptions() {
diff --git a/src/public/app/menus/launcher_context_menu.ts b/src/public/app/menus/launcher_context_menu.ts
@@ -34,8 +34,8 @@ export default class LauncherContextMenu implements SelectMenuItemEventListener<
 
         const isVisibleRoot = note?.noteId === "_lbVisibleLaunchers";
         const isAvailableRoot = note?.noteId === "_lbAvailableLaunchers";
-        const isVisibleItem = parentNoteId === "_lbVisibleLaunchers";
-        const isAvailableItem = parentNoteId === "_lbAvailableLaunchers";
+        const isVisibleItem = (parentNoteId === "_lbVisibleLaunchers" || parentNoteId === "_lbMobileVisibleLaunchers");
+        const isAvailableItem = (parentNoteId === "_lbAvailableLaunchers" || parentNoteId === "_lbMobileAvailableLaunchers");
         const isItem = isVisibleItem || isAvailableItem;
         const canBeDeleted = !note?.noteId.startsWith("_"); // fixed notes can't be deleted
         const canBeReset = !canBeDeleted && note?.isLaunchBarConfig();
diff --git a/src/public/app/services/attribute_parser.spec.ts b/src/public/app/services/attribute_parser.spec.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from "vitest";
-import attributeParser from "../src/public/app/services/attribute_parser.ts";
+import attributeParser from "./attribute_parser.js";
 
 
 describe("Lexing", () => {
@@ -41,7 +41,9 @@ describe("Lexing", () => {
 });
 
 describe.todo("Parser", () => {
+  /* #TODO
     it("simple label", () => {
+
         const attrs = attributeParser.parse(["#token"].map((t: any) => ({ text: t })));
 
         expect(attrs.length).toEqual(1);
@@ -85,6 +87,7 @@ describe.todo("Parser", () => {
         expect(attrs[0].name).toEqual("token");
         expect(attrs[0].value).toEqual("NFi2gL4xtPxM");
     });
+    */
 });
 
 describe("error cases", () => {
diff --git a/src/public/app/services/utils.ts b/src/public/app/services/utils.ts
@@ -308,7 +308,9 @@ function dynamicRequire(moduleName: string) {
     if (typeof __non_webpack_require__ !== "undefined") {
         return __non_webpack_require__(moduleName);
     } else {
-        return require(moduleName);
+        // explicitly pass as string and not as expression to suppress webpack warning
+        // 'Critical dependency: the request of a dependency is an expression'
+        return require(`${moduleName}`);
     }
 }
 
diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
@@ -1636,12 +1636,24 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
         }
     }
 
-    moveShortcutToVisibleCommand({ node, selectedOrActiveBranchIds }) {
-        branchService.moveToParentNote(selectedOrActiveBranchIds, "_lbVisibleLaunchers");
+    moveLauncherToVisibleCommand({ selectedOrActiveBranchIds }) {
+        this.#moveLaunchers(selectedOrActiveBranchIds, "_lbVisibleLaunchers", "_lbMobileVisibleLaunchers");
     }
 
-    moveShortcutToAvailableCommand({ node, selectedOrActiveBranchIds }) {
-        branchService.moveToParentNote(selectedOrActiveBranchIds, "_lbAvailableLaunchers");
+    moveLauncherToAvailableCommand({ selectedOrActiveBranchIds }) {
+        this.#moveLaunchers(selectedOrActiveBranchIds, "_lbAvailableLaunchers", "_lbMobileAvailableLaunchers");
+    }
+
+    #moveLaunchers(selectedOrActiveBranchIds, desktopParent, mobileParent) {
+        const desktopLaunchersToMove = selectedOrActiveBranchIds.filter((branchId) => !branchId.startsWith("_lbMobile"));
+        if (desktopLaunchersToMove) {
+            branchService.moveToParentNote(desktopLaunchersToMove, "_lbRoot_" + desktopParent);
+        }
+
+        const mobileLaunchersToMove = selectedOrActiveBranchIds.filter((branchId) => branchId.startsWith("_lbMobile"));
+        if (mobileLaunchersToMove) {
+            branchService.moveToParentNote(mobileLaunchersToMove, "_lbMobileRoot_" + mobileParent);
+        }
     }
 
     addNoteLauncherCommand({ node }) {
diff --git a/src/services/data_dir.spec.ts b/src/services/data_dir.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeEach, vi } from "vitest";
 
-import type { getTriliumDataDir as getTriliumDataDirType, getDataDirs as getDataDirsType, getPlatformAppDataDir as getPlatformAppDataDirType } from "../src/services/data_dir";
+import type { getTriliumDataDir as getTriliumDataDirType, getDataDirs as getDataDirsType, getPlatformAppDataDir as getPlatformAppDataDirType } from "./data_dir.js";
 
 describe("data_dir.ts unit tests", async () => {
     let getTriliumDataDir: typeof getTriliumDataDirType;
@@ -42,9 +42,9 @@ describe("data_dir.ts unit tests", async () => {
     });
 
     // import function to test now, after creating the mocks
-    ({ getTriliumDataDir } = await import("../src/services/data_dir.ts"));
-    ({ getPlatformAppDataDir } = await import("../src/services/data_dir.ts"));
-    ({ getDataDirs } = await import("../src/services/data_dir.ts"));
+    ({ getTriliumDataDir } = await import("./data_dir.js"));
+    ({ getPlatformAppDataDir } = await import("./data_dir.js"));
+    ({ getDataDirs } = await import("./data_dir.js"));
 
     // helper to reset call counts
     const resetAllMocks = () => {
@@ -288,7 +288,7 @@ describe("data_dir.ts unit tests", async () => {
             const result = getDataDirs(`${mockValuePrefix}_TRILIUM_DATA_DIR`);
 
             for (const key in result) {
-                expect(result[key]).toEqual(`${mockValuePrefix}_${key}`);
+                expect(result[key as keyof typeof result]).toEqual(`${mockValuePrefix}_${key}`);
             }
         });
 
@@ -303,7 +303,7 @@ describe("data_dir.ts unit tests", async () => {
             const result = getDataDirs(mockDataDir);
 
             for (const key in result) {
-                expect(result[key].startsWith(mockDataDir)).toBeTruthy();
+                expect(result[key as keyof typeof result].startsWith(mockDataDir)).toBeTruthy();
             }
 
             mockFn.pathJoinMock.mockReset();
@@ -336,7 +336,7 @@ describe("data_dir.ts unit tests", async () => {
             if (typeof changeAttemptResult === "string") {
                 // if it didn't throw above: assert that it did not change the value of it or any other keys of the object
                 for (const key in result) {
-                    expect(result[key].startsWith(mockDataDirBase)).toBeTruthy();
+                    expect(result[key as keyof typeof result].startsWith(mockDataDirBase)).toBeTruthy();
                 }
             } else {
                 expect(changeAttemptResult).toBeInstanceOf(TypeError);
diff --git a/src/services/options_init.ts b/src/services/options_init.ts
@@ -63,6 +63,7 @@ async function initNotSyncedOptions(initialized: boolean, opts: NotSyncedOpts =
     optionService.createOption("lastSyncedPush", "0", false);
 
     optionService.createOption("theme", "next", false);
+    optionService.createOption("textNoteEditorType", "ckeditor-classic", true);
 
     optionService.createOption("syncServerHost", opts.syncServerHost || "", false);
     optionService.createOption("syncServerTimeout", "120000", false);
diff --git a/src/services/sanitize_attribute_name.spec.ts b/src/services/sanitize_attribute_name.spec.ts
@@ -1,5 +1,5 @@
 import { expect, describe, it } from "vitest";
-import sanitizeAttributeName from "../src/services/sanitize_attribute_name";
+import sanitizeAttributeName from "./sanitize_attribute_name.js";
 
 // fn value, expected value
 const testCases: [fnValue: string, expectedValue: string][] = [
diff --git a/src/services/search/services/handle_parens.spec.ts b/src/services/search/services/handle_parens.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from "vitest";
-import handleParens from "../../src/services/search/services/handle_parens.js";
-import type { TokenStructure } from "../../src/services/search/services/types.js";
+import handleParens from "./handle_parens.js";
+import type { TokenStructure } from "./types.js";
 
 describe("Parens handler", () => {
     it("handles parens", () => {
diff --git a/src/services/search/services/lex.spec.ts b/src/services/search/services/lex.spec.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from "vitest";
-import lex from "../../src/services/search/services/lex.js";
+import lex from "./lex.js";
 
 describe("Lexer fulltext", () => {
     it("simple lexing", () => {
diff --git a/src/services/search/services/parse.spec.ts b/src/services/search/services/parse.spec.ts
@@ -1,16 +1,16 @@
 import { describe, it, expect } from "vitest";
-import AndExp from "../../src/services/search/expressions/and.js";
-import AttributeExistsExp from "../../src/services/search/expressions/attribute_exists.js";
-import type Expression from "../../src/services/search/expressions/expression.js";
-import LabelComparisonExp from "../../src/services/search/expressions/label_comparison.js";
-import NotExp from "../../src/services/search/expressions/not.js";
-import NoteContentFulltextExp from "../../src/services/search/expressions/note_content_fulltext.js";
-import NoteFlatTextExp from "../../src/services/search/expressions/note_flat_text.js";
-import OrExp from "../../src/services/search/expressions/or.js";
-import OrderByAndLimitExp from "../../src/services/search/expressions/order_by_and_limit.js";
-import PropertyComparisonExp from "../../src/services/search/expressions/property_comparison.js";
-import SearchContext from "../../src/services/search/search_context.js";
-import { default as parseInternal, type ParseOpts } from "../../src/services/search/services/parse.js";
+import AndExp from "../../search/expressions/and.js";
+import AttributeExistsExp from "../../search/expressions/attribute_exists.js";
+import type Expression from "../../search/expressions/expression.js";
+import LabelComparisonExp from "../../search/expressions/label_comparison.js";
+import NotExp from "../../search/expressions/not.js";
+import NoteContentFulltextExp from "../../search/expressions/note_content_fulltext.js";
+import NoteFlatTextExp from "../../search/expressions/note_flat_text.js";
+import OrExp from "../../search/expressions/or.js";
+import OrderByAndLimitExp from "../../search/expressions/order_by_and_limit.js";
+import PropertyComparisonExp from "../../search/expressions/property_comparison.js";
+import SearchContext from "../../search/search_context.js";
+import { default as parseInternal, type ParseOpts } from "./parse.js";
 
 describe("Parser", () => {
     it("fulltext parser without content", () => {
diff --git a/src/services/search/services/search.spec.ts b/src/services/search/services/search.spec.ts
@@ -1,11 +1,11 @@
 import { describe, it, expect, beforeEach,  } from "vitest";
-import searchService from "../../src/services/search/services/search.js";
-import BNote from "../../src/becca/entities/bnote.js";
-import BBranch from "../../src/becca/entities/bbranch.js";
-import SearchContext from "../../src/services/search/search_context.js";
-import dateUtils from "../../src/services/date_utils.js";
-import becca from "../../src/becca/becca.js";
-import becca_mocking from "./becca_mocking.js";
+import searchService from "./search.js";
+import BNote from "../../../becca/entities/bnote.js";
+import BBranch from "../../../becca/entities/bbranch.js";
+import SearchContext from "../search_context.js";
+import dateUtils from "../../date_utils.js";
+import becca from "../../../becca/becca.js";
+import becca_mocking from "../../../../spec/support/becca_mocking.js";
 
 describe("Search", () => {
     let rootNote: any;
diff --git a/src/services/search/value_extractor.spec.ts b/src/services/search/value_extractor.spec.ts
@@ -1,8 +1,8 @@
 import { describe, it, expect, beforeEach } from "vitest";
-import becca_mocking from "./becca_mocking.js";
-import ValueExtractor from "../../src/services/search/value_extractor.js";
-import becca from "../../src/becca/becca.js";
-import SearchContext from "../../src/services/search/search_context.js";
+import becca_mocking from "../../../spec/support/becca_mocking.js";
+import ValueExtractor from "./value_extractor.js";
+import becca from "../../becca/becca.js";
+import SearchContext from "./search_context.js";
 
 const dsc = new SearchContext();
 
diff --git a/src/services/special_notes.ts b/src/services/special_notes.ts
@@ -213,7 +213,7 @@ function resetLauncher(noteId: string) {
 
     if (note?.isLaunchBarConfig()) {
         if (note) {
-            if (noteId === "_lbRoot") {
+            if (noteId === "_lbRoot" || noteId === "_lbMobileRoot") {
                 // deleting hoisted notes are not allowed, so we just reset the children
                 for (const childNote of note.getChildNotes()) {
                     childNote.deleteNote();
diff --git a/src/services/utils.formatDownloadTitle.spec.ts b/src/services/utils.formatDownloadTitle.spec.ts
@@ -1,5 +1,5 @@
 import { expect, describe, it } from "vitest";
-import { formatDownloadTitle } from "../../src/services/utils.ts";
+import { formatDownloadTitle } from "./utils.js";
 
 const testCases: [fnValue: Parameters<typeof formatDownloadTitle>, expectedValue: ReturnType<typeof formatDownloadTitle>][] = [
     // empty fileName tests
diff --git a/tests-examples/demo-todo-app.spec.ts b/tests-examples/demo-todo-app.spec.ts
diff --git a/translations/ro/server.json b/translations/ro/server.json

Original file line number	Diff line number	Diff line change
`@@ -1528,7 +1528,9 @@ class BNote extends AbstractBeccaEntity<BNote> {`
`1528`	`1528`	`}`
`1529`	`1529`
`1530`	`1530`	`isLaunchBarConfig() {`
`1531`		`- return this.type === "launcher" \|\| ["_lbRoot", "_lbAvailableLaunchers", "_lbVisibleLaunchers"].includes(this.noteId);`
	`1531`	`+ return this.type === "launcher"`
	`1532`	`+ \|\| ["_lbRoot", "_lbAvailableLaunchers", "_lbVisibleLaunchers"].includes(this.noteId)`
	`1533`	`+ \|\| ["_lbMobileRoot", "_lbMobileAvailableLaunchers", "_lbMobileVisibleLaunchers"].includes(this.noteId);`
`1532`	`1534`	`}`
`1533`	`1535`
`1534`	`1536`	`isOptions() {`
Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,9 @@ function dynamicRequire(moduleName: string) {`
`308`	`308`	`if (typeof __non_webpack_require__ !== "undefined") {`
`309`	`309`	`return __non_webpack_require__(moduleName);`
`310`	`310`	`} else {`
`311`		`- return require(moduleName);`
	`311`	`+ // explicitly pass as string and not as expression to suppress webpack warning`
	`312`	`+ // 'Critical dependency: the request of a dependency is an expression'`
	`313`	+ return require(`${moduleName}`);
`312`	`314`	`}`
`313`	`315`	`}`
`314`	`316`