fix-fe: processList orderIndex 해제 버그 (#914)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Kim Da Eun <midekuna@gmail.com>
woowacourse-teams · Oct 23, 2024 · 26cdff9 · 26cdff9
1 parent 0b2cdbf
commit 26cdff9
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 18 deletions.
diff --git a/frontend/src/assets/images/dashboard.webp b/frontend/src/assets/images/dashboard.webp
diff --git a/frontend/src/assets/images/feature1.webp b/frontend/src/assets/images/feature1.webp
diff --git a/frontend/src/components/ApplicantModal/ApplicantBaseInfo/index.tsx b/frontend/src/components/ApplicantModal/ApplicantBaseInfo/index.tsx
@@ -37,14 +37,16 @@ export default function ApplicantBaseInfo({ applicantId }: ApplicantBaseInfoProp
 
   const { applicant, process } = applicantBaseInfo;
 
-  const menuItems: DropdownItemType[] = processList.map(({ processName, processId }) => ({
-    type: 'clickable',
-    id: processId,
-    name: processName,
-    onClick: ({ targetProcessId }) => {
-      moveApplicantProcess({ processId: targetProcessId, applicants: [applicantId] });
-    },
-  }));
+  const menuItems: DropdownItemType[] = processList
+    .filter(({ processId }) => processId !== process.id)
+    .map(({ processName, processId }) => ({
+      type: 'clickable',
+      id: processId,
+      name: processName,
+      onClick: ({ targetProcessId }) => {
+        moveApplicantProcess({ processId: targetProcessId, applicants: [applicantId] });
+      },
+    }));
 
   const rejectAppHandler = () => {
     const confirmAction = (message: string, action: () => void) => {

diff --git a/frontend/src/components/dashboard/ProcessColumn/index.tsx b/frontend/src/components/dashboard/ProcessColumn/index.tsx
@@ -51,21 +51,22 @@ export default function ProcessColumn({
     removeApplicant,
     removeApplicants,
   } = useMultiApplicant();
-
   const menuItemsList = ({ applicantId }: { applicantId: number }) => {
     const menuItems: DropdownItemType[] = [
       {
         type: 'subTrigger',
         id: 'moveProcess',
         name: '단계 이동',
-        items: processList.map(({ processName, processId }) => ({
-          type: 'clickable',
-          id: processId,
-          name: processName,
-          onClick: ({ targetProcessId }) => {
-            moveApplicantProcess({ processId: targetProcessId, applicants: [applicantId] });
-          },
-        })),
+        items: processList
+          .filter((simpleProcess) => simpleProcess.processId !== process.processId)
+          .map(({ processName, processId }) => ({
+            type: 'clickable',
+            id: processId,
+            name: processName,
+            onClick: ({ targetProcessId }) => {
+              moveApplicantProcess({ processId: targetProcessId, applicants: [applicantId] });
+            },
+          })),
       },
       {
         type: 'clickable',

diff --git a/frontend/src/hooks/useApplicant/index.ts b/frontend/src/hooks/useApplicant/index.ts
@@ -12,6 +12,7 @@ export default function useApplicant({ applicantId }: { applicantId?: number })
   return useMutation({
     mutationFn: ({ processId, applicants }: { processId: number; applicants: number[] }) =>
       applicantApis.move({ processId, applicants }),
+
     onSuccess: (_, variables) => {
       const { processId } = variables;
       queryClient.invalidateQueries({ queryKey: [QUERY_KEYS.DASHBOARD, dashboardId, applyFormId] });

diff --git a/frontend/src/hooks/useProcess/index.ts b/frontend/src/hooks/useProcess/index.ts
@@ -69,7 +69,7 @@ export default function useProcess({ dashboardId, applyFormId }: UseProcessProps
   return {
     title: data?.title ?? '',
     postUrl: `${DOMAIN_URL}${routes.post({ applyFormId: data?.applyFormId ?? '' })}`,
-    processes,
+    processes: processes.sort((processA, processB) => processA.orderIndex - processB.orderIndex),
     processList,
     error,
     isLoading,