@truedat/dd 5.18.3 → 5.20.0

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/components/__tests__/__snapshots__/StructureNoteSuggestions.spec.js.snap

@@ -0,0 +1,316 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<StructureNoteSuggestions /> component lifecycle 1`] = `
+<div>
+  <div
+    class="ui segment"
+  >
+    <div
+      class="ui container"
+      style="display: flex; justify-content: space-between;"
+    >
+      <h4>
+        <i
+          aria-hidden="true"
+          class="lightbulb outline icon"
+        />
+        header
+      </h4>
+      <div
+        class="ui hidden divider"
+      />
+    </div>
+    <div
+      class="ui container"
+    >
+      <h5 />
+      <div
+        class="ui list"
+        role="list"
+      >
+        <div
+          class="item"
+          role="listitem"
+          style="display: flex; align-items: center; gap: 12px;"
+        >
+          <div
+            class="ui checked fitted checkbox"
+          >
+            <input
+              checked=""
+              class="hidden"
+              id="editable_field"
+              readonly=""
+              tabindex="0"
+              type="checkbox"
+              value=""
+            />
+            <label
+              for="editable_field"
+            />
+          </div>
+          <label
+            disabled=""
+            for="editable_field"
+            style="cursor: pointer;"
+          >
+            <div
+              class="header"
+            >
+              EditableField
+            </div>
+            <div
+              class="description"
+            >
+              editable_field_value
+            </div>
+          </label>
+        </div>
+      </div>
+      <div
+        class="ui hidden divider"
+      />
+    </div>
+    <div
+      class="ui container"
+    >
+      <h5>
+        Group2
+      </h5>
+      <div
+        class="ui list"
+        role="list"
+      >
+        <div
+          class="item"
+          role="listitem"
+          style="display: flex; align-items: center; gap: 12px;"
+        >
+          <div
+            class="ui disabled fitted checkbox"
+          >
+            <input
+              class="hidden"
+              disabled=""
+              id="non_editable_field"
+              readonly=""
+              tabindex="-1"
+              type="checkbox"
+              value=""
+            />
+            <label
+              for="non_editable_field"
+            />
+          </div>
+          <label
+            disabled=""
+            for="non_editable_field"
+            style="cursor: pointer;"
+          >
+            <div
+              class="header"
+            >
+              NonEditableField
+            </div>
+            <div
+              class="description"
+            >
+              non_editable_field_value
+            </div>
+          </label>
+        </div>
+        <div
+          class="item"
+          role="listitem"
+          style="display: flex; align-items: center; gap: 12px;"
+        >
+          <div
+            class="ui checked fitted checkbox"
+          >
+            <input
+              checked=""
+              class="hidden"
+              id="unselect_field"
+              readonly=""
+              tabindex="0"
+              type="checkbox"
+              value=""
+            />
+            <label
+              for="unselect_field"
+            />
+          </div>
+          <label
+            disabled=""
+            for="unselect_field"
+            style="cursor: pointer;"
+          >
+            <div
+              class="header"
+            >
+              UnselectedField
+            </div>
+            <div
+              class="description"
+            >
+              unselect_field_value
+            </div>
+          </label>
+        </div>
+      </div>
+      <div
+        class="ui hidden divider"
+      />
+    </div>
+    <div
+      class="ui right aligned container"
+    >
+      <button
+        class="ui primary button"
+      >
+        actions.apply_ai_suggestion
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`<StructureNoteSuggestions /> component lifecycle 2`] = `
+<div>
+  <div
+    class="ui segment"
+  >
+    <div
+      class="ui container"
+      style="display: flex; justify-content: space-between;"
+    >
+      <h4>
+        <i
+          aria-hidden="true"
+          class="lightbulb icon"
+        />
+        header
+      </h4>
+      <div
+        class="ui hidden divider"
+      />
+      <button
+        class="ui button"
+      >
+        actions.ai_suggestion
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`<StructureNoteSuggestions /> matches the latest snapshot 1`] = `
+<div>
+  <div
+    class="ui segment"
+  >
+    <div
+      class="ui container"
+      style="display: flex; justify-content: space-between;"
+    >
+      <h4>
+        <i
+          aria-hidden="true"
+          class="lightbulb icon"
+        />
+        header
+      </h4>
+      <div
+        class="ui hidden divider"
+      />
+      <button
+        class="ui button"
+      >
+        actions.ai_suggestion
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`<StructureNoteSuggestions /> renders error with message 1`] = `
+<div>
+  <div
+    class="ui segment"
+  >
+    <div
+      class="ui container"
+      style="display: flex; justify-content: space-between;"
+    >
+      <h4>
+        <i
+          aria-hidden="true"
+          class="lightbulb icon"
+        />
+        header
+      </h4>
+      <div
+        class="ui hidden divider"
+      />
+      <button
+        class="ui button"
+      >
+        actions.ai_suggestion
+      </button>
+    </div>
+    <div
+      class="ui negative message"
+    >
+      <div
+        class="header"
+      >
+        error
+      </div>
+      <p>
+        ERROR MESSAGE
+      </p>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`<StructureNoteSuggestions /> renders error with message 2`] = `
+<div>
+  <div
+    class="ui segment"
+  >
+    <div
+      class="ui container"
+      style="display: flex; justify-content: space-between;"
+    >
+      <h4>
+        <i
+          aria-hidden="true"
+          class="lightbulb icon"
+        />
+        header
+      </h4>
+      <div
+        class="ui hidden divider"
+      />
+      <button
+        class="ui button"
+      >
+        actions.ai_suggestion
+      </button>
+    </div>
+    <div
+      class="ui negative message"
+    >
+      <div
+        class="header"
+      >
+        error
+      </div>
+      <p>
+        ERROR TEXT
+      </p>
+    </div>
+  </div>
+</div>
+`;

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

@@ -25,3 +25,52 @@ exports[`<StructureNotesEdit /> matches the latest snapshot 1`] = `
   </div>
 </div>
 `;
+
+exports[`<StructureNotesEdit /> matches the latest snapshot with ai suggestion action 1`] = `
+<div>
+  <div
+    class="ui bottom attached segment"
+  >
+    <div
+      class="ui segment"
+    >
+      <div
+        class="ui container"
+        style="display: flex; justify-content: space-between;"
+      >
+        <h4>
+          <i
+            aria-hidden="true"
+            class="lightbulb icon"
+          />
+          header
+        </h4>
+        <div
+          class="ui hidden divider"
+        />
+        <button
+          class="ui button"
+        >
+          ai_suggestion
+        </button>
+      </div>
+    </div>
+    <form
+      class="ui form"
+    >
+      <button
+        class="ui primary button"
+      >
+        save
+      </button>
+      <a
+        class="ui secondary button"
+        href="/"
+        role="button"
+      >
+        cancel
+      </a>
+    </form>
+  </div>
+</div>
+`;

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,
   },