@truedat/dq 6.16.3 → 6.16.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "6.16.3",
+  "version": "6.16.4",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -118,5 +118,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "9ac7bd2ddab3f16be28269b3203e568c269cbd0e"
+  "gitHead": "ecf57a30185b9e353b6e2692702b5599e4425edb"
 }

package/src/components/ConceptRules.js

@@ -118,7 +118,10 @@ ConceptRules.propTypes = {
 
 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)

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

@@ -7,8 +7,8 @@ import { Checkbox, Table, Header, Icon } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { sortImplementations } from "../routines";
 import {
+  getBusinessConceptsLinksToImplementationsColumns,
   getRuleImplementationColumns,
-  getRuleImplementationExpandableColumns,
 } from "../selectors";
 import RuleImplementationRow from "./RuleImplementationRow";
 
@@ -130,8 +130,14 @@ RuleImplementationsTable.propTypes = {
 };
 
 const mapStateToProps = (state, props) => ({
-  columns: _.propOr(getRuleImplementationColumns(state), "columns")(props),
-  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();
+  });
 });