Browse Source

명칭 변경, 줄바꿈 함수 수정

pull/2/head
hhjk00 11 months ago
parent
commit
0854e43c8c
  1. 10
      src/containers/cstmrService/inquiry/UserInquiryContainer.js
  2. 23
      src/modules/cstmrService/inquiry/action/index.ts
  3. 8
      src/modules/cstmrService/inquiry/apis/index.ts
  4. 2
      src/modules/cstmrService/inquiry/model/index.ts
  5. 12
      src/modules/cstmrService/inquiry/sagas/index.ts

10
src/containers/cstmrService/inquiry/UserInquiryContainer.js

@ -50,12 +50,14 @@ export default function UserInquiryContainer({ memberName }) {
if (detail) setInquiryForm({ ...detail }); if (detail) setInquiryForm({ ...detail });
}, [detail]); }, [detail]);
// 줄바꿈 문자(\r\n)을 <br>로 변환 // 줄바꿈 문자 <br>로 변환
const textLineBreaks = text => { const textLineBreaks = text => {
return text.split('\r\n').map((line, index) => ( const lines = text.split(/\r?\n/);
return lines.map((line, index) => (
<Fragment key={index}> <Fragment key={index}>
{line} {line}
{index < text.split('\r\n').length - 1 && <br />} {index < lines.length - 1 && <br />}
</Fragment> </Fragment>
)); ));
}; };
@ -202,7 +204,7 @@ export default function UserInquiryContainer({ memberName }) {
dispatch(Actions.USER_INQUIRY.request(form)); dispatch(Actions.USER_INQUIRY.request(form));
} else if (type === 'edit') { } else if (type === 'edit') {
dispatch( dispatch(
Actions.USER_INQUIRY_EDIT.request({ Actions.USER_INQUIRY_UPDATE.request({
qnaSno, qnaSno,
category, category,
contact, contact,

23
src/modules/cstmrService/inquiry/action/index.ts

@ -10,7 +10,7 @@ import {
IQnaUserList, IQnaUserList,
IQnaUserSearch, IQnaUserSearch,
IQnaUserInquiry, IQnaUserInquiry,
IQnaUserInquiryEdit IQnaUserInquiryUpdate
} from '../model'; } 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_FAILURE = 'cstmrService/qna/USER_INQUIRY_FAILURE';
// 사용자 문의 수정 // 사용자 문의 수정
const USER_INQUIRY_EDIT_REQUEST = 'cstmrService/qna/USER_INQUIRY_EDIT_REQUEST'; const USER_INQUIRY_UPDATE_REQUEST =
const USER_INQUIRY_EDIT_SUCCESS = 'cstmrService/qna/USER_INQUIRY_EDIT_SUCCESS'; 'cstmrService/qna/USER_INQUIRY_UPDATE_REQUEST';
const USER_INQUIRY_EDIT_FAILURE = 'cstmrService/qna/USER_INQUIRY_EDIT_FAILURE'; 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( export const ADMIN_LIST = createAsyncAction(
ADMIN_LIST_REQUEST, ADMIN_LIST_REQUEST,
@ -110,11 +113,11 @@ export const USER_INQUIRY = createAsyncAction(
USER_INQUIRY_FAILURE USER_INQUIRY_FAILURE
)<IQnaUserInquiry, {}, AxiosError>(); )<IQnaUserInquiry, {}, AxiosError>();
export const USER_INQUIRY_EDIT = createAsyncAction( export const USER_INQUIRY_UPDATE = createAsyncAction(
USER_INQUIRY_EDIT_REQUEST, USER_INQUIRY_UPDATE_REQUEST,
USER_INQUIRY_EDIT_SUCCESS, USER_INQUIRY_UPDATE_SUCCESS,
USER_INQUIRY_EDIT_FAILURE USER_INQUIRY_UPDATE_FAILURE
)<IQnaUserInquiryEdit, {}, AxiosError>(); )<IQnaUserInquiryUpdate, {}, AxiosError>();
const actions = { const actions = {
ADMIN_LIST, ADMIN_LIST,
@ -125,7 +128,7 @@ const actions = {
ADMIN_DELETE, ADMIN_DELETE,
USER_LIST, USER_LIST,
USER_INQUIRY, USER_INQUIRY,
USER_INQUIRY_EDIT USER_INQUIRY_UPDATE
}; };
export type QnaAction = ActionType<typeof actions>; export type QnaAction = ActionType<typeof actions>;

8
src/modules/cstmrService/inquiry/apis/index.ts

@ -1,6 +1,10 @@
import axios from '../../../utils/customAxiosUtil'; import axios from '../../../utils/customAxiosUtil';
import qs from 'qs'; import qs from 'qs';
import { IQnaUserInquiry, IQnaUserInquiryEdit, IQnaUserSearch } from '../model'; import {
IQnaUserInquiry,
IQnaUserInquiryUpdate,
IQnaUserSearch
} from '../model';
export const qnaAPI = { export const qnaAPI = {
adminList: async (data: { adminList: async (data: {
@ -69,7 +73,7 @@ export const qnaAPI = {
} }
}); });
}, },
userInquiryEdit: async (data: IQnaUserInquiryEdit) => { userInquiryUpdate: async (data: IQnaUserInquiryUpdate) => {
const params = {}; const params = {};
Object.keys(data).forEach(i => { Object.keys(data).forEach(i => {
if (data[i]) { if (data[i]) {

2
src/modules/cstmrService/inquiry/model/index.ts

@ -96,7 +96,7 @@ export interface IQnaUserInquiry {
content: string; content: string;
} }
export interface IQnaUserInquiryEdit extends IQnaUserInquiry { export interface IQnaUserInquiryUpdate extends IQnaUserInquiry {
qnaSno: number; qnaSno: number;
} }

12
src/modules/cstmrService/inquiry/sagas/index.ts

@ -228,12 +228,12 @@ function* userInquirySaga(
} }
} }
function* userInquiryEditSaga( function* userInquiryUpdateSaga(
action: ActionType<typeof Actions.USER_INQUIRY_EDIT.request> action: ActionType<typeof Actions.USER_INQUIRY_UPDATE.request>
) { ) {
try { try {
const payload = action.payload; const payload = action.payload;
const res = yield call(Apis.qnaAPI.userInquiryEdit, payload); const res = yield call(Apis.qnaAPI.userInquiryUpdate, payload);
const { errorCode, data } = res; const { errorCode, data } = res;
if (errorCode) { if (errorCode) {
@ -261,9 +261,9 @@ function* userInquiryEditSaga(
yield put( yield put(
Actions.USER_LIST.request({ category: '', searchType: '', word: '' }) 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) { } 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.ADMIN_DELETE.request, adminDeleteSaga);
yield takeEvery(Actions.USER_LIST.request, userListSaga); yield takeEvery(Actions.USER_LIST.request, userListSaga);
yield takeEvery(Actions.USER_INQUIRY.request, userInquirySaga); yield takeEvery(Actions.USER_INQUIRY.request, userInquirySaga);
yield takeEvery(Actions.USER_INQUIRY_EDIT.request, userInquiryEditSaga); yield takeEvery(Actions.USER_INQUIRY_UPDATE.request, userInquiryUpdateSaga);
} }

Loading…
Cancel
Save