@truedat/lm 7.13.5 → 7.13.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/lm",
-  "version": "7.13.5",
+  "version": "7.13.6",
   "description": "Truedat Link Manager",
   "sideEffects": false,
   "module": "src/index.js",
@@ -48,7 +48,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "7.13.5",
+    "@truedat/test": "7.13.6",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -82,5 +82,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "a82fdfd07c75632206f6639dd7c3b3072a3a9379"
+  "gitHead": "5c369d5a90a39be6362493db19e597a91d5a907d"
 }

package/src/components/LinksPane.js

@@ -1,8 +1,10 @@
 import _ from "lodash/fp";
 import PropTypes from "prop-types";
+import { useEffect, useState } from "react";
 import { Table, Header, Grid } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { columnDecorator, columnPredicate } from "@truedat/core/services";
+import { useDataStructureSearch } from "@truedat/dd/hooks/useStructures";
 
 const Row = ({ columns, link }) => (
   <Table.Row>
@@ -23,10 +25,61 @@ Row.propTypes = {
 };
 
 export const Links = ({ tag, sourceType, targetType, columns, links }) => {
+  const [enrichedLinks, setEnrichedLinks] = useState(links);
+  const { trigger } = useDataStructureSearch();
+
+  useEffect(() => {
+    const fetchStructureNotes = async () => {
+      const structureIds = _.flow(
+        _.filter(_.propEq("resource_type", "data_structure")),
+        _.map(({ resource_id }) => parseInt(resource_id)),
+        _.uniq
+      )(links);
+
+      if (_.isEmpty(structureIds)) {
+        setEnrichedLinks(links);
+        return;
+      }
+
+      try {
+        const response = await trigger({
+          must: { ids: structureIds },
+          page: 0,
+          size: structureIds.length,
+        });
+
+        const structuresMap = _.flow(
+          _.getOr([], "data.data"),
+          _.keyBy("id")
+        )(response);
+
+        const enriched = _.map((link) => {
+          if (link.resource_type === "data_structure") {
+            const structure = structuresMap[link.resource_id];
+            return {
+              ...link,
+              note: structure?.note || null,
+            };
+          }
+          return link;
+        })(links);
+
+        setEnrichedLinks(enriched);
+      } catch (error) {
+        setEnrichedLinks(links);
+      }
+    };
+
+    fetchStructureNotes();
+  }, [links, trigger]);
+
   const linksData = _.orderBy(["business_concept_id", "name"])(["desc", "asc"])(
-    links
+    enrichedLinks
   );
-  const headerRow = columns.map(({ name }, key) => (
+
+  const filteredColumns = filterColumns(columns, enrichedLinks);
+
+  const headerRow = filteredColumns.map(({ name }, key) => (
     <Table.HeaderCell
       key={key}
       content={
@@ -35,7 +88,7 @@ export const Links = ({ tag, sourceType, targetType, columns, links }) => {
     />
   ));
   const renderBodyRow = (link, i) => (
-    <Row key={i} columns={columns} link={link} />
+    <Row key={i} columns={filteredColumns} link={link} />
   );
   return (
     <>
@@ -82,7 +135,7 @@ export const LinksPane = ({ groups, sourceType, targetType, linksActions }) => (
               tag={tag}
               sourceType={sourceType}
               targetType={targetType}
-              columns={filterColumns(columns, links)}
+              columns={columns}
               links={links}
             />
           </Grid.Column>

package/src/components/__tests__/LinksPane.spec.js

@@ -1,6 +1,13 @@
-import { render } from "@truedat/test/render";
+import _ from "lodash/fp";
+import { waitFor } from "@testing-library/react";
+import { render, waitForLoad } from "@truedat/test/render";
+import { useDataStructureSearch } from "@truedat/dd/hooks/useStructures";
 import { LinksPane } from "../LinksPane";
 
+jest.mock("@truedat/dd/hooks/useStructures", () => ({
+  useDataStructureSearch: jest.fn(),
+}));
+
 describe("<LinksPane />", () => {
   const renderOpts = {
     messages: {
@@ -14,6 +21,16 @@ describe("<LinksPane />", () => {
     },
   };
 
+  beforeEach(() => {
+    useDataStructureSearch.mockReturnValue({
+      trigger: jest.fn().mockResolvedValue({
+        data: {
+          data: [],
+        },
+      }),
+    });
+  });
+
   const columns = [
     {
       name: "column",
@@ -27,8 +44,135 @@ describe("<LinksPane />", () => {
     targetType: "concept",
     linksActions: <button>action</button>,
   };
-  it("matches the latest snapshot", () => {
-    const { container } = render(<LinksPane {...props} />, renderOpts);
-    expect(container).toMatchSnapshot();
+  it("matches the latest snapshot", async () => {
+    const rendered = render(<LinksPane {...props} />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("fetches structure notes for data_structure links", async () => {
+    const mockTrigger = jest.fn().mockResolvedValue({
+      data: {
+        data: [
+          { id: 123, note: { status: "published", content: "Test note" } },
+          { id: 456, note: { status: "draft", content: "Another note" } },
+        ],
+      },
+    });
+
+    useDataStructureSearch.mockReturnValue({
+      trigger: mockTrigger,
+    });
+
+    const structureLinks = [
+      { id: 1, resource_type: "data_structure", resource_id: 123, name: "Structure 1" },
+      { id: 2, resource_type: "data_structure", resource_id: 456, name: "Structure 2" },
+    ];
+
+    const propsWithStructures = {
+      ...props,
+      groups: [[columns, ["tag", structureLinks]]],
+    };
+
+    const rendered = render(<LinksPane {...propsWithStructures} />, renderOpts);
+    await waitForLoad(rendered);
+
+    expect(mockTrigger).toHaveBeenCalledWith({
+      must: { ids: [123, 456] },
+      page: 0,
+      size: 2,
+    });
+  });
+
+  it("handles empty structure links", async () => {
+    const mockTrigger = jest.fn();
+
+    useDataStructureSearch.mockReturnValue({
+      trigger: mockTrigger,
+    });
+
+    const nonStructureLinks = [
+      { id: 1, resource_type: "other", resource_id: 123, name: "Other 1" },
+    ];
+
+    const propsWithOther = {
+      ...props,
+      groups: [[columns, ["tag", nonStructureLinks]]],
+    };
+
+    const rendered = render(<LinksPane {...propsWithOther} />, renderOpts);
+    await waitForLoad(rendered);
+
+    expect(mockTrigger).not.toHaveBeenCalled();
+  });
+
+  it("should display note columns only when note values are present for that column", async () => {
+    const mockTrigger = jest.fn().mockResolvedValue({
+      data: {
+        data: [
+          { id: 123, name: "Structure 1", note: { foo: "baz" } },
+          { id: 456, name: "Structure 2", note: {} },
+        ],
+      },
+    });
+
+    useDataStructureSearch.mockReturnValue({
+      trigger: mockTrigger,
+    });
+
+    const structureLinksMixedNotes = [
+      { id: 1, resource_type: "data_structure", resource_id: 123, name: "Structure 1" },
+      { id: 2, resource_type: "data_structure", resource_id: 456, name: "Structure 2" },
+    ];
+
+    const columnsWithNotes = [
+      ...columns,
+      {
+        name: "note.foo",
+        header: "note.foo",
+        fieldSelector: _.path(["note", "foo"]),
+      },
+      {
+        name: "note.bar",
+        header: "note.bar",
+        fieldSelector: _.path(["note", "bar"]),
+      },
+    ];
+
+    const renderOptsWithNotes = {
+      messages: {
+        en: {
+          ...renderOpts.messages.en,
+          "concept.note.foo": "Foo",
+          "concept.note.bar": "Bar",
+        },
+      },
+    };
+
+    const propsWithMixedNotes = {
+      ...props,
+      groups: [[columnsWithNotes, ["tag", structureLinksMixedNotes]]],
+    };
+
+    const rendered = render(<LinksPane {...propsWithMixedNotes} />, renderOptsWithNotes);
+    await waitForLoad(rendered);
+
+    await waitFor(() => {
+      expect(rendered.queryByText(/foo/i)).toBeInTheDocument();
+    });
+
+    expect(mockTrigger).toHaveBeenCalledWith({
+      must: { ids: [123, 456] },
+      page: 0,
+      size: 2,
+    });
+
+    const fooCells = rendered.queryAllByText(/baz/i);
+    expect(fooCells.length).toBeGreaterThan(0);
+
+    const barHeader = rendered.queryByText(/^bar$/i);
+    expect(barHeader).not.toBeInTheDocument();
+
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/components/__tests__/__snapshots__/LinksPane.spec.js.snap

@@ -50,3 +50,73 @@ exports[`<LinksPane /> matches the latest snapshot 1`] = `
   </div>
 </div>
 `;
+
+exports[`<LinksPane /> should display note columns only when note values are present for that column 1`] = `
+<div>
+  <div
+    class="ui grid"
+  >
+    <div
+      class="row"
+    >
+      <div
+        class="column"
+      >
+        <button>
+          action
+        </button>
+      </div>
+    </div>
+    <div
+      class="row"
+    >
+      <div
+        class="column"
+      >
+        <h3
+          class="ui header"
+        >
+          Master title
+        </h3>
+        <table
+          class="ui table"
+        >
+          <thead
+            class=""
+          >
+            <tr
+              class=""
+            >
+              <th
+                class=""
+              >
+                Foo
+              </th>
+            </tr>
+          </thead>
+          <tbody
+            class=""
+          >
+            <tr
+              class=""
+            >
+              <td
+                class=""
+              >
+                baz
+              </td>
+            </tr>
+            <tr
+              class=""
+            >
+              <td
+                class=""
+              />
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>
+`;