From 9580d636cf36f4d951508a639a0b983182512f31 Mon Sep 17 00:00:00 2001
From: SiriusXT <1160925501@qq.com>
Date: Fri, 14 Nov 2025 17:20:35 +0800
Subject: [PATCH] client/pageurl: migrate note origin to info bar

---
 apps/client/src/layouts/desktop_layout.tsx    |  2 +
 apps/client/src/widgets/note_origin.tsx       | 43 +++++++++++++++++++
 .../ribbon/CollectionPropertiesTab.tsx        |  5 ++-
 .../src/widgets/ribbon/NotePropertiesTab.tsx  | 20 ---------
 .../src/widgets/ribbon/RibbonDefinition.ts    |  8 ----
 5 files changed, 48 insertions(+), 30 deletions(-)
 create mode 100644 apps/client/src/widgets/note_origin.tsx
 delete mode 100644 apps/client/src/widgets/ribbon/NotePropertiesTab.tsx

diff --git a/apps/client/src/layouts/desktop_layout.tsx b/apps/client/src/layouts/desktop_layout.tsx
index 17c77f8d8..16167a471 100644
--- a/apps/client/src/layouts/desktop_layout.tsx
+++ b/apps/client/src/layouts/desktop_layout.tsx
@@ -31,6 +31,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";
@@ -137,6 +138,7 @@ export default class DesktopLayout {
                                                             new ScrollingContainer()
                                                                 .filling()
                                                                 .child(new ContentHeader()
+                                                                    .child(<OriginInfo />)
                                                                     .child(<ReadOnlyNoteInfoBar />)
                                                                     .child(<SharedInfo />)
                                                                 )
diff --git a/apps/client/src/widgets/note_origin.tsx b/apps/client/src/widgets/note_origin.tsx
new file mode 100644
index 000000000..bf6f0ccfc
--- /dev/null
+++ b/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");
+}
\ No newline at end of file
diff --git a/apps/client/src/widgets/ribbon/CollectionPropertiesTab.tsx b/apps/client/src/widgets/ribbon/CollectionPropertiesTab.tsx
index e961ae1f0..fb68b7950 100644
--- a/apps/client/src/widgets/ribbon/CollectionPropertiesTab.tsx
+++ b/apps/client/src/widgets/ribbon/CollectionPropertiesTab.tsx
@@ -28,7 +28,7 @@ export default function CollectionPropertiesTab({ note }: TabContext) {
   const defaultViewType = (note?.type === "search" ? "list" : "grid");
   const viewTypeWithDefault = (viewType ?? defaultViewType) as ViewTypeOptions;
   const properties = bookPropertiesConfig[viewTypeWithDefault].properties;
-
+  console.warn('CollectionPropertiesTab:', properties)
   return (
     <div className="book-properties-widget">
       {note && (
@@ -137,7 +137,7 @@ function NumberPropertyView({ note, property }: { note: FNote, property: NumberP
 
 function ComboBoxPropertyView({ note, property }: { note: FNote, property: ComboBoxProperty }) {
     const [ value, setValue ] = useNoteLabel(note, property.bindToLabel);
-
+    console.warn('ComboBoxPropertyView:', value)
     return (
         <LabelledEntry label={property.label}>
             <FormSelectWithGroups
@@ -150,6 +150,7 @@ function ComboBoxPropertyView({ note, property }: { note: FNote, property: Combo
 }
 
 function LabelledEntry({ label, children }: { label: string, children: ComponentChildren }) {
+    console.warn('LabelledEntry:', label)
     return (
         <>
             <label>
diff --git a/apps/client/src/widgets/ribbon/NotePropertiesTab.tsx b/apps/client/src/widgets/ribbon/NotePropertiesTab.tsx
deleted file mode 100644
index 9dc1574c7..000000000
--- a/apps/client/src/widgets/ribbon/NotePropertiesTab.tsx
+++ /dev/null
@@ -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>
-    )
-}
diff --git a/apps/client/src/widgets/ribbon/RibbonDefinition.ts b/apps/client/src/widgets/ribbon/RibbonDefinition.ts
index 9f19707cb..fbd8f15d7 100644
--- a/apps/client/src/widgets/ribbon/RibbonDefinition.ts
+++ b/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",