diff --git a/src/_redux/features/account/auth/authThunk.ts b/src/_redux/features/account/auth/authThunk.ts index 947a3008..0aa19bd2 100644 --- a/src/_redux/features/account/auth/authThunk.ts +++ b/src/_redux/features/account/auth/authThunk.ts @@ -21,7 +21,7 @@ import { cookieStorage } from '@src/modules/account/auth/service/cookie'; import { openModal } from '../../comn/message/messageSlice'; -import { MODAL_DESC, MODAL_TITLE } from '@src/configs/msgConst'; +import { MODAL_BODY, MODAL_HEADER } from '@src/configs/msgConst'; // 로그인 export const setLogin = createAsyncThunk( @@ -79,8 +79,8 @@ export const checkCookie = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -105,8 +105,8 @@ export const setLogout = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -125,8 +125,8 @@ export const getUserPage = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -146,16 +146,16 @@ export const updateUser = createAsyncThunk( } else { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.save + header: MODAL_HEADER.confirm, + body: MODAL_BODY.save }) ); } } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -174,7 +174,7 @@ export const deleteUser = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, + header: MODAL_HEADER.confirm, body: '탈퇴가 완료되었습니다.', isRefresh: true }) @@ -191,8 +191,8 @@ export const deleteUser = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -212,14 +212,14 @@ export const checkUserPw = createAsyncThunk( if (data.errorCode === '-1') { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, + header: MODAL_HEADER.error, body: '기존 비밀번호가 일치하지 않습니다.' }) ); } else { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, + header: MODAL_HEADER.confirm, body: '확인이 완료되었습니다.' }) ); @@ -229,8 +229,8 @@ export const checkUserPw = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -248,15 +248,15 @@ export const updateUserPw = createAsyncThunk( if (data.errorCode === '-1') { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, + header: MODAL_HEADER.error, body: '기존 비밀번호가 일치하지 않습니다.' }) ); } else { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.save, + header: MODAL_HEADER.confirm, + body: MODAL_BODY.save, isHistoryBack: true, isRefresh: true }) @@ -265,8 +265,8 @@ export const updateUserPw = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -286,8 +286,8 @@ export const checkToken = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } diff --git a/src/_redux/features/account/find/findThunk.ts b/src/_redux/features/account/find/findThunk.ts index b77bf92a..233d880e 100644 --- a/src/_redux/features/account/find/findThunk.ts +++ b/src/_redux/features/account/find/findThunk.ts @@ -5,7 +5,7 @@ import { createAsyncThunk } from '@reduxjs/toolkit'; import { QS_OPTION } from '@src/configs/constants'; import { IUpdateUserRq, IUserIdRq, IUserPwRq } from './findState'; import { openModal } from '../../comn/message/messageSlice'; -import { MODAL_DESC, MODAL_TITLE } from '@src/configs/msgConst'; +import { MODAL_BODY, MODAL_HEADER } from '@src/configs/msgConst'; // 아이디 찾기 인증번호 발송 export const sendCrtfyhpForId = createAsyncThunk( @@ -19,8 +19,8 @@ export const sendCrtfyhpForId = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -39,8 +39,8 @@ export const findUserId = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -59,8 +59,8 @@ export const sendCrtfyhpForPw = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -79,8 +79,8 @@ export const updateUserPw = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } diff --git a/src/_redux/features/account/register/registerThunk.ts b/src/_redux/features/account/register/registerThunk.ts index 5c68f96d..f41e979f 100644 --- a/src/_redux/features/account/register/registerThunk.ts +++ b/src/_redux/features/account/register/registerThunk.ts @@ -7,7 +7,7 @@ import { ACCOUNT, QS_OPTION } from '@src/configs/constants'; import { IGetTermsListRs, IRegisterRq } from './registerState'; import { DefaultSearchModel } from 'src/modules/models/ComnModel'; import { openModal } from '../../comn/message/messageSlice'; -import { MODAL_DESC, MODAL_TITLE } from '@src/configs/msgConst'; +import { MODAL_BODY, MODAL_HEADER } from '@src/configs/msgConst'; // 회원가입 export const register = createAsyncThunk( @@ -29,8 +29,8 @@ export const register = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -50,8 +50,8 @@ export const getTermsList = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -69,8 +69,8 @@ export const sendCrtfyhp = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -89,8 +89,8 @@ export const confirmCrtfyhp = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } diff --git a/src/_redux/features/analysis/history/historyThunk.ts b/src/_redux/features/analysis/history/historyThunk.ts index 740efbc9..5b86d9f9 100644 --- a/src/_redux/features/analysis/history/historyThunk.ts +++ b/src/_redux/features/analysis/history/historyThunk.ts @@ -4,7 +4,7 @@ import { createAsyncThunk } from '@reduxjs/toolkit'; import { openModal } from '../../comn/message/messageSlice'; import { QS_OPTION } from '@src/configs/constants'; import { IHstryListRq } from './historyState'; -import { MODAL_DESC, MODAL_TITLE } from '@src/configs/msgConst'; +import { MODAL_BODY, MODAL_HEADER } from '@src/configs/msgConst'; // 비행이력 조회 export const getHstryList = createAsyncThunk( @@ -20,8 +20,8 @@ export const getHstryList = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -38,8 +38,8 @@ export const getHstryLog = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -56,8 +56,8 @@ export const getHstryDetail = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } diff --git a/src/_redux/features/analysis/simulation/simulationThunk.ts b/src/_redux/features/analysis/simulation/simulationThunk.ts index 019ce55e..e56b69fe 100644 --- a/src/_redux/features/analysis/simulation/simulationThunk.ts +++ b/src/_redux/features/analysis/simulation/simulationThunk.ts @@ -4,7 +4,7 @@ import { createAsyncThunk } from '@reduxjs/toolkit'; import { openModal } from '../../comn/message/messageSlice'; import { QS_OPTION } from '@src/configs/constants'; import { IAnalysisSimulatorListRq } from './simulationState'; -import { MODAL_DESC, MODAL_TITLE } from '@src/configs/msgConst'; +import { MODAL_BODY, MODAL_HEADER } from '@src/configs/msgConst'; // 비행 현황 목록 export const getSmltList = createAsyncThunk( @@ -20,8 +20,8 @@ export const getSmltList = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -38,8 +38,8 @@ export const getSmltLog = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -56,8 +56,8 @@ export const getSmltDetail = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -74,8 +74,8 @@ export const getSmltStcs = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } diff --git a/src/_redux/features/basis/drone/droneThunk.ts b/src/_redux/features/basis/drone/droneThunk.ts index 39b15c8b..34dc3451 100644 --- a/src/_redux/features/basis/drone/droneThunk.ts +++ b/src/_redux/features/basis/drone/droneThunk.ts @@ -12,7 +12,7 @@ import { IIdntf, IUpdateDroneRq } from './droneState'; -import { MODAL_DESC, MODAL_TITLE } from '@src/configs/msgConst'; +import { MODAL_BODY, MODAL_HEADER } from '@src/configs/msgConst'; // 드론 목록 조회 export const getDroneList = createAsyncThunk( @@ -35,8 +35,8 @@ export const getDroneList = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -55,8 +55,8 @@ export const getDroneDetail = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -74,8 +74,8 @@ export const createDrone = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.save, + header: MODAL_HEADER.confirm, + body: MODAL_BODY.save, isHistoryBack: true }) ); @@ -83,8 +83,8 @@ export const createDrone = createAsyncThunk( if (data.errorCode === 'DT002') { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: '제작번호가 ' + MODAL_DESC.duplicate + header: MODAL_HEADER.error, + body: '제작번호가 ' + MODAL_BODY.duplicate }) ); } else { @@ -94,8 +94,8 @@ export const createDrone = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -113,8 +113,8 @@ export const updateDrone = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.save, + header: MODAL_HEADER.confirm, + body: MODAL_BODY.save, isHistoryBack: true }) ); @@ -122,8 +122,8 @@ export const updateDrone = createAsyncThunk( if (data.errorCode === 'DT002') { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: '제작번호가 ' + MODAL_DESC.duplicate + header: MODAL_HEADER.error, + body: '제작번호가 ' + MODAL_BODY.duplicate }) ); } else { @@ -133,8 +133,8 @@ export const updateDrone = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -153,8 +153,8 @@ export const deleteDrone = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.delete, + header: MODAL_HEADER.confirm, + body: MODAL_BODY.delete, isHistoryBack: true }) ); @@ -164,8 +164,8 @@ export const deleteDrone = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -202,8 +202,8 @@ export const getIdntfList = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -243,8 +243,8 @@ export const createIdntf = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.save, + header: MODAL_HEADER.confirm, + body: MODAL_BODY.save, isHistoryBack: true }) ); @@ -253,8 +253,8 @@ export const createIdntf = createAsyncThunk( if (data.errorCode === 'DT002') { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: '식별번호가 ' + MODAL_DESC.duplicate + header: MODAL_HEADER.error, + body: '식별번호가 ' + MODAL_BODY.duplicate }) ); } else { @@ -264,8 +264,8 @@ export const createIdntf = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -284,8 +284,8 @@ export const deleteIdntf = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.delete + header: MODAL_HEADER.confirm, + body: MODAL_BODY.delete }) ); return data; @@ -295,8 +295,8 @@ export const deleteIdntf = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } diff --git a/src/_redux/features/basis/group/groupThunk.ts b/src/_redux/features/basis/group/groupThunk.ts index bff5ab2d..d8f04149 100644 --- a/src/_redux/features/basis/group/groupThunk.ts +++ b/src/_redux/features/basis/group/groupThunk.ts @@ -20,7 +20,7 @@ import { IUpdateGroupRq, IUpdateUserAccessRq } from './groupState'; -import { MODAL_DESC, MODAL_TITLE } from '@src/configs/msgConst'; +import { MODAL_BODY, MODAL_HEADER } from '@src/configs/msgConst'; /** * 나와 관련된 그룹 조회(생성 + 참여) @@ -37,8 +37,8 @@ export const getGroupList = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -58,8 +58,8 @@ export const getAvailGroupList = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -89,8 +89,8 @@ export const getMyGroupList = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -120,8 +120,8 @@ export const getJoinGroupList = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -140,8 +140,8 @@ export const getGroupDetail = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -162,8 +162,8 @@ export const createGroup = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.save, + header: MODAL_HEADER.confirm, + body: MODAL_BODY.save, isHistoryBack: true }) ); @@ -171,7 +171,7 @@ export const createGroup = createAsyncThunk( if (data.errorCode === 'DT002') { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, + header: MODAL_HEADER.error, body: data.errorMessage + ' (그룹명)' }) ); @@ -182,8 +182,8 @@ export const createGroup = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -204,8 +204,8 @@ export const updateGroup = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.save, + header: MODAL_HEADER.confirm, + body: MODAL_BODY.save, isHistoryBack: true }) ); @@ -213,7 +213,7 @@ export const updateGroup = createAsyncThunk( if (data.errorCode === 'DT002') { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, + header: MODAL_HEADER.error, body: data.errorMessage + ' (그룹명)' }) ); @@ -223,8 +223,8 @@ export const updateGroup = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -243,8 +243,8 @@ export const deleteGroup = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.delete, + header: MODAL_HEADER.confirm, + body: MODAL_BODY.delete, isHistoryBack: true }) ); @@ -254,8 +254,8 @@ export const deleteGroup = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -274,8 +274,8 @@ export const createGroupId = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -295,8 +295,8 @@ export const joinGroup = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.save, + header: MODAL_HEADER.confirm, + body: MODAL_BODY.save, isHistoryBack: true }) ); @@ -306,8 +306,8 @@ export const joinGroup = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -327,8 +327,8 @@ export const leaveGroup = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.save, + header: MODAL_HEADER.confirm, + body: MODAL_BODY.save, isRefresh: true }) ); @@ -338,8 +338,8 @@ export const leaveGroup = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -368,8 +368,8 @@ export const getAprvList = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -389,8 +389,8 @@ export const updateAprv = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.save, + header: MODAL_HEADER.confirm, + body: MODAL_BODY.save, isRefresh: true }) ); @@ -400,8 +400,8 @@ export const updateAprv = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -428,8 +428,8 @@ export const getUserList = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -449,8 +449,8 @@ export const updateUserAccess = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.save, + header: MODAL_HEADER.confirm, + body: MODAL_BODY.save, isRefresh: true }) ); @@ -460,8 +460,8 @@ export const updateUserAccess = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -481,8 +481,8 @@ export const delegateUser = createAsyncThunk( if (data.result) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.confirm, - body: MODAL_DESC.save, + header: MODAL_HEADER.confirm, + body: MODAL_BODY.save, isRefresh: true }) ); @@ -492,8 +492,8 @@ export const delegateUser = createAsyncThunk( } catch (error) { thunkAPI.dispatch( openModal({ - header: MODAL_TITLE.error, - body: MODAL_DESC.error + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } diff --git a/src/_redux/features/control/gp/gpThunk.ts b/src/_redux/features/control/gp/gpThunk.ts index 4515afc1..22525423 100644 --- a/src/_redux/features/control/gp/gpThunk.ts +++ b/src/_redux/features/control/gp/gpThunk.ts @@ -7,13 +7,7 @@ import { IControlGpRq } from './gpState'; import { createAsyncThunk } from '@reduxjs/toolkit'; -import { isError, isMessage } from '../../comn/message/messageSlice'; -import { - ERROR_MESSAGE, - DUPLATE_MESSAGE, - SAVE_MESSAGE, - DELETE_MESSAGE -} from '@src/configs/constants'; +import { openModal } from '../../comn/message/messageSlice'; import { COOKIE_ACCESS_TOKEN, cookieStorage @@ -22,13 +16,14 @@ import { IDecodeToken } from '@src/modules/account/auth'; import decode from 'jwt-decode'; import { RootState } from '@src/_redux/store'; import { ClientcontrolGpRtDtlInit } from './gpSlice'; +import { MODAL_BODY, MODAL_HEADER } from '@src/configs/msgConst'; const token = cookieStorage.getCookie(COOKIE_ACCESS_TOKEN); export const getControlGp = createAsyncThunk( 'control/gp/getControlGp', async (data: IControlGpRq[], thunkAPI) => { - const { rejectWithValue, dispatch, getState } = thunkAPI; + const { dispatch, getState } = thunkAPI; try { const state = getState() as RootState; @@ -85,7 +80,12 @@ export const getControlGp = createAsyncThunk( return { controlGpList: data, controlGroupAuthInfo: res.payload }; } } catch (error) { - return rejectWithValue(error); + dispatch( + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error + }) + ); } } ); @@ -93,7 +93,7 @@ export const getControlGp = createAsyncThunk( export const controlDt = createAsyncThunk( 'control/gp/controlDt', async (controlId: string, thunkAPI) => { - const { rejectWithValue, getState, dispatch } = thunkAPI; + const { getState, dispatch } = thunkAPI; try { const state: any = getState(); const { controlGpList } = state.controlGpState; @@ -118,15 +118,12 @@ export const controlDt = createAsyncThunk( ...resData }; } catch (error) { - thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + dispatch( + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -134,7 +131,6 @@ export const controlDt = createAsyncThunk( export const getHistory = createAsyncThunk( 'control/gp/getHistory', async (id: string, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { if (!id) { return null; @@ -143,14 +139,11 @@ export const getHistory = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -158,7 +151,6 @@ export const getHistory = createAsyncThunk( export const getWarnLog = createAsyncThunk( 'control/gp/getWarnLog', async (id: string, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { if (!id) { return null; @@ -167,14 +159,11 @@ export const getWarnLog = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -182,20 +171,16 @@ export const getWarnLog = createAsyncThunk( export const getDetail = createAsyncThunk( 'control/gp/getDetail', async (id: string, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const { data } = await axios.get(`api/ctr/cntrl/detail/${id}`); return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -203,7 +188,6 @@ export const getDetail = createAsyncThunk( export const getGroupAuth = createAsyncThunk( 'control/gp/getGroupAuth', async (id: number, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { if (!id) { return null; @@ -212,14 +196,11 @@ export const getGroupAuth = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -227,7 +208,6 @@ export const getGroupAuth = createAsyncThunk( export const getFlightPlan = createAsyncThunk( 'control/gp/getFlightPlan', async (idntfNum: string, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { if (!idntfNum) { return null; @@ -236,14 +216,11 @@ export const getFlightPlan = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -251,7 +228,6 @@ export const getFlightPlan = createAsyncThunk( export const getWeather = createAsyncThunk( 'control/gp/getWeather', async (rq: IControlweatherRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const { data } = await axios.get(`api/ctr/cntrl/api/weather`, { params: { @@ -261,15 +237,11 @@ export const getWeather = createAsyncThunk( return data.response.body; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - - return rejectWithValue(error); } } ); @@ -277,7 +249,6 @@ export const getWeather = createAsyncThunk( export const checkPlanContains = createAsyncThunk( 'control/gp/checkPlanContains', async (rq: IControlGpPlanContainsRQ, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { if (!rq.idntfNum) { return null; @@ -286,14 +257,11 @@ export const checkPlanContains = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -301,7 +269,6 @@ export const checkPlanContains = createAsyncThunk( export const getArcrftWarn = createAsyncThunk( 'control/gp/getArcrftWarn', async (rq: IControlGpArcrftWarnRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { if (!rq.cntrlId) { return null; @@ -310,14 +277,11 @@ export const getArcrftWarn = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -325,7 +289,6 @@ export const getArcrftWarn = createAsyncThunk( export const getArcrftWarnList = createAsyncThunk( 'control/gp/getArcrftWarnList', async (rq: IControlGpArcrftWarnRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { if (!rq.cntrlId) return null; @@ -334,14 +297,11 @@ export const getArcrftWarnList = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); diff --git a/src/_redux/features/customerService/faq/faqThunk.ts b/src/_redux/features/customerService/faq/faqThunk.ts index b0d8d25d..a63ae11d 100644 --- a/src/_redux/features/customerService/faq/faqThunk.ts +++ b/src/_redux/features/customerService/faq/faqThunk.ts @@ -1,7 +1,6 @@ import { createAsyncThunk } from '@reduxjs/toolkit'; import axios from '../../../../modules/utils/customAxiosUtil'; -import { isError } from '../../comn/message/messageSlice'; -import { ERROR_MESSAGE } from '@src/configs/constants'; +import { openModal } from '../../comn/message/messageSlice'; import { IFaqSearchRq, IFaqListRs, @@ -9,6 +8,7 @@ import { IFaqUpdateRq, IFaqDeleteRq } from './faqState'; +import { MODAL_BODY, MODAL_HEADER } from '@src/configs/msgConst'; // 자주묻는 질문 목록 export const getFaqList = createAsyncThunk( @@ -31,11 +31,9 @@ export const getFaqList = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -61,11 +59,9 @@ export const setFaq = createAsyncThunk( dispatch(getFaqList(search)); } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -92,11 +88,9 @@ export const updateFaq = createAsyncThunk( dispatch(getFaqList(search)); } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -122,11 +116,9 @@ export const deleteFaq = createAsyncThunk( dispatch(getFaqList(search)); } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } diff --git a/src/_redux/features/customerService/qna/qnaThunk.ts b/src/_redux/features/customerService/qna/qnaThunk.ts index 6054e711..e95e2f1e 100644 --- a/src/_redux/features/customerService/qna/qnaThunk.ts +++ b/src/_redux/features/customerService/qna/qnaThunk.ts @@ -1,8 +1,7 @@ import { createAsyncThunk } from '@reduxjs/toolkit'; import qs from 'qs'; import axios from '../../../../modules/utils/customAxiosUtil'; -import { isError } from '../../comn/message/messageSlice'; -import { ERROR_MESSAGE, HOST } from '@src/configs/constants'; +import { openModal } from '../../comn/message/messageSlice'; import { IQnaAdminSearch, IQnaAdminListRs, @@ -15,6 +14,8 @@ import { IQnaUserDetailRs, IQnaUserUpdateRq } from './qnaState'; +import { MODAL_BODY, MODAL_HEADER } from '@src/configs/msgConst'; +import { QS_OPTION } from '@src/configs/constants'; // Q&A 관리자 문의 목록 조회 export const getAdminQnaList = createAsyncThunk( @@ -29,10 +30,7 @@ export const getAdminQnaList = createAsyncThunk( } }); - const queryString = qs.stringify(params, { - addQueryPrefix: true, - arrayFormat: 'repeat' - }); + const queryString = qs.stringify(params, QS_OPTION); const { data, @@ -48,11 +46,9 @@ export const getAdminQnaList = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -78,11 +74,9 @@ export const getAdminQnaDetail = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -109,11 +103,9 @@ export const setQnaAdminAnswer = createAsyncThunk( dispatch(getAdminQnaList(search)); } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -139,11 +131,9 @@ export const deleteQnaAdmin = createAsyncThunk( dispatch(getAdminQnaList({ category, anserStatus, createUserNm })); } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -162,10 +152,7 @@ export const getUserQnaList = createAsyncThunk( } }); - const queryString = qs.stringify(params, { - addQueryPrefix: true, - arrayFormat: 'repeat' - }); + const queryString = qs.stringify(params, QS_OPTION); const { data, errorCode }: { data: IQnaUserListRs[]; errorCode: string } = await axios.get(`api/cns/qna/user${queryString}`); @@ -177,11 +164,9 @@ export const getUserQnaList = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -212,11 +197,9 @@ export const setUserQna = createAsyncThunk( dispatch(getUserQnaList({ category: '', searchType: '', word: '' })); } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -238,11 +221,9 @@ export const getUserQnaDetail = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -273,11 +254,9 @@ export const updateUserQna = createAsyncThunk( dispatch(getUserQnaList({ category: '', searchType: '', word: '' })); } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -302,11 +281,9 @@ export const deleteQnaUser = createAsyncThunk( dispatch(getUserQnaList({ category: '', searchType: '', word: '' })); } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } diff --git a/src/_redux/features/dashboard/dashboardThunk.ts b/src/_redux/features/dashboard/dashboardThunk.ts index b5daba7b..9f2e8ad5 100644 --- a/src/_redux/features/dashboard/dashboardThunk.ts +++ b/src/_redux/features/dashboard/dashboardThunk.ts @@ -1,8 +1,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit'; import qs from 'qs'; import axios from '../../../modules/utils/customAxiosUtil'; -import { isError } from '../comn/message/messageSlice'; -import { ERROR_MESSAGE } from '@src/configs/constants'; +import { openModal } from '../comn/message/messageSlice'; +import { QS_OPTION } from '@src/configs/constants'; import { EDronStatus, IStcsDayListRs, @@ -11,16 +11,14 @@ import { IDronSituationRs, IDronOperationListRs } from './dashboardState'; +import { MODAL_BODY, MODAL_HEADER } from '@src/configs/msgConst'; // 일 별 비행횟수 통계 날짜 리스트 export const getStcsDayList = createAsyncThunk( 'dashboard/getStcsDayList', async (rq: string, thunkAPI) => { try { - const queryString = qs.stringify(rq, { - addQueryPrefix: true, - arrayFormat: 'repeat' - }); + const queryString = qs.stringify(rq, QS_OPTION); const { data, errorCode }: { data: IStcsDayListRs[]; errorCode: string } = await axios.get(`api/main/dash/stcs/day${queryString}`); @@ -32,11 +30,9 @@ export const getStcsDayList = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -48,10 +44,7 @@ export const getStcsAreaList = createAsyncThunk( 'dashboard/getStcsAreaList', async (rq: string, thunkAPI) => { try { - const queryString = qs.stringify(rq, { - addQueryPrefix: true, - arrayFormat: 'repeat' - }); + const queryString = qs.stringify(rq, QS_OPTION); const { data, @@ -67,11 +60,9 @@ export const getStcsAreaList = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -120,11 +111,9 @@ export const getAllDashboardData = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } @@ -150,11 +139,9 @@ export const getDronOperationList = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE, - errorMessage: '처리중 오류가 발생하였습니다', - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); } diff --git a/src/_redux/features/laanc/laancThunk.ts b/src/_redux/features/laanc/laancThunk.ts index ac1e8479..7484a69f 100644 --- a/src/_redux/features/laanc/laancThunk.ts +++ b/src/_redux/features/laanc/laancThunk.ts @@ -1,5 +1,4 @@ import axios from '../../../modules/utils/customAxiosUtil'; -import qs from 'qs'; import { IFlightPlanAreaDataRq, IFlightPlanDataRq, @@ -9,32 +8,23 @@ import { IweatherRq } from './laancState'; import { createAsyncThunk } from '@reduxjs/toolkit'; -import { isError, isMessage } from '../comn/message/messageSlice'; -import { - ERROR_MESSAGE, - DUPLATE_MESSAGE, - SAVE_MESSAGE, - DELETE_MESSAGE -} from '@src/configs/constants'; +import { openModal } from '../comn/message/messageSlice'; +import { MODAL_BODY, MODAL_HEADER } from '@src/configs/msgConst'; // laanc 승인 export const setApprovalLaancFlight = createAsyncThunk( 'laanc/setApprovalLaancFlight', async (data: IFlightPlanDataRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const res = await axios.post(`api/bas/laanc/plan/valid`, data); return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -42,20 +32,16 @@ export const setApprovalLaancFlight = createAsyncThunk( export const createLaancFlight = createAsyncThunk( 'laanc/createLaancFlight', async (data: IFlightPlanDataRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const res = await axios.post(`api/bas/laanc/plan/create`, data); return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -63,7 +49,6 @@ export const createLaancFlight = createAsyncThunk( export const getLaancSunList = createAsyncThunk( 'laanc/getLaancSunList', async (data: ILaancSunRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const res = await axios.get(`api/comn/sunriseset/coord/list`, { params: data @@ -71,14 +56,11 @@ export const getLaancSunList = createAsyncThunk( return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -86,22 +68,16 @@ export const getLaancSunList = createAsyncThunk( export const laancAprvList = createAsyncThunk( 'laanc/laancAprvList', async (data: ILaancAprvRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const res = await axios.get(`api/bas/laanc/aprv/list2`, { params: data }); return res.data; } catch (error) { - thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false - }) - ); - return rejectWithValue(error); + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error + }); } } ); @@ -109,20 +85,16 @@ export const laancAprvList = createAsyncThunk( export const getLaancDetail = createAsyncThunk( 'laanc/laancDetail', async (data: string, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const res = await axios.get(`api/bas/laanc/aprv/detail/${data}`); return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -130,20 +102,16 @@ export const getLaancDetail = createAsyncThunk( export const laancAltitudeData = createAsyncThunk( 'laanc/laancAltitudeData', async (data: IFlightPlanAreaDataRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const res = await axios.post(`api/bas/laanc/valid/elev`, data); return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -151,7 +119,6 @@ export const laancAltitudeData = createAsyncThunk( export const checkLaancValidArea = createAsyncThunk( 'laanc/checkLaancValidArea', async (data: IFlightPlanAreaDataRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const res = await axios.post( `api/bas/laanc/valid/duplicated/airspace`, @@ -160,14 +127,11 @@ export const checkLaancValidArea = createAsyncThunk( return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -175,20 +139,16 @@ export const checkLaancValidArea = createAsyncThunk( export const checkLaancTsQr = createAsyncThunk( 'laanc/checkLaancTsQr', async (data: string, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const res = await axios.get(`api/bas/laanc/ts/qr/${data}`); return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -197,7 +157,6 @@ export const checkLaancTsQr = createAsyncThunk( export const getWeatherData = createAsyncThunk( 'laanc/getWeatherData', async (rq: IweatherRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const { data } = await axios.get(`api/bas/flight/plan/api/weather`, { params: { @@ -208,14 +167,11 @@ export const getWeatherData = createAsyncThunk( return data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -224,20 +180,16 @@ export const getWeatherData = createAsyncThunk( export const AreaBufferList = createAsyncThunk( 'laanc/AreaBufferList', async (data: IFlightPlanAreaDataListRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const res = await axios.post(`api/bas/flight/plan/area/buffer`, data); return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -246,7 +198,6 @@ export const AreaBufferList = createAsyncThunk( export const flightScheduleList = createAsyncThunk( 'laanc/flightScheduleList', async (searchDate: any, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const res = await axios.get( `api/bas/flight/schedule?searchDate=${searchDate}` @@ -254,14 +205,11 @@ export const flightScheduleList = createAsyncThunk( return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -270,7 +218,6 @@ export const flightScheduleList = createAsyncThunk( export const getFlightSearchArea = createAsyncThunk( 'laanc/getFlightSearchArea', async (param: any, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const res = await axios.get( `api/bas/flight/plan/area/search?query=${param.query}` @@ -278,14 +225,11 @@ export const getFlightSearchArea = createAsyncThunk( return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); diff --git a/src/_redux/features/statistics/statisticsThunk.ts b/src/_redux/features/statistics/statisticsThunk.ts index 88fefbc4..ff592e5e 100644 --- a/src/_redux/features/statistics/statisticsThunk.ts +++ b/src/_redux/features/statistics/statisticsThunk.ts @@ -2,19 +2,14 @@ import axios from '../../../modules/utils/customAxiosUtil'; import qs from 'qs'; import { IStcsRq, IStcsSearchRq } from './statisticsState'; import { createAsyncThunk } from '@reduxjs/toolkit'; -import { isError, isMessage } from '../comn/message/messageSlice'; -import { - ERROR_MESSAGE, - DUPLATE_MESSAGE, - SAVE_MESSAGE, - DELETE_MESSAGE -} from '@src/configs/constants'; +import { openModal } from '../comn/message/messageSlice'; +import { MODAL_BODY, MODAL_HEADER } from '@src/configs/msgConst'; +import { QS_OPTION } from '@src/configs/constants'; // 비행 통계(총 비행시간, 총 비행 건수,총 비행거리) export const getFlightStatistics = createAsyncThunk( 'statistics/getFlightStatistics', async (rq: IStcsRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const { serviceType } = rq; const res = await axios.get( @@ -25,14 +20,11 @@ export const getFlightStatistics = createAsyncThunk( return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -41,7 +33,6 @@ export const getFlightStatistics = createAsyncThunk( export const getFlightSearch = createAsyncThunk( 'statistics/getFlightSearch', async (rq: IStcsSearchRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const { type } = rq; const params = {}; @@ -50,24 +41,18 @@ export const getFlightSearch = createAsyncThunk( params[`${i}`] = rq[i]; } }); - const queryString = qs.stringify(params, { - addQueryPrefix: true, - arrayFormat: 'repeat' - }); + const queryString = qs.stringify(params, QS_OPTION); const res = await axios.get( `api/main/statistics/flight/${type}${queryString}` ); return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -76,7 +61,6 @@ export const getFlightSearch = createAsyncThunk( export const getAbnormalStatistics = createAsyncThunk( 'statistics/getAbnormalStatistics', async (rq: IStcsRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const { serviceType } = rq; const res = await axios.get( @@ -87,14 +71,11 @@ export const getAbnormalStatistics = createAsyncThunk( return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -103,7 +84,6 @@ export const getAbnormalStatistics = createAsyncThunk( export const getAbnormalSearch = createAsyncThunk( 'statistics/getAbnormalSearch', async (rq: IStcsSearchRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const { type } = rq; const params = {}; @@ -112,24 +92,18 @@ export const getAbnormalSearch = createAsyncThunk( params[`${i}`] = rq[i]; } }); - const queryString = qs.stringify(params, { - addQueryPrefix: true, - arrayFormat: 'repeat' - }); + const queryString = qs.stringify(params, QS_OPTION); const res = await axios.get( `api/main/statistics/warn/${type}${queryString}` ); return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -138,7 +112,6 @@ export const getAbnormalSearch = createAsyncThunk( export const getResultStatistics = createAsyncThunk( 'statistics/getResultStatistics', async (rq: IStcsRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const { serviceType } = rq; const res = await axios.get( @@ -149,14 +122,11 @@ export const getResultStatistics = createAsyncThunk( return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); @@ -165,7 +135,6 @@ export const getResultStatistics = createAsyncThunk( export const getResultSearch = createAsyncThunk( 'statistics/getResultSearch', async (rq: IStcsSearchRq, thunkAPI) => { - const { rejectWithValue } = thunkAPI; try { const { type } = rq; const params = {}; @@ -174,24 +143,18 @@ export const getResultSearch = createAsyncThunk( params[`${i}`] = rq[i]; } }); - const queryString = qs.stringify(params, { - addQueryPrefix: true, - arrayFormat: 'repeat' - }); + const queryString = qs.stringify(params, QS_OPTION); const res = await axios.get( `api/main/statistics/flight/result/${type}${queryString}` ); return res.data; } catch (error) { thunkAPI.dispatch( - isError({ - errorCode: ERROR_MESSAGE.code, - errorMessage: ERROR_MESSAGE.message, - isHistoryBack: false, - isRefresh: false + openModal({ + header: MODAL_HEADER.error, + body: MODAL_BODY.error }) ); - return rejectWithValue(error); } } ); diff --git a/src/configs/msgConst.ts b/src/configs/msgConst.ts index 7bd04915..927c4ecd 100644 --- a/src/configs/msgConst.ts +++ b/src/configs/msgConst.ts @@ -9,7 +9,7 @@ export const MODAL_CRTFYHP = { }; // 공통 모달 제목 -export const MODAL_TITLE = { +export const MODAL_HEADER = { error: '오류', confirm: '확인', valid: '필수값 입력 오류', @@ -17,7 +17,7 @@ export const MODAL_TITLE = { }; // 공통 모달 메시지 -export const MODAL_DESC = { +export const MODAL_BODY = { error: '처리중 오류가 발생하였습니다.', duplicate: '이미 존재합니다.', save: '저장을 완료하였습니다.',