@truedat/dd 8.12.2 → 8.12.5

package/src/components/StructureNotesEdit.js

@@ -1,12 +1,12 @@
 import _ from "lodash/fp";
-import { lazy, useEffect, useState } from "react";
+import { lazy, useEffect, useRef, useState } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Button, Form, Segment } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { HistoryBackButton } from "@truedat/core/components";
 import { selectTemplate, selectDomains } from "@truedat/df/routines";
-import { applyTemplate, validateContent } from "@truedat/df/utils";
+import { applyTemplate } from "@truedat/df/utils";
 import SuggestionsWidget from "@truedat/ai/components/suggestions/SuggestionsWidget";
 import { doStructureNoteAction } from "../routines";
 import { getLatestDfContent } from "../selectors/getSortedStructureNotes";
@@ -17,6 +17,16 @@ const TemplateLoader = lazy(
   () => import("@truedat/df/templates/components/TemplateLoader"),
 );
 
+const isInformed = _.flow(
+  _.cond([
+    [_.isArray, _.isEmpty],
+    [_.isObject, _.isEmpty],
+    [_.isString, _.isEmpty],
+    [_.stubTrue, _.isNil],
+  ]),
+  (value) => !value,
+);
+
 export const StructureNotesEdit = ({
   applyTemplate,
   structure,
@@ -28,8 +38,9 @@ export const StructureNotesEdit = ({
   latestDfContent,
 }) => {
   const [content, setContent] = useState(latestDfContent);
-
+  const explicitEmptiesRef = useRef({});
   const isModification = !_.isEmpty(latestDfContent);
+  const initializedRef = useRef(false);
 
   useEffect(() => {
     selectDomains(structure.domain_ids);
@@ -37,18 +48,37 @@ export const StructureNotesEdit = ({
   }, [template, structure, selectTemplate, selectDomains]);
 
   useEffect(() => {
-    if (template && latestDfContent) {
+    if (!initializedRef.current && template && latestDfContent) {
+      initializedRef.current = true;
       setContent(applyTemplate(latestDfContent, structure.domain_id));
     }
   }, [applyTemplate, template, latestDfContent, structure.domain_id]);
 
   const { formatMessage, locale } = useIntl();
 
-  const submitDisabled =
-    !template || _.size(validateContent(template)(content)) > 0;
+  const submitDisabled = !template;
+
+  const handleFormChange = (newContent) => {
+    const clearedFields = _.flow(
+      _.pickBy((value) => isInformed(value.value)),
+      _.omit(Object.keys(newContent)),
+      _.mapValues(() => ({ value: "", origin: "user" })),
+    )(content);
+
+    explicitEmptiesRef.current = {
+      ..._.omit(
+        Object.keys(_.pickBy((value) => isInformed(value.value))(newContent)),
+      )(explicitEmptiesRef.current),
+      ...clearedFields,
+    };
+    setContent(newContent);
+  };
 
   const handleSubmit = () => {
-    const df_content = applyTemplate(content, structure.domain_id);
+    const df_content = {
+      ...applyTemplate(content, structure.domain_id),
+      ...explicitEmptiesRef.current,
+    };
     const draftNoteAction = _.flow(
       _.get("structureNotes"),
       _.find({ status: "draft" }),
@@ -96,7 +126,7 @@ export const StructureNotesEdit = ({
       />
       <Form>
         <DynamicForm
-          onChange={setContent}
+          onChange={handleFormChange}
           content={content}
           isModification={isModification}
         />

package/src/components/StructuresUpdateOption.js

@@ -84,7 +84,7 @@ export const StructuresUpdateOption = ({
         onClick={navigateToBulkUpdate}
         disabled={disabled}
         content={
-          <>
+          <div>
             <span>
               {formatMessage({ id: "structures.actions.bulk_update" })}
             </span>
@@ -93,7 +93,7 @@ export const StructuresUpdateOption = ({
                 {formatMessage({ id: "structures.actions.bulk_update.popup" })}
               </p>
             )}
-          </>
+          </div>
         }
       />
     )

package/src/components/SystemStructures.js

@@ -1,4 +1,3 @@
-import _ from "lodash/fp";
 import { useEffect } from "react";
 import { useSelector, useDispatch } from "react-redux";
 import { Grid, Segment } from "semantic-ui-react";
@@ -13,8 +12,9 @@ export default function SystemStructures() {
   const { id: systemId } = useParams();
   const dispatch = useDispatch();
 
-  const { navFilter, systemStructuresLoading } = useSelector(
-    _.pick(["navFilter", "systemStructuresLoading"]),
+  const navFilter = useSelector((state) => state.navFilter);
+  const systemStructuresLoading = useSelector(
+    (state) => state.systemStructuresLoading,
   );
   const system = useSelector((state) => getSystem(state, systemId));
 

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

@@ -29,6 +29,8 @@ jest.mock("react-router", () => ({
 }));
 
 describe("<CatalogViewConfigFormLoader />", () => {
+  beforeEach(() => jest.useRealTimers());
+
   it("Saves the configuration", async () => {
     const dispatch = jest.fn();
     const rendered = render(<CatalogViewConfigFormLoader />, {

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

@@ -4,7 +4,9 @@ import { render, waitForLoad } from "@truedat/test/render";
 import { domainsMock } from "@truedat/test/mocks";
 import { EditDomainForm } from "../EditDomainForm";
 
-const mocks = [domainsMock({ action: "manageStructuresDomain" })];
+const mocks = Array.from({ length: 3 }, () =>
+  domainsMock({ action: "manageStructuresDomain" }),
+);
 
 describe("<EditDomainForm />", () => {
   const updateStructure = jest.fn();

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

@@ -125,3 +125,174 @@ describe("<Grant />", () => {
     ).not.toBeInTheDocument();
   });
 });
+
+describe("group and deleted", () => {
+  const baseGrant = {
+    data_structure: {
+      id: "2",
+    },
+    id: "1",
+    data_structure_version: {
+      name: "qux",
+    },
+    detail: {},
+    start_date: "2018-12-01",
+    end_date: "2029-12-31",
+    inserted_at: "2022-12-12T12:49:09.789722Z",
+    pending_removal: false,
+  };
+
+  const defaultProps = {
+    actions: {},
+    loading: false,
+    onStatusChange: jest.fn(),
+  };
+
+  const messages = {
+    en: {
+      "grant.header.user": "User",
+      "grant.header.group": "User group",
+      "deleted.user": "Deleted user",
+      "deleted.group": "Deleted group",
+    },
+  };
+
+  it("shows accordion with group members when grant is for a group", async () => {
+    const user = userEvent.setup({ delay: null });
+    const groupGrant = {
+      ...baseGrant,
+      user: null,
+      user_group_id: 10,
+      user_group: {
+        id: 10,
+        name: "foo",
+        alias: "bar",
+        users: [
+          { id: 1, full_name: "foo user" },
+          { id: 2, full_name: "bar user" },
+        ],
+      },
+    };
+
+    const rendered = render(<Grant {...defaultProps} grant={groupGrant} />, {
+      messages,
+    });
+    await waitForLoad(rendered);
+
+    const item = rendered.getByText(/^bar$/i).closest(".item");
+    expect(item.querySelector(".header")).toHaveTextContent(/^user group$/i);
+    expect(item.querySelector(".header")).not.toHaveTextContent(/^user$/i);
+    expect(item.querySelector(".angle.right.icon")).toBeInTheDocument();
+    await user.click(item.querySelector(".angle.right.icon"));
+    expect(item.querySelector(".angle.down.icon")).toBeInTheDocument();
+    expect(rendered.getByText(/foo user/i)).toBeInTheDocument();
+    expect(rendered.getByText(/bar user/i)).toBeInTheDocument();
+  });
+
+  it("shows group name when alias is empty", async () => {
+    const groupGrant = {
+      ...baseGrant,
+      user: null,
+      user_group_id: 10,
+      user_group: {
+        id: 10,
+        name: "foo",
+        alias: "",
+        users: [],
+      },
+    };
+
+    const rendered = render(<Grant {...defaultProps} grant={groupGrant} />, {
+      messages,
+    });
+    await waitForLoad(rendered);
+
+    const item = rendered.getByText(/^foo$/i).closest(".item");
+    expect(item.querySelector(".header")).toHaveTextContent(/^user group$/i);
+  });
+
+  it("shows Deleted group without accordion when the group is missing", async () => {
+    const deletedGroupGrant = {
+      ...baseGrant,
+      user: null,
+      user_group_id: 10,
+      user_group: null,
+    };
+
+    const rendered = render(
+      <Grant {...defaultProps} grant={deletedGroupGrant} />,
+      { messages },
+    );
+    await waitForLoad(rendered);
+
+    const item = rendered.getByText(/^deleted group$/i).closest(".item");
+    expect(item.querySelector(".header")).toHaveTextContent(/^user group$/i);
+    expect(item.querySelector(".header")).not.toHaveTextContent(/^user$/i);
+    expect(item.querySelector(".angle.right.icon")).not.toBeInTheDocument();
+    expect(item.querySelector(".angle.down.icon")).not.toBeInTheDocument();
+    expect(item.querySelector("table")).not.toBeInTheDocument();
+  });
+
+  it("shows Deleted user when the user is missing", async () => {
+    const deletedUserGrant = {
+      ...baseGrant,
+      user_id: 7,
+      user: null,
+    };
+
+    const rendered = render(
+      <Grant {...defaultProps} grant={deletedUserGrant} />,
+      { messages },
+    );
+    await waitForLoad(rendered);
+
+    const item = rendered.getByText(/^deleted user$/i).closest(".item");
+    expect(item.querySelector(".header")).toHaveTextContent(/^user$/i);
+    expect(item.querySelector(".header")).not.toHaveTextContent(/user group/i);
+    expect(item.querySelector(".angle.right.icon")).not.toBeInTheDocument();
+    expect(item.querySelector(".angle.down.icon")).not.toBeInTheDocument();
+  });
+
+  it("shows user full name without group accordion when grant is for a user", async () => {
+    const userGrant = {
+      ...baseGrant,
+      user: {
+        full_name: "foo user",
+        email: "foo@ext",
+      },
+    };
+
+    const rendered = render(<Grant {...defaultProps} grant={userGrant} />, {
+      messages,
+    });
+    await waitForLoad(rendered);
+
+    const item = rendered.getByText(/^foo user$/i).closest(".item");
+    expect(item.querySelector(".header")).toHaveTextContent(/^user$/i);
+    expect(item.querySelector(".header")).not.toHaveTextContent(/user group/i);
+    expect(item.querySelector(".angle.right.icon")).not.toBeInTheDocument();
+    expect(item.querySelector(".angle.down.icon")).not.toBeInTheDocument();
+  });
+
+  it("shows User group header for source_group_name without accordion", async () => {
+    const sourceGroupGrant = {
+      ...baseGrant,
+      user: null,
+      user_group: null,
+      source_group_name: "baz",
+    };
+
+    const rendered = render(
+      <Grant {...defaultProps} grant={sourceGroupGrant} />,
+      { messages },
+    );
+    await waitForLoad(rendered);
+
+    const item = rendered.getByText(/^baz$/i).closest(".item");
+    expect(item.querySelector(".header")).toHaveTextContent(/^user group$/i);
+    expect(item.querySelector(".header")).not.toHaveTextContent(/^user$/i);
+    expect(item.querySelector(".angle.right.icon")).not.toBeInTheDocument();
+    expect(item.querySelector(".angle.down.icon")).not.toBeInTheDocument();
+    expect(item.querySelector("table")).not.toBeInTheDocument();
+  });
+});

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

@@ -44,6 +44,8 @@ const approvalRule = {
 };
 
 describe("<GrantApprovalRuleForm />", () => {
+  beforeEach(() => jest.useRealTimers());
+
   it("matches the last snapshot", async () => {
     const props = {
       onSubmit: jest.fn(),

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

@@ -1,5 +1,6 @@
 import { render, waitForLoad } from "@truedat/test/render";
 import { domainsMock, rolesMock } from "@truedat/test/mocks";
+import { CURRENT_ROLES } from "@truedat/core/api/queries";
 import { GrantApprovalRuleNew } from "../GrantApprovalRuleNew";
 
 const createGrantApprovalRule = jest.fn();
@@ -8,6 +9,13 @@ const renderOpts = {
   mocks: [
     domainsMock({ action: "approveGrantRequests" }),
     rolesMock({ domainId: "1", permission: "approve_grant_request" }),
+    {
+      request: {
+        query: CURRENT_ROLES,
+        variables: { domainId: null, permission: "approve_grant_request" },
+      },
+      result: { data: { currentRoles: [] } },
+    },
   ],
 };
 

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

@@ -4,6 +4,8 @@ import GrantApprovalRules from "../GrantApprovalRules";
 import { GRANT_APPROVAL_RULES_QUERY } from "../../api/queries";
 import en from "../../messages/en";
 
+jest.mock("@truedat/bg/hooks/useDomains");
+
 const grantApprovalRules = {
   grantApprovalRules: [
     {
@@ -15,6 +17,7 @@ const grantApprovalRules = {
       domains: [
         {
           __typename: "Domain",
+          id: "1",
           name: "domain_test",
         },
       ],
@@ -28,6 +31,7 @@ const grantApprovalRules = {
       domains: [
         {
           __typename: "Domain",
+          id: "1",
           name: "domain_test",
         },
       ],

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

@@ -481,8 +481,8 @@ describe("<GrantRequest />", () => {
           en: {
             "grantRequest.header.user": "User",
             "grantRequest.header.group": "User group",
-            "grantRequest.deleted.user": "Deleted user",
-            "grantRequest.deleted.group": "Deleted group",
+            "deleted.user": "Deleted user",
+            "deleted.group": "Deleted group",
           },
         },
       },
@@ -519,8 +519,8 @@ describe("<GrantRequest />", () => {
           en: {
             "grantRequest.header.user": "User",
             "grantRequest.header.group": "User group",
-            "grantRequest.deleted.user": "Deleted user",
-            "grantRequest.deleted.group": "Deleted group",
+            "deleted.user": "Deleted user",
+            "deleted.group": "Deleted group",
           },
         },
       },

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

@@ -1,5 +1,4 @@
 import userEvent from "@testing-library/user-event";
-import { act } from "@testing-library/react";
 import { render, waitForLoad } from "@truedat/test/render";
 import SearchContext from "@truedat/core/search/SearchContext";
 import GrantRequestBulkActions from "../GrantRequestBulkActions";
@@ -142,8 +141,6 @@ describe("<GrantRequestBulkActions />", () => {
     await user.click(await rendered.findByText(/approve_request/i));
     await user.type(await rendered.getByRole("textbox"), "Approve comment");
 
-    await act(
-      async () => await user.click(rendered.getByTestId("approve-button-id")),
-    );
+    await user.click(rendered.getByTestId("approve-button-id"));
   });
 });

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

@@ -3,6 +3,8 @@ import { render, waitForLoad } from "@truedat/test/render";
 import SearchContext from "@truedat/core/search/SearchContext";
 import GrantRequestsSearchResults from "../GrantRequestsSearchResults";
 
+jest.mock("@truedat/core/hooks/useUserFilters");
+
 describe("<GrantRequestsSearchResults />", () => {
   const grantRequests = [{ id: 1 }, { id: 2 }];
   const rolesPermission = ["foo", "bar"];

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

@@ -1,5 +1,6 @@
-import { render, waitForLoad } from "@truedat/test/render";
 import { screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { render, waitForLoad } from "@truedat/test/render";
 import SearchContext from "@truedat/core/search/SearchContext";
 import { GrantsDownloadButton } from "../GrantsDownloadButton";
 
@@ -139,7 +140,8 @@ describe("<GrantsDownloadButton />", () => {
     );
 
     const button = await screen.findByRole("button");
-    button.click();
+    const user = userEvent.setup({ delay: null });
+    await user.click(button);
 
     expect(triggerMock).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -193,4 +195,58 @@ describe("<GrantsDownloadButton />", () => {
 
     expect(setDownloadingMock).toHaveBeenCalledWith(true);
   });
+
+  it("sends User / Group in header_labels for user_name", async () => {
+    const triggerMock = jest.fn();
+
+    jest
+      .mocked(require("@truedat/dd/hooks/useGrant").useGrantDownload)
+      .mockReturnValue({
+        trigger: triggerMock,
+        isMutating: false,
+      });
+
+    const props = {
+      hasFilterApplied: true,
+      onlyMyGrants: false,
+      setDownloading: jest.fn(),
+    };
+
+    const rendered = render(
+      <SearchContext value={searchContext}>
+        <GrantsDownloadButton {...props} />
+      </SearchContext>,
+      {
+        state: {
+          userPermissions: { update: true },
+        },
+        messages: {
+          en: {
+            "grants.actions.download.tooltip": "Download to XLSX",
+            "grants.props.user_name": "User",
+            "grants.props.user_or_group": "User / Group",
+            "grants.props.data_structure_name": "Structure",
+            "grants.props.domain_name": "Domain",
+            "grants.props.end_date": "End date",
+            "grants.props.grant_details": "Details",
+            "grants.props.start_date": "Start date",
+            "grants.props.structure_path": "Path",
+            "grants.props.system_name": "System",
+          },
+        },
+      },
+    );
+
+    await waitForLoad(rendered);
+    const user = userEvent.setup({ delay: null });
+    await user.click(await rendered.findByRole("button"));
+
+    expect(triggerMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        header_labels: expect.objectContaining({
+          user_name: "User / Group",
+        }),
+      }),
+    );
+  });
 });

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

@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";
 import { render, waitForLoad } from "@truedat/test/render";
 import SearchContext from "@truedat/core/search/SearchContext";
 import { GrantsTable } from "../GrantsTable";
-import { defaultGrantsTableColumns } from "../../selectors/getGrantsColumns";
+import { getGrantsTableColumns } from "../../selectors/getGrantsColumns";
 
 describe("<GrantsTable />", () => {
   const renderOpts = {
@@ -79,7 +79,7 @@ describe("<GrantsTable />", () => {
   const sortGrants = jest.fn();
   const grantsLoading = false;
   const props = {
-    columns: defaultGrantsTableColumns,
+    columns: getGrantsTableColumns({ authentication: {} }),
     setDownloading: jest.fn(),
   };
 
@@ -100,6 +100,7 @@ describe("<GrantsTable />", () => {
       renderOpts,
     );
     await waitForLoad(rendered);
+    expect(rendered.getByText("user_full_name_1")).toBeInTheDocument();
     expect(rendered.container).toMatchSnapshot();
   });
 
@@ -137,4 +138,23 @@ describe("<GrantsTable />", () => {
     await user.click(headers[0]);
     expect(handleSortSelection).toHaveBeenCalled();
   });
+
+  it("shows User / Group header for the user column", async () => {
+    const rendered = render(
+      <SearchContext value={searchContext}>
+        <GrantsTable {...props} />
+      </SearchContext>,
+      {
+        ...renderOpts,
+        messages: {
+          en: {
+            "grant.header.user": "User",
+            "grants.props.user_or_group": "User / Group",
+          },
+        },
+      },
+    );
+    await waitForLoad(rendered);
+    expect(rendered.getByText(/user \/ group/i)).toBeInTheDocument();
+  });
 });

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

@@ -9,7 +9,12 @@ describe("<LineageDefs />", () => {
   };
 
   it("matches the latest snapshot", async () => {
-    const rendered = render(<LineageDefs />, renderOpts);
+    const rendered = render(
+      <svg>
+        <LineageDefs />
+      </svg>,
+      renderOpts,
+    );
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
   });

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

@@ -74,6 +74,7 @@ describe("<LineageForm />", () => {
   };
 
   beforeEach(() => {
+    jest.useRealTimers();
     localStorage.clear();
   });
 

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

@@ -1,4 +1,4 @@
-import { fireEvent, screen } from "@testing-library/react";
+import { act, fireEvent, screen } from "@testing-library/react";
 import { render } from "@truedat/test/render";
 import { LineageGraphToolbar, visibleLegendKeys } from "../LineageGraphToolbar";
 
@@ -45,12 +45,12 @@ const renderToolbar = (props = {}, state = { graph: { id: "graph-1" } }) =>
 describe("<LineageGraphToolbar />", () => {
   beforeEach(() => jest.clearAllMocks());
 
-  it("opens the legend from the empty context slot", () => {
+  it("opens the legend from the empty context slot", async () => {
     renderToolbar({ context: null });
     const button = screen.getByRole("button", { name: "Lineage legend" });
     expect(button).toBeEnabled();
     expect(button).toHaveAttribute("aria-expanded", "false");
-    fireEvent.click(button);
+    await act(async () => fireEvent.click(button));
     expect(defaultProps.onPanelChange).toHaveBeenCalledWith("legend");
   });
 
@@ -98,7 +98,7 @@ describe("<LineageGraphToolbar />", () => {
     ).toHaveAttribute("title", "Search nodes");
   });
 
-  it("changes visible depth independently through the accessible selector", () => {
+  it("changes visible depth independently through the accessible selector", async () => {
     renderToolbar();
 
     const trigger = screen.getByRole("button", { name: "Visible levels" });
@@ -111,7 +111,7 @@ describe("<LineageGraphToolbar />", () => {
       trigger.closest(".lineage-graph__dock-tooltip-trigger"),
     ).not.toBeInTheDocument();
 
-    fireEvent.click(trigger);
+    await act(async () => fireEvent.click(trigger));
 
     expect(trigger).toHaveAttribute("aria-expanded", "true");
     expect(trigger).toHaveClass("lineage-graph__dock-button--active");
@@ -249,17 +249,19 @@ describe("<LineageGraphToolbar />", () => {
     expect(defaultProps.onUnpin).toHaveBeenCalledTimes(1);
   });
 
-  it("forwards search, collapse and expand interactions", () => {
-    renderToolbar({ activePanel: "search" });
+  it("forwards search, collapse and expand interactions", async () => {
+    await act(async () => renderToolbar({ activePanel: "search" }));
 
-    fireEvent.change(
-      screen.getByRole("textbox", { name: "Search graph nodes" }),
-      {
-        target: { value: "orders" },
-      },
-    );
-    fireEvent.click(screen.getByRole("button", { name: "Collapse all" }));
-    fireEvent.click(screen.getByRole("button", { name: "Expand all" }));
+    await act(async () => {
+      fireEvent.change(
+        screen.getByRole("textbox", { name: "Search graph nodes" }),
+        {
+          target: { value: "orders" },
+        },
+      );
+      fireEvent.click(screen.getByRole("button", { name: "Collapse all" }));
+      fireEvent.click(screen.getByRole("button", { name: "Expand all" }));
+    });
 
     expect(defaultProps.onSearchInputChange).toHaveBeenCalledWith("orders");
     expect(defaultProps.onCollapseAll).toHaveBeenCalledTimes(1);
@@ -288,7 +290,7 @@ describe("<LineageGraphToolbar />", () => {
     ).not.toBeInTheDocument();
   });
 
-  it("toggles whether a double click expands or collapses nodes", () => {
+  it("toggles whether a double click expands or collapses nodes", async () => {
     const onDoubleClickExpandsNodesChange = jest.fn();
     renderToolbar({ onDoubleClickExpandsNodesChange });
 
@@ -299,7 +301,7 @@ describe("<LineageGraphToolbar />", () => {
     expect(
       settingsButton.querySelector(".lucide-settings"),
     ).toBeInTheDocument();
-    fireEvent.click(settingsButton);
+    await act(async () => fireEvent.click(settingsButton));
 
     const toggle = screen.getByRole("checkbox", {
       name: "Double-click expands or collapses nodes",