Merge 46b8f01b19 into e28da416ba

apps/client/src/components/app_context.ts

@@ -328,6 +328,7 @@ export type CommandMappings = {
     exportAsPdf: CommandData;
     openNoteExternally: CommandData;
     openNoteCustom: CommandData;
+    openNoteOnServer: CommandData;
     renderActiveNote: CommandData;
     unhoist: CommandData;
     reloadFrontendApp: CommandData;

apps/client/src/components/root_command_executor.ts

@@ -67,6 +67,13 @@ export default class RootCommandExecutor extends Component {
         }
     }
 
+    openNoteOnServerCommand() {
+        const noteId = appContext.tabManager.getActiveContextNoteId();
+        if (noteId) {
+            openService.openNoteOnServer(noteId);
+        }
+    }
+
     enterProtectedSessionCommand() {
         protectedSessionService.enterProtectedSession();
     }

apps/client/src/services/open.ts

@@ -1,5 +1,6 @@
 import utils from "./utils.js";
 import server from "./server.js";
+import options from "./options.js";
 
 type ExecFunction = (command: string, cb: (err: string, stdout: string, stderror: string) => void) => void;
 
@@ -171,6 +172,21 @@ function getHost() {
     return `${url.protocol}//${url.hostname}:${url.port}`;
 }
 
+async function openNoteOnServer(noteId: string) {
+    // Get the sync server host from options
+    const syncServerHost = options.get("syncServerHost");
+    
+    if (!syncServerHost) {
+        console.error("No sync server host configured");
+        return;
+    }
+    
+    const url = new URL(`#root/${noteId}`, syncServerHost).toString();
+    
+    // Use window.open to ensure link opens in external browser in Electron
+    window.open(url, '_blank', 'noopener,noreferrer');
+}
+
 async function openDirectory(directory: string) {
     try {
         if (utils.isElectron()) {
@@ -198,5 +214,6 @@ export default {
     openAttachmentExternally,
     openNoteCustom,
     openAttachmentCustom,
+    openNoteOnServer,
     openDirectory
 };

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

@@ -682,6 +682,7 @@
     "open_note_externally": "Open note externally",
     "open_note_externally_title": "File will be open in an external application and watched for changes. You'll then be able to upload the modified version back to Trilium.",
     "open_note_custom": "Open note custom",
+    "open_note_on_server": "Open note on server",
     "import_files": "Import files",
     "export_note": "Export note",
     "delete_note": "Delete note",

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

@@ -1,4 +1,4 @@
-import { ConvertToAttachmentResponse } from "@triliumnext/commons";
+import { ConvertToAttachmentResponse, OptionNames } from "@triliumnext/commons";
 import appContext, { CommandNames } from "../../components/app_context";
 import FNote from "../../entities/fnote"
 import dialog from "../../services/dialog";
@@ -12,6 +12,7 @@ import { FormDropdownDivider, FormListItem } from "../react/FormList";
 import { isElectron as getIsElectron, isMac as getIsMac } from "../../services/utils";
 import { ParentComponent } from "../react/react_utils";
 import { useContext } from "preact/hooks";
+import { useTriliumOption } from "../react/hooks";
 import NoteContext from "../../components/note_context";
 import branches from "../../services/branches";
 
@@ -52,6 +53,7 @@ function NoteContextMenu({ note, noteContext }: { note: FNote, noteContext?: Not
   const isMac = getIsMac();
   const hasSource = ["text", "code", "relationMap", "mermaid", "canvas", "mindMap"].includes(note.type);
   const isSearchOrBook = ["search", "book"].includes(note.type);
+  const [ syncServerHost ] = useTriliumOption("syncServerHost");
 
   return (
     <Dropdown
@@ -82,6 +84,9 @@ function NoteContextMenu({ note, noteContext }: { note: FNote, noteContext?: Not
       <CommandItem command="openNoteExternally" icon="bx bx-file-find" disabled={isSearchOrBook || !isElectron} text={t("note_actions.open_note_externally")} title={t("note_actions.open_note_externally_title")} />
       <CommandItem command="openNoteCustom" icon="bx bx-customize" disabled={isSearchOrBook || isMac || !isElectron} text={t("note_actions.open_note_custom")} />
       <CommandItem command="showNoteSource" icon="bx bx-code" disabled={!hasSource} text={t("note_actions.note_source")} />
+      {(syncServerHost && isElectron) &&
+        <CommandItem command="openNoteOnServer" icon="bx bx-world" disabled={!syncServerHost} text={t("note_actions.open_note_on_server")} />
+      }
       <FormDropdownDivider />
 
       <CommandItem command="forceSaveRevision" icon="bx bx-save" disabled={isInOptionsOrHelp} text={t("note_actions.save_revision")} />