@truedat/dq 4.41.5 → 4.42.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.42.1] 2022-04-12
+
+# Changed
+
+- [TD-4536] Support rule implementation with multiple populations
+
 ## [4.41.4] 2022-04-04
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "4.41.5",
+  "version": "4.42.2",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -31,7 +31,7 @@
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
-    "@truedat/test": "4.41.5",
+    "@truedat/test": "4.42.0",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -82,8 +82,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.4.10",
-    "@truedat/core": "4.41.5",
-    "@truedat/df": "4.41.5",
+    "@truedat/core": "4.42.2",
+    "@truedat/df": "4.42.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": "a4436b1f8d9fcf01424b44e6a7fc26ad1159a45c"
+  "gitHead": "1ca6b75d5b0c80c8e2e931340d5efe4eeefb27de"
 }

package/src/components/ConditionSummary.js

@@ -163,41 +163,55 @@ ConditionCell.propTypes = {
   alias: PropTypes.array,
 };
 
-export const ConditionSummary = ({ rows, type, icon, alias }) =>
-  empty(rows) ? null : (
+export const ConditionSummary = ({ rows, type, icon, alias }) => {
+  const areMultidimensionalRows =
+    rows.filter(Array.isArray).length == rows.length;
+  const wrappedRows = areMultidimensionalRows ? rows : [rows];
+  return empty(rows) ? null : (
     <>
       <Header as="h3">
         <Icon name={icon} size="small" />
         <Header.Content>
-          <FormattedMessage
-            id={`ruleImplementations.summary.headers.${type}`}
-          />
+          {areMultidimensionalRows ? (
+            <FormattedMessage
+              id={`ruleImplementations.summary.headers.${type}s`}
+            />
+          ) : (
+            <FormattedMessage
+              id={`ruleImplementations.summary.headers.${type}`}
+            />
+          )}
         </Header.Content>
       </Header>
-      <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>
+      {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>
+      ))}
     </>
   );
+};
 
 ConditionSummary.propTypes = {
   icon: PropTypes.string,

package/src/components/ImplementationSummary.js

@@ -13,7 +13,7 @@ const defaults = [
   "executable",
   "implementationKey",
   "dataset",
-  "population",
+  "populations",
   "validations",
 ];
 
@@ -130,7 +130,7 @@ DatasetSummary.propTypes = {
 
 export const ImplementationSummary = ({ ruleImplementation, activeSteps }) => {
   const steps = _.isEmpty(activeSteps) ? defaults : activeSteps;
-  const { dataset, population, validations } =
+  const { dataset, populations, validations } =
     _.pick(steps)(ruleImplementation);
   const alias = _.map(_.propOr({}, "alias"))(dataset);
   return (
@@ -142,14 +142,14 @@ export const ImplementationSummary = ({ ruleImplementation, activeSteps }) => {
       {dataset && _.includes("dataset")(steps) && (
         <DatasetSummary rows={dataset} alias={alias} />
       )}
-      {population && _.includes("population")(steps) && (
+      {populations && _.includes("populations")(steps) ? (
         <ConditionSummary
           type="population"
           icon="user"
-          rows={population}
+          rows={populations}
           alias={alias}
         />
-      )}
+      ) : null}
       {validations && _.includes("validations")(steps) && (
         <ConditionSummary
           type="validations"

package/src/components/NewRuleImplementation.js

@@ -92,6 +92,9 @@ const conditionAttributes = (condition) =>
     _.map(updateConditionKey)
   )(condition);
 
+const populationsAttributes = (populations) =>
+  _.flow(_.map(conditionAttributes))(populations);
+
 const fieldTypeFromStructure = (row, structures, operators, scope) => {
   const structure_id = _.path("structure.id")(row);
   const field = _.find(_.propEq("data_structure_id", structure_id))(structures);
@@ -266,17 +269,22 @@ export const NewRuleImplementation = ({
             ruleImplementationProps
           ),
           dataset: precalculatedDataset,
-          population: withConditionDefaultAlias(
-            addFieldType(
-              ruleImplementationProps,
-              structuresFields,
-              structuresSiblings,
-              "population",
-              "population",
-              operators
-            ),
-            precalculatedDataset
-          ),
+          populations: _.flow(
+            _.pathOr([], "populations"),
+            _.map((population) =>
+              withConditionDefaultAlias(
+                addFieldType(
+                  { population: population },
+                  structuresFields,
+                  structuresSiblings,
+                  "population",
+                  "population",
+                  operators
+                ),
+                precalculatedDataset
+              )
+            )
+          )(ruleImplementationProps),
           validations: withConditionDefaultAlias(
             addFieldType(
               ruleImplementationProps,
@@ -303,6 +311,7 @@ export const NewRuleImplementation = ({
           implementationType: "default",
           dataset: [{}],
           population: [],
+          populations: [],
           validations: [{}],
           rawContent: {
             database: "",
@@ -396,6 +405,23 @@ export const NewRuleImplementation = ({
     setRuleImplementation({ ...ruleImplementation, population });
   };
 
+  const addPopulation = () => {
+    const populations = _.concat(
+      _.pathOr([], "populations")(ruleImplementation)
+    )([[{}]]);
+    setRuleImplementation({ ...ruleImplementation, populations: populations });
+  };
+
+  const setPopulations = (population, index) => {
+    const populations = _.flow(
+      _.pathOr([], "populations"),
+      _.update(`[${index}]`, (_previousPopulation) => population),
+      _.reject(_.isEmpty)
+    )(ruleImplementation);
+
+    setRuleImplementation({ ...ruleImplementation, populations: populations });
+  };
+
   const setValidations = (validations) => {
     setRuleImplementation({ ...ruleImplementation, validations });
   };
@@ -417,8 +443,8 @@ export const NewRuleImplementation = ({
   }, [template]);
 
   const doSubmit = () => {
-    const population = _.filter(_.negate(_.isEmpty))(
-      ruleImplementation.population
+    const populations = _.filter(_.negate(_.isEmpty))(
+      ruleImplementation.populations
     );
     const validations = _.filter(_.negate(_.isEmpty))(
       ruleImplementation.validations
@@ -453,7 +479,7 @@ export const NewRuleImplementation = ({
         : {
             executable: ruleImplementation.executable,
             dataset: datasetAttributes(_.prop("dataset")(ruleImplementation)),
-            population: conditionAttributes(population),
+            populations: populationsAttributes(populations),
             validations: conditionAttributes(validations),
             implementation_key: _.prop("implementationKey")(ruleImplementation),
             implementation_type:
@@ -533,7 +559,8 @@ export const NewRuleImplementation = ({
               <RuleImplementationForm
                 ruleImplementation={ruleImplementation}
                 setStructures={setDataset}
-                setPopulation={setPopulation}
+                addPopulation={addPopulation}
+                setPopulations={setPopulations}
                 setValidations={setValidations}
                 operators={operators}
                 setImplementationKey={setImplementationKey}

package/src/components/RuleImplementationProperties.js

@@ -12,7 +12,7 @@ const DynamicFormViewer = React.lazy(() =>
   import("@truedat/df/components/DynamicFormViewer")
 );
 
-const summarySteps = ["dataset", "population", "validations"];
+const summarySteps = ["dataset", "populations", "validations"];
 
 export const RuleImplementationProperties = ({
   ruleImplementation,
@@ -74,6 +74,7 @@ const mapStateToProps = ({
 }) => ({
   ruleImplementation: _.pick([
     ...summarySteps,
+    "populations",
     "executable",
     "event_type",
     "event_message",

package/src/components/__test_samples__/NewRuleImplementationProps.js

@@ -130,56 +130,58 @@ export const newRuleImplementationProps = {
     id: 852,
     implementation_key: "impl_example_1",
     implementation_type: "default",
-    population: [
-      {
-        operator: {
-          name: "eq",
-          value_type: "field",
-        },
-        structure: {
-          external_id:
-            "https://glue.eu-west-1.amazonaws.com/#/576759405678/cepsa-demo-s3/02_es_provincias/descripcion",
-          id: 4817544,
-          metadata: {
-            account: "576759405678",
-            data_type_class: "string",
-            database: "cepsa-demo-s3",
-            order: "2.0",
-            region: "eu-west-1",
-            tablename: "02_es_provincias",
-            type: "string",
-          },
-          name: "descripcion",
-          path: ["cepsa-demo-s3", "02_es_provincias"],
-          system: {
-            external_id: "glue",
-            id: 94,
-            name: "Glue",
+    populations: [
+      [
+        {
+          operator: {
+            name: "eq",
+            value_type: "field",
           },
-          type: "Column",
-        },
-        value: [
-          {
+          structure: {
             external_id:
-              "/home/alberto/projects/connectors/td-connector-txt-files/data/########_D_PELAYO_POLIZAS_20201202033016_I.txt[Aux. Externo]",
-            id: 4814767,
+              "https://glue.eu-west-1.amazonaws.com/#/576759405678/cepsa-demo-s3/02_es_provincias/descripcion",
+            id: 4817544,
             metadata: {
-              order: "8",
+              account: "576759405678",
+              data_type_class: "string",
+              database: "cepsa-demo-s3",
+              order: "2.0",
+              region: "eu-west-1",
+              tablename: "02_es_provincias",
+              type: "string",
             },
-            name: "Aux. Externo",
-            path: [
-              "Area_Vida",
-              "########_D_PELAYO_POLIZAS_20201202033016_I.txt",
-            ],
+            name: "descripcion",
+            path: ["cepsa-demo-s3", "02_es_provincias"],
             system: {
-              external_id: "file_system",
-              id: 33,
-              name: "File System",
+              external_id: "glue",
+              id: 94,
+              name: "Glue",
             },
             type: "Column",
           },
-        ],
-      },
+          value: [
+            {
+              external_id:
+                "/home/alberto/projects/connectors/td-connector-txt-files/data/########_D_PELAYO_POLIZAS_20201202033016_I.txt[Aux. Externo]",
+              id: 4814767,
+              metadata: {
+                order: "8",
+              },
+              name: "Aux. Externo",
+              path: [
+                "Area_Vida",
+                "########_D_PELAYO_POLIZAS_20201202033016_I.txt",
+              ],
+              system: {
+                external_id: "file_system",
+                id: 33,
+                name: "File System",
+              },
+              type: "Column",
+            },
+          ],
+        },
+      ],
     ],
     results: [
       {

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",
       "ruleImplementation.summary.field": "Field",
       "ruleImplementation.summary.operator": "Operator",
       "ruleImplementation.summary.structure": "Structure",
@@ -46,7 +46,7 @@ const ruleImplementation = {
       },
     },
   ],
-  population: [{}],
+  populations: [[{}]],
   validations: [
     {
       structure: { field_type: "string", name: "Mes", id: 2598 },
@@ -67,7 +67,7 @@ describe("<ImplementationSummary />", () => {
       "implementationKey",
       "executable",
       "dataset",
-      "population",
+      "populations",
       "validations",
     ];
     const props = {
@@ -79,7 +79,7 @@ describe("<ImplementationSummary />", () => {
   });
 
   it("displays correctly validations values of list type", () => {
-    const steps = ["dataset", "population", "validations"];
+    const steps = ["dataset", "populations", "validations"];
     const props = {
       steps,
       ruleImplementation,

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

@@ -144,6 +144,67 @@ exports[`<ImplementationSummary /> displays correctly validations values of list
       </tbody>
     </table>
   </div>
+  <h3
+    class="ui header"
+  >
+    <i
+      aria-hidden="true"
+      class="user small icon"
+    />
+    <div
+      class="content"
+    >
+      populations
+    </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>
   <h3
     class="ui header"
   >
@@ -264,8 +325,10 @@ exports[`<ImplementationSummary /> matches the latest snapshot 1`] = `
         "implementationKey": "ImplKey",
         "implementationType": "",
         "minimum": 10,
-        "population": Array [
-          Object {},
+        "populations": Array [
+          Array [
+            Object {},
+          ],
         ],
         "rawContent": Object {
           "dataset": "",
@@ -340,7 +403,9 @@ exports[`<ImplementationSummary /> matches the latest snapshot 1`] = `
     icon="user"
     rows={
       Array [
-        Object {},
+        Array [
+          Object {},
+        ],
       ]
     }
     type="population"

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

@@ -28,6 +28,7 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
         stretched={true}
       >
         <Connect(RuleImplementationForm)
+          addPopulation={[Function]}
           handleSubmit={[Function]}
           onChange={[Function]}
           operators={
@@ -799,64 +800,66 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
               "implementationKey": "impl_example_1",
               "implementationType": "default",
               "minimum": 2010,
-              "population": Array [
-                Object {
-                  "modifier": undefined,
-                  "operator": Object {
-                    "group": "eq",
-                    "id": 23,
-                    "name": "eq",
-                    "value_type": "field",
-                  },
-                  "structure": Object {
-                    "external_id": "https://glue.eu-west-1.amazonaws.com/#/576759405678/cepsa-demo-s3/02_es_provincias/descripcion",
-                    "field_type": "string",
-                    "id": 4817544,
-                    "metadata": Object {
-                      "account": "576759405678",
-                      "data_type_class": "string",
-                      "database": "cepsa-demo-s3",
-                      "order": "2.0",
-                      "region": "eu-west-1",
-                      "tablename": "02_es_provincias",
-                      "type": "string",
+              "populations": Array [
+                Array [
+                  Object {
+                    "modifier": undefined,
+                    "operator": Object {
+                      "group": "eq",
+                      "id": 23,
+                      "name": "eq",
+                      "value_type": "field",
                     },
-                    "name": "descripcion",
-                    "parent_index": 1,
-                    "path": Array [
-                      "cepsa-demo-s3",
-                      "02_es_provincias",
-                    ],
-                    "system": Object {
-                      "external_id": "glue",
-                      "id": 94,
-                      "name": "Glue",
-                    },
-                    "type": "Column",
-                  },
-                  "value": Array [
-                    Object {
-                      "external_id": "/home/alberto/projects/connectors/td-connector-txt-files/data/########_D_PELAYO_POLIZAS_20201202033016_I.txt[Aux. Externo]",
-                      "id": 4814767,
+                    "structure": Object {
+                      "external_id": "https://glue.eu-west-1.amazonaws.com/#/576759405678/cepsa-demo-s3/02_es_provincias/descripcion",
+                      "field_type": "string",
+                      "id": 4817544,
                       "metadata": Object {
-                        "order": "8",
+                        "account": "576759405678",
+                        "data_type_class": "string",
+                        "database": "cepsa-demo-s3",
+                        "order": "2.0",
+                        "region": "eu-west-1",
+                        "tablename": "02_es_provincias",
+                        "type": "string",
                       },
-                      "name": "Aux. Externo",
-                      "parent_index": 0,
+                      "name": "descripcion",
+                      "parent_index": 1,
                       "path": Array [
-                        "Area_Vida",
-                        "########_D_PELAYO_POLIZAS_20201202033016_I.txt",
+                        "cepsa-demo-s3",
+                        "02_es_provincias",
                       ],
                       "system": Object {
-                        "external_id": "file_system",
-                        "id": 33,
-                        "name": "File System",
+                        "external_id": "glue",
+                        "id": 94,
+                        "name": "Glue",
                       },
                       "type": "Column",
                     },
-                  ],
-                  "value_modifier": undefined,
-                },
+                    "value": Array [
+                      Object {
+                        "external_id": "/home/alberto/projects/connectors/td-connector-txt-files/data/########_D_PELAYO_POLIZAS_20201202033016_I.txt[Aux. Externo]",
+                        "id": 4814767,
+                        "metadata": Object {
+                          "order": "8",
+                        },
+                        "name": "Aux. Externo",
+                        "parent_index": 0,
+                        "path": Array [
+                          "Area_Vida",
+                          "########_D_PELAYO_POLIZAS_20201202033016_I.txt",
+                        ],
+                        "system": Object {
+                          "external_id": "file_system",
+                          "id": 33,
+                          "name": "File System",
+                        },
+                        "type": "Column",
+                      },
+                    ],
+                    "value_modifier": undefined,
+                  },
+                ],
               ],
               "rawContent": Object {},
               "result_type": "errors_number",
@@ -901,7 +904,7 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
             }
           }
           setImplementationKey={[Function]}
-          setPopulation={[Function]}
+          setPopulations={[Function]}
           setStructures={[Function]}
           setValidations={[Function]}
         />
@@ -1022,64 +1025,66 @@ exports[`<NewRuleImplementation /> calculate aliases when not informed 1`] = `
             "implementationKey": "impl_example_1",
             "implementationType": "default",
             "minimum": 2010,
-            "population": Array [
-              Object {
-                "modifier": undefined,
-                "operator": Object {
-                  "group": "eq",
-                  "id": 23,
-                  "name": "eq",
-                  "value_type": "field",
-                },
-                "structure": Object {
-                  "external_id": "https://glue.eu-west-1.amazonaws.com/#/576759405678/cepsa-demo-s3/02_es_provincias/descripcion",
-                  "field_type": "string",
-                  "id": 4817544,
-                  "metadata": Object {
-                    "account": "576759405678",
-                    "data_type_class": "string",
-                    "database": "cepsa-demo-s3",
-                    "order": "2.0",
-                    "region": "eu-west-1",
-                    "tablename": "02_es_provincias",
-                    "type": "string",
-                  },
-                  "name": "descripcion",
-                  "parent_index": 1,
-                  "path": Array [
-                    "cepsa-demo-s3",
-                    "02_es_provincias",
-                  ],
-                  "system": Object {
-                    "external_id": "glue",
-                    "id": 94,
-                    "name": "Glue",
+            "populations": Array [
+              Array [
+                Object {
+                  "modifier": undefined,
+                  "operator": Object {
+                    "group": "eq",
+                    "id": 23,
+                    "name": "eq",
+                    "value_type": "field",
                   },
-                  "type": "Column",
-                },
-                "value": Array [
-                  Object {
-                    "external_id": "/home/alberto/projects/connectors/td-connector-txt-files/data/########_D_PELAYO_POLIZAS_20201202033016_I.txt[Aux. Externo]",
-                    "id": 4814767,
+                  "structure": Object {
+                    "external_id": "https://glue.eu-west-1.amazonaws.com/#/576759405678/cepsa-demo-s3/02_es_provincias/descripcion",
+                    "field_type": "string",
+                    "id": 4817544,
                     "metadata": Object {
-                      "order": "8",
+                      "account": "576759405678",
+                      "data_type_class": "string",
+                      "database": "cepsa-demo-s3",
+                      "order": "2.0",
+                      "region": "eu-west-1",
+                      "tablename": "02_es_provincias",
+                      "type": "string",
                     },
-                    "name": "Aux. Externo",
-                    "parent_index": 0,
+                    "name": "descripcion",
+                    "parent_index": 1,
                     "path": Array [
-                      "Area_Vida",
-                      "########_D_PELAYO_POLIZAS_20201202033016_I.txt",
+                      "cepsa-demo-s3",
+                      "02_es_provincias",
                     ],
                     "system": Object {
-                      "external_id": "file_system",
-                      "id": 33,
-                      "name": "File System",
+                      "external_id": "glue",
+                      "id": 94,
+                      "name": "Glue",
                     },
                     "type": "Column",
                   },
-                ],
-                "value_modifier": undefined,
-              },
+                  "value": Array [
+                    Object {
+                      "external_id": "/home/alberto/projects/connectors/td-connector-txt-files/data/########_D_PELAYO_POLIZAS_20201202033016_I.txt[Aux. Externo]",
+                      "id": 4814767,
+                      "metadata": Object {
+                        "order": "8",
+                      },
+                      "name": "Aux. Externo",
+                      "parent_index": 0,
+                      "path": Array [
+                        "Area_Vida",
+                        "########_D_PELAYO_POLIZAS_20201202033016_I.txt",
+                      ],
+                      "system": Object {
+                        "external_id": "file_system",
+                        "id": 33,
+                        "name": "File System",
+                      },
+                      "type": "Column",
+                    },
+                  ],
+                  "value_modifier": undefined,
+                },
+              ],
             ],
             "rawContent": Object {},
             "result_type": "errors_number",
@@ -1157,6 +1162,7 @@ exports[`<NewRuleImplementation /> matches the latest snapshot 1`] = `
         stretched={true}
       >
         <Connect(RuleImplementationForm)
+          addPopulation={[Function]}
           handleSubmit={[Function]}
           onChange={[Function]}
           ruleImplementation={
@@ -1172,6 +1178,7 @@ exports[`<NewRuleImplementation /> matches the latest snapshot 1`] = `
               "implementationType": "default",
               "minimum": null,
               "population": Array [],
+              "populations": Array [],
               "rawContent": Object {
                 "database": "",
                 "dataset": "",
@@ -1186,7 +1193,7 @@ exports[`<NewRuleImplementation /> matches the latest snapshot 1`] = `
             }
           }
           setImplementationKey={[Function]}
-          setPopulation={[Function]}
+          setPopulations={[Function]}
           setStructures={[Function]}
           setValidations={[Function]}
         />
@@ -1209,6 +1216,7 @@ exports[`<NewRuleImplementation /> matches the latest snapshot 1`] = `
             "implementationType": "default",
             "minimum": null,
             "population": Array [],
+            "populations": Array [],
             "rawContent": Object {
               "database": "",
               "dataset": "",

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

@@ -63,7 +63,7 @@ exports[`<RuleImplementationProperties /> matches the latest snapshot 1`] = `
         activeSteps={
           Array [
             "dataset",
-            "population",
+            "populations",
             "validations",
           ]
         }

package/src/components/ruleImplementationForm/PopulationForm.js

@@ -6,30 +6,6 @@ import { Grid, Icon, Segment } from "semantic-ui-react";
 import { dropAt, replaceAt } from "@truedat/core/services/arrays";
 import { FiltersGrid } from "./FiltersGrid";
 
-const PopulationTypeForm = ({ createFilter }) => (
-  <Grid columns={2} textAlign="center">
-    <Grid.Column>
-      <Segment className={`population active`}>
-        <FormattedMessage id="populationForm.selectAll.text" />
-        <Icon circular name="check" color="green" />
-      </Segment>
-    </Grid.Column>
-    <Grid.Column>
-      <Segment
-        className={`population selectable`}
-        onClick={() => createFilter()}
-      >
-        <Icon name="plus circle" />
-        <FormattedMessage id="populationForm.createFilters.text" />
-      </Segment>
-    </Grid.Column>
-  </Grid>
-);
-
-PopulationTypeForm.propTypes = {
-  createFilter: PropTypes.func,
-};
-
 export default function PopulationForm({
   typeOperators,
   population,
@@ -45,9 +21,7 @@ export default function PopulationForm({
     } else setPopulation(dropAt(index)(population));
   };
 
-  return _.isEmpty(population) ? (
-    <PopulationTypeForm createFilter={() => setPopulation([{}])} />
-  ) : (
+  return _.isEmpty(population) ? null : (
     <FiltersGrid
       rows={population}
       setRowValue={setPopulationField}

package/src/components/ruleImplementationForm/RuleImplementationForm.js

@@ -4,7 +4,15 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useHistory } from "react-router-dom";
 import { FormattedMessage, useIntl } from "react-intl";
-import { Button, Divider, Form, Grid, Icon, Step } from "semantic-ui-react";
+import {
+  Button,
+  Divider,
+  Form,
+  Grid,
+  Icon,
+  Step,
+  Segment,
+} from "semantic-ui-react";
 import { validateContent } from "@truedat/df/utils";
 import PopulationForm from "./PopulationForm";
 import DatasetForm from "./DatasetForm";
@@ -32,7 +40,8 @@ RuleImplementationStep.propTypes = {
 export const RuleImplementationForm = ({
   ruleImplementation,
   setStructures,
-  setPopulation,
+  addPopulation,
+  setPopulations,
   setImplementationKey,
   setValidations,
   isSubmitting,
@@ -46,7 +55,7 @@ export const RuleImplementationForm = ({
   const steps = [
     { name: "information", icon: "info", isValid: () => validInformation() },
     { name: "dataset", icon: "database", isValid: () => validDataSet() },
-    { name: "population", icon: "user", isValid: () => validPopulation() },
+    { name: "populations", icon: "user", isValid: () => validPopulations() },
     { name: "validations", icon: "setting", isValid: () => validValidations() },
   ];
 
@@ -55,7 +64,7 @@ export const RuleImplementationForm = ({
 
   const {
     dataset: structures,
-    population,
+    populations,
     validations,
     dfContent,
   } = ruleImplementation || {};
@@ -66,8 +75,8 @@ export const RuleImplementationForm = ({
     _.size(validateContent(template)(dfContent)) == 0 &&
     areLimitsValid(ruleImplementation);
 
-  const validPopulation = () =>
-    _.every(_.isEmpty)(population) || populationComplete();
+  const validPopulations = () =>
+    _.every((population) => populationComplete(population))(populations);
 
   const validValidations = () =>
     _.every(_.negate(_.isEmpty))(validations) && validationsComplete();
@@ -90,11 +99,9 @@ export const RuleImplementationForm = ({
     _.size(clauses) > 0 &&
     _.every((c) => itemComplete(c, ["left", "right"]))(clauses);
 
-  const populationComplete = () =>
-    _.flow(
-      _.filter(_.negate(_.isEmpty)),
-      _.every((p) => itemComplete(p, attrsFromProfile(p)))
-    )(population);
+  const populationComplete = (population) =>
+    _.every(_.negate(_.isEmpty))(population) &&
+    _.every((p) => itemComplete(p, attrsFromProfile(p)))(population);
 
   const validationsComplete = () =>
     _.every((v) => itemComplete(v, attrsFromProfile(v)))(validations);
@@ -231,14 +238,31 @@ export const RuleImplementationForm = ({
               }}
             />
           )}
-          {activeStep == "population" && (
-            <PopulationForm
-              population={population}
-              setPopulation={setPopulation}
-              structures={structures}
-              typeOperators={operators}
-            />
-          )}
+          {activeStep == "populations" ? (
+            <>
+              {populations.map((population, i) => (
+                <Segment key={i}>
+                  <PopulationForm
+                    population={population}
+                    setPopulation={(p) => setPopulations(p, i)}
+                    structures={structures}
+                    typeOperators={operators}
+                  />
+                </Segment>
+              ))}
+              {_.flow(_.flatten, _.isEmpty)(populations) ? (
+                <PopulationTypeForm createFilter={() => addPopulation()} />
+              ) : validPopulations() ? (
+                <Button
+                  secondary
+                  onClick={() => addPopulation()}
+                  content={formatMessage({
+                    id: "ruleImplementationForm.populations.add",
+                  })}
+                />
+              ) : null}
+            </>
+          ) : null}
           {activeStep == "validations" && (
             <ValidationsForm
               validations={validations}
@@ -291,7 +315,8 @@ RuleImplementationForm.propTypes = {
   handleSubmit: PropTypes.func.isRequired,
   isSubmitting: PropTypes.bool.isRequired,
   setStructures: PropTypes.func,
-  setPopulation: PropTypes.func,
+  addPopulation: PropTypes.func,
+  setPopulations: PropTypes.func,
   setImplementationKey: PropTypes.func,
   setValidations: PropTypes.func,
   operators: PropTypes.object,
@@ -305,3 +330,27 @@ const mapStateToProps = (state) => ({
 });
 
 export default connect(mapStateToProps)(RuleImplementationForm);
+
+const PopulationTypeForm = ({ createFilter }) => (
+  <Grid columns={2} textAlign="center">
+    <Grid.Column>
+      <Segment className={`population active`}>
+        <FormattedMessage id="populationForm.selectAll.text" />
+        <Icon circular name="check" color="green" />
+      </Segment>
+    </Grid.Column>
+    <Grid.Column>
+      <Segment
+        className={`population selectable`}
+        onClick={() => createFilter()}
+      >
+        <Icon name="plus circle" />
+        <FormattedMessage id="populationForm.createFilters.text" />
+      </Segment>
+    </Grid.Column>
+  </Grid>
+);
+
+PopulationTypeForm.propTypes = {
+  createFilter: PropTypes.func,
+};

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

@@ -37,7 +37,7 @@ exports[`<RuleImplementationForm /> matches the latest snapshot 1`] = `
           }
         }
         key="2"
-        name="population"
+        name="populations"
       />
       <RuleImplementationStep
         activeStep="information"

package/src/messages/en.js

@@ -138,7 +138,7 @@ export default {
     "All rule implementations should be removed",
   "rule.error.rule_name_bc_id.unique_constraint":
     "Duplicated rule name. Edit name or associated business concept.",
-  
+
   "rule.form.accordion.select": "Select",
   "rule.form.concept.label": "Concept",
   "ruleImplementation.form.tooltip.deviation.goal":
@@ -441,9 +441,10 @@ export default {
   "ruleImplementation.system.placeholder": "Select a system",
   "ruleImplementation.table": "Table",
   "ruleImplementation.table.placeholder": "Select a table",
+  "ruleImplementationForm.populations.add": "Add population",
   "ruleImplementationForm.step.information": "Information",
   "ruleImplementationForm.step.dataset": "Data Set",
-  "ruleImplementationForm.step.population": "Population",
+  "ruleImplementationForm.step.populations": "Populations",
   "ruleImplementationForm.step.validations": "Validations",
   "ruleImplementationRawForm.props.database": "Database",
   "ruleImplementationRawForm.props.database.placeholder": "Select database",
@@ -515,6 +516,7 @@ 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.validations": "Validation",
   "ruleImplementations.upload.success.errors":
     "Error in {implementation_key} attribute: {key} message: {message} ",

package/src/messages/es.js

@@ -455,9 +455,10 @@ export default {
   "ruleImplementation.system": "Sistema",
   "ruleImplementation.table.placeholder": "Seleccionar tabla",
   "ruleImplementation.table": "Tabla",
+  "ruleImplementationForm.populations.add": "Añadir población",
   "ruleImplementationForm.step.dataset": "Datos",
   "ruleImplementationForm.step.information": "Información",
-  "ruleImplementationForm.step.population": "Población",
+  "ruleImplementationForm.step.populations": "Poblaciones",
   "ruleImplementationForm.step.validations": "Validaciones",
   "ruleImplementationRawForm.props.database.placeholder":
     "Seleccionar base de datos",
@@ -537,6 +538,7 @@ 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.validations": "Validaciones",
   "ruleImplementations.upload.success.errors":
     "Error en {name} atributo: {key} mensaje: {message} ",

package/src/reducers/ruleImplementation.js

@@ -15,7 +15,7 @@ const pickFields = _.pick([
   "id",
   "implementation_key",
   "implementation_type",
-  "population",
+  "populations",
   "raw_content",
   "results",
   "rule_id",

package/src/sagas/__tests__/createRuleImplementation.spec.js

@@ -2,7 +2,7 @@ import { testSaga } from "redux-saga-test-plan";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
 import {
   createRuleImplementationRequestSaga,
-  createRuleImplementationSaga
+  createRuleImplementationSaga,
 } from "../createRuleImplementation";
 import { API_RULE_IMPLEMENTATIONS } from "../../api";
 import { createRuleImplementation, clearStructure } from "../../routines";
@@ -35,21 +35,23 @@ describe("sagas: createRuleImplementationSaga", () => {
   const rule_implementation = {
     implementation_key: "Awesome Impl Key",
     dataset: [{ structure: { id: 1 } }],
-    population: [
-      {
-        operator: { name: "eq", value_type: "number" },
-        structure: { id: 2 },
-        value: [{ raw: 3 }]
-      }
+    populations: [
+      [
+        {
+          operator: { name: "eq", value_type: "number" },
+          structure: { id: 2 },
+          value: [{ raw: 3 }],
+        },
+      ],
     ],
     validations: [
       {
         operator: { name: "between", value_type: "field" },
         structure: { id: 3 },
-        value: [{ id: 4 }, { id: 5 }]
-      }
+        value: [{ id: 4 }, { id: 5 }],
+      },
     ],
-    rule_id: 1
+    rule_id: 1,
   };
   const data = { rule_implementation };
   const url = API_RULE_IMPLEMENTATIONS;

package/src/sagas/__tests__/updateRuleImplementation.spec.js

@@ -39,12 +39,14 @@ describe("sagas: updateRuleImplementationSaga", () => {
     id: 1,
     implementation_key: "impl_key",
     dataset: [{ structure: { id: 1 } }],
-    population: [
-      {
-        operator: { name: "eq", value_type: "number" },
-        structure: { id: 2 },
-        value: [{ raw: 3 }],
-      },
+    populations: [
+      [
+        {
+          operator: { name: "eq", value_type: "number" },
+          structure: { id: 2 },
+          value: [{ raw: 3 }],
+        },
+      ],
     ],
     validations: [
       {