@truedat/dq 4.35.5 → 4.36.0

package/src/components/ruleImplementationForm/DatasetForm.js

@@ -33,7 +33,7 @@ export const DatasetForm = ({
   };
 
   const onChangeField = (index, value) => {
-    const structureAttrs = _.pick(["structure", "clauses"])(value);
+    const structureAttrs = _.pick(["structure", "clauses", "alias"])(value);
     setStructure({
       index,
       value: {
@@ -45,8 +45,27 @@ export const DatasetForm = ({
   const getStructureAttrs = (structure) =>
     _.pick(["id", "name", "path", "system"])(structure);
 
-  const setStructure = ({ index, value }) => {
-    if (index === 0) {
+  const hasChangedStructure = (index, value) =>
+    _.path("structure.id")(value) !==
+      _.path(`[${index}].structure.id`)(structures) && !_.isNil(value);
+
+  const getGlobalAliasIndex = () =>
+    _.max([
+      ..._.flow(_.map("alias.index"), _.reject(_.isNil))(structures),
+      structures.length - 1,
+    ]);
+
+  const setAliasIndex = (value) => ({
+    ...value,
+    alias: {
+      index: getGlobalAliasIndex() + 1,
+    },
+  });
+
+  const setStructure = ({ index, value: param_value }) => {
+    const structureChanged = hasChangedStructure(index, param_value);
+    const value = structureChanged ? setAliasIndex(param_value) : param_value;
+    if (index === 0 && structureChanged) {
       setStructures([value ? { ...value } : {}]);
       setImplementationFilterValues({ value: _.get("structure")(value) });
     } else if (_.isNil(index))
@@ -91,7 +110,7 @@ export const DatasetForm = ({
             onChangeField(index, value);
           }}
           onDelete={() => setStructure({ index })}
-          structures={index > 0 ? structures : null}
+          structures={structures}
           selectedStructure={structure}
           onClick={() => setSelector(index === selector ? -1 : index)}
           systemRequired={false}

package/src/components/ruleImplementationForm/FiltersField.js

@@ -125,11 +125,15 @@ export const FiltersField = ({
             onSelectField={(value, modifier) =>
               onChange(
                 null,
-                _.pick(["data_structure_id", "name"])(value),
+                _.pick(["data_structure_id", "name", "parent_index"])(value),
                 modifier ? { name: modifier.name } : null
               )
             }
-            value={_.prop("id")(value)}
+            value={
+              _.isNil(_.prop("parent_index")(value))
+                ? _.prop("id")(value)
+                : `${_.prop("id")(value)}/${_.prop("parent_index")(value)}`
+            }
           />
           {modifier && (
             <FieldModifier

package/src/components/ruleImplementationForm/FiltersFormGroup.js

@@ -69,7 +69,13 @@ export const FiltersFormGroup = ({
                 parentStructures={parentStructures}
                 structureFields={structureFields}
                 onSelectField={(value) => onStructureChange(index, value)}
-                value={clause?.structure?.id}
+                value={
+                  _.isNil(_.prop("parent_index")(clause?.structure))
+                    ? _.prop("id")(clause?.structure)
+                    : `${_.prop("id")(clause?.structure)}/${_.prop(
+                        "parent_index"
+                      )(clause?.structure)}`
+                }
               />
             )}
           </Form.Field>

package/src/components/ruleImplementationForm/FiltersGrid.js

@@ -12,7 +12,11 @@ export const FiltersGrid = ({
   scope,
 }) => {
   const [activeConditionIndex, setActiveConditionIndex] = useState();
-  const parentStructures = _.map("structure")(structures);
+  const parentStructures = _.map((s) =>
+    _.isNil(_.prop("alias")(s))
+      ? _.prop("structure")(s)
+      : { ..._.prop("structure")(s), alias: _.prop("alias")(s) }
+  )(structures);
   const allOperators = _.flow(
     _.values,
     _.map(_.prop("operators")),
@@ -21,7 +25,7 @@ export const FiltersGrid = ({
 
   const onStructureChange = (index, value) => {
     const structure = {
-      ..._.pick(["field_type", "name"])(value),
+      ..._.pick(["field_type", "name", "parent_index"])(value),
       id: value.data_structure_id,
     };
     setRowValue({
@@ -58,6 +62,7 @@ export const FiltersGrid = ({
         id: value.data_structure_id || value.id,
         name: value.name,
         path: value.path,
+        parent_index: value.parent_index,
       };
     } else {
       return { raw: value };

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

@@ -31,7 +31,39 @@ exports[`<DatasetForm /> matches the latest snapshot 1`] = `
         },
       }
     }
-    structures={null}
+    structures={
+      Array [
+        Object {
+          "structure": Object {
+            "id": 1,
+            "name": "strcuture1",
+            "path": Array [],
+            "system": Object {
+              "name": "system",
+            },
+          },
+        },
+        Object {
+          "clauses": Array [
+            Object {
+              "id": 100,
+            },
+            Object {
+              "id": 200,
+            },
+          ],
+          "join_type": "inner",
+          "structure": Object {
+            "id": 2,
+            "name": "structure2",
+            "path": Array [],
+            "system": Object {
+              "name": "system",
+            },
+          },
+        },
+      ]
+    }
     systemRequired={false}
   />
   <lazy

package/src/messages/en.js

@@ -412,6 +412,7 @@ export default {
   "ruleImplementation.props.status.deprecated": "Deprecated Implementation",
   "ruleImplementation.props.structure": "Structure",
   "ruleImplementation.props.structure.placeholder": "Search structure",
+  "ruleImplementation.props.structure.alias": "Alias",
   "ruleImplementation.props.system": "System",
   "ruleImplementation.props.system.placeholder": "System",
   "ruleImplementation.props.type": "Type",

package/src/messages/es.js

@@ -425,6 +425,7 @@ export default {
     "Esta Implementación está archivada",
   "ruleImplementation.props.structure.placeholder": "Buscar estructura",
   "ruleImplementation.props.structure": "Estructura",
+  "ruleImplementation.props.structure.alias": "Alias",
   "ruleImplementation.props.system.placeholder": "Sistema de referencia",
   "ruleImplementation.props.system": "Sistema",
   "ruleImplementation.props.type.placeholder": "Tipo de regla",