@truedat/dq 5.7.2 → 5.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "5.7.2",
+  "version": "5.7.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": "5.7.2",
+    "@truedat/test": "5.7.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": "5.7.2",
-    "@truedat/df": "5.7.2",
+    "@truedat/core": "5.7.3",
+    "@truedat/df": "5.7.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": "4315abba2c52728150ce9b9044005eae1409cccf"
+  "gitHead": "adaa367000214d1d4200c98b62aadfc84a29da07"
 }

package/src/components/ImplementationStructures.js

@@ -2,7 +2,15 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { Table, Button, Grid, Segment, Header, Icon } from "semantic-ui-react";
+import {
+  Button,
+  Grid,
+  Header,
+  Icon,
+  List,
+  Segment,
+  Table,
+} from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { Link } from "react-router-dom";
 import { linkTo } from "@truedat/core/routes";
@@ -18,6 +26,20 @@ ImplementationStructureDeleteDecorator.propTypes = {
   implementation_id: PropTypes.number,
 };
 
+const DomainDecorator = (domains) => (
+  <List>
+    {domains.map(({ name, parents }, i) => (
+      <List.Item key={i}>
+        {_.flow(_.map("name"), _.union([name]), _.join(" > "))(parents)}
+      </List.Item>
+    ))}
+  </List>
+);
+
+DomainDecorator.propTypes = {
+  domains: PropTypes.array,
+};
+
 const PathDecorator = (path) => (
   <span title={_.join(" › ")(path)}>
     {_.flow(_.join(" › "), _.truncate({ length: 90 }))(path)}
@@ -50,6 +72,11 @@ export const ImplementationStructures = ({ implementation, canCreateLink }) => {
       fieldSelector: _.path("data_structure"),
       fieldDecorator: ImplementationStructureLink,
     },
+    {
+      header: "structure.domain",
+      fieldSelector: _.path("data_structure.domains"),
+      fieldDecorator: DomainDecorator,
+    },
     {
       header: "structure.system",
       fieldSelector: _.path("data_structure.system.name"),

package/src/components/ImplementationSummary.js

@@ -8,6 +8,7 @@ import { linkTo } from "@truedat/core/routes";
 import ConditionSummary, { empty, path } from "./ConditionSummary";
 import FieldSummary from "./FieldSummary";
 import InformationSummary from "./InformationSummary";
+import TaxonomySummary from "./TaxonomySummary";
 import { JoinTypeIcon } from "./JoinTypeIcon";
 import "../styles/ImplementationSummary.less";
 
@@ -164,10 +165,16 @@ export const ImplementationSummary = ({ ruleImplementation, activeSteps }) => {
   const alias = _.map(_.propOr({}, "alias"))(dataset);
   return (
     <>
-      {(_.includes("implementationKey")(steps) ||
-        _.includes("executable")(steps)) && (
+      {_.includes("implementationKey")(steps) ||
+      _.includes("executable")(steps) ? (
         <InformationSummary ruleImplementation={ruleImplementation} />
-      )}
+      ) : null}
+
+      {_.includes("dataset")(steps) &&
+      !_.isEmpty(ruleImplementation?.data_structures) ? (
+        <TaxonomySummary ruleImplementation={ruleImplementation} />
+      ) : null}
+
       {dataset && _.includes("dataset")(steps) && (
         <DatasetSummary rows={dataset} alias={alias} />
       )}

package/src/components/RawContent.js

@@ -4,59 +4,64 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Header, Icon, Grid, List } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
+import TaxonomySummary from "./TaxonomySummary";
 
-const empty = rows => rows && _.every(r => _.isEmpty(r) || _.isNil(r))(rows);
+const empty = (rows) =>
+  rows && _.every((r) => _.isEmpty(r) || _.isNil(r))(rows);
 
-export const RawContent = ({ content }) => {
+export const RawContent = ({ content, ruleImplementation }) => {
   const system = _.path("system.name")(content);
   const source = _.path("source.external_id")(content);
   const database = _.prop("database")(content);
 
   return empty(content) ? null : (
-    <Grid>
-      {!_.isEmpty(system) && (
-        <Grid.Row>
-          <Grid.Column>
-            <Header as="h3">
-              <FormattedMessage id="ruleImplementation.summary.system" />
-            </Header>
-            <List>
-              <List.Item>{system}</List.Item>
-            </List>
-          </Grid.Column>
-        </Grid.Row>
-      )}
-      {source && (
-        <Grid.Row>
-          <Grid.Column>
-            <Header as="h3">
-              <FormattedMessage id="ruleImplementation.summary.source" />
-            </Header>
-            <List>
-              <List.Item>{source}</List.Item>
-            </List>
-          </Grid.Column>
-        </Grid.Row>
-      )}
-      {!_.isEmpty(database) && (
-        <Grid.Row>
-          <Grid.Column>
-            <Header as="h3">
-              <FormattedMessage id="ruleImplementation.summary.database" />
-            </Header>
-            <List>
-              <List.Item>{database}</List.Item>
-            </List>
-          </Grid.Column>
-        </Grid.Row>
-      )}
-      {[
-        { property: "dataset", icon: "database" },
-        { property: "population", icon: "user" },
-        { property: "validations", icon: "setting" }
-      ].map(
-        ({ property, icon }, i) =>
-          _.prop(property)(content) && (
+    <>
+      {!_.isEmpty(ruleImplementation?.data_structures) ? (
+        <TaxonomySummary ruleImplementation={ruleImplementation} />
+      ) : null}
+      <Grid>
+        {!_.isEmpty(system) ? (
+          <Grid.Row>
+            <Grid.Column>
+              <Header as="h3">
+                <FormattedMessage id="ruleImplementation.summary.system" />
+              </Header>
+              <List>
+                <List.Item>{system}</List.Item>
+              </List>
+            </Grid.Column>
+          </Grid.Row>
+        ) : null}
+        {source ? (
+          <Grid.Row>
+            <Grid.Column>
+              <Header as="h3">
+                <FormattedMessage id="ruleImplementation.summary.source" />
+              </Header>
+              <List>
+                <List.Item>{source}</List.Item>
+              </List>
+            </Grid.Column>
+          </Grid.Row>
+        ) : null}
+        {!_.isEmpty(database) ? (
+          <Grid.Row>
+            <Grid.Column>
+              <Header as="h3">
+                <FormattedMessage id="ruleImplementation.summary.database" />
+              </Header>
+              <List>
+                <List.Item>{database}</List.Item>
+              </List>
+            </Grid.Column>
+          </Grid.Row>
+        ) : null}
+        {[
+          { property: "dataset", icon: "database" },
+          { property: "population", icon: "user" },
+          { property: "validations", icon: "setting" },
+        ].map(({ property, icon }, i) =>
+          _.prop(property)(content) ? (
             <Grid.Row key={i}>
               <Grid.Column>
                 <Header as="h3">
@@ -76,18 +81,19 @@ export const RawContent = ({ content }) => {
                 </List>
               </Grid.Column>
             </Grid.Row>
-          )
-      )}
-    </Grid>
+          ) : null
+        )}
+      </Grid>
+    </>
   );
 };
 
 RawContent.propTypes = {
-  content: PropTypes.object
+  content: PropTypes.object,
 };
 
 export const mapStateToProps = ({ ruleImplementationRaw: content }) => ({
-  content
+  content,
 });
 
 export default connect(mapStateToProps)(RawContent);

package/src/components/RuleImplementationProperties.js

@@ -73,7 +73,7 @@ export const RuleImplementationProperties = ({
               activeSteps={summarySteps}
             />
           ) : (
-            <RawContent />
+            <RawContent ruleImplementation={ruleImplementation} />
           )}
         </Grid.Column>
       </Grid>

package/src/components/RuleImplementationsDownload.js

@@ -9,6 +9,7 @@ import { downloadImplementations } from "../routines";
 const staticHeaderLabels = [
   "implementation_key",
   "implementation_type",
+  "domain",
   "rule",
   "rule_template",
   "implementation_template",
@@ -20,6 +21,7 @@ const staticHeaderLabels = [
   "execution",
   "inserted_at",
   "executable",
+  "structure_domains",
 ];
 
 const staticContentLabels = [

package/src/components/TaxonomySummary.js

@@ -0,0 +1,41 @@
+import _ from "lodash/fp";
+import React from "react";
+import PropTypes from "prop-types";
+import { FormattedMessage } from "react-intl";
+import { Header, Icon, Segment, List } from "semantic-ui-react";
+
+const domainDecorator = (domains) => (
+  <List>
+    {domains.map(({ name, parents }, key) => (
+      <List.Item key={key}>
+        {_.flow(_.map("name"), _.union([name]), _.join(" > "))(parents)}
+      </List.Item>
+    ))}
+  </List>
+);
+
+export default function TaxonomySummary({ ruleImplementation }) {
+  const dataStructures = ruleImplementation.data_structures || [];
+
+  const taxonomy = _.flow(
+    _.map((structure) => structure.data_structure.domains),
+    _.flatten,
+    _.uniqBy("name"),
+    _.orderBy(["name"], ["asc"])
+  )(dataStructures);
+
+  return (
+    <>
+      <Header as="h3">
+        <Icon name="sitemap" size="small" />
+        <Header.Content>
+          <FormattedMessage id="ruleImplementation.taxonomy" />
+        </Header.Content>
+      </Header>
+      <Segment>{domainDecorator(taxonomy)}</Segment>
+    </>
+  );
+}
+TaxonomySummary.propTypes = {
+  ruleImplementation: PropTypes.object.isRequired,
+};

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

@@ -6,6 +6,7 @@ describe("<ImplementationStructures />", () => {
   const renderOpts = {
     messages: {
       en: {
+        "structure.domain": "domain",
         "structure.name": "name",
         "structure.system": "system",
         "structure.path": "path",
@@ -26,6 +27,7 @@ describe("<ImplementationStructures />", () => {
               id: 1,
               name: "foo",
               system: { name: "bar" },
+              domains: [{ name: "foo_domain", parents: [{ name: "bar" }] }],
               current_version: {
                 name: "qux",
                 path: ["baz"],
@@ -52,6 +54,7 @@ describe("<ImplementationStructures />", () => {
             data_structure: {
               id: 1,
               name: "foo",
+              domains: [{ name: "foo_domain", parents: [{ name: "bar" }] }],
               system: { name: "bar" },
               path: ["baz"],
               current_version: {

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

@@ -1,40 +1,82 @@
 import React from "react";
-import { shallow } from "enzyme";
+import { render } from "@truedat/test/render";
 import { RawContent } from "../RawContent";
 
 describe("<RawContent />", () => {
-  it("matches the latest snapshot", () => {
-    const content = {
-      source: { external_id: "source" },
-      dataset: "client c join address a on c.address_id=a.id",
-      population: "",
-      validations: "c.city='MADRID'"
+  const content = {
+    source: { external_id: "external_id_source" },
+    dataset: "client c join address a on c.address_id=a.id",
+    population: "",
+    validations: "c.city='MADRID'",
+    system: { name: "foo" },
+    database: "bar",
+  };
+  const ruleImplementation = {
+    data_structures: [
+      {
+        data_structure: {
+          domains: [
+            {
+              id: 1,
+              name: "foo",
+            },
+            {
+              id: 2,
+              name: "bar",
+            },
+          ],
+        },
+      },
+    ],
+  };
+  it("matches the lastest snapshot", () => {
+    const props = { content, ruleImplementation };
+    const { container } = render(<RawContent {...props} />);
+    expect(container).toMatchSnapshot();
+  });
+
+  it("render when content is empty", () => {
+    const props = { content: {}, ruleImplementation };
+    const { container } = render(<RawContent {...props} />);
+    expect(container).toMatchSnapshot();
+  });
+
+  it("render when system is empty", () => {
+    const props = {
+      content: { ...content, system: {} },
+      ruleImplementation,
     };
+    const { container } = render(<RawContent {...props} />);
+    expect(container).toMatchSnapshot();
+  });
 
-    const props = { content };
-    const wrapper = shallow(<RawContent {...props} />);
-    expect(wrapper).toMatchSnapshot();
+  it("render when database is empty", () => {
+    const props = {
+      content: { ...content, database: {} },
+      ruleImplementation,
+    };
+    const { container } = render(<RawContent {...props} />);
+    expect(container).toMatchSnapshot();
   });
 
-  it("renders alias if present", () => {
-    const content = {
-      source: { external_id: "source" },
-      dataset: "client c join address a on c.address_id=a.id",
-      population: "",
-      validations: "c.city='MADRID'"
+  it("render when source is empty", () => {
+    const props = {
+      content: { ...content, source: {} },
+      ruleImplementation,
     };
+    const { container } = render(<RawContent {...props} />);
+    expect(container).toMatchSnapshot();
+  });
+
+  it("render when data_structures is empty", () => {
+    const props = { content, ruleImplementation: {} };
+    const { container } = render(<RawContent {...props} />);
+    expect(container).toMatchSnapshot();
+  });
 
+  it("renders alias if present", async () => {
     const props = { content };
-    const wrapper = shallow(<RawContent {...props} />);
-    expect(wrapper).toMatchSnapshot();
-    expect(
-      wrapper
-        .find("GridRow")
-        .at(0)
-        .find("ListItem")
-        .children()
-        .at(0)
-        .text()
-    ).toBe(content.source.external_id);
+    const { findByText } = render(<RawContent {...props} />);
+    expect(await findByText(/external_id_source/)).toBeInTheDocument();
   });
 });

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

@@ -0,0 +1,39 @@
+import React from "react";
+import { render } from "@truedat/test/render";
+import messages from "@truedat/dq/messages";
+import TaxonomySummary from "../TaxonomySummary";
+
+describe("<TaxonomySummary />", () => {
+  const ruleImplementation = {
+    data_structures: [
+      {
+        data_structure: {
+          domains: [
+            {
+              id: 1,
+              name: "foo",
+            },
+            {
+              id: 2,
+              name: "bar",
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  it("matches the latest snapshot", () => {
+    const renderOpts = {
+      messages: {
+        en: {
+          ...messages.en,
+        },
+      },
+    };
+
+    const props = { ruleImplementation };
+    const { container } = render(<TaxonomySummary {...props} />, renderOpts);
+    expect(container).toMatchSnapshot();
+  });
+});

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

@@ -25,6 +25,11 @@ exports[`<ImplementationStructures /> matches the latest snapshot 1`] = `
               >
                 name
               </th>
+              <th
+                class=""
+              >
+                domain
+              </th>
               <th
                 class=""
               >
@@ -60,6 +65,21 @@ exports[`<ImplementationStructures /> matches the latest snapshot 1`] = `
                   qux
                 </a>
               </td>
+              <td
+                class=""
+              >
+                <div
+                  class="ui list"
+                  role="list"
+                >
+                  <div
+                    class="item"
+                    role="listitem"
+                  >
+                    bar &gt; foo_domain
+                  </div>
+                </div>
+              </td>
               <td
                 class=""
               >
@@ -121,6 +141,11 @@ exports[`<ImplementationStructures /> matches the latest snapshot without create
               >
                 name
               </th>
+              <th
+                class=""
+              >
+                domain
+              </th>
               <th
                 class=""
               >
@@ -153,6 +178,21 @@ exports[`<ImplementationStructures /> matches the latest snapshot without create
                   qux
                 </a>
               </td>
+              <td
+                class=""
+              >
+                <div
+                  class="ui list"
+                  role="list"
+                >
+                  <div
+                    class="item"
+                    role="listitem"
+                  >
+                    bar &gt; foo_domain
+                  </div>
+                </div>
+              </td>
               <td
                 class=""
               >