@truedat/dq 5.18.1 → 5.18.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "5.18.1",
+  "version": "5.18.3",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -92,8 +92,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/core": "5.18.1",
-    "@truedat/df": "5.18.1",
+    "@truedat/core": "5.18.3",
+    "@truedat/df": "5.18.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": "95d5a42f5bd259ad53fa66d4fe8cce48be73ee03"
+  "gitHead": "ba00f358149f00dcdabb3e3edd883c54c0bbd43a"
 }

package/src/components/RuleImplementationSelectedFilters.js

@@ -3,11 +3,14 @@ import { bindActionCreators, compose } from "redux";
 import { connect } from "react-redux";
 import { injectIntl } from "react-intl";
 import { makeOption } from "@truedat/core/services/i18n";
-import { SelectedFilters } from "@truedat/core/components";
+import { SelectedFilters, StructureFilterItem } from "@truedat/core/components";
+import { StructuresLoader } from "@truedat/dd/components";
+
 import {
   applyUserSearchFilter,
   deleteUserSearchFilter,
   saveUserSearchFilters,
+  searchStructures,
 } from "@truedat/dd/routines";
 import {
   closeImplementationFilter,
@@ -46,6 +49,18 @@ export const mapStateToProps = (state, ownProps) => {
     userSearchFilters: userFilters,
   } = state;
 
+  const searchFiltersPropsMapping = {
+    linked_structures_ids: {
+      query: state.structureQuery?.query,
+      searchCallback: searchStructures,
+      options: state.structures,
+      placeholder: formatMessage({ id: "structures.search.placeholder" }),
+      FilterDataLoader: StructuresLoader,
+      loaderProps: { pageSize: 50 },
+      FilterItem: StructureFilterItem,
+    },
+  };
+
   return {
     loading,
     filterTypes: getRuleImplementationFilterTypes(state),
@@ -58,6 +73,7 @@ export const mapStateToProps = (state, ownProps) => {
     activeFilters,
     userFilters,
     userFilterScope: "rule_implementation",
+    searchFiltersPropsMapping,
   };
 };
 
@@ -72,6 +88,7 @@ const mapDispatchToProps = (dispatch) =>
       resetFilters: resetImplementationFilters,
       toggleFilterValue: toggleImplementationFilterValue,
       saveFilters: saveUserSearchFilters,
+      searchFilterDispacher: (searchCall) => dispatch(searchCall),
     },
     dispatch
   );

package/src/messages/en.js

@@ -55,6 +55,7 @@ export default {
   "filters.df_label.raw": "Type",
   "filters.current_business_concept_version": "Concept",
   "filters.execution_result_info.result_text": "Execution",
+  "filters.linked_structures_ids": "Linked Structures",
   "filters.result_type.raw": "Result Type",
   "filters.result_type.raw.deviation": "Deviation",
   "filters.result_type.raw.errors_number": "Error count",

package/src/messages/es.js

@@ -55,6 +55,7 @@ export default {
   "filters.df_label.raw": "Tipo",
   "filters.current_business_concept_version": "Concepto",
   "filters.execution_result_info.result_text": "Ejecución",
+  "filters.linked_structures_ids": "Estructuras Linkadas",
   "filters.result_type.raw": "Tipo de resultado",
   "filters.result_type.raw.deviation": "Desviación",
   "filters.result_type.raw.errors_number": "Número de errores",

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

@@ -1,4 +1,3 @@
-import _ from "lodash/fp";
 import {
   clearImplementationFilters,
   fetchImplementationFilters,
@@ -35,6 +34,34 @@ describe("reducers: ruleImplementationFilters", () => {
     ).toEqual(data);
   });
 
+  it("fetchImplementationFilters.SUCCESS omit filters without values", () => {
+    const data = {
+      filter1: { values: ["value1", "value2"] },
+      filter2: { values: [] },
+    };
+    expect(
+      ruleImplementationFilters(fooState, {
+        type: fetchImplementationFilters.SUCCESS,
+        payload: { data: { data } },
+      })
+    ).toEqual({
+      filter1: { values: ["value1", "value2"] },
+    });
+  });
+
+  it("fetchImplementationFilters.SUCCESS no omit filters without values but type search", () => {
+    const data = {
+      filter1: { values: ["value1", "value2"] },
+      filter2: { values: [], type: "search" },
+    };
+    expect(
+      ruleImplementationFilters(fooState, {
+        type: fetchImplementationFilters.SUCCESS,
+        payload: { data: { data } },
+      })
+    ).toEqual(data);
+  });
+
   it("should ignore unknown actions", () => {
     expect(ruleImplementationFilters(fooState, { type: "FOO" })).toBe(fooState);
   });

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

@@ -4,7 +4,7 @@ import {
   closeImplementationFilter,
   openImplementationFilter,
   removeImplementationFilter,
-  resetImplementationFilters
+  resetImplementationFilters,
 } from "../../routines";
 import { ruleImplementationSelectedFilter } from "..";
 

package/src/reducers/ruleImplementationFilters.js

@@ -13,7 +13,13 @@ const ruleImplementationFilters = (state = initialState, { type, payload }) => {
     case fetchImplementationFilters.SUCCESS:
       return _.flow(
         _.propOr({}, "data.data"),
-        _.omitBy(_.flow(_.getOr([], "values"), _.isEmpty))
+        _.omitBy(
+          _.cond([
+            [_.matches({ type: "search" }), _.stubFalse],
+            [_.flow(_.getOr([], "values"), _.isEmpty), _.stubTrue],
+            [_.stubTrue, _.stubFalse],
+          ])
+        )
       )(payload);
     default:
       return state;

package/src/selectors/getRuleImplementationAvailableFilters.js

@@ -9,7 +9,16 @@ export const getRuleImplementationAvailableFilters = createSelector(
   getRuleImplementationSelectedFilters,
   (implementationFilters, implementationSelectedFilters) =>
     _.flow(
-      _.omitBy(({ values }) => _.size(values) < 2),
+      _.omitBy(
+        _.cond([
+          [_.matches({ type: "search" }), _.stubFalse],
+          [
+            _.flow(_.getOr([], "values"), (values) => _.size(values) < 2),
+            _.stubTrue,
+          ],
+          [_.stubTrue, _.stubFalse],
+        ])
+      ),
       _.keys,
       _.without(implementationSelectedFilters)
     )(implementationFilters)