@truedat/dq 5.0.3 → 5.0.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [5.0.4] 2023-01-27
+
+### Changed
+
+- [TD-5522] Merge default and user filters for implementation execution
+
 ## [5.0.3] 2023-01-27
 
 - [TD-5478] Render actions and views to convert basic implementation to default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "5.0.3",
+  "version": "5.0.5",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "5.0.3",
+    "@truedat/test": "5.0.5",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -92,8 +92,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/core": "5.0.3",
-    "@truedat/df": "5.0.3",
+    "@truedat/core": "5.0.5",
+    "@truedat/df": "5.0.5",
     "decode-uri-component": "^0.2.2",
     "graphql": "^15.5.3",
     "moment": "^2.29.4",
@@ -118,5 +118,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "ee802e3e32b52638cb4723fcab3cdeca266a666c"
+  "gitHead": "a90adc0fcf336af276a585669065b661e28a8739"
 }

package/src/components/ImplementationSearchResults.js

@@ -127,8 +127,11 @@ ImplementationSearchResults.propTypes = {
   ruleImplementations: PropTypes.array,
 };
 
-const mapStateToProps = (state) => ({
-  implementationQuery: getExecutionQuery(state),
+const mapStateToProps = (state, props) => ({
+  implementationQuery: getExecutionQuery({
+    ...state,
+    ruleImplementationDefaultFilters: _.propOr({}, "defaultFilters")(props),
+  }),
   role: state.authentication?.role,
   loading: state.ruleImplementationsLoading,
   ruleImplementations: state.ruleImplementations,

package/src/components/Implementations.js

@@ -18,7 +18,7 @@ export const Implementations = ({ defaultFilters }) => (
     <Segment>
       <ImplementationsHeader />
       <Segment attached="bottom">
-        <ImplementationSearchResults />
+        <ImplementationSearchResults defaultFilters={defaultFilters} />
       </Segment>
     </Segment>
   </>

package/src/selectors/__tests__/getExecutionQuery.spec.js

@@ -2,13 +2,26 @@ import { getExecutionQuery } from "..";
 
 const ruleImplementationQuery = { query: "foo" };
 const ruleImplementationActiveFilters = { foo: "bar", bar: "baz" };
+const ruleImplementationDefaultFilters = { status: "some status" };
 
 describe("selectors: getExecutionQuery", () => {
   it("should return query", () => {
     const res = getExecutionQuery({
       ruleImplementationQuery,
-      ruleImplementationActiveFilters
+      ruleImplementationActiveFilters,
     });
     expect(res).toEqual({ query: "foo", filters: { foo: "bar", bar: "baz" } });
   });
+
+  it("should return query with default filters", () => {
+    const res = getExecutionQuery({
+      ruleImplementationQuery,
+      ruleImplementationActiveFilters,
+      ruleImplementationDefaultFilters,
+    });
+    expect(res).toEqual({
+      query: "foo",
+      filters: { foo: "bar", bar: "baz", status: "some status" },
+    });
+  });
 });

package/src/selectors/getExecutionQuery.js

@@ -4,9 +4,16 @@ import { createSelector } from "reselect";
 export const getExecutionQuery = createSelector(
   _.prop("ruleImplementationQuery"),
   _.prop("ruleImplementationActiveFilters"),
-  (implementationQuery, implementationActiveFilters) => {
+  _.prop("ruleImplementationDefaultFilters"),
+  (implementationQuery, implementationActiveFilters, defaultFilters) => {
     const query = _.trim(implementationQuery?.query);
     const filters = _.omitBy(_.isEmpty)(implementationActiveFilters);
-    return query ? { filters, query } : { filters };
+    const filtersWithDefaults = {
+      ...defaultFilters,
+      ...filters,
+    };
+    return query
+      ? { filters: filtersWithDefaults, query }
+      : { filters: filtersWithDefaults };
   }
 );