@truedat/dd 6.1.1 → 6.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "6.1.1",
+  "version": "6.1.3",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "6.1.1",
+    "@truedat/test": "6.1.3",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "6.1.1",
-    "@truedat/core": "6.1.1",
-    "@truedat/df": "6.1.1",
+    "@truedat/auth": "6.1.3",
+    "@truedat/core": "6.1.3",
+    "@truedat/df": "6.1.3",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -115,5 +115,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "8ba2e1d68380956d654d6927a6117734f1c50076"
+  "gitHead": "0f50f152b947693a64e36e6eb946fac33978ea8c"
 }

package/src/components/Grant.js

@@ -38,7 +38,23 @@ export const GrantHeader = ({ grant, title, actions, onStatusChange }) => {
         ...structure.data,
         ...structure.data.data_structure,
       };
+
   const { formatMessage } = useIntl();
+
+  const getTodayDate = () => {
+    const today = new Date();
+    const year = today.getFullYear();
+    const month = today.getMonth() + 1;
+    const formatedMonth = month < 10 ? "0" + month : month;
+    const day = today.getDate();
+    const formatedDay = day < 10 ? "0" + day : day;
+
+    return `${year}-${formatedMonth}-${formatedDay}`;
+  };
+
+  const isGrantExpired = () =>
+    !_.isNil(grant.end_date) && _.lte(grant.end_date, getTodayDate());
+
   return (
     <Grid>
       <Grid.Row>
@@ -53,25 +69,29 @@ export const GrantHeader = ({ grant, title, actions, onStatusChange }) => {
           </Header>
         </Grid.Column>
         <Grid.Column width={4} textAlign="right">
-          {actions?.update && !loading ? (
-            <GrantChangeRequest
-              structure={data_structure}
-              grant={grant}
-              key="requestChange"
-            >
-              <Button
-                className="button icon group-actions"
-                content={formatMessage({
-                  id: "structure.grant.request_grant_change",
-                })}
+          {!isGrantExpired() ? (
+            <>
+              {actions?.update && !loading ? (
+                <GrantChangeRequest
+                  structure={data_structure}
+                  grant={grant}
+                  key="requestChange"
+                >
+                  <Button
+                    className="button icon group-actions"
+                    content={formatMessage({
+                      id: "structure.grant.request_grant_change",
+                    })}
+                  />
+                </GrantChangeRequest>
+              ) : null}
+              <GrantRemoval
+                actions={actions}
+                grant={grant}
+                onConfirm={onStatusChange}
               />
-            </GrantChangeRequest>
+            </>
           ) : null}
-          <GrantRemoval
-            actions={actions}
-            grant={grant}
-            onConfirm={onStatusChange}
-          />
         </Grid.Column>
       </Grid.Row>
     </Grid>
@@ -190,11 +210,15 @@ export const Grant = ({ grant, actions, loading, onStatusChange }) => {
                       {formatMessage({ id: "grant.header.end_date" })}
                     </List.Header>
                     <List.Description>
-                      <Moment
-                        locale="es"
-                        date={grant?.end_date}
-                        format="YYYY-MM-DD"
-                      />
+                      {grant?.end_date ? (
+                        <Moment
+                          locale="es"
+                          date={grant.end_date}
+                          format="YYYY-MM-DD"
+                        />
+                      ) : (
+                        formatMessage({ id: "grant.cell.end_date.null" })
+                      )}
                     </List.Description>
                   </List.Item>
                   {_.isEmpty(grant?.detail) ? null : (

package/src/components/GrantRequestRow.js

@@ -46,7 +46,7 @@ export const GrantRequestRow = ({
              * inside an anchor, such as an icon) is clicked
              */
             !ev.target.closest("a") &&
-              history.push(linkTo.GRANT_REQUEST(grantRequest))
+              history.push(linkTo.GRANT_REQUEST(grantRequest));
           }}
           content={columnDecoratorComponent(column)(grantRequest)}
         />

package/src/components/StructureGrantDropdown.js

@@ -2,10 +2,11 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { Button, Dropdown, Popup, Header } from "semantic-ui-react";
-import { useIntl } from "react-intl";
+import { FormattedMessage, useIntl } from "react-intl";
 import { useHistory } from "react-router-dom";
 import { linkTo } from "@truedat/core/routes";
 import { Date } from "@truedat/core/components";
+import { config } from "@truedat/core/truedatConfig";
 
 import GrantChangeRequest from "./GrantChangeRequest";
 import GrantRequestCancel from "./GrantRequestCancel";
@@ -97,6 +98,9 @@ export const StructureGrantDropdown = ({
       header: isModification
         ? "structure.grant.requested_modification"
         : "structure.grant.requested_access",
+      buttonContent: isModification
+        ? "structure.grant.requested_modification.short"
+        : "structure.grant.requested_access.short",
     },
     processingRequest: {
       color: "grey",
@@ -104,11 +108,15 @@ export const StructureGrantDropdown = ({
       header: isModification
         ? "structure.grant.modification.attended"
         : "structure.grant.access.attended",
+      buttonContent: isModification
+        ? "structure.grant.modification.attended.short"
+        : "structure.grant.access.attended.short",
     },
     activeGrant: {
       color: "green",
       options: [actions["requestChange"]],
       header: "structure.grant.has_grant",
+      buttonContent: "structure.grant.has_grant.short",
     },
   };
 
@@ -145,11 +153,23 @@ export const StructureGrantDropdown = ({
     </>
   );
 
+  const buttonContent = (
+    <FormattedMessage
+      id={stateProps?.buttonContent}
+      defaultMessage={stateProps?.buttonContent}
+    />
+  );
+
   const optionsWithCart =
     authorized && !requested
       ? [actions["addToCart"], ...stateProps.options]
       : stateProps?.options;
 
+  const { iconName, hasText } = config?.structureGrantRequestButton || {
+    iconName: "shield",
+    hasText: false,
+  };
+
   const trigger = (
     <Dropdown
       icon={null}
@@ -159,7 +179,8 @@ export const StructureGrantDropdown = ({
         <Button
           color={stateProps.color}
           className="button basic icon group-actions"
-          icon="shield"
+          icon={iconName || null}
+          content={hasText ? buttonContent : null}
         />
       }
     >

package/src/components/StructureGrantRequestButton.js

@@ -1,8 +1,9 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { Button, Icon, Popup } from "semantic-ui-react";
+import { Button, Popup } from "semantic-ui-react";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";
+import { config } from "@truedat/core/truedatConfig";
 import { addGrantRequestToCart, removeGrantRequestFromCart } from "../routines";
 
 export const StructureGrantRequestButton = ({
@@ -12,6 +13,10 @@ export const StructureGrantRequestButton = ({
   addGrantRequestToCart,
   removeGrantRequestFromCart,
 }) => {
+  const { iconName, hasText } = config?.structureGrantRequestButton || {
+    iconName: "shield",
+    hasText: false,
+  };
   const { formatMessage } = useIntl();
   const addRequest = () => {
     addGrantRequestToCart(structure);
@@ -20,14 +25,24 @@ export const StructureGrantRequestButton = ({
   const removeRequest = () => {
     removeGrantRequestFromCart(structure);
   };
-  const content = formatMessage({
+  const popupContent = formatMessage({
     id: requested
       ? "structure.grant.requested_grant"
       : "structure.grant.request_grant",
   });
-  const trigger = (
+
+  const buttonContentMessageId = requested
+    ? "structure.grant.requested_grant.short"
+    : "structure.grant.request_grant.short";
+  const buttonContent = formatMessage({
+    id: buttonContentMessageId,
+    defaultMessage: buttonContentMessageId,
+  });
+
+  const button = (
     <Button
-      icon={<Icon name="shield" />}
+      icon={iconName || null}
+      content={hasText ? buttonContent : null}
       className="button basic icon group-actions"
       color={requested ? "blue" : "orange"}
       onClick={requested ? removeRequest : addRequest}
@@ -35,7 +50,7 @@ export const StructureGrantRequestButton = ({
   );
 
   return authorized ? (
-    <Popup content={content} position="top center" trigger={trigger} />
+    <Popup content={popupContent} position="top center" trigger={button} />
   ) : null;
 };
 

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

@@ -36,7 +36,7 @@ describe("<Grant />", () => {
       bar: "baz",
     },
     start_date: "2018-12-01",
-    end_date: "2019-12-31",
+    end_date: "2029-12-31",
     inserted_at: "2022-12-12T12:49:09.789722Z",
     pending_removal: false,
     external_ref: "foo",
@@ -111,4 +111,20 @@ describe("<Grant />", () => {
       id: 1,
     });
   });
+
+  it("don't show buttons of edit and remove if the grant is expired", async () => {
+    const updatedGrant = {
+      ...defaultProps.grant,
+      end_date: "2024-01-01",
+    };
+
+    const updatedProps = {
+      ...defaultProps,
+      grant: updatedGrant,
+    };
+
+    const { queryByText } = render(<Grant {...updatedProps} />, renderOpts);
+    const buttonText = queryByText("request grant change");
+    expect(buttonText).toBeNull();
+  });
 });

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

@@ -190,9 +190,9 @@ exports[`<Grant /> matches the latest snapshot 1`] = `
                 class="description"
               >
                 <time
-                  datetime="1577750400000"
+                  datetime="1893369600000"
                 >
-                  2019-12-31
+                  2029-12-31
                 </time>
               </div>
             </div>
@@ -411,9 +411,9 @@ exports[`<Grant /> matches the latest snapshot with manage_grant_removal action
                 class="description"
               >
                 <time
-                  datetime="1577750400000"
+                  datetime="1893369600000"
                 >
-                  2019-12-31
+                  2029-12-31
                 </time>
               </div>
             </div>
@@ -685,9 +685,9 @@ exports[`<Grant /> matches the latest snapshot with update action 1`] = `
                 class="description"
               >
                 <time
-                  datetime="1577750400000"
+                  datetime="1893369600000"
                 >
-                  2019-12-31
+                  2029-12-31
                 </time>
               </div>
             </div>

package/src/selectors/getGrantRequestsColumns.js

@@ -55,7 +55,7 @@ export const StructureDecorator = ({
           content={formatMessage({ id: "request.grantRemoval" })}
           trigger={
             <Link to={linkTo.GRANT({ id: grant.id })}>
-              <Icon name="key" />
+              <Icon name="user delete" style={{ color: "black" }} />{" "}
             </Link>
           }
         />

package/src/selectors/getGrantRequestsSearchColumns.js

@@ -45,7 +45,7 @@ export const StructureDecorator = (grantRequest) => {
           content={formatMessage({ id: "request.grantRemoval" })}
           trigger={
             <Link to={linkTo.GRANT({ id: grantRequest.grant.id })}>
-              <Icon name="key" />
+              <Icon name="user delete" style={{ color: "black" }} />{" "}
             </Link>
           }
         />

package/src/selectors/utils/decorators.js

@@ -39,7 +39,7 @@ export const GrantRequestStructureDecorator = (grantRequest) => {
           }
         />
       ) : null}
-      { grantRequest?.data_structure_version?.name ||
+      {grantRequest?.data_structure_version?.name ||
         grantRequest?.grant?.data_structure_version?.name}
     </>
   );
@@ -65,4 +65,4 @@ export const StatusDecorator = ({ status }) => {
 
 StatusDecorator.propTypes = {
   status: PropTypes.string,
-};
+};