@truedat/qx 7.5.7 → 7.5.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/qx",
-  "version": "7.5.7",
+  "version": "7.5.9",
   "description": "Truedat Web Quality Experience package",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -35,7 +35,7 @@
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "7.5.7",
+    "@truedat/test": "7.5.9",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -90,7 +90,7 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "7.5.7",
+    "@truedat/core": "7.5.9",
     "prop-types": "^15.8.1",
     "react-hook-form": "^7.45.4",
     "react-intl": "^5.20.10",
@@ -106,5 +106,5 @@
   "overrides": {
     "jsdom": "26.0.0"
   },
-  "gitHead": "01b1e4eb176b2c491750b524988e32094413515c"
+  "gitHead": "03770e3241daa955de2e6e40fdaea91e3d147860"
 }

package/src/components/__tests__/__fixtures__/helper.js

@@ -59,17 +59,16 @@ export const messages = {
     "quality_control.actions.execution.confirmation.content":
       "This quality control will be executed. Are you sure?",
     "quality_control.control_properties.empty": "Empty control properties",
-    "quality_control.error_count.errors_resource.empty": "Empty Dataset",
+    "quality_control.count.errors_resource.empty": "Empty Dataset",
     "quality_control.control_mode.deviation": "Deviation",
-    "quality_control.control_mode.error_count": "Error count",
+    "quality_control.control_mode.count": "count",
     "quality_control.control_mode.percentage": "Percentage",
     "quality_control.control_mode": "Control mode",
-    "quality_control.error_count.errors_resource": "Dataset",
+    "quality_control.count.errors_resource": "Dataset",
     "quality_control.form.active": "Enable",
     "quality_control.form.control_properties.ratio.resource": "Dataset",
     "quality_control.form.control_properties.ratio.validation": "Validation",
-    "quality_control.form.control_properties.error_count.errors_resource":
-      "Dataset",
+    "quality_control.form.control_properties.count.errors_resource": "Dataset",
     "quality_control.form.control_properties": "Implementation",
     "quality_control.form.domain_ids": "Domains",
     "quality_control.form.information": "Information",
@@ -83,8 +82,8 @@ export const messages = {
     "quality_control.score_criteria.deviation.goal": "Goal",
     "quality_control.score_criteria.deviation.maximum": "Threshold",
     "quality_control.score_criteria.empty": "No result criteria defined",
-    "quality_control.score_criteria.error_count.goal": "Goal",
-    "quality_control.score_criteria.error_count.maximum": "Threshold",
+    "quality_control.score_criteria.count.goal": "Goal",
+    "quality_control.score_criteria.count.maximum": "Threshold",
     "quality_control.score_criteria.percentage.goal": "Goal",
     "quality_control.score_criteria.percentage.minimum": "Threshold",
     "quality_control.score_criteria": "Result criteria",

package/src/components/common/expressions/__tests__/Expression.spec.js

@@ -21,19 +21,18 @@ const renderOpts = {
 };
 
 describe("<Expression />", () => {
-  it("matches the latest snapshot", () => {
-    const { container } = render(
+  it("matches the latest snapshot", async () => {
+    const { container, queryByText } = render(
       <TestFormWrapper>
         <Expression />
       </TestFormWrapper>,
       renderOpts
     );
+    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
     expect(container).toMatchSnapshot();
   });
-
   it("shape function expression", async () => {
     const watcher = jest.fn();
-
     const functions = [
       {
         name: "eq",
@@ -44,13 +43,11 @@ describe("<Expression />", () => {
         ],
       },
     ];
-
     const defaultValues = {
       test: {
         shape: "function",
       },
     };
-
     const { container, getByRole, getAllByRole, queryByText } = render(
       <TestFormWrapper
         watcher={watcher}
@@ -63,13 +60,9 @@ describe("<Expression />", () => {
     );
     const listboxes = await waitFor(() => getAllByRole("listbox"));
     const listbox = listboxes[0];
-
     userEvent.click(listbox);
-
     const option = await waitFor(() => getByRole("option", { name: /eq/i }));
-
     userEvent.click(option);
-
     expect(watcher).toHaveBeenLastCalledWith({
       test: {
         shape: "function",
@@ -80,13 +73,10 @@ describe("<Expression />", () => {
       },
     });
     await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-
     expect(container).toMatchSnapshot();
   });
-
   it("shape constant expression", async () => {
     const watcher = jest.fn();
-
     const { container, getByRole, getAllByRole, queryByText } = render(
       <TestFormWrapper watcher={watcher} context={{ type: "boolean" }}>
         <Expression />
@@ -95,7 +85,6 @@ describe("<Expression />", () => {
     );
     userEvent.click(getAllByRole("listbox")[0]);
     userEvent.click(getByRole("option", { name: /constant/i }));
-
     expect(watcher).toHaveBeenLastCalledWith({
       test: {
         shape: "constant",
@@ -104,21 +93,16 @@ describe("<Expression />", () => {
         },
       },
     });
-
     await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument(), {
       timeout: 10000,
     });
-
     expect(container).toMatchSnapshot();
   });
-
   it("shape param expression", async () => {
     const watcher = jest.fn();
-
     const defaultValues = {
       params: [{ name: "param1", type: "boolean", id: 1 }],
     };
-
     const { container, getByRole, getAllByRole, queryByText } = render(
       <TestFormWrapper
         watcher={watcher}
@@ -131,16 +115,13 @@ describe("<Expression />", () => {
     );
     userEvent.click(getAllByRole("listbox")[0]);
     userEvent.click(getByRole("option", { name: /param/i }));
-
     expect(watcher).toHaveBeenLastCalledWith({
       params: [{ name: "param1", type: "boolean", id: 1 }],
       test: { shape: "param", value: { id: undefined } },
     });
-
     await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument(), {
       timeout: 10000,
     });
-
     expect(container).toMatchSnapshot();
   });
 });

package/src/components/common/expressions/__tests__/ShapeSelector.spec.js

@@ -17,26 +17,27 @@ const renderOpts = {
 };
 
 describe("<ShapeSelector />", () => {
-  it("matches the latest snapshot", () => {
+  it("matches the latest snapshot", async () => {
     const defaultValues = {
       params: [{ name: "param1", type: "boolean", id: 1 }],
     };
-    const { container } = render(
+    const { container, queryByText } = render(
       <TestFormWrapper defaultValues={defaultValues}>
         <ShapeSelector />
       </TestFormWrapper>,
       renderOpts
     );
+
+    await waitFor(() =>
+      expect(queryByText(/loading/i)).not.toBeInTheDocument()
+    );
     expect(container).toMatchSnapshot();
   });
-
   it("user interaction select param", async () => {
     const watcher = jest.fn();
-
     const defaultValues = {
       params: [{ name: "param1", type: "boolean", id: 1 }],
     };
-
     const { container, queryByText, getByRole } = render(
       <TestFormWrapper
         watcher={watcher}
@@ -50,9 +51,7 @@ describe("<ShapeSelector />", () => {
     await waitFor(() =>
       expect(queryByText(/loading/i)).not.toBeInTheDocument()
     );
-
     userEvent.click(await getByRole("option", { name: /param/i }));
-
     expect(watcher).toHaveBeenLastCalledWith({
       params: [
         {
@@ -63,13 +62,10 @@ describe("<ShapeSelector />", () => {
       ],
       test: { shape: "param", value: { isCondition: undefined } },
     });
-
     expect(container).toMatchSnapshot();
   });
-
   it("user interaction select constant", async () => {
     const watcher = jest.fn();
-
     const { container, queryByText, getByRole } = render(
       <TestFormWrapper watcher={watcher} context={{ type: "boolean" }}>
         <ShapeSelector />
@@ -79,19 +75,14 @@ describe("<ShapeSelector />", () => {
     await waitFor(() =>
       expect(queryByText(/loading/i)).not.toBeInTheDocument()
     );
-
     userEvent.click(await getByRole("option", { name: /constant/i }));
-
     expect(watcher).toHaveBeenLastCalledWith({
       test: { shape: "constant", value: { isCondition: undefined } },
     });
-
     expect(container).toMatchSnapshot();
   });
-
   it("user interaction select function", async () => {
     const watcher = jest.fn();
-
     const { container, queryByText, getByRole } = render(
       <TestFormWrapper watcher={watcher} context={{ type: "boolean" }}>
         <ShapeSelector />
@@ -101,13 +92,10 @@ describe("<ShapeSelector />", () => {
     await waitFor(() =>
       expect(queryByText(/loading/i)).not.toBeInTheDocument()
     );
-
     userEvent.click(await getByRole("option", { name: /function/i }));
-
     expect(watcher).toHaveBeenLastCalledWith({
       test: { shape: "function", value: { isCondition: undefined } },
     });
-
     expect(container).toMatchSnapshot();
   });
 });

package/src/components/dataViews/queryableProperties/__tests__/SelectField.spec.js

@@ -46,7 +46,6 @@ describe("<SelectField />", () => {
     );
     expect(container).toMatchSnapshot();
   });
-
   it("matches the latest snapshot for group_by", async () => {
     const { container, queryByText } = render(
       <TestFormWrapper
@@ -75,7 +74,6 @@ describe("<SelectField />", () => {
     );
     expect(container).toMatchSnapshot();
   });
-
   it("handles delete", async () => {
     const onDelete = jest.fn();
     const { getByRole, getAllByRole } = render(
@@ -100,15 +98,12 @@ describe("<SelectField />", () => {
       </TestFormWrapper>,
       renderOpts
     );
-
     userEvent.hover(getAllByRole("textbox")[0]);
     userEvent.unhover(getAllByRole("textbox")[0]);
     userEvent.hover(getAllByRole("textbox")[0]);
-
     await act(async () => {
       userEvent.click(getByRole("button", { name: /delete/i }));
     });
-
     expect(onDelete).toHaveBeenCalledTimes(1);
   });
 });

package/src/components/qualityControls/ControlProperties.js

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { useFormContext } from "react-hook-form";
 import { Segment } from "semantic-ui-react";
 import QxContext from "@truedat/qx/components/QxContext";
-import ErrorCount from "./controlProperties/ErrorCount";
+import Count from "./controlProperties/Count";
 import Ratio from "./controlProperties/Ratio";
 
 export default function ControlProperties() {
@@ -12,8 +12,9 @@ export default function ControlProperties() {
   const { control_mode: controlMode, source_id: sourceId } = watch();
 
   const componentForMode = {
-    error_count: <ErrorCount />,
+    count: <Count />,
     deviation: <Ratio />,
+    error_count: <Ratio />,
     percentage: <Ratio />,
   };
 
@@ -28,7 +29,7 @@ export default function ControlProperties() {
 
 export const defaultForMode = (controlMode) => {
   switch (controlMode) {
-    case "error_count":
+    case "count":
       return { errors_resource: null };
     default:
       return {

package/src/components/qualityControls/ControlPropertiesView.js

@@ -14,8 +14,9 @@ export default function ControlPropertiesView({ qualityControl }) {
     deviation: (
       <ControlPropertiesRatio controlProperties={control_properties} />
     ),
+    count: <ControlPropertiesCount controlProperties={control_properties} />,
     error_count: (
-      <ControlPropertiesErrorCount controlProperties={control_properties} />
+      <ControlPropertiesRatio controlProperties={control_properties} />
     ),
   };
 
@@ -78,11 +79,11 @@ const ControlPropertiesRatio = ({ controlProperties }) => (
   </List>
 );
 
-const ControlPropertiesErrorCount = ({ controlProperties }) => (
+const ControlPropertiesCount = ({ controlProperties }) => (
   <List>
     <List.Item>
       <List.Header>
-        <FormattedMessage id="quality_control.error_count.errors_resource" />
+        <FormattedMessage id="quality_control.count.errors_resource" />
       </List.Header>
       <List.Content>
         {controlProperties.errors_resource ? (
@@ -97,7 +98,7 @@ const ControlPropertiesErrorCount = ({ controlProperties }) => (
             </Label>
           </List.Description>
         ) : (
-          <FormattedMessage id="quality_control.error_count.errors_resource.empty" />
+          <FormattedMessage id="quality_control.count.errors_resource.empty" />
         )}
       </List.Content>
     </List.Item>

package/src/components/qualityControls/QualityBadge.js

@@ -76,11 +76,20 @@ export const QualityBadgeForSearch = ({
           value2: criteria.maximum,
           text: `${latestScore.result}%`,
         }
-      : {
+      : controlMode == "error_count"
+      ? {
           color: color,
           label1: "quality_control.score_criteria.error_count.goal",
-          value1: criteria?.goal,
+          value1: criteria.goal,
           label2: "quality_control.score_criteria.error_count.maximum",
+          value2: criteria.maximum,
+          text: latestScore?.result,
+        }
+      : {
+          color: color,
+          label1: "quality_control.score_criteria.count.goal",
+          value1: criteria?.goal,
+          label2: "quality_control.score_criteria.count.maximum",
           value2: criteria?.maximum,
           text: latestScore?.result,
         };

package/src/components/qualityControls/QualityControlEditor.js

@@ -70,7 +70,7 @@ export default function QualityControlEditor({
     key: v,
     value: v,
     text: formatMessage({ id: `quality_control.control_mode.${v}` }),
-  }))(["percentage", "deviation", "error_count"]);
+  }))(["percentage", "deviation", "error_count", "count"]);
 
   return (
     <Fragment>

package/src/components/qualityControls/ScoreCriteria.js

@@ -5,6 +5,7 @@ import QxContext from "@truedat/qx/components/QxContext";
 
 import Deviation from "./scoreCriterias/Deviation";
 import ErrorCount from "./scoreCriterias/ErrorCount";
+import Count from "./scoreCriterias/Count";
 import Percentage from "./scoreCriterias/Percentage";
 
 export default function ScoreCriteria() {
@@ -15,6 +16,7 @@ export default function ScoreCriteria() {
 
   const scoreCriteriaForMode = {
     deviation: <Deviation />,
+    count: <Count />,
     error_count: <ErrorCount />,
     percentage: <Percentage />,
   };
@@ -32,6 +34,8 @@ export const defaultForMode = (controlMode) => {
   switch (controlMode) {
     case "deviation":
       return { goal: null, maximum: null };
+    case "count":
+      return { goal: null, maximum: null };
     case "error_count":
       return { goal: null, maximum: null };
     case "percentage":

package/src/components/qualityControls/ScoreCriteriaView.js

@@ -5,10 +5,32 @@ import { Header, Icon, Segment, List } from "semantic-ui-react";
 
 export default function ScoreCriteriaView({ qualityControl }) {
   const { score_criteria, control_mode } = qualityControl;
+
   const scoreCriteriaForMode = {
-    percentage: <ScoreCriteriaPercentage scoreCriteria={score_criteria} />,
-    deviation: <ScoreCriteriaDeviation scoreCriteria={score_criteria} />,
-    error_count: <ScoreCriteriaErrorCount scoreCriteria={score_criteria} />,
+    percentage: (
+      <ScoreCriteriaContent
+        goal={`${score_criteria?.goal}%`}
+        threshold={`${score_criteria?.minimum}%`}
+      />
+    ),
+    deviation: (
+      <ScoreCriteriaContent
+        goal={`${score_criteria?.goal}%`}
+        threshold={`${score_criteria?.maximum}%`}
+      />
+    ),
+    error_count: (
+      <ScoreCriteriaContent
+        goal={score_criteria?.goal}
+        threshold={score_criteria?.maximum}
+      />
+    ),
+    count: (
+      <ScoreCriteriaContent
+        goal={score_criteria?.goal}
+        threshold={score_criteria?.maximum}
+      />
+    ),
   };
 
   return (
@@ -30,53 +52,11 @@ export default function ScoreCriteriaView({ qualityControl }) {
   );
 }
 
-const ScoreCriteriaPercentage = ({ scoreCriteria }) => (
-  <List>
-    <List.Item>
-      <Icon name="circle" color="green" />
-      <List.Content>
-        <List.Header>
-          <FormattedMessage id="quality.goal" />
-        </List.Header>
-        <List.Description>{scoreCriteria.goal}%</List.Description>
-      </List.Content>
-    </List.Item>
-    <List.Item>
-      <Icon name="circle" color="yellow" />
-      <List.Content>
-        <List.Header>
-          <FormattedMessage id="quality.threshold" />
-        </List.Header>
-        <List.Description>{scoreCriteria.minimum}%</List.Description>
-      </List.Content>
-    </List.Item>
-  </List>
-);
-
-const ScoreCriteriaDeviation = ({ scoreCriteria }) => (
-  <List>
-    <List.Item>
-      <Icon name="circle" color="green" />
-      <List.Content>
-        <List.Header>
-          <FormattedMessage id="quality.goal" />
-        </List.Header>
-        <List.Description>{scoreCriteria.goal}%</List.Description>
-      </List.Content>
-    </List.Item>
-    <List.Item>
-      <Icon name="circle" color="yellow" />
-      <List.Content>
-        <List.Header>
-          <FormattedMessage id="quality.threshold" />
-        </List.Header>
-        <List.Description>{scoreCriteria.maximum}%</List.Description>
-      </List.Content>
-    </List.Item>
-  </List>
-);
+ScoreCriteriaView.propTypes = {
+  qualityControl: PropTypes.object,
+};
 
-const ScoreCriteriaErrorCount = ({ scoreCriteria }) => (
+const ScoreCriteriaContent = ({ goal, threshold }) => (
   <List>
     <List.Item>
       <Icon name="circle" color="green" />
@@ -84,7 +64,7 @@ const ScoreCriteriaErrorCount = ({ scoreCriteria }) => (
         <List.Header>
           <FormattedMessage id="quality.goal" />
         </List.Header>
-        <List.Description>{scoreCriteria.goal}</List.Description>
+        <List.Description>{goal}</List.Description>
       </List.Content>
     </List.Item>
     <List.Item>
@@ -93,12 +73,13 @@ const ScoreCriteriaErrorCount = ({ scoreCriteria }) => (
         <List.Header>
           <FormattedMessage id="quality.threshold" />
         </List.Header>
-        <List.Description>{scoreCriteria.maximum}</List.Description>
+        <List.Description>{threshold}</List.Description>
       </List.Content>
     </List.Item>
   </List>
 );
 
-ScoreCriteriaView.propTypes = {
-  qualityControl: PropTypes.object,
+ScoreCriteriaContent.propTypes = {
+  goal: PropTypes.string,
+  threshold: PropTypes.string,
 };

package/src/components/qualityControls/__tests__/ControlProperties.spec.js

@@ -48,13 +48,13 @@ describe("<ControlProperties />", () => {
     expect(container).toMatchSnapshot();
   });
 
-  it("matches the latest snapshot with error count", async () => {
-    const errorCountDefaultValues = {
+  it("matches the latest snapshot with count", async () => {
+    const countDefaultValues = {
       ...defaultValues,
-      control_mode: "error_count",
+      control_mode: "count",
     };
     const { container } = render(
-      <TestFormWrapper defaultValues={errorCountDefaultValues}>
+      <TestFormWrapper defaultValues={countDefaultValues}>
         <ControlProperties />
       </TestFormWrapper>,
       renderOpts
@@ -67,8 +67,8 @@ describe("<ControlProperties />", () => {
 });
 
 describe("defaultForMode", () => {
-  it("returns correct default for 'error_count' control mode", () => {
-    const result = defaultForMode("error_count");
+  it("returns correct default for 'count' control mode", () => {
+    const result = defaultForMode("count");
     expect(result).toEqual({ errors_resource: null });
   });
 

package/src/components/qualityControls/__tests__/ControlPropertiesView.spec.js

@@ -20,10 +20,10 @@ describe("<ControlPropertiesView />", () => {
     expect(container).toMatchSnapshot();
   });
 
-  it("matches the latest snapshot for error count", async () => {
-    const errorCountQualityControl = {
+  it("matches the latest snapshot for count", async () => {
+    const countQualityControl = {
       ...qualityControl,
-      control_mode: "error_count",
+      control_mode: "count",
       control_properties: {
         errors_resource: {
           id: 11859650,
@@ -33,7 +33,7 @@ describe("<ControlPropertiesView />", () => {
     };
     const { container } = render(
       <TestFormWrapper>
-        <ControlPropertiesView qualityControl={errorCountQualityControl} />
+        <ControlPropertiesView qualityControl={countQualityControl} />
       </TestFormWrapper>,
       renderOpts
     );
@@ -58,7 +58,7 @@ describe("<ControlPropertiesView />", () => {
         <ControlPropertiesView
           qualityControl={{
             ...qualityControl,
-            control_mode: "error_count",
+            control_mode: "count",
             control_properties: { errors_resource: null },
           }}
         />

package/src/components/qualityControls/__tests__/NewQualityControl.spec.js

@@ -65,6 +65,11 @@ const referenceDatasetsMock = {
           name: "dataset1",
           headers: ["campo1", "campo2"],
         },
+        {
+          id: "8",
+          name: "patito",
+          headers: ["pasto1", "pasto2"],
+        },
       ],
       loading: false,
     },
@@ -190,6 +195,13 @@ describe("<NewQualityControl />", () => {
     userEvent.click(getByText(/Reference datasets/));
     userEvent.click(getByRole("option", { name: /dataset1/i }));
 
+    await waitFor(() =>
+      expect(queryByText(/loading/i)).not.toBeInTheDocument()
+    );
+    await waitFor(() =>
+      expect(container.querySelector(".loader")).not.toBeInTheDocument()
+    );
+
     userEvent.click(getAllByRole("option", { name: /campo1/i })[0]);
     userEvent.click(getByRole("option", { name: /eq/i }));
     userEvent.click(getAllByRole("option", { name: /campo2/i })[1]);
@@ -314,9 +326,10 @@ describe("<NewQualityControl />", () => {
 
     // Select a source
     userEvent.click(getByText(/Select source/));
+
     userEvent.click(getByRole("option", { name: /external_source_id/i }));
 
-    userEvent.click(getByRole("option", { name: /Error count/i }));
+    userEvent.click(getByRole("option", { name: /^count$/i }));
 
     // Fill in the 'Goal' field
     userEvent.type(getByPlaceholderText("Goal"), "25");
@@ -348,7 +361,7 @@ describe("<NewQualityControl />", () => {
           domain_ids: ["2"],
           df_type: "template1",
           source_id: 181,
-          control_mode: "error_count",
+          control_mode: "count",
           dynamic_content: {},
           control_properties: {
             errors_resource: {