Merge branch 'one-to-one'

Author: Paul Korzhyk

client/src/e2etests/oneToOne.test.js

@@ -0,0 +1,57 @@
+import puppeteer from "puppeteer";
+
+import {
+    easyUid,
+    createHttpClient,
+    createTestTab,
+    setupBrowser,
+    typeAndRun,
+    waitForEditor,
+    waitForActiveTab,
+    waitForElement,
+} from "./puppetHelpers";
+
+let browser = null;
+
+beforeAll(async () => {
+    browser = await setupBrowser();
+});
+
+afterAll(async () => browser && (await browser.close()));
+
+test("Should draw one to one nodes", async () => {
+    const page = await createTestTab(browser);
+
+    await waitForEditor(page);
+
+    const testId = `testRun${easyUid()}`;
+
+    await createHttpClient().alter({ schema: `${testId}: uid .` });
+    await createHttpClient()
+        .newTxn()
+        .mutate({
+            setJson: {
+                [testId + "_name"]: "Alice",
+                [testId]: {
+                    [testId + "_name"]: "Bob",
+                },
+            },
+            commitNow: true,
+        });
+
+    await typeAndRun(
+        page,
+        `{
+            query(func: has(${testId})) {
+              uid
+              ${testId} { uid }
+    `,
+    );
+
+    const summarySelector = ".graph-overlay .title";
+    await waitForElement(page, summarySelector);
+
+    await expect(
+        page.$eval(summarySelector, el => el.textContent),
+    ).resolves.toBe("Showing 2 nodes and 1 edges");
+});

client/src/lib/graph.js

@@ -86,14 +86,13 @@ export class GraphParser {
     addResponseToQueue = (response, expansionNode = "FromResponse") => {
         response = cloneDeep(response);
 
-        Object.entries(response).forEach(([key, block], index) =>
+        Object.entries(response).forEach(([key, block]) =>
             block.forEach(node =>
                 this.queue.push({
                     node,
                     src: {
                         id: "",
                         pred: key,
-                        index,
                         expansionNode,
                     },
                 }),
@@ -163,17 +162,30 @@ export class GraphParser {
                     typeof val[0] === "object"
                 ) {
                     // These are child nodes, lets add them to the queue.
-                    val.map((x, index) =>
+                    val.map(x =>
                         this.queue.push({
                             node: x,
                             src: {
                                 pred: prop,
                                 id: uid,
-                                index,
                                 expansionNode: obj.src.expansionNode,
                             },
                         }),
                     );
+                } else if (
+                    typeof val === "object" &&
+                    val &&
+                    typeof val.uid === "string"
+                ) {
+                    // This is a one to one relationship in v1.1.
+                    this.queue.push({
+                        node: val,
+                        src: {
+                            pred: prop,
+                            id: uid,
+                            expansionNode: obj.src.expansionNode,
+                        },
+                    });
                 } else {
                     properties.attrs[prop] = val;
                 }