@truedat/dd 7.1.5 → 7.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "7.1.5",
+  "version": "7.1.7",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "7.1.5",
+    "@truedat/test": "7.1.7",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "7.1.5",
-    "@truedat/core": "7.1.5",
-    "@truedat/df": "7.1.5",
+    "@truedat/auth": "7.1.7",
+    "@truedat/core": "7.1.7",
+    "@truedat/df": "7.1.7",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -115,5 +115,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "70b7033a85426aac68147bffa65c44ad754441bc"
+  "gitHead": "080df9a1d6c8a4464e10b974875b6d00db751616"
 }

package/src/components/StructureTabPane.js

@@ -9,7 +9,10 @@ import {
   STRUCTURE_NOTES_EDIT,
 } from "@truedat/core/routes";
 import { getActiveTab } from "../selectors/getActiveTab";
-import { getTabVisibility } from "../selectors/getTabVisibility";
+import {
+  getTabVisibility,
+  getLinkedImplementationsToStructuresColumns,
+} from "../selectors";
 import StructureChildrenRelations from "./StructureChildrenRelations";
 import StructureEvents from "./StructureEvents";
 import StructureGrants from "./StructureGrants";
@@ -40,7 +43,7 @@ const RuleImplementationsTable = React.lazy(() =>
   import("@truedat/dq/components/RuleImplementationsTable")
 );
 
-export const StructureTabPane = ({ activeTab, tabVisibility }) => {
+export const StructureTabPane = ({ activeTab, tabVisibility, columns }) => {
   return (
     <ErrorBoundary>
       {activeTab === "fields" && <StructureFields />}
@@ -82,7 +85,7 @@ export const StructureTabPane = ({ activeTab, tabVisibility }) => {
       {activeTab === "events" && <StructureEvents />}
       {activeTab === "roles" && <StructureRoles />}
       {activeTab === "rules" && tabVisibility.rules && (
-        <RuleImplementationsTable withoutColumns={["status"]} />
+        <RuleImplementationsTable columns={columns} />
       )}
       {activeTab === "metadata" && tabVisibility.metadata && (
         <StructureMetadata />
@@ -96,6 +99,7 @@ export const StructureTabPane = ({ activeTab, tabVisibility }) => {
 StructureTabPane.propTypes = {
   activeTab: PropTypes.string,
   tabVisibility: PropTypes.object,
+  columns: PropTypes.array,
 };
 
 const mapStateToProps = (
@@ -107,6 +111,7 @@ const mapStateToProps = (
   return {
     tabVisibility,
     activeTab,
+    columns: getLinkedImplementationsToStructuresColumns(state),
   };
 };
 

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

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

package/src/selectors/getLinkedImplementationsToStructuresColumns.js

@@ -0,0 +1,95 @@
+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 ConceptsLinkDecorator from "@truedat/bg/concepts/components/ConceptsLinkDecorator";
+import RuleResultDecorator from "@truedat/dq/components/RuleResultDecorator";
+import RuleImplementationLink from "@truedat/dq/components/RuleImplementationLink";
+import RuleLink from "@truedat/dq/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 defaultImplementationToStructuresColumns = [
+  {
+    name: "implementation_key",
+    fieldSelector: _.pick(["id", "implementation_key", "rule_id"]),
+    fieldDecorator: RuleImplementationLink,
+    sort: { name: "implementation_key.raw" },
+    width: 2,
+  },
+  {
+    name: "rule",
+    fieldSelector: ({ rule, rule_id: id }) => ({ id, name: rule?.name }),
+    sort: { name: "rule.name.raw" },
+    fieldDecorator: RuleLink,
+    width: 2,
+  },
+  {
+    name: "business_concepts",
+    fieldSelector: _.path("concepts"),
+    fieldDecorator: ConceptsLinkDecorator,
+    width: 2,
+  },
+  {
+    name: "last_execution_at",
+    fieldSelector: ({ execution_result_info }) => ({
+      value: execution_result_info?.date,
+    }),
+    fieldDecorator: DateTime,
+    sort: { name: "execution_result_info.date" },
+    width: 2,
+  },
+  {
+    name: "result_type",
+    fieldDecorator: (value) =>
+      _.isNil(value)
+        ? null
+        : translateDecorator(`ruleImplementations.props.result_type.${value}`),
+    sort: { name: "result_type.raw" },
+    width: 2,
+  },
+  {
+    name: "minimum",
+    fieldSelector: _.pick(["minimum", "result_type"]),
+    fieldDecorator: (field) =>
+      resultTypeDecorator(field.minimum, field.result_type),
+    sort: { name: "minimum" },
+    textAlign: "right",
+    width: 1,
+  },
+  {
+    name: "goal",
+    fieldSelector: _.pick(["goal", "result_type"]),
+    fieldDecorator: (field) =>
+      resultTypeDecorator(field.goal, field.result_type),
+    sort: { name: "goal" },
+    textAlign: "right",
+    width: 1,
+  },
+  {
+    name: "result",
+    fieldSelector: (ruleImplementation) => ({
+      ruleResult: ruleImplementation?.execution_result_info,
+      ruleImplementation,
+    }),
+    fieldDecorator: RuleResultDecorator,
+    textAlign: "center",
+    sort: { name: "execution_result_info.result.sort" },
+    width: 2,
+  },
+];
+
+const getColumns = (state) => state.ruleImplementationToStructuresColumns;
+
+export const getLinkedImplementationsToStructuresColumns = createSelector(
+  [getColumns],
+  _.defaultTo(defaultImplementationToStructuresColumns)
+);

package/src/selectors/index.js

@@ -53,6 +53,10 @@ export { getSystemTemplate } from "./getSystemTemplate";
 export { getTabVisibility } from "./getTabVisibility";
 export { groupOptionsSelector } from "./groupOptionsSelector";
 export { resourceOptionsSelector } from "./resourceOptionsSelector";
+export {
+  getLinkedImplementationsToStructuresColumns,
+  defaultImplementationToStructuresColumns,
+} from "./getLinkedImplementationsToStructuresColumns";
 export * from "./templateNamesSelector";
 export * from "./getGrantsColumns";
 export * from "./getLineageLevels";