@truedat/dq 4.36.1 → 4.36.2

package/CHANGELOG.md

@@ -1,10 +1,10 @@
 # Changelog
 
-## [4.36.1] 2022-01-13
+## [4.36.2] 2022-01-17
 
-### Changed
+### Added
 
-- [TD-2564] Uses `has_field_child` default filter on Structure selection of ImplementationForm's DataSet
+- [TD-3178] Show join details in implementation summary
 
 ## [4.35.8] 2022-01-07
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.36.1",
+  "version": "4.36.2",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -82,8 +82,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.4.10",
-    "@truedat/core": "4.36.1",
-    "@truedat/df": "4.36.1",
+    "@truedat/core": "4.36.2",
+    "@truedat/df": "4.36.2",
     "axios": "^0.19.2",
     "graphql": "^15.5.3",
     "path-to-regexp": "^1.7.0",
@@ -103,5 +103,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "236b538f0fa3671bc4f3dc3bcfb26ea6bb9bbaee"
+  "gitHead": "0f4c09d90582210ae7c98e945b8c0b7af0f9a61d"
 }

package/src/components/ConditionSummary.js

@@ -74,7 +74,12 @@ OperatorMessage.propTypes = {
   operator: PropTypes.object,
 };
 
-const ConditionCell = ({ row }) => {
+const ConditionCell = ({ row, alias }) => {
+  const alias_text = _.flow(
+    _.find({ index: row.structure?.parent_index }),
+    _.propOr(null, "text")
+  )(alias);
+
   const values = getValues(row);
   const operator = _.prop("operator")(row);
   return (
@@ -87,10 +92,10 @@ const ConditionCell = ({ row }) => {
                 id: _.path("structure.id")(row),
               })}
             >
-              <span className="highlighted">{`"${_.pathOr(
-                "",
-                "structure.name"
-              )(row)}"`}</span>
+              <span className="highlighted">
+                {alias_text && `(${alias_text}).`}{" "}
+                {`"${_.pathOr("", "structure.name")(row)}"`}
+              </span>
             </Link>
             {row?.modifier && (
               <>
@@ -155,9 +160,10 @@ const ConditionCell = ({ row }) => {
 
 ConditionCell.propTypes = {
   row: PropTypes.object,
+  alias: PropTypes.array,
 };
 
-export const ConditionSummary = ({ rows, type, icon }) =>
+export const ConditionSummary = ({ rows, type, icon, alias }) =>
   empty(rows) ? null : (
     <>
       <Header as="h3">
@@ -185,7 +191,7 @@ export const ConditionSummary = ({ rows, type, icon }) =>
           </Table.Header>
           <Table.Body>
             {rows.map((row, i) => (
-              <ConditionCell key={i} row={row} />
+              <ConditionCell key={i} row={row} alias={alias} />
             ))}
           </Table.Body>
         </Table>

package/src/components/ImplementationSummary.js

@@ -1,12 +1,13 @@
 import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
-import { Header, Icon, Table, Segment } from "semantic-ui-react";
+import { Header, Icon, Table, Segment, List } from "semantic-ui-react";
 import { Link } from "react-router-dom";
 import { FormattedMessage } from "react-intl";
 import { linkTo } from "@truedat/core/routes";
 import ConditionSummary, { empty, path } from "./ConditionSummary";
 import InformationSummary from "./InformationSummary";
+import "../styles/ImplementationSummary.less";
 
 const defaults = [
   "executable",
@@ -39,7 +40,45 @@ FormattedLink.propTypes = {
   operator: PropTypes.object,
 };
 
-const DatasetSummary = ({ rows }) =>
+const AliasText = ({ alias, clause }) => {
+  const text = _.flow(
+    _.find({ index: clause?.parent_index }),
+    _.propOr(null, "text")
+  )(alias);
+  return _.isNull(text) ? clause?.name : `(${text}).${clause?.name}`;
+};
+
+AliasText.propTypes = {
+  alias: PropTypes.array,
+  clause: PropTypes.object,
+};
+
+const UnionSummary = ({ alias, row }) => {
+  return empty(row) || !(row?.clauses && _.size(row?.clauses) > 0) ? null : (
+    <List id="union-list">
+      <List.Item>
+        <List.Header>
+          <FormattedMessage id="structureSelector.union.criteria" />
+        </List.Header>
+      </List.Item>
+      {row.clauses.map((clause, k) =>
+        _.size(clause) > 0 ? (
+          <List.Item key={k}>
+            {clause.left && <AliasText alias={alias} clause={clause.left} />} ={" "}
+            {clause.right && <AliasText alias={alias} clause={clause.right} />}
+          </List.Item>
+        ) : null
+      )}
+    </List>
+  );
+};
+
+UnionSummary.propTypes = {
+  row: PropTypes.object,
+  alias: PropTypes.array,
+};
+
+const DatasetSummary = ({ rows, alias }) =>
   empty(rows) ? null : (
     <>
       <Header as="h3">
@@ -61,16 +100,19 @@ const DatasetSummary = ({ rows }) =>
             {rows.map((row, i) => (
               <Table.Row key={i}>
                 {_.has("structure")(row) && (
-                  <Table.Cell key={i}>
+                  <Table.Cell>
                     <Link
                       to={linkTo.STRUCTURE({
                         id: _.pathOr("", "structure.id")(row),
                       })}
                     >
-                      <span key={i} className="highlighted">{`"${path(
+                      <p className="highlighted">{`"${path(
                         _.propOr({}, "structure")(row)
-                      )}"`}</span>
+                      )}"`}</p>
                     </Link>
+
+                    {row.alias?.text && <span>({row.alias.text})</span>}
+                    <UnionSummary alias={alias} row={row} />
                   </Table.Cell>
                 )}
               </Table.Row>
@@ -83,12 +125,14 @@ const DatasetSummary = ({ rows }) =>
 
 DatasetSummary.propTypes = {
   rows: PropTypes.array,
+  alias: PropTypes.array,
 };
 
 export const ImplementationSummary = ({ ruleImplementation, activeSteps }) => {
   const steps = _.isEmpty(activeSteps) ? defaults : activeSteps;
   const { dataset, population, validations } =
     _.pick(steps)(ruleImplementation);
+  const alias = _.map(_.propOr({}, "alias"))(dataset);
   return (
     <>
       {(_.includes("implementationKey")(steps) ||
@@ -96,16 +140,22 @@ export const ImplementationSummary = ({ ruleImplementation, activeSteps }) => {
         <InformationSummary ruleImplementation={ruleImplementation} />
       )}
       {dataset && _.includes("dataset")(steps) && (
-        <DatasetSummary rows={dataset} />
+        <DatasetSummary rows={dataset} alias={alias} />
       )}
       {population && _.includes("population")(steps) && (
-        <ConditionSummary type="population" icon="user" rows={population} />
+        <ConditionSummary
+          type="population"
+          icon="user"
+          rows={population}
+          alias={alias}
+        />
       )}
       {validations && _.includes("validations")(steps) && (
         <ConditionSummary
           type="validations"
           icon="setting"
           rows={validations}
+          alias={alias}
         />
       )}
     </>

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

@@ -42,6 +42,7 @@ const ruleImplementation = {
           id: 1,
           name: "Microstrategy",
         },
+        alias: [{ index: 0, text: "bar" }],
       },
     },
   ],

package/src/components/__tests__/__snapshots__/ConditionSummary.spec.js.snap

@@ -59,6 +59,7 @@ exports[`<ConditionSummary /> matches the latest snapshot 1`] = `
               <span
                 class="highlighted"
               >
+                 
                 "Mes"
               </span>
             </a>

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

@@ -133,11 +133,11 @@ exports[`<ImplementationSummary /> displays correctly validations values of list
             <a
               href="/structures/1915"
             >
-              <span
+              <p
                 class="highlighted"
               >
                 "CMC &gt; Objetos Públicos &gt; 0. 0 Meses"
-              </span>
+              </p>
             </a>
           </td>
         </tr>
@@ -201,6 +201,7 @@ exports[`<ImplementationSummary /> displays correctly validations values of list
               <span
                 class="highlighted"
               >
+                 
                 "Mes"
               </span>
             </a>
@@ -238,6 +239,12 @@ exports[`<ImplementationSummary /> matches the latest snapshot 1`] = `
         "dataset": Array [
           Object {
             "structure": Object {
+              "alias": Array [
+                Object {
+                  "index": 0,
+                  "text": "bar",
+                },
+              ],
               "id": 1915,
               "name": "0. 0 Meses",
               "path": Array [
@@ -293,10 +300,21 @@ exports[`<ImplementationSummary /> matches the latest snapshot 1`] = `
     }
   />
   <DatasetSummary
+    alias={
+      Array [
+        Object {},
+      ]
+    }
     rows={
       Array [
         Object {
           "structure": Object {
+            "alias": Array [
+              Object {
+                "index": 0,
+                "text": "bar",
+              },
+            ],
             "id": 1915,
             "name": "0. 0 Meses",
             "path": Array [
@@ -314,6 +332,11 @@ exports[`<ImplementationSummary /> matches the latest snapshot 1`] = `
     }
   />
   <ConditionSummary
+    alias={
+      Array [
+        Object {},
+      ]
+    }
     icon="user"
     rows={
       Array [
@@ -323,6 +346,11 @@ exports[`<ImplementationSummary /> matches the latest snapshot 1`] = `
     type="population"
   />
   <ConditionSummary
+    alias={
+      Array [
+        Object {},
+      ]
+    }
     icon="setting"
     rows={
       Array [

package/src/components/ruleImplementationForm/DatasetForm.js

@@ -7,6 +7,7 @@ import { dropAt, replaceAt } from "@truedat/core/services/arrays";
 import { Button } from "semantic-ui-react";
 import { setImplementationFilterValues } from "../../routines";
 import { getRuleImplementationFormFilters } from "../../selectors";
+import "../../styles/ruleImplementationForm/DatasetForm.less";
 
 const StructureSelectorInputField = React.lazy(() =>
   import("@truedat/dd/components/StructureSelectorInputField")
@@ -88,7 +89,7 @@ export const DatasetForm = ({
   };
 
   const buildDefaultFilters = (i) => {
-    const defaultFilters = { "has_field_child.raw": ["true"] };
+    const defaultFilters = { "class.raw": [""] };
     return i == 0
       ? { defaultFilters }
       : { defaultFilters: { ...defaultFilters, ...customFilters } };
@@ -116,7 +117,9 @@ export const DatasetForm = ({
           systemRequired={false}
         />
       ))}
+
       <Button
+        id="add-structure-button"
         onClick={(e) => {
           e.preventDefault();
           setStructure({ value: { join_type: "inner" } });

package/src/components/ruleImplementationForm/__tests__/DataSetForm.spec.js

@@ -20,8 +20,8 @@ describe("<DatasetForm />", () => {
         id: 1,
         name: "strcuture1",
         path: [],
-        system: { name: "system" },
-      },
+        system: { name: "system" }
+      }
     },
     {
       join_type: "inner",
@@ -29,10 +29,10 @@ describe("<DatasetForm />", () => {
         id: 2,
         name: "structure2",
         path: [],
-        system: { name: "system" },
+        system: { name: "system" }
       },
-      clauses: [{ id: 100 }, { id: 200 }],
-    },
+      clauses: [{ id: 100 }, { id: 200 }]
+    }
   ];
 
   const customFilters = { "foo.bar": ["baz"] };
@@ -44,7 +44,7 @@ describe("<DatasetForm />", () => {
     setSelector,
     selector,
     setImplementationFilterValues,
-    setImplementationKey,
+    setImplementationKey
   };
 
   it("matches the latest snapshot", () => {
@@ -63,14 +63,14 @@ describe("<DatasetForm />", () => {
     const selectors = wrapper.find("lazy");
     expect(selectors.first().prop("options")).toEqual({
       defaultFilters: {
-        "has_field_child.raw": ["true"],
-      },
+        "class.raw": [""]
+      }
     });
     expect(selectors.last().prop("options")).toEqual({
       defaultFilters: {
-        "has_field_child.raw": ["true"],
-        "foo.bar": ["baz"],
-      },
+        "class.raw": [""],
+        "foo.bar": ["baz"]
+      }
     });
   });
 });

package/src/components/ruleImplementationForm/__tests__/__snapshots__/DataSetForm.spec.js.snap

@@ -13,8 +13,8 @@ exports[`<DatasetForm /> matches the latest snapshot 1`] = `
     options={
       Object {
         "defaultFilters": Object {
-          "has_field_child.raw": Array [
-            "true",
+          "class.raw": Array [
+            "",
           ],
         },
       }
@@ -77,12 +77,12 @@ exports[`<DatasetForm /> matches the latest snapshot 1`] = `
     options={
       Object {
         "defaultFilters": Object {
+          "class.raw": Array [
+            "",
+          ],
           "foo.bar": Array [
             "baz",
           ],
-          "has_field_child.raw": Array [
-            "true",
-          ],
         },
       }
     }
@@ -144,6 +144,7 @@ exports[`<DatasetForm /> matches the latest snapshot 1`] = `
   />
   <Button
     as="button"
+    id="add-structure-button"
     onClick={[Function]}
   >
     dataset.form.button.add_structure

package/src/messages/en.js

@@ -543,6 +543,7 @@ export default {
     "Error uploading file. No rules have been created.",
   "rules.upload.failed.misssing_required_columns":
     "Missing required columns. Expected [{expected}]. Found [{found}].",
+  "structureSelector.union.criteria": "Union criteria",
   "structureFields.dropdown.label": "Select Field",
   "structureFields.dropdown.placeholder": "Fields",
   "summary.link.and": "and",

package/src/messages/es.js

@@ -559,6 +559,7 @@ export default {
   "rules.upload.failed.misssing_required_columns":
     "Faltan columnas obligatorias en el fichero. Esperado [{expected}]. Recibido [{found}].",
   "ruleSubscription.actions.remove": "Eliminar",
+  "structureSelector.union.criteria": "Criterio de unión",
   "structureFields.dropdown.label": "Seleccionar Campo",
   "structureFields.dropdown.placeholder": "Campos",
   "summary.link.and": "y",

package/src/styles/ImplementationSummary.less

@@ -0,0 +1,3 @@
+#union-list {
+  margin-top: 15px;
+}

package/src/styles/ruleImplementationForm/DatasetForm.less

@@ -0,0 +1,3 @@
+#add-structure-button {
+  margin-top: 12px;
+}