Merge 0c3b552678470a60d0a2512149742efea304fcc9 into 32c16021c420ce10f630d98b00f8735f0bf2fdd7

.github/workflows/playwright.yml

@@ -79,7 +79,7 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v5
         with:
-          name: e2e report ${{ matrix.arch }}
+          name: e2e report
           path: apps/server-e2e/test-output
 
       - name: Kill the server

apps/client/src/menus/context_menu_utils.ts

@@ -1,21 +0,0 @@
-import { t } from "../services/i18n"
-import attributes from "../services/attributes"
-import FNote from "../entities/fnote"
-
-export function getArchiveMenuItem(note: FNote) {
-    if (!note.isArchived) {
-        return {
-            title: t("board_view.archive-note"),
-            uiIcon: "bx bx-archive",
-            handler: () => attributes.addLabel(note.noteId, "archived")
-        }
-    } else {
-        return {
-            title: t("board_view.unarchive-note"),
-            uiIcon: "bx bx-archive-out",
-            handler: async () => {
-                attributes.removeOwnedLabelByName(note, "archived")
-            }
-        }
-    }
-}

apps/client/src/services/utils.ts

@@ -207,7 +207,7 @@ function toObject<T, R>(array: T[], fn: (arg0: T) => [key: string, value: R]) {
     return obj;
 }
 
-export function randomString(len: number) {
+function randomString(len: number) {
     let text = "";
     const possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 

apps/client/src/stylesheets/style.css

@@ -257,11 +257,6 @@ button.close:hover {
     color: var(--hover-item-text-color);
 }
 
-button.custom-title-bar-button {
-    background: transparent;
-    border: unset;
-}
-
 .modal-content {
     background-color: var(--modal-background-color) !important;
 }

apps/client/src/stylesheets/theme-next-dark.css

@@ -275,8 +275,7 @@
     --calendar-coll-event-background-lightness: 20%;
     --calendar-coll-event-background-color: #3c3c3c;
     --calendar-coll-event-text-color: white;
-    --calendar-coll-event-hover-filter: brightness(1.25);
+    --calendar-cell-event-hover-filter: brightness(1.25);
-    --callendar-coll-event-archived-sripe-color: #00000026;
     --calendar-coll-today-background-color: #ffffff08;
 }
 

apps/client/src/stylesheets/theme-next-light.css

@@ -273,8 +273,7 @@
     --calendar-coll-event-background-saturation: 80%;
     --calendar-coll-event-background-color: #eaeaea;
     --calendar-coll-event-text-color: black;
-    --calendar-coll-event-hover-filter: brightness(.95) saturate(1.25);
+    --calendar-cell-event-hover-filter: brightness(.95) saturate(1.25);
-    --callendar-coll-event-archived-sripe-color: #0000000a;
     --calendar-coll-today-background-color: #00000006;
 }
 

apps/client/src/stylesheets/theme-next/notes/text.css

@@ -643,7 +643,7 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
     }
 }
 
-.ck-content:not(.word-wrap) pre code {
+.note-detail-printable:not(.word-wrap) pre code {
     white-space: pre;
 }
 

apps/client/src/translations/cn/translation.json

@@ -162,8 +162,7 @@
     "inPageSearch": "页面内搜索",
     "newTabWithActivationNoteLink": "在新标签页打开笔记链接并激活该标签页",
     "title": "资料表",
-    "newTabNoteLink": "在新标签页开启链接",
+    "newTabNoteLink": "在新标签页开启链接"
-    "editShortcuts": "编辑键盘快捷键"
   },
   "import": {
     "importIntoNote": "导入到笔记",
@@ -2105,8 +2104,5 @@
     "clear-color": "清除笔记颜色",
     "set-color": "设置笔记颜色",
     "set-custom-color": "设置自定义笔记颜色"
-  },
-  "popup-editor": {
-    "maximize": "切换至完整编辑器"
   }
 }

apps/client/src/translations/en/translation.json

@@ -736,8 +736,8 @@
     "zoom_out_title": "Zoom Out"
   },
   "zpetne_odkazy": {
-    "backlink_one": "{{count}} Backlink",
+    "backlink": "{{count}} Backlink",
-    "backlink_other": "{{count}} Backlinks",
+    "backlinks": "{{count}} Backlinks",
     "relation": "relation"
   },
   "mobile_detail_menu": {

apps/client/src/translations/ja/translation.json

@@ -2105,8 +2105,5 @@
     "clear-color": "ノートの色をクリア",
     "set-color": "ノートの色を設定",
     "set-custom-color": "ノートの色をカスタム設定"
-  },
-  "popup-editor": {
-    "maximize": "フルエディターに切り替え"
   }
 }

apps/client/src/translations/ro/translation.json

@@ -1362,9 +1362,8 @@
     "title": "Factorul de zoom (doar pentru versiunea desktop)"
   },
   "zpetne_odkazy": {
-    "backlink_one": "{{count}} legătură de retur",
+    "backlink": "{{count}} legături de retur",
-    "backlink_few": "{{count}} legături de retur",
+    "backlinks": "{{count}} legături de retur",
-    "backlink_other": "{{count}} de legături de retur",
     "relation": "relație"
   },
   "svg_export_button": {

apps/client/src/translations/tw/translation.json

@@ -162,8 +162,7 @@
     "inPageSearch": "頁面內搜尋",
     "title": "列表",
     "newTabNoteLink": "在新分頁開啟筆記連結",
-    "newTabWithActivationNoteLink": "在新分頁開啟並切換至筆記連結",
+    "newTabWithActivationNoteLink": "在新分頁開啟並切換至筆記連結"
-    "editShortcuts": "編輯鍵盤快捷鍵"
   },
   "import": {
     "importIntoNote": "匯入至筆記",
@@ -2105,8 +2104,5 @@
     "clear-color": "清除筆記顏色",
     "set-color": "設定筆記顏色",
     "set-custom-color": "設定自訂筆記顏色"
-  },
-  "popup-editor": {
-    "maximize": "切換至完整編輯器"
   }
 }

apps/client/src/widgets/FloatingButtonsDefinitions.tsx

@@ -18,7 +18,6 @@ import froca from "../services/froca";
 import NoteLink from "./react/NoteLink";
 import RawHtml from "./react/RawHtml";
 import { ViewTypeOptions } from "./collections/interface";
-import attributes from "../services/attributes";
 
 export interface FloatingButtonContext {
     parentComponent: Component;
@@ -311,24 +310,13 @@ function Backlinks({ note, isDefaultViewMode }: FloatingButtonContext) {
     let [ popupOpen, setPopupOpen ] = useState(false);
     const backlinksContainerRef = useRef<HTMLDivElement>(null);
 
-    function refresh() {
+    useEffect(() => {
         if (!isDefaultViewMode) return;
 
         server.get<BacklinkCountResponse>(`note-map/${note.noteId}/backlink-count`).then(resp => {
             setBacklinkCount(resp.count);
         });
-    }
+    }, [ note ]);
-
-    useEffect(() => refresh(), [ note ]);
-    useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
-        loadResults.getAttributeRows().some(attr =>
-            attr.type === "relation" &&
-            attr.name === "internalLink" &&
-            attributes.isAffecting(attr, note))
-        {
-            refresh();
-        }
-    });
 
     // Determine the max height of the container.
     const { windowHeight } = useWindowSize();

apps/client/src/widgets/PromotedAttributes.tsx

@@ -14,10 +14,8 @@ import ws from "../services/ws";
 import { UpdateAttributeResponse } from "@triliumnext/commons";
 import attributes from "../services/attributes";
 import debounce from "../services/debounce";
-import { randomString } from "../services/utils";
 
 interface Cell {
-    uniqueId: string;
     definitionAttr: FAttribute;
     definition: DefinitionObject;
     valueAttr: Attribute;
@@ -46,7 +44,6 @@ export default function PromotedAttributes() {
         <div className="promoted-attributes-widget">
             {cells && cells.length > 0 && <div className="promoted-attributes-container">
                 {note && cells?.map(cell => <PromotedAttributeCell
-                    key={cell.uniqueId}
                     cell={cell}
                     cells={cells} setCells={setCells}
                     shouldFocus={cell === cellToFocus} setCellToFocus={setCellToFocus}
@@ -106,8 +103,7 @@ function usePromotedAttributeData(note: FNote | null | undefined, componentId: s
                     valueAttr.attributeId = "";
                 }
 
-                const uniqueId = randomString(10);
+                cells.push({  definitionAttr, definition, valueAttr, valueName });
-                cells.push({  definitionAttr, definition, valueAttr, valueName, uniqueId });
             }
         }
         setCells(cells);

apps/client/src/widgets/collections/board/context_menu.ts

@@ -2,9 +2,9 @@ import FNote from "../../../entities/fnote";
 import NoteColorPicker from "../../../menus/custom-items/NoteColorPicker";
 import contextMenu, { ContextMenuEvent } from "../../../menus/context_menu";
 import link_context_menu from "../../../menus/link_context_menu";
+import attributes from "../../../services/attributes";
 import branches from "../../../services/branches";
 import dialog from "../../../services/dialog";
-import { getArchiveMenuItem } from "../../../menus/context_menu_utils";
 import { t } from "../../../services/i18n";
 import Api from "./api";
 
@@ -43,6 +43,17 @@ export function openNoteContextMenu(api: Api, event: ContextMenuEvent, note: FNo
         items: [
             ...link_context_menu.getItems(),
             { kind: "separator" },
+            {
+                title: t("board_view.move-to"),
+                uiIcon: "bx bx-transfer",
+                items: api.columns.map(columnToMoveTo => ({
+                    title: columnToMoveTo,
+                    enabled: columnToMoveTo !== column,
+                    handler: () => api.changeColumn(note.noteId, columnToMoveTo)
+                })),
+            },
+            getArchiveMenuItem(note),
+            { kind: "separator" },
             {
                 title: t("board_view.insert-above"),
                 uiIcon: "bx bx-list-plus",
@@ -54,17 +65,6 @@ export function openNoteContextMenu(api: Api, event: ContextMenuEvent, note: FNo
                 handler: () => api.insertRowAtPosition(column, branchId, "after")
             },
             { kind: "separator" },
-            {
-                title: t("board_view.move-to"),
-                uiIcon: "bx bx-transfer",
-                items: api.columns.map(columnToMoveTo => ({
-                    title: columnToMoveTo,
-                    enabled: columnToMoveTo !== column,
-                    handler: () => api.changeColumn(note.noteId, columnToMoveTo)
-                })),
-            },
-            { kind: "separator" },
-            getArchiveMenuItem(note),
             {
                 title: t("board_view.remove-from-board"),
                 uiIcon: "bx bx-task-x",
@@ -85,3 +85,20 @@ export function openNoteContextMenu(api: Api, event: ContextMenuEvent, note: FNo
     });
 }
 
+function getArchiveMenuItem(note: FNote) {
+    if (!note.isArchived) {
+        return {
+            title: t("board_view.archive-note"),
+            uiIcon: "bx bx-archive",
+            handler: () => attributes.addLabel(note.noteId, "archived")
+        }
+    } else {
+        return {
+            title: t("board_view.unarchive-note"),
+            uiIcon: "bx bx-archive-out",
+            handler: async () => {
+                attributes.removeOwnedLabelByName(note, "archived")
+            }
+        }
+    }
+}

apps/client/src/widgets/collections/calendar/context_menu.ts

@@ -3,10 +3,11 @@ import FNote from "../../../entities/fnote";
 import contextMenu, { ContextMenuEvent } from "../../../menus/context_menu";
 import link_context_menu from "../../../menus/link_context_menu";
 import branches from "../../../services/branches";
-import { getArchiveMenuItem } from "../../../menus/context_menu_utils";
+import froca from "../../../services/froca";
+import { note } from "mermaid/dist/rendering-util/rendering-elements/shapes/note.js";
 import { t } from "../../../services/i18n";
 
-export function openCalendarContextMenu(e: ContextMenuEvent, note: FNote, parentNote: FNote) {
+export function openCalendarContextMenu(e: ContextMenuEvent, noteId: string, parentNote: FNote) {
     e.preventDefault();
     e.stopPropagation();
 
@@ -16,13 +17,15 @@ export function openCalendarContextMenu(e: ContextMenuEvent, note: FNote, parent
         items: [
             ...link_context_menu.getItems(),
             { kind: "separator" },
-            getArchiveMenuItem(note),
             {
                 title: t("calendar_view.delete_note"),
                 uiIcon: "bx bx-trash",
                 handler: async () => {
+                    const noteToDelete = await froca.getNote(noteId);
+                    if (!noteToDelete) return;
+
                     let branchIdToDelete: string | null = null;
-                    for (const parentBranch of note.getParentBranches()) {
+                    for (const parentBranch of noteToDelete.getParentBranches()) {
                         const parentNote = await parentBranch.getNote();
                         if (parentNote?.hasAncestor(parentNote.noteId)) {
                             branchIdToDelete = parentBranch.branchId;
@@ -37,9 +40,9 @@ export function openCalendarContextMenu(e: ContextMenuEvent, note: FNote, parent
             { kind: "separator" },
             {
                 kind: "custom",
-                componentFn: () => NoteColorPicker({note: note})
+                componentFn: () => NoteColorPicker({note: noteId})
             }
         ],
-        selectMenuItemHandler: ({ command }) =>  link_context_menu.handleLinkContextMenuItem(command, note.noteId),
+        selectMenuItemHandler: ({ command }) =>  link_context_menu.handleLinkContextMenuItem(command, noteId),
     })
 }

apps/client/src/widgets/collections/calendar/index.css

@@ -3,9 +3,8 @@
     --calendar-coll-event-background-lightness: 95%;
     --calendar-coll-event-background-saturation: 80%;
     --calendar-coll-event-background-color: var(--accented-background-color);
-    --calendar-coll-event-text-color: var(--main-text-color);
+    --calendar-coll-event-text-color: var(--primary-button-text-color);
-    --calendar-coll-event-hover-filter: none;
+    --calendar-cell-event-hover-filter: none;
-    --callendar-coll-event-archived-sripe-color: #00000013;
     --calendar-coll-today-background-color: var(--more-accented-background-color);
 }
 
@@ -54,23 +53,7 @@
 }
 
 .calendar-container a.fc-event.archived {
-    opacity: .65;
+    opacity: 0.5;
-}
-
-.calendar-container a.fc-event.archived::after {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-
-    --c1: transparent;
-    --c2: var(--callendar-coll-event-archived-sripe-color);
-
-    background: repeating-linear-gradient(45deg, var(--c1), var(--c1) 8px,
-                                          var(--c2) 8px, var(--c2) 16px) !important;
 }
 
 .calendar-container .fc-button {
@@ -146,18 +129,17 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
 
 .calendar-view a.fc-timegrid-event:hover,
 .calendar-view a.fc-daygrid-event:hover {
-    filter: var(--calendar-coll-event-hover-filter);
+    filter: var(--calendar-cell-event-hover-filter);
     border-color: var(--fc-event-text-color);
     text-decoration: none;
     color: currentColor;
-    opacity: 1;
 }
 
 .calendar-view .fc-timegrid-event.with-hue,
 .calendar-view .fc-daygrid-event.with-hue {
     --fc-event-text-color: var(--custom-color);
 
-    --fc-event-bg-color: hsl(var(--custom-color-hue),
+    background: hsl(var(--custom-color-hue),
                     var(--calendar-coll-event-background-saturation),
                     var(--calendar-coll-event-background-lightness)) !important;
 }

apps/client/src/widgets/collections/calendar/index.tsx

@@ -307,11 +307,9 @@ function useEventDisplayCustomization(parentNote: FNote) {
             $(mainContainer ?? e.el).append($(promotedAttributesHtml));
         }
 
-        e.el.addEventListener("contextmenu", async (contextMenuEvent) => {
+        e.el.addEventListener("contextmenu", (contextMenuEvent) => {
-            const note = await froca.getNote(e.event.extendedProps.noteId);
+            const noteId = e.event.extendedProps.noteId;
-            if (!note) return;
+            openCalendarContextMenu(contextMenuEvent, noteId, parentNote);
-
-            openCalendarContextMenu(contextMenuEvent, note, parentNote);
         });
     }, []);
     return { eventDidMount };

apps/dump-db/package.json

@@ -7,7 +7,7 @@
     "better-sqlite3": "12.5.0",
     "mime-types": "3.0.2",
     "sanitize-filename": "1.6.3",
-    "tsx": "4.21.0",
+    "tsx": "4.20.6",
     "yargs": "18.0.0"
   },
   "devDependencies": {

apps/server-e2e/src/i18n.spec.ts

@@ -43,7 +43,7 @@ test("User can change language from settings", async ({ page, context }) => {
     // Check that the default value (English) is set.
     await expect(app.currentNoteSplit).toContainText("First day of the week");
     const languageCombobox = app.dropdown(app.currentNoteSplit.locator(".options-section .dropdown").first());
-    await expect(languageCombobox).toContainText("English (United States)");
+    await expect(languageCombobox).toContainText("English");
 
     // Select Chinese and ensure the translation is set.
     await languageCombobox.selectOptionByText("简体中文");
@@ -53,8 +53,8 @@ test("User can change language from settings", async ({ page, context }) => {
     await expect(languageCombobox).toContainText("简体中文");
 
     // Select English again.
-    await languageCombobox.selectOptionByText("English (United States)");
+    await languageCombobox.selectOptionByText("English");
     await app.currentNoteSplit.locator("button[name=restart-app-button]").click();
     await expect(app.currentNoteSplit).toContainText("Language", { timeout: 15000 });
-    await expect(languageCombobox).toContainText("English (United States)");
+    await expect(languageCombobox).toContainText("English");
 });

docs/README-fa.md

@@ -33,39 +33,50 @@ quick overview:
 
 <a href="https://triliumnext.github.io/Docs/Wiki/screenshot-tour"><img src="./docs/app.png" alt="Trilium Screenshot" width="1000"></a>
 
-## ⏬ دانلود
+## ⏬ Download
-- [آخرین انتشار]{‍‏1} – نسخه پایدار، برای بیشتر کاربران ‎ پیشنهاد می‌شود.
+- [Latest release](https://github.com/TriliumNext/Trilium/releases/latest) –
+  stable version, recommended for most users.
 - [Nightly build](https://github.com/TriliumNext/Trilium/releases/tag/nightly) –
   unstable development version, updated daily with the latest features and
   fixes.
 
-## 📚 کتابچه راهنما
+## 📚 Documentation
 
 **Visit our comprehensive documentation at
 [docs.triliumnotes.org](https://docs.triliumnotes.org/)**
 
-مستندات ما در چندین قالب مختلف در دسترس است:
+Our documentation is available in multiple formats:
-- مستندات آنلاین: می‌توانید نسخهٔ کامل مستندات را در
+- **Online Documentation**: Browse the full documentation at
-  ‎[docs.triliumnotes.org](https://docs.triliumnotes.org/)‎ مرور کنید
+  [docs.triliumnotes.org](https://docs.triliumnotes.org/)
-- ** In-App Help **: Press `F1 ` در Trilium برای دسترسی به همان اسناد به طور
+- **In-App Help**: Press `F1` within Trilium to access the same documentation
-  مستقیم در برنامه
+  directly in the application
-- ** GitHub **: از طریق [راهنمای کاربر] در این مخزن حرکت کنید
+- **GitHub**: Navigate through the [User
+  Guide](./docs/User%20Guide/User%20Guide/) in this repository
 
-### لینک‌های سریع
+### Quick Links
-- راهنمای شروع کار
+- [Getting Started Guide](https://docs.triliumnotes.org/)
-- دستورالعمل‌های نصب
+- [Installation
-- راه‌اندازی داکر
+  Instructions](./docs/User%20Guide/User%20Guide/Installation%20&%20Setup/Server%20Installation.md)
-- ارتقای TriliumNext
+- [Docker
-- مفاهیم و ویژگی‌های پایه
+  Setup](./docs/User%20Guide/User%20Guide/Installation%20&%20Setup/Server%20Installation/1.%20Installing%20the%20server/Using%20Docker.md)
-- الگوهای پایگاه دانشی شخصی
+- [Upgrading
+  TriliumNext](./docs/User%20Guide/User%20Guide/Installation%20%26%20Setup/Upgrading%20TriliumNext.md)
+- [Basic Concepts and
+  Features](./docs/User%20Guide/User%20Guide/Basic%20Concepts%20and%20Features/Notes.md)
+- [Patterns of Personal Knowledge
+  Base](https://triliumnext.github.io/Docs/Wiki/patterns-of-personal-knowledge)
 
-## 🎁 ویژگی‌ها
+## 🎁 Features
 
-* یادداشت‌ها می‌توانند در یک درخت با عمق دلخواه سازمان‌دهی شوند. یک یادداشت
+* Notes can be arranged into arbitrarily deep tree. Single note can be placed
-  می‌تواند در چندین نقطهٔ مختلف از درخت قرار گیرد.
+  into multiple places in the tree (see
-* ویرایشگر یادداشت غنی WYSIWYG از جمله جداول، تصاویر و [math] [1] با علامت گذاری
+  [cloning](https://triliumnext.github.io/Docs/Wiki/cloning-notes))
-  [autoformat] [2]
+* Rich WYSIWYG note editor including e.g. tables, images and
-* پشتیبانی از ویرایش [یادداشت با کد منبع][۱]، از جمله نحو برجسته
+  [math](https://triliumnext.github.io/Docs/Wiki/text-notes) with markdown
+  [autoformat](https://triliumnext.github.io/Docs/Wiki/text-notes#autoformat)
+* Support for editing [notes with source
+  code](https://triliumnext.github.io/Docs/Wiki/code-notes), including syntax
+  highlighting
 * Fast and easy [navigation between
   notes](https://triliumnext.github.io/Docs/Wiki/note-navigation), full text
   search and [note

package.json

@@ -53,7 +53,7 @@
     "esbuild": "0.27.0",
     "eslint": "9.39.1",
     "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-playwright": "2.4.0",
+    "eslint-plugin-playwright": "2.3.0",
     "eslint-plugin-react-hooks": "7.0.1",
     "happy-dom": "~20.0.0",
     "http-server": "14.1.1",
@@ -62,7 +62,7 @@
     "react-refresh": "0.18.0",
     "rollup-plugin-webpack-stats": "2.1.8",
     "tslib": "2.8.1",
-    "tsx": "4.21.0",
+    "tsx": "4.20.6",
     "typescript": "~5.9.0",
     "typescript-eslint": "8.48.0",
     "upath": "2.0.1",

packages/commons/src/lib/i18n.ts

@@ -14,7 +14,7 @@ export interface Locale {
 const UNSORTED_LOCALES = [
     { id: "cn", name: "简体中文", electronLocale: "zh_CN" },
     { id: "de", name: "Deutsch", electronLocale: "de" },
-    { id: "en", name: "English (United States)", electronLocale: "en" },
+    { id: "en", name: "English", electronLocale: "en" },
     { id: "en-GB", name: "English (United Kingdom)", electronLocale: "en_GB" },
     { id: "es", name: "Español", electronLocale: "es" },
     { id: "fr", name: "Français", electronLocale: "fr" },