@truedat/dq 4.47.4 → 4.47.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.47.5] 2022-06-30
+
+### Added
+
+- [TD-4894] Multiple column operator in implementation creation
+
 ## [4.47.4] 2022-06-29
 
 - [TD-4921] Add implementation workflow events
@@ -20,7 +26,7 @@
 
 ## [4.46.12] 2022-06-20
 
-### Reverted
+### Removed
 
 - [TD-4894] Multiple column operator in implementation creation
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.47.4",
+  "version": "4.47.5",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.47.4",
+    "@truedat/test": "4.47.5",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -88,8 +88,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.4",
-    "@truedat/core": "4.47.4",
-    "@truedat/df": "4.47.4",
+    "@truedat/core": "4.47.5",
+    "@truedat/df": "4.47.5",
     "axios": "^0.19.2",
     "graphql": "^15.5.3",
     "path-to-regexp": "^1.7.0",
@@ -110,5 +110,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "9d38ae9759ce669fe1b459a3ee80c314d33871e0"
+  "gitHead": "1265272aa7b8fcb415592916f0e557ae226befe3"
 }

package/src/components/ConditionSummary.js

@@ -8,43 +8,85 @@ import { linkTo } from "@truedat/core/routes";
 
 const concatValues = (values, link) => _.join(link)(values);
 
-const FormattedLink = ({ value, operator = {} }) =>
-  _.propEq("value_type", "field")(operator) ? (
+const LinkToStructure = ({ value }) =>
+  value?.id ? (
     <Link to={linkTo.STRUCTURE({ id: value.id })}>
       <span className="highlighted">{`"${
         !_.isEmpty(value.path) ? path(value) : value.name
       }"`}</span>{" "}
     </Link>
-  ) : (
-    <span className="highlighted">
-      <FormattedMessage
-        id={`ruleImplementation.filtersField.${value.raw}`}
-        defaultMessage={`"${
-          _.isArray(value.raw) ? _.join(", ")(value.raw) : value.raw
-        }"`}
-      ></FormattedMessage>
-    </span>
-  );
+  ) : null;
+
+const FormattedLink = ({ value, operator = {} }) => {
+  switch (operator?.value_type) {
+    case "field":
+      return <LinkToStructure value={value} />;
+    case "field_list":
+      return (
+        <>
+          {_.map.convert({ cap: false })((v, i) => (
+            <LinkToStructure key={i} value={v} />
+          ))(value)}
+        </>
+      );
+    default:
+      return (
+        <span className="highlighted">
+          <FormattedMessage
+            id={`ruleImplementation.filtersField.${value.raw}`}
+            defaultMessage={`"${
+              _.isArray(value.raw) ? _.join(", ")(value.raw) : value.raw
+            }"`}
+          ></FormattedMessage>
+        </span>
+      );
+  }
+};
 
 FormattedLink.propTypes = {
-  value: PropTypes.object,
+  value: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
   operator: PropTypes.object,
 };
 
 const nilOrEmpty = (v) => _.isNil(v) || v === "";
 
-const filterNilOrEmpties = (values, keys) =>
-  _.filter((v) => _.every((k) => !nilOrEmpty(_.prop(k)(v.kv)))(keys))(values);
+const filterNilOrEmpties = (values, keys) => {
+  if ("kv" in values) {
+    return _.every((k) => !nilOrEmpty(values.kv[k]))(keys) ? values : null;
+  }
+
+  return _.flow(
+    _.map((v) => filterNilOrEmpties(v, keys)),
+    _.filter((v) => !!v)
+  )(values);
+};
+
+const pick = (value, keys, optionalKeys) => ({
+  kv: _.pick(keys)(value),
+  optv: _.pick(optionalKeys)(value),
+});
+
+const convert = (v, index, value_modifier) => {
+  if (_.has("kv")(v)) {
+    return { ...v.kv, ...v.optv, modifier: _.nth(index)(value_modifier) };
+  }
+
+  return _.map.convert({ cap: false })((v, i) => {
+    return convert(v, i, value_modifier);
+  })(v);
+};
 
 const valuesFromKeys = (values, keys, optionalKeys, value_modifier) =>
   _.flow(
-    _.map((v) => {
-      return { kv: _.pick(keys)(v), optv: _.pick(optionalKeys)(v) };
+    _.map((value) => {
+      return Array.isArray(value?.fields)
+        ? _.map((innerValue) => pick(innerValue, keys, optionalKeys))(
+            value?.fields
+          )
+        : pick(value, keys, optionalKeys);
     }),
     (v) => filterNilOrEmpties(v, keys),
-    _.map.convert({ cap: false })((v, i) => {
-      return { ...v.kv, ...v.optv, modifier: _.nth(i)(value_modifier) };
-    })
+    (v) => convert(v, 0, value_modifier)
   )(values);
 
 export const empty = (rows) =>
@@ -52,7 +94,7 @@ export const empty = (rows) =>
 
 export const getValues = ({ value = [], operator = {}, value_modifier }) => {
   const defaultOrValue = value || [];
-  return _.propEq("value_type", "field")(operator)
+  return ["field", "field_list"].includes(operator?.value_type)
     ? valuesFromKeys(defaultOrValue, ["id", "name"], ["path"], value_modifier)
     : valuesFromKeys(defaultOrValue, ["raw"], [], value_modifier);
 };

package/src/components/NewRuleImplementation.js

@@ -25,6 +25,19 @@ const updateDatasetKey = (data) =>
     {}
   )(data);
 
+// object either field, raw value, list of fields, list of raw values
+const updateValueKeyContent = (object) => {
+  if (object?.id || object?.raw || object?.fields) {
+    return object?.id
+      ? _.pick(["id", "parent_index"])(object)
+      : _.pick(["raw", "fields"])(object);
+  }
+
+  return (object || []).map((v) => {
+    return updateValueKeyContent(v);
+  });
+};
+
 const updateConditionValue = (acc, value, key) => {
   if (key === "structure") {
     return _.set(key, _.pick(["id", "parent_index"])(value))(acc);
@@ -48,13 +61,9 @@ const updateConditionValue = (acc, value, key) => {
         _.pick(["name", "value_type", "value_type_filter"])(value)
       )
     )(acc);
-  if (key == "value")
-    return _.set(
-      key,
-      _.map((v) =>
-        _.has("id")(v) ? _.pick(["id", "parent_index"])(v) : _.pick(["raw"])(v)
-      )(value)
-    )(acc);
+  if (key == "value") {
+    return { ...acc, value: updateValueKeyContent(value) };
+  }
   if (key === "population") return _.set(key, conditionAttributes(value))(acc);
 
   return acc;
@@ -103,6 +112,7 @@ const fieldTypeFromStructure = (row, structures, operators, scope) => {
     field_type,
     _.prop("operator")(row)
   );
+
   const updatedRow = {
     ...row,
     operator,