@truedat/dd 6.1.1 → 6.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "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.2",
     "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.2",
+    "@truedat/core": "6.1.2",
+    "@truedat/df": "6.1.2",
     "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": "34f3dad97550142a4a23048fee3214ce04e957bf"
 }

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;
 };