@truedat/dq 4.53.6 → 4.53.8

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.53.8] 2022-10-17
+
+### Added
+
+- [TD-5027] support for restoring deprecated `Implementations`
+
+## [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.8",
   "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.8",
     "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.8",
+    "@truedat/df": "4.53.8",
     "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": "56190c74eddc249134cb973cc21470c36a4701d0"
 }

package/src/api/mutations.js

@@ -23,3 +23,11 @@ export const PUBLISH_IMPLEMENTATION = gql`
     }
   }
 `;
+
+export const RESTORE_IMPLEMENTATION = gql`
+  mutation restoreImplementation($id: ID!) {
+    restoreImplementation(id: $id) {
+      id
+    }
+  }
+`;

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/ImplementationActions.js

@@ -12,6 +12,7 @@ import {
   submitImplementation,
   publishImplementation,
   rejectImplementation,
+  restoreImplementation,
   deleteImplementation,
 } from "../routines";
 import ExecutionPopup from "./ExecutionPopup";
@@ -59,6 +60,7 @@ export const ImplementationActions = ({
   deleteImplementation,
   publishImplementation,
   rejectImplementation,
+  restoreImplementation,
   ruleImplementation,
   submitImplementation,
 }) => {
@@ -96,6 +98,18 @@ export const ImplementationActions = ({
           }
         />
       ) : null}
+      {actions?.restore ? (
+        <Button
+          primary
+          content={formatMessage({ id: "actions.restore" })}
+          onClick={() =>
+            restoreImplementation({
+              id,
+              redirectUrl: linkTo.IMPLEMENTATION({ implementation_id: id }),
+            })
+          }
+        />
+      ) : null}
       {actions?.reject ? (
         <Button
           secondary
@@ -132,6 +146,7 @@ ImplementationActions.propTypes = {
   deleteImplementation: PropTypes.func,
   publishImplementation: PropTypes.func,
   rejectImplementation: PropTypes.func,
+  restoreImplementation: PropTypes.func,
   ruleImplementation: PropTypes.object,
   submitImplementation: PropTypes.func,
 };
@@ -149,5 +164,6 @@ export default connect(mapStateToProps, {
   deleteImplementation,
   publishImplementation,
   rejectImplementation,
+  restoreImplementation,
   submitImplementation,
 })(ImplementationActions);

package/src/components/ImplementationSearchResults.js

@@ -5,7 +5,10 @@ import { connect } from "react-redux";
 import { Dimmer, Header, Icon, Loader, Segment } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { useActiveRoute } from "@truedat/core/hooks";
-import { IMPLEMENTATIONS_PENDING } from "@truedat/core/routes";
+import {
+  IMPLEMENTATIONS_PENDING,
+  IMPLEMENTATIONS_DEPRECATED,
+} from "@truedat/core/routes";
 import { getExecutionQuery } from "../selectors";
 import RuleImplementationsActions from "./RuleImplementationsActions";
 import RuleImplementationsLabelResults from "./RuleImplementationsLabelResults";
@@ -24,11 +27,16 @@ const usePrevious = (value) => {
 
 export const ImplementationSearchResultsHeader = () => {
   const pending = useActiveRoute(IMPLEMENTATIONS_PENDING);
+  const deprecated = useActiveRoute(IMPLEMENTATIONS_DEPRECATED);
   const header = pending
     ? "implementations.header.manage"
+    : deprecated
+    ? "implementations.header.deprecated"
     : "implementations.header";
   const subheader = pending
     ? "implementations.subheader.manage"
+    : deprecated
+    ? "implementations.subheader.deprecated"
     : "implementations.subheader";
   return (
     <Header as="h2">

package/src/components/ImplementationSummary.js

@@ -117,16 +117,22 @@ const DatasetSummary = ({ rows, alias }) =>
                 {_.has("structure")(row) && (
                   <Table.Cell>
                     {_.path("structure.type")(row) !== "reference_dataset" ? (
-                      <Link
-                        to={linkTo.STRUCTURE({
-                          id: _.pathOr("", "structure.id")(row),
-                        })}
-                      >
-                        <p className="highlighted">
-                          <Icon name="table" size="small" />
-                          {`"${path(_.propOr({}, "structure")(row))}"`}
-                        </p>
-                      </Link>
+                      _.path("structure.id")(row) ? (
+                        <Link
+                          to={linkTo.STRUCTURE({
+                            id: _.path("structure.id")(row),
+                          })}
+                        >
+                          <p className="highlighted">
+                            <Icon name="table" size="small" />
+                            {`"${path(_.propOr({}, "structure")(row))}"`}
+                          </p>
+                        </Link>
+                      ) : (
+                        <FormattedMessage
+                          id={`ruleImplementation.summary.invalid_structure`}
+                        />
+                      )
                     ) : (
                       <span>
                         <Icon name="list ol" size="small" />{" "}
@@ -173,22 +179,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/ImplementationsRoutes.js

@@ -23,6 +23,7 @@ import {
   IMPLEMENTATION_STRUCTURES,
   IMPLEMENTATION,
   IMPLEMENTATIONS,
+  IMPLEMENTATIONS_DEPRECATED,
   IMPLEMENTATIONS_PENDING,
 } from "@truedat/core/routes";
 import {
@@ -340,6 +341,17 @@ export const ImplementationsRoutes = ({
           />
         )}
       />
+      <Route
+        exact
+        path={IMPLEMENTATIONS_DEPRECATED}
+        render={() => (
+          <Implementations
+            defaultFilters={{
+              status: ["deprecated"],
+            }}
+          />
+        )}
+      />
     </Switch>
   );
 };

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/QualityRoutes.js

@@ -6,6 +6,7 @@ import {
   EXECUTION_GROUP,
   EXECUTION_GROUPS,
   IMPLEMENTATIONS,
+  IMPLEMENTATIONS_DEPRECATED,
   IMPLEMENTATIONS_PENDING,
   RULES,
 } from "@truedat/core/routes";
@@ -55,6 +56,12 @@ const QualityRoutes = () => {
           authorized ? <ImplementationsRoutes /> : <Unauthorized />
         }
       />
+      <Route
+        path={IMPLEMENTATIONS_DEPRECATED}
+        render={() =>
+          authorized ? <ImplementationsRoutes /> : <Unauthorized />
+        }
+      />
     </>
   );
 };

package/src/components/RuleImplementation.js

@@ -27,15 +27,7 @@ export const RuleImplementation = ({ children, ruleImplementation }) => {
         </Grid.Column>
         <Grid.Column width={8} textAlign="right">
           <>
-            {deletedAt ? (
-              <Label
-                className="alert warning"
-                content={formatMessage({
-                  id: "ruleImplementation.props.status.deprecated",
-                })}
-                icon={{ name: "warning circle", color: "red" }}
-              />
-            ) : (
+            {deletedAt ? null : (
               <Subscription
                 resource={ruleImplementation}
                 resourceType="implementation"

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: [],
+          },
+        ],
       ],
     };