@truedat/dq 5.9.5 → 5.9.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "5.9.5",
+  "version": "5.9.7",
   "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.9.5",
+    "@truedat/test": "5.9.7",
     "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.9.5",
-    "@truedat/df": "5.9.5",
+    "@truedat/core": "5.9.7",
+    "@truedat/df": "5.9.7",
     "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": "e5921f6b5e5a2142ac6be90ad269d5e1fecb1e2c"
+  "gitHead": "9970ccde5058eacef7d2950af845b43a625e218f"
 }

package/src/components/RuleResultDecorator.js

@@ -1,4 +1,4 @@
-import { defaultTo, has, isNil } from "lodash/fp";
+import _, { defaultTo, has, isNil } from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { Icon } from "semantic-ui-react";
@@ -38,6 +38,34 @@ export const calculateResultDecoration = ({
   }
 
   const { resultType, result_type } = ruleImplementation;
+  const { errors, records, result: ruleResultPercentage } = ruleResult || {};
+
+  const executionInfoIsObject = _.flow(
+    _.prop("execution_result_info"),
+    _.isObject
+  );
+  const notEmptyResults = _.flow(
+    _.prop("results"),
+    (results) => _.isArray(results) && !_.isEmpty(results)
+  );
+  const firstResult = _.flow(_.prop("results"), _.first);
+  const defaultValue = { goal: null, minimum: null };
+
+  const { goal, minimum } = _.cond([
+    [executionInfoIsObject, _.prop("execution_result_info")],
+    [notEmptyResults, firstResult],
+    [_.stubTrue, () => defaultValue],
+  ])(ruleImplementation);
+
+  const colorParams = {
+    errors: errors,
+    result: ruleResultPercentage,
+    minimum: minimum,
+    goal: goal,
+    result_type: result_type,
+    records: records,
+  };
+
   const type = defaultTo(result_type)(resultType);
   const result =
     type === "errors_number"
@@ -51,7 +79,9 @@ export const calculateResultDecoration = ({
         { result, date: <DateTime value={date} /> }
       )
     : formatMessage({ id: `quality.result.${type}.description` }, { result });
-  const color = selectColor({ ...ruleImplementation, ...ruleResult });
+
+  const color = selectColor(colorParams);
+
   const iconTitle = ruleResult?.result_text
     ? formatMessage({
         id: ruleResult?.result_text,

package/src/components/__tests__/ImplementationResultBar.spec.js

@@ -5,9 +5,11 @@ import ImplementationResultBar from "../ImplementationResultBar";
 const implementation = {
   id: 1,
   rule_id: 8,
-  goal: 80,
-  minimum: 50,
   result_type: "percentage",
+  execution_result_info: {
+    goal: 80,
+    minimum: 50,
+  },
 };
 
 describe("<ImplementationResultBar />", () => {
@@ -41,7 +43,9 @@ describe("<ImplementationResultBar />", () => {
     const props = {
       implementation: {
         ...implementation,
-        results: [{ date: "2021-07-19T00:01:20Z", result: "40" }],
+        results: [
+          { date: "2021-07-19T00:01:20Z", result: "40", goal: 80, minimum: 50 },
+        ],
       },
     };
     const { container } = render(<ImplementationResultBar {...props} />);

package/src/components/__tests__/__snapshots__/RuleResultDecorator.spec.js.snap

@@ -14,7 +14,7 @@ exports[`<RuleResultDecorator /> decorates a percentage result 1`] = `
 <div>
   <i
     aria-hidden="true"
-    class="green circle icon"
+    class="grey circle icon"
     title="Something happened"
   />
   42%
@@ -25,7 +25,7 @@ exports[`<RuleResultDecorator /> decorates an error count result 1`] = `
 <div>
   <i
     aria-hidden="true"
-    class="green circle icon"
+    class="grey circle icon"
     title="Something happened"
   />
   1,234 errors

package/src/messages/en.js

@@ -540,6 +540,7 @@ export default {
   "ruleImplementations.events.action_versioned": "Implementation versioned",
   "ruleImplementations.or": "OR",
   "ruleImplementations.props.business_concept": "Concept",
+  "ruleImplementations.props.business_concepts": "Concepts",
   "ruleImplementations.props.domain": "Domain",
   "ruleImplementations.props.executable": "Executable",
   "ruleImplementations.props.executable.false": "Internal",

package/src/messages/es.js

@@ -556,6 +556,7 @@ export default {
   "ruleImplementations.events.action_versioned": "Implementación versionada",
   "ruleImplementations.or": "OR",
   "ruleImplementations.props.business_concept": "Concepto",
+  "ruleImplementations.props.business_concepts": "Conceptos",
   "ruleImplementations.props.domain": "Dominio",
   "ruleImplementations.props.executable": "Ejecutable",
   "ruleImplementations.props.executable.false": "Interna",

package/src/reducers/ruleImplementations.js

@@ -8,7 +8,7 @@ import {
 const initialState = [];
 
 const pickFields = _.pick([
-  "current_business_concept_version",
+  "concepts",
   "execution_result_info",
   "id",
   "implementation_key",

package/src/selectors/getRuleImplementationColumns.js

@@ -4,6 +4,7 @@ import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import DateTime from "@truedat/core/components/DateTime";
 import { formatNumber } from "@truedat/core/services/format";
+import ArrayDecorator from "@truedat/core/components/ArrayDecorator";
 import RuleResultDecorator from "../components/RuleResultDecorator";
 import RuleImplementationLink from "../components/RuleImplementationLink";
 import RuleLink from "../components/RuleLink";
@@ -39,9 +40,10 @@ export const defaultImplementationColumns = [
     width: 2,
   },
   {
-    name: "business_concept",
-    fieldSelector: _.path("current_business_concept_version.name"),
-    sort: { name: "current_business_concept_version.name.raw" },
+    name: "business_concepts",
+    fieldSelector: _.path("concepts"),
+    fieldDecorator: ArrayDecorator(1, ", "),
+    sort: { name: "concepts.raw" },
     width: 2,
   },
   {