@truedat/dq 8.12.2 → 8.12.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "8.12.2",
+  "version": "8.12.4",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "module": "src/index.js",
@@ -59,7 +59,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.12.2",
+    "@truedat/test": "8.12.4",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -92,5 +92,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "b0000f1b2727cad43ce3c3eb2fa29681488dd2ec"
+  "gitHead": "d5bc1af84c4d828bdec676b0da58385cf0d6015f"
 }

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

@@ -1,7 +1,9 @@
 import { render, waitForLoad } from "@truedat/test/render";
-import { domainsMock } from "@truedat/test/mocks";
+import { domainsMock, multipleTemplatesMock } from "@truedat/test/mocks";
 import { EditRule } from "../EditRule";
 
+jest.mock("@truedat/core/hooks/useUserFilters");
+
 jest.mock("@truedat/bg/concepts/hooks/useConcepts", () => {
   const originalModule = jest.requireActual(
     "@truedat/bg/concepts/hooks/useConcepts",
@@ -40,7 +42,10 @@ describe("<EditRule />", () => {
   const props = { rule, updateRule };
 
   const renderOpts = {
-    mocks: [domainsMock({ action: "manageQualityRule" })],
+    mocks: [
+      domainsMock({ action: "manageQualityRule" }),
+      multipleTemplatesMock({ scope: "dq", domainIds: null }),
+    ],
   };
 
   it("matches the latest snapshot", async () => {

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

@@ -1,6 +1,8 @@
 import { render, waitForLoad } from "@truedat/test/render";
 import { ImplementationStructuresNew } from "../ImplementationStructuresNew";
 
+jest.mock("@truedat/core/hooks/useUserFilters");
+
 jest.mock("@truedat/core/routes", () => ({
   linkTo: {
     IMPLEMENTATION_STRUCTURES: jest.fn(

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

@@ -31,6 +31,8 @@ const renderOpts = {
 };
 
 describe("<MoveImplementation />", () => {
+  beforeEach(() => jest.useRealTimers());
+
   it("matches snapshot with two options", async () => {
     const props = {
       implementation: { id: 123, rule_id: "1" },
@@ -48,6 +50,7 @@ describe("<MoveImplementation />", () => {
   });
 
   it("calls foo with onSubmit", async () => {
+    const user = userEvent.setup();
     const props = {
       implementation: { id: 123, rule_id: "1" },
       saving: false,
@@ -64,7 +67,7 @@ describe("<MoveImplementation />", () => {
       expect(getByRole("button", { name: "save" })).toBeDisabled(),
     );
 
-    userEvent.click(await findByRole("option", { name: "bar" }));
+    await user.click(await findByRole("option", { name: "bar" }));
 
     // Submit button should now be enabled
     await waitFor(() =>
@@ -72,7 +75,7 @@ describe("<MoveImplementation />", () => {
     );
 
     // Submit
-    userEvent.click(await findByRole("button", { name: "save" }));
+    await user.click(await findByRole("button", { name: "save" }));
 
     await waitFor(() =>
       expect(props.updateRuleImplementation).toHaveBeenCalledWith({

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

@@ -60,6 +60,8 @@ const domainMock = {
 };
 
 describe("<NewBasicRuleImplementation />", () => {
+  beforeEach(() => jest.useRealTimers());
+
   const createRuleImplementation = jest.fn();
   const updateRuleImplementation = jest.fn();
 
@@ -90,6 +92,8 @@ describe("<NewBasicRuleImplementation />", () => {
 });
 
 describe("<NewBasicRuleImplementation> NewBasicRuleImplementation doSubmit", () => {
+  beforeEach(() => jest.useRealTimers());
+
   const dispatch = jest.fn();
 
   const renderOpts = {

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

@@ -1,6 +1,8 @@
 import { render } from "@truedat/test/render";
 import { RawContent } from "../RawContent";
 
+jest.mock("@truedat/bg/hooks/useDomains");
+
 describe("<RawContent />", () => {
   const content = {
     source: { external_id: "external_id_source" },

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

@@ -34,9 +34,11 @@ const renderOpts = {
 };
 
 describe("<RemediationPlan />", () => {
+  beforeEach(() => jest.useRealTimers());
+
   it("matches the latest snapshot", async () => {
     const rendered = render(<RemediationPlan />, renderOpts);
-    await waitForLoad(rendered);
+    await waitForLoad(rendered, /loading/i, { timeout: 5000 });
     expect(rendered.container).toMatchSnapshot();
   });
 
@@ -62,10 +64,11 @@ describe("<RemediationPlan />", () => {
   });
 
   it("Remediation form is shown if edit button is clicked", async () => {
+    const user = userEvent.setup();
     const rendered = render(<RemediationPlan />, renderOpts);
     await waitForLoad(rendered);
 
-    userEvent.click(rendered.getByText(/edit/i));
+    await user.click(rendered.getByText(/edit/i));
 
     await waitFor(() => {
       expect(

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

@@ -4,6 +4,9 @@ import { domainsMock, multipleTemplatesMock } from "@truedat/test/mocks";
 import RuleForm from "../RuleForm";
 import { globalState } from "./__fixtures__/RuleForm";
 
+jest.mock("@truedat/core/hooks/useUserFilters");
+jest.mock("@truedat/bg/hooks/useDomains");
+
 const data = {
   data: [
     {
@@ -113,7 +116,9 @@ describe("<RuleForm />", () => {
     const renderOpts = {
       mocks: [
         domainsMock({ action: "manageQualityRule" }),
+        multipleTemplatesMock({ scope: "dq", domainIds: null }),
         multipleTemplatesMock({ scope: "dq", domainIds: [1] }),
+        multipleTemplatesMock({ scope: "dq", domainIds: [2] }),
       ],
       state: globalState,
     };

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

@@ -1,6 +1,8 @@
 import { render, waitForLoad } from "@truedat/test/render";
 import { RuleImplementationProperties } from "../RuleImplementationProperties";
 
+jest.mock("@truedat/bg/hooks/useDomains");
+
 describe("<RuleImplementationProperties />", () => {
   const props = {
     rule: {

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

@@ -1,6 +1,6 @@
 import React from "react";
+import { Route, Routes } from "react-router";
 import { render, waitForLoad } from "@truedat/test/render";
-import { useAuthorized } from "@truedat/core/hooks/useAuthorized";
 import {
   IMPLEMENTATION_RESULT_DETAILS,
   IMPLEMENTATION_RESULT_SEGMENTS_RESULTS,
@@ -9,10 +9,6 @@ import {
 import { RuleResultsRoutes } from "../RuleResultsRoutes";
 import { IMPLEMENTATION_RESULT_QUERY } from "../../api/queries";
 
-jest.mock("@truedat/core/hooks/useAuthorized", () => ({
-  useAuthorized: jest.fn(() => true),
-}));
-
 // Mock child components
 jest.mock("../RuleResult", () => ({ children }) => (
   <div>RuleResult{children}</div>
@@ -57,52 +53,41 @@ describe("<RuleResultsRoutes />", () => {
     },
   ];
 
-  const renderOpts = { mocks };
+  const renderRoute = (path) =>
+    render(
+      <Routes>
+        <Route
+          path="/implementations/:implementation_id/results/:rule_result_id/*"
+          element={<RuleResultsRoutes />}
+        />
+      </Routes>,
+      { routes: [path.replace(":implementation_id", "456")], mocks },
+    );
 
   it("renders correctly with default route", async () => {
-    const rendered = render(<RuleResultsRoutes />, {
-      routes: [IMPLEMENTATION_RESULT_DETAILS.replace(":rule_result_id", "123")],
-      renderOpts,
-    });
+    const rendered = renderRoute(
+      IMPLEMENTATION_RESULT_DETAILS.replace(":rule_result_id", "123"),
+    );
     await waitForLoad(rendered);
+    expect(rendered.getByText("RuleResultDetails")).toBeInTheDocument();
     expect(rendered.container).toMatchSnapshot();
   });
 
   it("renders correctly with segments results route", async () => {
-    const rendered = render(<RuleResultsRoutes />, {
-      routes: [
-        IMPLEMENTATION_RESULT_SEGMENTS_RESULTS.replace(
-          ":rule_result_id",
-          "123",
-        ),
-      ],
-      renderOpts,
-    });
+    const rendered = renderRoute(
+      IMPLEMENTATION_RESULT_SEGMENTS_RESULTS.replace(":rule_result_id", "123"),
+    );
     await waitForLoad(rendered);
+    expect(rendered.getByText("RuleResultSegments")).toBeInTheDocument();
     expect(rendered.container).toMatchSnapshot();
   });
 
   it("renders correctly with remediation plan route", async () => {
-    const rendered = render(<RuleResultsRoutes />, {
-      routes: [
-        IMPLEMENTATION_RESULT_REMEDIATION_PLAN.replace(
-          ":rule_result_id",
-          "123",
-        ),
-      ],
-      renderOpts,
-    });
-    await waitForLoad(rendered);
-    expect(rendered.container).toMatchSnapshot();
-  });
-
-  it("renders unauthorized component when not authorized", async () => {
-    useAuthorized.mockReturnValueOnce(false);
-    const rendered = render(<RuleResultsRoutes />, {
-      routes: [IMPLEMENTATION_RESULT_DETAILS.replace(":rule_result_id", "123")],
-      renderOpts,
-    });
+    const rendered = renderRoute(
+      IMPLEMENTATION_RESULT_REMEDIATION_PLAN.replace(":rule_result_id", "123"),
+    );
     await waitForLoad(rendered);
+    expect(rendered.getByText("RuleResultRemediations")).toBeInTheDocument();
     expect(rendered.container).toMatchSnapshot();
   });
 });

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

@@ -1,6 +1,15 @@
 import { render, waitForLoad } from "@truedat/test/render";
 import { RuleResultSegmentRow } from "../RuleResultSegmentRow";
 
+const renderRow = (props) =>
+  render(
+    <table>
+      <tbody>
+        <RuleResultSegmentRow {...props} />
+      </tbody>
+    </table>,
+  );
+
 describe("<RuleResultSegmentRow />", () => {
   it("renders customColumns values when passed", async () => {
     const props = {
@@ -29,7 +38,7 @@ describe("<RuleResultSegmentRow />", () => {
       },
     };
 
-    const rendered = render(<RuleResultSegmentRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
 
     expect(rendered.getByText(/1/i)).toBeInTheDocument();
@@ -53,7 +62,7 @@ describe("<RuleResultSegmentRow />", () => {
       },
     };
 
-    const rendered = render(<RuleResultSegmentRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
 
     const icon = rendered.container.querySelector("i.green.icon");
@@ -73,7 +82,7 @@ describe("<RuleResultSegmentRow />", () => {
       },
     };
 
-    const rendered = render(<RuleResultSegmentRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
 
     const icon = rendered.container.querySelector("i.red.icon");
@@ -93,7 +102,7 @@ describe("<RuleResultSegmentRow />", () => {
       date: "2019-08-12T02:00:00Z",
     };
 
-    const rendered = render(<RuleResultSegmentRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
 
     const icon = rendered.container.querySelector("i.yellow.icon");
@@ -115,7 +124,7 @@ describe("<RuleResultSegmentRow />", () => {
       deleteRuleResult: jest.fn(),
     };
 
-    const rendered = render(<RuleResultSegmentRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
 
     const deleteButton = rendered.container.querySelector(".trash");
@@ -137,7 +146,7 @@ describe("<RuleResultSegmentRow />", () => {
       deleteRuleResult: jest.fn(),
     };
 
-    const rendered = render(<RuleResultSegmentRow {...props} />);
+    const rendered = renderRow(props);
     await waitForLoad(rendered);
 
     const deleteButton = rendered.container.querySelector("button");

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

@@ -3,6 +3,8 @@ import { render } from "@truedat/test/render";
 import { RuleRow } from "../RuleRow";
 import { defaultRuleColumns } from "../../selectors";
 
+jest.mock("@truedat/bg/hooks/useDomains");
+
 const renderOpts = {
   messages: {
     en: {

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

@@ -30,6 +30,8 @@ const renderOpts = {
 };
 
 describe("<RuleSelectionForm />", () => {
+  beforeEach(() => jest.useRealTimers());
+
   it("matches snapshot with two options", async () => {
     const { container, findByRole } = render(
       <RuleSelectionForm value="1" />,
@@ -41,6 +43,7 @@ describe("<RuleSelectionForm />", () => {
   });
 
   it("calls foo with onSubmit", async () => {
+    const user = userEvent.setup();
     const onSubmit = jest.fn();
 
     // Submit button should initially be disabled
@@ -53,7 +56,7 @@ describe("<RuleSelectionForm />", () => {
       expect(getByRole("button", { name: "save" })).toBeDisabled(),
     );
 
-    userEvent.click(await findByRole("option", { name: "bar" }));
+    await user.click(await findByRole("option", { name: "bar" }));
 
     // Submit button should now be enabled
     await waitFor(() =>
@@ -61,7 +64,7 @@ describe("<RuleSelectionForm />", () => {
     );
 
     // Submit
-    userEvent.click(await findByRole("button", { name: "save" }));
+    await user.click(await findByRole("button", { name: "save" }));
 
     await waitFor(() =>
       expect(onSubmit).toHaveBeenCalledWith({ rule_id: "2" }),

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

@@ -1,7 +1,10 @@
+import { fireEvent } from "@testing-library/react";
 import { render, waitForLoad } from "@truedat/test/render";
 import { Rules } from "../Rules";
 import { ruleColumnsSelector } from "../../selectors";
 
+jest.mock("@truedat/bg/hooks/useDomains");
+
 jest.mock("../RuleSelectedFilters", () => ({
   __esModule: true,
   default: () => (
@@ -92,7 +95,7 @@ describe("<Rules />", () => {
     await waitForLoad(rendered);
 
     const headerCells = rendered.container.querySelectorAll("th");
-    headerCells[0].click();
+    fireEvent.click(headerCells[0]);
     expect(sortRules).toHaveBeenCalled();
   });
 });

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

@@ -2,6 +2,8 @@ import { render } from "@truedat/test/render";
 import messages from "@truedat/dq/messages";
 import TaxonomySummary from "../TaxonomySummary";
 
+jest.mock("@truedat/bg/hooks/useDomains");
+
 describe("<TaxonomySummary />", () => {
   const ruleImplementation = {
     data_structures: [

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

@@ -375,6 +375,81 @@ exports[`<EditRule /> matches the latest snapshot 1`] = `
           </div>
         </div>
       </div>
+      <div
+        class="required field"
+      >
+        <label>
+          template.selector.label
+          <div
+            class="ui left pointing label"
+          >
+            template.form.validation.empty_required
+          </div>
+        </label>
+        <div
+          class="field"
+        >
+          <div
+            aria-busy="false"
+            aria-expanded="false"
+            class="ui search selection dropdown"
+            name="template"
+            role="combobox"
+          >
+            <input
+              aria-autocomplete="list"
+              autocomplete="off"
+              class="search"
+              tabindex="0"
+              type="text"
+              value=""
+            />
+            <div
+              aria-atomic="true"
+              aria-live="polite"
+              class="divider default text"
+              role="alert"
+            >
+              template.selector.placeholder
+            </div>
+            <i
+              aria-hidden="true"
+              class="dropdown icon"
+            />
+            <div
+              class="menu transition"
+              role="listbox"
+            >
+              <div
+                aria-checked="false"
+                aria-selected="true"
+                class="selected item"
+                role="option"
+                style="pointer-events: all;"
+              >
+                <span
+                  class="text"
+                >
+                  template1
+                </span>
+              </div>
+              <div
+                aria-checked="false"
+                aria-selected="false"
+                class="item"
+                role="option"
+                style="pointer-events: all;"
+              >
+                <span
+                  class="text"
+                >
+                  template2
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
       <div
         class="actions"
       >

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

@@ -1,9 +1,58 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<RuleResultsRoutes /> renders correctly with default route 1`] = `<div />`;
+exports[`<RuleResultsRoutes /> renders correctly with default route 1`] = `
+<div>
+  <div
+    class="ui segment"
+  >
+    <div>
+      ImplementationCrumbs
+    </div>
+    <div>
+      RuleResult
+      <div>
+        RuleResultDetails
+      </div>
+    </div>
+  </div>
+</div>
+`;
 
-exports[`<RuleResultsRoutes /> renders correctly with remediation plan route 1`] = `<div />`;
+exports[`<RuleResultsRoutes /> renders correctly with remediation plan route 1`] = `
+<div>
+  <div
+    class="ui segment"
+  >
+    <div>
+      ImplementationCrumbs
+    </div>
+    <div>
+      RuleResult
+      <div>
+        RuleResultRemediations
+      </div>
+    </div>
+  </div>
+</div>
+`;
 
-exports[`<RuleResultsRoutes /> renders correctly with segments results route 1`] = `<div />`;
-
-exports[`<RuleResultsRoutes /> renders unauthorized component when not authorized 1`] = `<div />`;
+exports[`<RuleResultsRoutes /> renders correctly with segments results route 1`] = `
+<div>
+  <div
+    class="ui segment"
+  >
+    <div>
+      ImplementationCrumbs
+    </div>
+    <div>
+      RuleResult
+      <div>
+        RuleResultSegmentsLoader
+      </div>
+      <div>
+        RuleResultSegments
+      </div>
+    </div>
+  </div>
+</div>
+`;

package/src/selectors/getExecutionGroupColumns.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import { createSelector } from "reselect";
 import DateTime from "@truedat/core/components/DateTime";
 import RuleEventDecorator from "../components/RuleEventDecorator";
 import RuleImplementationResultsLink from "../components/RuleImplementationResultsLink";
@@ -42,9 +41,5 @@ export const defaultExecutionGroupColumns = [
   },
 ];
 
-const getColumns = (state) => state.executionGroupColumns;
-
-export const getExecutionGroupColumns = createSelector(
-  [getColumns],
-  _.defaultTo(defaultExecutionGroupColumns),
-);
+export const getExecutionGroupColumns = (state) =>
+  state.executionGroupColumns ?? defaultExecutionGroupColumns;

package/src/selectors/getImplementationStructures.js

@@ -2,8 +2,8 @@ import _ from "lodash/fp";
 import { createSelector } from "reselect";
 
 const getRuleImplementation = (state) => state.ruleImplementation;
-const getStructureFields = (state) => _.keys(state.structuresFields);
-const getStructureSiblings = (state) => _.keys(state.structuresSiblings);
+const getStructureFields = (state) => state.structuresFields;
+const getStructureSiblings = (state) => state.structuresSiblings;
 
 export const getDatasetStructures = createSelector(
   [getRuleImplementation],
@@ -39,7 +39,10 @@ export const getValidationStructures = createSelector(
 export const getStructures = createSelector(
   [getStructureSiblings, getStructureFields],
   (structuresSiblings, structuresFields) =>
-    _.flow(_.concat(structuresSiblings), _.uniq)(structuresFields),
+    _.flow(
+      _.concat(_.keys(structuresSiblings)),
+      _.uniq,
+    )(_.keys(structuresFields)),
 );
 export const getImplementationStructures = createSelector(
   [getDatasetStructures, getValidationStructures],

package/src/selectors/getLinkedImplementationsToRulesColumns.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import DateTime from "@truedat/core/components/DateTime";
 import { formatNumber } from "@truedat/core/services/format";
@@ -91,9 +90,5 @@ export const defaultImplementationToRulesColumns = [
   },
 ];
 
-const getColumns = (state) => state.ruleImplementationToRulesColumns;
-
-export const getLinkedImplementationsToRulesColumns = createSelector(
-  [getColumns],
-  (columns) => _.defaultTo(defaultImplementationToRulesColumns)(columns),
-);
+export const getLinkedImplementationsToRulesColumns = (state) =>
+  state.ruleImplementationToRulesColumns ?? defaultImplementationToRulesColumns;

package/src/selectors/getRuleImplementationColumns.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import DateTime from "@truedat/core/components/DateTime";
 import { formatNumber } from "@truedat/core/services/format";
@@ -105,9 +104,5 @@ export const defaultImplementationColumns = [
   },
 ];
 
-const getColumns = (state) => state.ruleImplementationColumns;
-
-export const getRuleImplementationColumns = createSelector(
-  [getColumns],
-  _.defaultTo(defaultImplementationColumns),
-);
+export const getRuleImplementationColumns = (state) =>
+  state.ruleImplementationColumns ?? defaultImplementationColumns;

package/src/selectors/ruleColumnsSelector.js

@@ -1,7 +1,6 @@
 import _ from "lodash/fp";
 import { Label } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
-import { createSelector } from "reselect";
 import { DomainTooltip } from "@truedat/bg/taxonomy/components/DomainPath";
 import RuleLink from "../components/RuleLink";
 
@@ -83,8 +82,7 @@ export const optionalRuleColumns = [
   },
 ];
 
-export const ruleColumnsSelector = createSelector(
-  _.prop("rulesColumns"),
-  defaultRuleColumns,
-  (rulesColumns, defaults) => _.defaultTo(defaults)(rulesColumns),
-);
+const defaultColumns = defaultRuleColumns();
+
+export const ruleColumnsSelector = (state) =>
+  state.rulesColumns ?? defaultColumns;