@truedat/dq 4.33.10 → 4.34.0

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

@@ -20,18 +20,16 @@ describe("reducers: rule", () => {
       current_business_concept_version: { name: "alfalfa", id: 1234 },
       name: "rule1",
       description: "desc1",
-      goal: 10,
-      minimum: 1,
       active: false,
       domain_id: 1,
-      domain: { id: 1, name: "foo", external_id: "bar" }
+      domain: { id: 1, name: "foo", external_id: "bar" },
     };
     const payload = { data: someRule };
 
     expect(
       rule(fooState, {
         type: fetchRule.SUCCESS,
-        payload
+        payload,
       })
     ).toMatchObject(someRule);
   });

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

@@ -21,6 +21,8 @@ describe("reducers: ruleImplementation", () => {
       id: 2,
       implementation_key: "xxx",
       results: [],
+      goal: 10,
+      minimum: 1,
     };
     const payload = { data: ruleImpl };
 

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

@@ -1,7 +1,7 @@
 import {
   clearRuleImplementations,
   fetchRuleImplementations,
-  searchRuleImplementations
+  searchRuleImplementations,
 } from "../../routines";
 import { ruleImplementations } from "..";
 
@@ -9,12 +9,16 @@ const fooState = { foo: "bar" };
 const data = [
   {
     id: 1,
-    implementation_key: "RuleImplementations 1"
+    implementation_key: "RuleImplementations 1",
+    goal: 10,
+    minimum: 1,
   },
   {
     id: 2,
-    implementation_key: "RuleImplementations 2"
-  }
+    implementation_key: "RuleImplementations 2",
+    goal: 10,
+    minimum: 1,
+  },
 ];
 
 describe("reducers: ruleImplementations", () => {
@@ -27,7 +31,7 @@ describe("reducers: ruleImplementations", () => {
   it("should handle the fetchRuleImplementations.TRIGGER action", () => {
     expect(
       ruleImplementations(fooState, {
-        type: fetchRuleImplementations.TRIGGER
+        type: fetchRuleImplementations.TRIGGER,
       })
     ).toMatchObject(initialState);
   });
@@ -38,7 +42,7 @@ describe("reducers: ruleImplementations", () => {
     expect(
       ruleImplementations(fooState, {
         type: fetchRuleImplementations.SUCCESS,
-        payload
+        payload,
       })
     ).toMatchObject(data);
   });
@@ -49,7 +53,7 @@ describe("reducers: ruleImplementations", () => {
     expect(
       ruleImplementations(fooState, {
         type: searchRuleImplementations.SUCCESS,
-        payload
+        payload,
       })
     ).toMatchObject(data);
   });
@@ -57,7 +61,7 @@ describe("reducers: ruleImplementations", () => {
   it("should handle the clearRuleImplementations.TRIGGER action", () => {
     expect(
       ruleImplementations(fooState, {
-        type: clearRuleImplementations.TRIGGER
+        type: clearRuleImplementations.TRIGGER,
       })
     ).toMatchObject(initialState);
   });

package/src/reducers/rule.js

@@ -13,13 +13,10 @@ const pickFields = _.pick([
   "current_business_concept_version",
   "name",
   "description",
-  "goal",
-  "minimum",
   "system_values",
   "type_params",
   "df_name",
   "df_content",
-  "result_type"
 ]);
 
 const rule = (state = initialState, { type, payload }) => {

package/src/reducers/ruleImplementation.js

@@ -21,6 +21,9 @@ const pickFields = _.pick([
   "rule_id",
   "system",
   "validations",
+  "result_type",
+  "minimum",
+  "goal",
 ]);
 
 const ruleImplementation = (state = initialState, { type, payload }) => {

package/src/reducers/ruleImplementations.js

@@ -21,6 +21,9 @@ const pickFields = _.pick([
   "event_type",
   "event_inserted_at",
   "deleted_at",
+  "result_type",
+  "minimum",
+  "goal",
   "dataset",
   "valdations",
 ]);

package/src/selectors/getRuleImplementationColumns.js

@@ -1,10 +1,18 @@
 import _ from "lodash/fp";
+import React from "react";
 import { createSelector } from "reselect";
+import { FormattedMessage } from "react-intl";
 import DateTime from "@truedat/core/components/DateTime";
+import { formatNumber } from "@truedat/core/services/format";
 import RuleResultDecorator from "../components/RuleResultDecorator";
 import RuleImplementationLink from "../components/RuleImplementationLink";
 import RuleLink from "../components/RuleLink";
 
+const translateDecorator = (id) => <FormattedMessage id={id} />;
+
+const resultTypeDecorator = (result, result_type) =>
+  result_type === "errors_number" ? formatNumber(result) : `${result}%`;
+
 export const defaultImplementationColumns = [
   {
     name: "implementation_key",
@@ -35,11 +43,38 @@ export const defaultImplementationColumns = [
     sort: { name: "execution_result_info.date" },
     width: 2,
   },
+  {
+    name: "result_type",
+    fieldDecorator: (value) =>
+      _.isNil(value)
+        ? null
+        : translateDecorator(`ruleImplementations.props.result_type.${value}`),
+    sort: { name: "result_type.raw" },
+    width: 2,
+  },
+  {
+    name: "minimum",
+    fieldSelector: _.pick(["minimum", "result_type"]),
+    fieldDecorator: (field) =>
+      resultTypeDecorator(field.minimum, field.result_type),
+    sort: { name: "minimum" },
+    textAlign: "right",
+    width: 1,
+  },
+  {
+    name: "goal",
+    fieldSelector: _.pick(["goal", "result_type"]),
+    fieldDecorator: (field) =>
+      resultTypeDecorator(field.goal, field.result_type),
+    sort: { name: "goal" },
+    textAlign: "right",
+    width: 1,
+  },
   {
     name: "result",
-    fieldSelector: ({ execution_result_info: ruleResult, rule }) => ({
-      ruleResult,
-      rule,
+    fieldSelector: (ruleImplementation) => ({
+      ruleResult: ruleImplementation?.execution_result_info,
+      ruleImplementation,
     }),
     fieldDecorator: RuleResultDecorator,
     textAlign: "center",

package/src/selectors/ruleColumnsSelector.js

@@ -3,14 +3,10 @@ import React from "react";
 import { Label } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { createSelector } from "reselect";
-import { formatNumber } from "@truedat/core/services/format";
 import RuleLink from "../components/RuleLink";
 
 const translateDecorator = (id) => <FormattedMessage id={id} />;
 
-const resultTypeDecorator = (result, result_type) =>
-  result_type === "errors_number" ? formatNumber(result) : `${result}%`;
-
 export const dynamicDecorator = (field) => (
   <>
     {field &&
@@ -52,33 +48,6 @@ export const defaultRuleColumns = () => [
     sort: { name: "current_business_concept_version.name.raw" },
     width: 3,
   },
-  {
-    name: "result_type",
-    fieldDecorator: (value) =>
-      _.isNil(value)
-        ? null
-        : translateDecorator(`rule.props.result_type.${value}`),
-    sort: { name: "result_type.raw" },
-    width: 2,
-  },
-  {
-    name: "minimum",
-    fieldSelector: _.pick(["minimum", "result_type"]),
-    fieldDecorator: (field) =>
-      resultTypeDecorator(field.minimum, field.result_type),
-    sort: { name: "minimum" },
-    textAlign: "right",
-    width: 1,
-  },
-  {
-    name: "goal.list",
-    fieldSelector: _.pick(["goal", "result_type"]),
-    fieldDecorator: (field) =>
-      resultTypeDecorator(field.goal, field.result_type),
-    sort: { name: "goal" },
-    textAlign: "right",
-    width: 1,
-  },
 ];
 
 export const optionalRuleColumns = [

package/src/styles/ruleSummary.less

@@ -7,7 +7,7 @@
   height: 18px;
   border-radius: 9px;
   margin: 0px auto;
-  >span>span {
+  > span > span {
     color: white;
   }
 }
@@ -21,39 +21,46 @@
   transition: all 100ms ease-in-out;
   overflow: hidden;
 
-  span:first-child{
+  span:first-child {
     margin-left: 0px;
   }
 
-  span:last-child{
+  span:last-child {
     margin-right: 0px;
   }
 
-  span{
+  span {
     margin: 1px;
     cursor: default;
     color: transparent;
     text-align: center;
     font-size: 10px;
     line-height: 15px;
+    white-space: pre;
   }
 }
 
 .rule-summary {
   @import "~semantic-ui-less/definitions/globals/site";
   .over-goal-color {
-      background-color: @overGoalRuleColor;
+    background-color: @overGoalRuleColor;
   }
   .under-goal-color {
-      background-color: @underGoalRuleColor;
+    background-color: @underGoalRuleColor;
   }
   .under-minimum-color {
-      background-color: @underMinimumRuleColor;
+    background-color: @underMinimumRuleColor;
   }
   .not-executed-color {
-      background-color: @notExecutedRuleColor;
+    background-color: @notExecutedRuleColor;
   }
   .failed-color {
-      background-color: @failedRuleColor;
+    background-color: @failedRuleColor;
   }
-}
+}
+
+.pointer {
+  span {
+    cursor: pointer;
+  }
+}