@truedat/qx 7.4.0 → 7.4.2

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

@@ -164,6 +164,11 @@ exports[`<QualityControls /> matches the latest snapshot 1`] = `
             >
               status
             </th>
+            <th
+              class="two wide disabled"
+            >
+              latest_score
+            </th>
             <th
               class="two wide"
             >
@@ -181,7 +186,7 @@ exports[`<QualityControls /> matches the latest snapshot 1`] = `
               class=""
             >
               <a
-                href="/qualityControls/8"
+                href="/qualityControls/8/version/1"
               >
                 test
               </a>
@@ -201,6 +206,15 @@ exports[`<QualityControls /> matches the latest snapshot 1`] = `
             >
               Published
             </td>
+            <td
+              class=""
+            >
+              <i
+                aria-hidden="true"
+                class="green circle icon"
+              />
+              100%
+            </td>
             <td
               class="center aligned"
             >

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

@@ -31,6 +31,11 @@ exports[`<QualityControlsTable /> matches the latest snapshot 1`] = `
         >
           status
         </th>
+        <th
+          class="two wide disabled"
+        >
+          latest_score
+        </th>
         <th
           class="two wide descending sorted"
         >
@@ -48,7 +53,7 @@ exports[`<QualityControlsTable /> matches the latest snapshot 1`] = `
           class=""
         >
           <a
-            href="/qualityControls/8"
+            href="/qualityControls/8/version/1"
           >
             test
           </a>
@@ -68,6 +73,15 @@ exports[`<QualityControlsTable /> matches the latest snapshot 1`] = `
         >
           Draft
         </td>
+        <td
+          class=""
+        >
+          <i
+            aria-hidden="true"
+            class="green circle icon"
+          />
+          100%
+        </td>
         <td
           class="center aligned"
         >
@@ -85,7 +99,7 @@ exports[`<QualityControlsTable /> matches the latest snapshot 1`] = `
           class=""
         >
           <a
-            href="/qualityControls/9"
+            href="/qualityControls/9/version/1"
           >
             Foo
           </a>
@@ -105,6 +119,15 @@ exports[`<QualityControlsTable /> matches the latest snapshot 1`] = `
         >
           Draft
         </td>
+        <td
+          class=""
+        >
+          <i
+            aria-hidden="true"
+            class="green circle icon"
+          />
+          100%
+        </td>
         <td
           class="center aligned"
         >

package/src/components/qualityControls/qualityByControlMode.js

@@ -4,7 +4,7 @@ export default function qualityByControlMode(score) {
   const controlMode = _.prop("quality_control.control_mode")(score);
   const scoreCriteria = _.prop("quality_control.score_criteria")(score);
   const scoreContent = _.prop("score_content")(score);
-
+  const noResultsMessage = _.prop("noResultsMessage")(score);
   if (score.status === "FAILED") return { isFailed: true };
   if (!scoreContent) return { isEmpty: true };
 
@@ -25,10 +25,17 @@ export default function qualityByControlMode(score) {
       };
     case "deviation":
       const deviationRatio =
-        (scoreContent.validation_count / scoreContent.total_count) * 100;
+        scoreContent.total_count == 0
+          ? null
+          : (scoreContent.validation_count / scoreContent.total_count) * 100;
+
+      const deviationResult =
+        scoreContent.total_count == 0 ? noResultsMessage : `${deviationRatio}%`;
       return {
         color:
-          deviationRatio < scoreCriteria.goal
+          scoreContent.total_count == 0
+            ? "grey"
+            : deviationRatio < scoreCriteria.goal
             ? "green"
             : deviationRatio < scoreCriteria.maximum
             ? "yellow"
@@ -37,14 +44,24 @@ export default function qualityByControlMode(score) {
         value1: scoreCriteria.goal,
         label2: "quality_control.score_criteria.deviation.maximum",
         value2: scoreCriteria.maximum,
-        text: `${deviationRatio}%`,
+        text: deviationResult,
       };
     case "percentage":
       const percentageRatio =
-        (scoreContent.validation_count / scoreContent.total_count) * 100;
+        scoreContent.total_count == 0
+          ? null
+          : (scoreContent.validation_count / scoreContent.total_count) * 100;
+
+      const percentageResult =
+        scoreContent.total_count == 0
+          ? noResultsMessage
+          : `${percentageRatio}%`;
+
       return {
         color:
-          percentageRatio > scoreCriteria.goal
+          scoreContent.total_count == 0
+            ? "grey"
+            : percentageRatio > scoreCriteria.goal
             ? "green"
             : percentageRatio > scoreCriteria.minimum
             ? "yellow"
@@ -53,7 +70,7 @@ export default function qualityByControlMode(score) {
         value1: scoreCriteria.minimum,
         label2: "quality_control.score_criteria.percentage.goal",
         value2: scoreCriteria.goal,
-        text: `${percentageRatio}%`,
+        text: percentageResult,
       };
 
     default:

package/src/components/qualityControls/qualityControlScoresColumns.js

@@ -1,5 +1,6 @@
 import _ from "lodash/fp";
 import React from "react";
+import PropTypes from "prop-types";
 import { Link } from "react-router-dom";
 import { FormattedMessage } from "react-intl";
 import { DateDecorator } from "@truedat/core/services/columnDecorators";
@@ -16,6 +17,11 @@ const ScoreLink = ({ id, execution_timestamp }) => (
   </Link>
 );
 
+ScoreLink.propTypes = {
+  id: PropTypes.number,
+  execution_timestamp: PropTypes.string,
+};
+
 export default [
   {
     name: "execution_timestamp",
@@ -43,10 +49,11 @@ export default [
   },
   {
     name: "quality_control_status",
-    fieldSelector: ({ quality_control: { status } }) => status,
-    fieldDecorator: (status) =>
-      status ? (
-        <FormattedMessage id={`quality_control.status.${status}`} />
+    fieldDecorator: (quality_control_status) =>
+      quality_control_status ? (
+        <FormattedMessage
+          id={`quality_control.status.${quality_control_status}`}
+        />
       ) : null,
   },
 ];

package/src/components/scores/QualityBar.js

@@ -2,6 +2,7 @@ import _ from "lodash/fp";
 import React, { useContext } from "react";
 import { Popup } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
+import Moment from "react-moment";
 import qualityByControlMode from "../qualityControls/qualityByControlMode";
 import ScoreContext from "./ScoreContext";
 
@@ -16,9 +17,26 @@ export default function QualityBar() {
         text: formatMessage({ id: "score.status.failed" }),
       }
     : quality.isEmpty
+    ? {
+        color: "notExecutedDataset",
+        text: formatMessage({ id: "quality.result.no.data" }),
+      }
+    : score.score_content.total_count == 0
     ? {
         color: "empyDataset",
-        text: formatMessage({ id: "score.no_results" }),
+        text: formatMessage(
+          {
+            id: "score.empty_dataset_date",
+          },
+          {
+            date: (
+              <Moment
+                date={score.execution_timestamp}
+                format="YYYY-MM-DD HH:mm"
+              />
+            ),
+          }
+        ),
       }
     : quality;
 
@@ -39,6 +57,10 @@ export default function QualityBar() {
       className: "not-executed-color",
       tooltip: "no_execution",
     },
+    notExecutedDataset: {
+      className: "not-executed-color",
+      tooltip: "no_execution",
+    },
     empyDataset: {
       className: "empty-dataset-color",
       tooltip: "no_content",

package/src/components/scores/ScoreCrumbs.js

@@ -22,7 +22,10 @@ export default function ScoreCrumbs() {
 
       <Breadcrumb.Section
         as={Link}
-        to={linkTo.QUALITY_CONTROL_SCORES({ id: qualityControl.id })}
+        to={linkTo.QUALITY_CONTROL_SCORES({
+          id: qualityControl.id,
+          version: qualityControl.version,
+        })}
       >
         {qualityControl.name}
       </Breadcrumb.Section>

package/src/components/scores/ScoreGroup.js

@@ -14,8 +14,8 @@ const DynamicFormViewer = React.lazy(() =>
   import("@truedat/df/components/DynamicFormViewer")
 );
 
-const QualityControlLink = ({ id, name }) => (
-  <Link to={linkTo.QUALITY_CONTROL({ id })}>{name}</Link>
+const QualityControlLink = ({ id, name, version }) => (
+  <Link to={linkTo.QUALITY_CONTROL({ id, version })}>{name}</Link>
 );
 const COLUMNS = [
   {

package/src/components/scores/__tests__/QualityBar.spec.js

@@ -50,6 +50,6 @@ describe("<QualityBar />", () => {
       renderOpts
     );
 
-    expect(queryByText(/No results/i)).toBeInTheDocument();
+    expect(queryByText(/quality.result.no.data/i)).toBeInTheDocument();
   });
 });

package/src/components/scores/__tests__/Score.spec.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React from "react";
+import React, { version } from "react";
 import { render } from "@truedat/test/render";
 import { messages } from "@truedat/qx/components/__tests__/__fixtures__/helper";
 import { useScoreShow } from "@truedat/qx/hooks/useScores";
@@ -7,7 +7,7 @@ import Score from "../Score";
 
 jest.mock("react-router-dom", () => ({
   ...jest.requireActual("react-router-dom"),
-  useParams: () => ({ id: "8" }),
+  useParams: () => ({ id: "8", version: "1" }),
 }));
 
 jest.mock("@truedat/qx/hooks/useScores", () => {

package/src/components/scores/__tests__/ScoreGroup.spec.js

@@ -6,7 +6,7 @@ import ScoreGroup from "../ScoreGroup";
 
 jest.mock("react-router-dom", () => ({
   ...jest.requireActual("react-router-dom"),
-  useParams: () => ({ id: "8" }),
+  useParams: () => ({ id: "8", version: "1" }),
 }));
 
 jest.mock("@truedat/qx/hooks/useScoreGroups", () => {

package/src/components/scores/__tests__/__fixtures__/scoreHelper.js

@@ -63,6 +63,7 @@ export const score = {
       maximum: 30,
       goal: 10,
     },
+
     version_id: 1,
   },
   firstInVersion: true,

package/src/components/scores/__tests__/__snapshots__/Score.spec.js.snap

@@ -17,7 +17,7 @@ exports[`<Score /> matches the latest snapshot 1`] = `
     />
     <a
       class="section"
-      href="/qualityControls/8/scores"
+      href="/qualityControls/8/version/1/scores"
     >
       test
     </a>

package/src/components/scores/__tests__/__snapshots__/ScoreCrumbs.spec.js.snap

@@ -17,7 +17,7 @@ exports[`<ScoreCrumbs /> matches the latest snapshot 1`] = `
     />
     <a
       class="section"
-      href="/qualityControls/8/scores"
+      href="/qualityControls/8/version/1/scores"
     >
       test
     </a>

package/src/components/scores/__tests__/__snapshots__/ScoreGroup.spec.js.snap

@@ -88,7 +88,7 @@ exports[`<ScoreGroup /> matches the latest snapshot 1`] = `
           class=""
         >
           <a
-            href="/qualityControls/8"
+            href="/qualityControls/8/version/1"
           >
             test
           </a>

package/src/hooks/useQualityControls.js

@@ -9,17 +9,17 @@ import {
 } from "@truedat/core/services/api";
 import {
   API_QUALITY_CONTROLS,
-  API_QUALITY_CONTROL,
   API_QUALITY_CONTROL_DRAFT,
   API_QUALITY_CONTROL_STATUS,
   API_QUALITY_CONTROL_MAIN,
   API_QUALITY_CONTROL_SEARCH,
   API_QUALITY_CONTROL_FILTERS,
   API_QUALITY_CONTROL_QUERIES,
+  API_QUALITY_CONTROL_VERSION,
 } from "../api";
 
-export const useQualityControl = (id) => {
-  const url = compile(API_QUALITY_CONTROL)({ id });
+export const useQualityControl = (id, version) => {
+  const url = compile(API_QUALITY_CONTROL_VERSION)({ id, version });
   const { data, error, mutate } = useSWR(url, apiJson);
   return { data: data?.data, error, loading: !error && !data, mutate };
 };
@@ -52,8 +52,11 @@ export const useQualityControlUpdateMain = (id) => {
 
 export const useQualityControlDelete = (qualityControl) => {
   const id = qualityControl?.id || 0;
-  const url = compile(API_QUALITY_CONTROL)({ id });
-  return useSWRMutations(url, (url, { arg }) => apiJsonDelete(url, arg));
+  const version = qualityControl?.version || 0;
+  const url = compile(API_QUALITY_CONTROL_VERSION)({ id, version });
+  return useSWRMutations(url, (url, { arg }) => apiJsonDelete(url, arg), {
+    revalidate: false,
+  });
 };
 
 export const useQualityControlsSearch = () => {