@truedat/dq 4.46.4 → 4.46.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.46.5] 2022-06-17
+
+### Added
+
+- [TD-4894] Multiple column operator in implementation creation
+
 ## [4.46.3] 2022-06-16
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.46.4",
+  "version": "4.46.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.46.4",
+    "@truedat/test": "4.46.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.46.4",
-    "@truedat/df": "4.46.4",
+    "@truedat/core": "4.46.5",
+    "@truedat/df": "4.46.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": "dcd0aa42ffe1fb816945154ec2a2d06889dca7e7"
+  "gitHead": "cc6e42515345adf2926f47216622e0fc4f7a0d86"
 }

package/src/components/ConditionSummary.js

@@ -8,23 +8,41 @@ 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 }) => {
+  return 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,
@@ -33,26 +51,52 @@ FormattedLink.propTypes = {
 
 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;
+  }
 
-const valuesFromKeys = (values, keys, optionalKeys, value_modifier) =>
-  _.flow(
-    _.map((v) => {
-      return { kv: _.pick(keys)(v), optv: _.pick(optionalKeys)(v) };
+  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) => {
+  return _.flow(
+    _.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) =>
   rows && _.every((r) => _.isEmpty(r) || _.isNil(r))(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,24 @@ const updateDatasetKey = (data) =>
     {}
   )(data);
 
+// https://stackoverflow.com/a/38417085
+const updateValueKeyValue = (object) => {
+  if (object?.id || object?.raw || object?.fields) {
+    return object?.id
+      ? _.pick(["id", "parent_index"])(object)
+      : _.pick(["raw", "fields"])(object);
+  }
+
+  return Object.keys(object).reduce(
+    (output, key) => {
+      // eslint-disable-next-line fp/no-mutation
+      output[key] = updateValueKeyValue(object[key]);
+      return output;
+    },
+    Array.isArray(object) ? [] : {}
+  );
+};
+
 const updateConditionValue = (acc, value, key) => {
   if (key === "structure") {
     return _.set(key, _.pick(["id", "parent_index"])(value))(acc);
@@ -49,12 +67,10 @@ const updateConditionValue = (acc, value, key) => {
       )
     )(acc);
   if (key == "value")
-    return _.set(
-      key,
-      _.map((v) =>
-        _.has("id")(v) ? _.pick(["id", "parent_index"])(v) : _.pick(["raw"])(v)
-      )(value)
-    )(acc);
+    return {
+      ...acc,
+      value: updateValueKeyValue(value),
+    };
   if (key === "population") return _.set(key, conditionAttributes(value))(acc);
 
   return acc;
@@ -103,6 +119,7 @@ const fieldTypeFromStructure = (row, structures, operators, scope) => {
     field_type,
     _.prop("operator")(row)
   );
+
   const updatedRow = {
     ...row,
     operator,

package/src/components/ruleImplementationForm/FiltersField.js

@@ -48,6 +48,24 @@ export const FiltersField = ({
   const { value_type, value_type_filter, fixed_values } = operator;
 
   const modifierDef = _.find({ name: modifier?.name })(typeCastModifiers);
+  const pickFromValue = _.pick(["data_structure_id", "name", "parent_index"]);
+
+  const getVal = (value) => {
+    return _.isNil(_.prop("parent_index")(value))
+      ? _.prop("id")(value)
+      : `${_.prop("id")(value)}/${_.prop("parent_index")(value)}`;
+  };
+
+  const getValue = (valueOrValues, operator) => {
+    const getValueResultado =
+      operator?.value_type === "field_list"
+        ? (valueOrValues?.fields || []).map((v) => {
+            return getVal(v);
+          })
+        : getVal(valueOrValues);
+
+    return getValueResultado;
+  };
 
   switch (value_type) {
     case "string":
@@ -89,6 +107,7 @@ export const FiltersField = ({
     case "timestamp":
       return <DateTimeField label={label} value={value} onChange={onChange} />;
     case "field":
+    case "field_list":
       const structureFields = getStructureFields(parentStructures);
       return value_type_filter == "any" ? (
         <StructureSelectorInputField
@@ -111,24 +130,30 @@ export const FiltersField = ({
       ) : (
         <>
           <StructureFieldsDropdown
+            multiple={value_type === "field_list"}
             label={label}
             inline={false}
             parentStructures={parentStructures}
             structureFields={structureFields}
             typeCastModifiers={typeCastModifiers}
-            filters={{ field_type: [fieldType] }}
-            onSelectField={(value, modifier) =>
+            filters={
+              value_type === "field_list" ? null : { field_type: [fieldType] }
+            }
+            onSelectField={(value, modifier) => {
               onChange(
                 null,
-                _.pick(["data_structure_id", "name", "parent_index"])(value),
+                pickFromValue(value),
                 modifier ? { name: modifier.name } : null
-              )
-            }
-            value={
-              _.isNil(_.prop("parent_index")(value))
-                ? _.prop("id")(value)
-                : `${_.prop("id")(value)}/${_.prop("parent_index")(value)}`
-            }
+              );
+            }}
+            onSelectFields={(values) => {
+              onChange(
+                null,
+                values.map((value) => pickFromValue(value)),
+                null
+              );
+            }}
+            value={getValue(value, operator)}
           />
           {modifier && (
             <FieldModifier

package/src/components/ruleImplementationForm/FiltersFormGroup.js

@@ -65,7 +65,9 @@ export const FiltersFormGroup = ({
                 inline={false}
                 parentStructures={parentStructures}
                 structureFields={structureFields}
-                onSelectField={(value) => onStructureChange(index, value)}
+                onSelectField={(value) => {
+                  return onStructureChange(index, value /*[0]*/);
+                }}
                 value={
                   _.isNil(_.prop("parent_index")(clause?.structure))
                     ? _.prop("id")(clause?.structure)
@@ -122,7 +124,9 @@ export const FiltersFormGroup = ({
           })}
           options={operatorsOptions}
           value={getOperatorValue(clause)}
-          onClick={({ id }) => onOperatorChange(index, id)}
+          onClick={(whatever) => {
+            onOperatorChange(index, whatever.id);
+          }}
           placeholder={formatMessage({
             id: "operator.dropdown.placeholder",
           })}

package/src/components/ruleImplementationForm/FiltersGrid.js

@@ -56,13 +56,23 @@ export const FiltersGrid = ({
     });
   };
 
+  const composeFieldValue = (value) => {
+    return {
+      id: value.data_structure_id || value.id,
+      name: value.name,
+      path: value.path,
+      parent_index: value.parent_index,
+    };
+  };
+
   const composeValue = (value_type, value) => {
     if (value_type == "field") {
+      return composeFieldValue(value);
+    } else if (value_type === "field_list") {
       return {
-        id: value.data_structure_id || value.id,
-        name: value.name,
-        path: value.path,
-        parent_index: value.parent_index,
+        fields: _.map((v) => {
+          return composeFieldValue(v);
+        })(value),
       };
     } else {
       return { raw: value };

package/src/components/ruleImplementationForm/__tests__/__snapshots__/FiltersFormGroup.spec.js.snap

@@ -50,7 +50,13 @@ exports[`<FiltersFormGroup /> matches the latest snapshot 1`] = `
         <div
           class="menu transition"
           role="listbox"
-        />
+        >
+          <div
+            class="message"
+          >
+            No results found.
+          </div>
+        </div>
       </div>
     </div>
     <div

package/src/components/ruleImplementationForm/__tests__/__snapshots__/FiltersGroup.spec.js.snap

@@ -56,7 +56,13 @@ exports[`<FiltersGroup /> matches the latest snapshot when siblings provided 1`]
             <div
               class="menu transition"
               role="listbox"
-            />
+            >
+              <div
+                class="message"
+              >
+                No results found.
+              </div>
+            </div>
           </div>
         </div>
         <div

package/src/components/ruleImplementationForm/__tests__/__snapshots__/ValueConditions.spec.js.snap

@@ -56,7 +56,13 @@ exports[`<ValueConditions /> matches the latest snapshot when siblings provided
             <div
               class="menu transition"
               role="listbox"
-            />
+            >
+              <div
+                class="message"
+              >
+                No results found.
+              </div>
+            </div>
           </div>
         </div>
         <div

package/src/messages/en.js

@@ -423,7 +423,8 @@ export default {
     "matches regular expression",
   "ruleImplementation.operator.starts_with": "starts with",
   "ruleImplementation.operator.starts_with.string": "starts with",
-  "ruleImplementation.operator.unique": "has unique value",
+  "ruleImplementation.operator.unique": "unique",
+  "ruleImplementation.operator.unique.field_list": "unique across fields",
   "ruleImplementation.operator.variation_on_count": "count variation",
   "ruleImplementation.operator.variation_on_count.string": "count variation",
   "ruleImplementation.props.esquema": "Structure",

package/src/messages/es.js

@@ -435,7 +435,8 @@ export default {
   "ruleImplementation.operator.regex_format": "cumple la expresión regular",
   "ruleImplementation.operator.starts_with.string": "empieza por",
   "ruleImplementation.operator.starts_with": "empieza por",
-  "ruleImplementation.operator.unique": "tiene valor único",
+  "ruleImplementation.operator.unique": "único",
+  "ruleImplementation.operator.unique.field_list": "único en conjunto",
   "ruleImplementation.operator.variation_on_count.string": "variación conteo",
   "ruleImplementation.operator.variation_on_count": "variación conteo",
   "ruleImplementation.props.esquema.placeholder": "añade una estructura",

package/src/selectors/getRuleImplementationOperators.js

@@ -5,6 +5,7 @@ const defaultOperators = {
   any: {
     operators: [
       { name: "unique", scope: "validation" },
+      { name: "unique", value_type: "field_list" },
       { name: "not_empty" },
       { name: "empty" },
       {