datajunction-ui 0.0.1-a44.dev5 → 0.0.1-a45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datajunction-ui",
-  "version": "0.0.1-a44.dev5",
+  "version": "0.0.1a45",
   "description": "DataJunction Metrics Platform UI",
   "module": "src/index.tsx",
   "repository": {

package/src/app/pages/AddEditNodePage/NodeQueryField.jsx

@@ -68,6 +68,9 @@ export const NodeQueryField = ({ djClient, value }) => {
             }),
           ]}
           value={value}
+          placeholder={
+            'SELECT\n\tprimary_key,\n\tmeasure1,\n\tmeasure2,\n\tforeign_key_for_dimension1,\n\tforeign_key_for_dimension2\nFROM source.source_node\nWHERE ...'
+          }
           options={{
             theme: 'default',
             lineNumbers: true,

package/src/app/pages/NodePage/__tests__/AddMaterializationPopover.test.jsx

@@ -33,7 +33,7 @@ describe('<AddMaterializationPopover />', () => {
             job_class: 'SparkSqlMaterializationJob',
           },
           {
-            name: 'druid_cube',
+            name: 'druid_metrics_cube',
             label: 'Druid Cube',
             description:
               'Used to materialize a cube to Druid for low-latency access to a set of metrics and dimensions. While the logical cube definition is at the level of metrics and dimensions, a materialized Druid cube will reference measures and dimensions, with rollup configured on the measures where appropriate.',

package/src/app/services/DJService.js

@@ -613,6 +613,51 @@ export const DataJunctionAPI = {
     );
     return { status: response.status, json: await response.json() };
   },
+
+  addComplexDimensionLink: async function (
+    nodeName,
+    dimensionNode,
+    joinOn,
+    joinType = null,
+    joinCardinality = null,
+    role = null,
+  ) {
+    const response = await fetch(`${DJ_URL}/nodes/${nodeName}/link`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        dimensionNode: dimensionNode,
+        joinType: joinType,
+        joinOn: joinOn,
+        joinCardinality: joinCardinality,
+        role: role,
+      }),
+      credentials: 'include',
+    });
+    return { status: response.status, json: await response.json() };
+  },
+
+  removeComplexDimensionLink: async function (
+    nodeName,
+    dimensionNode,
+    role = null,
+  ) {
+    const response = await fetch(`${DJ_URL}/nodes/${nodeName}/link`, {
+      method: 'DELETE',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        dimensionNode: dimensionNode,
+        role: role,
+      }),
+      credentials: 'include',
+    });
+    return { status: response.status, json: await response.json() };
+  },
+
   deactivate: async function (nodeName) {
     const response = await fetch(`${DJ_URL}/nodes/${nodeName}`, {
       method: 'DELETE',

package/src/app/services/__tests__/DJService.test.jsx

@@ -656,6 +656,46 @@ describe('DataJunctionAPI', () => {
     );
   });
 
+  it('calls add and remove complex dimension link correctly', async () => {
+    const nodeName = 'default.transform1';
+    const dimensionNode = 'default.dimension1';
+    const joinOn = 'blah';
+    fetch.mockResponseOnce(JSON.stringify({}));
+    await DataJunctionAPI.removeComplexDimensionLink(nodeName, dimensionNode);
+    expect(fetch).toHaveBeenCalledWith(`${DJ_URL}/nodes/${nodeName}/link`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        dimensionNode: dimensionNode,
+        role: null,
+      }),
+      method: 'DELETE',
+    });
+
+    fetch.mockResponseOnce(JSON.stringify({}));
+    await DataJunctionAPI.addComplexDimensionLink(
+      nodeName,
+      dimensionNode,
+      joinOn,
+    );
+    expect(fetch).toHaveBeenCalledWith(`${DJ_URL}/nodes/${nodeName}/link`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        dimensionNode: dimensionNode,
+        joinType: null,
+        joinOn: joinOn,
+        joinCardinality: null,
+        role: null,
+      }),
+      method: 'POST',
+    });
+  });
+
   it('calls deactivate correctly', async () => {
     const nodeName = 'default.transform1';
     fetch.mockResponseOnce(JSON.stringify({}));