@truedat/dq 5.6.2 → 5.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "5.6.2",
+  "version": "5.6.3",
   "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.6.2",
+    "@truedat/test": "5.6.3",
     "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.6.2",
-    "@truedat/df": "5.6.2",
+    "@truedat/core": "5.6.3",
+    "@truedat/df": "5.6.3",
     "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": "a667767fbb979e9c12142aabad58f49d3fb68fea"
+  "gitHead": "c79bc612b29e41c6c600c2e029ae762b36147193"
 }

package/src/components/RuleImplementationSelectedFilters.js

@@ -21,6 +21,7 @@ import {
   getRuleImplementationSelectedFilterActiveValues,
   getRuleImplementationSelectedFilters,
   getRuleImplementationSelectedFilterValues,
+  getRuleImplementationFilterTypes,
 } from "../selectors";
 
 const translations = (formatMessage) => ({
@@ -47,6 +48,7 @@ export const mapStateToProps = (state, ownProps) => {
 
   return {
     loading,
+    filterTypes: getRuleImplementationFilterTypes(state),
     selectedFilter,
     selectedFilters: getRuleImplementationSelectedFilters(state),
     selectedFilterActiveValues:

package/src/components/RuleSelectedFilters.js

@@ -20,6 +20,7 @@ import {
   getRuleSelectedFilterActiveValues,
   getRuleSelectedFilters,
   getRuleSelectedFilterValues,
+  getRuleFilterTypes,
 } from "../selectors";
 
 const translations = (formatMessage) => ({
@@ -44,6 +45,7 @@ export const mapStateToProps = (state, ownProps) => {
 
   return {
     loading,
+    filterTypes: getRuleFilterTypes(state),
     selectedFilter,
     selectedFilters: getRuleSelectedFilters(state),
     selectedFilterActiveValues: getRuleSelectedFilterActiveValues(state),

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

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
 import {
   clearImplementationFilters,
-  fetchImplementationFilters
+  fetchImplementationFilters,
 } from "../../routines";
 import { ruleImplementationFilters } from "..";
 
@@ -17,25 +17,20 @@ describe("reducers: ruleImplementationFilters", () => {
   it("should handle the clearImplementationFilters.TRIGGER action", () => {
     expect(
       ruleImplementationFilters(fooState, {
-        type: clearImplementationFilters.TRIGGER
-      })
-    ).toEqual(initialState);
-  });
-
-  it("should handle the fetchImplementationFilters.REQUEST action", () => {
-    expect(
-      ruleImplementationFilters(fooState, {
-        type: fetchImplementationFilters.REQUEST
+        type: clearImplementationFilters.TRIGGER,
       })
     ).toEqual(initialState);
   });
 
   it("should handle the fetchImplementationFilters.SUCCESS action", () => {
-    const data = { filter1: ["value1", "value2"], filter2: ["value1"] };
+    const data = {
+      filter1: { values: ["value1", "value2"] },
+      filter2: { values: ["value1"] },
+    };
     expect(
       ruleImplementationFilters(fooState, {
         type: fetchImplementationFilters.SUCCESS,
-        payload: { data: { data } }
+        payload: { data: { data } },
       })
     ).toEqual(data);
   });

package/src/reducers/ruleFilters.js

@@ -7,10 +7,11 @@ const ruleFilters = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearRuleFilters.TRIGGER:
       return initialState;
-    case fetchRuleFilters.REQUEST:
-      return initialState;
     case fetchRuleFilters.SUCCESS:
-      return _.flow(_.propOr({}, "data.data"), _.omitBy(_.isEmpty))(payload);
+      return _.flow(
+        _.propOr({}, "data.data"),
+        _.omitBy(_.flow(_.getOr([], "values"), _.isEmpty))
+      )(payload);
     default:
       return state;
   }

package/src/reducers/ruleImplementationFilters.js

@@ -10,10 +10,11 @@ const ruleImplementationFilters = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearImplementationFilters.TRIGGER:
       return initialState;
-    case fetchImplementationFilters.REQUEST:
-      return initialState;
     case fetchImplementationFilters.SUCCESS:
-      return _.flow(_.propOr({}, "data.data"), _.omitBy(_.isEmpty))(payload);
+      return _.flow(
+        _.propOr({}, "data.data"),
+        _.omitBy(_.flow(_.getOr([], "values"), _.isEmpty))
+      )(payload);
     default:
       return state;
   }

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

@@ -1,8 +1,8 @@
 import { getRuleImplementationAvailableFilters } from "..";
 
-const foo = ["foo1", "foo2"];
-const bar = ["bar1", "bar2"];
-const baz = ["baz1", "baz2"];
+const foo = { values: ["foo1", "foo2"] };
+const bar = { values: ["bar1", "bar2"] };
+const baz = { values: ["baz1", "baz2"] };
 
 describe("selectors: getRuleImplementationAvailableFilters", () => {
   const ruleImplementationFilters = { foo, bar, baz };
@@ -12,7 +12,7 @@ describe("selectors: getRuleImplementationAvailableFilters", () => {
   it("should return the keys of the ruleImplementation filters which are not currently active", () => {
     expect(getRuleImplementationAvailableFilters(state)).toEqual([
       "foo",
-      "bar"
+      "bar",
     ]);
   });
 });

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

@@ -1,8 +1,8 @@
 import { getRuleImplementationSelectedFilterValues } from "..";
 
-const foo = ["foo1", "foo2"];
-const bar = ["bar1", "bar2"];
-const baz = ["baz1", "baz2"];
+const foo = { values: ["foo1", "foo2"] };
+const bar = { values: ["bar1", "bar2"] };
+const baz = { values: ["baz1", "baz2"] };
 
 describe("selectors: getRuleImplementationSelectedFilterValues", () => {
   const ruleImplementationFilters = { foo, bar, baz };
@@ -10,6 +10,8 @@ describe("selectors: getRuleImplementationSelectedFilterValues", () => {
   const state = { ruleImplementationFilters, ruleImplementationSelectedFilter };
 
   it("should return the values of the currently selected ruleImplementation filters", () => {
-    expect(getRuleImplementationSelectedFilterValues(state)).toEqual(foo);
+    expect(getRuleImplementationSelectedFilterValues(state)).toEqual(
+      foo.values
+    );
   });
 });

package/src/selectors/getRuleAvailableFilters.js

@@ -8,7 +8,7 @@ export const getRuleAvailableFilters = createSelector(
   [getRuleFilters, getRuleSelectedFilters],
   (ruleFilters, ruleSelectedFilters) =>
     _.flow(
-      _.omitBy(values => _.size(values) < 2),
+      _.omitBy(({ values }) => _.size(values) < 2),
       _.keys,
       _.without(ruleSelectedFilters)
     )(ruleFilters)

package/src/selectors/getRuleFilterTypes.js

@@ -0,0 +1,7 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+
+export const getRuleFilterTypes = createSelector(
+  _.prop("ruleFilters"),
+  _.mapValues("type")
+);

package/src/selectors/getRuleImplementationAvailableFilters.js

@@ -9,7 +9,7 @@ export const getRuleImplementationAvailableFilters = createSelector(
   getRuleImplementationSelectedFilters,
   (implementationFilters, implementationSelectedFilters) =>
     _.flow(
-      _.omitBy(values => _.size(values) < 2),
+      _.omitBy(({ values }) => _.size(values) < 2),
       _.keys,
       _.without(implementationSelectedFilters)
     )(implementationFilters)

package/src/selectors/getRuleImplementationFilterTypes.js

@@ -0,0 +1,7 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+
+export const getRuleImplementationFilterTypes = createSelector(
+  _.prop("ruleImplementationFilters"),
+  _.mapValues("type")
+);

package/src/selectors/getRuleImplementationSelectedFilterValues.js

@@ -9,7 +9,7 @@ export const getRuleImplementationSelectedFilterValues = createSelector(
   ],
   (implementationSelectedFilter, implementationFilters) =>
     _.flow(
-      _.propOr([], implementationSelectedFilter),
-      formatFilterValues(implementationSelectedFilter)
+      _.propOr({ values: [] }, implementationSelectedFilter),
+      formatFilterValues
     )(implementationFilters)
 );

package/src/selectors/getRuleSelectedFilterValues.js

@@ -6,7 +6,7 @@ export const getRuleSelectedFilterValues = createSelector(
   [_.prop("ruleSelectedFilter"), _.prop("ruleFilters")],
   (ruleSelectedFilter, ruleFilters) =>
     _.flow(
-      _.propOr([], ruleSelectedFilter),
-      formatFilterValues(ruleSelectedFilter)
+      _.propOr({ values: [] }, ruleSelectedFilter),
+      formatFilterValues
     )(ruleFilters)
 );

package/src/selectors/index.js

@@ -1,6 +1,7 @@
 export { datasetDefaultFiltersSelector } from "./datasetDefaultFiltersSelector";
 export { getImplementationsExecution } from "./getImplementationsExecution";
 export { getRuleAvailableFilters } from "./getRuleAvailableFilters";
+export { getRuleFilterTypes } from "./getRuleFilterTypes";
 export { getRuleSelectedFilters } from "./getRuleSelectedFilters";
 export { getRuleSelectedFilterActiveValues } from "./getRuleSelectedFilterActiveValues";
 export { getRuleSelectedFilterValues } from "./getRuleSelectedFilterValues";
@@ -24,6 +25,7 @@ export {
 } from "./getRuleImplementationColumns";
 export { getPreviousRuleImplementationQuery } from "./getPreviousRuleImplementationQuery";
 export { getRuleImplementationAvailableFilters } from "./getRuleImplementationAvailableFilters";
+export { getRuleImplementationFilterTypes } from "./getRuleImplementationFilterTypes";
 export { getRuleImplementationSelectedFilters } from "./getRuleImplementationSelectedFilters";
 export { getRuleImplementationSelectedFilterValues } from "./getRuleImplementationSelectedFilterValues";
 export { getRuleImplementationSelectedFilterActiveValues } from "./getRuleImplementationSelectedFilterActiveValues";