@truedat/dq 7.5.7 → 7.5.10

package/src/components/ruleImplementationForm/__tests__/RuleImplementationBasicForm.spec.js

@@ -1,30 +1,43 @@
 import _ from "lodash/fp";
-import React from "react";
+import { render, waitForLoad } from "@truedat/test/render";
 import { waitFor } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { render } from "@truedat/test/render";
 import { DOMAIN_QUERY, DOMAINS_QUERY } from "@truedat/core/api/queries";
 import { multipleTemplatesMock } from "@truedat/test/mocks";
 import { RuleImplementationBasicForm } from "../RuleImplementationBasicForm";
 
-jest.setTimeout(30000);
-
 const domains = [
-  { id: 1, name: "domain1", actions: ["publishImplementation"] },
+  {
+    id: 1,
+    name: "domain1",
+    actions: ["publishImplementation"],
+    parentId: null,
+    externalId: "extid1",
+  },
 ];
 const domainsMock = {
-  request: { query: DOMAINS_QUERY },
+  request: {
+    query: DOMAINS_QUERY,
+    variables: {
+      action: "manageBasicRulelessImplementations",
+      domainActions: ["publishImplementation"],
+      ids: undefined,
+    },
+  },
   result: { data: { domains: domains } },
 };
 
 const domainMock = {
-  request: { query: DOMAIN_QUERY },
+  request: {
+    query: DOMAIN_QUERY,
+    variables: { id: 1, actions: ["publishImplementation"] },
+  },
   result: { data: { domain: domains } },
 };
 
 const renderOpts = {
   mocks: [
     multipleTemplatesMock({ scope: "ri", domainIds: [1] }),
+    multipleTemplatesMock({ scope: "ri", domainIds: null }),
     domainMock,
     domainsMock,
   ],
@@ -32,7 +45,6 @@ const renderOpts = {
     rule: { domain_id: 1 },
     ruleImplementationCreating: false,
   },
-  fallback: "lazy",
 };
 
 const props = {
@@ -53,31 +65,29 @@ describe("<RuleImplementationBasicForm />", () => {
     const updatedProps = _.flow(_.set("ruleImplementation.domain_id", 1))(
       props
     );
-    const { container, queryByText } = render(
+    const rendered = render(
       <RuleImplementationBasicForm {...updatedProps} />,
       renderOpts
     );
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument(), {
-      timeout: 10000,
-    });
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    expect(container).toMatchSnapshot();
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
-  it("Implementation_key field is editable with status published", () => {
+  it("Implementation_key field is editable with status published", async () => {
     const updatedProps = _.flow(
       _.set("ruleImplementation.domain_id", 1),
       _.set("ruleImplementation.status", "published"),
       _.set("ruleImplementation.implementation_key", "implementation_test")
     )(props);
-    const { queryByPlaceholderText } = render(
+    const rendered = render(
       <RuleImplementationBasicForm {...updatedProps} />,
       renderOpts
     );
+    await waitForLoad(rendered);
     expect(
-      queryByPlaceholderText("Rule Implementation Key")
+      rendered.queryByPlaceholderText(
+        /ruleImplementation.props.name.placeholder/i
+      )
     ).not.toBeDisabled();
   });
 
@@ -91,12 +101,13 @@ describe("<RuleImplementationBasicForm />", () => {
       ...updatedProps,
     };
 
-    const { getByRole } = render(
+    const rendered = render(
       <RuleImplementationBasicForm {...customProps} />,
       renderOpts
     );
+    await waitForLoad(rendered);
     await waitFor(() => {
-      expect(getByRole("button", { name: "Save" })).toBeEnabled();
+      expect(rendered.getByRole("button", { name: /save/i })).toBeEnabled();
     });
   });
 
@@ -111,26 +122,29 @@ describe("<RuleImplementationBasicForm />", () => {
       rule: { id: 5, name: "regla" },
     };
 
-    const { findByRole } = render(
+    const rendered = render(
       <RuleImplementationBasicForm {...customProps} />,
       renderOpts
     );
-    expect(await findByRole("button", { name: /save/i })).toBeEnabled();
+    await waitForLoad(rendered);
+    expect(
+      await rendered.findByRole("button", { name: /save/i })
+    ).toBeEnabled();
   });
 
   it("submit button disabled if there is invalid content in form", async () => {
     const updatedProps = _.flow(
-      _.set("ruleImplementation.domain_id", 1),
       _.set("ruleImplementation.dfName", "template1"),
       _.set("ruleImplementation.dfContent", {})
     )(props);
     const customProps = {
       ...updatedProps,
     };
-    const { queryByRole } = render(
+    const rendered = render(
       <RuleImplementationBasicForm {...customProps} />,
       renderOpts
     );
-    expect(queryByRole("button", { name: /save/i })).toBeDisabled();
+    await waitForLoad(rendered);
+    expect(rendered.getByRole("button", { name: /save/i })).toBeDisabled();
   });
 });

package/src/components/ruleImplementationForm/__tests__/RuleImplementationForm.spec.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { waitFor } from "@testing-library/react";
 import { render } from "@truedat/test/render";
 import { multipleTemplatesMock } from "@truedat/test/mocks";
@@ -29,7 +28,6 @@ const renderOpts = {
     rule: {},
     ruleImplementationCreating: true,
   },
-  fallback: "lazy",
 };
 
 describe("<RuleImplementationForm />", () => {

package/src/components/ruleImplementationForm/__tests__/RuleImplementationRawForm.spec.js

@@ -1,27 +1,43 @@
 import _ from "lodash/fp";
-import React from "react";
-import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { render } from "@truedat/test/render";
+import { waitFor } from "@testing-library/react";
+import { render, waitForLoad } from "@truedat/test/render";
 import { DOMAIN_QUERY, DOMAINS_QUERY } from "@truedat/core/api/queries";
 import { multipleTemplatesMock } from "@truedat/test/mocks";
 import { RuleImplementationRawForm } from "../RuleImplementationRawForm";
 
-jest.setTimeout(30000);
-
-const domains = [{ id: 1, name: "domain1", actions: [] }];
+const domains = [
+  {
+    id: 1,
+    name: "domain1",
+    actions: [],
+    parentId: null,
+    externalId: "ext_id_1",
+  },
+];
 const domainsMock = {
-  request: { query: DOMAINS_QUERY },
+  request: {
+    query: DOMAINS_QUERY,
+    variables: {
+      action: "manageRawRulelessImplementations",
+      domainActions: ["publishImplementation"],
+      ids: undefined,
+    },
+  },
   result: { data: { domains: domains } },
 };
 
 const domainMock = {
-  request: { query: DOMAIN_QUERY },
+  request: {
+    query: DOMAIN_QUERY,
+    variables: { id: 1, actions: ["publishImplementation"] },
+  },
   result: { data: { domain: domains } },
 };
 
 const renderOpts = {
   mocks: [
+    multipleTemplatesMock({ scope: "ri", domainIds: null }),
     multipleTemplatesMock({ scope: "ri", domainIds: [1] }),
     domainMock,
     domainsMock,
@@ -30,7 +46,6 @@ const renderOpts = {
     rule: { domain_id: 1 },
     ruleImplementationCreating: false,
   },
-  fallback: "lazy",
 };
 
 const props = {
@@ -94,40 +109,41 @@ describe("<RuleImplementationRawForm />", () => {
     const updatedProps = _.flow(_.set("ruleImplementation.domain_id", 1))(
       props
     );
-    const { container, queryByText } = render(
+    const rendered = render(
       <RuleImplementationRawForm {...updatedProps} />,
       renderOpts
     );
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument(), {
-      timeout: 10000,
-    });
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    expect(container).toMatchSnapshot();
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
-  it("Implementation_key field is editable with status published", () => {
+  it("Implementation_key field is editable with status published", async () => {
     const updatedProps = _.flow(
       _.set("ruleImplementation.domain_id", 1),
       _.set("ruleImplementation.status", "published"),
       _.set("ruleImplementation.implementation_key", "implementation_test")
     )(props);
-    const { queryByPlaceholderText } = render(
+    const rendered = render(
       <RuleImplementationRawForm {...updatedProps} />,
       renderOpts
     );
+    await waitForLoad(rendered);
     expect(
-      queryByPlaceholderText("Rule Implementation Key")
+      rendered.queryByPlaceholderText(
+        /ruleImplementation.props.name.placeholder/i
+      )
     ).not.toBeDisabled();
   });
 
-  it("renders sources", () => {
-    const { queryByRole } = render(
+  it("renders sources", async () => {
+    const rendered = render(
       <RuleImplementationRawForm {...props} />,
       renderOpts
     );
-    expect(queryByRole("option", { name: "ext_id_1" })).toBeInTheDocument();
+    await waitForLoad(rendered);
+    expect(
+      rendered.getByRole("option", { name: /ext_id_1/i })
+    ).toBeInTheDocument();
   });
 
   it("renders databases dropdown if selected source has databases", async () => {
@@ -141,17 +157,16 @@ describe("<RuleImplementationRawForm />", () => {
       },
     };
 
-    const { queryByRole } = render(
+    const rendered = render(
       <RuleImplementationRawForm {...customProps} />,
       renderOpts
     );
+    await waitForLoad(rendered);
 
-    await waitFor(() => {
-      expect(queryByRole("option", { name: "db1" })).toBeInTheDocument();
-    });
+    expect(rendered.getByRole("option", { name: /db1/i })).toBeInTheDocument();
   });
 
-  it("dont renders databases dropdown if selected source doesnt have databases", () => {
+  it("dont renders databases dropdown if selected source doesnt have databases", async () => {
     const customProps = {
       ...props,
       rawContent: {
@@ -162,11 +177,14 @@ describe("<RuleImplementationRawForm />", () => {
       },
     };
 
-    const { queryByRole } = render(
+    const rendered = render(
       <RuleImplementationRawForm {...customProps} />,
       renderOpts
     );
-    expect(queryByRole("option", { name: "db1" })).not.toBeInTheDocument();
+    await waitForLoad(rendered);
+    expect(
+      rendered.queryByRole("option", { name: /db1/i })
+    ).not.toBeInTheDocument();
   });
 
   it("submit button enabled if there is valid content in form with database without rule", async () => {
@@ -186,13 +204,12 @@ describe("<RuleImplementationRawForm />", () => {
       },
     };
 
-    const { getByRole } = render(
+    const rendered = render(
       <RuleImplementationRawForm {...customProps} />,
       renderOpts
     );
-    await waitFor(() => {
-      expect(getByRole("button", { name: "Save" })).toBeEnabled();
-    });
+    await waitForLoad(rendered);
+    expect(rendered.getByRole("button", { name: /save/i })).toBeEnabled();
   });
 
   it("submit button enabled if there is valid content in form with database", async () => {
@@ -213,11 +230,12 @@ describe("<RuleImplementationRawForm />", () => {
       rule: { id: 5, name: "regla" },
     };
 
-    const { findByRole } = render(
+    const rendered = render(
       <RuleImplementationRawForm {...customProps} />,
       renderOpts
     );
-    expect(await findByRole("button", { name: /save/i })).toBeEnabled();
+    await waitForLoad(rendered);
+    expect(rendered.getByRole("button", { name: /save/i })).toBeEnabled();
   });
 
   it("submit button disabled if databases are available and not selected", async () => {
@@ -231,23 +249,26 @@ describe("<RuleImplementationRawForm />", () => {
       },
     };
 
-    const { getByRole } = render(
+    const rendered = render(
       <RuleImplementationRawForm {...customProps} />,
       renderOpts
     );
-    expect(getByRole("button", { name: "Save" })).toBeDisabled();
+    await waitForLoad(rendered);
+    expect(rendered.getByRole("button", { name: /save/i })).toBeDisabled();
   });
 
   it("calls setImplementationRawContent when filling raw content input fields", async () => {
     const setImplementationRawContent = jest.fn();
-    const { findByLabelText } = render(
+    const rendered = render(
       <RuleImplementationRawForm
         setImplementationRawContent={setImplementationRawContent}
         {...props}
       />,
       renderOpts
     );
-    userEvent.type(await findByLabelText("Dataset"), "A");
+    await waitForLoad(rendered);
+    const user = userEvent.setup({ delay: null });
+    await user.type(rendered.getByLabelText(/dataset/i), "A");
     expect(setImplementationRawContent).toBeCalledWith({
       dataset: "A",
       population: "",
@@ -256,16 +277,18 @@ describe("<RuleImplementationRawForm />", () => {
     });
   });
 
-  it("calls setImplementationRawContent when selecting source", () => {
+  it("calls setImplementationRawContent when selecting source", async () => {
     const setImplementationRawContent = jest.fn();
-    const { queryByRole } = render(
+    const rendered = render(
       <RuleImplementationRawForm
         setImplementationRawContent={setImplementationRawContent}
         {...props}
       />,
       renderOpts
     );
-    userEvent.click(queryByRole("option", { name: "ext_id_2" }));
+    await waitForLoad(rendered);
+    const user = userEvent.setup({ delay: null });
+    await user.click(rendered.getByRole("option", { name: /ext_id_2/i }));
     expect(setImplementationRawContent).toBeCalledWith({
       database: "",
       dataset: "",
@@ -308,12 +331,12 @@ describe("<RuleImplementationRawForm />", () => {
         validations: "a.city='MADRID'",
       },
     };
-    const { findByRole } = render(
+    const rendered = render(
       <RuleImplementationRawForm {...customProps} />,
       renderOpts
     );
-
-    expect(await findByRole("button", { name: /save/i })).toBeEnabled();
+    await waitForLoad(rendered);
+    expect(rendered.getByRole("button", { name: /save/i })).toBeEnabled();
   });
 
   it("submit button disabled if there is invalid content in form", async () => {
@@ -330,11 +353,12 @@ describe("<RuleImplementationRawForm />", () => {
         validations: "a.city='MADRID'",
       },
     };
-    const { queryByRole } = render(
+    const rendered = render(
       <RuleImplementationRawForm {...customProps} />,
       renderOpts
     );
-    expect(queryByRole("button", { name: /save/i })).toBeDisabled();
+    await waitForLoad(rendered);
+    expect(rendered.getByRole("button", { name: /save/i })).toBeDisabled();
   });
 
   it("input errors if invalid content in dataset field", async () => {
@@ -347,20 +371,25 @@ describe("<RuleImplementationRawForm />", () => {
         validations: "a.city='MADRID'",
       },
     };
-    const { queryByText } = render(
+    const rendered = render(
       <RuleImplementationRawForm {...customProps} />,
       renderOpts
     );
-    expect(queryByText(/entered content not allowed.*/i)).toBeInTheDocument();
+    await waitForLoad(rendered);
+    expect(
+      rendered.getByText(/ruleImplementationRawForm.rawText.error/i)
+    ).toBeInTheDocument();
   });
 
   it("handles executable field", async () => {
     const onChange = jest.fn();
-    const { findByText } = render(
+    const rendered = render(
       <RuleImplementationRawForm {...props} onChange={onChange} />,
       renderOpts
     );
-    userEvent.click(await findByText("Executable"));
+    await waitForLoad(rendered);
+    const user = userEvent.setup({ delay: null });
+    await user.click(rendered.getByText(/executable/i));
     expect(onChange).toHaveBeenCalledWith("executable", false);
   });
 });

package/src/components/ruleImplementationForm/__tests__/ValueConditions.spec.js

@@ -1,7 +1,6 @@
-import React, { Suspense } from "react";
-import { render } from "@truedat/test/render";
 import { createStore } from "redux";
 import { Provider } from "react-redux";
+import { render, waitForLoad } from "@truedat/test/render";
 import { ValueConditions } from "../ValueConditions";
 
 describe("<ValueConditions />", () => {
@@ -51,29 +50,20 @@ describe("<ValueConditions />", () => {
     getOperatorValue,
   };
 
-  const messages = {
-    en: {
-      "filtersGrid.field.filters.popup": "Filters",
-      "filtersGrid.field.filters.deletion.popup": "Delete Filters",
-      "operator.dropdown.placeholder": "Operator Dropdown",
-      "filtersGrid.field.label": "Field",
-      "filtersGrid.field.operator": "Operator",
-      "filtersGrid.field.value": "Value",
+  const renderOpts = {
+    state: {
+      structuresSiblings,
     },
   };
 
-  it("matches the latest snapshot when siblings provided", () => {
-    const store = createStore(() => ({ structuresSiblings }));
-    const { container } = render(
-      <Provider store={store}>
-        <Suspense fallback={null}>
-          <ValueConditions {...props} />
-        </Suspense>
+  it("matches the latest snapshot when siblings provided", async () => {
+    const rendered = render(
+      <Provider store={createStore(() => ({ structuresSiblings }))}>
+        <ValueConditions {...props} />
       </Provider>,
-      {
-        messages,
-      }
+      renderOpts
     );
-    expect(container).toMatchSnapshot();
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/components/ruleImplementationForm/__tests__/__snapshots__/DataSetForm.spec.js.snap

@@ -6,7 +6,7 @@ exports[`<DatasetForm /> matches the latest snapshot 1`] = `
     class="field"
   >
     <label>
-      Structure
+      ruleImplementation.props.structure
     </label>
     <div
       class="required seven wide field"
@@ -16,7 +16,7 @@ exports[`<DatasetForm /> matches the latest snapshot 1`] = `
       >
         <input
           class="action-pointer"
-          placeholder="Search structure"
+          placeholder="ruleImplementation.props.structure.placeholder"
           required=""
           type="text"
           value=""
@@ -32,7 +32,7 @@ exports[`<DatasetForm /> matches the latest snapshot 1`] = `
       class="field"
     >
       <label>
-        Alias
+        ruleImplementation.props.structure.alias
       </label>
       <div
         class="seven wide field"
@@ -52,7 +52,7 @@ exports[`<DatasetForm /> matches the latest snapshot 1`] = `
     class="field"
   >
     <label>
-      Structure
+      ruleImplementation.props.structure
       <i
         aria-hidden="true"
         class="close icon selectable"
@@ -66,7 +66,7 @@ exports[`<DatasetForm /> matches the latest snapshot 1`] = `
       >
         <input
           class="action-pointer"
-          placeholder="Search structure"
+          placeholder="ruleImplementation.props.structure.placeholder"
           required=""
           type="text"
           value=""
@@ -82,7 +82,7 @@ exports[`<DatasetForm /> matches the latest snapshot 1`] = `
       class="field"
     >
       <label>
-        Alias
+        ruleImplementation.props.structure.alias
       </label>
       <div
         class="seven wide field"

package/src/components/ruleImplementationForm/__tests__/__snapshots__/FiltersField.spec.js.snap

@@ -1,52 +1,28 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<FiltersField /> matches the latest snapshot 1`] = `
-<lazy
-  active={false}
-  defaultFilters={
-    {
-      "class.raw": [
-        "field",
-      ],
-    }
-  }
-  fieldWidth={15}
-  joined={false}
-  onChange={[Function]}
-  onClick={[Function]}
-  onDelete={[Function]}
-  selectedStructure={
-    {
-      "structure": {
-        "structure": "1",
-      },
-    }
-  }
-  structureSelectorOverwriteColumns={
-    [
-      {
-        "name": "name",
-        "sort": {
-          "name": "name.sort",
-        },
-        "width": 2,
-      },
-      {
-        "fieldSelector": [Function],
-        "name": "system",
-        "sort": {
-          "name": "system.name.sort",
-        },
-        "width": 1,
-      },
-      {
-        "fieldDecorator": [Function],
-        "name": "path",
-        "sort": {
-          "name": "path_sort",
-        },
-      },
-    ]
-  }
-/>
+<div>
+  <div
+    class="field"
+  >
+    <label>
+      ruleImplementation.props.structure
+    </label>
+    <div
+      class="required fifteen wide field"
+    >
+      <div
+        class="ui fluid icon input"
+      >
+        <input
+          class="action-pointer"
+          placeholder="ruleImplementation.props.structure.placeholder"
+          required=""
+          type="text"
+          value=""
+        />
+      </div>
+    </div>
+  </div>
+</div>
 `;