@truedat/lm 4.38.2 → 4.38.3

package/CHANGELOG.md

@@ -4,7 +4,9 @@
 
 ### Added
 
-- [TD-4297] Add tags ("type") column to structure Linkage tab
+- [TD-4297]
+  - Add tags ("type") column to structure Linkage tab
+  - Hide the type column if none of the links has any tag
 
 ### Changed
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/lm",
-  "version": "4.38.2",
+  "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.38.2",
+    "@truedat/test": "4.38.3",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -83,7 +83,7 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "4.38.2",
+    "@truedat/core": "4.38.3",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.7.2",
     "react-graph-vis": "1.0.5",
@@ -100,5 +100,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "41504c0c5ccc40ea20e67985e3957fd7c1897e2e"
+  "gitHead": "0ad3a7fe5d8d09b9c5e6e7007d8298748f6677fe"
 }

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/constants/index.js

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