@truedat/dq 4.37.2 → 4.37.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.37.3] 2022-02-03
+
+### Added
+
+- [TD-2929] Added support for `UserSearchFilters` on `Rules` and `RuleImplementations`
+
 ## [4.37.2] 2022-02-02
 
 ### Added

package/package.json

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

package/src/components/ImplementationsRoutes.js

@@ -8,6 +8,9 @@ import RuleImplementationsLoader from "./RuleImplementationsLoader";
 const TemplatesLoader = React.lazy(() =>
   import("@truedat/df/templates/components/TemplatesLoader")
 );
+const UserSearchFiltersLoader = React.lazy(() =>
+  import("@truedat/dd/components/UserSearchFiltersLoader")
+);
 
 const ImplementationsRoutes = () => (
   <Route
@@ -17,6 +20,7 @@ const ImplementationsRoutes = () => (
         <RuleImplementationsLoader />
         <ImplementationFiltersLoader />
         <TemplatesLoader scope="qe" />
+        <UserSearchFiltersLoader scope="rule_implementation" />
         <RuleImplementations exact />
       </>
     )}

package/src/components/RuleEvents.js

@@ -1,4 +1,3 @@
-
 import React from "react";
 import PropTypes from "prop-types";
 import { Feed, Segment } from "semantic-ui-react";
@@ -29,4 +28,4 @@ const mapStateToProps = (state) => {
   };
 };
 
-export default connect(mapStateToProps)(RuleEvents);
+export default connect(mapStateToProps)(RuleEvents);

package/src/components/RuleImplementationSelectedFilters.js

@@ -4,6 +4,11 @@ import { connect } from "react-redux";
 import { injectIntl } from "react-intl";
 import { makeOption } from "@truedat/core/services/i18n";
 import { SelectedFilters } from "@truedat/core/components";
+import {
+  applyUserSearchFilter,
+  deleteUserSearchFilter,
+  saveUserSearchFilters,
+} from "@truedat/dd/routines";
 import {
   closeImplementationFilter,
   openImplementationFilter,
@@ -30,23 +35,36 @@ export const mapStateToProps = (state, ownProps) => {
     _.map(makeOption(translations(formatMessage), selectedFilter))
   )(state);
 
+  const {
+    selectedUserSearchFilter: selectedUserFilter,
+    ruleImplementationActiveFilters: activeFilters,
+    userSearchFilters: userFilters,
+  } = state;
+
   return {
     selectedFilter,
     selectedFilters: getRuleImplementationSelectedFilters(state),
     selectedFilterActiveValues:
       getRuleImplementationSelectedFilterActiveValues(state),
     selectedFilterValues: i18nValues,
+    selectedUserFilter,
+    activeFilters,
+    userFilters,
+    userFilterScope: "rule_implementation",
   };
 };
 
 const mapDispatchToProps = (dispatch) =>
   bindActionCreators(
     {
+      applyUserFilter: applyUserSearchFilter,
       closeFilter: closeImplementationFilter,
+      deleteUserFilter: deleteUserSearchFilter,
       openFilter: openImplementationFilter,
       removeFilter: removeImplementationFilter,
       resetFilters: resetImplementationFilters,
       toggleFilterValue: toggleImplementationFilterValue,
+      saveFilters: saveUserSearchFilters,
     },
     dispatch
   );

package/src/components/RuleSelectedFilters.js

@@ -4,6 +4,11 @@ import { connect } from "react-redux";
 import { injectIntl } from "react-intl";
 import { makeOption } from "@truedat/core/services/i18n";
 import { SelectedFilters } from "@truedat/core/components";
+import {
+  applyUserSearchFilter,
+  deleteUserSearchFilter,
+  saveUserSearchFilters,
+} from "@truedat/dd/routines";
 import {
   closeRuleFilter,
   openRuleFilter,
@@ -30,22 +35,35 @@ export const mapStateToProps = (state, ownProps) => {
     _.map(makeOption(translations(formatMessage), selectedFilter))
   )(state);
 
+  const {
+    selectedUserSearchFilter: selectedUserFilter,
+    ruleActiveFilters: activeFilters,
+    userSearchFilters: userFilters,
+  } = state;
+
   return {
     selectedFilter,
     selectedFilters: getRuleSelectedFilters(state),
     selectedFilterActiveValues: getRuleSelectedFilterActiveValues(state),
     selectedFilterValues: i18nValues,
+    selectedUserFilter,
+    activeFilters,
+    userFilters,
+    userFilterScope: "rule",
   };
 };
 
 const mapDispatchToProps = (dispatch) =>
   bindActionCreators(
     {
+      applyUserFilter: applyUserSearchFilter,
       closeFilter: closeRuleFilter,
+      deleteUserFilter: deleteUserSearchFilter,
       openFilter: openRuleFilter,
       removeFilter: removeRuleFilter,
       resetFilters: resetRuleFilters,
       toggleFilterValue: toggleRuleFilterValue,
+      saveFilters: saveUserSearchFilters,
     },
     dispatch
   );

package/src/components/RuleTabs.js

@@ -41,7 +41,7 @@ const RuleTabs = ({ rule }) => {
 };
 
 RuleTabs.propTypes = {
-  rule: PropTypes.object
+  rule: PropTypes.object,
 };
 
 const mapStateToProps = ({ rule }) => ({ rule });

package/src/components/RulesRoutes.js

@@ -13,13 +13,25 @@ const DomainsLoader = React.lazy(() =>
 const TemplatesLoader = React.lazy(() =>
   import("@truedat/df/templates/components/TemplatesLoader")
 );
+const UserSearchFiltersLoader = React.lazy(() =>
+  import("@truedat/dd/components/UserSearchFiltersLoader")
+);
 const QualityTemplatesLoader = () => <TemplatesLoader scope="dq" />;
 
 const RulesRoutes = () => (
   <>
     <Route path={RULES} component={RulesLoader} />
     <Route path={RULES} component={RuleFiltersLoader} />
-    <Route path={RULES} component={Rules} exact />
+    <Route
+      exact
+      path={RULES}
+      render={() => (
+        <>
+          <UserSearchFiltersLoader scope="rule" />
+          <Rules />
+        </>
+      )}
+    />
     <Switch>
       <Route
         exact

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

@@ -20,9 +20,9 @@ describe("<RuleEvents />", () => {
         email: "some.user@domain.tld",
         full_name: "Some User",
         id: 142,
-        user_name: "some.user@domain.tld"
+        user_name: "some.user@domain.tld",
       },
-      ts: "2021-09-16T07:36:32.848603Z"
+      ts: "2021-09-16T07:36:32.848603Z",
     },
     {
       id: 100436,
@@ -31,7 +31,7 @@ describe("<RuleEvents />", () => {
       resource_type: "rule",
       event: "rule_updated",
       payload: {
-        domain_id: 168
+        domain_id: 168,
       },
       user_id: 171,
       user_name: null,
@@ -39,9 +39,9 @@ describe("<RuleEvents />", () => {
         email: "some.user@domain.tld",
         full_name: "Some User",
         id: 171,
-        user_name: "some.user"
+        user_name: "some.user",
       },
-      ts: "2021-09-16T09:31:03.061864Z"
+      ts: "2021-09-16T09:31:03.061864Z",
     },
   ];
   const renderOpts = {

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 });
   });

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

@@ -1,10 +1,11 @@
+import { applyUserSearchFilter } from "@truedat/dd/routines";
 import { initialState } from "../ruleImplementationActiveFilters";
 import {
   addImplementationFilter,
   closeImplementationFilter,
   removeImplementationFilter,
   resetImplementationFilters,
-  toggleImplementationFilterValue
+  toggleImplementationFilterValue,
 } from "../../routines";
 import { ruleImplementationActiveFilters } from "..";
 
@@ -17,13 +18,24 @@ describe("reducers: ruleImplementationActiveFilters", () => {
     );
   });
 
+  it("should handle the applyUserSearchFilter.TRIGGER action", () => {
+    const filters = { country: ["Sp"] };
+    const payload = { userFilter: { filters }, scope: "rule_implementation" };
+    expect(
+      ruleImplementationActiveFilters(fooState, {
+        type: applyUserSearchFilter.TRIGGER,
+        payload,
+      })
+    ).toEqual({ ...filters });
+  });
+
   it("should handle the addImplementationFilter.TRIGGER action", () => {
     const filter = "baz";
     const payload = { filter };
     expect(
       ruleImplementationActiveFilters(fooState, {
         type: addImplementationFilter.TRIGGER,
-        payload
+        payload,
       })
     ).toEqual({ ...fooState, baz: [] });
   });
@@ -36,7 +48,7 @@ describe("reducers: ruleImplementationActiveFilters", () => {
     expect(
       ruleImplementationActiveFilters(state, {
         type: closeImplementationFilter.TRIGGER,
-        payload
+        payload,
       })
     ).toEqual({ foo });
   });
@@ -49,7 +61,7 @@ describe("reducers: ruleImplementationActiveFilters", () => {
     expect(
       ruleImplementationActiveFilters(state, {
         type: removeImplementationFilter.TRIGGER,
-        payload
+        payload,
       })
     ).toEqual({ bar });
   });
@@ -57,7 +69,7 @@ describe("reducers: ruleImplementationActiveFilters", () => {
   it("should handle the resetImplementationFilters.TRIGGER action", () => {
     expect(
       ruleImplementationActiveFilters(fooState, {
-        type: resetImplementationFilters.TRIGGER
+        type: resetImplementationFilters.TRIGGER,
       })
     ).toEqual(initialState);
   });
@@ -67,7 +79,7 @@ describe("reducers: ruleImplementationActiveFilters", () => {
       ruleImplementationActiveFilters(
         { ...fooState, executable: [true] },
         {
-          type: resetImplementationFilters.TRIGGER
+          type: resetImplementationFilters.TRIGGER,
         }
       )
     ).toEqual({ executable: [true] });
@@ -81,7 +93,7 @@ describe("reducers: ruleImplementationActiveFilters", () => {
     expect(
       ruleImplementationActiveFilters(state, {
         type: toggleImplementationFilterValue.TRIGGER,
-        payload
+        payload,
       })
     ).toEqual({ foo: ["foo1", "foo3"], bar });
   });

package/src/reducers/ruleActiveFilters.js

@@ -1,4 +1,5 @@
 import _ from "lodash/fp";
+import { applyUserSearchFilter } from "@truedat/dd/routines";
 import {
   addRuleFilter,
   closeRuleFilter,
@@ -15,6 +16,10 @@ export const ruleActiveFilters = (state = initialState, { type, payload }) => {
       const { filter } = payload;
       return { ...state, [filter]: [] };
     }
+    case applyUserSearchFilter.TRIGGER: {
+      const { userFilter, scope } = payload;
+      return scope === "rule" ? _.prop("filters")(userFilter) : state;
+    }
     case closeRuleFilter.TRIGGER: {
       const { filter } = payload;
       const values = _.propOr([], filter)(state);

package/src/reducers/ruleImplementationActiveFilters.js

@@ -1,4 +1,5 @@
 import _ from "lodash/fp";
+import { applyUserSearchFilter } from "@truedat/dd/routines";
 import {
   addImplementationFilter,
   closeImplementationFilter,
@@ -18,6 +19,12 @@ export const ruleImplementationActiveFilters = (
       const { filter } = payload;
       return { ...state, [filter]: [] };
     }
+    case applyUserSearchFilter.TRIGGER: {
+      const { userFilter, scope } = payload;
+      return scope === "rule_implementation"
+        ? _.prop("filters")(userFilter)
+        : state;
+    }
     case closeImplementationFilter.TRIGGER: {
       const { filter } = payload;
       const values = _.propOr([], filter)(state);