86b7kbjcf - Fix: item counter when deleting form item on second page

src/actions/__tests__/sponsor-forms-actions.test.js

@@ -0,0 +1,66 @@
+import * as OpenStackUiCoreActions from "openstack-uicore-foundation/lib/utils/actions";
+import { deleteSponsorFormItem } from "../sponsor-forms-actions";
+import * as UtilsMethods from "../../utils/methods";
+import * as BaseActions from "../base-actions";
+
+jest.mock("openstack-uicore-foundation/lib/utils/actions", () => {
+  const originalModule = jest.requireActual(
+    "openstack-uicore-foundation/lib/utils/actions"
+  );
+
+  return {
+    __esModule: true,
+    ...originalModule,
+    deleteRequest: jest.fn(() => () => () => Promise.resolve())
+  };
+});
+
+describe("SponsorFormActions", () => {
+  describe("DeleteSponsorFormItem", () => {
+    afterEach(() => {
+      // restore the spy created with spyOn
+      jest.restoreAllMocks();
+    });
+
+    it("execute", async () => {
+      const mockedDispatch = jest.fn();
+      const mockedGetState = jest.fn(() => ({
+        currentSummitState: {
+          currentSummit: "SSS"
+        },
+        sponsorFormItemsListState: {
+          currentPage: 1,
+          perPage: 10,
+          order: "asc",
+          orderDir: 1,
+          hideArchived: false
+        }
+      }));
+
+      const params = {
+        formId: "AAA",
+        itemId: "III"
+      };
+
+      const spyOnGetAccessTokenSafely = jest
+        .spyOn(UtilsMethods, "getAccessTokenSafely")
+        .mockImplementation(() => "access _token");
+      const spyOnSnackbarSuccessHandler = jest.spyOn(
+        BaseActions,
+        "snackbarSuccessHandler"
+      );
+
+      await deleteSponsorFormItem(params.formId, params.itemId)(
+        mockedDispatch,
+        mockedGetState
+      );
+
+      // gets acces token safely
+      expect(spyOnGetAccessTokenSafely).toHaveBeenCalled();
+      // calls delete request
+      expect(OpenStackUiCoreActions.deleteRequest).toHaveBeenCalled();
+      // shows snackbar
+      expect(spyOnSnackbarSuccessHandler).toHaveBeenCalled();
+    });
+  });
+});

src/actions/sponsor-forms-actions.js

@@ -932,13 +932,12 @@ export const getSponsorFormItem =
 
 export const deleteSponsorFormItem =
   (formId, itemId) => async (dispatch, getState) => {
-    const { currentSummitState } = getState();
+    const { currentSummitState, sponsorFormItemsListState } = getState();
     const accessToken = await getAccessTokenSafely();
     const { currentSummit } = currentSummitState;
     const params = { access_token: accessToken };
 
     dispatch(startLoading());
-
     return deleteRequest(
       null,
       createAction(SPONSOR_FORM_ITEM_DELETED)({ itemId }),
@@ -947,6 +946,18 @@ export const deleteSponsorFormItem =
       snackbarErrorHandler
     )(params)(dispatch)
       .then(() => {
+        const { currentPage, perPage, order, orderDir, hideArchived } =
+          sponsorFormItemsListState;
+        dispatch(
+          getSponsorFormItems(
+            formId,
+            currentPage,
+            perPage,
+            order,
+            orderDir,
+            hideArchived
+          )
+        );
         dispatch(
           snackbarSuccessHandler({
             title: T.translate("general.success"),

src/reducers/sponsors/__tests__/sponsor-form-items-list-reducer.test.js

@@ -234,7 +234,6 @@ describe("SponsorFormItemsListReducer", () => {
       result = SponsorFormItemsListReducer(
         {
           ...initialState,
-          totalCount: 2,
           items: [
             {
               id: "A",
@@ -267,7 +266,6 @@ describe("SponsorFormItemsListReducer", () => {
       );
       expect(result).toStrictEqual({
         ...initialState,
-        totalCount: 1,
         items: [
           {
             id: "B",

src/reducers/sponsors/sponsor-form-items-list-reducer.js

@@ -131,9 +131,8 @@ const sponsorFormItemsListReducer = (state = DEFAULT_STATE, action) => {
     case SPONSOR_FORM_ITEM_DELETED: {
       const { itemId } = payload;
       const items = state.items.filter((it) => it.id !== itemId);
-      const totalCount = items.length;
 
-      return { ...state, items, totalCount };
+      return { ...state, items };
     }
     case SPONSOR_FORM_ITEM_ARCHIVED: {
       const { id: itemId } = payload.response;