@truedat/dq 4.48.4 → 4.48.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.48.7]
+
+### Added
+
+- [TD-5029] Reenable submit test commented out in [TD-4661]
+
+## [4.48.6] 2022-07-15
+
+### Fixed
+
+- [TD-4576] Send business_concept_id in concept rules tab rule creation form
+
 ## [4.48.2] 2022-07-08
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.48.4",
+  "version": "4.48.7",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -88,8 +88,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.4",
-    "@truedat/core": "4.48.4",
-    "@truedat/df": "4.48.4",
+    "@truedat/core": "4.48.7",
+    "@truedat/df": "4.48.7",
     "axios": "^0.19.2",
     "graphql": "^15.5.3",
     "path-to-regexp": "^1.7.0",
@@ -110,5 +110,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "5e50a034469bf3ad8e02a64eb875ad2b710b6b03"
+  "gitHead": "f4a20ecf51eb101c2c25facfec48ee8cd0e621a3"
 }

package/src/components/RuleForm.js

@@ -148,10 +148,29 @@ export class RuleForm extends React.Component {
     e.preventDefault();
     if (this.messagesInformed(this.generateValidationMessages())) return;
     const { onSubmit, match } = this.props;
-    const { concept, ...rule } = this.state;
+
+    const {
+      concept,
+      domain_id,
+      active,
+      description,
+      df_content,
+      df_name,
+      name,
+    } = this.state;
 
     onSubmit({
-      rule,
+      rule: {
+        ...(concept?.business_concept_id && {
+          business_concept_id: concept?.business_concept_id,
+        }),
+        domain_id,
+        active,
+        description,
+        df_content,
+        df_name,
+        name,
+      },
       ids: match.params,
     });
   };
@@ -204,7 +223,7 @@ export class RuleForm extends React.Component {
       isSubmitting,
       intl: { formatMessage },
     } = this.props;
-    const { template, valid, ...rule } = this.state;
+    const { valid, ...rule } = this.state;
     const { domain_id } = rule;
     const { concept, domainOptions } = this.props;
     const messages = this.generateValidationMessages();

package/src/components/__test_samples__/RuleForm.js

@@ -0,0 +1,118 @@
+export const globalState = {
+  ruleCreating: false,
+  ruleUpdating: false,
+  conceptRulesActions: {
+    domain_ids: [
+      {
+        external_id: "ARQUITECTURA",
+        id: 1,
+        name: "ARQ",
+        parent_id: null,
+        updated_at: "2020-04-01 11:30:42.177807Z",
+      },
+    ],
+  },
+  concept: {
+    id: 12157,
+    content: {
+      CHECKBOXES: "",
+      dependiente: "v4",
+    },
+    confidential: false,
+    description: {
+      document: {
+        data: {},
+        nodes: [
+          {
+            data: {},
+            nodes: [
+              {
+                marks: [],
+                object: "text",
+                text: "a",
+              },
+            ],
+            object: "block",
+            type: "paragraph",
+          },
+        ],
+        object: "document",
+      },
+      object: "value",
+    },
+    domain: {
+      id: 1,
+      name: "ARQ",
+    },
+    domain_parents: [
+      {
+        external_id: "ARQUITECTURA",
+        id: 1,
+        name: "ARQ",
+      },
+      {
+        external_id: "Bankia Prueba",
+        id: 191,
+        name: "Bankia Prueba",
+      },
+    ],
+    name: "abc-def",
+    business_concept_id: 11960,
+    status: "published",
+    type: "test_checkboxes",
+    version: 1,
+    template: {
+      content: [
+        {
+          fields: [
+            {
+              cardinality: "?",
+              default: "",
+              label: "dependiente",
+              name: "dependiente",
+              type: "string",
+              values: {
+                fixed: ["v1", "v2", "v3", "v4"],
+              },
+              widget: "radio",
+            },
+            {
+              cardinality: "*",
+              default: "",
+              label: "CHECKBOXES",
+              name: "CHECKBOXES",
+              type: "string",
+              values: {
+                switch: {
+                  on: "dependiente",
+                  values: {
+                    v1: ["v11", "v22"],
+                    v2: ["c2a", "c2b"],
+                    v3: ["v3x", "v3y"],
+                  },
+                },
+              },
+              widget: "checkbox",
+            },
+          ],
+          name: "New Group 1",
+        },
+      ],
+      label: "test_checkboxes",
+    },
+    last_change_at: "2021-12-28T09:35:25.624552Z",
+    last_change_by: 29,
+    last_change_user: {
+      email: "user@domain.tld",
+      external_id: "",
+      full_name: "Full Name",
+      id: 29,
+      user_name: "user@domain.tld",
+    },
+    completeness: 50,
+    in_progress: false,
+    link_count: 0,
+    rule_count: 11,
+    concept_count: 4,
+  },
+};

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

@@ -207,126 +207,133 @@ describe("<NewRuleImplementation> NewRuleImplementation doSubmit", () => {
     });
   });
 
-  // it("doSubmit: unique across fields operator", async () => {
-  //   const expectedRuleImplementation = {
-  //     ...expectedRuleImplementationBase,
-  //     validations: [
-  //       {
-  //         modifier: null,
-  //         operator: { name: "unique", value_type: "field_list" },
-  //         population: [],
-  //         structure: { id: 11127109, parent_index: 4, name: "EMAIL", type: "VARCHAR2" },
-  //         value: [
-  //           {
-  //             fields: [
-  //               {
-  //                 id: 11127109,
-  //                 name: "EMAIL",
-  //                 parent_index: 4,
-  //                 path: undefined,
-  //               },
-  //               {
-  //                 id: 11127116,
-  //                 name: "PHONE_NUMBER",
-  //                 parent_index: 4,
-  //                 path: undefined,
-  //               },
-  //             ],
-  //           },
-  //         ],
-  //         value_modifier: [],
-  //       },
-  //     ],
-  //   };
-
-  //   const { queryByText, getByRole, findByRole, findByTestId } = render(
-  //     <NewRuleImplementation {...props} />,
-  //     renderOptsImplementationEdit
-  //   );
-
-  //   // Information Form
-
-  //   await waitFor(() => {
-  //     expect(queryByText(/Template/)).toBeTruthy();
-  //   });
-
-  //   userEvent.click(await findByRole("option", { name: "template1" }));
-
-  //   await waitFor(() => {
-  //     expect(getByRole("button", { name: "Next" })).toBeEnabled();
-  //   });
-  //   userEvent.click(await getByRole("button", { name: "Next" }));
-
-  //   // Dataset Form
-
-  //   await waitFor(() => {
-  //     expect(getByRole("button", { name: "Next" })).toBeEnabled();
-  //   });
-  //   userEvent.click(await getByRole("button", { name: "Next" }));
-
-  //   // Population Form
-
-  //   await waitFor(() => {
-  //     expect(getByRole("button", { name: "Next" })).toBeEnabled();
-  //   });
-  //   userEvent.click(await getByRole("button", { name: "Next" }));
-
-  //   // Validations Form
-
-  //   userEvent.click(await findByRole("button", { name: "add-condition-row" }));
-
-  //   const row = await findByTestId("row-0");
-
-  //   const field = row.querySelector('div[label="Field"]');
-  //   const operator = row.querySelector('div[label="Operator"]');
-
-  //   userEvent.click(field);
-  //   const fieldOptions = await within(field).findByRole("listbox");
-  //   const emailFieldOption = within(fieldOptions).getByText("EMAIL");
-  //   userEvent.click(emailFieldOption);
-  //   const selectedField = fieldOptions.querySelector(".selected>span");
-  //   expect(within(selectedField).queryByText(/EMAIL/)).toBeInTheDocument();
-
-  //   userEvent.click(operator);
-  //   const operatorOptions = await within(operator).findByRole("listbox");
-  //   const uniqueAcrossFieldsOperatorOption = within(operatorOptions).getByText(
-  //     "unique across fields"
-  //   );
-  //   userEvent.click(uniqueAcrossFieldsOperatorOption);
-  //   const selectedOperator = operatorOptions.querySelector(".selected>span");
-  //   expect(
-  //     within(selectedOperator).queryByText(/unique across fields/)
-  //   ).toBeInTheDocument();
-
-  //   const updatedRow = await findByTestId("row-0");
-  //   const value = updatedRow.querySelector('div[label="Value"]');
-  //   userEvent.click(value);
-  //   const valueOptions = await within(value).findByRole("listbox");
-  //   const valueEmailFieldOption = within(valueOptions).getByText("EMAIL");
-  //   const valuePhoneNumberFieldOption =
-  //     within(valueOptions).getByText("PHONE_NUMBER");
-
-  //   userEvent.click(valueEmailFieldOption);
-  //   userEvent.click(valuePhoneNumberFieldOption);
-
-  //   const selectedFieldValues = updatedRow.querySelectorAll(".label");
-
-  //   const selectedFieldTexts = [...selectedFieldValues].map(
-  //     (selectedFieldValue) => selectedFieldValue.text
-  //   );
-
-  //   expect(_.difference(selectedFieldTexts, ["EMAIL", "PHONE_NUMBER"])).toEqual(
-  //     []
-  //   );
-
-  //   await waitFor(() => {
-  //     expect(getByRole("button", { name: "Save" })).toBeEnabled();
-  //   });
-  //   userEvent.click(await getByRole("button", { name: "Save" }));
-
-  //   expect(dispatch).toHaveBeenCalledWith({
-  //     ...ruleImplementationLoaderActions.updateRuleImplementation(),
-  //     payload: { rule_implementation: expectedRuleImplementation },
-  //   });
-  // });
+  it("doSubmit: unique across fields operator", async () => {
+    const expectedRuleImplementation = {
+      ...expectedRuleImplementationBase,
+      validations: [
+        {
+          modifier: null,
+          operator: { name: "unique", value_type: "field_list" },
+          population: [],
+          structure: {
+            id: 11127109,
+            parent_index: 4,
+            name: "EMAIL",
+            type: "VARCHAR2",
+          },
+          value: [
+            {
+              fields: [
+                {
+                  id: 11127109,
+                  name: "EMAIL",
+                  parent_index: 4,
+                  path: undefined,
+                  type: "VARCHAR2",
+                },
+                {
+                  id: 11127116,
+                  name: "PHONE_NUMBER",
+                  parent_index: 4,
+                  path: undefined,
+                  type: "VARCHAR2",
+                },
+              ],
+            },
+          ],
+          value_modifier: [],
+        },
+      ],
+    };
+
+    const { queryByText, getByRole, findByRole, findByTestId } = render(
+      <NewRuleImplementation {...props} />,
+      renderOptsImplementationEdit
+    );
+
+    // Information Form
+
+    await waitFor(() => {
+      expect(queryByText(/Template/)).toBeTruthy();
+    });
+
+    userEvent.click(await findByRole("option", { name: "template1" }));
+
+    await waitFor(() => {
+      expect(getByRole("button", { name: "Next" })).toBeEnabled();
+    });
+    userEvent.click(await getByRole("button", { name: "Next" }));
+
+    // Dataset Form
+
+    await waitFor(() => {
+      expect(getByRole("button", { name: "Next" })).toBeEnabled();
+    });
+    userEvent.click(await getByRole("button", { name: "Next" }));
+
+    // Population Form
+
+    await waitFor(() => {
+      expect(getByRole("button", { name: "Next" })).toBeEnabled();
+    });
+    userEvent.click(await getByRole("button", { name: "Next" }));
+
+    // Validations Form
+
+    userEvent.click(await findByRole("button", { name: "add-condition-row" }));
+
+    const row = await findByTestId("row-0");
+
+    const field = row.querySelector('div[label="Field"]');
+    const operator = row.querySelector('div[label="Operator"]');
+
+    userEvent.click(field);
+    const fieldOptions = await within(field).findByRole("listbox");
+    const emailFieldOption = within(fieldOptions).getByText("EMAIL");
+    userEvent.click(emailFieldOption);
+    const selectedField = fieldOptions.querySelector(".selected>span");
+    expect(within(selectedField).queryByText(/EMAIL/)).toBeInTheDocument();
+
+    userEvent.click(operator);
+    const operatorOptions = await within(operator).findByRole("listbox");
+    const uniqueAcrossFieldsOperatorOption = within(operatorOptions).getByText(
+      "unique across fields"
+    );
+    userEvent.click(uniqueAcrossFieldsOperatorOption);
+    const selectedOperator = operatorOptions.querySelector(".selected>span");
+    expect(
+      within(selectedOperator).queryByText(/unique across fields/)
+    ).toBeInTheDocument();
+
+    const updatedRow = await findByTestId("row-0");
+    const value = updatedRow.querySelector('div[label="Value"]');
+    userEvent.click(value);
+    const valueOptions = await within(value).findByRole("listbox");
+    const valueEmailFieldOption = within(valueOptions).getByText("EMAIL");
+    const valuePhoneNumberFieldOption =
+      within(valueOptions).getByText("PHONE_NUMBER");
+
+    userEvent.click(valueEmailFieldOption);
+    userEvent.click(valuePhoneNumberFieldOption);
+
+    const selectedFieldValues = updatedRow.querySelectorAll(".label");
+
+    const selectedFieldTexts = [...selectedFieldValues].map(
+      (selectedFieldValue) => selectedFieldValue.text
+    );
+
+    expect(_.difference(selectedFieldTexts, ["EMAIL", "PHONE_NUMBER"])).toEqual(
+      []
+    );
+
+    await waitFor(() => {
+      expect(getByRole("button", { name: "Save" })).toBeEnabled();
+    });
+    userEvent.click(await getByRole("button", { name: "Save" }));
+
+    expect(dispatch).toHaveBeenCalledWith({
+      ...ruleImplementationLoaderActions.updateRuleImplementation(),
+      payload: { rule_implementation: expectedRuleImplementation },
+    });
+  });
 });

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

@@ -4,6 +4,7 @@ import { render } from "@truedat/test/render";
 import userEvent from "@testing-library/user-event";
 import { multipleTemplatesMock } from "@truedat/test/mocks";
 import RuleForm from "../RuleForm";
+import { globalState } from "../__test_samples__/RuleForm";
 
 const rule = {
   id: 123,
@@ -62,4 +63,41 @@ describe("<RuleForm />", () => {
       expect(getByRole("button", { name: /save/i })).not.toBeDisabled();
     });
   });
+
+  it("submit rule data", async () => {
+    const onSubmit = jest.fn();
+
+    const renderOpts = {
+      mocks: [multipleTemplatesMock({ scope: "dq", domainIds: [1] })],
+      state: globalState,
+      fallback: "lazy",
+    };
+
+    const { getByRole } = render(<RuleForm onSubmit={onSubmit} />, renderOpts);
+    await waitFor(() =>
+      expect(getByRole("button", { name: /save/i })).toBeDisabled()
+    );
+    userEvent.click(getByRole("option", { name: "ARQ" }));
+    const ruleNameTextbox = getByRole("textbox", { name: /rule name/i });
+    userEvent.paste(ruleNameTextbox, "rule1");
+    expect(ruleNameTextbox).toHaveValue("rule1");
+    await waitFor(() => {
+      expect(getByRole("button", { name: /save/i })).not.toBeDisabled();
+    });
+
+    userEvent.click(await getByRole("button", { name: /save/i }));
+
+    expect(onSubmit).toHaveBeenCalledWith({
+      ids: {},
+      rule: {
+        active: true,
+        business_concept_id: 11960,
+        description: {},
+        df_content: {},
+        df_name: undefined,
+        domain_id: 1,
+        name: "rule1",
+      },
+    });
+  });
 });