@truedat/dd 5.18.3 → 5.20.0

package/src/selectors/getGrantRequestsSearchColumns.js

@@ -2,6 +2,8 @@ import _ from "lodash/fp";
 import React from "react";
 import { Header, Icon, Popup } from "semantic-ui-react";
 import { createSelector } from "reselect";
+import { linkTo } from "@truedat/core/routes";
+import { Link } from "react-router-dom";
 import { useIntl } from "react-intl";
 import PropTypes from "prop-types";
 import Moment from "react-moment";
@@ -26,29 +28,34 @@ export const PathDecorator = ({ data_structure_version }) => {
 };
 
 PathDecorator.propTypes = {
-  data_structure: PropTypes.object,
+  data_structure_version: PropTypes.object,
 };
 
-export const StructureDecorator = ({ name, modificationGrant }) => {
+export const StructureDecorator = (grantRequest) => {
   const { formatMessage } = useIntl();
   return (
     <>
-      {modificationGrant ? (
+      {grantRequest.modification_grant_id ? (
         <Popup
           content={formatMessage({ id: "grantRequest.modification_grant_id" })}
           trigger={<Icon name="edit" />}
         />
+      ) : grantRequest.request_type === "grant_removal" ? (
+        <Popup
+          content={formatMessage({ id: "request.grantRemoval" })}
+          trigger={
+            <Link to={linkTo.GRANT({ id: grantRequest.grant.id })}>
+              <Icon name="key" />
+            </Link>
+          }
+        />
       ) : null}
-      {name}
+      {grantRequest?.data_structure_version?.name ||
+        grantRequest?.grant?.data_structure_version?.name}
     </>
   );
 };
 
-StructureDecorator.propTypes = {
-  name: PropTypes.string,
-  modificationGrant: PropTypes.string,
-};
-
 const DateDecorator = ({ date }) => {
   const { locale } = useIntl();
   return date ? (
@@ -83,16 +90,15 @@ export const defaultGrantRequestsSearchTableColumns = [
   {
     name: "data_structure",
     sort: { name: "data_structure_version.name.raw" },
-    fieldSelector: (grantRequest) => ({
-      name: grantRequest?.data_structure_version?.name,
-      modificationGrant: _.prop("modification_grant_id")(grantRequest),
-    }),
+    fieldSelector: (grantRequest) => grantRequest,
     fieldDecorator: StructureDecorator,
   },
   {
     name: "path",
     fieldSelector: (grantRequest) => ({
-      data_structure_version: grantRequest?.data_structure_version,
+      data_structure_version:
+        grantRequest?.data_structure_version ||
+        grantRequest?.grant?.data_structure_version,
     }),
     fieldDecorator: PathDecorator,
   },

package/src/selectors/utils/decorators.js

@@ -0,0 +1,68 @@
+import _ from "lodash/fp";
+import React from "react";
+import { Header, Icon, Popup } from "semantic-ui-react";
+import { linkTo } from "@truedat/core/routes";
+import { Link } from "react-router-dom";
+import { useIntl } from "react-intl";
+import PropTypes from "prop-types";
+import Moment from "react-moment";
+
+export const UserDecorator = ({ user }) =>
+  user ? (
+    <Header as="h4">
+      <Header.Content>
+        {user.full_name} <Header.Subheader>{user.email}</Header.Subheader>
+      </Header.Content>
+    </Header>
+  ) : null;
+
+UserDecorator.propTypes = {
+  user: PropTypes.object,
+};
+
+export const GrantRequestStructureDecorator = (grantRequest) => {
+  const { formatMessage } = useIntl();
+  return (
+    <>
+      {grantRequest?.modification_grant_id ? (
+        <Popup
+          content={formatMessage({ id: "grantRequest.isModification" })}
+          trigger={<Icon name="edit" />}
+        />
+      ) : grantRequest?.request_type === "grant_removal" ? (
+        <Popup
+          content={formatMessage({ id: "grantRequest.isModification" })}
+          trigger={
+            <Link to={linkTo.GRANT({ id: grantRequest?.grant?.id || 0 })}>
+              <Icon name="key" />
+            </Link>
+          }
+        />
+      ) : null}
+      { grantRequest?.data_structure_version?.name ||
+        grantRequest?.grant?.data_structure_version?.name}
+    </>
+  );
+};
+
+export const DateDecorator = ({ date }) => {
+  const { locale } = useIntl();
+  return date ? (
+    <Moment locale={locale} date={date} format="YYYY-MM-DD HH:mm" />
+  ) : null;
+};
+
+DateDecorator.propTypes = {
+  date: PropTypes.string,
+};
+
+export const StatusDecorator = ({ status }) => {
+  const { formatMessage } = useIntl();
+  return status ? (
+    <>{formatMessage({ id: `grantRequest.content.${status}` })}</>
+  ) : null;
+};
+
+StatusDecorator.propTypes = {
+  status: PropTypes.string,
+};

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

@@ -1,9 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<GrantRemoval /> matches the latest snapshot 1`] = `
-<div>
-  <p>
-    child
-  </p>
-</div>
-`;