@truedat/dq 4.53.6 → 4.53.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.53.7] 2022-10-14
+
+### Added
+
+- [TD-3087] Add OR/AND in implementations validations
+
 ## [4.53.6] 2022-10-13
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.53.6",
+  "version": "4.53.7",
   "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.53.6",
+    "@truedat/test": "4.53.7",
     "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.6.4",
-    "@truedat/core": "4.53.6",
-    "@truedat/df": "4.53.6",
+    "@truedat/core": "4.53.7",
+    "@truedat/df": "4.53.7",
     "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": "ff29c0e4f51c049077545c425533dd45a704e440"
+  "gitHead": "beccd8ba2a5af9a3e0e1690b97d7c756b59e9c2b"
 }

package/src/components/ConditionSummary.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
 import React, { Fragment } from "react";
 import PropTypes from "prop-types";
-import { Header, Icon, Segment, Table } from "semantic-ui-react";
+import { Divider, Header, Icon, Segment, Table } from "semantic-ui-react";
 import { Link } from "react-router-dom";
 import { FormattedMessage } from "react-intl";
 import { useIntl } from "react-intl";
@@ -235,7 +235,7 @@ export const ConditionSummary = ({ rows, type, icon, alias }) => {
         <Header.Content>
           {areMultidimensionalRows ? (
             <FormattedMessage
-              id={`ruleImplementations.summary.headers.${type}s`}
+              id={`ruleImplementations.summary.headers.${type}.plural`}
             />
           ) : (
             <FormattedMessage
@@ -245,30 +245,39 @@ export const ConditionSummary = ({ rows, type, icon, alias }) => {
         </Header.Content>
       </Header>
       {wrappedRows.map((rows, i) => (
-        <Segment key={i}>
-          <Table basic="very">
-            <Table.Header>
-              <Table.Row>
-                <Table.HeaderCell>
-                  <FormattedMessage id={`ruleImplementation.summary.field`} />
-                </Table.HeaderCell>
-                <Table.HeaderCell>
-                  <FormattedMessage
-                    id={`ruleImplementation.summary.operator`}
-                  />
-                </Table.HeaderCell>
-                <Table.HeaderCell>
-                  <FormattedMessage id={`ruleImplementation.summary.values`} />
-                </Table.HeaderCell>
-              </Table.Row>
-            </Table.Header>
-            <Table.Body>
-              {rows.map((row, i) => (
-                <ConditionCell key={i} row={row} alias={alias} />
-              ))}
-            </Table.Body>
-          </Table>
-        </Segment>
+        <Fragment key={i}>
+          <Segment>
+            <Table basic="very">
+              <Table.Header>
+                <Table.Row>
+                  <Table.HeaderCell>
+                    <FormattedMessage id={`ruleImplementation.summary.field`} />
+                  </Table.HeaderCell>
+                  <Table.HeaderCell>
+                    <FormattedMessage
+                      id={`ruleImplementation.summary.operator`}
+                    />
+                  </Table.HeaderCell>
+                  <Table.HeaderCell>
+                    <FormattedMessage
+                      id={`ruleImplementation.summary.values`}
+                    />
+                  </Table.HeaderCell>
+                </Table.Row>
+              </Table.Header>
+              <Table.Body>
+                {rows.map((row, i) => (
+                  <ConditionCell key={i} row={row} alias={alias} />
+                ))}
+              </Table.Body>
+            </Table>
+          </Segment>
+          {i < wrappedRows.length - 1 ? (
+            <Divider horizontal>
+              <FormattedMessage id={"ruleImplementations.or"} />
+            </Divider>
+          ) : null}
+        </Fragment>
       ))}
     </>
   );

package/src/components/ImplementationSummary.js

@@ -173,22 +173,22 @@ export const ImplementationSummary = ({ ruleImplementation, activeSteps }) => {
           alias={alias}
         />
       ) : null}
-      {validations && _.includes("validations")(steps) && (
+      {validations && _.includes("validations")(steps) ? (
         <ConditionSummary
           type="validations"
           icon="setting"
           rows={validations}
           alias={alias}
         />
-      )}
-      {segments && _.includes("segments")(steps) && (
+      ) : null}
+      {segments && _.includes("segments")(steps) ? (
         <FieldSummary
           type="segments"
           icon="grid layout"
           rows={segments}
           alias={alias}
         />
-      )}
+      ) : null}
     </>
   );
 };

package/src/components/NewRuleImplementation.js

@@ -98,8 +98,8 @@ const conditionAttributes = (condition) =>
     _.map(updateConditionKey)
   )(condition);
 
-const populationsAttributes = (populations) =>
-  _.flow(_.map(conditionAttributes))(populations);
+const conditionsAttributes = (conditions) =>
+  _.flow(_.map(conditionAttributes))(conditions);
 
 const fieldTypeFromStructure = (row, structures, operators, scope) => {
   const structure = _.prop("structure")(row);
@@ -287,17 +287,22 @@ export const NewRuleImplementation = ({
               )
             )
           )(ruleImplementationProps),
-          validations: withConditionDefaultAlias(
-            addFieldType(
-              ruleImplementationProps,
-              structuresFields,
-              structuresSiblings,
-              "validations",
-              "validation",
-              operators
-            ),
-            precalculatedDataset
-          ),
+          validations: _.flow(
+            _.pathOr([], "validations"),
+            _.map((validation) =>
+              withConditionDefaultAlias(
+                addFieldType(
+                  { validation: validation },
+                  structuresFields,
+                  structuresSiblings,
+                  "validation",
+                  "validation",
+                  operators
+                ),
+                precalculatedDataset
+              )
+            )
+          )(ruleImplementationProps),
           segments: withConditionDefaultAlias(
             addFieldType(
               ruleImplementationProps,
@@ -330,7 +335,7 @@ export const NewRuleImplementation = ({
           dataset: [{}],
           population: [],
           populations: [],
-          validations: [{}],
+          validations: [[{}]],
           segments: [{}],
           rawContent: {
             database: "",
@@ -393,36 +398,36 @@ export const NewRuleImplementation = ({
       _.isNil(_.path("value[0].id")(val)) ||
       belongsToDataset(_.path("value[0].id")(val));
 
-    const validations_within_dataset = _.flow(
-      _.prop("validations"),
-      _.filter((val) => belongsToDataset(_.path("structure.id")(val))),
-      _.filter((val) => valueInDataset(val))
+    const withinDataset = (val) =>
+      belongsToDataset(_.path("structure.id")(val)) && valueInDataset(val);
+
+    const populationsWithinDataset = _.flow(
+      _.prop("populations"),
+      _.map((population) => _.filter(withinDataset)(population)),
+      _.reject(_.isEmpty)
     )(ruleImplementation);
 
-    const segments_within_dataset = _.flow(
-      _.prop("segments"),
-      _.filter((val) => belongsToDataset(_.path("structure.id")(val))),
-      _.filter((val) => valueInDataset(val))
+    const validationsWithinDataset = _.flow(
+      _.prop("validations"),
+      _.map((validation) => _.filter(withinDataset)(validation)),
+      _.reject(_.isEmpty)
     )(ruleImplementation);
 
-    const population_within_dataset = _.flow(
-      _.prop("population"),
-      _.filter((val) => belongsToDataset(_.path("structure.id")(val))),
-      _.filter((val) => valueInDataset(val))
+    const segmentsWithinDataset = _.flow(
+      _.prop("segments"),
+      _.filter(withinDataset)
     )(ruleImplementation);
 
     setRuleImplementation({
       ...ruleImplementation,
       dataset: cleanDataset,
-      population: _.isEmpty(population_within_dataset)
+      populations: _.isEmpty(populationsWithinDataset)
         ? []
-        : population_within_dataset,
-      validations: _.isEmpty(validations_within_dataset)
-        ? [{}]
-        : validations_within_dataset,
-      segments: _.isEmpty(segments_within_dataset)
-        ? []
-        : segments_within_dataset,
+        : populationsWithinDataset,
+      validations: _.isEmpty(validationsWithinDataset)
+        ? [[{}]]
+        : validationsWithinDataset,
+      segments: _.isEmpty(segmentsWithinDataset) ? [] : segmentsWithinDataset,
     });
   };
 
@@ -446,11 +451,27 @@ export const NewRuleImplementation = ({
     setRuleImplementation({ ...ruleImplementation, populations: populations });
   };
 
-  const setValidations = (validations) => {
-    setRuleImplementation({ ...ruleImplementation, validations });
+  const addValidation = () => {
+    const validations = _.concat(
+      _.pathOr([[{}]], "validations")(ruleImplementation)
+    )([[{}]]);
+    setRuleImplementation({ ...ruleImplementation, validations: validations });
+  };
+
+  const setValidations = (validation, index) => {
+    const validations = _.flow(
+      _.pathOr([], "validations"),
+      _.update(`[${index}]`, (_previousValidation) => validation),
+      _.reject(_.isEmpty)
+    )(ruleImplementation);
+
+    setRuleImplementation({
+      ...ruleImplementation,
+      validations: _.isEmpty(validations) ? [[{}]] : validations,
+    });
   };
 
-  const addSegments = () => {
+  const addSegment = () => {
     const segments = _.concat(_.pathOr([], "segments")(ruleImplementation))([
       {},
     ]);
@@ -495,8 +516,8 @@ export const NewRuleImplementation = ({
         : {
             executable: ruleImplementation.executable,
             dataset: datasetAttributes(ruleImplementation.dataset),
-            populations: populationsAttributes(populations),
-            validations: conditionAttributes(validations),
+            populations: conditionsAttributes(populations),
+            validation: conditionsAttributes(validations),
             segments,
             implementation_key: ruleImplementation.implementationKey,
             implementation_type: ruleImplementation.implementationType,
@@ -555,7 +576,8 @@ export const NewRuleImplementation = ({
           ) : (
             <RuleImplementationForm
               addPopulation={addPopulation}
-              addSegments={addSegments}
+              addValidation={addValidation}
+              addSegment={addSegment}
               onSubmit={doSubmit}
               onChange={onChange}
               operators={operators}

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

@@ -12,7 +12,7 @@ const renderOpts = {
       "quality.threshold": "threshold",
       "quality.goal": "goal",
       "ruleImplementations.props.result_type.percentage": "percentage",
-      "ruleImplementations.summary.headers.populations": "populations",
+      "ruleImplementations.summary.headers.population.plural": "populations",
       "ruleImplementation.summary.field": "Field",
       "ruleImplementation.summary.operator": "Operator",
       "ruleImplementation.summary.structure": "Structure",

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

@@ -149,20 +149,22 @@ describe("<NewRuleImplementation> NewRuleImplementation doSubmit", () => {
   it("doSubmit: is empty operator", async () => {
     const expectedRuleImplementation = {
       ...expectedRuleImplementationBase,
-      validations: [
-        {
-          modifier: null,
-          operator: { name: "empty" },
-          population: [],
-          structure: {
-            id: 11127109,
-            parent_index: 4,
-            name: "EMAIL",
-            type: "column",
+      validation: [
+        [
+          {
+            modifier: null,
+            operator: { name: "empty" },
+            population: [],
+            structure: {
+              id: 11127109,
+              parent_index: 4,
+              name: "EMAIL",
+              type: "column",
+            },
+            value: [],
+            value_modifier: [],
           },
-          value: [],
-          value_modifier: [],
-        },
+        ],
       ],
     };
 
@@ -245,39 +247,41 @@ describe("<NewRuleImplementation> NewRuleImplementation doSubmit", () => {
   it("doSubmit: unique across fields operator", async () => {
     const expectedRuleImplementation = {
       ...expectedRuleImplementationBase,
-      validations: [
-        {
-          modifier: null,
-          operator: { name: "unique", value_type: "field_list" },
-          population: [],
-          structure: {
-            id: 11127109,
-            parent_index: 4,
-            name: "EMAIL",
-            type: "column",
-          },
-          value: [
-            {
-              fields: [
-                {
-                  id: 11127109,
-                  name: "EMAIL",
-                  parent_index: 4,
-                  path: undefined,
-                  type: "column",
-                },
-                {
-                  id: 11127116,
-                  name: "PHONE_NUMBER",
-                  parent_index: 4,
-                  path: undefined,
-                  type: "column",
-                },
-              ],
+      validation: [
+        [
+          {
+            modifier: null,
+            operator: { name: "unique", value_type: "field_list" },
+            population: [],
+            structure: {
+              id: 11127109,
+              parent_index: 4,
+              name: "EMAIL",
+              type: "column",
             },
-          ],
-          value_modifier: [],
-        },
+            value: [
+              {
+                fields: [
+                  {
+                    id: 11127109,
+                    name: "EMAIL",
+                    parent_index: 4,
+                    path: undefined,
+                    type: "column",
+                  },
+                  {
+                    id: 11127116,
+                    name: "PHONE_NUMBER",
+                    parent_index: 4,
+                    path: undefined,
+                    type: "column",
+                  },
+                ],
+              },
+            ],
+            value_modifier: [],
+          },
+        ],
       ],
     };
 

package/src/components/__tests__/__fixtures__/NewRuleImplementationProps.js

@@ -205,32 +205,34 @@ export const newRuleImplementationProps = {
       df_content: {},
     },
     validations: [
-      {
-        operator: {
-          name: "length_not_eq",
-          value_type: "number",
-        },
-        structure: {
-          external_id: "/data/example.txt[agent]",
-          id: 4814766,
-          metadata: {
-            metadata: { order: "6" },
+      [
+        {
+          operator: {
+            name: "length_not_eq",
+            value_type: "number",
           },
-          name: "agent",
-          path: ["Main", "example.txt"],
-          system: {
-            external_id: "file_system",
-            id: 33,
-            name: "File System",
+          structure: {
+            external_id: "/data/example.txt[agent]",
+            id: 4814766,
+            metadata: {
+              metadata: { order: "6" },
+            },
+            name: "agent",
+            path: ["Main", "example.txt"],
+            system: {
+              external_id: "file_system",
+              id: 33,
+              name: "File System",
+            },
+            type: "Column",
           },
-          type: "Column",
+          value: [
+            {
+              raw: 2,
+            },
+          ],
         },
-        value: [
-          {
-            raw: 2,
-          },
-        ],
-      },
+      ],
     ],
     segments: [
       {

package/src/components/__tests__/__fixtures__/newRuleImplementationHelper.js

@@ -13,7 +13,6 @@ const structuresFields = {
   11127104: [
     {
       data_structure_id: 11127108,
-      data_type_class: "number",
       deleted_at: null,
       description:
         "Department id where employee works; foreign key to department_id column of the departments table",
@@ -21,6 +20,7 @@ const structuresFields = {
       links: [],
       name: "DEPARTMENT_ID",
       metadata: {
+        data_type_class: "number",
         database: "xe",
         default: "None",
         host: "localhost",
@@ -34,13 +34,13 @@ const structuresFields = {
     },
     {
       data_structure_id: 11127111,
-      data_type_class: "string",
       deleted_at: null,
       description: "First name of the employee. A not null column.",
       inserted_at: "2022-04-12T14:28:06.057667Z",
       links: [],
       name: "FIRST_NAME",
       metadata: {
+        data_type_class: "string",
         database: "xe",
         default: "None",
         host: "localhost",
@@ -54,7 +54,6 @@ const structuresFields = {
     },
     {
       data_structure_id: 11127117,
-      data_type_class: "number",
       deleted_at: null,
       description:
         "Monthly salary of the employee. Must be greater than zero (enforced by constraint emp_salary_min)",
@@ -75,7 +74,6 @@ const structuresFields = {
     },
     {
       data_structure_id: 11127116,
-      data_type_class: "string",
       deleted_at: null,
       description:
         "Phone number of the employee; includes country code and area code",
@@ -84,6 +82,7 @@ const structuresFields = {
       name: "PHONE_NUMBER",
       type: "column",
       metadata: {
+        data_type_class: "string",
         database: "xe",
         default: "None",
         host: "localhost",
@@ -97,7 +96,6 @@ const structuresFields = {
     },
     {
       data_structure_id: 11127115,
-      data_type_class: "number",
       deleted_at: null,
       description:
         "Manager id of the employee; has same domain as manager_id in departments table. Foreign key to employee_id column of employees table. (useful for reflexive joins and CONNECT BY query)",
@@ -106,6 +104,7 @@ const structuresFields = {
       name: "MANAGER_ID",
       type: "NUMBER",
       metadata: {
+        data_type_class: "number",
         database: "xe",
         default: "None",
         host: "localhost",
@@ -118,7 +117,6 @@ const structuresFields = {
     },
     {
       data_structure_id: 11127109,
-      data_type_class: "string",
       deleted_at: null,
       description: "Email id of the employee",
       inserted_at: "2022-04-12T14:28:06.057667Z",
@@ -126,6 +124,7 @@ const structuresFields = {
       name: "EMAIL",
       type: "column",
       metadata: {
+        data_type_class: "string",
         database: "xe",
         default: "None",
         host: "localhost",
@@ -139,13 +138,13 @@ const structuresFields = {
     },
     {
       data_structure_id: 11127110,
-      data_type_class: "number",
       deleted_at: null,
       description: "Primary key of employees table.",
       inserted_at: "2022-04-12T14:28:06.057667Z",
       links: [],
       name: "EMPLOYEE_ID",
       metadata: {
+        data_type_class: "number",
         database: "xe",
         default: "None",
         host: "localhost",
@@ -160,13 +159,13 @@ const structuresFields = {
     },
     {
       data_structure_id: 11127114,
-      data_type_class: "string",
       deleted_at: null,
       description: "Last name of the employee. A not null column.",
       inserted_at: "2022-04-12T14:28:06.057667Z",
       links: [],
       name: "LAST_NAME",
       metadata: {
+        data_type_class: "string",
         database: "xe",
         default: "None",
         host: "localhost",
@@ -180,7 +179,6 @@ const structuresFields = {
     },
     {
       data_structure_id: 11127112,
-      data_type_class: "date",
       deleted_at: null,
       description:
         "Date when the employee started on this job. A not null column.",
@@ -188,6 +186,7 @@ const structuresFields = {
       links: [],
       name: "HIRE_DATE",
       metadata: {
+        data_type_class: "date",
         database: "xe",
         default: "None",
         host: "localhost",
@@ -201,7 +200,6 @@ const structuresFields = {
     },
     {
       data_structure_id: 11127113,
-      data_type_class: "string",
       deleted_at: null,
       description:
         "Current job of the employee; foreign key to job_id column of the jobs table. A not null column.",
@@ -209,6 +207,7 @@ const structuresFields = {
       links: [],
       name: "JOB_ID",
       metadata: {
+        data_type_class: "string",
         database: "xe",
         default: "None",
         host: "localhost",
@@ -222,7 +221,6 @@ const structuresFields = {
     },
     {
       data_structure_id: 11127107,
-      data_type_class: "number",
       deleted_at: null,
       description:
         "Commission percentage of the employee; Only employees in sales department elgible for commission percentage",
@@ -230,6 +228,7 @@ const structuresFields = {
       links: [],
       name: "COMMISSION_PCT",
       metadata: {
+        data_type_class: "number",
         database: "xe",
         default: "None",
         host: "localhost",
@@ -374,7 +373,7 @@ const ruleImplementation = {
   rule_id: null,
   segments: [],
   status: "draft",
-  validations: [],
+  validations: [[]],
   version: 2,
 };
 

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

@@ -653,7 +653,7 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
         <div
           class="content"
         >
-          Validation
+          Validations
         </div>
       </h3>
       <div
@@ -1370,6 +1370,67 @@ exports[`<NewRuleImplementation /> matches the latest snapshot 1`] = `
           </div>
         </div>
       </div>
+      <h3
+        class="ui header"
+      >
+        <i
+          aria-hidden="true"
+          class="setting small icon"
+        />
+        <div
+          class="content"
+        >
+          Validations
+        </div>
+      </h3>
+      <div
+        class="ui segment"
+      >
+        <table
+          class="ui very basic table"
+        >
+          <thead
+            class=""
+          >
+            <tr
+              class=""
+            >
+              <th
+                class=""
+              >
+                Field
+              </th>
+              <th
+                class=""
+              >
+                Operator
+              </th>
+              <th
+                class=""
+              >
+                Values
+              </th>
+            </tr>
+          </thead>
+          <tbody
+            class=""
+          >
+            <tr
+              class=""
+            >
+              <td
+                class="five wide"
+              />
+              <td
+                class="five wide"
+              />
+              <td
+                class="five wide"
+              />
+            </tr>
+          </tbody>
+        </table>
+      </div>
     </div>
   </div>
 </div>

package/src/components/ruleImplementationForm/FiltersGrid.js

@@ -142,7 +142,7 @@ export const FiltersGrid = ({
 
   return (
     <>
-      <Grid verticalAlign="middle" divided="vertically">
+      <Grid verticalAlign="middle">
         <FiltersGroup
           activeConditionIndex={activeConditionIndex}
           allOperators={allOperators}

package/src/components/ruleImplementationForm/FiltersGroup.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import React, { Fragment, useState } from "react";
 import { useIntl } from "react-intl";
-import { Accordion, Grid, Icon, Popup } from "semantic-ui-react";
+import { Accordion, Divider, Grid, Icon, Popup } from "semantic-ui-react";
 import PropTypes from "prop-types";
 import ValueConditions from "./ValueConditions";
 import FiltersFormGroup from "./FiltersFormGroup";
@@ -158,24 +158,26 @@ export const FiltersGroup = ({
   scope,
 }) => {
   return rows.map((clause, index) => (
-    <Filter
-      key={index}
-      activeConditionIndex={activeConditionIndex}
-      allOperators={allOperators}
-      operators={operators}
-      composeValue={composeValue}
-      clause={clause}
-      index={index}
-      onConditionChange={onConditionChange}
-      onOperatorChange={onOperatorChange}
-      onStructureChange={onStructureChange}
-      onValueChange={onValueChange}
-      onModifierChange={onModifierChange}
-      parentStructures={parentStructures}
-      setActiveConditionIndex={setActiveConditionIndex}
-      setRowValue={setRowValue}
-      scope={scope}
-    />
+    <Fragment key={index}>
+      <Filter
+        activeConditionIndex={activeConditionIndex}
+        allOperators={allOperators}
+        operators={operators}
+        composeValue={composeValue}
+        clause={clause}
+        index={index}
+        onConditionChange={onConditionChange}
+        onOperatorChange={onOperatorChange}
+        onStructureChange={onStructureChange}
+        onValueChange={onValueChange}
+        onModifierChange={onModifierChange}
+        parentStructures={parentStructures}
+        setActiveConditionIndex={setActiveConditionIndex}
+        setRowValue={setRowValue}
+        scope={scope}
+      />
+      {index < rows.length - 1 ? <Divider /> : null}
+    </Fragment>
   ));
 };
 

package/src/components/ruleImplementationForm/RuleImplementationForm.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useEffect, useState } from "react";
+import React, { Fragment, useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useHistory } from "react-router-dom";
@@ -45,7 +45,8 @@ RuleImplementationStep.propTypes = {
 
 export const RuleImplementationForm = ({
   addPopulation,
-  addSegments,
+  addSegment,
+  addValidation,
   isSubmitting,
   onChange,
   onSubmit,
@@ -122,10 +123,6 @@ export const RuleImplementationForm = ({
       !!ruleImplementation?.domain_id &&
       areLimitsValid(ruleImplementation);
 
-    const validValidations = () =>
-      _.every(_.negate(_.isEmpty))(validations) &&
-      validationsComplete(validations);
-
     const validSegments = () => _.every(_.negate(_.isEmpty))(segments);
 
     const validDataSet = () => areStructuresComplete();
@@ -158,7 +155,7 @@ export const RuleImplementationForm = ({
         {
           name: "validations",
           icon: "setting",
-          isValid: () => validValidations(),
+          isValid: () => validValidations(validations),
         },
         ...(canManageSegmentsAnyDomain
           ? [
@@ -192,7 +189,13 @@ export const RuleImplementationForm = ({
     _.every(_.negate(_.isEmpty))(population) &&
     _.every((p) => itemComplete(p, attrsFromProfile(p)))(population);
 
+  const validValidations = (validationsSet) =>
+    _.every(
+      (validations) => _.negate(_.isEmpty) && validationsComplete(validations)
+    )(validationsSet);
+
   const validationsComplete = (validations) =>
+    _.negate(_.isEmpty)(validations) &&
     _.every((v) => itemComplete(v, attrsFromProfile(v)))(validations);
 
   const attrsFromProfile = (p) => {
@@ -361,14 +364,23 @@ export const RuleImplementationForm = ({
             {activeStep == "populations" ? (
               <>
                 {populations.map((population, i) => (
-                  <Segment key={i}>
-                    <PopulationForm
-                      population={population}
-                      setPopulation={(p) => setPopulations(p, i)}
-                      structures={structures}
-                      typeOperators={operators}
-                    />
-                  </Segment>
+                  <Fragment key={i}>
+                    <Segment>
+                      <PopulationForm
+                        population={population}
+                        setPopulation={(p) => setPopulations(p, i)}
+                        structures={structures}
+                        typeOperators={operators}
+                      />
+                    </Segment>
+                    {i < populations.length - 1 ? (
+                      <Divider horizontal>
+                        {formatMessage({
+                          id: "ruleImplementations.or",
+                        })}
+                      </Divider>
+                    ) : null}
+                  </Fragment>
                 ))}
                 {_.flow(_.flatten, _.isEmpty)(populations) ? (
                   <PopulationTypeForm createFilter={() => addPopulation()} />
@@ -383,18 +395,42 @@ export const RuleImplementationForm = ({
                 ) : null}
               </>
             ) : null}
-            {activeStep == "validations" && (
-              <ValidationsForm
-                validations={validations}
-                setValidations={setValidations}
-                structures={structures}
-                typeOperators={operators}
-              />
-            )}
+            {activeStep == "validations" ? (
+              <>
+                {validations.map((validation, i) => (
+                  <Fragment key={i}>
+                    <Segment>
+                      <ValidationsForm
+                        validations={validation}
+                        setValidations={(v) => setValidations(v, i)}
+                        structures={structures}
+                        typeOperators={operators}
+                      />
+                    </Segment>
+                    {i < validations.length - 1 ? (
+                      <Divider horizontal>
+                        {formatMessage({
+                          id: "ruleImplementations.or",
+                        })}
+                      </Divider>
+                    ) : null}
+                  </Fragment>
+                ))}
+                {validValidations(validations) ? (
+                  <Button
+                    secondary
+                    onClick={() => addValidation()}
+                    content={formatMessage({
+                      id: "ruleImplementationForm.validations.add",
+                    })}
+                  />
+                ) : null}
+              </>
+            ) : null}
             {activeStep == "segments" ? (
               <>
                 {_.flow(_.flatten, _.isEmpty)(segments) ? (
-                  <SegmentsTypeForm createFilter={() => addSegments()} />
+                  <SegmentsTypeForm createFilter={() => addSegment()} />
                 ) : (
                   <SegmentsForm
                     segments={segments}
@@ -466,7 +502,8 @@ export const RuleImplementationForm = ({
 
 RuleImplementationForm.propTypes = {
   addPopulation: PropTypes.func,
-  addSegments: PropTypes.func,
+  addValidation: PropTypes.func,
+  addSegment: PropTypes.func,
   authManageSegments: PropTypes.bool,
   isAdmin: PropTypes.bool,
   isSubmitting: PropTypes.bool,

package/src/components/ruleImplementationForm/ValidationsForm.js

@@ -17,8 +17,7 @@ export const ValidationsForm = ({
       const validation = { ..._.nth(index)(validations), ...value };
       setValidations(replaceAt(index, validation)(validations));
     } else {
-      const array = dropAt(index)(validations);
-      setValidations(_.isEmpty(array) ? [{}] : array);
+      setValidations(dropAt(index)(validations));
     }
   };
 

package/src/messages/en.js

@@ -467,12 +467,14 @@ export default {
   "ruleImplementation.system.placeholder": "Select a system",
   "ruleImplementation.table": "Table",
   "ruleImplementation.table.placeholder": "Select a table",
+  "ruleImplementationForm.condition.add": "Add condition",
   "ruleImplementationForm.populations.add": "Add population",
   "ruleImplementationForm.step.dataset": "Data Set",
   "ruleImplementationForm.step.information": "Information",
   "ruleImplementationForm.step.populations": "Populations",
   "ruleImplementationForm.step.segments": "Segments",
   "ruleImplementationForm.step.validations": "Validations",
+  "ruleImplementationForm.validations.add": "Add validations",
   "ruleImplementationRawForm.props.database": "Database",
   "ruleImplementationRawForm.props.database.placeholder": "Select database",
   "ruleImplementationRawForm.props.dataset": "Dataset",
@@ -512,6 +514,7 @@ export default {
   "ruleImplementations.events.action_restored": "Implementation restored",
   "ruleImplementations.events.action_updated": "Implementation updated",
   "ruleImplementations.events.action_versioned": "Implementation versioned",
+  "ruleImplementations.or": "OR",
   "ruleImplementations.props.business_concept": "Concept",
   "ruleImplementations.props.executable": "Executable",
   "ruleImplementations.props.executable.false": "Internal",
@@ -549,9 +552,10 @@ export default {
   "ruleImplementations.summary.headers.filters": "Filters",
   "ruleImplementations.summary.headers.implementation": "Rule Implementation",
   "ruleImplementations.summary.headers.population": "Population",
-  "ruleImplementations.summary.headers.populations": "Populations",
+  "ruleImplementations.summary.headers.population.plural": "Populations",
   "ruleImplementations.summary.headers.segments": "Segments",
-  "ruleImplementations.summary.headers.validations": "Validation",
+  "ruleImplementations.summary.headers.validations": "Validations",
+  "ruleImplementations.summary.headers.validations.plural": "Validations",
   "ruleImplementations.update.success.header.implementation_unchanged":
     "The implementation has not changed",
   "ruleImplementations.upload.failed.header":

package/src/messages/es.js

@@ -477,12 +477,14 @@ export default {
   "ruleImplementation.system.placeholder": "Seleccionar sistema",
   "ruleImplementation.table": "Tabla",
   "ruleImplementation.table.placeholder": "Seleccionar tabla",
+  "ruleImplementationForm.condition.add": "Añadir condición",
   "ruleImplementationForm.populations.add": "Añadir población",
   "ruleImplementationForm.step.dataset": "Datos",
   "ruleImplementationForm.step.information": "Información",
   "ruleImplementationForm.step.populations": "Poblaciones",
   "ruleImplementationForm.step.segments": "Segmentos",
   "ruleImplementationForm.step.validations": "Validaciones",
+  "ruleImplementationForm.validations.add": "Añadir validación",
   "ruleImplementationRawForm.props.database": "Base de datos",
   "ruleImplementationRawForm.props.database.placeholder":
     "Seleccionar base de datos",
@@ -528,6 +530,7 @@ export default {
   "ruleImplementations.events.action_restored": "Implementación restaurada",
   "ruleImplementations.events.action_updated": "Implementación actualizada",
   "ruleImplementations.events.action_versioned": "Implementación versionada",
+  "ruleImplementations.or": "OR",
   "ruleImplementations.props.business_concept": "Concepto",
   "ruleImplementations.props.executable": "Ejecutable",
   "ruleImplementations.props.executable.false": "Interna",
@@ -570,9 +573,10 @@ export default {
   "ruleImplementations.summary.headers.implementation":
     "Implementación de una Regla",
   "ruleImplementations.summary.headers.population": "Población",
-  "ruleImplementations.summary.headers.populations": "Poblaciones",
+  "ruleImplementations.summary.headers.population.plural": "Poblaciones",
   "ruleImplementations.summary.headers.segments": "Segmentos",
   "ruleImplementations.summary.headers.validations": "Validaciones",
+  "ruleImplementations.summary.headers.validations.plural": "Validaciones",
   "ruleImplementations.update.success.header.implementation_unchanged":
     "La implementación no ha cambiado",
   "ruleImplementations.upload.failed.header":

package/src/reducers/ruleImplementation.js

@@ -39,7 +39,10 @@ const ruleImplementation = (state = initialState, { type, payload }) => {
     case fetchRuleImplementation.TRIGGER:
       return initialState;
     case fetchRuleImplementation.SUCCESS:
-      return pickFields(payload.data);
+      return pickFields({
+        ...payload.data,
+        validations: payload.data.validation,
+      });
     case clearRuleImplementation.TRIGGER:
       return initialState;
     default: