Merge pull request #1211 from scottsut/mode

fix(Member): unify request error handle

Author: scottsut

frontend/src/app/pages/MainPage/pages/MemberPage/slice/thunks.ts

@@ -20,8 +20,7 @@ import { createAsyncThunk } from '@reduxjs/toolkit';
 import { User } from 'app/slice/types';
 import omit from 'lodash/omit';
 import { RootState } from 'types';
-import { request, request2 } from 'utils/request';
-import { errorHandle } from 'utils/utils';
+import { request2 } from 'utils/request';
 import { selectEditingMember, selectEditingRole } from './selectors';
 import {
   AddRoleParams,
@@ -37,48 +36,33 @@ import {
 export const getMembers = createAsyncThunk<User[], string>(
   'member/getMembers',
   async orgId => {
-    try {
-      const result = await request<User[]>(`/orgs/${orgId}/members`);
-      return result.data;
-    } catch (error) {
-      errorHandle(error);
-      throw error;
-    }
+    const result = await request2<User[]>(`/orgs/${orgId}/members`);
+    return result.data;
   },
 );
 
 export const inviteMember = createAsyncThunk<null, InviteMemberParams>(
   'member/inviteMember',
   async ({ params: { orgId, emails, sendMail }, resolve }) => {
-    try {
-      const { data } = await request<{ success: string[]; fail: string[] }>({
-        url: `/orgs/${orgId}/invite`,
-        method: 'POST',
-        data: emails,
-        params: { sendMail },
-      });
-      resolve(data);
-      return null;
-    } catch (error) {
-      errorHandle(error);
-      throw error;
-    }
+    const { data } = await request2<{ success: string[]; fail: string[] }>({
+      url: `/orgs/${orgId}/invite`,
+      method: 'POST',
+      data: emails,
+      params: { sendMail },
+    });
+    resolve(data);
+    return null;
   },
 );
 
 export const getMemberRoles = createAsyncThunk<
   Role[],
   { orgId: string; memberId: string }
 >('member/getMemberRoles', async ({ orgId, memberId }) => {
-  try {
-    const { data } = await request<Role[]>({
-      url: `/orgs/${orgId}/members/${memberId}/roles`,
-    });
-    return data;
-  } catch (error) {
-    errorHandle(error);
-    throw error;
-  }
+  const { data } = await request2<Role[]>({
+    url: `/orgs/${orgId}/members/${memberId}/roles`,
+  });
+  return data;
 });
 
 export const saveMember = createAsyncThunk<
@@ -132,17 +116,12 @@ export const saveMember = createAsyncThunk<
 export const removeMember = createAsyncThunk<null, RemoveMemberParams>(
   'member/removeMember',
   async ({ id, orgId, resolve }) => {
-    try {
-      await request<boolean>({
-        url: `/orgs/${orgId}/members/${id}`,
-        method: 'DELETE',
-      });
-      resolve();
-      return null;
-    } catch (error) {
-      errorHandle(error);
-      throw error;
-    }
+    await request2<boolean>({
+      url: `/orgs/${orgId}/members/${id}`,
+      method: 'DELETE',
+    });
+    resolve();
+    return null;
   },
 );
 
@@ -162,31 +141,21 @@ export const deleteMember = createAsyncThunk<null, RemoveMemberParams>(
 export const getRoles = createAsyncThunk<Role[], string>(
   'member/getRoles',
   async orgId => {
-    try {
-      const { data } = await request<Role[]>(`/orgs/${orgId}/roles`);
-      return data;
-    } catch (error) {
-      errorHandle(error);
-      throw error;
-    }
+    const { data } = await request2<Role[]>(`/orgs/${orgId}/roles`);
+    return data;
   },
 );
 
 export const addRole = createAsyncThunk<Role, AddRoleParams>(
   'member/addRole',
   async ({ role, resolve }) => {
-    try {
-      const { data } = await request<Role>({
-        url: '/roles',
-        method: 'POST',
-        data: role,
-      });
-      resolve();
-      return data;
-    } catch (error) {
-      errorHandle(error);
-      throw error;
-    }
+    const { data } = await request2<Role>({
+      url: '/roles',
+      method: 'POST',
+      data: role,
+    });
+    resolve();
+    return data;
   },
 );
 
@@ -195,103 +164,78 @@ export const editRole = createAsyncThunk<
   EditRoleParams,
   { state: RootState }
 >('member/editRole', async ({ role, members, resolve }, { getState }) => {
-  try {
-    const editingRole = selectEditingRole(getState());
-    if (editingRole) {
-      const { info, members: originMembers } = editingRole;
-      const mergedRole = { ...info, ...role };
-      const originMemberIds = originMembers.map(({ id }) => id);
-      const memberIds = members.map(({ id }) => id);
+  const editingRole = selectEditingRole(getState());
+  if (editingRole) {
+    const { info, members: originMembers } = editingRole;
+    const mergedRole = { ...info, ...role };
+    const originMemberIds = originMembers.map(({ id }) => id);
+    const memberIds = members.map(({ id }) => id);
+
+    await Promise.all([
+      request2<boolean>({
+        url: `/roles/${info.id}`,
+        method: 'PUT',
+        data: omit(mergedRole, 'orgId'),
+      }),
+      originMemberIds.sort().join() !== memberIds.sort().join()
+        ? request2<boolean>({
+            url: `/roles/${info.id}/users`,
+            method: 'PUT',
+            data: memberIds,
+          })
+        : null,
+    ]);
 
-      await Promise.all([
-        request<boolean>({
-          url: `/roles/${info.id}`,
-          method: 'PUT',
-          data: omit(mergedRole, 'orgId'),
-        }),
-        originMemberIds.sort().join() !== memberIds.sort().join()
-          ? request<boolean>({
-              url: `/roles/${info.id}/users`,
-              method: 'PUT',
-              data: memberIds,
-            })
-          : null,
-      ]);
-
-      resolve();
-      return mergedRole;
-    }
-    return null;
-  } catch (error) {
-    errorHandle(error);
-    throw error;
+    resolve();
+    return mergedRole;
   }
+  return null;
 });
 
 export const deleteRole = createAsyncThunk<null, DeleteRoleParams>(
   'member/deleteRole',
   async ({ id, resolve }) => {
-    try {
-      await request<boolean>({
-        url: `/roles/${id}`,
-        method: 'DELETE',
-      });
-      resolve();
-      return null;
-    } catch (error) {
-      errorHandle(error);
-      throw error;
-    }
+    await request2<boolean>({
+      url: `/roles/${id}`,
+      method: 'DELETE',
+    });
+    resolve();
+    return null;
   },
 );
 
 export const getRoleMembers = createAsyncThunk<User[], string>(
   'member/getRoleMembers',
   async roleId => {
-    try {
-      const { data } = await request<User[]>({
-        url: `/roles/${roleId}/users`,
-      });
-      return data;
-    } catch (error) {
-      errorHandle(error);
-      throw error;
-    }
+    const { data } = await request2<User[]>({
+      url: `/roles/${roleId}/users`,
+    });
+    return data;
   },
 );
 
 export const grantOwner = createAsyncThunk<null, GrantOwnerParams>(
   'member/grantOwner',
   async ({ orgId, userId, resolve }) => {
-    try {
-      await request<boolean>({
-        url: '/roles/permission/grant/org_owner',
-        method: 'POST',
-        params: { orgId, userId },
-      });
-      resolve();
-      return null;
-    } catch (error) {
-      errorHandle(error);
-      throw error;
-    }
+    await request2<boolean>({
+      url: '/roles/permission/grant/org_owner',
+      method: 'POST',
+      params: { orgId, userId },
+    });
+    resolve();
+    return null;
   },
 );
 
 export const revokeOwner = createAsyncThunk<null, GrantOwnerParams>(
   'member/revokeOwner',
   async ({ orgId, userId, resolve }) => {
-    try {
-      await request<boolean>({
-        url: '/roles/permission/revoke/org_owner',
-        method: 'DELETE',
-        params: { orgId, userId },
-      });
-      resolve();
-      return null;
-    } catch (error) {
-      errorHandle(error);
-      throw error;
-    }
+    await request2<boolean>({
+      url: '/roles/permission/revoke/org_owner',
+      method: 'DELETE',
+      params: { orgId, userId },
+    });
+    resolve();
+    return null;
   },
 );