@truedat/dd 4.53.4 → 4.53.6

package/CHANGELOG.md

@@ -1,10 +1,17 @@
 # Changelog
 
+## [4.53.5] 2022-10-07
+
+### Changed
+
+- [TD-5167] "Remove Grant" action is now only displayed on the grant's data
+  structure, not on it's descendents
+
 ## [4.53.4] 2022-10-07
 
 ### Fixed
 
-- [TD-5098] Missing value modifier parameter translations, put key in Fragment
+- [TD-5098] Missing value modifier parameter translations
 
 ## [4.53.3] 2022-10-07
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.53.4",
+  "version": "4.53.6",
   "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.53.4",
+    "@truedat/test": "4.53.6",
     "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.53.4",
-    "@truedat/core": "4.53.4",
-    "@truedat/df": "4.53.4",
+    "@truedat/auth": "4.53.6",
+    "@truedat/core": "4.53.6",
+    "@truedat/df": "4.53.6",
     "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": "b21b4051e9370c3a28d4f0e43a53e34d3ccd59d5"
+  "gitHead": "ff29c0e4f51c049077545c425533dd45a704e440"
 }

package/src/components/StructureGrants.js

@@ -8,7 +8,7 @@ import { columnDecorator } from "@truedat/core/services";
 import { getGrantsColumns } from "../selectors";
 import GrantRemoval from "./GrantRemoval";
 
-export const RemovalButtonDecorator = (grant) => (
+export const RemovalButton = ({ grant }) => (
   <GrantRemoval grant={grant}>
     {grant.pending_removal ? (
       <Button size="mini" color="olive" icon="undo" />
@@ -18,68 +18,76 @@ export const RemovalButtonDecorator = (grant) => (
   </GrantRemoval>
 );
 
-export const StructureGrants = ({ columns, grants, userPermissions }) => {
-  const { formatMessage } = useIntl();
-  const canUpdateRemoval = _.getOr(
-    false,
-    "update_grant_removal"
-  )(userPermissions);
+RemovalButton.propTypes = {
+  grant: PropTypes.object,
+};
 
-  const columnsWithActions = [
-    ...columns,
-    ...(canUpdateRemoval
-      ? [
-          {
-            fieldSelector: _.identity,
-            fieldDecorator: RemovalButtonDecorator,
-          },
-        ]
-      : []),
-  ];
+const matchesStructure = ({ id }) => _.pathEq("data_structure.id", id);
+
+export const StructureGrants = ({
+  columns,
+  grants,
+  structure,
+  userPermissions,
+}) => {
+  const { formatMessage } = useIntl();
+  const canUpdateRemoval =
+    userPermissions?.update_grant_removal &&
+    _.any(matchesStructure(structure))(grants);
 
-  return (
-    grants && (
-      <Table basic="very">
-        <Table.Header>
-          <Table.Row>
-            {columns.map((column, i) => (
-              <Table.HeaderCell
-                key={i}
+  return grants ? (
+    <Table basic="very">
+      <Table.Header>
+        <Table.Row>
+          {columns.map((column, i) => (
+            <Table.HeaderCell
+              key={i}
+              textAlign={column.textAlign}
+              content={formatMessage({
+                id: `grant.header.${column.name}`,
+                defaultMessage: column.name,
+              })}
+            />
+          ))}
+          {canUpdateRemoval ? <Table.HeaderCell /> : null}
+        </Table.Row>
+      </Table.Header>
+      <Table.Body>
+        {grants.map((grant, i) => (
+          <Table.Row key={i}>
+            {columns.map((column, key) => (
+              <Table.Cell
+                key={key}
                 textAlign={column.textAlign}
-                content={formatMessage({
-                  id: `grant.header.${column.name}`,
-                  defaultMessage: column.name,
-                })}
+                content={columnDecorator(column)(grant)}
               />
             ))}
+            {canUpdateRemoval ? (
+              <Table.Cell
+                content={
+                  matchesStructure(structure)(grant) ? (
+                    <RemovalButton grant={grant} />
+                  ) : null
+                }
+              />
+            ) : null}
           </Table.Row>
-        </Table.Header>
-        <Table.Body>
-          {grants.map((grant, i) => (
-            <Table.Row key={i}>
-              {columnsWithActions.map((column, key) => (
-                <Table.Cell
-                  key={key}
-                  textAlign={column.textAlign}
-                  content={columnDecorator(column)(grant)}
-                />
-              ))}
-            </Table.Row>
-          ))}
-        </Table.Body>
-      </Table>
-    )
-  );
+        ))}
+      </Table.Body>
+    </Table>
+  ) : null;
 };
 
 StructureGrants.propTypes = {
   grants: PropTypes.array,
   columns: PropTypes.array,
+  structure: PropTypes.object,
   userPermissions: PropTypes.object,
 };
 
 const mapStateToProps = (state) => ({
-  grants: state.structure.grants,
+  grants: state.structure?.grants,
+  structure: state.structure,
   columns: getGrantsColumns(state),
   userPermissions: state.userPermissions,
 });

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

@@ -1,53 +1,14 @@
-import _ from "lodash/fp";
 import React from "react";
 import { shallow } from "enzyme";
 import { intl } from "@truedat/test/intl-stub";
 import { GrantsTable } from "../GrantsTable";
-import {
-  userDecorator,
-  GrantTableStructureDecorator,
-  StartDateDecorator,
-  EndDateDecorator,
-  GenericObjectDecorator,
-} from "../../selectors/getGrantsColumns";
+import { defaultGrantsTableColumns } from "../../selectors/getGrantsColumns";
 
 // workaround for enzyme issue with React.useContext
 // see https://github.com/airbnb/enzyme/issues/2176#issuecomment-532361526
 jest.spyOn(React, "useContext").mockImplementation(() => intl);
 
 describe("<GrantsTable />", () => {
-  const defaultGrantsTableColumns = [
-    {
-      name: "user",
-      sort: { name: "user.user_name.raw" },
-      fieldSelector: _.pick(["user"]),
-      fieldDecorator: userDecorator,
-    },
-    {
-      name: "data_structure_version",
-      sort: { name: "data_structure_version.name.raw" },
-      fieldSelector: _.pick(["data_structure", "data_structure_version"]),
-      fieldDecorator: GrantTableStructureDecorator,
-    },
-    {
-      name: "start_date",
-      sort: { name: "start_date" },
-      fieldSelector: _.pick(["start_date"]),
-      fieldDecorator: StartDateDecorator,
-    },
-    {
-      name: "end_date",
-      sort: { name: "end_date" },
-      fieldSelector: _.pick(["end_date"]),
-      fieldDecorator: EndDateDecorator,
-    },
-    {
-      name: "metadata",
-      fieldSelector: _.pick(["data_structure_version.metadata"]),
-      fieldDecorator: GenericObjectDecorator,
-    },
-  ];
-
   const grants = [
     {
       data_structure_version: {

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

@@ -32,11 +32,14 @@ describe("<StructureGrants />", () => {
       fieldSelector: _.pick(["foo"]),
     },
   ];
+
+  const structure = { id: 99, external_id: "foo_strucutre" };
+
   const grants = [
     {
       id: 1,
       user: { id: 1, full_name: "foo user" },
-      data_structure: { name: "foo structure" },
+      data_structure: structure,
       end_date: "2021/08/02",
     },
     {
@@ -46,20 +49,13 @@ describe("<StructureGrants />", () => {
       end_date: "2021/09/02",
     },
   ];
-  const props = { grants, columns };
 
-  const messages = {
-    en: {
-      "grant.header.user": "User",
-      "grant.header.data_structure": "Structure",
-      "grant.header.end_date": "Date",
-    },
-  };
+  const userPermissions = { update_grant_removal: {} };
+
+  const props = { grants, columns, structure, userPermissions };
 
   it("matches the latest snapshot", () => {
-    const { container } = render(<StructureGrants {...props} />, {
-      messages,
-    });
+    const { container } = render(<StructureGrants {...props} />);
     expect(container).toMatchSnapshot();
   });
 });

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

@@ -25,7 +25,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
         <TableHeaderCell
           as="th"
           className=""
-          content="grant.header.data_structure_version"
+          content="grant.header.data_structure"
           key="1"
           onClick={[Function]}
           sorted="ascending"

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

@@ -14,7 +14,7 @@ exports[`<StructureGrants /> matches the latest snapshot 1`] = `
         <th
           class=""
         >
-          User
+          Account
         </th>
         <th
           class=""
@@ -24,13 +24,16 @@ exports[`<StructureGrants /> matches the latest snapshot 1`] = `
         <th
           class=""
         >
-          Date
+          Expires
         </th>
         <th
           class=""
         >
           foo
         </th>
+        <th
+          class=""
+        />
       </tr>
     </thead>
     <tbody
@@ -49,9 +52,7 @@ exports[`<StructureGrants /> matches the latest snapshot 1`] = `
         <td
           class=""
         >
-          <p>
-            foo structure
-          </p>
+          <p />
         </td>
         <td
           class=""
@@ -65,6 +66,18 @@ exports[`<StructureGrants /> matches the latest snapshot 1`] = `
         >
           foo
         </td>
+        <td
+          class=""
+        >
+          <button
+            class="ui red mini icon button"
+          >
+            <i
+              aria-hidden="true"
+              class="delete icon"
+            />
+          </button>
+        </td>
       </tr>
       <tr
         class=""
@@ -95,6 +108,9 @@ exports[`<StructureGrants /> matches the latest snapshot 1`] = `
         >
           foo
         </td>
+        <td
+          class=""
+        />
       </tr>
     </tbody>
   </table>

package/src/messages/en.js

@@ -51,7 +51,7 @@ export default {
   "grant.cell.end_date.pending_removal": "Grant pending removal",
   "grant.cell.end_date.same_user": "It's you",
   "grant.header.user": "Account",
-  "grant.header.data_structure_version": "Structure",
+  "grant.header.data_structure": "Structure",
   "grant.header.end_date": "Expires",
   "grant.header.start_date": "Access granted",
   "grant.updated_at": "Last changed",

package/src/messages/es.js

@@ -54,7 +54,7 @@ export default {
   "grant.cell.end_date.null": "Sin fecha de expiración",
   "grant.cell.end_date.pending_removal": "Solicitada expiración del acceso",
   "grant.cell.end_date.same_user": "Eres tú",
-  "grant.header.data_structure_version": "Estructura",
+  "grant.header.data_structure": "Estructura",
   "grant.header.end_date": "Expira",
   "grant.header.start_date": "Acceso desde",
   "grant.header.user": "Cuenta",

package/src/selectors/getGrantsColumns.js

@@ -201,7 +201,7 @@ export const defaultGrantsTableColumns = [
     fieldDecorator: userDecorator,
   },
   {
-    name: "data_structure_version",
+    name: "data_structure",
     sort: { name: "data_structure_version.name.raw" },
     fieldSelector: _.pick(["data_structure", "data_structure_version"]),
     fieldDecorator: GrantTableStructureDecorator,