diff --git a/src/components/ui/common/Header.tsx b/src/components/ui/common/Header.tsx
index 3c146cb..dc741de 100644
--- a/src/components/ui/common/Header.tsx
+++ b/src/components/ui/common/Header.tsx
@@ -11,8 +11,6 @@ import { useSideNavState } from '@/store/sideNavState'
import { useHeaderStore } from '@/store/header'
import { useSessionStore } from '@/store/session'
import { usePopupController } from '@/store/popupController'
-import { useSurveyFilterStore } from '@/store/surveyFilterStore'
-import { useInquiryFilterStore } from '@/store/inquiryFilterStore'
import { useTitle } from '@/hooks/useTitle'
import { useAxios } from '@/hooks/useAxios'
@@ -32,9 +30,6 @@ export default function Header() {
const popupController = usePopupController()
- const { setIsMySurvey } = useSurveyFilterStore()
- const { setInquiryListRequest, inquiryListRequest } = useInquiryFilterStore()
-
if (pathname === '/login') {
return null
}
@@ -88,8 +83,7 @@ export default function Header() {
{
- setIsMySurvey(session?.userId)
- router.push('/survey-sale')
+ router.push('/survey-sale?isMySurvey=true')
setSideNavIsOpen(false)
}}
>
@@ -101,8 +95,7 @@ export default function Header() {
{
- setInquiryListRequest({ ...inquiryListRequest, schRegId: session?.userId })
- router.push('/inquiry/list')
+ router.push('/inquiry/list?isMyInquiry=true')
setSideNavIsOpen(false)
}}
>
diff --git a/src/hooks/useAlertMsg.ts b/src/hooks/useAlertMsg.ts
index d0e82b9..43b7313 100644
--- a/src/hooks/useAlertMsg.ts
+++ b/src/hooks/useAlertMsg.ts
@@ -28,8 +28,8 @@ export const SUCCESS_MESSAGE = {
* @description 확인 메세지 상수 객체
*/
export const CONFIRM_MESSAGE = {
- /** 제출 확인 - "제출하시겠습니까?" */
- SUBMIT_CONFIRM: '提出しますか?',
+ /** 제출 확인 - "전송하시겠습니까? 전송 후에는 수정/삭제 할 수 없습니다." */
+ SUBMIT_CONFIRM: '送信しますか? 送信後は変更・修正することはできません。',
/** 저장 확인 - "저장하시겠습니까?" */
SAVE_CONFIRM: '保存しますか?',
@@ -56,7 +56,7 @@ export const WARNING_MESSAGE = {
EMAIL_PREFIX_IS_INVALID: '有効なメールアドレスを入力してください。',
/** 최소값 오류 - "2자 이상 입력하세요" */
- KEYWORD_MINIMUM_LENGTH: '2文字以上入力してください',
+ KEYWORD_MINIMUM_LENGTH: 'タイトルを入力してください(2文字以上)。',
/** 최대값 오류 - "30자 이내로 입력하세요" */
KEYWORD_MAX_LENGTH: '30文字以内で入力してください',
diff --git a/src/hooks/useInquiry.ts b/src/hooks/useInquiry.ts
index 3533084..6525638 100644
--- a/src/hooks/useInquiry.ts
+++ b/src/hooks/useInquiry.ts
@@ -35,7 +35,7 @@ export function useInquiry(
commonCodeList: CommonCode[]
} {
const queryClient = useQueryClient()
- const { inquiryListRequest, offset } = useInquiryFilterStore()
+ const { inquiryListRequest, offset, isMyInquiry } = useInquiryFilterStore()
const { axiosInstance } = useAxios()
const router = useRouter()
const { showErrorAlert } = useAlertMsg()
@@ -104,7 +104,7 @@ export function useInquiry(
* @returns {boolean} isLoading - 문의사항 목록 로딩 상태
*/
const { data: inquiryList, isLoading: isLoadingInquiryList } = useQuery({
- queryKey: ['inquiryList', inquiryListRequest, offset],
+ queryKey: ['inquiryList', inquiryListRequest.loginId, inquiryListRequest.schTitle, inquiryListRequest.schAnswerYn, offset, isMyInquiry],
queryFn: async () => {
const isListQuery = true
const shouldThrowError = false
@@ -112,7 +112,7 @@ export function useInquiry(
const resp = await tryFunction(
() =>
axiosInstance(null).get<{ data: InquiryList[] }>(`/api/qna/list`, {
- params: { inquiryListRequest, startRow: offset, endRow: offset + 9 },
+ params: { inquiryListRequest, startRow: offset, endRow: offset + 9, schRegId: isMyInquiry },
}),
isListQuery,
shouldThrowError,
diff --git a/src/hooks/useSurvey.ts b/src/hooks/useSurvey.ts
index c76ce56..6de1d11 100644
--- a/src/hooks/useSurvey.ts
+++ b/src/hooks/useSurvey.ts
@@ -253,7 +253,6 @@ export function useSurvey(
false,
true,
)
- console.log(resp)
const blob = await resp.blob()
if (!blob || blob.size === 0) {
@@ -264,7 +263,7 @@ export function useSurvey(
const url = window.URL.createObjectURL(blob)
const a = document.createElement('a')
a.href = url
- a.download = `${filename}.pdf`
+ a.download = `${filename}`
a.click()
window.URL.revokeObjectURL(url)
diff --git a/src/store/inquiryFilterStore.ts b/src/store/inquiryFilterStore.ts
index 6a3f676..47fea1e 100644
--- a/src/store/inquiryFilterStore.ts
+++ b/src/store/inquiryFilterStore.ts
@@ -10,6 +10,8 @@ type InquiryFilterState = {
reset: () => void
offset: number
setOffset: (offset: number) => void
+ isMyInquiry: string | null
+ setIsMyInquiry: (isMyInquiry: string | null) => void
}
/**
@@ -28,7 +30,6 @@ export const useInquiryFilterStore = create((set) => ({
storeId: '',
siteTpCd: 'QC',
schTitle: null,
- schRegId: null,
schFromDt: null,
schToDt: null,
schAnswerYn: null,
@@ -42,15 +43,17 @@ export const useInquiryFilterStore = create((set) => ({
langCd: 'JA',
storeId: '',
siteTpCd: 'QC',
- schTitle: '',
- schRegId: '',
- schFromDt: '',
- schToDt: '',
+ schTitle: null,
+ schFromDt: null,
+ schToDt: null,
schAnswerYn: null,
loginId: '',
},
offset: 1,
+ isMyInquiry: null,
}),
offset: 1,
setOffset: (offset) => set({ offset }),
+ isMyInquiry: null,
+ setIsMyInquiry: (isMyInquiry) => set({ isMyInquiry }),
}))
diff --git a/src/types/Inquiry.ts b/src/types/Inquiry.ts
index 646cce7..ee2cfe9 100644
--- a/src/types/Inquiry.ts
+++ b/src/types/Inquiry.ts
@@ -12,8 +12,6 @@ export type InquiryListRequest = {
siteTpCd: string
/* 검색 제목 */
schTitle: string | null
- /* 검색 등록자 ID */
- schRegId: string | null
/* 검색 시작 일자 */
schFromDt: string | null
/* 검색 종료 일자 */
diff --git a/src/types/Survey.ts b/src/types/Survey.ts
index 8cc8d55..e45ccd3 100644
--- a/src/types/Survey.ts
+++ b/src/types/Survey.ts
@@ -324,7 +324,6 @@ export type SurveySearchParams = {
builderId?: string | null
}
-
type RadioEtcKeys =
| 'structureOrder'
| 'houseStructure'