@truedat/dd 4.46.13 → 4.47.2

package/CHANGELOG.md

@@ -1,8 +1,15 @@
 # Changelog
 
+## [4.47.0] 2022-06-22
+
+### Changed
+
+- [TD-4392] "Request grant" button is only displayed if the structure's has been
+  classified as `_grantable`
+
 ## [4.46.12] 2022-06-20
 
-### Reverted
+### Removed
 
 - [TD-4894] Multiple column operator in implementation creation
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.46.13",
+  "version": "4.47.2",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.46.12",
+    "@truedat/test": "4.47.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.6.4",
-    "@truedat/auth": "4.46.13",
-    "@truedat/core": "4.46.13",
-    "@truedat/df": "4.46.13",
+    "@truedat/auth": "4.47.2",
+    "@truedat/core": "4.47.2",
+    "@truedat/df": "4.47.2",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
@@ -112,5 +112,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "89cd539e47e64a3e4a6f8bc30ea4d3b66fb0b666"
+  "gitHead": "53cb62b57d41745cfcd4c0b90154a6cfcd168534"
 }

package/src/components/StructureNav.js

@@ -7,10 +7,17 @@ import StructureItem from "./StructureItem";
 import StructureItems from "./StructureItems";
 import StructureNavClassified from "./StructureNavClassified";
 
+export const navClasses = _.flow(
+  _.prop("classes"),
+  _.keys,
+  _.without(["_grantable"])
+);
+export const hasNavClass = _.flow(navClasses, _.negate(_.isEmpty));
+
 export const StructureNav = ({ childStructures, parentStructure }) => {
-  const firstWithClasses = _.find("classes")(childStructures);
+  const firstWithClasses = _.find(hasNavClass)(childStructures);
   const classifier = firstWithClasses
-    ? Object.keys(firstWithClasses.classes)[0]
+    ? _.flow(navClasses, _.head)(firstWithClasses)
     : undefined;
 
   return (

package/src/components/StructureSummary.js

@@ -55,6 +55,7 @@ const dateProperties = (deleted_at, updatedAt) =>
 
 export const StructureSummary = ({
   class: structureClass,
+  classes: structureClasses,
   name,
   published_note,
   description,
@@ -79,7 +80,9 @@ export const StructureSummary = ({
                   {_.isEmpty(published_note?.alias)
                     ? name
                     : published_note.alias}
-                  <StructureGrantButton />
+                  {structureClasses?._grantable ? (
+                    <StructureGrantButton />
+                  ) : null}
                   {!_.isEmpty(published_note?.alias) && (
                     <Header.Subheader>{name}</Header.Subheader>
                   )}
@@ -117,6 +120,7 @@ export const StructureSummary = ({
 
 StructureSummary.propTypes = {
   class: PropTypes.string,
+  classes: PropTypes.object,
   name: PropTypes.string,
   published_note: PropTypes.object,
   description: PropTypes.string,

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

@@ -1,6 +1,6 @@
 import React from "react";
 import { render } from "@truedat/test/render";
-import { StructureNav } from "../StructureNav";
+import { StructureNav, hasNavClass, navClasses } from "../StructureNav";
 
 const renderOpts = {
   messages: {
@@ -25,3 +25,27 @@ describe("<StructureNav />", () => {
     expect(container).toMatchSnapshot();
   });
 });
+
+describe("navClasses", () => {
+  it("returns all classes keys except _grantable", () => {
+    expect(navClasses({ classes: { foo: "foo" } })).toEqual(["foo"]);
+    expect(navClasses({ classes: { b: "b", _grantable: "x" } })).toEqual(["b"]);
+    expect(navClasses({})).toEqual([]);
+  });
+});
+
+describe("hasNavClass", () => {
+  it("returns true for an item with a class other than _grantable", () => {
+    expect(hasNavClass({ classes: { foo: "foo" } })).toBe(true);
+  });
+
+  it("returns false for an item with only _grantable class", () => {
+    expect(hasNavClass({ classes: { _grantable: "foo" } })).toBe(false);
+  });
+
+  it("returns false for an item with no classes", () => {
+    expect(hasNavClass({ classes: {} })).toBe(false);
+    expect(hasNavClass({ classes: null })).toBe(false);
+    expect(hasNavClass({})).toBe(false);
+  });
+});