@truedat/dd 4.46.10 → 4.47.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # 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
+
+### Removed
+
+- [TD-4894] Multiple column operator in implementation creation
+
 ## [4.46.6] 2022-06-20
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.46.10",
+  "version": "4.47.0",
   "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.10",
+    "@truedat/test": "4.46.12",
     "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.10",
-    "@truedat/core": "4.46.10",
-    "@truedat/df": "4.46.10",
+    "@truedat/auth": "4.46.13",
+    "@truedat/core": "4.46.13",
+    "@truedat/df": "4.46.13",
     "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": "2bfaf01b4ff0cbd9166456e0cfff7028015d220f"
+  "gitHead": "ef34abe3f66b5ef61faeafb3a2c46732783ebe5c"
 }

package/src/components/StructureFieldsDropdown.js

@@ -11,37 +11,23 @@ export const StructureFieldsDropdown = ({
   fluid,
   inline,
   onSelectField,
-  onSelectFields,
   structureFields,
   filters,
   value,
   typeCastModifiers,
-  multiple,
 }) => {
   const { formatMessage } = useIntl();
   const onClick = ({ value, modifier }) => {
-    onSelectField(dropdownItemToField(value), modifier);
-  };
-
-  const onChangeStructureFieldsDropdown = (valueOrValues) => {
-    return _.flow(
-      _.map((value) => {
-        return dropdownItemToField(value);
-      }),
-      multiple ? onSelectFields : onSelectField
-    )(Array.isArray(valueOrValues) ? valueOrValues : [valueOrValues]);
-  };
-
-  const dropdownItemToField = (value) => {
     const [data_structure_id, parent_index] = _.isString(value)
       ? value.split("/").map(Number)
       : [value, undefined];
-    return _.isNil(parent_index)
+    const field = _.isNil(parent_index)
       ? _.find({ data_structure_id: data_structure_id })(structureFields)
       : _.find({
           data_structure_id: data_structure_id,
           parent_index: parent_index,
         })(structureFields);
+    onSelectField(field, modifier);
   };
 
   const formatOption = (field) => {
@@ -76,15 +62,14 @@ export const StructureFieldsDropdown = ({
       }),
     };
   };
-  const toFieldOption = (field) => {
-    return _.has("options")(field)
+  const toFieldOption = (field) =>
+    _.has("options")(field)
       ? {
           icon: "table",
           label: field.label,
           options: _.map(formatOption)(field.options),
         }
       : formatOption(field);
-  };
 
   const getOptions = _.flow(
     _.sortBy(_.flow(_.prop("name"), _.toLower)),
@@ -115,13 +100,11 @@ export const StructureFieldsDropdown = ({
 
   return (
     <OptionGroup
-      multiple={multiple}
       fluid={fluid}
       inline={inline}
       label={label}
       value={value}
       onClick={onClick}
-      onChange={onChangeStructureFieldsDropdown}
       placeholder={formatMessage({
         id: "structureFields.dropdown.placeholder",
       })}
@@ -137,10 +120,8 @@ StructureFieldsDropdown.propTypes = {
   value: PropTypes.number,
   structureFields: PropTypes.array,
   onSelectField: PropTypes.func,
-  onSelectFields: PropTypes.func,
   filters: PropTypes.object,
   typeCastModifiers: PropTypes.array,
-  multiple: PropTypes.bool,
 };
 
 const mapStateToProps = (state, props) => ({

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

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

@@ -36,31 +36,21 @@ exports[`<ValueConditionStructure /> matches the latest snapshot 1`] = `
       role="listbox"
     >
       <div
-        aria-checked="false"
-        aria-selected="true"
-        class="selected item"
-        role="option"
-        style="pointer-events: all;"
+        class="divider"
+      />
+      <div
+        class="header"
       >
-        <div
-          class="divider"
+        <i
+          aria-hidden="true"
+          class="table icon"
         />
-        <div
-          class="header"
-        >
-          <i
-            aria-hidden="true"
-            class="table icon"
-          />
-          bar
-        </div>
+        bar
       </div>
       <div
-        aria-checked="false"
         aria-selected="false"
         class="item group"
         role="option"
-        style="pointer-events: all;"
       >
         <i
           aria-hidden="true"