@truedat/dd 7.0.0 → 7.0.2

package/src/selectors/getGrantRequestsSearchColumns.js

@@ -33,6 +33,12 @@ PathDecorator.propTypes = {
 
 export const StructureDecorator = (grantRequest) => {
   const { formatMessage } = useIntl();
+  const data_structure_version = grantRequest?.data_structure_version?.name
+    ? grantRequest?.data_structure_version
+    : grantRequest?.grant?.data_structure_version?.name
+    ? grantRequest?.grant?.data_structure_version
+    : null;
+
   return (
     <>
       {grantRequest.modification_grant_id ? (
@@ -44,14 +50,25 @@ export const StructureDecorator = (grantRequest) => {
         <Popup
           content={formatMessage({ id: "request.grantRemoval" })}
           trigger={
-            <Link to={linkTo.GRANT({ id: grantRequest.grant.id })}>
+            <Link
+              onClick={(e) => e.stopPropagation()}
+              to={linkTo.GRANT({ id: grantRequest.grant.id })}
+            >
               <Icon name="user delete" style={{ color: "black" }} />{" "}
             </Link>
           }
         />
       ) : null}
-      {grantRequest?.data_structure_version?.name ||
-        grantRequest?.grant?.data_structure_version?.name}
+      {data_structure_version ? (
+        <Link
+          onClick={(e) => e.stopPropagation()}
+          to={linkTo.STRUCTURE({
+            id: data_structure_version?.data_structure_id,
+          })}
+        >
+          {data_structure_version?.name}
+        </Link>
+      ) : null}
     </>
   );
 };

package/src/selectors/getGrantsColumns.js

@@ -8,16 +8,6 @@ import { useIntl } from "react-intl";
 import Moment from "react-moment";
 import PropTypes from "prop-types";
 
-export const GrantIdDecorator = ({ id }) => (
-  <Link to={linkTo.GRANT({ id })}>{id}</Link>
-);
-
-GrantIdDecorator.propTypes = {
-  id: PropTypes.number,
-};
-
-export const idDecorator = ({ id }) => GrantIdDecorator({ id });
-
 export const GrantUserDecorator = ({ authentication, user }) => {
   const { formatMessage } = useIntl();
   const sameUser = user?.user_name === authentication?.user_name;
@@ -69,7 +59,12 @@ export const GrantStructureDecorator = ({
       </Header.Subheader>
     </Header>
   ) : (
-    <Link to={linkTo.STRUCTURE(data_structure)}>{path}</Link>
+    <Link
+      onClick={(e) => e.stopPropagation()}
+      to={linkTo.STRUCTURE(data_structure)}
+    >
+      {path}
+    </Link>
   );
 };
 
@@ -83,15 +78,14 @@ export const structureDecorator = (structure) => (props) => {
   return GrantStructureDecorator({ grant_structure: structure, ...props });
 };
 
-export const GrantTableStructureDecorator = ({ data_structure_version }) => {
-  return (
-    <Link
-      to={linkTo.STRUCTURE({ id: data_structure_version.data_structure_id })}
-    >
-      {data_structure_version.name}
-    </Link>
-  );
-};
+export const GrantTableStructureDecorator = ({ data_structure_version }) => (
+  <Link
+    onClick={(e) => e.stopPropagation()}
+    to={linkTo.STRUCTURE({ id: data_structure_version.data_structure_id })}
+  >
+    {data_structure_version.name}
+  </Link>
+);
 
 GrantTableStructureDecorator.propTypes = {
   data_structure_version: PropTypes.object,
@@ -166,11 +160,6 @@ EndDateDecorator.propTypes = {
 };
 
 export const defaultGrantsColumns = [
-  {
-    name: "id",
-    fieldSelector: _.pick(["id"]),
-    fieldDecorator: idDecorator,
-  },
   {
     name: "user",
     fieldSelector: _.pick(["user"]),
@@ -209,11 +198,6 @@ export const getGrantsColumns = createSelector(
 );
 
 export const defaultGrantsTableColumns = [
-  {
-    name: "id",
-    fieldSelector: _.pick(["id"]),
-    fieldDecorator: idDecorator,
-  },
   {
     name: "user",
     sort: { name: "user.user_name.raw" },

package/src/selectors/structureColumnsSelector.js

@@ -2,8 +2,17 @@ import _ from "lodash/fp";
 import React from "react";
 import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
+import { linkTo } from "@truedat/core/routes";
+import { Link } from "react-router-dom";
 import Moment from "react-moment";
 
+const StructureLink = (structure) =>
+  structure?.id ? (
+    <Link to={linkTo.STRUCTURE(structure)} title={structure?.name}>
+      {structure?.name}
+    </Link>
+  ) : null;
+
 const typeTranslateDecorator = ({ type }) => (
   <FormattedMessage id={`structure.type.${type}.text`} defaultMessage={type} />
 );
@@ -24,6 +33,8 @@ export const defaultStructureColumns = [
   {
     name: "name",
     sort: { name: "name.sort" },
+    fieldDecorator: StructureLink,
+    fieldSelector: _.identity,
     width: 2,
   },
   {

package/src/selectors/structureNotesColumnsSelector.js

@@ -2,8 +2,17 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { createSelector } from "reselect";
+import { Link } from "react-router-dom";
+import { linkTo } from "@truedat/core/routes";
 import { FormattedMessage } from "react-intl";
 
+const StructureLink = (structure) =>
+  structure?.id ? (
+    <Link to={linkTo.STRUCTURE_NOTES(structure)} title={structure?.name}>
+      {structure?.name}
+    </Link>
+  ) : null;
+
 const translateDecorator = (id) =>
   id ? <FormattedMessage id={id} defaultMessage={id} /> : null;
 
@@ -27,6 +36,8 @@ export const defaultStructureNoteColumns = [
   {
     name: "name",
     sort: { name: "name.sort" },
+    fieldDecorator: StructureLink,
+    fieldSelector: _.identity,
     width: 2,
   },
   {