@truedat/dd 8.12.2 → 8.12.4

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

@@ -1,6 +1,7 @@
 import userEvent from "@testing-library/user-event";
 import { render, waitForLoad } from "@truedat/test/render";
 import { singleTemplateMock, domainsMock } from "@truedat/test/mocks";
+import { DOMAINS_QUERY, FUNCTIONS_QUERY } from "@truedat/core/api/queries";
 import { StructureGrantCartCheckout } from "../StructureGrantCartCheckout";
 
 jest.mock("@truedat/core/webContext", () => ({
@@ -23,6 +24,10 @@ jest.mock("@truedat/auth/hooks/useUsers", () => ({
   useGrantRequestableUsers: jest.fn(),
 }));
 
+jest.mock("@truedat/auth/hooks/useRoles", () => ({
+  useRoles: () => ({ data: undefined }),
+}));
+
 jest.mock("react-redux", () => {
   const actual = jest.requireActual("react-redux");
   return {
@@ -177,6 +182,17 @@ const grantRequestsCartSingleDomain = {
 };
 
 describe("StructureGrantCartCheckout", () => {
+  const domainQueryErrorMock = {
+    request: {
+      query: DOMAINS_QUERY,
+      variables: { action: "createForeignGrantRequest" },
+    },
+    error: new Error("Domains are not used by this checkout test"),
+  };
+  const functionsQueryErrorMock = {
+    request: { query: FUNCTIONS_QUERY },
+    error: new Error("Functions are not used by this checkout test"),
+  };
   const mockTrigger = jest.fn().mockResolvedValue({});
   const mockDispatch = jest.fn();
   const mockInitGroupTemplates = jest.fn();
@@ -208,7 +224,11 @@ describe("StructureGrantCartCheckout", () => {
 
   const variables = { scope: "gr" };
   const renderOpts = {
-    mocks: [singleTemplateMock(variables)],
+    mocks: [
+      singleTemplateMock(variables),
+      functionsQueryErrorMock,
+      domainQueryErrorMock,
+    ],
   };
 
   it("matches snapshot when modification grant (single flow)", async () => {
@@ -272,6 +292,8 @@ describe("StructureGrantCartCheckout", () => {
       mocks: [
         singleTemplateMock({ scope: "gr" }),
         domainsMock({ action: "createForeignGrantRequest" }),
+        functionsQueryErrorMock,
+        domainQueryErrorMock,
       ],
     };
     const rendered = render(
@@ -297,6 +319,8 @@ describe("StructureGrantCartCheckout", () => {
       mocks: [
         singleTemplateMock({ scope: "gr" }),
         domainsMock({ action: "createForeignGrantRequest" }),
+        functionsQueryErrorMock,
+        domainQueryErrorMock,
       ],
     };
     const rendered = render(
@@ -324,6 +348,8 @@ describe("StructureGrantCartCheckout", () => {
       mocks: [
         singleTemplateMock({ scope: "gr" }),
         domainsMock({ action: "createForeignGrantRequest" }),
+        functionsQueryErrorMock,
+        domainQueryErrorMock,
       ],
     };
     const rendered = render(
@@ -348,6 +374,8 @@ describe("StructureGrantCartCheckout", () => {
       mocks: [
         singleTemplateMock({ scope: "gr" }),
         domainsMock({ action: "createForeignGrantRequest" }),
+        functionsQueryErrorMock,
+        domainQueryErrorMock,
       ],
     };
     const rendered = render(
@@ -373,6 +401,8 @@ describe("StructureGrantCartCheckout", () => {
       mocks: [
         singleTemplateMock({ scope: "gr" }),
         domainsMock({ action: "createForeignGrantRequest" }),
+        functionsQueryErrorMock,
+        domainQueryErrorMock,
       ],
     };
     const rendered = render(
@@ -408,6 +438,8 @@ describe("StructureGrantCartCheckout", () => {
       mocks: [
         singleTemplateMock({ scope: "gr" }),
         domainsMock({ action: "createForeignGrantRequest" }),
+        functionsQueryErrorMock,
+        domainQueryErrorMock,
       ],
     };
     const rendered = render(
@@ -456,6 +488,8 @@ describe("StructureGrantCartCheckout", () => {
       mocks: [
         singleTemplateMock({ scope: "gr" }),
         domainsMock({ action: "createForeignGrantRequest" }),
+        functionsQueryErrorMock,
+        domainQueryErrorMock,
       ],
     };
 
@@ -544,6 +578,8 @@ describe("StructureGrantCartCheckout", () => {
       mocks: [
         singleTemplateMock({ scope: "gr" }),
         domainsMock({ action: "createForeignGrantRequest" }),
+        functionsQueryErrorMock,
+        domainQueryErrorMock,
       ],
     };
     const rendered = render(
@@ -598,6 +634,8 @@ describe("StructureGrantCartCheckout", () => {
       mocks: [
         singleTemplateMock({ scope: "gr" }),
         domainsMock({ action: "createForeignGrantRequest" }),
+        functionsQueryErrorMock,
+        domainQueryErrorMock,
       ],
     };
 

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

@@ -1,5 +1,5 @@
 import { render, waitForLoad } from "@truedat/test/render";
-import { singleTemplateMock } from "@truedat/test/mocks";
+import { singleTemplateMock, domainsMock } from "@truedat/test/mocks";
 import { StructureGrantCartInformation } from "../StructureGrantCartInformation";
 
 jest.mock("@truedat/auth/hooks/useRoles", () => {
@@ -38,7 +38,10 @@ describe("<StructureGrantCartInformation />", () => {
   };
 
   const renderOpts = {
-    mocks: [singleTemplateMock(variables)],
+    mocks: [
+      singleTemplateMock(variables),
+      domainsMock({ action: "createForeignGrantRequest" }, []),
+    ],
   };
 
   it("matches the latest snapshot", async () => {

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

@@ -4,6 +4,10 @@ import { render, waitForLoad } from "@truedat/test/render";
 import { useGrantRequestableUsers } from "@truedat/auth/hooks/useUsers";
 import StructureGrantCartUserSelector from "../StructureGrantCartUserSelector";
 
+jest.mock("@truedat/auth/hooks/useRoles", () => ({
+  useRoles: () => ({ data: undefined }),
+}));
+
 jest.mock("@truedat/auth/hooks/useUsers", () => ({
   useGrantRequestableUsers: jest.fn(() => ({
     users: [
@@ -179,4 +183,128 @@ describe("<StructureGrantCartUserSelector />", () => {
     );
     expect(payloads.some((payload) => payload?.id === "group:10")).toBe(false);
   });
+
+  it("preselects user group when modificationGrant has user_group_id", async () => {
+    const dispatch = jest.fn();
+    useGrantRequestableUsers.mockImplementation(() => ({
+      users: [{ id: 1, full_name: "foo user" }],
+      groups: [{ id: 10, name: "foo", alias: "bar" }],
+      trigger: jest.fn(),
+    }));
+
+    const rendered = render(<StructureGrantCartUserSelector />, {
+      state: {
+        grantRequestsCart: {
+          modificationGrant: {
+            user_group_id: 10,
+            user_group: { id: 10, name: "foo", alias: "bar" },
+            user_id: null,
+          },
+        },
+      },
+      dispatch,
+    });
+    await waitForLoad(rendered);
+
+    await waitFor(() => {
+      const payloads = dispatch.mock.calls.map(
+        ([action]) => action?.payload ?? action,
+      );
+      expect(payloads.some((payload) => payload?.user_group_id === 10)).toBe(
+        true,
+      );
+    });
+  });
+
+  it("shows group alias in the modification header", async () => {
+    const rendered = render(<StructureGrantCartUserSelector />, {
+      state: {
+        grantRequestsCart: {
+          modificationGrant: {
+            user_group_id: 10,
+            user_group: { id: 10, alias: "bar", name: "foo" },
+            user_id: null,
+          },
+        },
+      },
+      messages: {
+        en: {
+          "grantRequestCart.user.label": "Request for:",
+        },
+      },
+    });
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/bar/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/undefined/i)).not.toBeInTheDocument();
+  });
+
+  it("shows group name in the modification header when alias is empty", async () => {
+    const rendered = render(<StructureGrantCartUserSelector />, {
+      state: {
+        grantRequestsCart: {
+          modificationGrant: {
+            user_group_id: 10,
+            user_group: { id: 10, alias: "", name: "foo" },
+            user_id: null,
+          },
+        },
+      },
+      messages: {
+        en: {
+          "grantRequestCart.user.label": "Request for:",
+        },
+      },
+    });
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/foo/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/bar/i)).not.toBeInTheDocument();
+    expect(rendered.queryByText(/undefined/i)).not.toBeInTheDocument();
+  });
+
+  it("shows deleted group in the modification header when the group is missing", async () => {
+    const rendered = render(<StructureGrantCartUserSelector />, {
+      state: {
+        grantRequestsCart: {
+          modificationGrant: {
+            user_group_id: 10,
+            user_group: null,
+            user_id: null,
+          },
+        },
+      },
+      messages: {
+        en: {
+          "grantRequestCart.user.label": "Request for:",
+          "deleted.group": "Deleted group",
+        },
+      },
+    });
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/deleted group/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/undefined/i)).not.toBeInTheDocument();
+  });
+
+  it("shows user full name in the modification header for a personal grant", async () => {
+    const rendered = render(<StructureGrantCartUserSelector />, {
+      state: {
+        grantRequestsCart: {
+          modificationGrant: {
+            user: { full_name: "foo user" },
+          },
+        },
+      },
+      messages: {
+        en: {
+          "grantRequestCart.user.label": "Request for:",
+        },
+      },
+    });
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/foo user/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/undefined/i)).not.toBeInTheDocument();
+  });
 });

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

@@ -276,4 +276,96 @@ describe("<StructureGrantDropdown />", () => {
       rendered.getByText(/grant.actions.viewrequest.confirmation.header/i),
     ).toBeInTheDocument();
   });
+
+  it("shows users icon and change action for active group grant", async () => {
+    const user = userEvent.setup({ delay: null });
+    const grant = {
+      pending_removal: false,
+      user_group_id: 10,
+      user_group: { id: 10, name: "foo", alias: "bar" },
+    };
+    const props = {
+      ...propsBuilder(grant),
+      grantRequest: null,
+      grantRequestStatus: null,
+    };
+    const rendered = render(<StructureGrantDropdown {...props} />);
+    await waitForLoad(rendered);
+
+    expect(
+      rendered.container.querySelector(".button.group-actions .users.icon"),
+    ).not.toBeInTheDocument();
+
+    fireEvent.mouseOver(await rendered.findByRole("listbox"));
+    expect(
+      await rendered.findByText(/structure.grant.has_grant/i),
+    ).toBeInTheDocument();
+    expect(
+      rendered.baseElement.querySelector(".users.icon"),
+    ).toBeInTheDocument();
+
+    await user.click(await rendered.findByRole("listbox"));
+    expect(
+      rendered.getByText(/structure.grant.request_grant_change/i),
+    ).toBeInTheDocument();
+  });
+
+  it("shows users icon in popup for pending group grant request", async () => {
+    const grantRequest = {
+      group: {
+        user_group_id: 10,
+        _embedded: {
+          user_group: { id: 10, name: "foo" },
+        },
+      },
+    };
+    const props = {
+      ...propsBuilder(null),
+      grantRequest,
+      grantRequestStatus: "pending",
+    };
+    const rendered = render(<StructureGrantDropdown {...props} />, {
+      state: { authentication: { user_name: "foo" } },
+    });
+    await waitForLoad(rendered);
+
+    expect(
+      rendered.container.querySelector(".button.group-actions .users.icon"),
+    ).not.toBeInTheDocument();
+
+    fireEvent.mouseOver(await rendered.findByRole("listbox"));
+    expect(
+      await rendered.findByText(/structure.grant.requested_access/i),
+    ).toBeInTheDocument();
+    expect(
+      rendered.baseElement.querySelector(".users.icon"),
+    ).toBeInTheDocument();
+  });
+
+  it("shows users icon in popup for active group grant", async () => {
+    const grant = {
+      pending_removal: false,
+      user_group_id: 10,
+      user_group: { id: 10, name: "foo", alias: "bar" },
+    };
+    const props = {
+      ...propsBuilder(grant),
+      grantRequest: null,
+      grantRequestStatus: null,
+    };
+    const rendered = render(<StructureGrantDropdown {...props} />);
+    await waitForLoad(rendered);
+
+    expect(
+      rendered.container.querySelector(".button.group-actions .users.icon"),
+    ).not.toBeInTheDocument();
+
+    fireEvent.mouseOver(await rendered.findByRole("listbox"));
+    expect(
+      await rendered.findByText(/structure.grant.has_grant/i),
+    ).toBeInTheDocument();
+    expect(
+      rendered.baseElement.querySelector(".users.icon"),
+    ).toBeInTheDocument();
+  });
 });

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

@@ -1,4 +1,5 @@
 import userEvent from "@testing-library/user-event";
+import { fireEvent } from "@testing-library/react";
 import { render, waitForLoad } from "@truedat/test/render";
 import SearchContextWrapper from "@truedat/core/components/common/SearchContextWrapper";
 import StructureGrantListButton from "../StructureGrantListButton";
@@ -117,4 +118,73 @@ describe("<StructureGrantListButton />", () => {
     onSuccess();
     expect(refreshSearch).toHaveBeenCalled();
   });
+
+  it("shows users icon in popup for group grant in my_grants", async () => {
+    const groupStructure = {
+      ...structure,
+      my_grants: [
+        {
+          id: 2,
+          user_group_id: 10,
+          user_group: { id: 10, name: "foo" },
+        },
+      ],
+    };
+
+    const rendered = render(
+      <SearchContextWrapper props={searchProps}>
+        <StructureGrantListButton structure={groupStructure} />
+      </SearchContextWrapper>,
+      renderOpts,
+    );
+    await waitForLoad(rendered);
+
+    expect(
+      rendered.container.querySelector(".button.group-actions .users.icon"),
+    ).not.toBeInTheDocument();
+
+    fireEvent.mouseOver(await rendered.findByRole("listbox"));
+    expect(
+      await rendered.findByText(/structure.grant.has_grant/i),
+    ).toBeInTheDocument();
+    expect(
+      rendered.baseElement.querySelector(".users.icon"),
+    ).toBeInTheDocument();
+  });
+
+  it("shows users icon in popup for pending group grant request in my_grant_request", async () => {
+    const pendingGroupStructure = {
+      ...structure,
+      my_grant_request: {
+        status: "pending",
+        _embedded: { group: { user_group_id: 10 } },
+      },
+    };
+
+    const rendered = render(
+      <SearchContextWrapper props={searchProps}>
+        <StructureGrantListButton structure={pendingGroupStructure} />
+      </SearchContextWrapper>,
+      {
+        ...renderOpts,
+        state: {
+          ...renderOpts.state,
+          authentication: { user_name: "foo" },
+        },
+      },
+    );
+    await waitForLoad(rendered);
+
+    expect(
+      rendered.container.querySelector(".button.group-actions .users.icon"),
+    ).not.toBeInTheDocument();
+
+    fireEvent.mouseOver(await rendered.findByRole("listbox"));
+    expect(
+      await rendered.findByText(/structure.grant.requested_access/i),
+    ).toBeInTheDocument();
+    expect(
+      rendered.baseElement.querySelector(".users.icon"),
+    ).toBeInTheDocument();
+  });
 });

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" }),