@truedat/dd 5.19.0 → 5.20.1

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

@@ -47,18 +47,22 @@ describe("<StructureGrants />", () => {
       user: { id: 1, full_name: "foo user" },
       data_structure: structure,
       end_date: "2021/08/02",
+      pending_removal: false,
     },
     {
       id: 2,
       user: { id: 2, full_name: "bar user" },
       data_structure: { name: "bar structure" },
       end_date: "2021/09/02",
+      pending_removal: false,
     },
   ];
 
   const userPermissions = { update_grant_removal: {} };
 
-  const props = { grants, columns, structure, userPermissions };
+  const grantsActions = { manage_grant_removal: {} };
+
+  const props = { grants, columns, structure, userPermissions, grantsActions };
 
   it("matches the latest snapshot", () => {
     const { container } = render(<StructureGrants {...props} />);

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

@@ -223,7 +223,7 @@ exports[`<Grant /> matches the latest snapshot 1`] = `
 </div>
 `;
 
-exports[`<Grant /> matches the latest snapshot with cancel_removal action 1`] = `
+exports[`<Grant /> matches the latest snapshot with manage_grant_removal action 1`] = `
 <div>
   <div
     class="ui breadcrumb"
@@ -552,15 +552,16 @@ exports[`<Grant /> matches the latest snapshot with update action 1`] = `
                     Grants  -&gt; foo
                   </div>
                 </h2>
+              </div>
+              <div
+                class="right aligned four wide column"
+              >
                 <button
                   class="ui button button icon group-actions"
                 >
                   Request grant change
                 </button>
               </div>
-              <div
-                class="right aligned four wide column"
-              />
             </div>
           </div>
           <div

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

@@ -47,7 +47,7 @@ exports[`<GrantRequest /> matches the latest snapshot 1`] = `
               <div
                 class="content"
               >
-                header
+                Structure access
               </div>
             </h2>
           </div>
@@ -198,7 +198,7 @@ exports[`<GrantRequest /> matches the latest snapshot with approve actions 1`] =
               <div
                 class="content"
               >
-                header
+                Structure access
               </div>
             </h2>
           </div>
@@ -465,7 +465,7 @@ exports[`<GrantRequest /> matches the latest snapshot with failed status 1`] = `
               <div
                 class="content"
               >
-                header
+                Structure access
               </div>
             </h2>
           </div>

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

@@ -18,7 +18,7 @@ exports[`<GrantRequestHeader /> matches the latest snapshot (pending) 1`] = `
         <div
           class="content"
         >
-          header
+          Structure access request
         </div>
       </h2>
     </div>
@@ -28,12 +28,12 @@ exports[`<GrantRequestHeader /> matches the latest snapshot (pending) 1`] = `
       <button
         class="ui primary button button icon group-actions"
       >
-        approve
+        Approve
       </button>
       <button
         class="ui secondary button button icon group-actions"
       >
-        reject
+        Reject
       </button>
     </div>
   </div>
@@ -58,7 +58,7 @@ exports[`<GrantRequestHeader /> matches the latest snapshot 1`] = `
         <div
           class="content"
         >
-          header
+          Structure access request
         </div>
       </h2>
     </div>

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

@@ -165,7 +165,7 @@ exports[`<GrantRequestsSearchResults /> matches the latest snapshot 1`] = `
           results
         </div>
         <table
-          class="ui sortable table"
+          class="ui selectable sortable table"
         >
           <thead
             class=""

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

@@ -33,58 +33,6 @@ exports[`<StructureGrantDropdown /> matches the latest snapshot for activeGrant
           Request grant change
         </span>
       </div>
-      <div
-        class="item"
-        role="option"
-      >
-        <i
-          aria-hidden="true"
-          class="delete icon"
-        />
-        <span
-          class="text"
-        >
-          Request grant removal
-        </span>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<StructureGrantDropdown /> matches the latest snapshot for pendingRemovalGrant state 1`] = `
-<div>
-  <div
-    aria-expanded="false"
-    class="ui floating dropdown"
-    role="listbox"
-    tabindex="0"
-  >
-    <button
-      class="ui red icon button button basic icon group-actions"
-    >
-      <i
-        aria-hidden="true"
-        class="shield icon"
-      />
-    </button>
-    <div
-      class="menu transition left"
-    >
-      <div
-        class="item"
-        role="option"
-      >
-        <i
-          aria-hidden="true"
-          class="delete icon"
-        />
-        <span
-          class="text"
-        >
-          Cancel grant removal
-        </span>
-      </div>
     </div>
   </div>
 </div>

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

@@ -73,20 +73,6 @@ exports[`<StructureGrantListButton /> matches the latest snapshot with grant 1`]
           Request grant change
         </span>
       </div>
-      <div
-        class="item"
-        role="option"
-      >
-        <i
-          aria-hidden="true"
-          class="delete icon"
-        />
-        <span
-          class="text"
-        >
-          Request grant removal
-        </span>
-      </div>
     </div>
   </div>
 </div>

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

@@ -85,20 +85,6 @@ exports[`<StructureGrantSummaryButton /> matches snapshot for active grant and i
           Request grant change
         </span>
       </div>
-      <div
-        class="item"
-        role="option"
-      >
-        <i
-          aria-hidden="true"
-          class="delete icon"
-        />
-        <span
-          class="text"
-        >
-          Request grant removal
-        </span>
-      </div>
     </div>
   </div>
 </div>

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

@@ -46,6 +46,7 @@ exports[`<StructureGrants /> matches the latest snapshot 1`] = `
     >
       <tr
         class=""
+        style="cursor: pointer;"
       >
         <td
           class=""
@@ -82,17 +83,15 @@ exports[`<StructureGrants /> matches the latest snapshot 1`] = `
           class=""
         >
           <button
-            class="ui red mini icon button"
+            class="ui red button button icon group-actions"
           >
-            <i
-              aria-hidden="true"
-              class="delete icon"
-            />
+            Remove
           </button>
         </td>
       </tr>
       <tr
         class=""
+        style="cursor: pointer;"
       >
         <td
           class=""

package/src/hooks/useGrantRequest.js

@@ -1,9 +1,18 @@
 import useSWRMutations from "swr/mutation";
 import { apiJsonPost } from "@truedat/core/services/api";
-import { API_GRANT_REQUEST_BULK_APPROVAL } from "../api";
+import {
+  API_GRANT_REQUEST_BULK_APPROVAL,
+  API_GRANT_REQUEST_GROUP,
+} from "../api";
 
 export const useGrantRequestBulkApproval = () => {
   return useSWRMutations(API_GRANT_REQUEST_BULK_APPROVAL, (url, { arg }) =>
     apiJsonPost(url, arg)
   );
 };
+
+export const useGrantRequestGroup = () => {
+  return useSWRMutations(API_GRANT_REQUEST_GROUP, (url, { arg }) =>
+    apiJsonPost(url, arg)
+  );
+};

package/src/messages/en.js

@@ -41,15 +41,15 @@ export default {
   "filters.with_profiling.raw": "Profile",
   "filters.with_profiling.raw.false": "Without profile",
   "filters.with_profiling.raw.true": "With profile",
-  "grant.actions.cancel_removal.confirmation.content":
+  "grant.actions.markPendingRemoval.button": "Remove",
+  "grant.actions.markPendingRemoval.confirmation.content":
+  "Requesting this grant to be revoked. Are you sure?",
+  "grant.actions.markPendingRemoval.confirmation.header": "Request grant removal",
+  "grant.actions.unmarkPendingRemoval.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",
-  "grant.actions.view_request.confirmation.header": "View detail",
+  "grant.actions.unmarkPendingRemoval.button": "Reactivate",
+  "grant.actions.unmarkPendingRemoval.confirmation.header": "Cancel grant removal",
+  "grant.actions.viewRequest.confirmation.header": "View detail",
   "grant.cell.direct_access": "Direct access",
   "grant.cell.end_date.null": "No expiration set",
   "grant.cell.end_date.pending_removal": "Grant pending removal",
@@ -129,6 +129,7 @@ export default {
   "grantRequest.header.user": "User",
   "grantRequest.header.createdBy": "Created by",
   "grantRequest.header.create": "Create grant request",
+  "grantRequest.header.type": "Request type",
   "grantRequest.header.update": "Request grant change",
   "grantRequest.summary.emptyApprovals": "No approves",
   "grantRequest.summary.pendingRoles": "Pending roles",
@@ -270,6 +271,20 @@ export default {
   "referenceDatasets.header": "Reference Data",
   "referenceDatasets.search.placeholder": "Search datasets...",
   "referenceDatasets.subheader": "Manage reference datasets",
+  "request.grantAccess": "Structure access request",
+  "request.grantRemoval": "Grant removal request",
+  "request.grantRemoval.action.start.description": "Request grant removal",
+  "request.grantRemoval.state.approvedAndGrantPendingRemoval.description":
+    "Pending grant removal",
+  "request.grantRemoval.state.pending.description": "Grant removal requested",
+  "request.grantRemoval.state.rejected.description":
+    "Grant removal request has been rejected",
+  "request.grantRemoval.state.processing.description":
+    "Grant removal being attended by operators",
+  "request.grantRemoval.state.workflowBypassedActive.description":
+    "Directly set to active, grant request bypassed",
+  "request.grantRemoval.state.workflowBypassedPendingRemoval.description":
+    "Directly removed, grant request bypassed.",
   "saveUserSearchFilters.error.name.duplicated": "Duplicated name",
   "structure._actions": " ",
   "structure.actions.delete.confirmation.content":

package/src/messages/es.js

@@ -43,17 +43,17 @@ export default {
   "filters.with_profiling.raw": "Perfilado",
   "filters.with_profiling.raw.false": "Sin perfilado",
   "filters.with_profiling.raw.true": "Contiene perfilado",
-  "grant.actions.cancel_removal.confirmation.content":
-    "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":
+  "grant.actions.markPendingRemoval.button": "Eliminar",
+  "grant.actions.markPendingRemoval.confirmation.content":
     "El acceso será eliminado. ¿Estás seguro?",
-  "grant.actions.request_removal.confirmation.header":
+  "grant.actions.markPendingRemoval.confirmation.header":
     "Solicitar eliminación de acceso",
-  "grant.actions.view_request.confirmation.header": "Ver detalle",
+  "grant.actions.unmarkPendingRemoval.button": "Reactivar",
+  "grant.actions.unmarkPendingRemoval.confirmation.content":
+    "Cancelar solicitud de eliminar acceso. ¿Estás seguro?",
+  "grant.actions.unmarkPendingRemoval.confirmation.header":
+    "Cancelar retirada de acceso",
+  "grant.actions.viewRequest.confirmation.header": "Ver detalle",
   "grant.cell.direct_access": "Acceso Directo",
   "grant.cell.end_date.null": "Sin fecha de expiración",
   "grant.cell.end_date.pending_removal": "Solicitada expiración del acceso",
@@ -134,6 +134,7 @@ export default {
   "grantRequest.header.user": "Usuario",
   "grantRequest.header.createdBy": "Creado por",
   "grantRequest.header.create": "Crear petición de acceso",
+  "grantRequest.header.type": "Tipo de petición",
   "grantRequest.header.update": "Petición de modificación de acceso",
   "grantRequest.summary.emptyApprovals": "Sin aprobaciones",
   "grantRequest.summary.pendingRoles": "Roles pendientes",
@@ -278,6 +279,22 @@ export default {
   "referenceDatasets.header": "Datos de referencia",
   "referenceDatasets.search.placeholder": "Buscar datasets...",
   "referenceDatasets.subheader": "Gestionar conjuntos de datos de referencia",
+  "request.grantAccess": "Petición de acceso a estructura",
+  "request.grantRemoval": "Petición de borrado de acceso a estructura",
+  "request.grantRemoval.action.start.description":
+    "Solicitar borrado de acceso",
+  "request.grantRemoval.state.approvedAndGrantPendingRemoval.description":
+    "Acceso pendiente de eliminación",
+  "request.grantRemoval.state.pending.description":
+    "Borrado de acceso solicitado",
+  "request.grantRemoval.state.rejected.description":
+    "Petición de borrado de acceso rechazada",
+  "request.grantRemoval.state.processing.description":
+    "Borrado de acceso siendo atendido por operadores",
+  "request.grantRemoval.state.workflowBypassedActive.description":
+    "Activado directamente, petición ignorada",
+  "request.grantRemoval.state.workflowBypassedPendingRemoval.description":
+    "Borrado directamente, petición ignorada",
   "saveUserSearchFilters.error.name.duplicated": "Nombre duplicado",
   "structure._actions": " ",
   "structure.actions.delete.confirmation.content":

package/src/reducers/structure.js

@@ -39,6 +39,7 @@ const structureVersionFields = _.pick([
   "source",
   "system",
   "type",
+  "_actions",
 ]);
 
 const structure = (state = initialState, { type, payload }) => {

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

@@ -35,7 +35,7 @@ describe("sagas: createGrantRequestStatusSaga", () => {
   const status = "cancelled";
   const structureId = 3;
   const payload = {
-    grantRequestId: 8,
+    grantRequest: { id: 8, request_type: "ACCESS" },
     status,
     structureId,
   };

package/src/sagas/createGrantRequestStatus.js

@@ -10,17 +10,33 @@ import { API_GRANT_REQUEST_STATUS } from "../api";
 
 export function* createGrantRequestStatusSaga({ payload }) {
   try {
-    const { grantRequestId, status, structureId, previousStructureQuery } =
-      payload;
-    const url = compile(API_GRANT_REQUEST_STATUS)({ id: grantRequestId });
+    const {
+      grantRequest,
+      setLatestGrantRequest,
+      status,
+      structureId,
+      previousStructureQuery,
+    } = payload;
+    const url = compile(API_GRANT_REQUEST_STATUS)({ id: grantRequest.id });
     yield put(createGrantRequestStatus.request({ status }));
     const { data } = yield call(apiJsonPost, url, { status }, JSON_OPTS);
+
     yield put(createGrantRequestStatus.success(data));
-    yield put(
-      previousStructureQuery
-        ? fetchStructures.trigger(previousStructureQuery)
-        : fetchStructure.trigger({ id: structureId })
-    );
+
+    if (previousStructureQuery || structureId) {
+      yield put(
+        previousStructureQuery
+          ? fetchStructures.trigger(previousStructureQuery)
+          : structureId && fetchStructure.trigger({ id: structureId })
+      );
+    } else if (grantRequest.requestType === "GRANT_REMOVAL") {
+      setLatestGrantRequest({
+        ...{
+          ...grantRequest,
+          status: { ...grantRequest.status, status: data.data.status },
+        },
+      });
+    }
   } catch (error) {
     if (error.response) {
       const { status, data } = error.response;

package/src/selectors/getGrantRequestsColumns.js

@@ -2,6 +2,8 @@ import _ from "lodash/fp";
 import React from "react";
 import { Header, Icon, Popup } from "semantic-ui-react";
 import { createSelector } from "reselect";
+import { linkTo } from "@truedat/core/routes";
+import { Link } from "react-router-dom";
 import { useIntl } from "react-intl";
 import PropTypes from "prop-types";
 import Moment from "react-moment";
@@ -19,12 +21,13 @@ UserDecorator.propTypes = {
   user: PropTypes.object,
 };
 
-export const PathDecorator = ({ data_structure }) => {
+export const PathDecorator = ({ data_structure, data_structure_version }) => {
   const path = _.flow(
-    _.prop("path"),
+    ({ data_structure, data_structure_version }) =>
+      data_structure?.path || data_structure_version?.path,
     _.map("name"),
     _.join(" › ")
-  )(data_structure);
+  )({ data_structure, data_structure_version });
   return <>{path}</>;
 };
 
@@ -32,7 +35,13 @@ PathDecorator.propTypes = {
   data_structure: PropTypes.object,
 };
 
-export const StructureDecorator = ({ data_structure, modificationGrant }) => {
+export const StructureDecorator = ({
+  request_type,
+  data_structure,
+  data_structure_version,
+  modificationGrant,
+  grant,
+}) => {
   const { formatMessage } = useIntl();
   return (
     <>
@@ -41,15 +50,27 @@ export const StructureDecorator = ({ data_structure, modificationGrant }) => {
           content={formatMessage({ id: "grantRequest.isModification" })}
           trigger={<Icon name="edit" />}
         />
+      ) : request_type === "grant_removal" ? (
+        <Popup
+          content={formatMessage({ id: "request.grantRemoval" })}
+          trigger={
+            <Link to={linkTo.GRANT({ id: grant.id })}>
+              <Icon name="key" />
+            </Link>
+          }
+        />
       ) : null}
-      {data_structure.name}
+      {data_structure?.name || data_structure_version?.name}
     </>
   );
 };
 
 StructureDecorator.propTypes = {
+  request_type: PropTypes.string,
   data_structure: PropTypes.object,
+  data_structure_version: PropTypes.object,
   modificationGrant: PropTypes.object,
+  grant: PropTypes.object,
 };
 
 const DateDecorator = ({ date }) => {
@@ -85,10 +106,14 @@ export const defaultGrantRequestsTableColumns = [
   {
     name: "data_structure",
     fieldSelector: (grantRequest) => ({
+      request_type: grantRequest?.request_type,
       data_structure: grantRequest?._embedded?.data_structure,
+      data_structure_version:
+        grantRequest?._embedded?.grant?.data_structure_version,
       modificationGrant: _.prop("_embedded.group._embedded.modification_grant")(
         grantRequest
       ),
+      grant: grantRequest?._embedded?.grant,
     }),
     fieldDecorator: StructureDecorator,
   },
@@ -96,6 +121,8 @@ export const defaultGrantRequestsTableColumns = [
     name: "path",
     fieldSelector: (grantRequest) => ({
       data_structure: grantRequest?._embedded?.data_structure,
+      data_structure_version:
+        grantRequest?._embedded?.grant?.data_structure_version,
     }),
     fieldDecorator: PathDecorator,
   },

package/src/selectors/getGrantRequestsSearchColumns.js

@@ -2,6 +2,8 @@ import _ from "lodash/fp";
 import React from "react";
 import { Header, Icon, Popup } from "semantic-ui-react";
 import { createSelector } from "reselect";
+import { linkTo } from "@truedat/core/routes";
+import { Link } from "react-router-dom";
 import { useIntl } from "react-intl";
 import PropTypes from "prop-types";
 import Moment from "react-moment";
@@ -26,29 +28,34 @@ export const PathDecorator = ({ data_structure_version }) => {
 };
 
 PathDecorator.propTypes = {
-  data_structure: PropTypes.object,
+  data_structure_version: PropTypes.object,
 };
 
-export const StructureDecorator = ({ name, modificationGrant }) => {
+export const StructureDecorator = (grantRequest) => {
   const { formatMessage } = useIntl();
   return (
     <>
-      {modificationGrant ? (
+      {grantRequest.modification_grant_id ? (
         <Popup
           content={formatMessage({ id: "grantRequest.modification_grant_id" })}
           trigger={<Icon name="edit" />}
         />
+      ) : grantRequest.request_type === "grant_removal" ? (
+        <Popup
+          content={formatMessage({ id: "request.grantRemoval" })}
+          trigger={
+            <Link to={linkTo.GRANT({ id: grantRequest.grant.id })}>
+              <Icon name="key" />
+            </Link>
+          }
+        />
       ) : null}
-      {name}
+      {grantRequest?.data_structure_version?.name ||
+        grantRequest?.grant?.data_structure_version?.name}
     </>
   );
 };
 
-StructureDecorator.propTypes = {
-  name: PropTypes.string,
-  modificationGrant: PropTypes.string,
-};
-
 const DateDecorator = ({ date }) => {
   const { locale } = useIntl();
   return date ? (
@@ -83,16 +90,15 @@ export const defaultGrantRequestsSearchTableColumns = [
   {
     name: "data_structure",
     sort: { name: "data_structure_version.name.raw" },
-    fieldSelector: (grantRequest) => ({
-      name: grantRequest?.data_structure_version?.name,
-      modificationGrant: _.prop("modification_grant_id")(grantRequest),
-    }),
+    fieldSelector: (grantRequest) => grantRequest,
     fieldDecorator: StructureDecorator,
   },
   {
     name: "path",
     fieldSelector: (grantRequest) => ({
-      data_structure_version: grantRequest?.data_structure_version,
+      data_structure_version:
+        grantRequest?.data_structure_version ||
+        grantRequest?.grant?.data_structure_version,
     }),
     fieldDecorator: PathDecorator,
   },