@truedat/dq 6.16.2 → 6.16.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "6.16.2",
+  "version": "6.16.4",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -93,7 +93,7 @@
   "dependencies": {
     "@apollo/client": "^3.7.1",
     "@truedat/core": "6.15.2",
-    "@truedat/df": "6.16.1",
+    "@truedat/df": "6.15.2",
     "decode-uri-component": "^0.2.2",
     "graphql": "^15.5.3",
     "moment": "^2.29.4",
@@ -118,5 +118,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "be00925ba0aa8943442f7460ee4a97e021f2db31"
+  "gitHead": "ecf57a30185b9e353b6e2692702b5599e4425edb"
 }

package/src/components/ConceptRules.js

@@ -3,28 +3,57 @@ import React from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Link } from "react-router-dom";
-import { Table, Button, Message, Segment } from "semantic-ui-react";
+import { Table, Button, Message, Segment, TableCell } from "semantic-ui-react";
 import { connect } from "react-redux";
 import { linkTo } from "@truedat/core/routes";
 
-const ConceptRuleRow = ({ active, name, id }) => (
-  <Table.Row>
-    <Table.Cell>
-      <Link to={linkTo.RULE({ id })}>{name}</Link>
-    </Table.Cell>
-    <Table.Cell>
-      <FormattedMessage id={`rule.props.active.${active}`} />
-    </Table.Cell>
-  </Table.Row>
-);
+const ConceptRuleRow = ({
+  rule: { active, name, id, business_concept_id, business_concept_name },
+  showExpandableColumn,
+}) => {
+  return (
+    <Table.Row>
+      <Table.Cell>
+        <Link to={linkTo.RULE({ id })}>{name}</Link>
+      </Table.Cell>
+      <Table.Cell>
+        <FormattedMessage id={`rule.props.active.${active}`} />
+      </Table.Cell>
+      {showExpandableColumn ? (
+        <TableCell>
+          {business_concept_id ? (
+            <Link
+              to={linkTo.CONCEPT_VERSION({
+                business_concept_id: business_concept_id,
+                id: "current",
+              })}
+            >
+              {business_concept_name}
+            </Link>
+          ) : null}
+        </TableCell>
+      ) : null}
+    </Table.Row>
+  );
+};
 
 ConceptRuleRow.propTypes = {
-  name: PropTypes.string,
-  active: PropTypes.bool,
-  id: PropTypes.number,
+  rule: PropTypes.shape({
+    name: PropTypes.string,
+    active: PropTypes.bool,
+    id: PropTypes.number,
+    business_concept_id: PropTypes.number,
+    business_concept_name: PropTypes.string,
+  }),
+  showExpandableColumn: PropTypes.bool,
 };
 
-export const ConceptRules = ({ conceptRules, visible, createRuleUrl }) => {
+export const ConceptRules = ({
+  conceptRules,
+  visible,
+  createRuleUrl,
+  showExpandableColumn,
+}) => {
   const { formatMessage } = useIntl();
 
   return (
@@ -56,12 +85,23 @@ export const ConceptRules = ({ conceptRules, visible, createRuleUrl }) => {
               <Table.HeaderCell
                 content={formatMessage({ id: "concepts.rules.status" })}
               />
+              {showExpandableColumn ? (
+                <Table.HeaderCell
+                  content={formatMessage({
+                    id: "concepts.rules.expandable",
+                  })}
+                />
+              ) : null}
             </Table.Row>
           </Table.Header>
           <Table.Body>
-            {_.map((rule) => <ConceptRuleRow key={rule.id} {...rule} />)(
-              conceptRules
-            )}
+            {_.map((rule) => (
+              <ConceptRuleRow
+                key={rule.id}
+                rule={rule}
+                showExpandableColumn={showExpandableColumn}
+              />
+            ))(conceptRules)}
           </Table.Body>
         </Table>
       )}
@@ -73,11 +113,16 @@ ConceptRules.propTypes = {
   conceptRules: PropTypes.array,
   createRuleUrl: PropTypes.string,
   visible: PropTypes.bool,
+  showExpandableColumn: PropTypes.bool,
 };
 
 const mapStateToProps = ({ conceptRules, concept, conceptRulesActions }) => ({
   concept,
-  conceptRules: _.reject("deleted_at")(conceptRules),
+  conceptRules: _.flow(
+    _.reject("deleted_at"),
+    _.orderBy(["business_concept_id", "df_name"], ["desc", "asc"])
+  )(conceptRules),
+  showExpandableColumn: _.some("business_concept_name")(conceptRules),
   createRuleUrl: conceptRulesActions?.create
     ? linkTo.CONCEPT_RULES_NEW(concept)
     : null,

package/src/components/ImplementationStructureLinksActions.js

@@ -25,7 +25,7 @@ export const ImplementationStructureLinksActions = ({
 
 ImplementationStructureLinksActions.propTypes = {
   implementation_id: PropTypes.number,
-  canCreateLink: PropTypes.bool,
+  canCreateLink: PropTypes.oneOfType([PropTypes.bool, PropTypes.object]),
 };
 
 const mapStateToProps = (state) => ({

package/src/components/RuleImplementationsTable.js

@@ -6,7 +6,10 @@ import { getSortInfo, sortColumn } from "@truedat/core/services/sort";
 import { Checkbox, Table, Header, Icon } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { sortImplementations } from "../routines";
-import { getRuleImplementationColumns } from "../selectors";
+import {
+  getBusinessConceptsLinksToImplementationsColumns,
+  getRuleImplementationColumns,
+} from "../selectors";
 import RuleImplementationRow from "./RuleImplementationRow";
 
 export const RuleImplementationsTable = ({
@@ -23,9 +26,9 @@ export const RuleImplementationsTable = ({
   withoutColumns,
 }) => {
   const { formatMessage } = useIntl();
-  const effectiveColumns = _.filter(({ name }) =>
-    _.negate(_.includes(name))(withoutColumns)
-  )(columns);
+  const effectiveColumns = _.filter(({ name }) => {
+    return _.negate(_.includes(name))(withoutColumns);
+  })(columns);
   const [sortedColumn, setColumn] = useState(
     _.prop("column")(getSortInfo(implementationsSort))
   );
@@ -127,8 +130,14 @@ RuleImplementationsTable.propTypes = {
 };
 
 const mapStateToProps = (state, props) => ({
-  columns: getRuleImplementationColumns(state),
-  ruleImplementations: props.ruleImplementations || state.ruleImplementations,
+  columns: _.some("business_concept_id")(
+    props.ruleImplementations || state.ruleImplementations
+  )
+    ? getBusinessConceptsLinksToImplementationsColumns(state)
+    : getRuleImplementationColumns(state),
+  ruleImplementations: _.orderBy(["business_concept_id", "implementation_key"])(
+    ["desc", "asc"]
+  )(props.ruleImplementations || state.ruleImplementations),
   ruleImplementationsLoading: state.ruleImplementationsLoading,
   implementationsSort: _.path("ruleImplementationQuery.sort")(state),
 });

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

@@ -9,6 +9,8 @@ describe("<ConceptRules />", () => {
       active: true,
       name: "foo",
       id: 1,
+      business_concept_id: 1,
+      business_concept_name: "foo foo",
     },
     {
       active: true,
@@ -34,6 +36,8 @@ describe("<ConceptRules />", () => {
         "concepts.rules.empty": "empty",
         "concepts.rules.name": "name",
         "concepts.rules.status": "status",
+        "concepts.rules.expandable": "Linked by",
+        "concepts.rule.create": "Create",
       },
     },
   };
@@ -59,4 +63,25 @@ describe("<ConceptRules />", () => {
     expect(container).toMatchSnapshot();
     expect(queryByText(/empty/)).toBeTruthy();
   });
+
+  it("renders expandable", async () => {
+    const newProps = {
+      ...props,
+      showExpandableColumn: true,
+    };
+    const { queryByText } = render(<ConceptRules {...newProps} />, renderOpts);
+
+    expect(queryByText(/Linked by/)).toBeTruthy();
+  });
+
+  it("renders create url", async () => {
+    const newProps = {
+      ...props,
+      createRuleUrl: "/url/create",
+      visible: true,
+    };
+    const { queryByText } = render(<ConceptRules {...newProps} />, renderOpts);
+
+    expect(queryByText(/Create/)).toBeTruthy();
+  });
 });

package/src/selectors/__tests__/getBusinessConceptsLinksToImplementationsColumns.spec.js

@@ -0,0 +1,23 @@
+import {
+  getBusinessConceptsLinksToImplementationsColumns,
+  defaultBusinessConceptsLinksToImplementationsColumns,
+} from "..";
+
+describe("selectors: getBusinessConceptsLinksToImplementationsColumns", () => {
+  it("should return custom businessConceptsLinksToImplementationsColumns when present", () => {
+    const businessConceptsLinksToImplementationsColumns = [{ name: "test" }];
+    const res = getBusinessConceptsLinksToImplementationsColumns({
+      businessConceptsLinksToImplementationsColumns,
+    });
+    expect(res).toHaveLength(1);
+    expect(res).toEqual(businessConceptsLinksToImplementationsColumns);
+  });
+
+  it("should return default getBusinessConceptsLinksToImplementationsColumns when no customized", () => {
+    const res = getBusinessConceptsLinksToImplementationsColumns({});
+
+    expect(res).toHaveLength(
+      defaultBusinessConceptsLinksToImplementationsColumns.length
+    );
+  });
+});

package/src/selectors/getBusinessConceptsLinksToImplementationsColumns.js

@@ -0,0 +1,116 @@
+import _ from "lodash/fp";
+import React from "react";
+import { createSelector } from "reselect";
+import { FormattedMessage } from "react-intl";
+import DateTime from "@truedat/core/components/DateTime";
+import { formatNumber } from "@truedat/core/services/format";
+import ArrayDecorator from "@truedat/core/components/ArrayDecorator";
+import { linkTo } from "@truedat/core/routes";
+import { Link } from "react-router-dom";
+import RuleResultDecorator from "../components/RuleResultDecorator";
+import RuleImplementationLink from "../components/RuleImplementationLink";
+import RuleLink from "../components/RuleLink";
+
+const translateDecorator = (id) =>
+  id ? <FormattedMessage id={id} defaultMessage={id} /> : null;
+
+const resultTypeDecorator = (result, result_type, resultType) =>
+  _.defaultTo(result_type)(resultType) === "errors_number"
+    ? formatNumber(result)
+    : `${result}%`;
+
+export const defaultBusinessConceptsLinksToImplementationsColumns = [
+  {
+    name: "implementation_key",
+    fieldSelector: _.pick(["id", "implementation_key", "rule_id"]),
+    fieldDecorator: RuleImplementationLink,
+    width: 2,
+  },
+  {
+    name: "rule",
+    fieldSelector: ({ rule, rule_id: id }) => ({ id, name: rule?.name }),
+    fieldDecorator: RuleLink,
+    width: 2,
+  },
+  {
+    name: "status",
+    fieldSelector: ({ status }) =>
+      translateDecorator(`ruleImplementation.status.${status}`),
+    width: 2,
+  },
+  {
+    name: "last_execution_at",
+    fieldSelector: ({ execution_result_info }) => ({
+      value: execution_result_info?.date,
+    }),
+    fieldDecorator: DateTime,
+    width: 2,
+  },
+  {
+    name: "result_type",
+    fieldDecorator: (value) =>
+      _.isNil(value)
+        ? null
+        : translateDecorator(`ruleImplementations.props.result_type.${value}`),
+    width: 2,
+  },
+  {
+    name: "minimum",
+    fieldSelector: _.pick(["minimum", "result_type"]),
+    fieldDecorator: (field) =>
+      resultTypeDecorator(field.minimum, field.result_type),
+    textAlign: "right",
+    width: 1,
+  },
+  {
+    name: "goal",
+    fieldSelector: _.pick(["goal", "result_type"]),
+    fieldDecorator: (field) =>
+      resultTypeDecorator(field.goal, field.result_type),
+    textAlign: "right",
+    width: 1,
+  },
+  {
+    name: "result",
+    fieldSelector: (ruleImplementation) => ({
+      ruleResult: ruleImplementation?.execution_result_info,
+      ruleImplementation,
+    }),
+    fieldDecorator: RuleResultDecorator,
+    textAlign: "center",
+    width: 2,
+  },
+  {
+    name: "inserted_at",
+    fieldSelector: ({ inserted_at }) => ({ value: inserted_at }),
+    fieldDecorator: DateTime,
+  },
+  {
+    name: "updated_at",
+    fieldSelector: ({ updated_at }) => ({ value: updated_at }),
+    fieldDecorator: DateTime,
+  },
+  {
+    name: "related_by",
+    fieldSelector: _.pick(["business_concept_id", "business_concept_name"]),
+    fieldDecorator: ({ business_concept_id, business_concept_name }) => {
+      return _.isEmpty(business_concept_id) ? (
+        <></>
+      ) : (
+        <Link
+          to={linkTo.CONCEPT_VERSION({
+            business_concept_id: business_concept_id,
+            id: "current",
+          })}
+        >
+          {business_concept_name}
+        </Link>
+      );
+    },
+  },
+];
+
+export const getBusinessConceptsLinksToImplementationsColumns = createSelector(
+  _.prop("businessConceptsLinksToImplementationsColumns"),
+  _.defaultTo(defaultBusinessConceptsLinksToImplementationsColumns)
+);

package/src/selectors/index.js

@@ -27,6 +27,10 @@ export {
   getRuleImplementationColumns,
   defaultImplementationColumns,
 } from "./getRuleImplementationColumns";
+export {
+  getBusinessConceptsLinksToImplementationsColumns,
+  defaultBusinessConceptsLinksToImplementationsColumns,
+} from "./getBusinessConceptsLinksToImplementationsColumns";
 export { getPreviousRuleImplementationQuery } from "./getPreviousRuleImplementationQuery";
 export { getRuleImplementationAvailableFilters } from "./getRuleImplementationAvailableFilters";
 export { getRuleImplementationFilterTypes } from "./getRuleImplementationFilterTypes";