@truedat/dq 7.2.2 → 7.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "7.2.2",
+  "version": "7.2.3",
   "description": "Truedat Web Data Quality Module",
   "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.2.2",
+    "@truedat/test": "7.2.3",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -92,8 +92,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/core": "7.2.2",
-    "@truedat/df": "7.2.2",
+    "@truedat/core": "7.2.3",
+    "@truedat/df": "7.2.3",
     "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": "9033c57eccb9e6785c0a0c5aa6078c34788d6e7d"
+  "gitHead": "1f8b6f4d6fbd6e278493c35885e540c14f9c551b"
 }

package/src/components/ExecutionGroup.js

@@ -4,69 +4,28 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";
 import { Table } from "semantic-ui-react";
-import { DateTime } from "@truedat/core/components";
 import { columnDecorator } from "@truedat/core/services";
+import { getExecutionGroupColumns } from "../selectors";
 import ExecutionGroupMessage from "./ExecutionGroupMessage";
-import RuleResultDecorator from "./RuleResultDecorator";
-import RuleImplementationResultsLink from "./RuleImplementationResultsLink";
-import RuleEventDecorator from "./RuleEventDecorator";
 import ExecutionGroupContent from "./ExecutionGroupContent";
 import ExecutionGroupBreadcrumbs from "./ExecutionGroupBreadcrumbs";
 
-const COLUMNS = [
-  {
-    name: "ruleImplementations.props.status",
-    fieldDecorator: RuleEventDecorator,
-    fieldSelector: _.pick(["_embedded.quality_events"]),
-  },
-  {
-    name: "ruleImplementations.props.implementation_key",
-    fieldSelector: "_embedded.implementation",
-    fieldDecorator: RuleImplementationResultsLink,
-  },
-  {
-    name: "rule.props.name",
-    fieldSelector: "_embedded.rule.name",
-  },
-  {
-    name: "ruleResult.props.date",
-    fieldDecorator: DateTime,
-    textAlign: "center",
-    fieldSelector: ({ _embedded }) => ({ value: _embedded?.result?.date }),
-  },
-  {
-    name: "ruleResult.props.records",
-    textAlign: "right",
-    fieldSelector: "_embedded.result.records",
-  },
-  {
-    name: "ruleResult.props.errors",
-    textAlign: "right",
-    fieldSelector: "_embedded.result.errors",
-  },
-  {
-    name: "ruleResult.props.quality",
-    fieldSelector: ({ _embedded }) => ({
-      ruleResult: _embedded?.result,
-      ruleImplementation: _embedded?.implementation,
-    }),
-    fieldDecorator: RuleResultDecorator,
-  },
-];
-
-export const ExecutionRow = ({ execution }) => (
-  <Table.Row>
-    {COLUMNS.map(({ textAlign, ...column }, i) => (
-      <Table.Cell
-        key={i}
-        content={columnDecorator(column)(execution)}
-        textAlign={textAlign}
-      />
-    ))}
-  </Table.Row>
-);
+export const ExecutionRow = ({ execution, columns }) => {
+  return (
+    <Table.Row>
+      {columns.map(({ textAlign, ...column }, i) => (
+        <Table.Cell
+          key={i}
+          content={columnDecorator(column)(execution)}
+          textAlign={textAlign}
+        />
+      ))}
+    </Table.Row>
+  );
+};
 
 ExecutionRow.propTypes = {
+  columns: PropTypes.array,
   execution: PropTypes.object,
 };
 
@@ -74,7 +33,7 @@ const isCompleted = _.flow(_.prop("_embedded.status"), (s) =>
   _.includes(s)(["SUCCEEDED", "FAILED"])
 );
 
-export const ExecutionGroup = ({ executionGroup }) => {
+export const ExecutionGroup = ({ executionGroup, columns }) => {
   const { formatMessage } = useIntl();
   const executions = _.sortBy("_embedded.implementation.implementation_key")(
     executionGroup?._embedded?.executions
@@ -96,7 +55,7 @@ export const ExecutionGroup = ({ executionGroup }) => {
       <Table>
         <Table.Header>
           <Table.Row>
-            {COLUMNS.map(({ name: id, textAlign }, i) => (
+            {columns.map(({ name: id, textAlign }, i) => (
               <Table.HeaderCell
                 key={i}
                 content={formatMessage({ id })}
@@ -107,7 +66,7 @@ export const ExecutionGroup = ({ executionGroup }) => {
         </Table.Header>
         <Table.Body>
           {executions?.map((execution, i) => (
-            <ExecutionRow key={i} execution={execution} />
+            <ExecutionRow key={i} execution={execution} columns={columns} />
           ))}
         </Table.Body>
       </Table>
@@ -116,9 +75,15 @@ export const ExecutionGroup = ({ executionGroup }) => {
 };
 
 ExecutionGroup.propTypes = {
+  columns: PropTypes.array,
   executionGroup: PropTypes.object,
 };
 
-export const mapStateToProps = ({ executionGroup }) => ({ executionGroup });
+export const mapStateToProps = (state) => {
+  return {
+    columns: getExecutionGroupColumns(state),
+    executionGroup: state.executionGroup,
+  };
+};
 
 export default connect(mapStateToProps)(ExecutionGroup);

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

@@ -1,6 +1,7 @@
 import React from "react";
 import { render } from "@truedat/test/render";
 import ExecutionGroup from "../ExecutionGroup";
+import { defaultExecutionGroupColumns } from "../../selectors";
 
 const rule = {
   id: 1,
@@ -13,6 +14,12 @@ const implementation = {
   result_type: "percentage",
   minimum: 10,
   goal: 20,
+  df_content: {
+    df_field: "implementation_df_value",
+  },
+  dynamic_content: {
+    df_field: { value: "implementation_df_value", origin: "user" },
+  },
 };
 const result = {
   id: 1,
@@ -48,4 +55,28 @@ describe("<ExecutionGroup />", () => {
     const { container } = render(<ExecutionGroup />, renderOpts);
     expect(container).toMatchSnapshot();
   });
+
+  it("defines custom columns", () => {
+    const executionGroupColumns = [
+      {
+        name: "implementation.df_field",
+        fieldSelector:
+          "_embedded.implementation.dynamic_content.df_field.value",
+      },
+      ...defaultExecutionGroupColumns,
+    ];
+    const customColumnsState = {
+      executionGroupColumns,
+      ...state,
+    };
+
+    const { queryByText } = render(<ExecutionGroup />, {
+      state: customColumnsState,
+    });
+    expect(queryByText(/Identifier/)).toBeInTheDocument();
+    expect(queryByText(/foo/)).toBeInTheDocument();
+
+    expect(queryByText(/implementation.df_field/)).toBeInTheDocument();
+    expect(queryByText(/implementation_df_value/)).toBeInTheDocument();
+  });
 });

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

@@ -54,11 +54,6 @@ exports[`<ExecutionGroup /> matches the latest snapshot 1`] = `
         >
           Identifier
         </th>
-        <th
-          class=""
-        >
-          Name
-        </th>
         <th
           class="center aligned"
         >
@@ -104,11 +99,6 @@ exports[`<ExecutionGroup /> matches the latest snapshot 1`] = `
             foo
           </a>
         </td>
-        <td
-          class=""
-        >
-          rule_name
-        </td>
         <td
           class="center aligned"
         >

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

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

package/src/selectors/getExecutionGroupColumns.js

@@ -0,0 +1,50 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+import DateTime from "@truedat/core/components/DateTime";
+import RuleEventDecorator from "../components/RuleEventDecorator";
+import RuleImplementationResultsLink from "../components/RuleImplementationResultsLink";
+import RuleResultDecorator from "../components/RuleResultDecorator";
+
+export const defaultExecutionGroupColumns = [
+  {
+    name: "ruleImplementations.props.status",
+    fieldDecorator: RuleEventDecorator,
+    fieldSelector: _.pick(["_embedded.quality_events"]),
+  },
+  {
+    name: "ruleImplementations.props.implementation_key",
+    fieldSelector: "_embedded.implementation",
+    fieldDecorator: RuleImplementationResultsLink,
+  },
+  {
+    name: "ruleResult.props.date",
+    fieldDecorator: DateTime,
+    textAlign: "center",
+    fieldSelector: ({ _embedded }) => ({ value: _embedded?.result?.date }),
+  },
+  {
+    name: "ruleResult.props.records",
+    textAlign: "right",
+    fieldSelector: "_embedded.result.records",
+  },
+  {
+    name: "ruleResult.props.errors",
+    textAlign: "right",
+    fieldSelector: "_embedded.result.errors",
+  },
+  {
+    name: "ruleResult.props.quality",
+    fieldSelector: ({ _embedded }) => ({
+      ruleResult: _embedded?.result,
+      ruleImplementation: _embedded?.implementation,
+    }),
+    fieldDecorator: RuleResultDecorator,
+  },
+];
+
+const getColumns = (state) => state.executionGroupColumns;
+
+export const getExecutionGroupColumns = createSelector(
+  [getColumns],
+  _.defaultTo(defaultExecutionGroupColumns)
+);

package/src/selectors/index.js

@@ -31,6 +31,10 @@ export {
   getRuleImplementationColumns,
   defaultImplementationColumns,
 } from "./getRuleImplementationColumns";
+export {
+  getExecutionGroupColumns,
+  defaultExecutionGroupColumns,
+} from "./getExecutionGroupColumns";
 export { getPreviousRuleImplementationQuery } from "./getPreviousRuleImplementationQuery";
 export { getRuleImplementationAvailableFilters } from "./getRuleImplementationAvailableFilters";
 export { getRuleImplementationFilterTypes } from "./getRuleImplementationFilterTypes";