eng-1461 use Rid instead of just spaceUri as mark of import

Author: maparent

apps/obsidian/src/components/DiscourseContextView.tsx

@@ -37,7 +37,7 @@ const DiscourseContext = ({ activeFile }: DiscourseContextProps) => {
       setIsPublished(false);
       return;
     }
-    const isImported = !!frontmatter.importedFromSpaceUri;
+    const isImported = !!frontmatter.importedFromRid;
     const publishedToGroups = frontmatter.publishedToGroups as unknown;
     const published =
       !isImported &&
@@ -125,7 +125,7 @@ const DiscourseContext = ({ activeFile }: DiscourseContextProps) => {
       return <div>Unknown node type: {frontmatter.nodeTypeId}</div>;
     }
 
-    const isImported = !!frontmatter.importedFromSpaceUri;
+    const isImported = !!frontmatter.importedFromRid;
     const modifiedAt =
       typeof frontmatter.lastModified === "number"
         ? frontmatter.lastModified

apps/obsidian/src/components/NodeTypeSettings.tsx

@@ -27,7 +27,7 @@ const generateTagPlaceholder = (format: string, nodeName?: string): string => {
 
 type EditableFieldKey = keyof Omit<
   DiscourseNode,
-  "id" | "shortcut" | "modified" | "created"
+  "id" | "shortcut" | "modified" | "created" | "importedFromRid"
 >;
 
 type BaseFieldConfig = {

apps/obsidian/src/components/RelationshipSettings.tsx

@@ -21,7 +21,7 @@ const RelationshipSettings = () => {
 
   type EditableFieldKey = keyof Omit<
     DiscourseRelation,
-    "id" | "modified" | "created"
+    "id" | "modified" | "created" | "importedFromRid"
   >;
 
   const handleRelationChange = async (

apps/obsidian/src/components/RelationshipTypeSettings.tsx

@@ -99,7 +99,7 @@ const RelationshipTypeSettings = () => {
 
   type EditableFieldKey = keyof Omit<
     DiscourseRelationType,
-    "id" | "modified" | "created"
+    "id" | "modified" | "created" | "importedFromRid"
   >;
 
   const handleRelationTypeChange = (

apps/obsidian/src/index.ts

@@ -27,6 +27,10 @@ import { initializeSupabaseSync } from "~/utils/syncDgNodesToSupabase";
 import { FileChangeListener } from "~/utils/fileChangeListener";
 import generateUid from "~/utils/generateUid";
 import { migrateFrontmatterRelationsToRelationsJson } from "~/utils/relationsStore";
+import {
+  type DiscourseNodeInVault,
+  collectDiscourseNodesFromVault,
+} from "~/utils/getDiscourseNodes";
 
 export default class DiscourseGraphPlugin extends Plugin {
   settings: Settings = { ...DEFAULT_SETTINGS };
@@ -43,6 +47,10 @@ export default class DiscourseGraphPlugin extends Plugin {
       console.error("Failed to migrate frontmatter relations:", error);
     });
 
+    await this.migrateImportedFromFrontMatter().catch((error) => {
+      console.error("Failed to migrate frontmatter:", error);
+    });
+
     if (this.settings.syncModeEnabled === true) {
       void initializeSupabaseSync(this).catch((error) => {
         console.error("Failed to initialize Supabase sync:", error);
@@ -275,7 +283,7 @@ export default class DiscourseGraphPlugin extends Plugin {
         keysToHide.push(
           ...[
             "nodeTypeId",
-            "importedFromSpaceUri",
+            "importedFromRid",
             "nodeInstanceId",
             "publishedToGroups",
             "lastModified",
@@ -395,6 +403,37 @@ export default class DiscourseGraphPlugin extends Plugin {
     this.currentViewActions = [];
   }
 
+  async migrateImportedFromFrontMatter() {
+    const nodes = await collectDiscourseNodesFromVault(this, true);
+    for (const node of nodes) {
+      if (typeof node.frontmatter.importedFromSpaceUri === "string") {
+        await this.app.fileManager.processFrontMatter(
+          node.file,
+          (frontmatter: Record<string, unknown>) => {
+            const oldUri = frontmatter.importedFromSpaceUri as string;
+            // note: we fortunately reused the original Id here.
+            const nodeId = frontmatter.nodeInstanceId;
+            if (typeof nodeId !== "string") {
+              console.error(
+                `error: missing nodeInstanceId on node ${node.file.path}`,
+              );
+              return;
+            }
+            if (!oldUri.startsWith("obsidian:")) {
+              console.error(
+                `error: unexpected value ${oldUri} for importedFromSpaceUri`,
+              );
+              return;
+            }
+            const spaceUri = "orn:obsidian.note:" + oldUri.substring(9);
+            frontmatter.importedFromRid = `${spaceUri}/${nodeId}`;
+            delete frontmatter.importedFromSpaceUri;
+          },
+        );
+      }
+    }
+  }
+
   async onunload() {
     this.cleanupViewActions();
     if (this.styleElement) {

apps/obsidian/src/services/QueryEngine.ts

@@ -297,17 +297,17 @@ export class QueryEngine {
    */
   findExistingImportedFile = (
     nodeInstanceId: string,
-    importedFromSpaceUri: string,
+    importedFromRid: string,
   ): TFile | null => {
     if (this.dc) {
       try {
         const safeId = nodeInstanceId
           .replace(/\\/g, "\\\\")
           .replace(/"/g, '\\"');
-        const safeUri = importedFromSpaceUri
+        const safeUri = importedFromRid
           .replace(/\\/g, "\\\\")
           .replace(/"/g, '\\"');
-        const dcQuery = `@page and nodeInstanceId = "${safeId}" and importedFromSpaceUri = "${safeUri}"`;
+        const dcQuery = `@page and nodeInstanceId = "${safeId}" and importedFromRid = "${safeUri}"`;
         const results = this.dc.query(dcQuery);
 
         for (const page of results) {
@@ -329,7 +329,7 @@ export class QueryEngine {
       const fm = this.app.metadataCache.getFileCache(f)?.frontmatter;
       if (
         fm?.nodeInstanceId === nodeInstanceId &&
-        fm.importedFromSpaceUri === importedFromSpaceUri
+        fm.importedFromRid === importedFromRid
       ) {
         return f;
       }

apps/obsidian/src/types.ts

@@ -13,6 +13,7 @@ export type DiscourseNode = {
   keyImage?: boolean;
   created: number;
   modified: number;
+  importedFromRid?: string;
 };
 
 export type DiscourseRelationType = {
@@ -22,6 +23,7 @@ export type DiscourseRelationType = {
   color: TldrawColorName;
   created: number;
   modified: number;
+  importedFromRid?: string;
 };
 
 export type DiscourseRelation = {
@@ -31,6 +33,19 @@ export type DiscourseRelation = {
   relationshipTypeId: string;
   created: number;
   modified: number;
+  importedFromRid?: string;
+};
+
+export type RelationInstance = {
+  id: string;
+  type: string;
+  source: string;
+  destination: string;
+  created: number;
+  author: string;
+  lastModified?: number;
+  publishedToGroupId?: string[];
+  importedFromRid?: string;
 };
 
 export type Settings = {

apps/obsidian/src/utils/fileChangeListener.ts

@@ -98,7 +98,7 @@ export class FileChangeListener {
       return false;
     }
 
-    if (frontmatter?.importedFromSpaceUri) {
+    if (frontmatter?.importedFromRid) {
       return false;
     }
 

apps/obsidian/src/utils/getDiscourseNodes.ts

@@ -0,0 +1,56 @@
+import type { TFile } from "obsidian";
+import type DiscourseGraphPlugin from "~/index";
+import { ensureNodeInstanceId } from "./nodeInstanceId";
+
+export type DiscourseNodeInVault = {
+  file: TFile;
+  frontmatter: Record<string, unknown>;
+  nodeTypeId: string;
+  nodeInstanceId: string;
+};
+
+/**
+ * Step 1: Collect all discourse nodes from the vault
+ * Filters markdown files that have nodeTypeId in frontmatter
+ */
+export const collectDiscourseNodesFromVault = async (
+  plugin: DiscourseGraphPlugin,
+  includeImported?: boolean,
+): Promise<DiscourseNodeInVault[]> => {
+  const allFiles = plugin.app.vault.getMarkdownFiles();
+  const dgNodes: DiscourseNodeInVault[] = [];
+
+  for (const file of allFiles) {
+    const cache = plugin.app.metadataCache.getFileCache(file);
+    const frontmatter = cache?.frontmatter;
+
+    // Not a discourse node
+    if (!frontmatter?.nodeTypeId) {
+      continue;
+    }
+
+    if (frontmatter.importedFromRid && includeImported !== true) {
+      continue;
+    }
+
+    const nodeTypeId = frontmatter.nodeTypeId as string;
+    if (!nodeTypeId) {
+      continue;
+    }
+
+    const nodeInstanceId = await ensureNodeInstanceId(
+      plugin,
+      file,
+      frontmatter as Record<string, unknown>,
+    );
+
+    dgNodes.push({
+      file,
+      frontmatter: frontmatter as Record<string, unknown>,
+      nodeTypeId,
+      nodeInstanceId,
+    });
+  }
+
+  return dgNodes;
+};

apps/obsidian/src/utils/importNodes.ts

@@ -163,10 +163,13 @@ export const getSpaceNameFromId = async (
   return data.name;
 };
 
-export const getSpaceNameIdFromUri = async (
+export const getSpaceNameIdFromRid = async (
   client: DGSupabaseClient,
-  spaceUri: string,
+  rid: string,
 ): Promise<{ spaceName: string; spaceId: number }> => {
+  const parts = rid.split("/");
+  parts.pop();
+  const spaceUri = parts.join("/");
   const { data, error } = await client
     .from("Space")
     .select("name, id")
@@ -296,9 +299,7 @@ export const fetchNodeContentWithMetadata = async ({
 
   return {
     content: data.text,
-    createdAt: data.created
-      ? new Date(data.created + "Z").valueOf()
-      : 0,
+    createdAt: data.created ? new Date(data.created + "Z").valueOf() : 0,
     modifiedAt: data.last_modified
       ? new Date(data.last_modified + "Z").valueOf()
       : 0,
@@ -382,15 +383,15 @@ const fetchNodeContentForImport = async ({
 export const getSourceContentDates = async ({
   plugin,
   nodeInstanceId,
-  spaceUri,
+  importedFromRid,
 }: {
   plugin: DiscourseGraphPlugin;
   nodeInstanceId: string;
-  spaceUri: string;
+  importedFromRid: string;
 }): Promise<{ createdAt: string; modifiedAt: string } | null> => {
   const client = await getLoggedInClient(plugin);
   if (!client) return null;
-  const { spaceId } = await getSpaceNameIdFromUri(client, spaceUri);
+  const { spaceId } = await getSpaceNameIdFromRid(client, importedFromRid);
   if (spaceId < 0) return null;
   const { data, error } = await client
     .from("my_contents")
@@ -1074,6 +1075,7 @@ const processFileContent = async ({
   //    often empty immediately after create/modify), then map nodeTypeId and update frontmatter.
   const { frontmatter } = parseFrontmatter(rawContent);
   const sourceNodeTypeId = frontmatter.nodeTypeId;
+  const sourceNodeId = frontmatter.nodeInstanceId;
 
   let mappedNodeTypeId: string | undefined;
   if (sourceNodeTypeId && typeof sourceNodeTypeId === "string") {
@@ -1092,7 +1094,7 @@ const processFileContent = async ({
       if (mappedNodeTypeId !== undefined) {
         record.nodeTypeId = mappedNodeTypeId;
       }
-      record.importedFromSpaceUri = sourceSpaceUri;
+      record.importedFromRid = `${sourceSpaceUri}/${sourceNodeId}`;
       record.lastModified = importedModifiedAt;
     },
     stat,
@@ -1321,24 +1323,24 @@ export const refreshImportedFile = async ({
   }
   const cache = plugin.app.metadataCache.getFileCache(file);
   const frontmatter = cache?.frontmatter as Record<string, unknown> | undefined;
-  if (!frontmatter?.importedFromSpaceUri || !frontmatter?.nodeInstanceId) {
+  if (!frontmatter?.importedFromRid || !frontmatter?.nodeInstanceId) {
     return {
       success: false,
-      error: "Missing frontmatter: importedFromSpaceUri or nodeInstanceId",
+      error: "Missing frontmatter: importedFromRid or nodeInstanceId",
     };
   }
   if (
-    typeof frontmatter.importedFromSpaceUri !== "string" ||
+    typeof frontmatter.importedFromRid !== "string" ||
     typeof frontmatter.nodeInstanceId !== "string"
   ) {
     return {
       success: false,
-      error: "Non-string frontmatter: importedFromSpaceUri or nodeInstanceId",
+      error: "Non-string frontmatter: importedFromRid or nodeInstanceId",
     };
   }
-  const { spaceName, spaceId } = await getSpaceNameIdFromUri(
+  const { spaceName, spaceId } = await getSpaceNameIdFromRid(
     supabaseClient,
-    frontmatter.importedFromSpaceUri,
+    frontmatter.importedFromRid,
   );
   if (spaceId === -1) {
     return { success: false, error: "Could not get the space Id" };
@@ -1397,7 +1399,7 @@ export const refreshAllImportedFiles = async (
   for (const file of allFiles) {
     const cache = plugin.app.metadataCache.getFileCache(file);
     const frontmatter = cache?.frontmatter;
-    if (frontmatter?.importedFromSpaceUri && frontmatter?.nodeInstanceId) {
+    if (frontmatter?.importedFromRid && frontmatter?.nodeInstanceId) {
       importedFiles.push(file);
     }
   }