Release v1.4.2

Author: trangdoan982

main.js

@@ -1,7 +1,7 @@
 {
   "id": "discourse-graphs",
   "name": "Discourse Graph",
-  "version": "1.3.0",
+  "version": "1.4.2",
   "minAppVersion": "1.7.0",
   "description": "Add semantic structure to your notes with the Discourse Graph protocol.",
   "author": "Discourse Graphs",

manifest.json

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/naming-convention */
 import esbuild from "esbuild";
 import fs from "fs";
 import path from "path";

plugin.zip

@@ -447,7 +447,7 @@ const createGithubRelease = async ({
   const octokit = new Octokit({ auth: token });
   const owner = OWNER;
   const repo = REPO;
-  const tagName = `${version}`;
+  const tagName = `v${version}`;
   const releaseTitle = releaseName || `Discourse Graph v${version}`;
   const isPrerelease = !isExternalRelease(version);
 

scripts/compile.ts

@@ -1,8 +1,10 @@
 import { useState, useCallback } from "react";
 import { usePlugin } from "./PluginContext";
-import { Notice } from "obsidian";
+import { Notice, setIcon } from "obsidian";
 import { updateUsername } from "~/utils/supabaseContext";
 import { initializeSupabaseSync } from "~/utils/syncDgNodesToSupabase";
+import { nextRoot } from "@repo/utils/execContext";
+import { getLoggedInClient } from "~/utils/supabaseContext";
 
 export const AdminPanelSettings = () => {
   const plugin = usePlugin();
@@ -41,6 +43,33 @@ export const AdminPanelSettings = () => {
     await updateUsername(plugin, newValue);
   };
 
+  const handleLoginHandoff = async () => {
+    const client = await getLoggedInClient(plugin);
+    if (!client) {
+      new Notice("Failed to connect to the database", 3000);
+      return;
+    }
+    const sessionData = await client.auth.getSession();
+    if (!sessionData.data.session) {
+      new Notice("Failed to connect to the database", 3000);
+      return;
+    }
+    const { access_token, refresh_token } = sessionData.data.session;
+    const { data, error } = await client.rpc("create_secret_token", {
+      v_payload: JSON.stringify({ access_token, refresh_token }),
+      expiry_interval: "45s",
+    });
+    if (error || typeof data !== "string") {
+      new Notice("Failed to connect to the database", 3000);
+      return;
+    }
+    if (data)
+      window.open(
+        `${nextRoot()}auth/token?t=${data}&url=/auth/group`,
+        "_blank",
+      );
+  };
+
   return (
     <div className="general-settings">
       <div className="setting-item">
@@ -80,6 +109,31 @@ export const AdminPanelSettings = () => {
           />
         </div>
       </div>
+      <div
+        className={
+          "setting-item " + (plugin.settings.syncModeEnabled ? "" : "hidden")
+        }
+      >
+        <div className="setting-item-info">
+          <div className="setting-item-name">Group management</div>
+          <div className="setting-item-description">
+            This will allow you to view and manage your sharing groups
+          </div>
+        </div>
+        <div className="setting-item-control">
+          <button
+            onClick={() => {
+              void handleLoginHandoff();
+            }}
+          >
+            Manage groups
+            <span
+              className="icon"
+              ref={(el) => (el && setIcon(el, "arrow-up-right")) || undefined}
+            />
+          </button>
+        </div>
+      </div>
     </div>
   );
 };

scripts/publish.ts

@@ -31,7 +31,7 @@ type InfoTooltipProps = {
   content: string;
 };
 
-const InfoTooltip = ({ content }: InfoTooltipProps) => (
+export const InfoTooltip = ({ content }: InfoTooltipProps) => (
   <button
     ref={(el) => {
       if (el) setTooltip(el, content);
@@ -243,7 +243,14 @@ const DiscourseContext = ({ activeFile }: DiscourseContextProps) => {
                 View only
               </span>
               <InfoTooltip
-                content={`Imported from ${formattedVaultName}. Direct edits will be overwritten when refreshed.`}
+                content={
+                  `Imported from ${formattedVaultName}. ` +
+                  (frontmatter.authorId &&
+                  typeof frontmatter.authorId === "number"
+                    ? `By ${getUserNameById(plugin, frontmatter.authorId)}. `
+                    : "") +
+                  "Direct edits will be overwritten when refreshed."
+                }
               />
             </div>
           )}
@@ -255,15 +262,6 @@ const DiscourseContext = ({ activeFile }: DiscourseContextProps) => {
             </div>
           )}
 
-          {isImported &&
-            frontmatter.authorId &&
-            typeof frontmatter.authorId === "number" && (
-              <div className="text-modifier-text mt-2 text-xs">
-                <div>
-                  Author: {getUserNameById(plugin, frontmatter.authorId)}
-                </div>
-              </div>
-            )}
           {isImported && sourceDates && (
             <div className="text-modifier-text mt-2 text-xs">
               <div>Created in source: {sourceDates.createdAt}</div>

src/components/AdminPanelSettings.tsx

@@ -301,7 +301,7 @@ const GeneralSettings = () => {
                 handleNodeTagHotkeyChange("");
               }
             }}
-            placeholder="\\"
+            placeholder="\"
             maxLength={1}
           />
         </div>

src/components/DiscourseContextView.tsx

@@ -1,7 +1,8 @@
-import { Editor } from "obsidian";
+import { Editor, MarkdownView } from "obsidian";
 import { DiscourseNode } from "~/types";
-import { createDiscourseNode } from "~/utils/createNode";
 import type DiscourseGraphPlugin from "~/index";
+import { createModifyNodeModalSubmitHandler } from "~/utils/registerCommands";
+import ModifyNodeModal from "./ModifyNodeModal";
 
 /**
  * A popover that shows all node types inline near the cursor/selection.
@@ -98,7 +99,7 @@ export class InlineNodeTypePicker {
       itemEl.addEventListener("mousedown", (e) => {
         e.preventDefault();
         e.stopPropagation();
-        void this.selectItem(item);
+        this.selectItem(item);
       });
 
       itemEl.addEventListener("mouseenter", () => {
@@ -138,14 +139,22 @@ export class InlineNodeTypePicker {
     }
   }
 
-  private async selectItem(item: DiscourseNode) {
+  private selectItem(item: DiscourseNode) {
     this.close();
-    await createDiscourseNode({
+    const currentFile =
+      this.options.plugin.app.workspace.getActiveViewOfType(MarkdownView)
+        ?.file || undefined;
+    new ModifyNodeModal(this.options.plugin.app, {
+      nodeTypes: this.options.plugin.settings.nodeTypes,
       plugin: this.options.plugin,
-      nodeType: item,
-      text: this.options.selectedText,
-      editor: this.options.editor,
-    });
+      initialTitle: this.options.selectedText,
+      initialNodeType: item,
+      currentFile,
+      onSubmit: createModifyNodeModalSubmitHandler(
+        this.options.plugin,
+        this.options.editor,
+      ),
+    }).open();
   }
 
   private setupEventHandlers() {
@@ -173,7 +182,7 @@ export class InlineNodeTypePicker {
         e.stopPropagation();
         const selectedItem = this.items[this.selectedIndex];
         if (selectedItem) {
-          void this.selectItem(selectedItem);
+          this.selectItem(selectedItem);
         }
       } else if (e.key === "Escape") {
         e.preventDefault();

src/components/GeneralSettings.tsx

@@ -53,8 +53,13 @@ type ModifyNodeFormProps = {
   onCancel: () => void;
   initialTitle?: string;
   initialNodeType?: DiscourseNode;
-  initialFile?: TFile; // for edit mode
-  currentFile?: TFile; // the file where the node is being created from
+  /** Present in edit mode — the file being modified. Also drives `isEditMode`. */
+  initialFile?: TFile;
+  /** Context file for the "Relationship with …" block (editor "Turn into" flow). */
+  currentFile?: TFile;
+  /** Hides the search-existing-nodes dropdown. Used when intent is always to create
+   *  (e.g. file explorer "Convert into"), not to reuse an existing node. */
+  disableExistingNodeSearch?: boolean;
   plugin: DiscourseGraphPlugin;
 };
 
@@ -66,6 +71,7 @@ export const ModifyNodeForm = ({
   initialNodeType,
   initialFile,
   currentFile,
+  disableExistingNodeSearch = false,
   plugin,
 }: ModifyNodeFormProps) => {
   const isEditMode = !!initialFile;
@@ -95,9 +101,9 @@ export const ModifyNodeForm = ({
     [selectedNodeType],
   );
 
-  // Search for nodes when query changes (only in create mode)
+  // Search for nodes when query changes (only in create mode, and only when search is enabled)
   useEffect(() => {
-    if (isEditMode) {
+    if (isEditMode || disableExistingNodeSearch) {
       setSearchResults([]);
       return;
     }
@@ -137,16 +143,23 @@ export const ModifyNodeForm = ({
         clearTimeout(debounceTimeoutRef.current);
       }
     };
-  }, [query, selectedNodeType, isEditMode]);
+  }, [query, selectedNodeType, isEditMode, disableExistingNodeSearch]);
 
   const isOpen = useMemo(() => {
     return (
+      !disableExistingNodeSearch &&
       !selectedExistingNode &&
       isFocused &&
       searchResults.length > 0 &&
       query.trim().length >= 2
     );
-  }, [selectedExistingNode, isFocused, searchResults.length, query]);
+  }, [
+    disableExistingNodeSearch,
+    selectedExistingNode,
+    isFocused,
+    searchResults.length,
+    query,
+  ]);
 
   useEffect(() => {
     setActiveIndex(0);
@@ -177,9 +190,14 @@ export const ModifyNodeForm = ({
     }
   }, [activeIndex, isOpen]);
 
-  // Focus the content input on mount so users can start typing immediately
+  // Focus the content input on mount so users can start typing immediately,
+  // with cursor placed at the end of any pre-filled text
   useEffect(() => {
-    titleInputRef.current?.focus();
+    const el = titleInputRef.current;
+    if (!el) return;
+    el.focus();
+    const len = el.value.length;
+    el.setSelectionRange(len, len);
   }, []);
 
   useEffect(() => {
@@ -449,15 +467,19 @@ export const ModifyNodeForm = ({
                 placeholder={
                   isEditMode
                     ? "Enter new content"
-                    : selectedNodeType
-                      ? `Search for existing ${selectedNodeType.name.toLowerCase()} or enter new content`
-                      : "Search for existing nodes or enter new content"
+                    : disableExistingNodeSearch
+                      ? selectedNodeType
+                        ? `Enter ${selectedNodeType.name.toLowerCase()} content`
+                        : "Enter content"
+                      : selectedNodeType
+                        ? `Search for existing ${selectedNodeType.name.toLowerCase()} or enter new content`
+                        : "Search for existing nodes or enter new content"
                 }
                 value={query}
                 onChange={handleQueryChange}
                 onKeyDown={handleKeyDown}
                 onFocus={() => {
-                  if (!isEditMode) {
+                  if (!isEditMode && !disableExistingNodeSearch) {
                     setIsFocused(true);
                   }
                 }}
@@ -604,8 +626,12 @@ type ModifyNodeModalProps = {
   }) => Promise<void>;
   initialTitle?: string;
   initialNodeType?: DiscourseNode;
+  /** Present in edit mode — the file being modified. */
   initialFile?: TFile;
+  /** Context file for the "Relationship with …" block (editor "Turn into" flow). */
   currentFile?: TFile;
+  /** See `ModifyNodeFormProps.disableExistingNodeSearch`. */
+  disableExistingNodeSearch?: boolean;
 };
 
 class ModifyNodeModal extends Modal {
@@ -623,6 +649,7 @@ class ModifyNodeModal extends Modal {
   private initialNodeType?: DiscourseNode;
   private initialFile?: TFile;
   private currentFile?: TFile;
+  private disableExistingNodeSearch: boolean;
   private plugin: DiscourseGraphPlugin;
 
   constructor(app: App, props: ModifyNodeModalProps) {
@@ -633,6 +660,7 @@ class ModifyNodeModal extends Modal {
     this.initialNodeType = props.initialNodeType;
     this.initialFile = props.initialFile;
     this.currentFile = props.currentFile;
+    this.disableExistingNodeSearch = props.disableExistingNodeSearch ?? false;
     this.plugin = props.plugin;
   }
 
@@ -651,6 +679,7 @@ class ModifyNodeModal extends Modal {
           initialNodeType={this.initialNodeType}
           initialFile={this.initialFile}
           currentFile={this.currentFile}
+          disableExistingNodeSearch={this.disableExistingNodeSearch}
           plugin={this.plugin}
         />
       </StrictMode>,