Merge branch 'main' of https://github.com/TriliumNext/Trilium

.github/workflows/playwright.yml

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

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;
 }
 
-function randomString(len: number) {
+export function randomString(len: number) {
     let text = "";
     const possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 

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

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

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

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

apps/client/src/widgets/FloatingButtonsDefinitions.tsx

@@ -18,6 +18,7 @@ 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;
@@ -310,13 +311,24 @@ function Backlinks({ note, isDefaultViewMode }: FloatingButtonContext) {
     let [ popupOpen, setPopupOpen ] = useState(false);
     const backlinksContainerRef = useRef<HTMLDivElement>(null);
 
-    useEffect(() => {
+    function refresh() {
         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,8 +14,10 @@ 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;
@@ -44,6 +46,7 @@ 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}
@@ -103,7 +106,8 @@ function usePromotedAttributeData(note: FNote | null | undefined, componentId: s
                     valueAttr.attributeId = "";
                 }
 
-                cells.push({  definitionAttr, definition, valueAttr, valueName });
+                const uniqueId = randomString(10);
+                cells.push({  definitionAttr, definition, valueAttr, valueName, uniqueId });
             }
         }
         setCells(cells);

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");
+    await expect(languageCombobox).toContainText("English (United States)");
 
     // 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");
+    await languageCombobox.selectOptionByText("English (United States)");
     await app.currentNoteSplit.locator("button[name=restart-app-button]").click();
     await expect(app.currentNoteSplit).toContainText("Language", { timeout: 15000 });
-    await expect(languageCombobox).toContainText("English");
+    await expect(languageCombobox).toContainText("English (United States)");
 });

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", electronLocale: "en" },
+    { id: "en", name: "English (United States)", 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" },