@truedat/dq 4.28.8 → 4.29.0

package/src/components/ruleImplementationForm/FiltersField.js

@@ -10,7 +10,7 @@ import FixedListField from "./FixedListField";
 import NumberField from "./NumberField";
 import StringField from "./StringField";
 import StringListField from "./StringListField";
-import FieldModifier from './FieldModifier';
+import FieldModifier from "./FieldModifier";
 
 const StructureFieldsDropdown = React.lazy(() =>
   import("@truedat/dd/components/StructureFieldsDropdown")
@@ -50,7 +50,7 @@ export const FiltersField = ({
   const [active, setActive] = useState(false);
   const { value_type, value_type_filter, fixed_values } = operator;
 
-  const modifierDef = _.find({name: modifier?.name})(typeCastModifiers)
+  const modifierDef = _.find({ name: modifier?.name })(typeCastModifiers);
 
   switch (value_type) {
     case "string":
@@ -115,27 +115,29 @@ export const FiltersField = ({
         />
       ) : (
         <>
-        <StructureFieldsDropdown
-          label={label}
-          inline={false}
-          parentStructures={parentStructures}
-          structureFields={structureFields}
-          typeCastModifiers={typeCastModifiers}
-          filters={{ field_type: [fieldType] }}
-          onSelectField={(value, modifier) => 
-            onChange(
-              null,
-              _.pick(["data_structure_id", "name"])(value),
-              modifier ? {name: modifier.name} : null
-            )
-          }
-          value={_.prop("id")(value)}
-        />
-        {modifier && <FieldModifier
-          modifier={modifierDef}
-          value={modifier}
-          onChange = {(modifier) => onChange(null, value, modifier)}
-        />}
+          <StructureFieldsDropdown
+            label={label}
+            inline={false}
+            parentStructures={parentStructures}
+            structureFields={structureFields}
+            typeCastModifiers={typeCastModifiers}
+            filters={{ field_type: [fieldType] }}
+            onSelectField={(value, modifier) =>
+              onChange(
+                null,
+                _.pick(["data_structure_id", "name"])(value),
+                modifier ? { name: modifier.name } : null
+              )
+            }
+            value={_.prop("id")(value)}
+          />
+          {modifier && (
+            <FieldModifier
+              modifier={modifierDef}
+              value={modifier}
+              onChange={(modifier) => onChange(null, value, modifier)}
+            />
+          )}
         </>
       );
     case "string_list":

package/src/components/ruleImplementationForm/FiltersFormGroup.js

@@ -5,8 +5,8 @@ import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { getStructureFields } from "../../selectors/getStructureFields";
 import FiltersField from "./FiltersField";
-import FieldModifier from './FieldModifier';
-import operatorFunctions from './operators';
+import FieldModifier from "./FieldModifier";
+import operatorFunctions from "./operators";
 
 const OptionGroup = React.lazy(() =>
   import("@truedat/core/components/OptionGroup")
@@ -36,14 +36,20 @@ export const FiltersFormGroup = ({
   const structureFieldType = clause?.structure?.field_type;
   const modifiers = _.path(`${structureFieldType}.modifiers`)(operators);
   const modifierValue = clause?.modifier;
-  const modifier = _.find({name: modifierValue?.name})(modifiers);
+  const modifier = _.find({ name: modifierValue?.name })(modifiers);
 
   const fieldType = modifier?.cast_as || structureFieldType;
   const nestedCondition = !_.isEmpty(siblings);
   const structureFields = getStructureFields(parentStructures);
 
-  const {operatorsOptions, getOperatorValue, typeCastModifiers} =
-    operatorFunctions(operators, fieldType, nestedCondition, scope, formatMessage);
+  const { operatorsOptions, getOperatorValue, typeCastModifiers } =
+    operatorFunctions(
+      operators,
+      fieldType,
+      nestedCondition,
+      scope,
+      formatMessage
+    );
 
   return (
     <Form.Group className={"force-margin-bottom"}>
@@ -54,7 +60,7 @@ export const FiltersFormGroup = ({
               <ValueConditionStructure
                 siblings={siblings}
                 value={clause?.structure?.id}
-                onChange={value => onStructureChange(index, value)}
+                onChange={(value) => onStructureChange(index, value)}
               />
             ) : (
               <StructureFieldsDropdown
@@ -62,7 +68,7 @@ export const FiltersFormGroup = ({
                 inline={false}
                 parentStructures={parentStructures}
                 structureFields={structureFields}
-                onSelectField={value => onStructureChange(index, value)}
+                onSelectField={(value) => onStructureChange(index, value)}
                 value={clause?.structure?.id}
               />
             )}
@@ -74,45 +80,53 @@ export const FiltersFormGroup = ({
               icon="ellipsis vertical"
             >
               <Dropdown.Menu>
-                {modifiers.map((modifier, key) =>
+                {modifiers.map((modifier, key) => (
                   <Dropdown.Item
                     key={key}
-                    icon={modifier.cast_as ? formatMessage({
-                      id: `field_type.icon.${modifier.cast_as}`,
-                      defaultMessage: "hashtag",
-                    }) : null}
-                    text={formatMessage({ id: `filtersGrid.field.modifier.${modifier.name}` })}
+                    icon={
+                      modifier.cast_as
+                        ? formatMessage({
+                            id: `field_type.icon.${modifier.cast_as}`,
+                            defaultMessage: "hashtag",
+                          })
+                        : null
+                    }
+                    text={formatMessage({
+                      id: `filtersGrid.field.modifier.${modifier.name}`,
+                    })}
                     onClick={() =>
-                      onModifierChange(index, {name: modifier.name})
+                      onModifierChange(index, { name: modifier.name })
                     }
                   />
-                )}
+                ))}
               </Dropdown.Menu>
             </Dropdown>
           )}
         </div>
-        {modifier && <FieldModifier
-          modifier={modifier}
-          value={modifierValue}
-          onChange = {(value) => onModifierChange(index, value)}
-          removable
-        />}
+        {modifier && (
+          <FieldModifier
+            modifier={modifier}
+            value={modifierValue}
+            onChange={(value) => onModifierChange(index, value)}
+            removable
+          />
+        )}
       </div>
       <Form.Field>
         <OptionGroup
           label={formatMessage({
-            id: "filtersGrid.field.operator"
+            id: "filtersGrid.field.operator",
           })}
           options={operatorsOptions}
           value={getOperatorValue(clause)}
           onClick={({ id }) => onOperatorChange(index, id)}
           placeholder={formatMessage({
-            id: "operator.dropdown.placeholder"
+            id: "operator.dropdown.placeholder",
           })}
         />
       </Form.Field>
       {!_.isEmpty(clause?.operator) &&
-        _.range(0, clause?.operator?.arity || 1).map(nth_value => (
+        _.range(0, clause?.operator?.arity || 1).map((nth_value) => (
           <Form.Field
             width={clause?.operator?.arity === 2 ? 4 : 9}
             key={`value_${nth_value}`}
@@ -125,7 +139,9 @@ export const FiltersFormGroup = ({
               value={_.nth(nth_value)(clause?.value)}
               modifier={_.nth(nth_value)(clause?.value_modifier)}
               label={formatMessage({ id: "filtersGrid.field.value" })}
-              onChange={(_e, value, modifier) => onValueChange(index, value, modifier, nth_value)}
+              onChange={(_e, value, modifier) =>
+                onValueChange(index, value, modifier, nth_value)
+              }
             />
           </Form.Field>
         ))}

package/src/components/ruleImplementationForm/FiltersGrid.js

@@ -22,7 +22,7 @@ export const FiltersGrid = ({
   const onStructureChange = (index, value) => {
     const structure = {
       ..._.pick(["field_type", "name"])(value),
-      id: value.data_structure_id
+      id: value.data_structure_id,
     };
     setRowValue({
       index,
@@ -31,8 +31,8 @@ export const FiltersGrid = ({
         modifier: null,
         operator: {},
         value: null,
-        value_modifier: null
-      }
+        value_modifier: null,
+      },
     });
   };
 
@@ -47,24 +47,24 @@ export const FiltersGrid = ({
         operator: {},
         value: null,
         value_modifier: null,
-        population: null
-      }
+        population: null,
+      },
     });
   };
 
   const composeValue = (value_type, value) => {
     if (value_type == "field") {
       return {
-        id: value.data_structure_id || value.id,
+        id: value.data_structure_id || value.id,
         name: value.name,
-        path: value.path
+        path: value.path,
       };
     } else {
       return { raw: value };
     }
   };
 
-  const onValueChange = (rowIndex, value, modifier=null, valueIndex) => {
+  const onValueChange = (rowIndex, value, modifier = null, valueIndex) => {
     const rowValue = _.nth(rowIndex)(rows);
     const value_type = _.path("operator.value_type")(rowValue);
 
@@ -80,11 +80,9 @@ export const FiltersGrid = ({
       valueIndex == 0
         ? [composeValue(value_type, value), secondValue]
         : [firstValue, composeValue(value_type, value)];
-    
+
     const updatedValueModifier =
-      valueIndex == 0
-        ? [modifier, secondModifier]
-        : [firstModifier, modifier];
+      valueIndex == 0 ? [modifier, secondModifier] : [firstModifier, modifier];
 
     setRowValue({
       index: rowIndex,
@@ -92,8 +90,8 @@ export const FiltersGrid = ({
         ...rowValue,
         value: _.take(arity)(updatedValue),
         value_modifier: _.take(arity)(updatedValueModifier),
-        population: null
-      }
+        population: null,
+      },
     });
   };
 
@@ -107,8 +105,8 @@ export const FiltersGrid = ({
         ...rowValue,
         operator: { ..._.omit(["group"])(operatorEntry) },
         value: null,
-        population: null
-      }
+        population: null,
+      },
     });
   };
 
@@ -118,8 +116,8 @@ export const FiltersGrid = ({
       index,
       value: {
         ...rowValue,
-        population
-      }
+        population,
+      },
     });
   };
 
@@ -158,7 +156,7 @@ FiltersGrid.propTypes = {
   setRowValue: PropTypes.func,
   scope: PropTypes.string,
   structures: PropTypes.array,
-  typeOperators: PropTypes.array
+  typeOperators: PropTypes.array,
 };
 
 export default FiltersGrid;

package/src/components/ruleImplementationForm/FiltersGroup.js

@@ -27,26 +27,27 @@ const Filter = ({
   const [activePopulation, setActivePopulation] = useState(
     !_.isEmpty(clause?.population)
   );
-  const conditionApplies = row =>
+  const conditionApplies = (row) =>
     row?.operator?.value_type_filter === "any" &&
     row?.operator?.value_type === "field" &&
     row?.operator?.population &&
     row?.value;
-  const onPopupClick = index => {
+  const onPopupClick = (index) => {
     const display = !activePopulation;
     !display && onConditionChange(index, null);
     !display && setActiveConditionIndex(-1);
     display && setActiveConditionIndex(index);
     setActivePopulation(display);
   };
-  const onValueConditionChange = value => {
+  const onValueConditionChange = (value) => {
     onConditionChange(index, value);
     if (_.isNil(value)) {
       setActiveConditionIndex(-1);
       setActivePopulation(false);
     }
   };
-  const findSiblings = row => _.filter(v => !_.isNil(v?.id))(row?.value || []);
+  const findSiblings = (row) =>
+    _.filter((v) => !_.isNil(v?.id))(row?.value || []);
   return (
     <>
       <Grid.Row>
@@ -76,7 +77,7 @@ const Filter = ({
               content={formatMessage({
                 id: _.isEmpty(clause?.population)
                   ? "filtersGrid.field.filters.popup"
-                  : "filtersGrid.field.filters.deletion.popup"
+                  : "filtersGrid.field.filters.deletion.popup",
               })}
               hideOnScroll
             />

package/src/components/ruleImplementationForm/PopulationForm.js

@@ -27,14 +27,14 @@ const PopulationTypeForm = ({ createFilter }) => (
 );
 
 PopulationTypeForm.propTypes = {
-  createFilter: PropTypes.func
+  createFilter: PropTypes.func,
 };
 
 export default function PopulationForm({
   typeOperators,
   population,
   structures,
-  setPopulation
+  setPopulation,
 }) {
   const setPopulationField = ({ index, value }) => {
     if (_.isNil(index)) {
@@ -61,5 +61,5 @@ PopulationForm.propTypes = {
   typeOperators: PropTypes.array,
   population: PropTypes.array,
   structures: PropTypes.array,
-  setPopulation: PropTypes.func
+  setPopulation: PropTypes.func,
 };

package/src/components/ruleImplementationForm/RuleImplementationForm.js

@@ -24,7 +24,7 @@ const RuleImplementationStep = ({ activeStep, name, icon }) => (
 RuleImplementationStep.propTypes = {
   activeStep: PropTypes.string,
   name: PropTypes.string,
-  icon: PropTypes.oneOfType([PropTypes.string, PropTypes.object])
+  icon: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
 };
 
 export const RuleImplementationForm = ({
@@ -37,7 +37,7 @@ export const RuleImplementationForm = ({
   handleSubmit,
   operators,
   onChange,
-  applyTemplate
+  applyTemplate,
 }) => {
   const { formatMessage } = useIntl();
   const history = useHistory();
@@ -45,14 +45,17 @@ export const RuleImplementationForm = ({
     { name: "information", icon: "info", isValid: () => true },
     { name: "dataset", icon: "database", isValid: () => validDataSet() },
     { name: "population", icon: "user", isValid: () => validPopulation() },
-    { name: "validations", icon: "setting", isValid: () => validValidations() }
+    { name: "validations", icon: "setting", isValid: () => validValidations() },
   ];
 
   const [activeStep, setActiveStep] = useState("information");
   const [selector, setSelector] = useState();
 
-  const { dataset: structures, population, validations } =
-    ruleImplementation || {};
+  const {
+    dataset: structures,
+    population,
+    validations,
+  } = ruleImplementation || {};
 
   const validPopulation = () =>
     _.every(_.isEmpty)(population) || populationComplete();
@@ -65,29 +68,29 @@ export const RuleImplementationForm = ({
   const areStructuresComplete = () =>
     !_.isEmpty(structures) &&
     _.every(
-      i =>
+      (i) =>
         itemComplete(_.nth(i)(structures), [
           "structure.id",
-          "structure.name"
+          "structure.name",
         ]) &&
         (i == 0 ||
           _.flow(_.nth(i), _.prop("clauses"), areClausesComplete)(structures))
     )(_.range(0, _.size(structures)));
 
-  const areClausesComplete = clauses =>
+  const areClausesComplete = (clauses) =>
     _.size(clauses) > 0 &&
-    _.every(c => itemComplete(c, ["left", "right"]))(clauses);
+    _.every((c) => itemComplete(c, ["left", "right"]))(clauses);
 
   const populationComplete = () =>
     _.flow(
       _.filter(_.negate(_.isEmpty)),
-      _.every(p => itemComplete(p, attrsFromProfile(p)))
+      _.every((p) => itemComplete(p, attrsFromProfile(p)))
     )(population);
 
   const validationsComplete = () =>
-    _.every(v => itemComplete(v, attrsFromProfile(v)))(validations);
+    _.every((v) => itemComplete(v, attrsFromProfile(v)))(validations);
 
-  const attrsFromProfile = p => {
+  const attrsFromProfile = (p) => {
     const valueType = p?.operator?.value_type;
     return _.isNil(valueType)
       ? ["operator"]
@@ -96,7 +99,7 @@ export const RuleImplementationForm = ({
 
   const itemComplete = (item, attrs) =>
     _.every(
-      attr =>
+      (attr) =>
         mandatoryAttr(attr, item) &&
         !emptyAttr(attr, item) &&
         validArity(attr, item) &&
@@ -114,7 +117,7 @@ export const RuleImplementationForm = ({
       const values = _.path(attr)(item);
       return (
         _.size(values) == _.path("operator.arity")(item) &&
-        _.every(v => !_.isNil(v))(values)
+        _.every((v) => !_.isNil(v))(values)
       );
     }
     return true;
@@ -123,18 +126,20 @@ export const RuleImplementationForm = ({
   const nestedValid = (attr, item) => {
     if (attr === "population" && !_.isNil(item?.population)) {
       const population = item?.population;
-      return _.every(p => itemComplete(p, attrsFromProfile(p)))(population);
+      return _.every((p) => itemComplete(p, attrsFromProfile(p)))(population);
     }
     return true;
   };
 
-  const setNextStep = stepName => {
+  const setNextStep = (stepName) => {
     const nextStep = getNextStep(stepName);
     if (nextStep) setActiveStep(nextStep);
   };
 
-  const getNextStep = stepName => {
-    const currentStepIndex = _.findIndex(step => step.name == stepName)(steps);
+  const getNextStep = (stepName) => {
+    const currentStepIndex = _.findIndex((step) => step.name == stepName)(
+      steps
+    );
     if (currentStepIndex + 1 >= steps.length) {
       return null;
     } else {
@@ -142,13 +147,15 @@ export const RuleImplementationForm = ({
     }
   };
 
-  const setPreviousStep = stepName => {
+  const setPreviousStep = (stepName) => {
     const previousStep = getPreviousStep(stepName);
     if (previousStep) setActiveStep(previousStep);
   };
 
-  const getPreviousStep = stepName => {
-    const currentStepIndex = _.findIndex(step => step.name == stepName)(steps);
+  const getPreviousStep = (stepName) => {
+    const currentStepIndex = _.findIndex((step) => step.name == stepName)(
+      steps
+    );
     if (currentStepIndex - 1 < 0) {
       return null;
     } else {
@@ -156,18 +163,18 @@ export const RuleImplementationForm = ({
     }
   };
 
-  const isButtonDisabled = currentStep => !validStep(currentStep);
+  const isButtonDisabled = (currentStep) => !validStep(currentStep);
 
-  const validStep = stepName =>
-    _.prop("isValid")(_.find(step => step.name == stepName)(steps))();
+  const validStep = (stepName) =>
+    _.prop("isValid")(_.find((step) => step.name == stepName)(steps))();
 
   const completeStep = (index, activeStep) => {
-    if (index >= _.findIndex(s => s.name == activeStep)(steps)) return false;
+    if (index >= _.findIndex((s) => s.name == activeStep)(steps)) return false;
     return _.prop("isValid")(_.nth(index)(steps))();
   };
 
   const doSubmit = () => {
-    if (_.every(s => _.prop("isValid")(s)())(steps)) {
+    if (_.every((s) => _.prop("isValid")(s)())(steps)) {
       handleSubmit();
     }
   };
@@ -201,7 +208,7 @@ export const RuleImplementationForm = ({
                 setImplementationKey,
                 ruleImplementation,
                 onChange,
-                applyTemplate
+                applyTemplate,
               }}
             />
           )}
@@ -212,7 +219,7 @@ export const RuleImplementationForm = ({
                 structures,
                 selector,
                 setStructures,
-                setSelector
+                setSelector,
               }}
             />
           )}
@@ -280,11 +287,11 @@ RuleImplementationForm.propTypes = {
   setValidations: PropTypes.func,
   operators: PropTypes.object,
   onChange: PropTypes.func,
-  applyTemplate: PropTypes.func
+  applyTemplate: PropTypes.func,
 };
 
-const mapStateToProps = state => ({
-  isSubmitting: state.ruleImplementationCreating
+const mapStateToProps = (state) => ({
+  isSubmitting: state.ruleImplementationCreating,
 });
 
 export default connect(mapStateToProps)(RuleImplementationForm);

package/src/components/ruleImplementationForm/ValueConditions.js

@@ -13,13 +13,13 @@ export const ValueConditions = ({
   population = [],
   parentStructures,
   scope,
-  siblings
+  siblings,
 }) => {
   const onStructureChange = (index, value, opts) => {
     const structure = {
       ..._.pick(["field_type", "name", "data_structure_id"])(value),
       id: value?.data_structure_id,
-      opts
+      opts,
     };
     const updatedCondition = { structure };
     const modifiedPopulation = replaceAt(index, updatedCondition)(population);
@@ -32,7 +32,7 @@ export const ValueConditions = ({
     const updatedCondition = {
       ...clause,
       operator: _.omit(["group"])(operatorEntry),
-      value: null
+      value: null,
     };
     const modifiedPopulation = replaceAt(index, updatedCondition)(population);
     onChange && onChange(modifiedPopulation);
@@ -48,13 +48,13 @@ export const ValueConditions = ({
 
     const updatedCondition = {
       ...clause,
-      value: _.take(arity)(modifiedValues)
+      value: _.take(arity)(modifiedValues),
     };
     const modifiedPopulation = replaceAt(index, updatedCondition)(population);
     onChange && onChange(modifiedPopulation);
   };
 
-  const onRowDelete = index => {
+  const onRowDelete = (index) => {
     if (index === 0 && _.size(population) === 1) {
       onChange(null);
     } else {
@@ -105,7 +105,7 @@ ValueConditions.propTypes = {
   onChange: PropTypes.func,
   parentStructures: PropTypes.array,
   scope: PropTypes.string,
-  siblings: PropTypes.array
+  siblings: PropTypes.array,
 };
 
 export default ValueConditions;