@truedat/dq 4.33.10 → 4.34.0

package/src/components/RuleResultDecorator.js

@@ -10,31 +10,30 @@ const nilResult = (ruleResult) =>
   isNil(ruleResult) ||
   (has("result_text")(ruleResult) && isNil(ruleResult?.result_text));
 
-export const RuleResultDecorator = ({ ruleResult, rule, date }) => {
-  const { formatMessage, formatNumber: _formatNumber } = useIntl();
+export const calculateResultDecoration = ({
+  ruleResult,
+  ruleImplementation,
+  date,
+  intl: { formatMessage, formatNumber: _formatNumber },
+}) => {
   const formatNumber = (num) => (isNil(num) ? num : _formatNumber(num));
-  if (nilResult(ruleResult) && isNil(date)) {
-    return null;
-  }
+
   if (ruleResult?.result_text === "quality_result.failed") {
-    return (
-      <>
-        <Icon
-          name="warning circle"
-          color="red"
-          title={formatMessage({ id: "quality_result.failed" })}
-        />
-        {formatMessage({ id: "quality_result.failed" })}
-      </>
-    );
+    const resultText = formatMessage({ id: "quality_result.failed" });
+    return {
+      iconName: "warning circle",
+      resultText: resultText,
+      color: "red",
+      resultText,
+    };
   }
-  const resultText = ruleResult?.result_text;
-  const resultType = rule?.result_type;
+
+  const resultType = ruleImplementation?.result_type;
   const result =
     resultType === "errors_number"
       ? formatNumber(ruleResult?.errors)
       : ruleResult?.result;
-  const resultTitle = isNil(result)
+  const resultText = isNil(result)
     ? formatMessage({ id: "quality.result.no.data" })
     : date
     ? formatMessage(
@@ -45,23 +44,41 @@ export const RuleResultDecorator = ({ ruleResult, rule, date }) => {
         { id: `quality.result.${resultType}.description` },
         { result }
       );
-  const color = selectColor({ ...rule, ...ruleResult });
+  const color = selectColor({ ...ruleImplementation, ...ruleResult });
+  const iconTitle = ruleResult?.result_text
+    ? formatMessage({ id: ruleResult?.result_text })
+    : null;
+
+  return { iconName: "circle", color, resultText, iconTitle };
+};
+
+export const RuleResultDecorator = ({
+  ruleResult,
+  ruleImplementation,
+  date,
+}) => {
+  const intl = useIntl();
+  if (nilResult(ruleResult) && isNil(date)) {
+    return null;
+  }
+  const { iconName, color, resultText, iconTitle } = calculateResultDecoration({
+    ruleResult,
+    ruleImplementation,
+    date,
+    intl,
+  });
 
   return (
     <>
-      <Icon
-        name="circle"
-        title={resultText ? formatMessage({ id: resultText }) : null}
-        color={color}
-      />
-      {resultTitle}
+      <Icon name={iconName} title={iconTitle} color={color} />
+      {resultText}
     </>
   );
 };
 
 RuleResultDecorator.propTypes = {
   ruleResult: PropTypes.object,
-  rule: PropTypes.object,
+  ruleImplementation: PropTypes.object,
   date: PropTypes.string,
 };
 

package/src/components/RuleResultRow.js

@@ -41,7 +41,10 @@ export const RuleResultRow = ({
       }
     >
       <Table.Cell>
-        <Icon name="circle" color={selectColor({ ...rule, ...ruleResult })} />
+        <Icon
+          name="circle"
+          color={selectColor({ ...ruleImplementation, ...ruleResult })}
+        />
         {`${parseFloat(ruleResult.result)} %`}
       </Table.Cell>
       <Table.Cell>

package/src/components/RuleRoutes.js

@@ -66,7 +66,6 @@ const RuleRoutes = ({
   templatesLoaded,
   template,
   structuresAliasesLoading,
-  templateImpl,
   ruleImplementation,
 }) => {
   const latest = _.head(ruleImplementation.results);
@@ -227,14 +226,6 @@ const RuleRoutes = ({
                             <RuleImplementationProperties />
                           </RuleImplementation>
                         )}
-                        {!_.isEmpty(templateImpl) && ruleImplementationLoaded && (
-                          <Segment attached="bottom">
-                            <DynamicFormViewer
-                              template={templateImpl}
-                              content={ruleImplementation.df_content}
-                            />
-                          </Segment>
-                        )}
                       </Segment>
                     </>
                   )}
@@ -305,7 +296,6 @@ RuleRoutes.propTypes = {
   implementationStructures: PropTypes.array,
   ruleLoaded: PropTypes.bool,
   template: PropTypes.object,
-  templateImpl: PropTypes.object,
   ruleImplementation: PropTypes.object,
   ruleImplementationLoaded: PropTypes.bool,
   implementationStructuresLoaded: PropTypes.bool,
@@ -325,9 +315,6 @@ const mapStateToProps = (state) => ({
   templatesLoaded: !state.templatesLoading && !_.isEmpty(state.templates),
   template: _.find(_.propEq("name", state.rule.df_name))(state.templates),
   structuresAliasesLoading: state.structuresAliasesLoading,
-  templateImpl: _.find(_.propEq("name", state.ruleImplementation.df_name))(
-    state.templates
-  ),
   ruleImplementation: state.ruleImplementation,
 });
 

package/src/components/RuleSummary.js

@@ -22,8 +22,12 @@ const mapSummary = (implementations) => {
   const failed = _.size(failedImplementations);
   const quality = _.reduce(
     (summary, implementation) => {
-      const { errors, result } = implementation.execution_result_info;
-      const { goal, minimum, result_type } = implementation.rule;
+      const {
+        goal,
+        minimum,
+        result_type,
+        execution_result_info: { errors, result },
+      } = implementation;
       const color = selectColor({ errors, result, minimum, goal, result_type });
       return _.set(color, summary[color] + 1)(summary);
     },
@@ -71,6 +75,15 @@ const SummaryBar = ({
   </>
 );
 
+SummaryBar.propTypes = {
+  key: PropTypes.string,
+  className: PropTypes.string,
+  summary: PropTypes.object,
+  percentages: PropTypes.array,
+  showPercentages: PropTypes.bool,
+  tooltip: PropTypes.string,
+};
+
 const SummaryBars = (props) => {
   return (
     <div className="rule-summary">

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

@@ -11,11 +11,15 @@ describe("<ExecutionGroup />", () => {
   const rule = {
     id: 1,
     name: "rule_name",
+  };
+  const implementation = {
+    id: 1,
+    implementation_key: "foo",
+    rule_id: 1,
     result_type: "percentage",
     minimum: 10,
-    goal: 20
+    goal: 20,
   };
-  const implementation = { id: 1, implementation_key: "foo", rule_id: 1 };
   const result = {
     id: 1,
     implementation_key: "foo",
@@ -25,7 +29,7 @@ describe("<ExecutionGroup />", () => {
     errors: 30,
     result_type: "percentage",
     minimum: 10,
-    goal: 20
+    goal: 20,
   };
   const quality_events = [
     {
@@ -33,14 +37,14 @@ describe("<ExecutionGroup />", () => {
       execution_id: 1,
       id: 1,
       type: "SUCCESS",
-      message: ""
-    }
+      message: "",
+    },
   ];
   const executions = [
-    { id: 1, _embedded: { rule, implementation, result, quality_events } }
+    { id: 1, _embedded: { rule, implementation, result, quality_events } },
   ];
   const props = {
-    executionGroup: { id: 1, _embedded: { executions } }
+    executionGroup: { id: 1, _embedded: { executions } },
   };
 
   it("matches the latest snapshot", () => {

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

@@ -0,0 +1,98 @@
+import React from "react";
+import { render } from "@truedat/test/render";
+import ImplementationResultBar from "../ImplementationResultBar";
+import messages from "../../messages/en";
+
+describe("<ImplementationResultBar />", () => {
+  const renderOpts = {
+    messages: { en: messages },
+  };
+  const base = {
+    id: 1,
+    rule_id: 8,
+    goal: 80,
+    minimum: 50,
+    result_type: "percentage",
+  };
+  const overGoalProps = {
+    implementation: {
+      ...base,
+      results: [{ date: "2021-07-19T00:01:20Z", result: "99.99" }],
+    },
+  };
+  const underGoalProps = {
+    implementation: {
+      ...base,
+      results: [{ date: "2021-07-19T00:01:20Z", result: "70" }],
+    },
+  };
+  const underMinimumProps = {
+    implementation: {
+      ...base,
+      results: [{ date: "2021-07-19T00:01:20Z", result: "40" }],
+    },
+  };
+  const notExecutedProps = {
+    implementation: {
+      ...base,
+      results: [],
+    },
+  };
+  const failedProps = {
+    implementation: {
+      ...base,
+      results: [],
+      event_type: "FAILED",
+    },
+  };
+
+  it("render overGoal implementation", () => {
+    const { container } = render(
+      <ImplementationResultBar {...overGoalProps} />,
+      renderOpts
+    );
+    expect(container).toMatchSnapshot();
+    expect(container.querySelector(".over-goal-color")).not.toBeNull();
+    expect(container).toHaveTextContent("99.99% at 2021-07-19 00:01");
+  });
+
+  it("render underGoal implementation", () => {
+    const { container } = render(
+      <ImplementationResultBar {...underGoalProps} />,
+      renderOpts
+    );
+    expect(container).toMatchSnapshot();
+    expect(container.querySelector(".under-goal-color")).not.toBeNull();
+    expect(container).toHaveTextContent("70% at 2021-07-19 00:01");
+  });
+
+  it("render underMinimum implementation", () => {
+    const { container } = render(
+      <ImplementationResultBar {...underMinimumProps} />,
+      renderOpts
+    );
+    expect(container).toMatchSnapshot();
+    expect(container.querySelector(".under-minimum-color")).not.toBeNull();
+    expect(container).toHaveTextContent("40% at 2021-07-19 00:01");
+  });
+
+  it("render not executed implementation", () => {
+    const { container } = render(
+      <ImplementationResultBar {...notExecutedProps} />,
+      renderOpts
+    );
+    expect(container).toMatchSnapshot();
+    expect(container.querySelector(".not-executed-color")).not.toBeNull();
+    expect(container).toHaveTextContent("No information about quality");
+  });
+
+  it("render failed implementation", () => {
+    const { container } = render(
+      <ImplementationResultBar {...failedProps} />,
+      renderOpts
+    );
+    expect(container).toMatchSnapshot();
+    expect(container.querySelector(".failed-color")).not.toBeNull();
+    expect(container).toHaveTextContent("Latest execution failed");
+  });
+});

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

@@ -7,6 +7,12 @@ import { ImplementationSummary } from "../ImplementationSummary";
 const renderOpts = {
   messages: {
     en: {
+      "ruleImplementationForm.step.information": "information",
+      "quality.thresholds": "thresholds",
+      "quality.threshold": "threshold",
+      "quality.goal": "goal",
+      "ruleImplementations.props.result_type.percentage": "percentage",
+
       "ruleImplementation.summary.field": "Field",
       "ruleImplementation.summary.operator": "Operator",
       "ruleImplementation.summary.structure": "Structure",
@@ -47,6 +53,9 @@ const ruleImplementation = {
       value: [{ raw: ["4", "5", "6"] }],
     },
   ],
+  goal: 50,
+  minimum: 10,
+  result_type: "percentage",
   implementationType: "",
   rawContent: { system: "", dataset: "", population: "", validations: "" },
 };
@@ -82,32 +91,6 @@ describe("<ImplementationSummary />", () => {
     expect(queryByText('"4, 5, 6"')).not.toBeNull();
   });
 
-  it("displays correctly general summary", () => {
-    const props = {
-      ruleImplementation,
-    };
-    const { container, queryByText } = render(
-      <ImplementationSummary {...props} />,
-      renderOpts
-    );
-    expect(container).toMatchSnapshot();
-    expect(queryByText("Executable")).not.toBeNull();
-    expect(queryByText('"ImplKey"')).not.toBeNull();
-  });
-
-  it("renders executable as internal when it is false", () => {
-    const props = {
-      ruleImplementation: { ...ruleImplementation, executable: false },
-    };
-    const { container, queryByText } = render(
-      <ImplementationSummary {...props} />,
-      renderOpts
-    );
-    expect(container).toMatchSnapshot();
-    expect(queryByText("Internal")).not.toBeNull();
-    expect(queryByText('"ImplKey"')).not.toBeNull();
-  });
-
   it("getValues returns array of values that contain required keys and adds optional keys for operator with field value_type", () => {
     expect(
       getValues({

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

@@ -0,0 +1,35 @@
+import React from "react";
+import { render } from "@truedat/test/render";
+import InformationSummary from "../InformationSummary";
+import messages from "../../messages/en";
+
+describe("<InformationSummary />", () => {
+  const renderOpts = {
+    messages: { en: messages },
+  };
+  const ruleImplementation = {
+    id: 1,
+    rule_id: 8,
+    goal: 80,
+    minimum: 50,
+  };
+
+  it("renders percentage result_type", () => {
+    const props = {
+      ruleImplementation: { ...ruleImplementation, result_type: "percentage" },
+    };
+    const { container } = render(<InformationSummary {...props} />, renderOpts);
+    expect(container).toMatchSnapshot();
+  });
+
+  it("renders errors_number result_type", () => {
+    const props = {
+      ruleImplementation: {
+        ...ruleImplementation,
+        result_type: "errors_number",
+      },
+    };
+    const { container } = render(<InformationSummary {...props} />, renderOpts);
+    expect(container).toMatchSnapshot();
+  });
+});

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

@@ -11,7 +11,7 @@ describe("<NewRuleImplementation />", () => {
     ruleImplementationProps,
     createRuleImplementation,
     updateRuleImplementation,
-    sources
+    sources,
   };
 
   it("matches the latest snapshot", () => {

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

@@ -23,8 +23,6 @@ describe("<RuleForm />", () => {
       },
     },
     current_business_concept_version: { name: "My Concept" },
-    goal: 10,
-    minimum: 1,
   };
   const handleSubmit = jest.fn();
   const selectDomain = jest.fn();
@@ -52,9 +50,6 @@ describe("<RuleForm />", () => {
   const eventMock = {
     preventDefault: jest.fn(),
   };
-
-  const findLabel = (wrapper, field) =>
-    wrapper.find("FieldLabelWrapping").find({ label: `rule.props.${field}` });
   const findField = (wrapper, name) => wrapper.find({ name });
 
   it("matches the latest snapshot for editMode", () => {
@@ -112,192 +107,6 @@ describe("<RuleForm />", () => {
     expect(handleSubmit.mock.calls.length).toBe(1);
   });
 
-  it("shows and hides required label", () => {
-    const wrapper = shallowWithIntl(<RuleForm {...defaultProps} />);
-
-    const requiredValidation = "rule.form.validation.empty_required";
-
-    const testLabelOnChange = (name, value) => {
-      expect(findLabel(wrapper, name).props().messages).toEqual([
-        requiredValidation,
-      ]);
-      findField(wrapper, name).simulate("change", eventMock, { name, value });
-      expect(findLabel(wrapper, name).props().messages).toEqual(undefined);
-    };
-
-    testLabelOnChange("name", "value");
-    testLabelOnChange("minimum", "2");
-    testLabelOnChange("goal", "3");
-  });
-
-  it("doesnt change goal and minimum fields values when not valid number", () => {
-    const wrapper = shallowWithIntl(<RuleForm {...defaultProps} />);
-
-    const testValueOnChange = (name, beforeValue, value, expectedValue) => {
-      expect(findField(wrapper, name).props().value).toEqual(beforeValue);
-      findField(wrapper, name).simulate("change", eventMock, { name, value });
-      expect(findField(wrapper, name).props().value).toEqual(expectedValue);
-    };
-
-    testValueOnChange("minimum", "", "invalid", "");
-    testValueOnChange("minimum", "", "4", 4);
-    testValueOnChange("minimum", 4, "invalid", 4);
-    testValueOnChange("minimum", 4, "", "");
-    testValueOnChange("goal", "", "invalid", "");
-    testValueOnChange("goal", "", "5", 5);
-    testValueOnChange("goal", 5, "invalid", 5);
-    testValueOnChange("goal", 5, "", "");
-  });
-
-  it("shows correct messages for minimum and goal number ranges", () => {
-    const wrapper = shallowWithIntl(<RuleForm {...defaultProps} />);
-
-    findField(wrapper, "goal").simulate("change", eventMock, {
-      name: "goal",
-      value: "4",
-    });
-    expect(findLabel(wrapper, "goal").props().messages).toEqual(undefined);
-    findField(wrapper, "goal").simulate("change", eventMock, {
-      name: "goal",
-      value: "101",
-    });
-    expect(findLabel(wrapper, "goal").props().messages).toEqual([
-      "rule.form.validation.max_goal",
-    ]);
-
-    findField(wrapper, "minimum").simulate("change", eventMock, {
-      name: "minimum",
-      value: "5",
-    });
-    findField(wrapper, "goal").simulate("change", eventMock, {
-      name: "goal",
-      value: "10",
-    });
-    expect(findLabel(wrapper, "minimum").props().messages).toEqual(undefined);
-    expect(findLabel(wrapper, "goal").props().messages).toEqual(undefined);
-
-    findField(wrapper, "minimum").simulate("change", eventMock, {
-      name: "minimum",
-      value: "15",
-    });
-
-    expect(findLabel(wrapper, "minimum").props().messages).toEqual([
-      "rule.form.validation.minimum_greater",
-    ]);
-    expect(findLabel(wrapper, "goal").props().messages).toEqual([
-      "rule.form.validation.goal_less",
-    ]);
-  });
-
-  it("shows correct messages for minimum and goal number ranges in a Rule with result_type deviation", () => {
-    const props = {
-      rule: { ...rule, result_type: "deviation" },
-      handleSubmit,
-      templatesLoaded,
-      isSubmitting,
-      template,
-      business_concept_id,
-      applyTemplate: applyTemplate(template),
-    };
-
-    const wrapper = shallowWithIntl(<RuleForm {...props} />);
-
-    findField(wrapper, "goal").simulate("change", eventMock, {
-      name: "goal",
-      value: "11",
-    });
-    expect(findLabel(wrapper, "goal").props().messages).toEqual([
-      "rule.form.validation.goal.less_eq.minimum",
-    ]);
-    findField(wrapper, "goal").simulate("change", eventMock, {
-      name: "goal",
-      value: "0",
-    });
-    expect(findLabel(wrapper, "goal").props().messages).toEqual(undefined);
-
-    findField(wrapper, "minimum").simulate("change", eventMock, {
-      name: "minimum",
-      value: "70",
-    });
-    findField(wrapper, "goal").simulate("change", eventMock, {
-      name: "goal",
-      value: "80",
-    });
-    expect(findLabel(wrapper, "minimum").props().messages).toEqual([
-      "rule.form.validation.minimum.greater_eq.goal",
-    ]);
-    expect(findLabel(wrapper, "goal").props().messages).toEqual([
-      "rule.form.validation.goal.less_eq.minimum",
-    ]);
-
-    findField(wrapper, "minimum").simulate("change", eventMock, {
-      name: "minimum",
-      value: "90",
-    });
-
-    expect(findLabel(wrapper, "minimum").props().messages).toEqual(undefined);
-    expect(findLabel(wrapper, "goal").props().messages).toEqual(undefined);
-
-    findField(wrapper, "minimum").simulate("change", eventMock, {
-      name: "minimum",
-      value: "101",
-    });
-
-    expect(findLabel(wrapper, "minimum").props().messages).toEqual([
-      "rule.form.validation.max_minimum",
-    ]);
-  });
-
-  it("shows correct messages for minimum and goal number ranges in a Rule with result_type numeric", () => {
-    const props = {
-      rule: { ...rule, result_type: "errors_number" },
-      handleSubmit,
-      templatesLoaded,
-      isSubmitting,
-      template,
-      business_concept_id,
-      applyTemplate: applyTemplate(template),
-    };
-
-    const wrapper = shallowWithIntl(<RuleForm {...props} />);
-
-    findField(wrapper, "goal").simulate("change", eventMock, {
-      name: "goal",
-      value: "4",
-    });
-    expect(findLabel(wrapper, "goal").props().messages).toEqual([
-      "rule.form.validation.goal.less_eq.minimum",
-    ]);
-    findField(wrapper, "goal").simulate("change", eventMock, {
-      name: "goal",
-      value: "1",
-    });
-    expect(findLabel(wrapper, "goal").props().messages).toEqual(undefined);
-
-    findField(wrapper, "minimum").simulate("change", eventMock, {
-      name: "minimum",
-      value: "5",
-    });
-    findField(wrapper, "goal").simulate("change", eventMock, {
-      name: "goal",
-      value: "10",
-    });
-    expect(findLabel(wrapper, "minimum").props().messages).toEqual([
-      "rule.form.validation.minimum.greater_eq.goal",
-    ]);
-    expect(findLabel(wrapper, "goal").props().messages).toEqual([
-      "rule.form.validation.goal.less_eq.minimum",
-    ]);
-
-    findField(wrapper, "minimum").simulate("change", eventMock, {
-      name: "minimum",
-      value: "15",
-    });
-
-    expect(findLabel(wrapper, "minimum").props().messages).toEqual(undefined);
-    expect(findLabel(wrapper, "goal").props().messages).toEqual(undefined);
-  });
-
   it("handles correctly active field", () => {
     const wrapper = shallowWithIntl(<RuleForm {...defaultProps} />);
 

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

@@ -6,6 +6,7 @@ const state = {
   authentication: { role: "admin" },
   rule: { id: 1, name: "foo" },
   ruleImplementation: {
+    rule_id: 1,
     implementation_key: "impl key",
     id: 1,
   },