@truedat/dd 8.12.1 → 8.12.4

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

@@ -1,7 +1,12 @@
 import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { render, waitForLoad } from "@truedat/test/render";
-import { LATEST_GRANT_REQUEST_BY_DS_QUERY } from "../../api/queries";
+import {
+  buildDSVQuery,
+  DATA_STRUCTURE_VERSION_GRANTS_QUERY,
+  LEGACY_DATA_STRUCTURE_VERSION_QUERY,
+  LATEST_GRANT_REQUEST_BY_DS_QUERY,
+} from "../../api/queries";
 import StructureGrantSummaryButton from "../StructureGrantSummaryButton";
 import { createGrantRequestStatus } from "../../routines";
 import en from "../../messages/en";
@@ -209,4 +214,34 @@ describe("<StructureGrantSummaryButton />", () => {
       ).toHaveLength(0);
     });
   });
+
+  it("requests user group fields in data structure version grants query", () => {
+    const query = DATA_STRUCTURE_VERSION_GRANTS_QUERY.loc.source.body;
+    expect(query).toMatch(/user_group_id|userGroupId/);
+    expect(query).toMatch(/user_group|userGroup/);
+    expect(query).toMatch(/source_group_name|sourceGroupName/);
+    expect(query).toMatch(/\balias\b/);
+    expect(query).toMatch(/\bname\b/);
+  });
+
+  it("requests user group fields in legacy data structure version query grant", () => {
+    const query = LEGACY_DATA_STRUCTURE_VERSION_QUERY.loc.source.body;
+    expect(query).toMatch(/user_group_id|userGroupId/);
+    expect(query).toMatch(/user_group|userGroup/);
+    expect(query).toMatch(/source_group_name|sourceGroupName/);
+  });
+
+  it("requests user group fields in data structure version query grant", () => {
+    const query = buildDSVQuery(false).loc.source.body;
+    expect(query).toMatch(/user_group_id|userGroupId/);
+    expect(query).toMatch(/user_group|userGroup/);
+    expect(query).toMatch(/source_group_name|sourceGroupName/);
+  });
+});
+
+describe("data structure version grants query current user group member", () => {
+  it("requests current user group member in data structure version grants query", () => {
+    const query = DATA_STRUCTURE_VERSION_GRANTS_QUERY.loc.source.body;
+    expect(query).toMatch(/current_user_group_member|currentUserGroupMember/);
+  });
 });

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

@@ -93,4 +93,16 @@ describe("<StructureGrants />", () => {
     const { container } = render(<StructureGrants {...props} />);
     expect(container).toMatchSnapshot();
   });
+
+  it("shows User / Group header for the user column", () => {
+    const rendered = render(<StructureGrants {...props} />, {
+      messages: {
+        en: {
+          "grant.header.user": "User",
+          "grants.props.user_or_group": "User / Group",
+        },
+      },
+    });
+    expect(rendered.getByText(/user \/ group/i)).toBeInTheDocument();
+  });
 });

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

@@ -3,6 +3,16 @@ import { waitFor } from "@testing-library/react";
 import { render, waitForLoad } from "@truedat/test/render";
 import _ from "lodash/fp";
 import { StructureRelationRow } from "../StructureRelationRow";
+import { linksDecorator } from "../../selectors/getStructureFieldColumns";
+
+const renderRow = (props) =>
+  render(
+    <table>
+      <tbody>
+        <StructureRelationRow {...props} />
+      </tbody>
+    </table>,
+  );
 
 describe("<StructureRelationRow />", () => {
   const structure = { id: 1, name: "Structure 1", type: "Some Type 1" };
@@ -35,7 +45,7 @@ describe("<StructureRelationRow />", () => {
 
   it("matches the latest snapshot", async () => {
     const props = { relation, columns };
-    const rendered = render(<StructureRelationRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
   });
@@ -43,7 +53,7 @@ describe("<StructureRelationRow />", () => {
   it("clicking the row will pass the relation to onClick()", async () => {
     const onClick = jest.fn();
     const props = { relation, columns, onClick };
-    const rendered = render(<StructureRelationRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
     const user = userEvent.setup({ delay: null });
 
@@ -58,7 +68,7 @@ describe("<StructureRelationRow />", () => {
     const value = _.path("structure.name")(relation);
     const onClick = jest.fn();
     const props = { relation, columns: [_.head(columns)], onClick };
-    const rendered = render(<StructureRelationRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
 
     expect(rendered.container.querySelector("td")).toHaveTextContent(value);
@@ -71,11 +81,69 @@ describe("<StructureRelationRow />", () => {
       _.set("fieldDecorator", fieldDecorator),
     )(columns);
     const props = { relation, columns: [column] };
-    const rendered = render(<StructureRelationRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
 
     expect(rendered.container.querySelector("td")).toHaveTextContent(
       "used_by_decorated",
     );
   });
+
+  it("row prints concept links", async () => {
+    const relation = {
+      id: 1,
+      relation_type,
+      structure,
+      links: [
+        { name: "foo concept", resource_id: "1" },
+        { name: "bar concept", resource_id: "2" },
+      ],
+    };
+    const props = {
+      relation,
+      columns: [{ name: "links", fieldDecorator: linksDecorator }],
+    };
+    const rendered = render(<StructureRelationRow {...props} />);
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/foo concept/i)).toBeInTheDocument();
+    expect(rendered.getByText(/bar concept/i)).toBeInTheDocument();
+    expect(rendered.getAllByRole("link")).toHaveLength(2);
+  });
+
+  it("row skips empty or invalid concept links", async () => {
+    const relation = {
+      id: 1,
+      relation_type,
+      structure,
+      links: [null, {}, { name: "foo concept", resource_id: "1" }],
+    };
+    const props = {
+      relation,
+      columns: [{ name: "links", fieldDecorator: linksDecorator }],
+    };
+    const rendered = render(<StructureRelationRow {...props} />);
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/foo concept/i)).toBeInTheDocument();
+    expect(rendered.getAllByRole("link")).toHaveLength(1);
+  });
+
+  it("row prints nothing when concept links are missing", async () => {
+    const relation = {
+      id: 1,
+      relation_type,
+      structure,
+      links: [],
+    };
+    const props = {
+      relation,
+      columns: [{ name: "links", fieldDecorator: linksDecorator }],
+    };
+    const rendered = render(<StructureRelationRow {...props} />);
+    await waitForLoad(rendered);
+
+    expect(rendered.queryByRole("link")).not.toBeInTheDocument();
+    expect(rendered.container.querySelector("td")).toBeEmptyDOMElement();
+  });
 });

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

@@ -64,4 +64,22 @@ describe("<StructureRelations />", () => {
       relations.length,
     );
   });
+
+  it("renders concept links column header", async () => {
+    const relations = [
+      {
+        id: 1,
+        relation_type,
+        structure: { id: 1, name: "foo structure", type: "foo" },
+        links: [{ name: "foo concept", resource_id: "1" }],
+      },
+    ];
+    const columnsWithLinks = [...columns, { name: "links" }];
+    const rendered = render(
+      <StructureRelations relations={relations} columns={columnsWithLinks} />,
+    );
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/structure.relation.links/i)).toBeInTheDocument();
+  });
 });

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

@@ -1,6 +1,15 @@
 import { render, waitForLoad } from "@truedat/test/render";
 import StructureRoles from "../StructureRoles";
 
+jest.mock("@truedat/core/hooks/useAclEntries", () => ({
+  ...jest.requireActual("@truedat/core/hooks/useAclEntries"),
+  useAclEntries: () => ({
+    data: { aclEntries: [], actions: { canCreate: false } },
+    loading: false,
+    mutate: jest.fn(),
+  }),
+}));
+
 jest.mock("react-router", () => ({
   ...jest.requireActual("react-router"),
   useParams: jest.fn().mockReturnValue({ id: "1" }),

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

@@ -4,6 +4,15 @@ import { render, waitForLoad } from "@truedat/test/render";
 import _ from "lodash/fp";
 import { StructureRow } from "../StructureRow";
 
+const renderRow = (props) =>
+  render(
+    <table>
+      <tbody>
+        <StructureRow {...props} />
+      </tbody>
+    </table>,
+  );
+
 describe("<StructureRow />", () => {
   const structure = {
     id: 1,
@@ -22,7 +31,7 @@ describe("<StructureRow />", () => {
 
   it("matches the latest snapshot", async () => {
     const props = { structure, columns };
-    const rendered = render(<StructureRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
   });
@@ -30,7 +39,7 @@ describe("<StructureRow />", () => {
   it("clicking the row will pass the structure to onClick()", async () => {
     const onClick = jest.fn();
     const props = { structure, columns, onClick };
-    const rendered = render(<StructureRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
     const user = userEvent.setup({ delay: null });
 
@@ -56,7 +65,7 @@ describe("<StructureRow />", () => {
       },
     ];
     const props = { structure: testStructure, columns: testColumns };
-    const rendered = render(<StructureRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
 
     expect(rendered.container.querySelector("td")).toHaveTextContent(testValue);
@@ -71,7 +80,7 @@ describe("<StructureRow />", () => {
     };
     const testColumns = [{ name: "testObject", fieldDecorator }];
     const props = { structure: testStructure, columns: testColumns };
-    const rendered = render(<StructureRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
 
     const decoratedValue = fieldDecorator(testValue);

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

@@ -1,6 +1,8 @@
 import { render, waitForLoad } from "@truedat/test/render";
 import { StructureSelector } from "../StructureSelector";
 
+jest.mock("@truedat/core/hooks/useUserFilters");
+
 const data = {
   _actions: { bulkUpdate: {} },
   data: [

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

@@ -4,6 +4,8 @@ import userEvent from "@testing-library/user-event";
 import { StructureTag } from "../StructureTag";
 
 describe("<StructureTag />", () => {
+  beforeEach(() => jest.useRealTimers());
+
   const tagName = "Tag 42";
   const structureTag = {
     id: "1",

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

@@ -4,6 +4,8 @@ import { render, waitForLoad } from "@truedat/test/render";
 import { StructureTagForm } from "../StructureTagForm";
 
 describe("<StructureTagForm />", () => {
+  beforeEach(() => jest.useRealTimers());
+
   const tags = [
     { id: "1", name: "Tag1", description: "desc1" },
     { id: "2", name: "Tag2", description: "desc2" },

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

@@ -1,3 +1,4 @@
+import { act } from "@testing-library/react";
 import { render } from "@truedat/test/render";
 import StructureType from "../StructureType";
 
@@ -17,8 +18,9 @@ const renderOpts = {
 };
 
 describe("<StructureType />", () => {
-  it("matches the latest snapshot", () => {
+  it("matches the latest snapshot", async () => {
     const { container } = render(<StructureType />, renderOpts);
+    await act(async () => {});
     expect(container).toMatchSnapshot();
   });
 });

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

@@ -1,3 +1,4 @@
+import { act } from "@testing-library/react";
 import { render } from "@truedat/test/render";
 import StructureTypeForm from "../StructureTypeForm";
 
@@ -39,8 +40,9 @@ const renderOpts = {
 };
 
 describe("<StructureTypeForm />", () => {
-  it("matches the latest snapshot", () => {
+  it("matches the latest snapshot", async () => {
     const { container } = render(<StructureTypeForm />, renderOpts);
+    await act(async () => {});
     expect(container).toMatchSnapshot();
   });
 });

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

@@ -1,7 +1,12 @@
 import { render } from "@truedat/test/render";
 import { waitFor } from "@testing-library/react";
+import { STRUCTURE_TAGS_QUERY } from "../../api/queries";
 import StructureView from "../StructureView";
 
+jest.mock("../../hooks/useBucketStructures", () => ({
+  useBucketStructures: () => ({ data: undefined, isLoading: true }),
+}));
+
 jest.mock("react-router", () => ({
   ...jest.requireActual("react-router"),
   useParams: () => ({ id: 1 }),
@@ -33,6 +38,14 @@ const commonState = {
 };
 
 describe("<StructureView />", () => {
+  const structureTagsMock = {
+    request: { query: STRUCTURE_TAGS_QUERY, variables: { id: 1 } },
+    result: {
+      data: {
+        dataStructure: { id: 1, availableTags: [], structureTags: [] },
+      },
+    },
+  };
   it("Some inner component shows the structure name", () => {
     const renderOpts = {
       state: {
@@ -48,7 +61,10 @@ describe("<StructureView />", () => {
       },
     };
 
-    const { getAllByText } = render(<StructureView />, renderOpts);
+    const { getAllByText } = render(<StructureView />, {
+      ...renderOpts,
+      mocks: [structureTagsMock],
+    });
     expect(getAllByText("some_db")[0]).toBeInTheDocument();
   });
 

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

@@ -6,6 +6,8 @@ import { functionsMock } from "@truedat/test/mocks";
 import { StructuresGrantRequestView } from "../StructuresGrantRequestView";
 import en from "../../messages/en";
 
+jest.mock("@truedat/core/hooks/useUserFilters");
+
 const mockHistory = jest.fn();
 
 jest.mock("react-router", () => ({

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

@@ -1,10 +1,11 @@
-import _ from "lodash/fp";
 import { within } from "@testing-library/react";
 import { render, waitForLoad } from "@truedat/test/render";
 import SearchContext from "@truedat/core/search/SearchContext";
 import StructuresView from "../StructuresView";
 import { StructuresViewContent } from "../StructuresView";
 
+jest.mock("@truedat/core/hooks/useUserFilters");
+
 const mockHistory = jest.fn();
 
 jest.mock("react-router", () => ({

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

@@ -1,10 +1,13 @@
 import { render } from "@truedat/test/render";
+import { domainsMock } from "@truedat/test/mocks";
 import Tag from "../Tag";
 
 describe("<Tag />", () => {
   it("matches the latest snapshot", () => {
     const createTag = jest.fn();
-    const { container } = render(<Tag createTag={createTag} />);
+    const { container } = render(<Tag createTag={createTag} />, {
+      mocks: [domainsMock({ action: "manageTags" })],
+    });
     expect(container).toMatchSnapshot();
   });
 });

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

@@ -1,9 +1,15 @@
 import { render } from "@truedat/test/render";
+import { TAGS_QUERY } from "../../api/queries";
 import Tags from "../Tags";
 
+const tagsMock = {
+  request: { query: TAGS_QUERY },
+  result: { data: { tags: [] } },
+};
+
 describe("<Tags />", () => {
   it("matches the latest snapshot", () => {
-    const { container } = render(<Tags />);
+    const { container } = render(<Tags />, { mocks: [tagsMock] });
     expect(container).toMatchSnapshot();
   });
 });

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

@@ -41,7 +41,23 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
       >
         <td
           class=""
-        />
+        >
+          <h4
+            class="ui header"
+          >
+            <div
+              class="content"
+            >
+              user_full_name_1
+               
+              <div
+                class="sub header"
+              >
+                user1@example.com
+              </div>
+            </div>
+          </h4>
+        </td>
         <td
           class=""
         >
@@ -92,7 +108,23 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
       >
         <td
           class=""
-        />
+        >
+          <h4
+            class="ui header"
+          >
+            <div
+              class="content"
+            >
+              user_full_name_2
+               
+              <div
+                class="sub header"
+              >
+                user2@example.com
+              </div>
+            </div>
+          </h4>
+        </td>
         <td
           class=""
         >

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

@@ -2,35 +2,37 @@
 
 exports[`<LineageDefs /> matches the latest snapshot 1`] = `
 <div>
-  <defs>
-    <marker
-      id="end"
-      markerheight="6"
-      markerwidth="6"
-      orient="auto"
-      refx="10"
-      refy="0"
-      viewbox="0 -5 10 10"
-    >
-      <path
-        d="M0,-5L10,0L0,5L0,-5"
-        fill="#999"
-      />
-    </marker>
-    <marker
-      id="end-active"
-      markerheight="6"
-      markerwidth="6"
-      orient="auto"
-      refx="10"
-      refy="0"
-      viewbox="0 -5 10 10"
-    >
-      <path
-        d="M0,-5L10,0L0,5L0,-5"
-        fill="orangered"
-      />
-    </marker>
-  </defs>
+  <svg>
+    <defs>
+      <marker
+        id="end"
+        markerHeight="6"
+        markerWidth="6"
+        orient="auto"
+        refX="10"
+        refY="0"
+        viewBox="0 -5 10 10"
+      >
+        <path
+          d="M0,-5L10,0L0,5L0,-5"
+          fill="#999"
+        />
+      </marker>
+      <marker
+        id="end-active"
+        markerHeight="6"
+        markerWidth="6"
+        orient="auto"
+        refX="10"
+        refY="0"
+        viewBox="0 -5 10 10"
+      >
+        <path
+          d="M0,-5L10,0L0,5L0,-5"
+          fill="orangered"
+        />
+      </marker>
+    </defs>
+  </svg>
 </div>
 `;

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

@@ -142,22 +142,7 @@ exports[`<StructureFields /> matches the latest snapshot 1`] = `
         </td>
         <td
           class=""
-        >
-          <div
-            class="ui list"
-            role="list"
-          >
-            <div
-              class="item"
-              role="listitem"
-            >
-              <a
-                data-discover="true"
-                href="/concepts/123/versions/current"
-              />
-            </div>
-          </div>
-        </td>
+        />
       </tr>
       <tr
         class=""