@truedat/dq 4.36.9 → 4.37.3

package/src/components/ruleImplementationForm/DatasetForm.js

@@ -5,8 +5,7 @@ import { connect } from "react-redux";
 import { useIntl } from "react-intl";
 import { dropAt, replaceAt } from "@truedat/core/services/arrays";
 import { Button } from "semantic-ui-react";
-import { setImplementationFilterValues } from "../../routines";
-import { getRuleImplementationFormFilters } from "../../selectors";
+import { datasetDefaultFiltersSelector } from "../../selectors";
 import "../../styles/ruleImplementationForm/DatasetForm.less";
 
 const StructureSelectorInputField = React.lazy(() =>
@@ -14,10 +13,9 @@ const StructureSelectorInputField = React.lazy(() =>
 );
 
 export const DatasetForm = ({
-  customFilters,
+  defaultFilters,
   structures,
   selector,
-  setImplementationFilterValues,
   setStructures,
   setSelector,
 }) => {
@@ -66,12 +64,9 @@ export const DatasetForm = ({
   const setStructure = ({ index, value: param_value }) => {
     const structureChanged = hasChangedStructure(index, param_value);
     const value = structureChanged ? setAliasIndex(param_value) : param_value;
-    if (index === 0 && structureChanged) {
-      setStructures([value ? { ...value } : {}]);
-      setImplementationFilterValues({ value: _.get("structure")(value) });
-    } else if (_.isNil(index))
+    if (_.isNil(index)) {
       setStructures([...structures, value ? { ...value } : {}]);
-    else if (value) {
+    } else if (value) {
       const mergedValue = { ..._.nth(index)(structures), ...value };
       setStructures(replaceAt(index, mergedValue)(structures));
     } else setStructures(deleteStructure(index, structures));
@@ -88,13 +83,6 @@ export const DatasetForm = ({
     return dropAt(index)(structures);
   };
 
-  const buildDefaultFilters = (i) => {
-    const defaultFilters = { "class.raw": [""] };
-    return i == 0
-      ? { defaultFilters }
-      : { defaultFilters: { ...defaultFilters, ...customFilters } };
-  };
-
   return (
     <>
       {structures.map((structure, index) => (
@@ -102,7 +90,7 @@ export const DatasetForm = ({
           active={index === selector}
           joined={index > 0}
           key={index}
-          options={buildDefaultFilters(index)}
+          defaultFilters={defaultFilters}
           onChange={(value) => {
             setSelector(-1);
             onChange(index, { structure: value });
@@ -125,27 +113,22 @@ export const DatasetForm = ({
           setStructure({ value: { join_type: "inner" } });
         }}
       >
-        {formatMessage({
-          id: "dataset.form.button.add_structure",
-        })}
+        {formatMessage({ id: "dataset.form.button.add_structure" })}
       </Button>
     </>
   );
 };
 
 DatasetForm.propTypes = {
-  customFilters: PropTypes.object,
+  defaultFilters: PropTypes.object,
   structures: PropTypes.array,
   selector: PropTypes.number,
   setStructures: PropTypes.func,
   setSelector: PropTypes.func,
-  setImplementationFilterValues: PropTypes.func,
 };
 
 const mapStateToProps = (state) => ({
-  customFilters: getRuleImplementationFormFilters(state),
+  defaultFilters: datasetDefaultFiltersSelector(state),
 });
 
-export default connect(mapStateToProps, { setImplementationFilterValues })(
-  DatasetForm
-);
+export default connect(mapStateToProps)(DatasetForm);

package/src/components/ruleImplementationForm/FiltersField.js

@@ -1,8 +1,6 @@
 import _ from "lodash/fp";
 import React, { useState } from "react";
-import { connect } from "react-redux";
 import PropTypes from "prop-types";
-import { getRuleImplementationFormFilters } from "../../selectors";
 import { getStructureFields } from "../../selectors/getStructureFields";
 import DateField from "./DateField";
 import DateTimeField from "./DateTimeField";
@@ -36,7 +34,6 @@ const reducedStructureColumns = [
 ];
 
 export const FiltersField = ({
-  customFilters,
   parentStructures,
   label,
   operator,
@@ -97,9 +94,7 @@ export const FiltersField = ({
         <StructureSelectorInputField
           active={active}
           joined={false}
-          options={{
-            defaultFilters: { "class.raw": ["field"], ...customFilters },
-          }}
+          defaultFilters={{ "class.raw": ["field"] }}
           onChange={(value) => {
             onChange(null, {
               data_structure_id: _.prop("id")(value),
@@ -159,7 +154,6 @@ export const FiltersField = ({
 };
 
 FiltersField.propTypes = {
-  customFilters: PropTypes.object,
   label: PropTypes.string,
   parentStructures: PropTypes.array,
   operator: PropTypes.object,
@@ -171,8 +165,4 @@ FiltersField.propTypes = {
   typeCastModifiers: PropTypes.array,
 };
 
-const mapStateToProps = (state) => ({
-  customFilters: getRuleImplementationFormFilters(state),
-});
-
-export default connect(mapStateToProps)(FiltersField);
+export default FiltersField;

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

@@ -1,76 +1,36 @@
-import React from "react";
-import { intl } from "@truedat/test/intl-stub";
-import { shallow } from "enzyme";
-import { DatasetForm } from "../DatasetForm";
+import React, { Suspense } from "react";
+import { waitFor } from "@testing-library/react";
+import { render } from "@truedat/test/render";
+import DatasetForm from "../DatasetForm";
 
-// workaround for enzyme issue with React.useContext
-// see https://github.com/airbnb/enzyme/issues/2176#issuecomment-532361526
-jest.spyOn(React, "useContext").mockImplementation(() => intl);
+const renderOpts = {
+  messages: { en: { "dataset.form.button.add_structure": "add_structure" } },
+};
 
 describe("<DatasetForm />", () => {
   const setStructures = jest.fn();
   const setSelector = jest.fn();
   const selector = -1;
   const setImplementationKey = jest.fn();
-  const setImplementationFilterValues = jest.fn();
   const implementationKey = "Impl";
-  const structures = [
-    {
-      structure: {
-        id: 1,
-        name: "strcuture1",
-        path: [],
-        system: { name: "system" }
-      }
-    },
-    {
-      join_type: "inner",
-      structure: {
-        id: 2,
-        name: "structure2",
-        path: [],
-        system: { name: "system" }
-      },
-      clauses: [{ id: 100 }, { id: 200 }]
-    }
-  ];
+  const structures = [1, 2];
 
-  const customFilters = { "foo.bar": ["baz"] };
   const props = {
     implementationKey,
-    customFilters,
-    structures,
-    setStructures,
-    setSelector,
     selector,
-    setImplementationFilterValues,
-    setImplementationKey
+    setImplementationKey,
+    setSelector,
+    setStructures,
+    structures,
   };
 
   it("matches the latest snapshot", () => {
-    const wrapper = shallow(<DatasetForm {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("renders all StructureSelectorInputField", () => {
-    const wrapper = shallow(<DatasetForm {...props} />);
-    const selectors = wrapper.find("lazy");
-    expect(selectors).toHaveLength(structures.length);
-  });
-
-  it("all custom filter props are correct", () => {
-    const wrapper = shallow(<DatasetForm {...props} />);
-    const selectors = wrapper.find("lazy");
-    expect(selectors.first().prop("options")).toEqual({
-      defaultFilters: {
-        "class.raw": [""]
-      }
-    });
-    expect(selectors.last().prop("options")).toEqual({
-      defaultFilters: {
-        "class.raw": [""],
-        "foo.bar": ["baz"]
-      }
-    });
+    const { container } = render(
+      <Suspense fallback={null}>
+        <DatasetForm {...props} />
+      </Suspense>,
+      renderOpts
+    );
+    expect(container).toMatchSnapshot();
   });
 });

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

@@ -17,42 +17,28 @@ describe("<FiltersField />", () => {
       id: 1,
       name: "structure1",
       path: ["structure1"],
-      system: { external_id: "oracle_test", id: 29, name: "Oracle" }
-    }
+      system: { external_id: "oracle_test", id: 29, name: "Oracle" },
+    },
   ];
 
-  const customFilters = { "foo.bar": ["baz"] };
   const operator = {
     group: "references",
     name: "references",
     value_type: "field",
     value_type_filter: "any",
-    scope: "validation"
+    scope: "validation",
   };
   const props = {
-    customFilters,
     parentStructures,
     fieldType,
     onChange,
     name,
     operator,
-    value
+    value,
   };
 
   it("matches the latest snapshot", () => {
     const wrapper = shallow(<FiltersField {...props} />);
     expect(wrapper).toMatchSnapshot();
   });
-
-  it("renders StructureSelectorInputField with valid props", () => {
-    const wrapper = shallow(<FiltersField {...props} />);
-    const selectors = wrapper.find("lazy");
-    expect(selectors).toHaveLength(1);
-    expect(selectors.first().prop("options")).toEqual({
-      defaultFilters: {
-        "class.raw": ["field"],
-        "foo.bar": ["baz"]
-      }
-    });
-  });
 });

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

@@ -1,153 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<DatasetForm /> matches the latest snapshot 1`] = `
-<Fragment>
-  <lazy
-    active={false}
-    joined={false}
-    key="0"
-    onChange={[Function]}
-    onChangeField={[Function]}
-    onClick={[Function]}
-    onDelete={[Function]}
-    options={
-      Object {
-        "defaultFilters": Object {
-          "class.raw": Array [
-            "",
-          ],
-        },
-      }
-    }
-    selectedStructure={
-      Object {
-        "structure": Object {
-          "id": 1,
-          "name": "strcuture1",
-          "path": Array [],
-          "system": Object {
-            "name": "system",
-          },
-        },
-      }
-    }
-    structures={
-      Array [
-        Object {
-          "structure": Object {
-            "id": 1,
-            "name": "strcuture1",
-            "path": Array [],
-            "system": Object {
-              "name": "system",
-            },
-          },
-        },
-        Object {
-          "clauses": Array [
-            Object {
-              "id": 100,
-            },
-            Object {
-              "id": 200,
-            },
-          ],
-          "join_type": "inner",
-          "structure": Object {
-            "id": 2,
-            "name": "structure2",
-            "path": Array [],
-            "system": Object {
-              "name": "system",
-            },
-          },
-        },
-      ]
-    }
-    systemRequired={false}
-  />
-  <lazy
-    active={false}
-    joined={true}
-    key="1"
-    onChange={[Function]}
-    onChangeField={[Function]}
-    onClick={[Function]}
-    onDelete={[Function]}
-    options={
-      Object {
-        "defaultFilters": Object {
-          "class.raw": Array [
-            "",
-          ],
-          "foo.bar": Array [
-            "baz",
-          ],
-        },
-      }
-    }
-    selectedStructure={
-      Object {
-        "clauses": Array [
-          Object {
-            "id": 100,
-          },
-          Object {
-            "id": 200,
-          },
-        ],
-        "join_type": "inner",
-        "structure": Object {
-          "id": 2,
-          "name": "structure2",
-          "path": Array [],
-          "system": Object {
-            "name": "system",
-          },
-        },
-      }
-    }
-    structures={
-      Array [
-        Object {
-          "structure": Object {
-            "id": 1,
-            "name": "strcuture1",
-            "path": Array [],
-            "system": Object {
-              "name": "system",
-            },
-          },
-        },
-        Object {
-          "clauses": Array [
-            Object {
-              "id": 100,
-            },
-            Object {
-              "id": 200,
-            },
-          ],
-          "join_type": "inner",
-          "structure": Object {
-            "id": 2,
-            "name": "structure2",
-            "path": Array [],
-            "system": Object {
-              "name": "system",
-            },
-          },
-        },
-      ]
-    }
-    systemRequired={false}
-  />
-  <Button
-    as="button"
+<div>
+  <button
+    class="ui button"
     id="add-structure-button"
-    onClick={[Function]}
+    style="display: none;"
   >
-    dataset.form.button.add_structure
-  </Button>
-</Fragment>
+    add_structure
+  </button>
+</div>
 `;

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

@@ -3,23 +3,18 @@
 exports[`<FiltersField /> matches the latest snapshot 1`] = `
 <lazy
   active={false}
+  defaultFilters={
+    Object {
+      "class.raw": Array [
+        "field",
+      ],
+    }
+  }
   fieldWidth={15}
   joined={false}
   onChange={[Function]}
   onClick={[Function]}
   onDelete={[Function]}
-  options={
-    Object {
-      "defaultFilters": Object {
-        "class.raw": Array [
-          "field",
-        ],
-        "foo.bar": Array [
-          "baz",
-        ],
-      },
-    }
-  }
   selectedStructure={
     Object {
       "structure": "1",

package/src/messages/en.js

@@ -132,6 +132,7 @@ export default {
     "All rule implementations should be removed",
   "rule.error.rule_name_bc_id.unique_constraint":
     "Duplicated rule name. Edit name or associated business concept.",
+  
   "rule.form.accordion.select": "Select",
   "rule.form.concept.label": "Concept",
   "ruleImplementation.form.tooltip.deviation.goal":
@@ -497,6 +498,8 @@ export default {
   "ruleImplementations.props.result": "Quality",
   "ruleImplementations.props.rule": "Rule",
   "ruleImplementations.props.template": "Template",
+  "ruleImplementations.props.rule_template": "Rule template",
+  "ruleImplementations.props.implementation_template": "Implementation template",
   "ruleImplementations.retrieved.results": "{count} implementations found",
   "ruleImplementations.search.results.empty": "No implementations found",
   "ruleImplementations.searching": "Searching implementations",
@@ -539,6 +542,10 @@ export default {
   "rules.actions.upload.confirmation.header": "Confirm bulk upload",
   "rules.actions.upload.tooltip": "Upload Rules",
   "rules.crumbs.top": "Rules",
+  "rules.events.action_created": "Rule created",
+  "rules.events.action_changed": "Field {0} changed: {1}",
+  "rules.events.action_changed_to": "Field {0} changed to: {1}",
+  "rules.events.action_updated": "Rule updated",
   "rules.retrieved.results": "{count} rules found",
   "rules.search.placeholder": "Search rules...",
   "rules.searching": "Searching...",
@@ -555,6 +562,7 @@ export default {
   "structureFields.dropdown.placeholder": "Fields",
   "summary.link.and": "and",
   "tabs.dq.rule": "Rule",
+  "tabs.dq.rule.audit": "Audit",
   "tabs.dq.ruleImplementation": "Implementation",
   "tabs.dq.ruleImplementation.audit": "Audit",
   "tabs.dq.ruleImplementation.details": "Details",

package/src/messages/es.js

@@ -511,6 +511,8 @@ export default {
   "ruleImplementations.props.rule": "Regla",
   "ruleImplementations.props.status": "Estado",
   "ruleImplementations.props.template": "Plantilla",
+  "ruleImplementations.props.rule_template": "Plantilla de regla",
+  "ruleImplementations.props.implementation_template": "Plantilla de implementación",
   "ruleImplementations.retrieved.results":
     "{count} implementaciones encontradas",
   "ruleImplementations.search.results.empty":
@@ -554,6 +556,14 @@ export default {
   "rules.actions.upload.confirmation.header": "Subir ficheros de reglas",
   "rules.actions.upload.tooltip": "Subir reglas",
   "rules.crumbs.top": "Reglas",
+  "rules.events.action_created": "Regla creada",
+  "rules.events.action_changed": "Campo {0} actualizado: {1}",
+  "rules.events.action_changed_to": "Campo {0} actualizado a {1}",
+  "rules.events.action_updated": "Regla actualizada",
+  "ruleImplementations.events.action_created": "Implementación creada en regla: {0}",
+  "ruleImplementations.events.action_changed": "Campo {0} actualizado a {1}",
+  "ruleImplementations.events.action_deprecated": "Implementación archivada",
+  "ruleImplementations.events.action_moved": "Implementación movida a la regla: {0}",
   "rules.retrieved.results": "{count} reglas encontradas",
   "rules.search.placeholder": "Buscar reglas...",
   "rules.searching": "Buscando...",
@@ -571,6 +581,7 @@ export default {
   "structureFields.dropdown.placeholder": "Campos",
   "summary.link.and": "y",
   "tabs.dq.rule": "Regla",
+  "tabs.dq.rule.audit": "Auditoría",
   "tabs.dq.ruleImplementation.audit": "Auditoría",
   "tabs.dq.ruleImplementation.details": "Detalles",
   "tabs.dq.ruleImplementation.results": "Resultados",

package/src/reducers/__tests__/ruleActiveFilters.spec.js

@@ -1,10 +1,11 @@
+import { applyUserSearchFilter } from "@truedat/dd/routines";
 import { initialState } from "../ruleActiveFilters";
 import {
   addRuleFilter,
   closeRuleFilter,
   removeRuleFilter,
   resetRuleFilters,
-  toggleRuleFilterValue
+  toggleRuleFilterValue,
 } from "../../routines";
 import { ruleActiveFilters } from "..";
 
@@ -21,11 +22,22 @@ describe("reducers: ruleActiveFilters", () => {
     expect(
       ruleActiveFilters(fooState, {
         type: addRuleFilter.TRIGGER,
-        payload
+        payload,
       })
     ).toEqual({ ...fooState, baz: [] });
   });
 
+  it("should handle the applyUserSearchFilter.TRIGGER action", () => {
+    const filters = { country: ["Sp"] };
+    const payload = { userFilter: { filters }, scope: "rule" };
+    expect(
+      ruleActiveFilters(fooState, {
+        type: applyUserSearchFilter.TRIGGER,
+        payload,
+      })
+    ).toEqual({ ...filters });
+  });
+
   it("should handle the closeRuleFilter.TRIGGER action", () => {
     const foo = ["foo1"];
     const bar = [];
@@ -34,7 +46,7 @@ describe("reducers: ruleActiveFilters", () => {
     expect(
       ruleActiveFilters(state, {
         type: closeRuleFilter.TRIGGER,
-        payload
+        payload,
       })
     ).toEqual({ foo });
   });
@@ -47,7 +59,7 @@ describe("reducers: ruleActiveFilters", () => {
     expect(
       ruleActiveFilters(state, {
         type: removeRuleFilter.TRIGGER,
-        payload
+        payload,
       })
     ).toEqual({ bar });
   });
@@ -55,7 +67,7 @@ describe("reducers: ruleActiveFilters", () => {
   it("should handle the resetRuleFilters.TRIGGER action", () => {
     expect(
       ruleActiveFilters(fooState, {
-        type: resetRuleFilters.TRIGGER
+        type: resetRuleFilters.TRIGGER,
       })
     ).toEqual(initialState);
   });
@@ -63,7 +75,7 @@ describe("reducers: ruleActiveFilters", () => {
   it("should handle the resetRuleFilters.TRIGGER action when execution filter exists", () => {
     expect(
       ruleActiveFilters(fooState, {
-        type: resetRuleFilters.TRIGGER
+        type: resetRuleFilters.TRIGGER,
       })
     ).toEqual(initialState);
   });
@@ -76,7 +88,7 @@ describe("reducers: ruleActiveFilters", () => {
     expect(
       ruleActiveFilters(state, {
         type: toggleRuleFilterValue.TRIGGER,
-        payload
+        payload,
       })
     ).toEqual({ foo: ["foo1", "foo3"], bar });
   });