@truedat/dd 7.6.4 → 7.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "7.6.4",
+  "version": "7.7.1",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "module": "src/index.js",
@@ -48,7 +48,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "7.6.4",
+    "@truedat/test": "7.7.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -83,5 +83,5 @@
     "svg-pan-zoom": "^3.6.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "994343683c2e0fb3fab85a021e627b1b86a7831f"
+  "gitHead": "b0bbab1ace5acb5a0c670137a51d21456f5eecae"
 }

package/src/components/StructureRow.js

@@ -11,6 +11,7 @@ export const StructureRow = ({
   active,
   disabled,
   positive,
+  origin,
   grantable,
 }) =>
   _.isEmpty(columns) || _.isEmpty(structure) ? null : (
@@ -22,7 +23,10 @@ export const StructureRow = ({
             className: "structure-cell-overflow",
           })}
           textAlign={column.textAlign}
-          content={columnDecorator(column)(structure)}
+          content={columnDecorator(column)({
+            ...structure,
+            linkOrigin: origin,
+          })}
           onClick={() => onClick && onClick(structure)}
         />
       ))}
@@ -41,6 +45,7 @@ StructureRow.propTypes = {
   active: PropTypes.bool,
   disabled: PropTypes.bool,
   positive: PropTypes.bool,
+  origin: PropTypes.string,
   grantable: PropTypes.bool,
 };
 

package/src/components/StructuresTable.js

@@ -16,6 +16,17 @@ const isPositive = (links, id) => {
   return link ? true : false;
 };
 
+const getOrigin = (links, id) => {
+  return _.flow(
+    _.find(
+      (link) =>
+        _.propEq("target_id", id)(link) &&
+        _.propEq("target_type", "data_structure")(link)
+    ),
+    _.get("origin")
+  )(links);
+};
+
 export const StructuresTable = ({
   columns: overwriteColumns,
   grantable,
@@ -52,7 +63,8 @@ export const StructuresTable = ({
           : [selectedStructure, ...structures]
         : structures;
     const headerRow = (
-      <Table.Row>{columns.map((column, key) => (
+      <Table.Row>
+        {columns.map((column, key) => (
           <Table.HeaderCell
             key={key}
             content={
@@ -67,9 +79,11 @@ export const StructuresTable = ({
             onClick={() => handleSortSelection(_.path("sort.name")(column))}
             width={_.propOr(1, "width")(column)}
           />
-        ))}{grantable && (
+        ))}
+        {grantable && (
           <Table.HeaderCell textAlign="center">Request grant</Table.HeaderCell>
-        )}</Table.Row>
+        )}
+      </Table.Row>
     );
 
     const renderBodyRow = (s, i) => (
@@ -79,6 +93,7 @@ export const StructuresTable = ({
         structure={s}
         active={selectedStructure && _.propEq("id", s.id)(selectedStructure)}
         positive={isPositive(links, s.id)}
+        origin={getOrigin(links, s.id)}
         onClick={onStructureSelected}
         grantable={grantable}
       />

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

@@ -51,6 +51,8 @@ describe("selectors: defaultColumnsForStructureSelector", () => {
         name: "name",
         sort: { name: "name.sort" },
         width: 2,
+        fieldDecorator: expect.any(Function),
+        fieldSelector: expect.any(Function),
       },
       { name: "group", width: 1 },
     ]);

package/src/selectors/structureColumnsSelector.js

@@ -3,6 +3,7 @@ import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import { linkTo } from "@truedat/core/routes";
 import { Link } from "react-router";
+import { OriginIcon } from "@truedat/core/components/OriginLabel";
 import Moment from "react-moment";
 
 const StructureLink = (structure) =>
@@ -85,6 +86,13 @@ const rawName = {
   name: "name",
   sort: { name: "name.sort" },
   width: 2,
+  fieldSelector: _.identity,
+  fieldDecorator: ({ name, linkOrigin }) => (
+    <>
+      {name}
+      <OriginIcon origin={linkOrigin} />
+    </>
+  ),
 };
 export const defaultColumnsForStructureSelector = createSelector(
   (state) => structureColumnsSelector(state, null, null),