@truedat/lm 4.37.5 → 4.38.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.38.1] 2022-02-17
+
+### Added
+
+- [TD-4297]
+  - Add tags ("type") column to structure Linkage tab
+  - Hide the type column if none of the links has any tag
+
+### Changed
+
+- [TD-4297] Relation tags traduction messages now have the prefix `conceptRelations.relationType.`
+
 ## [4.30.0] 2021-10-06
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/lm",
-  "version": "4.37.5",
+  "version": "4.38.3",
   "description": "Truedat Link Manager",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -33,7 +33,7 @@
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.34.0",
+    "@truedat/test": "4.38.3",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -42,6 +42,7 @@
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.6",
     "enzyme-to-json": "^3.6.2",
+    "identity-obj-proxy": "^3.0.0",
     "jest": "^27.0.6",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
@@ -82,7 +83,7 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "4.37.5",
+    "@truedat/core": "4.38.3",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.7.2",
     "react-graph-vis": "1.0.5",
@@ -99,5 +100,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "98ff8669e99824ef1bdbd3d12035e6371029e4ca"
+  "gitHead": "0ad3a7fe5d8d09b9c5e6e7007d8298748f6677fe"
 }

package/src/components/ConceptLinkTags.js

@@ -0,0 +1,23 @@
+import React from "react";
+import PropTypes from "prop-types";
+import { FormattedMessage } from "react-intl";
+import "../styles/ConceptLinkTags.less";
+
+export const ConceptLinkTags = ({ tags }) => (
+  <ul className="concept-link-tags">
+    {tags.map((tag, i) => (
+      <li key={i}>
+        <FormattedMessage
+          id={`conceptRelations.relationType.${tag}`}
+          defaultMessage={tag}
+        />
+      </li>
+    ))}
+  </ul>
+);
+
+ConceptLinkTags.propTypes = {
+  tags: PropTypes.array,
+};
+
+export default ConceptLinkTags;

package/src/components/StructureLinkRow.js

@@ -23,6 +23,6 @@ StructureLinkRow.propTypes = {
   columns: PropTypes.array
 };
 
-const mapStateToProps = ({}) => ({ columns: structureLinkColumns });
+const mapStateToProps = ({}) => ({ /*columns: structureLinkColumns*/ });
 
 export default connect(mapStateToProps)(StructureLinkRow);

package/src/components/StructureLinks.js

@@ -7,24 +7,64 @@ import { FormattedMessage } from "react-intl";
 import { Link } from "react-router-dom";
 import { linkTo } from "@truedat/core/routes";
 import { accentInsensitivePathOrder } from "@truedat/core/services/sort";
-import { structureLinkColumns } from "../constants";
 import { getStructureToConceptLinks } from "../selectors/getStructureLinks";
+import ConceptLink from "../components/ConceptLink";
+import ConceptLinkTags from "../components/ConceptLinkTags";
 import StructureLinkRow from "./StructureLinkRow";
 
 export const StructureLinks = ({
-  columns,
   structure,
   structureLinks,
-  canCreateLink
+  canCreateLink,
 }) => {
+  const structureLinkColumnsWithTags = [
+    {
+      header: "concepts.props.name",
+      fieldSelector: _.identity,
+      fieldDecorator: ConceptLink,
+    },
+    {
+      header: "concepts.props.tags",
+      fieldSelector: _.identity,
+      fieldDecorator: ConceptLinkTags,
+    },
+    {
+      header: "concepts.props.domain",
+      fieldSelector: _.path("domain.name"),
+    },
+  ];
+
+  const structureLinkColumnsWithoutTags = [
+    {
+      header: "concepts.props.name",
+      fieldSelector: _.identity,
+      fieldDecorator: ConceptLink,
+    },
+    {
+      header: "concepts.props.domain",
+      fieldSelector: _.path("domain.name"),
+    },
+  ];
+
+  const columns = _.every(
+    (structureLink) => _.isEmpty(structureLink.tags),
+    structureLinks
+  )
+    ? structureLinkColumnsWithoutTags
+    : structureLinkColumnsWithTags;
+
   const headerRow = columns.map(({ header }, key) => (
     <Table.HeaderCell
       key={key}
       content={header ? <FormattedMessage id={header} /> : null}
     />
   ));
+
   const id = _.prop("id")(structure);
-  const renderBodyRow = (link, i) => <StructureLinkRow key={i} link={link} />;
+  const renderBodyRow = (link, i) => (
+    <StructureLinkRow key={i} link={link} columns={columns} />
+  );
+
   return (
     <Grid>
       {id && canCreateLink && (
@@ -52,17 +92,17 @@ export const StructureLinks = ({
 };
 
 StructureLinks.propTypes = {
+  structure: PropTypes.object,
   canCreateLink: PropTypes.bool,
-  structureLinks: PropTypes.array
+  structureLinks: PropTypes.array,
 };
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   structure: state.structure,
   structureLinks: _.sortBy(accentInsensitivePathOrder("name"))(
     getStructureToConceptLinks(state)
   ),
   canCreateLink: _.has("create_link")(state.structureActions),
-  columns: structureLinkColumns
 });
 
 export default connect(mapStateToProps)(StructureLinks);

package/src/components/StructureRelationForm.js

@@ -84,7 +84,7 @@ export class StructureRelationForm extends React.Component {
                   <Checkbox
                     toggle
                     label={formatMessage({
-                      id: tagOption.text,
+                      id: `conceptRelations.relationType.${tagOption.text}`,
                       defaultMessage: tagOption.text,
                     })}
                     name={tagOption.text}

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

@@ -0,0 +1,16 @@
+import _ from "lodash/fp";
+import React from "react";
+import { render } from "@truedat/test/render";
+import { shallow } from "enzyme";
+
+import ConceptLinkTags from "../ConceptLinkTags";
+
+describe("ConceptLinkTags", () => {
+  it("matches the latest snapshot", () => {
+    const link = {
+      tags: ["otro tipo", "business_concept_to_field_master"],
+    };
+    const wrapper = shallow(<ConceptLinkTags {...link} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+});

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

@@ -0,0 +1,24 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ConceptLinkTags matches the latest snapshot 1`] = `
+<ul
+  className="concept-link-tags"
+>
+  <li
+    key="0"
+  >
+    <MemoizedFormattedMessage
+      defaultMessage="otro tipo"
+      id="conceptRelations.relationType.otro tipo"
+    />
+  </li>
+  <li
+    key="1"
+  >
+    <MemoizedFormattedMessage
+      defaultMessage="business_concept_to_field_master"
+      id="conceptRelations.relationType.business_concept_to_field_master"
+    />
+  </li>
+</ul>
+`;

package/src/constants/index.js

@@ -1 +0,0 @@
-export * from "./structureLinkColumns";

package/src/constants/structureLinkColumns.js

@@ -1,14 +1,20 @@
 import _ from "lodash/fp";
 import ConceptLink from "../components/ConceptLink";
+import ConceptLinkTags from "../components/ConceptLinkTags";
 
 export const structureLinkColumns = [
   {
     header: "concepts.props.name",
     fieldSelector: _.identity,
-    fieldDecorator: ConceptLink
+    fieldDecorator: ConceptLink,
+  },
+  {
+    header: "Type",
+    fieldSelector: _.identity,
+    fieldDecorator: ConceptLinkTags,
   },
   {
     header: "concepts.props.domain",
-    fieldSelector: _.path("domain.name")
+    fieldSelector: _.path("domain.name"),
   }
 ];

package/src/styles/ConceptLinkTags.less

@@ -0,0 +1,4 @@
+.concept-link-tags{
+  list-style-type: none;
+  padding: 0;
+}