프로덕션 반영을 위해 머지합니다. (#176)

* fix: 관리자 심사현황/결과 테이블 단계 필터 수정단계 삭제 * fix: 테이블 필터 선택시 1 페이지로 돌아가도록 수정 * fix: textarea css 속성 변경
SystemConsultantGroup · Jul 4, 2024 · 875817a · 875817a
1 parent bed4414
commit 875817a
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 4 deletions.
diff --git a/src/components/common/rows/TextAreaRow/TextAreaRow.module.css b/src/components/common/rows/TextAreaRow/TextAreaRow.module.css
@@ -12,6 +12,7 @@
 
 .contentInput {
   height: 100%;
+  white-space: pre-wrap;
 }
 
 .wrapper {

diff --git a/src/components/pages/lists/ProfReviewListSection/ProfReviewListSection.tsx b/src/components/pages/lists/ProfReviewListSection/ProfReviewListSection.tsx
@@ -88,6 +88,7 @@ function ProfReviewListSection({ isFinal }: Props) {
       [name]: value === "" ? undefined : value,
       pageNumber: REFRESH_DEFAULT_PAGE_NUMBER,
     })) as any);
+    setPageNumber(REFRESH_DEFAULT_PAGE_NUMBER);
   };
 
   useEffect(() => {

diff --git a/src/components/pages/lists/ProfRevisionListSection/ProfRevisionListSection.tsx b/src/components/pages/lists/ProfRevisionListSection/ProfRevisionListSection.tsx
@@ -54,6 +54,7 @@ function ProfRevisionListSection() {
       [name]: value === "" ? undefined : value,
       pageNumber: REFRESH_DEFAULT_PAGE_NUMBER,
     })) as any);
+    setPageNumber(REFRESH_DEFAULT_PAGE_NUMBER);
   };
 
   useEffect(() => {

diff --git a/src/components/pages/lists/admin/AchievementListSection/AchievementListSection.tsx b/src/components/pages/lists/admin/AchievementListSection/AchievementListSection.tsx
@@ -70,6 +70,7 @@ function AchievementListSection() {
       [name]: value === "" ? undefined : value,
       pageNumber: REFRESH_DEFAULT_PAGE_NUMBER,
     })) as any);
+    setPageNumber(REFRESH_DEFAULT_PAGE_NUMBER);
   };
 
   // Todo: 파일명 및 필터 저장 방식 논의
@@ -222,7 +223,11 @@ function AchievementListSection() {
         ))}
       </Table>
       <Center>
-        <Pagination total={1} />
+        <Pagination
+          value={pageNumber}
+          onChange={setPageNumber}
+          total={pageData ? pageData?.totalPages : 1}
+        />
       </Center>
     </Stack>
   );

diff --git a/src/components/pages/lists/admin/ProfessorListSection/ProfessorListSection.tsx b/src/components/pages/lists/admin/ProfessorListSection/ProfessorListSection.tsx
@@ -90,6 +90,7 @@ function ProfessorListSection() {
       [name]: value === "" ? undefined : value,
       pageNumber: REFRESH_DEFAULT_PAGE_NUMBER,
     })) as any);
+    setPageNumber(REFRESH_DEFAULT_PAGE_NUMBER);
   };
 
   useEffect(() => {

diff --git a/src/components/pages/lists/admin/ReviewListSection/ReviewListSection.tsx b/src/components/pages/lists/admin/ReviewListSection/ReviewListSection.tsx
@@ -90,6 +90,7 @@ function ReviewListSection() {
       [name]: value === "" ? undefined : value,
       pageNumber: REFRESH_DEFAULT_PAGE_NUMBER,
     })) as any);
+    setPageNumber(REFRESH_DEFAULT_PAGE_NUMBER);
   };
 
   useEffect(() => {
@@ -155,7 +156,7 @@ function ReviewListSection() {
               data={[
                 { label: "예심", value: "PRELIMINARY" },
                 { label: "본심", value: "MAIN" },
-                { label: "수정 단계", value: "REVISION" },
+                // { label: "수정 단계", value: "REVISION" },
               ]}
             />
           </Table.Data>

diff --git a/src/components/pages/lists/admin/ReviewResultListSection/ReviewResultListSection.tsx b/src/components/pages/lists/admin/ReviewResultListSection/ReviewResultListSection.tsx
@@ -13,7 +13,7 @@ import { useRouter } from "next/navigation";
 import { ChangeEvent, useEffect, useState } from "react";
 import { ActionIcon, Button, Center, Group, Popover, Select, Skeleton, Stack } from "@mantine/core";
 import { SectionHeader } from "@/components/common/SectionHeader";
-import { IconDownload } from "@tabler/icons-react";
+import { IconDownload, IconRotate } from "@tabler/icons-react";
 import { Table } from "@/components/common/Table";
 import Pagination from "@/components/common/Pagination";
 import { DepartmentSelect } from "@/components/common/selects/DepartmentSelect";
@@ -101,6 +101,7 @@ function ReviewResultListSection() {
       [name]: value === "" ? undefined : value,
       pageNumber: REFRESH_DEFAULT_PAGE_NUMBER,
     })) as any);
+    setPageNumber(REFRESH_DEFAULT_PAGE_NUMBER);
   };
 
   useEffect(() => {
@@ -181,7 +182,7 @@ function ReviewResultListSection() {
               data={[
                 { label: "예심", value: "PRELIMINARY" },
                 { label: "본심", value: "MAIN" },
-                { label: "수정 단계", value: "REVISION" },
+                // { label: "수정 단계", value: "REVISION" },
               ]}
             />
           </Table.Data>

diff --git a/src/components/pages/lists/admin/StudentListSection/StudentListSection.tsx b/src/components/pages/lists/admin/StudentListSection/StudentListSection.tsx
@@ -90,6 +90,7 @@ function StudentListSection() {
       [name]: value === "" ? undefined : value,
       pageNumber: REFRESH_DEFAULT_PAGE_NUMBER,
     })) as any);
+    setPageNumber(REFRESH_DEFAULT_PAGE_NUMBER);
   };
 
   useEffect(() => {