feat: move admin access group grid to mui

src/actions/__tests__/admin-access-actions.test.js

@@ -0,0 +1,131 @@
+/**
+ * @jest-environment jsdom
+ */
+import configureStore from "redux-mock-store";
+import thunk from "redux-thunk";
+import flushPromises from "flush-promises";
+import {
+  postRequest,
+  putRequest
+} from "openstack-uicore-foundation/lib/utils/actions";
+import { saveAdminAccess } from "../admin-access-actions";
+import * as methods from "../../utils/methods";
+
+jest.mock("openstack-uicore-foundation/lib/utils/actions", () => ({
+  __esModule: true,
+  ...jest.requireActual("openstack-uicore-foundation/lib/utils/actions"),
+  postRequest: jest.fn(),
+  putRequest: jest.fn()
+}));
+
+const requestMock =
+  (requestActionCreator, receiveActionCreator) => () => (dispatch) => {
+    if (requestActionCreator && typeof requestActionCreator === "function") {
+      dispatch(requestActionCreator({}));
+    }
+    return new Promise((resolve) => {
+      if (typeof receiveActionCreator === "function") {
+        dispatch(receiveActionCreator({ response: { id: 1 } }));
+      } else {
+        dispatch(receiveActionCreator);
+      }
+      resolve({ response: { id: 1 } });
+    });
+  };
+
+const rejectMock = () => () => () => Promise.reject(new Error("API error"));
+
+describe("saveAdminAccess", () => {
+  const middlewares = [thunk];
+  const mockStore = configureStore(middlewares);
+
+  beforeEach(() => {
+    jest.spyOn(methods, "getAccessTokenSafely").mockResolvedValue("TOKEN");
+    postRequest.mockImplementation(requestMock);
+    putRequest.mockImplementation(requestMock);
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  describe("create path (entity has no id)", () => {
+    it("returns a Promise", async () => {
+      const store = mockStore({});
+      const result = store.dispatch(
+        saveAdminAccess({ title: "Group A", members: [], summits: [] })
+      );
+      expect(result).toBeInstanceOf(Promise);
+      await expect(result).resolves.toBeUndefined();
+    });
+
+    it("dispatches ADMIN_ACCESS_ADDED then STOP_LOADING on success", async () => {
+      const store = mockStore({});
+      store.dispatch(
+        saveAdminAccess({ title: "Group A", members: [], summits: [] })
+      );
+      await flushPromises();
+
+      const actionTypes = store.getActions().map((a) => a.type);
+      expect(actionTypes).toContain("ADMIN_ACCESS_ADDED");
+      expect(actionTypes).toContain("STOP_LOADING");
+      expect(actionTypes.indexOf("STOP_LOADING")).toBeGreaterThan(
+        actionTypes.indexOf("ADMIN_ACCESS_ADDED")
+      );
+    });
+
+    it("still dispatches STOP_LOADING when postRequest rejects", async () => {
+      postRequest.mockImplementation(rejectMock);
+      const store = mockStore({});
+      await store
+        .dispatch(
+          saveAdminAccess({ title: "Group A", members: [], summits: [] })
+        )
+        .catch(() => {});
+      await flushPromises();
+
+      const actionTypes = store.getActions().map((a) => a.type);
+      expect(actionTypes).toContain("STOP_LOADING");
+    });
+  });
+
+  describe("update path (entity has id)", () => {
+    it("returns a Promise", async () => {
+      const store = mockStore({});
+      const result = store.dispatch(
+        saveAdminAccess({ id: 1, title: "Group A", members: [], summits: [] })
+      );
+      expect(result).toBeInstanceOf(Promise);
+      await expect(result).resolves.toBeUndefined();
+    });
+
+    it("dispatches ADMIN_ACCESS_UPDATED then STOP_LOADING on success", async () => {
+      const store = mockStore({});
+      store.dispatch(
+        saveAdminAccess({ id: 1, title: "Group A", members: [], summits: [] })
+      );
+      await flushPromises();
+
+      const actionTypes = store.getActions().map((a) => a.type);
+      expect(actionTypes).toContain("ADMIN_ACCESS_UPDATED");
+      expect(actionTypes).toContain("STOP_LOADING");
+      expect(actionTypes.indexOf("STOP_LOADING")).toBeGreaterThan(
+        actionTypes.indexOf("ADMIN_ACCESS_UPDATED")
+      );
+    });
+
+    it("still dispatches STOP_LOADING when putRequest rejects", async () => {
+      putRequest.mockImplementation(rejectMock);
+      const store = mockStore({});
+      await store
+        .dispatch(
+          saveAdminAccess({ id: 1, title: "Group A", members: [], summits: [] })
+        )
+        .catch(() => {});
+      await flushPromises();
+
+      const actionTypes = store.getActions().map((a) => a.type);
+      expect(actionTypes).toContain("STOP_LOADING");
+    });
+  });
+});

src/actions/admin-access-actions.js

@@ -19,12 +19,9 @@ import {
   createAction,
   stopLoading,
   startLoading,
-  showMessage,
-  showSuccessMessage,
-  authErrorHandler,
   escapeFilterValue
 } from "openstack-uicore-foundation/lib/utils/actions";
-import history from "../history";
+import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions";
 import { getAccessTokenSafely } from "../utils/methods";
 import { DEFAULT_PER_PAGE } from "../utils/constants";
 
@@ -94,8 +91,8 @@ export const getAdminAccesses =
       createAction(REQUEST_ADMIN_ACCESSES),
       createAction(RECEIVE_ADMIN_ACCESSES),
       `${window.API_BASE_URL}/api/v1/summit-administrator-groups`,
-      authErrorHandler,
-      { order, orderDir, term }
+      snackbarErrorHandler,
+      { order, orderDir, term, page, perPage }
     )(params)(dispatch).then(() => {
       dispatch(stopLoading());
     });
@@ -118,7 +115,7 @@ export const getAdminAccess = (adminAccessId) => async (dispatch) => {
     null,
     createAction(RECEIVE_ADMIN_ACCESS),
     `${window.API_BASE_URL}/api/v1/summit-administrator-groups/${adminAccessId}`,
-    authErrorHandler
+    snackbarErrorHandler
   )(params)(dispatch).then(() => {
     dispatch(stopLoading());
   });
@@ -128,52 +125,55 @@ export const resetAdminAccessForm = () => (dispatch) => {
   dispatch(createAction(RESET_ADMIN_ACCESS_FORM)({}));
 };
 
-export const saveAdminAccess =
-  (entity, noAlert = false) =>
-  async (dispatch) => {
-    const accessToken = await getAccessTokenSafely();
+export const saveAdminAccess = (entity) => async (dispatch) => {
+  const accessToken = await getAccessTokenSafely();
 
-    dispatch(startLoading());
+  dispatch(startLoading());
 
-    const normalizedEntity = normalizeEntity(entity);
-    const params = { access_token: accessToken };
-
-    if (entity.id) {
-      putRequest(
-        createAction(UPDATE_ADMIN_ACCESS),
-        createAction(ADMIN_ACCESS_UPDATED),
-        `${window.API_BASE_URL}/api/v1/summit-administrator-groups/${entity.id}`,
-        normalizedEntity,
-        authErrorHandler,
-        entity
-      )(params)(dispatch).then(() => {
-        if (!noAlert)
-          dispatch(showSuccessMessage(T.translate("admin_access.saved")));
-        else dispatch(stopLoading());
-      });
-    } else {
-      const successMessage = {
-        title: T.translate("general.done"),
-        html: T.translate("admin_access.created"),
-        type: "success"
-      };
-
-      postRequest(
-        createAction(UPDATE_ADMIN_ACCESS),
-        createAction(ADMIN_ACCESS_ADDED),
-        `${window.API_BASE_URL}/api/v1/summit-administrator-groups`,
-        normalizedEntity,
-        authErrorHandler,
-        entity
-      )(params)(dispatch).then((payload) => {
+  const normalizedEntity = normalizeEntity(entity);
+  const params = { access_token: accessToken };
+
+  if (entity.id) {
+    return putRequest(
+      createAction(UPDATE_ADMIN_ACCESS),
+      createAction(ADMIN_ACCESS_UPDATED),
+      `${window.API_BASE_URL}/api/v1/summit-administrator-groups/${entity.id}`,
+      normalizedEntity,
+      snackbarErrorHandler,
+      entity
+    )(params)(dispatch)
+      .then(() => {
         dispatch(
-          showMessage(successMessage, () => {
-            history.push(`/app/admin-access/${payload.response.id}`);
+          snackbarSuccessHandler({
+            title: T.translate("general.success"),
+            html: T.translate("admin_access.saved")
           })
         );
+      })
+      .finally(() => {
+        dispatch(stopLoading());
       });
-    }
-  };
+  }
+  return postRequest(
+    createAction(UPDATE_ADMIN_ACCESS),
+    createAction(ADMIN_ACCESS_ADDED),
+    `${window.API_BASE_URL}/api/v1/summit-administrator-groups`,
+    normalizedEntity,
+    snackbarErrorHandler,
+    entity
+  )(params)(dispatch)
+    .then(() => {
+      dispatch(
+        snackbarSuccessHandler({
+          title: T.translate("general.success"),
+          html: T.translate("admin_access.created")
+        })
+      );
+    })
+    .finally(() => {
+      dispatch(stopLoading());
+    });
+};
 
 export const deleteAdminAccess = (adminAccessId) => async (dispatch) => {
   const accessToken = await getAccessTokenSafely();
@@ -187,7 +187,7 @@ export const deleteAdminAccess = (adminAccessId) => async (dispatch) => {
     createAction(ADMIN_ACCESS_DELETED)({ adminAccessId }),
     `${window.API_BASE_URL}/api/v1/summit-administrator-groups/${adminAccessId}`,
     null,
-    authErrorHandler
+    snackbarErrorHandler
   )(params)(dispatch).then(() => {
     dispatch(stopLoading());
   });