@truedat/dd 4.40.4 → 4.40.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.40.7] 2022-03-18
+
+### Added
+
+- [TD-4435] Display full name of structures in Data Catalog
+
+## [4.40.6] 2022-03-17
+
+### Changed
+
+- [TD-4500] Remove unnecessary domain_id attribute on GrantRequestApprovalForm
+
 ## [4.40.2] 2022-03-14
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.40.4",
+  "version": "4.40.7",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.40.4",
+    "@truedat/test": "4.40.5",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.40.4",
-    "@truedat/core": "4.40.4",
-    "@truedat/df": "4.40.4",
+    "@truedat/auth": "4.40.7",
+    "@truedat/core": "4.40.7",
+    "@truedat/df": "4.40.7",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.7.2",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "e9f62f91507d810f91963967a5f3afa20100c1b9"
+  "gitHead": "57ce60d30f6238ab63207ae402dfc0bc0e5c934a"
 }

package/src/components/GrantRequestApprovalForm.js

@@ -30,10 +30,9 @@ export const GrantRequestApprovalForm = ({
   )(grantRequest);
 
   const onSubmit = (formValues) => {
-    const { id, domain_id } = grantRequest;
+    const { id } = grantRequest;
     const approval = {
       ...formValues,
-      domain_id,
       is_rejection: isRejection,
     };
     createGrantRequestApproval({

package/src/components/StructureItem.js

@@ -10,14 +10,15 @@ import { STRUCTURES, linkTo } from "@truedat/core/routes";
 const getIcon = (formatMessage, type) =>
   formatMessage({
     id: `structure.type.${type}.icon`,
-    defaultMessage: "question circle outline"
+    defaultMessage: "question circle outline",
   });
 
 export const StructureItem = ({ name, id, type, active, deleted_at }) => {
   const { formatMessage } = useIntl();
   return (
     <List.Item
-      as={active ? undefined : Link}
+      as={active ? "a" : Link}
+      title={name}
       to={
         active
           ? undefined
@@ -39,8 +40,11 @@ export const StructureItem = ({ name, id, type, active, deleted_at }) => {
 };
 
 StructureItem.propTypes = {
+  active: PropTypes.bool,
+  deleted_at: PropTypes.string,
+  id: PropTypes.number,
   name: PropTypes.string,
-  id: PropTypes.number
+  type: PropTypes.string,
 };
 
 export const mapStateToProps = (
@@ -50,7 +54,8 @@ export const mapStateToProps = (
   const id = data_structure_id || structureId;
   return {
     id: id,
-    active: type !== "system" && _.isFinite(id) && _.propEq("id", id)(structure)
+    active:
+      type !== "system" && _.isFinite(id) && _.propEq("id", id)(structure),
   };
 };
 

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

@@ -7,7 +7,6 @@ import { GrantRequestApprovalForm } from "../GrantRequestApprovalForm";
 describe("<GrantRequestApprovalForm />", () => {
   const grantRequest = {
     id: 3,
-    domain_id: 8,
     pending_roles: ["role1", "role2"],
   };
   const createGrantRequestApproval = jest.fn();
@@ -77,7 +76,6 @@ describe("<GrantRequestApprovalForm />", () => {
       expect.objectContaining({
         grantRequestId: 3,
         approval: {
-          domain_id: 8,
           is_rejection: false,
           role: "role1",
           comment: "comment",

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

@@ -36,14 +36,16 @@ describe("<StructureItem />", () => {
     const wrapper = shallow(<StructureItem {...props} />);
     expect(wrapper.prop("as")).toBe(Link);
     expect(wrapper.prop("to")).toEqual("/structures");
+    expect(wrapper.prop("title")).toBeTruthy();
   });
 
-  it("renders as an active List Item if active is true", () => {
+  it("renders as an anchor tag if active is true", () => {
     const props = { id, name, active: true };
     const wrapper = shallow(<StructureItem {...props} />);
-    expect(wrapper.prop("as")).toBeUndefined();
+    expect(wrapper.prop("as")).toBe("a");
     expect(wrapper.prop("to")).toBeUndefined();
     expect(wrapper.prop("active")).toBeTruthy();
+    expect(wrapper.prop("title")).toBeTruthy();
   });
 
   describe("mapStateToProps", () => {
@@ -55,7 +57,7 @@ describe("<StructureItem />", () => {
 
       expect(mapStateToProps(state, ownProps)).toMatchObject({
         id: data_structure_id,
-        active: false
+        active: false,
       });
     });
 
@@ -65,7 +67,7 @@ describe("<StructureItem />", () => {
       const state = { structure };
 
       expect(mapStateToProps(state, ownProps)).toMatchObject({
-        active: true
+        active: true,
       });
     });
   });

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

@@ -3,6 +3,8 @@
 exports[`<StructureItem /> matches the latest snapshot (active state) 1`] = `
 <ListItem
   active={true}
+  as="a"
+  title="foo"
 >
   <ListIcon
     name="question circle outline"
@@ -32,6 +34,7 @@ exports[`<StructureItem /> matches the latest snapshot 1`] = `
       "render": [Function],
     }
   }
+  title="foo"
   to="/structures/1"
 >
   <ListIcon

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

@@ -20,7 +20,7 @@ exports[`<StructureNavClassified /> matches the latest snapshot (leaf class expa
       </div>
     </div>
   </div>
-  <div
+  <a
     class="active item"
     role="listitem"
   >
@@ -35,7 +35,7 @@ exports[`<StructureNavClassified /> matches the latest snapshot (leaf class expa
         class="description"
       />
     </div>
-  </div>
+  </a>
   <div
     class="item"
     role="listitem"