diff --git a/src/containers/cstmrService/inquiry/UserInquiryContainer.js b/src/containers/cstmrService/inquiry/UserInquiryContainer.js
index 207a4d3..2b7000b 100644
--- a/src/containers/cstmrService/inquiry/UserInquiryContainer.js
+++ b/src/containers/cstmrService/inquiry/UserInquiryContainer.js
@@ -50,12 +50,14 @@ export default function UserInquiryContainer({ memberName }) {
if (detail) setInquiryForm({ ...detail });
}, [detail]);
- // 줄바꿈 문자(\r\n)을
로 변환
+ // 줄바꿈 문자를
로 변환
const textLineBreaks = text => {
- return text.split('\r\n').map((line, index) => (
+ const lines = text.split(/\r?\n/);
+
+ return lines.map((line, index) => (
{line}
- {index < text.split('\r\n').length - 1 &&
}
+ {index < lines.length - 1 &&
}
));
};
@@ -202,7 +204,7 @@ export default function UserInquiryContainer({ memberName }) {
dispatch(Actions.USER_INQUIRY.request(form));
} else if (type === 'edit') {
dispatch(
- Actions.USER_INQUIRY_EDIT.request({
+ Actions.USER_INQUIRY_UPDATE.request({
qnaSno,
category,
contact,
diff --git a/src/modules/cstmrService/inquiry/action/index.ts b/src/modules/cstmrService/inquiry/action/index.ts
index 52fa4e0..90455bc 100644
--- a/src/modules/cstmrService/inquiry/action/index.ts
+++ b/src/modules/cstmrService/inquiry/action/index.ts
@@ -10,7 +10,7 @@ import {
IQnaUserList,
IQnaUserSearch,
IQnaUserInquiry,
- IQnaUserInquiryEdit
+ IQnaUserInquiryUpdate
} from '../model';
// 관리자 목록 조회
@@ -52,9 +52,12 @@ const USER_INQUIRY_SUCCESS = 'cstmrService/qna/USER_INQUIRY_SUCCESS';
const USER_INQUIRY_FAILURE = 'cstmrService/qna/USER_INQUIRY_FAILURE';
// 사용자 문의 수정
-const USER_INQUIRY_EDIT_REQUEST = 'cstmrService/qna/USER_INQUIRY_EDIT_REQUEST';
-const USER_INQUIRY_EDIT_SUCCESS = 'cstmrService/qna/USER_INQUIRY_EDIT_SUCCESS';
-const USER_INQUIRY_EDIT_FAILURE = 'cstmrService/qna/USER_INQUIRY_EDIT_FAILURE';
+const USER_INQUIRY_UPDATE_REQUEST =
+ 'cstmrService/qna/USER_INQUIRY_UPDATE_REQUEST';
+const USER_INQUIRY_UPDATE_SUCCESS =
+ 'cstmrService/qna/USER_INQUIRY_UPDATE_SUCCESS';
+const USER_INQUIRY_UPDATE_FAILURE =
+ 'cstmrService/qna/USER_INQUIRY_UPDATE_FAILURE';
export const ADMIN_LIST = createAsyncAction(
ADMIN_LIST_REQUEST,
@@ -110,11 +113,11 @@ export const USER_INQUIRY = createAsyncAction(
USER_INQUIRY_FAILURE
)();
-export const USER_INQUIRY_EDIT = createAsyncAction(
- USER_INQUIRY_EDIT_REQUEST,
- USER_INQUIRY_EDIT_SUCCESS,
- USER_INQUIRY_EDIT_FAILURE
-)();
+export const USER_INQUIRY_UPDATE = createAsyncAction(
+ USER_INQUIRY_UPDATE_REQUEST,
+ USER_INQUIRY_UPDATE_SUCCESS,
+ USER_INQUIRY_UPDATE_FAILURE
+)();
const actions = {
ADMIN_LIST,
@@ -125,7 +128,7 @@ const actions = {
ADMIN_DELETE,
USER_LIST,
USER_INQUIRY,
- USER_INQUIRY_EDIT
+ USER_INQUIRY_UPDATE
};
export type QnaAction = ActionType;
diff --git a/src/modules/cstmrService/inquiry/apis/index.ts b/src/modules/cstmrService/inquiry/apis/index.ts
index 41b52b7..a337e7d 100644
--- a/src/modules/cstmrService/inquiry/apis/index.ts
+++ b/src/modules/cstmrService/inquiry/apis/index.ts
@@ -1,6 +1,10 @@
import axios from '../../../utils/customAxiosUtil';
import qs from 'qs';
-import { IQnaUserInquiry, IQnaUserInquiryEdit, IQnaUserSearch } from '../model';
+import {
+ IQnaUserInquiry,
+ IQnaUserInquiryUpdate,
+ IQnaUserSearch
+} from '../model';
export const qnaAPI = {
adminList: async (data: {
@@ -69,7 +73,7 @@ export const qnaAPI = {
}
});
},
- userInquiryEdit: async (data: IQnaUserInquiryEdit) => {
+ userInquiryUpdate: async (data: IQnaUserInquiryUpdate) => {
const params = {};
Object.keys(data).forEach(i => {
if (data[i]) {
diff --git a/src/modules/cstmrService/inquiry/model/index.ts b/src/modules/cstmrService/inquiry/model/index.ts
index 62a1dd9..04e0ea0 100644
--- a/src/modules/cstmrService/inquiry/model/index.ts
+++ b/src/modules/cstmrService/inquiry/model/index.ts
@@ -96,7 +96,7 @@ export interface IQnaUserInquiry {
content: string;
}
-export interface IQnaUserInquiryEdit extends IQnaUserInquiry {
+export interface IQnaUserInquiryUpdate extends IQnaUserInquiry {
qnaSno: number;
}
diff --git a/src/modules/cstmrService/inquiry/sagas/index.ts b/src/modules/cstmrService/inquiry/sagas/index.ts
index 25f790b..d2f0456 100644
--- a/src/modules/cstmrService/inquiry/sagas/index.ts
+++ b/src/modules/cstmrService/inquiry/sagas/index.ts
@@ -228,12 +228,12 @@ function* userInquirySaga(
}
}
-function* userInquiryEditSaga(
- action: ActionType
+function* userInquiryUpdateSaga(
+ action: ActionType
) {
try {
const payload = action.payload;
- const res = yield call(Apis.qnaAPI.userInquiryEdit, payload);
+ const res = yield call(Apis.qnaAPI.userInquiryUpdate, payload);
const { errorCode, data } = res;
if (errorCode) {
@@ -261,9 +261,9 @@ function* userInquiryEditSaga(
yield put(
Actions.USER_LIST.request({ category: '', searchType: '', word: '' })
);
- // yield put(Actions.USER_INQUIRY_EDIT.success(data));
+ // yield put(Actions.USER_INQUIRY_UPDATE.success(data));
} catch (error) {
- yield put(Actions.USER_INQUIRY_EDIT.failure(error));
+ yield put(Actions.USER_INQUIRY_UPDATE.failure(error));
}
}
@@ -275,5 +275,5 @@ export function* qnaSaga() {
yield takeEvery(Actions.ADMIN_DELETE.request, adminDeleteSaga);
yield takeEvery(Actions.USER_LIST.request, userListSaga);
yield takeEvery(Actions.USER_INQUIRY.request, userInquirySaga);
- yield takeEvery(Actions.USER_INQUIRY_EDIT.request, userInquiryEditSaga);
+ yield takeEvery(Actions.USER_INQUIRY_UPDATE.request, userInquiryUpdateSaga);
}