@truedat/dd 4.58.0 → 4.58.1

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

@@ -0,0 +1,102 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<GrantCrumbs /> matches the latest snapshot 1`] = `
+Object {
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="ui breadcrumb"
+      >
+        <a
+          class="section"
+          href="/grants"
+        >
+          Grants
+        </a>
+        <i
+          aria-hidden="true"
+          class="right angle icon divider"
+        />
+        <div
+          class="active section"
+        >
+          foo
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="ui breadcrumb"
+    >
+      <a
+        class="section"
+        href="/grants"
+      >
+        Grants
+      </a>
+      <i
+        aria-hidden="true"
+        class="right angle icon divider"
+      />
+      <div
+        class="active section"
+      >
+        foo
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;

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

@@ -6,10 +6,18 @@ exports[`<GrantRoutes /> matches the latest snapshot 1`] = `
     path="/grantsRequests/checkout"
     render={[Function]}
   />
-  <Route
-    path="/grants"
-    render={[Function]}
-  />
+  <Switch>
+    <Route
+      exact={true}
+      path="/grants/:id"
+      render={[Function]}
+    />
+    <Route
+      exact={true}
+      path="/grants"
+      render={[Function]}
+    />
+  </Switch>
   <Route
     path="/myGrants"
     render={[Function]}

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

@@ -14,11 +14,19 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
         as="tr"
         cellAs="td"
       >
+        <TableHeaderCell
+          as="th"
+          className="disabled"
+          content="grant.header.id"
+          key="0"
+          onClick={[Function]}
+          sorted={null}
+        />
         <TableHeaderCell
           as="th"
           className=""
           content="grant.header.user"
-          key="0"
+          key="1"
           onClick={[Function]}
           sorted={null}
         />
@@ -26,7 +34,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
           as="th"
           className=""
           content="grant.header.data_structure"
-          key="1"
+          key="2"
           onClick={[Function]}
           sorted="ascending"
         />
@@ -34,7 +42,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
           as="th"
           className=""
           content="grant.header.start_date"
-          key="2"
+          key="3"
           onClick={[Function]}
           sorted={null}
         />
@@ -42,7 +50,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
           as="th"
           className=""
           content="grant.header.end_date"
-          key="3"
+          key="4"
           onClick={[Function]}
           sorted={null}
         />
@@ -50,7 +58,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
           as="th"
           className="disabled"
           content="metadata"
-          key="4"
+          key="5"
           onClick={[Function]}
           sorted={null}
         />
@@ -64,6 +72,15 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
         cellAs="td"
         key="0"
       >
+        <TableCell
+          as="td"
+          content={
+            <idDecorator
+              id={6}
+            />
+          }
+          key="0"
+        />
         <TableCell
           as="td"
           content={
@@ -77,7 +94,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
               }
             />
           }
-          key="0"
+          key="1"
         />
         <TableCell
           as="td"
@@ -102,7 +119,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
               }
             />
           }
-          key="1"
+          key="2"
         />
         <TableCell
           as="td"
@@ -111,7 +128,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
               start_date="2020-05-17"
             />
           }
-          key="2"
+          key="3"
         />
         <TableCell
           as="td"
@@ -120,7 +137,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
               end_date="2023-05-16"
             />
           }
-          key="3"
+          key="4"
         />
         <TableCell
           as="td"
@@ -133,7 +150,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
               }
             />
           }
-          key="4"
+          key="5"
         />
       </TableRow>
       <TableRow
@@ -141,6 +158,15 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
         cellAs="td"
         key="1"
       >
+        <TableCell
+          as="td"
+          content={
+            <idDecorator
+              id={8}
+            />
+          }
+          key="0"
+        />
         <TableCell
           as="td"
           content={
@@ -154,7 +180,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
               }
             />
           }
-          key="0"
+          key="1"
         />
         <TableCell
           as="td"
@@ -185,7 +211,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
               }
             />
           }
-          key="1"
+          key="2"
         />
         <TableCell
           as="td"
@@ -194,7 +220,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
               start_date="2011-05-17"
             />
           }
-          key="2"
+          key="3"
         />
         <TableCell
           as="td"
@@ -203,7 +229,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
               end_date="2023-05-18"
             />
           }
-          key="3"
+          key="4"
         />
         <TableCell
           as="td"
@@ -222,7 +248,7 @@ exports[`<GrantsTable /> matches the latest snapshot 1`] = `
               }
             />
           }
-          key="4"
+          key="5"
         />
       </TableRow>
     </TableBody>

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

@@ -11,6 +11,11 @@ exports[`<StructureGrants /> matches the latest snapshot 1`] = `
       <tr
         class=""
       >
+        <th
+          class=""
+        >
+          Id
+        </th>
         <th
           class=""
         >
@@ -42,6 +47,13 @@ exports[`<StructureGrants /> matches the latest snapshot 1`] = `
       <tr
         class=""
       >
+        <td
+          class=""
+        >
+          <p>
+            1
+          </p>
+        </td>
         <td
           class=""
         >
@@ -82,6 +94,13 @@ exports[`<StructureGrants /> matches the latest snapshot 1`] = `
       <tr
         class=""
       >
+        <td
+          class=""
+        >
+          <p>
+            2
+          </p>
+        </td>
         <td
           class=""
         >

package/src/hooks/useGrant.js

@@ -0,0 +1,18 @@
+import { compile } from "path-to-regexp";
+import useSWR from "swr";
+import useSWRMutations from "swr/mutation";
+import { apiJson, apiJsonPatch } from "@truedat/core/services/api";
+import { API_GRANT } from "../api";
+
+const toApiPath = compile(API_GRANT);
+
+export const useGrant = (id) => {
+  const url = toApiPath({ id });
+  const { data, error, mutate } = useSWR(url, apiJson);
+  return { data: data?.data, error, loading: !error && !data, mutate };
+};
+
+export const useGrantRemoval = (id) => {
+  const url = toApiPath({ id });
+  return useSWRMutations(url, (url, { arg }) => apiJsonPatch(url, arg));
+};

package/src/messages/en.js

@@ -42,6 +42,8 @@ export default {
   "grant.actions.cancel_removal.confirmation.content":
     "Cancelling grant removal. Are you sure?",
   "grant.actions.cancel_removal.confirmation.header": "Cancel grant removal",
+  "grant.actions.request_removal.button": "Remove",
+  "grant.actions.cancel_removal.button": "Reactivate",
   "grant.actions.request_removal.confirmation.content":
     "Requesting this grant to be revoked. Are you sure?",
   "grant.actions.request_removal.confirmation.header": "Request grant removal",
@@ -50,10 +52,15 @@ export default {
   "grant.cell.end_date.null": "No expiration set",
   "grant.cell.end_date.pending_removal": "Grant pending removal",
   "grant.cell.end_date.same_user": "It's you",
-  "grant.header.user": "Account",
+  "grant.header": "Grants",
   "grant.header.data_structure": "Structure",
-  "grant.header.end_date": "Expires",
+  "grant.header.id": "Id",
+  "grant.header.user": "Account",
+  "grant.header.user_name": "User name",
+  "grant.header.created_at": "Grant created",
   "grant.header.start_date": "Access granted",
+  "grant.header.end_date": "Expires",
+  "grant.header.details": "Details",
   "grant.updated_at": "Last changed",
   "grantApprovalRule.action": "Action",
   "grantApprovalRule.action.approve": "Approve",

package/src/messages/es.js

@@ -45,6 +45,8 @@ export default {
     "Cancelar solicitud de eliminar acceso. ¿Estás seguro?",
   "grant.actions.cancel_removal.confirmation.header":
     "Cancelar retirada de acceso",
+  "grant.actions.request_removal.button": "Eliminar",
+  "grant.actions.cancel_removal.button": "Reactivar",
   "grant.actions.request_removal.confirmation.content":
     "El acceso será eliminado. ¿Estás seguro?",
   "grant.actions.request_removal.confirmation.header":
@@ -54,10 +56,15 @@ 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": "Acceso",
   "grant.header.data_structure": "Estructura",
-  "grant.header.end_date": "Expira",
-  "grant.header.start_date": "Acceso desde",
+  "grant.header.id": "Id",
   "grant.header.user": "Cuenta",
+  "grant.header.user_name": "Usuario",
+  "grant.header.created_at": "Acceso creado",
+  "grant.header.start_date": "Acceso desde",
+  "grant.header.end_date": "Expira",
+  "grant.header.details": "Detalles",
   "grant.updated_at": "Actualizada",
   "grantApprovalRules.header": "Reglas de aprobación",
   "grantApprovalRules.subheader":

package/src/sagas/__tests__/fetchStructure.spec.js

@@ -3,7 +3,7 @@ import { testSaga } from "redux-saga-test-plan";
 import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
 import {
   fetchStructureRequestSaga,
-  fetchStructureSaga
+  fetchStructureSaga,
 } from "../fetchStructure";
 import { fetchStructure } from "../../routines";
 import { API_DATA_STRUCTURE_VERSION } from "../../api";

package/src/selectors/__tests__/__snapshots__/getGrantsColumns.spec.js.snap

@@ -18,6 +18,16 @@ exports[`EndDateDecorator matches the latest snapshot 1`] = `
 </div>
 `;
 
+exports[`GrantIdDecorator matches the latest snapshot 1`] = `
+<div>
+  <a
+    href="/grants/1"
+  >
+    1
+  </a>
+</div>
+`;
+
 exports[`GrantStructureDecorator matches the latest snapshot when structure is direct 1`] = `
 <div>
   <div

package/src/selectors/__tests__/getGrantsColumns.spec.js

@@ -6,6 +6,7 @@ import {
   defaultGrantsTableColumns,
   getGrantsColumns,
   getGrantsTableColumns,
+  GrantIdDecorator,
   GrantUserDecorator,
   GrantStructureDecorator,
   GrantTableStructureDecorator,
@@ -80,6 +81,14 @@ describe("selectors: getGrantsTableColumns", () => {
   });
 });
 
+describe("GrantIdDecorator", () => {
+  it("matches the latest snapshot", () => {
+    const props = { id: 1 };
+    const { container } = render(<GrantIdDecorator {...props} />, renderOpts);
+    expect(container).toMatchSnapshot();
+  });
+});
+
 describe("GrantUserDecorator", () => {
   it("matches the latest snapshot", () => {
     const props = {

package/src/selectors/getGrantsColumns.js

@@ -8,6 +8,16 @@ import { useIntl } from "react-intl";
 import Moment from "react-moment";
 import PropTypes from "prop-types";
 
+export const GrantIdDecorator = ({ id }) => (
+  <Link to={linkTo.GRANT({ id })}>{id}</Link>
+);
+
+GrantIdDecorator.propTypes = {
+  id: PropTypes.number,
+};
+
+export const idDecorator = ({ id }) => GrantIdDecorator({ id });
+
 export const GrantUserDecorator = ({ authentication, user }) => {
   const { formatMessage } = useIntl();
   const sameUser = user?.user_name === authentication?.user_name;
@@ -156,6 +166,11 @@ EndDateDecorator.propTypes = {
 };
 
 export const defaultGrantsColumns = [
+  {
+    name: "id",
+    fieldSelector: _.pick(["id"]),
+    fieldDecorator: idDecorator,
+  },
   {
     name: "user",
     fieldSelector: _.pick(["user"]),
@@ -194,6 +209,11 @@ export const getGrantsColumns = createSelector(
 );
 
 export const defaultGrantsTableColumns = [
+  {
+    name: "id",
+    fieldSelector: _.pick(["id"]),
+    fieldDecorator: idDecorator,
+  },
   {
     name: "user",
     sort: { name: "user.user_name.raw" },