@truedat/qx 7.5.7 → 7.5.10

package/src/components/qualityControls/__tests__/__snapshots__/QualityControls.spec.js.snap

@@ -15,11 +15,11 @@ exports[`<QualityControls /> matches the latest snapshot 1`] = `
       <div
         class="content"
       >
-        Quality Controls
+        quality_controls.header
         <div
           class="sub header"
         >
-          List and edit quality controls
+          quality_controls.subheader
         </div>
       </div>
     </h2>
@@ -37,7 +37,7 @@ exports[`<QualityControls /> matches the latest snapshot 1`] = `
             class="search link icon"
           />
           <input
-            placeholder="Search..."
+            placeholder="search.placeholder"
             type="text"
             value=""
           />
@@ -93,7 +93,6 @@ exports[`<QualityControls /> matches the latest snapshot 1`] = `
               readonly=""
               tabindex="0"
               type="checkbox"
-              value=""
             />
             <label
               for="execute_checkbox"
@@ -104,14 +103,15 @@ exports[`<QualityControls /> matches the latest snapshot 1`] = `
             disabled=""
             tabindex="-1"
           >
-            Execute quality control
+            quality_control.actions.do_execution
           </button>
           <a
             class="ui primary button"
+            data-discover="true"
             href="/qualityControls/new"
             role="button"
           >
-            Create control
+            quality_controls.actions.create
           </a>
         </div>
       </div>
@@ -119,22 +119,11 @@ exports[`<QualityControls /> matches the latest snapshot 1`] = `
     <div
       class="ui label quality-controls-label-results"
     >
-      1 quality controls found
+      quality_controls.retrieved.results
     </div>
     <div
       class="dimmable"
     >
-      <div
-        class="ui inverted dimmer"
-      >
-        <div
-          class="content"
-        >
-          <div
-            class="ui loader"
-          />
-        </div>
-      </div>
       <table
         class="ui sortable table"
       >
@@ -147,7 +136,7 @@ exports[`<QualityControls /> matches the latest snapshot 1`] = `
             <th
               class=""
             >
-              Name
+              name
             </th>
             <th
               class="two wide"
@@ -186,6 +175,7 @@ exports[`<QualityControls /> matches the latest snapshot 1`] = `
               class=""
             >
               <a
+                data-discover="true"
                 href="/qualityControls/8/version/1"
               >
                 test
@@ -199,12 +189,12 @@ exports[`<QualityControls /> matches the latest snapshot 1`] = `
             <td
               class=""
             >
-              Percentage
+              quality_control.control_mode.percentage
             </td>
             <td
               class=""
             >
-              Published
+              quality_control.status.published
             </td>
             <td
               class=""

package/src/components/qualityControls/__tests__/__snapshots__/QualityControlsTable.spec.js.snap

@@ -53,6 +53,7 @@ exports[`<QualityControlsTable /> matches the latest snapshot 1`] = `
           class=""
         >
           <a
+            data-discover="true"
             href="/qualityControls/8/version/1"
           >
             test
@@ -99,6 +100,7 @@ exports[`<QualityControlsTable /> matches the latest snapshot 1`] = `
           class=""
         >
           <a
+            data-discover="true"
             href="/qualityControls/9/version/1"
           >
             Foo

package/src/components/qualityControls/__tests__/__snapshots__/ScoreCriteria.spec.js.snap

@@ -63,7 +63,7 @@ exports[`<ScoreCriteria /> matches the latest snapshot for deviation 1`] = `
 
 exports[`<ScoreCriteria /> matches the latest snapshot for empty controlMode 1`] = `<div />`;
 
-exports[`<ScoreCriteria /> matches the latest snapshot for error_count 1`] = `
+exports[`<ScoreCriteria /> matches the latest snapshot for count 1`] = `
 <div>
   <div
     class="ui segment"

package/src/components/qualityControls/__tests__/__snapshots__/ScoreCriteriaView.spec.js.snap

@@ -41,8 +41,7 @@ exports[`<ScoreCriteriaView /> matches the latest snapshot for percentage 1`] =
           <div
             class="description"
           >
-            20
-            %
+            20%
           </div>
         </div>
       </div>
@@ -65,8 +64,7 @@ exports[`<ScoreCriteriaView /> matches the latest snapshot for percentage 1`] =
           <div
             class="description"
           >
-            10
-            %
+            10%
           </div>
         </div>
       </div>

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

@@ -154,13 +154,13 @@ describe("qualityByControlMode", () => {
     expect(qualityByControlMode(score)).toEqual(result);
   });
 
-  it("returns correct object when controlMode is error_count with green", () => {
+  it("returns correct object when controlMode is count with green", () => {
     const score = scoreData({
       score_content: {
-        error_count: 10,
+        count: 10,
       },
       quality_control: {
-        control_mode: "error_count",
+        control_mode: "count",
         score_criteria: {
           maximum: 30,
           goal: 20,
@@ -169,8 +169,8 @@ describe("qualityByControlMode", () => {
     });
     const result = {
       color: "green",
-      label1: "quality_control.score_criteria.error_count.goal",
-      label2: "quality_control.score_criteria.error_count.maximum",
+      label1: "quality_control.score_criteria.count.goal",
+      label2: "quality_control.score_criteria.count.maximum",
       text: 10,
       value1: 20,
       value2: 30,
@@ -178,13 +178,13 @@ describe("qualityByControlMode", () => {
     expect(qualityByControlMode(score)).toEqual(result);
   });
 
-  it("returns correct object when controlMode is error_count with yellow", () => {
+  it("returns correct object when controlMode is count with yellow", () => {
     const score = scoreData({
       score_content: {
-        error_count: 20,
+        count: 20,
       },
       quality_control: {
-        control_mode: "error_count",
+        control_mode: "count",
 
         score_criteria: {
           maximum: 30,
@@ -194,8 +194,8 @@ describe("qualityByControlMode", () => {
     });
     const result = {
       color: "yellow",
-      label1: "quality_control.score_criteria.error_count.goal",
-      label2: "quality_control.score_criteria.error_count.maximum",
+      label1: "quality_control.score_criteria.count.goal",
+      label2: "quality_control.score_criteria.count.maximum",
       text: 20,
       value1: 20,
       value2: 30,
@@ -203,13 +203,13 @@ describe("qualityByControlMode", () => {
     expect(qualityByControlMode(score)).toEqual(result);
   });
 
-  it("returns correct object when controlMode is error_count with red", () => {
+  it("returns correct object when controlMode is count with red", () => {
     const score = scoreData({
       score_content: {
-        error_count: 40,
+        count: 40,
       },
       quality_control: {
-        control_mode: "error_count",
+        control_mode: "count",
 
         score_criteria: {
           maximum: 30,
@@ -219,8 +219,8 @@ describe("qualityByControlMode", () => {
     });
     const result = {
       color: "red",
-      label1: "quality_control.score_criteria.error_count.goal",
-      label2: "quality_control.score_criteria.error_count.maximum",
+      label1: "quality_control.score_criteria.count.goal",
+      label2: "quality_control.score_criteria.count.maximum",
       text: 40,
       value1: 20,
       value2: 30,
@@ -231,7 +231,7 @@ describe("qualityByControlMode", () => {
   it("returns correct object when controlMode is not defined", () => {
     const score = scoreData({
       score_content: {
-        error_count: 10,
+        count: 10,
       },
       quality_control: {
         control_mode: "foo",

package/src/components/qualityControls/controlProperties/{ErrorCount.js → Count.js}

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useContext } from "react";
+import { use } from "react";
 import { useQuery } from "@apollo/client";
 import { useFormContext } from "react-hook-form";
 import { Loading } from "@truedat/core/components";
@@ -10,12 +10,11 @@ import { useDataViews } from "@truedat/qx/hooks/useDataViews";
 import { useFunctions } from "@truedat/qx/hooks/useFunctions";
 import ResourceSelector from "@truedat/qx/components/common/ResourceSelector";
 
-export default function ErrorCount() {
-  const { field } = useContext(QxContext);
+export default function Count() {
+  const { field } = use(QxContext);
   const { watch } = useFormContext();
 
   const formData = watch();
-
   const { source_id: sourceId } = formData;
 
   const { data, loading: dataViewsLoading } = useDataViews();
@@ -33,6 +32,7 @@ export default function ErrorCount() {
     _.sortBy([({ name }) => lowerDeburrTrim(name), "name"]),
     _.map((row) => ({ ...row, id: Number(row?.id) }))
   )(referenceDatasetsData);
+
   const context = {
     dataViews,
     referenceDatasets,
@@ -43,14 +43,14 @@ export default function ErrorCount() {
     <Loading />
   ) : (
     <>
-      <QxContext.Provider
+      <QxContext
         value={{ ...context, sourceId, field: `${field}.errors_resource` }}
       >
         <ResourceSelector
           required
-          labelId="quality_control.form.control_properties.error_count.errors_resource"
+          labelId="quality_control.form.control_properties.count.errors_resource"
         />
-      </QxContext.Provider>
+      </QxContext>
     </>
   );
 }

package/src/components/qualityControls/controlProperties/Ratio.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useContext } from "react";
+import { use } from "react";
 import { useQuery } from "@apollo/client";
 import { useFormContext } from "react-hook-form";
 import { Loading } from "@truedat/core/components";
@@ -13,7 +13,7 @@ import ResourceSelector from "@truedat/qx/components/common/ResourceSelector";
 import { Clauses } from "@truedat/qx/components/common/expressions";
 
 export default function Ratio() {
-  const { field } = useContext(QxContext);
+  const { field } = use(QxContext);
   const { watch } = useFormContext();
 
   const formData = watch();
@@ -52,17 +52,15 @@ export default function Ratio() {
     <Loading />
   ) : (
     <>
-      <QxContext.Provider
-        value={{ ...context, sourceId, field: `${field}.resource` }}
-      >
+      <QxContext value={{ ...context, sourceId, field: `${field}.resource` }}>
         <ResourceSelector
           required
           labelId="quality_control.form.control_properties.ratio.resource"
         />
-      </QxContext.Provider>
+      </QxContext>
       {resource?.id ? (
         <div className="vertical-space">
-          <QxContext.Provider
+          <QxContext
             value={{
               ...context,
               sourceId,
@@ -71,7 +69,7 @@ export default function Ratio() {
             }}
           >
             <Clauses labelId="quality_control.form.control_properties.ratio.validation" />
-          </QxContext.Provider>
+          </QxContext>
         </div>
       ) : null}
     </>

package/src/components/qualityControls/controlProperties/__tests__/{ErrorCount.spec.js → Count.spec.js}

@@ -1,9 +1,7 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import { waitFor } from "@testing-library/react";
-import { REFERENCE_DATASETS_HEADERS_QUERY } from "@truedat/dd/api/queries";
+import { render, waitForLoad } from "@truedat/test/render";
 import TestFormWrapper from "@truedat/qx/components/common/TestFormWrapper";
-import ErrorCount from "../ErrorCount";
+import { REFERENCE_DATASETS_HEADERS_QUERY } from "@truedat/dd/api/queries";
+import Count from "../Count";
 
 jest.mock("@truedat/qx/hooks/useDataViews", () => {
   const originalModule = jest.requireActual("@truedat/qx/hooks/useDataViews");
@@ -31,25 +29,14 @@ const dataSet = {
   name: "dataset1",
   headers: ["campo1", "campo2"],
 };
+
 const referenceDatasetsMock = {
   request: { query: REFERENCE_DATASETS_HEADERS_QUERY },
   result: { data: { referenceDatasets: [dataSet], loading: false } },
 };
 
-const messages = {
-  en: {
-    "quality_control.form.control_properties.error_count.errors_resource":
-      "Dataset",
-    "queryables.resource.type": "Resource type",
-    "queryables.resource.type.data_structure": "Data structures",
-    "queryables.resource.type.reference_dataset": "Reference datasets",
-  },
-};
-
 const renderOpts = {
   mocks: [referenceDatasetsMock],
-  fallback: "lazy",
-  messages,
 };
 
 const context = {
@@ -65,18 +52,15 @@ const context = {
   ],
 };
 
-describe("<ErrorCount />", () => {
+describe("<Count />", () => {
   it("matches the latest snapshot", async () => {
-    const { container, queryByText } = render(
+    const rendered = render(
       <TestFormWrapper context={context}>
-        <ErrorCount />
+        <Count />
       </TestFormWrapper>,
       renderOpts
     );
-    await waitFor(() => {
-      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
-      expect(container.querySelector(".loader")).not.toBeInTheDocument();
-    });
-    expect(container).toMatchSnapshot();
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/components/qualityControls/controlProperties/__tests__/Ratio.spec.js

@@ -1,6 +1,6 @@
-import React from "react";
-import { render } from "@truedat/test/render";
+import userEvent from "@testing-library/user-event";
 import { waitFor } from "@testing-library/react";
+import { render, waitForLoad } from "@truedat/test/render";
 import { REFERENCE_DATASETS_HEADERS_QUERY } from "@truedat/dd/api/queries";
 import TestFormWrapper from "@truedat/qx/components/common/TestFormWrapper";
 import Ratio from "../Ratio";
@@ -31,26 +31,14 @@ const dataSet = {
   name: "dataset1",
   headers: ["campo1", "campo2"],
 };
+
 const referenceDatasetsMock = {
   request: { query: REFERENCE_DATASETS_HEADERS_QUERY },
   result: { data: { referenceDatasets: [dataSet], loading: false } },
 };
 
-const messages = {
-  en: {
-    "quality_control.form.control_properties.ratio.resource": "Dataset",
-    "queryables.resource.type": "Resource type",
-    "queryables.resource.type.data_structure": "Data structures",
-    "queryables.resource.type.reference_dataset": "Reference datasets",
-    "expression.clause.action.addGroup": "Add group",
-    "quality_control.form.control_properties.ratio.validation": "Validation",
-  },
-};
-
 const renderOpts = {
   mocks: [referenceDatasetsMock],
-  fallback: "lazy",
-  messages,
 };
 
 const defaultValues = {
@@ -78,18 +66,15 @@ const context = {
 
 describe("<Ratio />", () => {
   it("matches the latest snapshot", async () => {
-    const { container, queryByText } = render(
+    const rendered = render(
       <TestFormWrapper context={context} defaultValues={defaultValues}>
         <Ratio />
       </TestFormWrapper>,
       renderOpts
     );
-    await waitFor(() => {
-      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
-      expect(container.querySelector(".loader")).not.toBeInTheDocument();
-    });
+    await waitForLoad(rendered);
 
-    expect(container).toMatchSnapshot();
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("matches the latest snapshot when there is not resource", async () => {
@@ -99,17 +84,14 @@ describe("<Ratio />", () => {
         resource: {},
       },
     };
-    const { container, queryByText } = render(
+    const rendered = render(
       <TestFormWrapper context={context} defaultValues={newDefaultValues}>
         <Ratio />
       </TestFormWrapper>,
       renderOpts
     );
-    await waitFor(() => {
-      expect(queryByText(/lazy/i)).not.toBeInTheDocument();
-      expect(container.querySelector(".loader")).not.toBeInTheDocument();
-    });
+    await waitForLoad(rendered);
 
-    expect(container).toMatchSnapshot();
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/components/qualityControls/controlProperties/__tests__/__snapshots__/{ErrorCount.spec.js.snap → Count.spec.js.snap}

@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<ErrorCount /> matches the latest snapshot 1`] = `
+exports[`<Count /> matches the latest snapshot 1`] = `
 <div>
   <div
     class="required field"
   >
     <label>
-      Dataset
+      quality_control.form.control_properties.count.errors_resource
     </label>
     <div
       aria-expanded="false"
@@ -20,7 +20,7 @@ exports[`<ErrorCount /> matches the latest snapshot 1`] = `
         class="divider default text"
         role="alert"
       >
-        Resource type
+        queryables.resource.type
       </div>
       <i
         aria-hidden="true"
@@ -39,7 +39,7 @@ exports[`<ErrorCount /> matches the latest snapshot 1`] = `
           <span
             class="text"
           >
-            Data structures
+            queryables.resource.type.data_structure
           </span>
         </div>
         <div
@@ -52,7 +52,7 @@ exports[`<ErrorCount /> matches the latest snapshot 1`] = `
           <span
             class="text"
           >
-            Reference datasets
+            queryables.resource.type.reference_dataset
           </span>
         </div>
       </div>

package/src/components/qualityControls/controlProperties/__tests__/__snapshots__/Ratio.spec.js.snap

@@ -6,7 +6,7 @@ exports[`<Ratio /> matches the latest snapshot 1`] = `
     class="required field"
   >
     <label>
-      Dataset
+      quality_control.form.control_properties.ratio.resource
     </label>
     <div
       aria-expanded="false"
@@ -20,7 +20,7 @@ exports[`<Ratio /> matches the latest snapshot 1`] = `
         class="divider default text"
         role="alert"
       >
-        Resource type
+        queryables.resource.type
       </div>
       <i
         aria-hidden="true"
@@ -39,7 +39,7 @@ exports[`<Ratio /> matches the latest snapshot 1`] = `
           <span
             class="text"
           >
-            Data structures
+            queryables.resource.type.data_structure
           </span>
         </div>
         <div
@@ -52,7 +52,7 @@ exports[`<Ratio /> matches the latest snapshot 1`] = `
           <span
             class="text"
           >
-            Reference datasets
+            queryables.resource.type.reference_dataset
           </span>
         </div>
       </div>
@@ -65,7 +65,7 @@ exports[`<Ratio /> matches the latest snapshot 1`] = `
       class="field"
     >
       <label>
-        Validation
+        quality_control.form.control_properties.ratio.validation
       </label>
       <div
         class="ui horizontal divider"
@@ -73,7 +73,7 @@ exports[`<Ratio /> matches the latest snapshot 1`] = `
         <button
           class="ui mini button"
         >
-          Add group
+          expression.clause.action.addGroup
         </button>
       </div>
     </div>
@@ -87,7 +87,7 @@ exports[`<Ratio /> matches the latest snapshot when there is not resource 1`] =
     class="required field"
   >
     <label>
-      Dataset
+      quality_control.form.control_properties.ratio.resource
     </label>
     <div
       aria-expanded="false"
@@ -101,7 +101,7 @@ exports[`<Ratio /> matches the latest snapshot when there is not resource 1`] =
         class="divider default text"
         role="alert"
       >
-        Resource type
+        queryables.resource.type
       </div>
       <i
         aria-hidden="true"
@@ -120,7 +120,7 @@ exports[`<Ratio /> matches the latest snapshot when there is not resource 1`] =
           <span
             class="text"
           >
-            Data structures
+            queryables.resource.type.data_structure
           </span>
         </div>
         <div
@@ -133,7 +133,7 @@ exports[`<Ratio /> matches the latest snapshot when there is not resource 1`] =
           <span
             class="text"
           >
-            Reference datasets
+            queryables.resource.type.reference_dataset
           </span>
         </div>
       </div>