@truedat/dd 8.10.8 → 8.11.2

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

@@ -1,3 +1,5 @@
+import { waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
 import { render, waitForLoad } from "@truedat/test/render";
 import { useGrantRequestableUsers } from "@truedat/auth/hooks/useUsers";
 import StructureGrantCartUserSelector from "../StructureGrantCartUserSelector";
@@ -74,4 +76,107 @@ describe("<StructureGrantCartUserSelector />", () => {
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
   });
+
+  it("shows group alias or name in the selector", async () => {
+    const user = userEvent.setup({ delay: null });
+    useGrantRequestableUsers.mockImplementation(() => ({
+      users: [{ id: 1, full_name: "Ada" }],
+      groups: [
+        { id: 10, name: "finance", alias: "Fin" },
+        { id: 11, name: "legal", alias: "" },
+      ],
+      trigger: jest.fn(),
+    }));
+
+    const rendered = render(
+      <StructureGrantCartUserSelector />,
+      defaultRenderOpts,
+    );
+    await waitForLoad(rendered);
+    await user.click(rendered.getByRole("combobox"));
+
+    expect(rendered.getByText(/fin/i)).toBeInTheDocument();
+    expect(rendered.getByText(/legal/i)).toBeInTheDocument();
+  });
+
+  it("uses users icon for group options and user icon for users", async () => {
+    const user = userEvent.setup({ delay: null });
+    useGrantRequestableUsers.mockImplementation(() => ({
+      users: [{ id: 1, full_name: "Ada" }],
+      groups: [
+        { id: 10, name: "finance", alias: "Fin" },
+        { id: 11, name: "legal", alias: "" },
+      ],
+      trigger: jest.fn(),
+    }));
+
+    const rendered = render(
+      <StructureGrantCartUserSelector />,
+      defaultRenderOpts,
+    );
+    await waitForLoad(rendered);
+    await user.click(rendered.getByRole("combobox"));
+
+    const groupOption = rendered.getByRole("option", { name: /fin/i });
+    expect(groupOption.querySelector(".users.icon")).toBeInTheDocument();
+
+    const userOption = rendered.getByRole("option", { name: /ada/i });
+    expect(userOption.querySelector(".user.icon")).toBeInTheDocument();
+  });
+
+  it("still shows requestable user full name", async () => {
+    const user = userEvent.setup({ delay: null });
+    useGrantRequestableUsers.mockImplementation(() => ({
+      users: [{ id: 1, full_name: "Ada" }],
+      groups: [
+        { id: 10, name: "finance", alias: "Fin" },
+        { id: 11, name: "legal", alias: "" },
+      ],
+      trigger: jest.fn(),
+    }));
+
+    const rendered = render(
+      <StructureGrantCartUserSelector />,
+      defaultRenderOpts,
+    );
+    await waitForLoad(rendered);
+    await user.click(rendered.getByRole("combobox"));
+
+    expect(rendered.getByRole("option", { name: /ada/i })).toBeInTheDocument();
+  });
+
+  it("dispatches user_group_id when selecting a group", async () => {
+    const user = userEvent.setup({ delay: null });
+    const dispatch = jest.fn();
+    useGrantRequestableUsers.mockImplementation(() => ({
+      users: [{ id: 1, full_name: "Ada" }],
+      groups: [
+        { id: 10, name: "finance", alias: "Fin" },
+        { id: 11, name: "legal", alias: "" },
+      ],
+      trigger: jest.fn(),
+    }));
+
+    const rendered = render(<StructureGrantCartUserSelector />, {
+      ...defaultRenderOpts,
+      dispatch,
+    });
+    await waitForLoad(rendered);
+    await user.click(rendered.getByRole("combobox"));
+    await user.click(rendered.getByRole("option", { name: /fin/i }));
+
+    await waitFor(() => {
+      const payloads = dispatch.mock.calls.map(
+        ([action]) => action?.payload ?? action,
+      );
+      expect(payloads.some((payload) => payload?.user_group_id === 10)).toBe(
+        true,
+      );
+    });
+
+    const payloads = dispatch.mock.calls.map(
+      ([action]) => action?.payload ?? action,
+    );
+    expect(payloads.some((payload) => payload?.id === "group:10")).toBe(false);
+  });
 });

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

@@ -150,4 +150,130 @@ describe("<StructureGrantDropdown />", () => {
 
     expect(mockHistory).toHaveBeenCalledWith("/grantRequests/8");
   });
+
+  it("shows cancel and view request when current user created the group grant request", async () => {
+    const grantRequest = {
+      id: 8,
+      group: {
+        user_group_id: 10,
+        created_by_id: 7,
+        _embedded: {
+          user_group: { id: 10, name: "finance" },
+          created_by: { user_name: "ada" },
+        },
+      },
+    };
+    const props = {
+      ...propsBuilder({}),
+      grantRequest,
+      grantRequestStatus: "pending",
+    };
+    const rendered = render(<StructureGrantDropdown {...props} />, {
+      state: { authentication: { user_name: "ada" } },
+    });
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/cancel_grant_request/i)).toBeInTheDocument();
+    expect(
+      rendered.getByText(/grant.actions.viewrequest.confirmation.header/i),
+    ).toBeInTheDocument();
+  });
+
+  it("does not show cancel when current user is a group member and not the creator", async () => {
+    const grantRequest = {
+      id: 8,
+      group: {
+        user_group_id: 10,
+        created_by_id: 7,
+        _embedded: {
+          user_group: { id: 10, name: "finance" },
+          created_by: { user_name: "ada" },
+        },
+      },
+    };
+    const props = {
+      ...propsBuilder({}),
+      grantRequest,
+      grantRequestStatus: "pending",
+    };
+    const rendered = render(<StructureGrantDropdown {...props} />, {
+      state: { authentication: { user_name: "bob" } },
+    });
+    await waitForLoad(rendered);
+
+    expect(
+      rendered.queryByText(/cancel_grant_request/i),
+    ).not.toBeInTheDocument();
+    expect(
+      rendered.getByText(/grant.actions.viewrequest.confirmation.header/i),
+    ).toBeInTheDocument();
+  });
+
+  it("shows cancel when grant request is for a user", async () => {
+    const status = "pending";
+    const grantRequest = {
+      status: { status },
+    };
+    const props = {
+      ...propsBuilder({}),
+      grantRequest,
+      grantRequestStatus: status,
+    };
+    const rendered = render(<StructureGrantDropdown {...props} />, {
+      state: { authentication: { user_name: "bob" } },
+    });
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/cancel_grant_request/i)).toBeInTheDocument();
+  });
+
+  it("shows cancel and view request when current user created the group grant request with camelCase group", async () => {
+    const grantRequest = {
+      id: 8,
+      group: {
+        userGroupId: 10,
+        createdBy: { userName: "ada" },
+      },
+    };
+    const props = {
+      ...propsBuilder({}),
+      grantRequest,
+      grantRequestStatus: "pending",
+    };
+    const rendered = render(<StructureGrantDropdown {...props} />, {
+      state: { authentication: { user_name: "ada" } },
+    });
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/cancel_grant_request/i)).toBeInTheDocument();
+    expect(
+      rendered.getByText(/grant.actions.viewrequest.confirmation.header/i),
+    ).toBeInTheDocument();
+  });
+
+  it("does not show cancel when current user is a group member and not the creator with camelCase group", async () => {
+    const grantRequest = {
+      id: 8,
+      group: {
+        userGroupId: 10,
+        createdBy: { userName: "ada" },
+      },
+    };
+    const props = {
+      ...propsBuilder({}),
+      grantRequest,
+      grantRequestStatus: "pending",
+    };
+    const rendered = render(<StructureGrantDropdown {...props} />, {
+      state: { authentication: { user_name: "bob" } },
+    });
+    await waitForLoad(rendered);
+
+    expect(
+      rendered.queryByText(/cancel_grant_request/i),
+    ).not.toBeInTheDocument();
+    expect(
+      rendered.getByText(/grant.actions.viewrequest.confirmation.header/i),
+    ).toBeInTheDocument();
+  });
 });

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

@@ -1,6 +1,8 @@
-import { render } from "@truedat/test/render";
+import userEvent from "@testing-library/user-event";
+import { render, waitForLoad } from "@truedat/test/render";
 import SearchContextWrapper from "@truedat/core/components/common/SearchContextWrapper";
 import StructureGrantListButton from "../StructureGrantListButton";
+import { createGrantRequestStatus } from "../../routines";
 
 const structure = {
   id: 151596,
@@ -82,4 +84,37 @@ describe("<StructureGrantListButton />", () => {
     );
     expect(container).toMatchSnapshot();
   });
+
+  it("cancelling a grant request refreshes the search results", async () => {
+    const user = userEvent.setup({ delay: null });
+    const refreshSearch = jest.fn();
+    const dispatch = jest.fn();
+    const pendingStructure = {
+      ...structure,
+      my_grant_request: { status: "pending" },
+    };
+
+    const rendered = render(
+      <SearchContextWrapper
+        props={{ filterParams: { foo: "bar" }, refreshSearch }}
+      >
+        <StructureGrantListButton structure={pendingStructure} />
+      </SearchContextWrapper>,
+      { ...renderOpts, dispatch },
+    );
+    await waitForLoad(rendered);
+
+    await user.click(rendered.getByText(/cancel_grant_request/i));
+    await user.click(
+      rendered.getByRole("button", { name: /modal-affirmative-action/i }),
+    );
+
+    const cancelAction = dispatch.mock.calls.find(
+      ([action]) => action.type === createGrantRequestStatus().type,
+    );
+    const { onSuccess } = cancelAction[0].payload;
+    expect(onSuccess).toBeDefined();
+    onSuccess();
+    expect(refreshSearch).toHaveBeenCalled();
+  });
 });

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

@@ -1,7 +1,9 @@
 import { waitFor } from "@testing-library/react";
-import { render } from "@truedat/test/render";
+import userEvent from "@testing-library/user-event";
+import { render, waitForLoad } from "@truedat/test/render";
 import { LATEST_GRANT_REQUEST_BY_DS_QUERY } from "../../api/queries";
 import StructureGrantSummaryButton from "../StructureGrantSummaryButton";
+import { createGrantRequestStatus } from "../../routines";
 import en from "../../messages/en";
 
 const latestGrantMockBuilder = (status) => ({
@@ -16,6 +18,8 @@ const latestGrantMockBuilder = (status) => ({
               grant: {
                 id: 1,
               },
+              userGroupId: null,
+              createdBy: null,
             },
             status: { status },
           }
@@ -121,4 +125,88 @@ describe("<StructureGrantSummaryButton />", () => {
     await expectToRenderRequestButton(container, getByRole);
     expect(container).toMatchSnapshot();
   });
+
+  it("requests userGroupId and createdBy userName in latest grant request by data structure query", () => {
+    const query = LATEST_GRANT_REQUEST_BY_DS_QUERY.loc.source.body;
+    expect(query).toContain("userGroupId");
+    expect(query).toContain("createdBy");
+    expect(query).toContain("userName");
+  });
+
+  it("cancelling refetches the latest grant request of the structure", async () => {
+    const user = userEvent.setup({ delay: null });
+    const dispatch = jest.fn();
+
+    const pendingMock = {
+      request: { query: LATEST_GRANT_REQUEST_BY_DS_QUERY },
+      result: {
+        data: {
+          latestGrantRequest: {
+            id: 1,
+            requestType: "ACCESS",
+            group: {
+              grant: null,
+              userGroupId: null,
+              createdBy: null,
+            },
+            status: { status: "pending" },
+          },
+        },
+      },
+    };
+    const cancelledMock = {
+      request: { query: LATEST_GRANT_REQUEST_BY_DS_QUERY },
+      result: {
+        data: {
+          latestGrantRequest: {
+            id: 1,
+            requestType: "ACCESS",
+            group: {
+              grant: null,
+              userGroupId: null,
+              createdBy: null,
+            },
+            status: { status: "cancelled" },
+          },
+        },
+      },
+    };
+
+    const rendered = render(<StructureGrantSummaryButton />, {
+      mocks: [pendingMock, cancelledMock],
+      state: {
+        structure: { grant: null },
+        userPermissions: { request_grant: true },
+      },
+      messages: { en },
+      dispatch,
+    });
+
+    await waitFor(() => {
+      expect(rendered.queryByText(/lazy/i)).not.toBeInTheDocument();
+      expect(
+        rendered.container.querySelector(".loader"),
+      ).not.toBeInTheDocument();
+    });
+
+    expectToRenderDropdownComponent(rendered.container);
+
+    await user.click(rendered.getByText(/cancel request/i));
+    await user.click(
+      rendered.getByRole("button", { name: /modal-affirmative-action/i }),
+    );
+
+    const cancelAction = dispatch.mock.calls.find(
+      ([action]) => action.type === createGrantRequestStatus().type,
+    );
+    const { onSuccess } = cancelAction[0].payload;
+    expect(onSuccess).toBeDefined();
+    onSuccess();
+
+    await waitFor(() => {
+      expect(
+        rendered.container.getElementsByClassName("dropdown"),
+      ).toHaveLength(0);
+    });
+  });
 });

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

@@ -50,6 +50,15 @@ exports[`<GrantRequest /> matches the latest snapshot 1`] = `
               </div>
             </h2>
           </div>
+          <div
+            class="right aligned four wide column"
+          >
+            <button
+              class="ui button"
+            >
+              structure.grant.cancel_grant_request
+            </button>
+          </div>
         </div>
         <div
           class="ui big very relaxed list"
@@ -319,6 +328,25 @@ exports[`<GrantRequest /> matches the latest snapshot with approve actions 1`] =
               </div>
             </h2>
           </div>
+          <div
+            class="right aligned four wide column"
+          >
+            <button
+              class="ui primary button button icon group-actions"
+            >
+              grantRequest.actions.approve
+            </button>
+            <button
+              class="ui secondary button button icon group-actions"
+            >
+              grantRequest.actions.reject
+            </button>
+            <button
+              class="ui button"
+            >
+              structure.grant.cancel_grant_request
+            </button>
+          </div>
         </div>
         <div
           class="ui big very relaxed list"

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

@@ -35,6 +35,11 @@ exports[`<GrantRequestHeader /> matches the latest snapshot (pending) 1`] = `
       >
         Reject
       </button>
+      <button
+        class="ui button"
+      >
+        Cancel request
+      </button>
     </div>
   </div>
 </div>

package/src/messages/en.js

@@ -131,6 +131,9 @@ export default {
   "grantRequest.header.status": "Status",
   "grantRequest.header.updated_at": "Updated",
   "grantRequest.header.user": "User",
+  "grantRequest.header.group": "User group",
+  "grantRequest.deleted.user": "Deleted user",
+  "grantRequest.deleted.group": "Deleted group",
   "grantRequest.header.createdBy": "Created by",
   "grantRequest.header.create": "Create grant request",
   "grantRequest.header.type": "Request type",
@@ -161,6 +164,8 @@ export default {
   "grantRequests.subheader.approve": "Grant requests pending approval",
   "grantRequests.subheader.me": "Grant requests requested by me",
   "grantRequests.subheader": "Pending approval grant requests",
+  "grantRequests.props.user_full_name": "User",
+  "grantRequests.props.user_or_group": "User / Group",
   "grants.actions.download.popup": "Select a grant",
   "grants.actions.download.tooltip": "Download to XLSX",
   "grants.header": "Grants",

package/src/messages/es.js

@@ -134,6 +134,9 @@ export default {
   "grantRequest.header.status": "Estado",
   "grantRequest.header.updated_at": "Actualizado",
   "grantRequest.header.user": "Usuario",
+  "grantRequest.header.group": "Grupo de usuarios",
+  "grantRequest.deleted.user": "Usuario eliminado",
+  "grantRequest.deleted.group": "Grupo eliminado",
   "grantRequest.header.createdBy": "Creado por",
   "grantRequest.header.create": "Crear petición de acceso",
   "grantRequest.header.type": "Tipo de petición",
@@ -165,6 +168,8 @@ export default {
     "Peticiones de acceso pendientes de aprobación",
   "grantRequests.subheader.me": "Peticiones de acceso demandadas por mí",
   "grantRequests.subheader": "Peticiones de acceso pendientes de aprobación",
+  "grantRequests.props.user_full_name": "Usuario",
+  "grantRequests.props.user_or_group": "Usuario / Grupo",
   "grants.actions.download.popup": "Seleccione un acceso",
   "grants.actions.download.tooltip": "Descargar a XLSX",
   "grants.header": "Accesos",

package/src/reducers/__tests__/grantRequestsCart.spec.js

@@ -9,6 +9,7 @@ import {
   initGroupTemplates,
   selectGrantRequestTemplateForGroup,
   updateGrantRequestTemplateContentForGroup,
+  updateGrantRequestUser,
 } from "../../routines";
 import { initialState, grantRequestsCart } from "../grantRequestsCart";
 
@@ -416,4 +417,15 @@ describe("reducers: grantRequestsCart", () => {
   it("should ignore unknown actions", () => {
     expect(grantRequestsCart(initialState, { type: "FOO" })).toBe(initialState);
   });
+
+  it("stores user_group_id and clears user id when selecting a user group", () => {
+    const state = grantRequestsCart(initialState, {
+      type: updateGrantRequestUser.TRIGGER,
+      payload: { user_group_id: 10, valid: true },
+    });
+
+    expect(state.user_group_id).toBe(10);
+    expect([null, undefined, ""]).toContain(state.user?.id);
+    expect(state.user?.id).not.toBe("group:10");
+  });
 });

package/src/reducers/grantRequestsCart.js

@@ -22,6 +22,7 @@ const initialState = {
   templateContent: {},
   modificationGrant: null,
   user: { id: null, valid: true },
+  user_group_id: null,
   groupUsers: {},
 };
 const mapPayload = (payload) =>
@@ -77,8 +78,19 @@ const grantRequestsCart = (state = initialState, { type, payload }) => {
         validCart: state.template && _.size(valid) === 0,
       };
     case updateGrantRequestUser.TRIGGER:
+      if (!_.isNil(payload.user_group_id)) {
+        return {
+          ...state,
+          user_group_id: payload.user_group_id,
+          user: {
+            id: null,
+            valid: payload.valid,
+          },
+        };
+      }
       return {
         ...state,
+        user_group_id: null,
         user: {
           id: payload.id,
           valid: payload.valid,

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

@@ -5,7 +5,11 @@ import {
   createGrantRequestStatusRequestSaga,
   createGrantRequestStatusSaga,
 } from "../createGrantRequestStatus";
-import { createGrantRequestStatus, fetchStructure } from "../../routines";
+import {
+  createGrantRequestStatus,
+  fetchStructure,
+  fetchStructures,
+} from "../../routines";
 import { API_GRANT_REQUEST_STATUS } from "../../api";
 
 describe("sagas: createGrantRequestStatusRequestSaga", () => {
@@ -79,4 +83,66 @@ describe("sagas: createGrantRequestStatusSaga", () => {
         .isDone();
     }).not.toThrow();
   });
+
+  it("calls onSuccess after refreshing the structure", () => {
+    const onSuccess = jest.fn();
+    const payloadWithOnSuccess = {
+      grantRequest: { id: "8", request_type: "ACCESS" },
+      status: "cancelled",
+      structureId: "3",
+      onSuccess,
+    };
+    const url = compile(API_GRANT_REQUEST_STATUS)({ id: "8" });
+
+    expect(() => {
+      testSaga(createGrantRequestStatusSaga, {
+        payload: payloadWithOnSuccess,
+      })
+        .next()
+        .put(createGrantRequestStatus.request({ status: "cancelled" }))
+        .next()
+        .call(apiJsonPost, url, { status: "cancelled" }, JSON_OPTS)
+        .next({ data: "result" })
+        .put(createGrantRequestStatus.success("result"))
+        .next()
+        .put(fetchStructure.trigger({ id: "3" }))
+        .next()
+        .call(onSuccess)
+        .next()
+        .put(createGrantRequestStatus.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("calls onSuccess after refreshing the previous structure query", () => {
+    const onSuccess = jest.fn();
+    const payloadWithOnSuccess = {
+      grantRequest: { id: "8", request_type: "ACCESS" },
+      status: "cancelled",
+      previousStructureQuery: { foo: "bar" },
+      onSuccess,
+    };
+    const url = compile(API_GRANT_REQUEST_STATUS)({ id: "8" });
+
+    expect(() => {
+      testSaga(createGrantRequestStatusSaga, {
+        payload: payloadWithOnSuccess,
+      })
+        .next()
+        .put(createGrantRequestStatus.request({ status: "cancelled" }))
+        .next()
+        .call(apiJsonPost, url, { status: "cancelled" }, JSON_OPTS)
+        .next({ data: "result" })
+        .put(createGrantRequestStatus.success("result"))
+        .next()
+        .put(fetchStructures.trigger({ foo: "bar" }))
+        .next()
+        .call(onSuccess)
+        .next()
+        .put(createGrantRequestStatus.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
 });

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

@@ -92,3 +92,29 @@ describe("sagas: fetchGrantRequestSaga", () => {
     }).not.toThrow();
   });
 });
+
+describe("sagas: fetchGrantRequestSaga with numeric id", () => {
+  const data = {
+    data_structure_id: "1",
+    medatada: { foo: "bar " },
+    filters: { bar: "baz" },
+  };
+  const id = 4751;
+  const payload = { id };
+  const url = compile(API_GRANT_REQUEST)({ id: `${id}` });
+  it("should put a success action when id is numeric", () => {
+    expect(() => {
+      testSaga(fetchGrantRequestSaga, { payload })
+        .next()
+        .put(fetchGrantRequest.request())
+        .next()
+        .call(apiJson, url, JSON_OPTS)
+        .next({ data })
+        .put(fetchGrantRequest.success(data))
+        .next()
+        .put(fetchGrantRequest.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

package/src/sagas/createGrantRequestStatus.js

@@ -16,6 +16,7 @@ export function* createGrantRequestStatusSaga({ payload }) {
       status,
       structureId,
       previousStructureQuery,
+      onSuccess,
     } = payload;
 
     const url = compile(API_GRANT_REQUEST_STATUS)({
@@ -40,6 +41,10 @@ export function* createGrantRequestStatusSaga({ payload }) {
         },
       });
     }
+
+    if (typeof onSuccess === "function") {
+      yield call(onSuccess);
+    }
   } catch (error) {
     if (error.response) {
       const { status, data } = error.response;

package/src/sagas/fetchGrantRequest.js

@@ -6,7 +6,7 @@ import { API_GRANT_REQUEST } from "../api";
 
 export function* fetchGrantRequestSaga({ payload }) {
   try {
-    const url = compile(API_GRANT_REQUEST)(payload);
+    const url = compile(API_GRANT_REQUEST)({ id: payload?.id?.toString() });
     yield put(fetchGrantRequest.request());
     const { data } = yield call(apiJson, url, JSON_OPTS);
     yield put(fetchGrantRequest.success(data));