ENG-1461 Use full Rid instead of just spaceUri as marker of import (#808)

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

@@ -275,7 +275,7 @@ export default class DiscourseGraphPlugin extends Plugin {
         keysToHide.push(
           ...[
             "nodeTypeId",
-            "importedFromSpaceUri",
+            "importedFromRid",
             "nodeInstanceId",
             "publishedToGroups",
             "lastModified",

apps/obsidian/src/services/QueryEngine.ts

@@ -291,23 +291,23 @@ export class QueryEngine {
   }
 
   /**
-   * Find an existing imported file by nodeInstanceId and importedFromSpaceUri
+   * Find an existing imported file by nodeInstanceId and importedFromRid
    * Uses DataCore when available; falls back to vault iteration otherwise
    * Returns the file if found, null otherwise
    */
   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,60 @@
+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 (
+      // note: importedFromSpaceUri is legacy
+      (frontmatter.importedFromRid || frontmatter.importedFromSpaceUri) &&
+      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;
+};