Merge a81e8adde78e4d608b40d417fdafd2ca3005bdcc into 67d2175ce93939e05709856a624004168ff66daf

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

apps/client/src/layouts/desktop_layout.tsx

@@ -30,6 +30,7 @@ import ScrollingContainer from "../widgets/containers/scrolling_container.js";
 import ScrollPadding from "../widgets/scroll_padding.js";
 import SearchResult from "../widgets/search_result.jsx";
 import SharedInfo from "../widgets/shared_info.jsx";
+import OriginInfo from "../widgets/note_origin.jsx";
 import SpacerWidget from "../widgets/spacer.js";
 import SplitNoteContainer from "../widgets/containers/split_note_container.js";
 import SqlResults from "../widgets/sql_result.js";
@@ -139,6 +140,7 @@ export default class DesktopLayout {
                                                                 .filling()
                                                                 .child(new ContentHeader()
                                                                     .child(<ReadOnlyNoteInfoBar />)
+                                                                    .child(<OriginInfo />)
                                                                     .child(<SharedInfo />)
                                                                 )
                                                                 .child(<PromotedAttributes />)

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

@@ -515,7 +515,7 @@
     "title": "الملاحظات المعدلة"
   },
   "note_properties": {
-    "info": "معلومات"
+    "this_note_was_originally_taken_from": ""
   },
   "backend_log": {
     "refresh": "تحديث"

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

@@ -840,8 +840,7 @@
     "search": "搜索"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "笔记来源:",
+    "this_note_was_originally_taken_from": "笔记来源:"
-    "info": "信息"
   },
   "owned_attribute_list": {
     "owned_attributes": "拥有的属性"

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

@@ -837,8 +837,7 @@
     "search": "Suchen"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Diese Notiz stammt ursprünglich aus:",
+    "this_note_was_originally_taken_from": "Diese Notiz stammt ursprünglich aus:"
-    "info": "Info"
   },
   "owned_attribute_list": {
     "owned_attributes": "Eigene Attribute"

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

@@ -841,8 +841,7 @@
     "search": "Search"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "This note was originally taken from:",
+    "this_note_was_originally_taken_from": "This note was originally taken from:"
-    "info": "Info"
   },
   "owned_attribute_list": {
     "owned_attributes": "Owned Attributes"

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

@@ -841,8 +841,7 @@
     "search": "Buscar"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Esta nota fue tomada originalmente de:",
+    "this_note_was_originally_taken_from": "Esta nota fue tomada originalmente de:"
-    "info": "Información"
   },
   "owned_attribute_list": {
     "owned_attributes": "Atributos propios"

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

@@ -835,8 +835,7 @@
     "search": "Recherche"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Cette note est initialement extraite de :",
+    "this_note_was_originally_taken_from": "Cette note est initialement extraite de :"
-    "info": "Infos"
   },
   "owned_attribute_list": {
     "owned_attributes": "Attributs propres"

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

@@ -1306,8 +1306,8 @@
   "zpetne_odkazy": {
     "relation": "relazione",
     "backlink_one": "{{count}} Backlink",
-    "backlink_many": "",
+    "backlink_many": "{{count}} Backlinks",
-    "backlink_other": "{{count}} Backlink"
+    "backlink_other": "{{count}} Backlinks"
   },
   "mobile_detail_menu": {
     "insert_child_note": "Inserisci nota secondaria",
@@ -1410,8 +1410,7 @@
     "search": "Ricerca"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Questa nota è stata originariamente tratta da:",
+    "this_note_was_originally_taken_from": "Questa nota è stata originariamente tratta da:"
-    "info": "Informazioni"
   },
   "owned_attribute_list": {
     "owned_attributes": "Attributi posseduti"
@@ -1801,8 +1800,8 @@
     "relation-map": "Mappa delle relazioni",
     "note-map": "Nota Mappa",
     "render-note": "Nota di rendering",
-    "book": "Collezione",
+    "book": "Raccolta",
-    "mermaid-diagram": "Diagramma della sirena",
+    "mermaid-diagram": "Diagramma Mermaid",
     "canvas": "Tela",
     "web-view": "Visualizzazione Web",
     "mind-map": "Mappa mentale",
@@ -1967,7 +1966,8 @@
     "open_note_in_new_tab": "Apri la nota in una nuova scheda",
     "open_note_in_new_split": "Apri nota in una nuova divisione",
     "open_note_in_new_window": "Apri la nota in una nuova finestra",
-    "open_note_in_popup": "Modifica rapida"
+    "open_note_in_popup": "Modifica rapida",
+    "open_note_in_other_split": "Apri nota nell'altra divisione"
   },
   "help-button": {
     "title": "Apri la pagina di aiuto pertinente"

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

@@ -693,7 +693,6 @@
     "outside_hoisted": "このパスはホイストされたノートの外側にあるため、ホイストを解除する必要があります。"
   },
   "note_properties": {
-    "info": "情報",
     "this_note_was_originally_taken_from": "このノートは元々以下から引用したものです:"
   },
   "similar_notes": {
@@ -1158,7 +1157,8 @@
     "open_note_in_popup": "クイック編集",
     "open_note_in_new_tab": "新しいタブでノートを開く",
     "open_note_in_new_split": "新しく分割してノートを開く",
-    "open_note_in_new_window": "新しいウィンドウでノートを開く"
+    "open_note_in_new_window": "新しいウィンドウでノートを開く",
+    "open_note_in_other_split": "他の分割画面でノートを開く"
   },
   "note_tooltip": {
     "quick-edit": "クイック編集",

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

@@ -447,8 +447,7 @@
     "search": "Szukaj"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Ta notatka oryginalnie została wzięta z:",
+    "this_note_was_originally_taken_from": "Ta notatka oryginalnie została wzięta z:"
-    "info": "Info"
   },
   "owned_attribute_list": {
     "owned_attributes": "Posiadane atrybuty"

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

@@ -810,8 +810,7 @@
     "search": "Pesquisar"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Esta nota foi originalmente obtida de:",
+    "this_note_was_originally_taken_from": "Esta nota foi originalmente obtida de:"
-    "info": "Informações"
   },
   "owned_attribute_list": {
     "owned_attributes": "Atributos próprios"

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

@@ -1070,8 +1070,7 @@
     "outside_hoisted": "Este caminho está fora de uma nota fixada e você teria que desafixar."
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Esta nota foi originalmente obtida de:",
+    "this_note_was_originally_taken_from": "Esta nota foi originalmente obtida de:"
-    "info": "Informações"
   },
   "promoted_attributes": {
     "promoted_attributes": "Atributos Promovidos",

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

@@ -910,7 +910,6 @@
     "title": "Căile notiței"
   },
   "note_properties": {
-    "info": "Informații",
     "this_note_was_originally_taken_from": "Această notiță a fost preluată original de la:"
   },
   "note_type_chooser": {

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

@@ -1067,7 +1067,6 @@
     "archived": "Архивировано"
   },
   "note_properties": {
-    "info": "Информация",
     "this_note_was_originally_taken_from": "Эта заметка была первоначально взята из:"
   },
   "promoted_attributes": {

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

@@ -837,8 +837,7 @@
     "search": "搜尋"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "筆記來源：",
+    "this_note_was_originally_taken_from": "筆記來源："
-    "info": "資訊"
   },
   "owned_attribute_list": {
     "owned_attributes": "自有屬性"

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

@@ -939,8 +939,7 @@
     "outside_hoisted": "Цей шлях знаходиться поза межами закріпленої нотатки і вам доведеться відкріпити."
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Цю нотатку було спочатку взято з:",
+    "this_note_was_originally_taken_from": "Цю нотатку було спочатку взято з:"
-    "info": "Інформація"
   },
   "owned_attribute_list": {
     "owned_attributes": "Власні Атрибути"

apps/client/src/widgets/note_origin.tsx

@@ -0,0 +1,43 @@
+import { t } from "../services/i18n";
+import { useNoteContext, useTriliumEvent, useTriliumOption } from "./react/hooks";
+import { useEffect, useState } from "preact/hooks";
+import attributes from "../services/attributes";
+import InfoBar from "./react/InfoBar";
+import RawHtml from "./react/RawHtml";
+import FNote from "../entities/fnote";
+
+export default function OriginInfo() {
+    const { note } = useNoteContext();
+    const [link, setLink] = useState<string>();
+
+    function refresh() {
+        if (!note) return;
+        const pageUrl = getPageUrl(note);
+        if (!pageUrl) {
+            setLink(undefined);
+            return;
+        }
+        setLink(`<a href="${pageUrl}" class="external tn-link">${pageUrl}</a>`);
+    }
+
+    useEffect(refresh, [note]);
+    useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
+        if (loadResults.getAttributeRows().find((attr) => attr.type === "label" && attr.name?.toString() === "pageUrl" && attributes.isAffecting(attr, note))) {
+            refresh();
+        }
+    });
+
+    return (
+        <InfoBar className="origin-info-widget" type="subtle" style={{ display: (!link) ? "none" : undefined }}>
+            {link && (
+                <RawHtml
+                    html={`${t("note_properties.this_note_was_originally_taken_from")} ${link}`}
+                />
+            )}
+        </InfoBar>
+    )
+}
+
+function getPageUrl(note: FNote) {
+    return note.getOwnedLabelValue("pageUrl");
+}

apps/client/src/widgets/ribbon/NotePropertiesTab.tsx

@@ -1,20 +0,0 @@
-import { t } from "../../services/i18n";
-import { useNoteLabel } from "../react/hooks";
-import { TabContext } from "./ribbon-interface";
-
-/**
- * TODO: figure out better name or conceptualize better.
- */
-export default function NotePropertiesTab({ note }: TabContext) {
-    const [ pageUrl ] = useNoteLabel(note, "pageUrl");
-
-    return (
-        <div className="note-properties-widget" style={{ padding: "12px", color: "var(--muted-text-color)" }}>
-            { pageUrl && (
-                <div style={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
-                    {t("note_properties.this_note_was_originally_taken_from")} <a href={pageUrl} class="page-url external">{pageUrl}</a>
-                </div>
-            )}
-        </div>
-    )
-}

apps/client/src/widgets/ribbon/RibbonDefinition.ts

@@ -1,6 +1,5 @@
 import ScriptTab from "./ScriptTab";
 import EditedNotesTab from "./EditedNotesTab";
-import NotePropertiesTab from "./NotePropertiesTab";
 import NoteInfoTab from "./NoteInfoTab";
 import SimilarNotesTab from "./SimilarNotesTab";
 import FilePropertiesTab from "./FilePropertiesTab";
@@ -59,13 +58,6 @@ export const RIBBON_TAB_DEFINITIONS: TabConfiguration[] = [
         show: ({ note }) => note?.type === "book" || note?.type === "search",
         toggleCommand: "toggleRibbonTabBookProperties"
     },
-    {
-        title: t("note_properties.info"),
-        icon: "bx bx-info-square",
-        content: NotePropertiesTab,
-        show: ({ note }) => !!note?.getLabelValue("pageUrl"),
-        activate: true
-    },
     {
         title: t("file_properties.title"),
         icon: "bx bx-file",