Merge branch 'Team-Coverflow:develop' into feat/answer

kmin-jeong · web-flow · commit 410dffde200e · 2024-05-30T23:03:53.000+09:00
diff --git a/src/components/pages/postPage/questionDetailPage.tsx b/src/components/pages/postPage/questionDetailPage.tsx
@@ -307,7 +307,7 @@ function QuestionDetailPage() {
 
       if (response.error) {
         if (response.status === 409) {
-          showErrorToast('답변이 달린 게시물은 삭제할 수 없습니다. ');
+          showErrorToast('답변이 달린 게시물은 삭제할 수 없습니다.');
           return;
         }
         throw new Error('요청 처리 중 오류가 발생했습니다.');
@@ -412,7 +412,6 @@ function QuestionDetailPage() {
               <li onClick={handleClickEdit} className="dropdown-item-edit">
                 수정
               </li>
-
               <li onClick={handleClickDelete} className="dropdown-item-delete">
                 삭제
               </li>
diff --git a/src/components/pages/searchPage/companyInfoPage.tsx b/src/components/pages/searchPage/companyInfoPage.tsx
@@ -189,6 +189,7 @@ function CompanyInfoPage() {
         if (data) {
           setCompanyData(data.data);
           setTotalPages(data.data.totalPages);
+
           setQuestionsCount(data.data.questionCount);
         } else {
           throw new Error('데이터가 존재하지 않습니다.');
@@ -324,6 +325,7 @@ function CompanyInfoPage() {
                   reward={question.reward}
                   companyData={companyData}
                   viewCount={question.questionViewCount}
+                  questionCategory={question.questionCategory}
                 />
               ))}
             </QuestionList>
@@ -343,6 +345,7 @@ function CompanyInfoPage() {
                   reward={question.reward}
                   companyData={companyData}
                   viewCount={question.questionViewCount}
+                  questionCategory={question.questionCategory}
                 />
               ))}
             </QuestionList>
diff --git a/src/components/ui/question/question.tsx b/src/components/ui/question/question.tsx
@@ -78,8 +78,9 @@ interface QuestionModulesProps {
   createAt: string;
   questionContent: string;
   reward: number;
-  companyData: CompanInfoProps;
+  companyData?: CompanInfoProps;
   viewCount: number;
+  questionCategory?: string;
 }
 
 function QuestionModule({
@@ -91,8 +92,8 @@ function QuestionModule({
   createAt,
   reward,
   questionerTag,
-  companyData,
   viewCount,
+  questionCategory,
 }: QuestionModulesProps) {
   const navigate = useNavigate();
 
@@ -130,11 +131,7 @@ function QuestionModule({
                 {truncateTitle(questionTitle)}
               </div>
             </div>
-            <div className="category-select-style">
-              {companyData?.questions?.map(
-                (question) => question.questionCategory,
-              )}
-            </div>
+            <div className="category-select-style">{questionCategory}</div>
           </div>
 
           <div className="view-container">
