diff --git a/.env.localhost b/.env.localhost index 966e366..6224cae 100644 --- a/.env.localhost +++ b/.env.localhost @@ -8,7 +8,7 @@ NEXT_PUBLIC_API_URL=http://localhost:3000 NEXT_PUBLIC_QSP_API_URL=http://1.248.227.176:8120 #1:1문의 api -NEXT_PUBLIC_INQUIRY_API_URL=http://1.248.227.176:38080 +NEXT_PUBLIC_INQUIRY_API_URL=http://172.23.4.129:8110 #QPARTNER 로그인 api DB_HOST=202.218.61.226 diff --git a/src/components/inquiry/list/ListTable.tsx b/src/components/inquiry/list/ListTable.tsx index f7d874b..8d7878e 100644 --- a/src/components/inquiry/list/ListTable.tsx +++ b/src/components/inquiry/list/ListTable.tsx @@ -25,7 +25,7 @@ export default function ListTable() { const router = useRouter() const pathname = usePathname() - const { inquiryList } = useInquiry() + const { inquiryList, isLoadingInquiryList } = useInquiry() const { inquiryListRequest, setInquiryListRequest, reset } = useInquiryFilterStore() const [offset, setOffset] = useState(inquiryListRequest.startRow) @@ -34,7 +34,6 @@ export default function ListTable() { const [heldInquiryList, setHeldInquiryList] = useState([]) const { session } = useSessionStore() - useEffect(() => { setInquiryListRequest({ ...inquiryListRequest, startRow: 1, endRow: 10 }) setHeldInquiryList([]) @@ -43,15 +42,13 @@ export default function ListTable() { }, [pathname]) useEffect(() => { - if (!session.isLoggedIn || !inquiryList) return + if (!session.isLoggedIn || isLoadingInquiryList) return if (session.isLoggedIn) { setInquiryListRequest({ ...inquiryListRequest, storeId: session.storeId ?? '', loginId: session.userId ?? '' }) } if (inquiryList.length > 0 && inquiryList[0].totCnt > 0) { if (inquiryListRequest.startRow > 1) { - const isDuplicate = inquiryList.every((newItem) => heldInquiryList.some((existingItem) => existingItem.qnaNo === newItem.qnaNo)) - if (isDuplicate) return - setHeldInquiryList((prev) => [...prev, ...inquiryList]) + setHeldInquiryList([...heldInquiryList, ...inquiryList]) } else { setHeldInquiryList(inquiryList) } @@ -60,7 +57,7 @@ export default function ListTable() { setHeldInquiryList([]) setHasMore(false) } - }, [session, inquiryList, inquiryListRequest.startRow]) + }, [session, inquiryList, inquiryListRequest.startRow, isLoadingInquiryList]) const handleMyInquiry = () => { setInquiryListRequest({ ...inquiryListRequest, schRegId: inquiryListRequest.schRegId ? null : session.userId }) diff --git a/src/hooks/useInquiry.ts b/src/hooks/useInquiry.ts index 3806ec1..6575613 100644 --- a/src/hooks/useInquiry.ts +++ b/src/hooks/useInquiry.ts @@ -36,12 +36,12 @@ export function useInquiry( return [] } }, - placeholderData: (previousData) => previousData, + enabled: !!inquiryListRequest, }) const inquriyListData = useMemo(() => { if (isLoadingInquiryList) { - return { inquiryList: inquiryList ?? [] } + return { inquiryList: [] } } return { inquiryList: inquiryList ?? [],