datajunction-ui 0.0.1-rc.23 → 0.0.1-rc.25

package/src/app/pages/NodePage/NodeInfoTab.jsx

@@ -13,7 +13,11 @@ foundation.hljs['padding'] = '2rem';
 export default function NodeInfoTab({ node }) {
   const [compiledSQL, setCompiledSQL] = useState('');
   const [checked, setChecked] = useState(false);
-  const nodeTags = node?.tags.map(tag => <div>{tag}</div>);
+  const nodeTags = node?.tags.map(tag => (
+    <div className={'badge tag_value'}>
+      <a href={`/tags/${tag.name}`}>{tag.display_name}</a>
+    </div>
+  ));
   const djClient = useContext(DJClientContext).DataJunctionAPI;
   useEffect(() => {
     const fetchData = async () => {

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

@@ -70,6 +70,7 @@ describe('<NodePage />', () => {
         {
           name: 'default_DOT_avg_repair_price',
           type: 'double',
+          display_name: 'Default DOT avg repair price',
           attributes: [],
           dimension: null,
         },
@@ -82,7 +83,7 @@ describe('<NodePage />', () => {
         },
       ],
       created_at: '2023-08-21T16:48:56.932162+00:00',
-      tags: [],
+      tags: [{ name: 'purpose', display_name: 'Purpose' }],
       primary_key: [],
       createNodeClientCode:
         'dj = DJBuilder(DJ_URL)\n\navg_repair_price = dj.create_metric(\n    description="Average repair price",\n    display_name="Default: Avg Repair Price",\n    name="default.avg_repair_price",\n    primary_key=[],\n    query="""SELECT  avg(price) default_DOT_avg_repair_price \n FROM default.repair_order_details\n\n"""\n)',
@@ -303,13 +304,12 @@ describe('<NodePage />', () => {
         'v1.0',
       );
 
-      // expect(screen.getByRole('dialog', { name: 'Table' })).not.toBeInTheDocument();
       expect(
         screen.getByRole('dialog', { name: 'NodeStatus' }),
       ).toBeInTheDocument();
 
       expect(screen.getByRole('dialog', { name: 'Tags' })).toHaveTextContent(
-        '',
+        'Purpose',
       );
 
       expect(
@@ -416,6 +416,9 @@ describe('<NodePage />', () => {
       expect(
         screen.getByRole('columnheader', { name: 'ColumnName' }),
       ).toHaveTextContent('default_DOT_avg_repair_price');
+      expect(
+        screen.getByRole('columnheader', { name: 'ColumnDisplayName' }),
+      ).toHaveTextContent('Default DOT avg repair price');
       expect(
         screen.getByRole('columnheader', { name: 'ColumnType' }),
       ).toHaveTextContent('double');

package/src/app/pages/RegisterTablePage/__tests__/__snapshots__/RegisterTablePage.test.jsx.snap

@@ -4,6 +4,7 @@ exports[`<RegisterTablePage /> registers a table correctly 1`] = `
 HTMLCollection [
   <div
     class="message success"
+    data-testid="success"
   >
     <svg
       class="bi bi-check-circle-fill"

package/src/app/pages/Root/index.tsx

@@ -59,7 +59,7 @@ export function Root() {
         ) : (
           <span className="menu-link">
             <span className="menu-title">
-              <button onClick={handleLogout}>Logout</button>
+              <a onClick={handleLogout}>Logout</a>
             </span>
           </span>
         )}

package/src/app/pages/TagPage/Loadable.jsx

@@ -0,0 +1,16 @@
+/**
+ * Asynchronously loads the component for the Node page
+ */
+
+import * as React from 'react';
+import { lazyLoad } from '../../../utils/loadable';
+
+export const TagPage = () => {
+  return lazyLoad(
+    () => import('./index'),
+    module => module.TagPage,
+    {
+      fallback: <div></div>,
+    },
+  )();
+};

package/src/app/pages/TagPage/__tests__/TagPage.test.jsx

@@ -0,0 +1,70 @@
+import React from 'react';
+import { screen, waitFor } from '@testing-library/react';
+import fetchMock from 'jest-fetch-mock';
+import { render } from '../../../../setupTests';
+import { MemoryRouter, Route, Routes } from 'react-router-dom';
+import DJClientContext from '../../../providers/djclient';
+import { TagPage } from '../index';
+
+describe('<TagPage />', () => {
+  const initializeMockDJClient = () => {
+    return {
+      DataJunctionAPI: {
+        getTag: jest.fn(),
+        listNodesForTag: jest.fn(),
+      },
+    };
+  };
+
+  const mockDjClient = initializeMockDJClient();
+
+  beforeEach(() => {
+    fetchMock.resetMocks();
+    jest.clearAllMocks();
+    window.scrollTo = jest.fn();
+
+    mockDjClient.DataJunctionAPI.getTag.mockReturnValue({
+      name: 'domains.com',
+      tag_type: 'domains',
+      description: 'Top-level domain .com',
+    });
+    mockDjClient.DataJunctionAPI.listNodesForTag.mockReturnValue([
+      {
+        name: 'random.node_a',
+        type: 'metric',
+        display_name: 'Node A',
+      },
+    ]);
+  });
+
+  const renderTagsPage = element => {
+    return render(
+      <MemoryRouter initialEntries={['/tags/:name']}>
+        <Routes>
+          <Route path="tags/:name" element={element} />
+        </Routes>
+      </MemoryRouter>,
+    );
+  };
+
+  const testElement = djClient => {
+    return (
+      <DJClientContext.Provider value={djClient}>
+        <TagPage />
+      </DJClientContext.Provider>
+    );
+  };
+
+  it('renders the tag page correctly', async () => {
+    const element = testElement(mockDjClient);
+    renderTagsPage(element);
+    await waitFor(() => {
+      expect(mockDjClient.DataJunctionAPI.getTag).toHaveBeenCalledTimes(1);
+      expect(
+        mockDjClient.DataJunctionAPI.listNodesForTag,
+      ).toHaveBeenCalledTimes(1);
+    });
+    expect(screen.getByText('Nodes')).toBeInTheDocument();
+    expect(screen.getByText('Node A')).toBeInTheDocument();
+  }, 60000);
+});

package/src/app/pages/TagPage/index.jsx

@@ -0,0 +1,79 @@
+/**
+ * For a given tag, displays nodes tagged with it
+ */
+import NamespaceHeader from '../../components/NamespaceHeader';
+import React, { useContext, useEffect, useState } from 'react';
+import 'styles/node-creation.scss';
+import DJClientContext from '../../providers/djclient';
+import { useParams } from 'react-router-dom';
+
+export function TagPage() {
+  const [nodes, setNodes] = useState([]);
+  const [tag, setTag] = useState([]);
+
+  const { name } = useParams();
+
+  const djClient = useContext(DJClientContext).DataJunctionAPI;
+  useEffect(() => {
+    const fetchData = async () => {
+      const data = await djClient.listNodesForTag(name);
+      const tagData = await djClient.getTag(name);
+      setNodes(data);
+      setTag(tagData);
+    };
+    fetchData().catch(console.error);
+  }, [djClient, name]);
+
+  return (
+    <div className="mid">
+      <NamespaceHeader namespace="" />
+      <div className="card">
+        <div className="card-header">
+          <h3
+            className="card-title align-items-start flex-column"
+            style={{ display: 'inline-block' }}
+          >
+            Tag
+          </h3>
+          <div>
+            <div style={{ marginBottom: '1.5rem' }}>
+              <h6 className="mb-0 w-100">Display Name</h6>
+              <p className="mb-0 opacity-75">{tag.display_name}</p>
+            </div>
+            <div style={{ marginBottom: '1.5rem' }}>
+              <h6 className="mb-0 w-100">Name</h6>
+              <p className="mb-0 opacity-75">{name}</p>
+            </div>
+            <div style={{ marginBottom: '1.5rem' }}>
+              <h6 className="mb-0 w-100">Tag Type</h6>
+              <p className="mb-0 opacity-75">{tag.tag_type}</p>
+            </div>
+            <div style={{ marginBottom: '1.5rem' }}>
+              <h6 className="mb-0 w-100">Description</h6>
+              <p className="mb-0 opacity-75">{tag.description}</p>
+            </div>
+            <div style={{ marginBottom: '1.5rem' }}>
+              <h6 className="mb-0 w-100">Nodes</h6>
+              <div className={`list-group-item`}>
+                {nodes?.map(node => (
+                  <div
+                    className="button-3 cube-element"
+                    key={node.name}
+                    role="cell"
+                    aria-label="CubeElement"
+                    aria-hidden="false"
+                  >
+                    <a href={`/nodes/${node.name}`}>{node.display_name}</a>
+                    <span className={`badge node_type__${node.type}`}>
+                      {node.type}
+                    </span>
+                  </div>
+                ))}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

package/src/app/services/DJService.js

@@ -12,7 +12,7 @@ export const DataJunctionAPI = {
   },
 
   logout: async function () {
-    await await fetch(`${DJ_URL}/basic/logout/`, {
+    await await fetch(`${DJ_URL}/logout/`, {
       credentials: 'include',
       method: 'POST',
     });
@@ -497,4 +497,82 @@ export const DataJunctionAPI = {
     });
     return { status: response.status, json: await response.json() };
   },
+  listTags: async function () {
+    const response = await fetch(`${DJ_URL}/tags`, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      credentials: 'include',
+    });
+    return await response.json();
+  },
+  getTag: async function (tagName) {
+    const response = await fetch(`${DJ_URL}/tags/${tagName}`, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      credentials: 'include',
+    });
+    return await response.json();
+  },
+  listNodesForTag: async function (tagName) {
+    const response = await fetch(`${DJ_URL}/tags/${tagName}/nodes`, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      credentials: 'include',
+    });
+    return await response.json();
+  },
+  tagsNode: async function (nodeName, tagNames) {
+    const url = tagNames
+      .map(value => `tag_names=${encodeURIComponent(value)}`)
+      .join('&');
+    const response = await fetch(`${DJ_URL}/nodes/${nodeName}/tags?${url}`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      credentials: 'include',
+    });
+    return { status: response.status, json: await response.json() };
+  },
+  addTag: async function (name, displayName, tagType, description) {
+    const response = await fetch(`${DJ_URL}/tags`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        name: name,
+        display_name: displayName,
+        tag_type: tagType,
+        description: description,
+      }),
+      credentials: 'include',
+    });
+    return { status: response.status, json: await response.json() };
+  },
+  editTag: async function (name, description, displayName) {
+    const updates = {};
+    if (description) {
+      updates.description = description;
+    }
+    if (displayName) {
+      updates.display_name = displayName;
+    }
+
+    const response = await fetch(`${DJ_URL}/tags/${name}`, {
+      method: 'PATCH',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(updates),
+      credentials: 'include',
+    });
+    return { status: response.status, json: await response.json() };
+  },
 };

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

@@ -28,7 +28,7 @@ describe('DataJunctionAPI', () => {
   it('calls logout correctly', async () => {
     fetch.mockResponseOnce(JSON.stringify({}));
     await DataJunctionAPI.logout();
-    expect(fetch).toHaveBeenCalledWith(`${DJ_URL}/basic/logout/`, {
+    expect(fetch).toHaveBeenCalledWith(`${DJ_URL}/logout/`, {
       credentials: 'include',
       method: 'POST',
     });
@@ -606,4 +606,87 @@ describe('DataJunctionAPI', () => {
       },
     );
   });
+
+  it('calls listTags correctly', async () => {
+    fetch.mockResponseOnce(JSON.stringify(mocks.tags));
+    const res = await DataJunctionAPI.listTags();
+    expect(fetch).toHaveBeenCalledWith(`${DJ_URL}/tags`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      method: 'GET',
+    });
+    expect(res).toEqual(mocks.tags);
+  });
+
+  it('calls getTag correctly', async () => {
+    fetch.mockResponseOnce(JSON.stringify(mocks.tags[0]));
+    const res = await DataJunctionAPI.getTag('report.financials');
+    expect(fetch).toHaveBeenCalledWith(`${DJ_URL}/tags/report.financials`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      method: 'GET',
+    });
+    expect(res).toEqual(mocks.tags[0]);
+  });
+
+  it('calls listNodesForTag correctly', async () => {
+    fetch.mockResponseOnce(JSON.stringify(mocks.mockLinkedNodes));
+    const res = await DataJunctionAPI.listNodesForTag('report.financials');
+    expect(fetch).toHaveBeenCalledWith(
+      `${DJ_URL}/tags/report.financials/nodes`,
+      {
+        credentials: 'include',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        method: 'GET',
+      },
+    );
+    expect(res).toEqual(mocks.mockLinkedNodes);
+  });
+
+  it('calls tagsNode correctly', async () => {
+    fetch.mockResponseOnce(JSON.stringify(mocks.mockLinkedNodes));
+    await DataJunctionAPI.tagsNode('default.num_repair_orders', [
+      'report.financials',
+      'report.forecasts',
+    ]);
+    expect(fetch).toHaveBeenCalledWith(
+      `${DJ_URL}/nodes/default.num_repair_orders/tags?tag_names=report.financials&tag_names=report.forecasts`,
+      {
+        credentials: 'include',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        method: 'POST',
+      },
+    );
+  });
+
+  it('calls addTag correctly', async () => {
+    fetch.mockResponseOnce(JSON.stringify(mocks.mockLinkedNodes));
+    await DataJunctionAPI.addTag(
+      'report.financials',
+      'Financial Reports',
+      'report',
+      'financial reports',
+    );
+    expect(fetch).toHaveBeenCalledWith(`${DJ_URL}/tags`, {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        name: 'report.financials',
+        display_name: 'Financial Reports',
+        tag_type: 'report',
+        description: 'financial reports',
+      }),
+      method: 'POST',
+    });
+  });
 });