@truedat/dq 4.56.3 → 4.56.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.56.4] 2022-11-26
+
+### Fixed
+
+- [TD-5247] Keep table name if structure field dropdown item changes
+
 ## [4.56.3] 2022-11-24
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.56.3",
+  "version": "4.56.4",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.56.3",
+    "@truedat/test": "4.56.4",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -93,8 +93,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.0",
-    "@truedat/core": "4.56.3",
-    "@truedat/df": "4.56.3",
+    "@truedat/core": "4.56.4",
+    "@truedat/df": "4.56.4",
     "graphql": "^15.5.3",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
@@ -114,5 +114,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "7940a71d7e8ed3eb6c1fc088cf631e37e87fd093"
+  "gitHead": "f327860aa80db650f562d53dc22218307f43e0ac"
 }

package/src/components/ConditionSummary.js

@@ -9,26 +9,31 @@ import { linkTo } from "@truedat/core/routes";
 
 const concatValues = (values, link) => _.join(link)(values);
 
-const LinkToStructure = ({ value }) =>
+const LinkToStructure = ({ value, aliasArray }) =>
   value?.id ? (
     <Link to={linkTo.STRUCTURE({ id: value.id })}>
-      <span className="highlighted">{`"${
-        !_.isEmpty(value.path) ? path(value) : value.name
-      }"`}</span>{" "}
+      <div className="highlighted">
+        {qualifySqlIdentifier({ aliasArray, value })}
+      </div>{" "}
     </Link>
   ) : (
     <span>{value.name}</span>
   );
 
-const FormattedLink = ({ value, operator = {} }) => {
+LinkToStructure.propTypes = {
+  value: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  aliasArray: PropTypes.array,
+};
+
+const FormattedLink = ({ value, aliasArray, operator = {} }) => {
   switch (operator?.value_type) {
     case "field":
-      return <LinkToStructure value={value} />;
+      return <LinkToStructure value={value} aliasArray={aliasArray} />;
     case "field_list":
       return (
         <>
           {_.map.convert({ cap: false })((v, i) => (
-            <LinkToStructure key={i} value={v} />
+            <LinkToStructure key={i} value={v} aliasArray={aliasArray} />
           ))(value)}
         </>
       );
@@ -49,6 +54,7 @@ const FormattedLink = ({ value, operator = {} }) => {
 FormattedLink.propTypes = {
   value: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
   operator: PropTypes.object,
+  aliasArray: PropTypes.array,
 };
 
 const nilOrEmpty = (v) => _.isNil(v) || v === "";
@@ -101,7 +107,7 @@ export const getValues = ({ value = [], operator = {}, value_modifier }) => {
     ? valuesFromKeys(
         defaultOrValue,
         ["name"],
-        ["path", "id", "type", "parent_index"],
+        ["path", "metadata", "id", "type", "parent_index"],
         value_modifier
       )
     : valuesFromKeys(defaultOrValue, ["raw"], [], value_modifier);
@@ -124,12 +130,15 @@ OperatorMessage.propTypes = {
   operator: PropTypes.object,
 };
 
+const qualifySqlIdentifier = ({ aliasArray, value }) =>
+  _.flow(
+    _.find({ index: value?.parent_index }),
+    _.propOr(null, "text"),
+    _.defaultTo(value?.metadata?.table || _.last(value?.path)),
+    (qualifier) => (qualifier ? `(${qualifier}).${value?.name}` : value?.name)
+  )(aliasArray);
+
 const ConditionCell = ({ row, alias, validationPopulationCondition }) => {
-  const alias_text =
-    _.flow(
-      _.find({ index: row.structure?.parent_index }),
-      _.propOr(null, "text")
-    )(alias) || (row.structure ? _.last(row.structure.path) : null);
   const values = getValues(row);
   const operator = _.prop("operator")(row);
   const { formatMessage } = useIntl();
@@ -154,8 +163,10 @@ const ConditionCell = ({ row, alias, validationPopulationCondition }) => {
                     })}
                   >
                     <span className="highlighted">
-                      {alias_text && `(${alias_text}).`}{" "}
-                      {`"${_.pathOr("", "structure.name")(row)}"`}
+                      {qualifySqlIdentifier({
+                        aliasArray: alias,
+                        value: row.structure,
+                      })}
                     </span>
                   </Link>
                 </>
@@ -190,8 +201,10 @@ const ConditionCell = ({ row, alias, validationPopulationCondition }) => {
                                     })}
                                   >
                                     <span className="highlighted">
-                                      {alias_text && `(${alias_text}).`}{" "}
-                                      {`"${_.pathOr("", "name")(row)}"`}
+                                      {qualifySqlIdentifier({
+                                        aliasArray: alias,
+                                        value: row,
+                                      })}
                                     </span>
                                   </Link>
                                 ) : (
@@ -214,7 +227,11 @@ const ConditionCell = ({ row, alias, validationPopulationCondition }) => {
         <Table.Cell width={5}>
           {_.map.convert({ cap: false })((value, i) => (
             <Fragment key={i}>
-              <FormattedLink value={value} operator={operator} />
+              <FormattedLink
+                value={value}
+                operator={operator}
+                aliasArray={alias}
+              />
               {i + 1 < _.size(values) && (
                 <span>
                   {" "}

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

@@ -266,6 +266,18 @@ describe("<NewRuleImplementation> NewRuleImplementation doSubmit", () => {
                 fields: [
                   {
                     id: 11127109,
+                    metadata: {
+                      data_type_class: "string",
+                      database: "xe",
+                      default: "None",
+                      host: "localhost",
+                      nullable: false,
+                      order: "4",
+                      precision: "25",
+                      schema: "HR",
+                      table: "EMPLOYEES",
+                      type: "VARCHAR2",
+                    },
                     name: "EMAIL",
                     parent_index: 4,
                     path: undefined,
@@ -273,6 +285,18 @@ describe("<NewRuleImplementation> NewRuleImplementation doSubmit", () => {
                   },
                   {
                     id: 11127116,
+                    metadata: {
+                      data_type_class: "string",
+                      database: "xe",
+                      default: "None",
+                      host: "localhost",
+                      nullable: true,
+                      order: "5",
+                      precision: "20",
+                      schema: "HR",
+                      table: "EMPLOYEES",
+                      type: "VARCHAR2",
+                    },
                     name: "PHONE_NUMBER",
                     parent_index: 4,
                     path: undefined,

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

@@ -59,9 +59,7 @@ exports[`<ConditionSummary /> matches the latest snapshot 1`] = `
               <span
                 class="highlighted"
               >
-                (foo_alias).
-                 
-                "Mes"
+                (foo_alias).Mes
               </span>
             </a>
           </td>

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

@@ -266,8 +266,7 @@ exports[`<ImplementationSummary /> displays correctly validations values of list
               <span
                 class="highlighted"
               >
-                 
-                "Mes"
+                Mes
               </span>
             </a>
           </td>

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

@@ -629,9 +629,7 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
                   <span
                     class="highlighted"
                   >
-                    (table2).
-                     
-                    "descripcion"
+                    (table2).descripcion
                   </span>
                 </a>
               </td>
@@ -650,11 +648,11 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
                 <a
                   href="/structures/4814767"
                 >
-                  <span
+                  <div
                     class="highlighted"
                   >
-                    "Main &gt; example.txt &gt; external"
-                  </span>
+                    (FS).external
+                  </div>
                    
                 </a>
               </td>
@@ -719,9 +717,7 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
                   <span
                     class="highlighted"
                   >
-                    (FS).
-                     
-                    "agent"
+                    (FS).agent
                   </span>
                 </a>
               </td>

package/src/components/ruleImplementationForm/FieldModifier.js

@@ -54,6 +54,7 @@ export default function FieldModifier({
                     const pickedValues = _.map(
                       _.pick([
                         "data_structure_id",
+                        "metadata",
                         "name",
                         "parent_index",
                         "type",

package/src/components/ruleImplementationForm/FiltersField.js

@@ -53,6 +53,7 @@ export const FiltersField = ({
   const modifierDef = _.find({ name: modifier?.name })(typeCastModifiers);
   const pickFromValue = _.pick([
     "data_structure_id",
+    "metadata",
     "name",
     "parent_index",
     "type",

package/src/components/ruleImplementationForm/FiltersGrid.js

@@ -25,7 +25,9 @@ export const FiltersGrid = ({
 
   const onStructureChange = (index, value) => {
     const structure = {
-      ..._.pick(["field_type", "name", "parent_index", "type"])(value),
+      ..._.pick(["field_type", "name", "parent_index", "type", "metadata"])(
+        value
+      ),
       id: value.data_structure_id,
     };
     setRowValue({
@@ -56,12 +58,21 @@ export const FiltersGrid = ({
     });
   };
 
-  const composeFieldValue = (value) => ({
-    id: value.data_structure_id || value.id,
-    name: value.name,
-    path: value.path,
-    parent_index: value.parent_index,
-    type: value.type,
+  const composeFieldValue = ({
+    data_structure_id,
+    id,
+    name,
+    path,
+    metadata,
+    parent_index,
+    type,
+  }) => ({
+    id: data_structure_id || id,
+    name,
+    path,
+    metadata,
+    parent_index,
+    type,
   });
 
   const composeValue = (value_type, value) => {