-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat-fe: 지원자 정렬 기능 #824
Merged
+138
−16
Merged
feat-fe: 지원자 정렬 기능 #824
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
39bfdd3
Create draft PR for #823
github-actions[bot] 57995db
Merge branch 'fe/develop' into fe-823-SORT_APPL_01
llqqssttyy 66b14e2
feat: ProcessQueryParams 컨텍스트 추가
llqqssttyy 8348174
chore: small dropdown 스타일 변경
llqqssttyy 4bc48ff
feat: 정렬 드롭박스 구현
llqqssttyy 2220002
fix: 정렬 옵션이 바뀌었을 때 요청이 2번 가는 버그
llqqssttyy c8ebbbc
refactor: useSortApplicant 위치를 useProcess 하위로 이동
llqqssttyy 5b1fd80
feat: 정렬 기준 다양화
llqqssttyy 03df506
Merge branch 'fe/develop' into fe-823-SORT_APPL_01
llqqssttyy 2bdfcc8
refactor: SortOptionState 타입 선언 수정
llqqssttyy 9dc11d4
chore: 필요없는 타입 추론 제거
llqqssttyy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
frontend/src/components/dashboard/ApplicantSortDropdown/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
import Dropdown from '@components/_common/molecules/Dropdown'; | ||
import DropdownItemRenderer from '@components/_common/molecules/DropdownItemRenderer'; | ||
import { ProcessSortOption, SortOption } from '@customTypes/process'; | ||
import { SortOptionState } from '@hooks/useProcess/useSortApplicant'; | ||
|
||
interface ApplicantSortDropdownProps { | ||
sortOption: SortOptionState; | ||
updateSortOption: (option?: SortOptionState) => void; | ||
} | ||
|
||
interface SortOptionsType { | ||
id: ProcessSortOption; | ||
name: string; | ||
value: SortOption; | ||
} | ||
|
||
const sortOptions: SortOptionsType[] = [ | ||
{ id: 'sortByScore', name: '평점 높은 순', value: 'DESC' }, | ||
{ id: 'sortByScore', name: '평점 낮은 순', value: 'ASC' }, | ||
{ id: 'sortByCreatedAt', name: '지원일 최신 순', value: 'DESC' }, | ||
{ id: 'sortByCreatedAt', name: '지원일 오래된 순', value: 'ASC' }, | ||
]; | ||
|
||
export default function ApplicantSortDropdown({ sortOption, updateSortOption }: ApplicantSortDropdownProps) { | ||
const selectedOption = sortOptions.find( | ||
(option) => sortOption && option.id && option.value === sortOption[option.id], | ||
); | ||
|
||
return ( | ||
<Dropdown | ||
initValue={selectedOption?.name || '정렬'} | ||
size="sm" | ||
isShadow={false} | ||
width={118} | ||
> | ||
<DropdownItemRenderer | ||
items={sortOptions.map(({ id, name, value }) => ({ | ||
type: 'clickable', | ||
id, | ||
name, | ||
onClick: () => updateSortOption({ [id]: value } as SortOptionState), | ||
}))} | ||
/> | ||
</Dropdown> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,9 @@ import type { Process, ProcessResponse } from '@customTypes/process'; | |
|
||
import processApis from '@api/domain/process'; | ||
import QUERY_KEYS from '@hooks/queryKeys'; | ||
import useSortApplicant from '@hooks/useProcess/useSortApplicant'; | ||
import { routes } from '@router/path'; | ||
import { useEffect } from 'react'; | ||
import { DOMAIN_URL } from '../../constants/constants'; | ||
|
||
export interface SimpleProcess { | ||
|
@@ -13,8 +15,8 @@ export interface SimpleProcess { | |
} | ||
|
||
interface UseProcessProps { | ||
dashboardId: string; | ||
applyFormId: string; | ||
dashboardId: string; | ||
} | ||
|
||
interface UseProcessReturn { | ||
|
@@ -28,15 +30,34 @@ interface UseProcessReturn { | |
endDate: string; | ||
} | ||
|
||
export default function useProcess({ dashboardId, applyFormId }: UseProcessProps): UseProcessReturn { | ||
const { data, error, isLoading } = useQuery<ProcessResponse>({ | ||
export default function useProcess({ | ||
dashboardId, | ||
applyFormId, | ||
}: UseProcessProps): UseProcessReturn & ReturnType<typeof useSortApplicant> { | ||
const { sortOption, updateSortOption } = useSortApplicant(); | ||
|
||
const { data, error, isLoading, refetch } = useQuery<ProcessResponse>({ | ||
// [10.17-lesser] | ||
// sortOption을 queryKey에 추가하면 기존 요청까지 다시 보내게 되어 | ||
// queryKey에 sortOption을 추가하지 않고, refetch로 재요청 보내도록 수정합니다. | ||
// eslint-disable-next-line | ||
queryKey: [QUERY_KEYS.DASHBOARD, dashboardId, applyFormId], | ||
queryFn: () => processApis.get({ dashboardId }), | ||
queryFn: () => | ||
processApis.get({ | ||
dashboardId, | ||
...sortOption, | ||
// ...(filterOption && { filterOption: filterOption as ProcessFilterOptions }), | ||
}), | ||
}); | ||
|
||
useEffect(() => { | ||
refetch(); | ||
}, [sortOption]); | ||
|
||
Comment on lines
+53
to
+56
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 멋진 💡 아이디어 👍 |
||
const processes = data?.processes || []; | ||
|
||
const processList = processes.map((p) => ({ processName: p.name, processId: p.processId })); | ||
|
||
return { | ||
title: data?.title ?? '', | ||
postUrl: `${DOMAIN_URL}${routes.post({ applyFormId: data?.applyFormId ?? '' })}`, | ||
|
@@ -46,5 +67,7 @@ export default function useProcess({ dashboardId, applyFormId }: UseProcessProps | |
isLoading, | ||
startDate: data?.startDate ?? '0', | ||
endDate: data?.endDate ?? '0', | ||
sortOption, | ||
updateSortOption, | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import { SortParams } from '@customTypes/process'; | ||
import { useCallback, useState } from 'react'; | ||
|
||
export type SortOptionState = Partial<SortParams> | undefined; | ||
|
||
export default function useSortApplicant() { | ||
const [sortOption, setSortOption] = useState<SortOptionState>(); | ||
|
||
const updateSortOption = useCallback((option?: SortOptionState) => { | ||
setSortOption(option); | ||
}, []); | ||
|
||
return { | ||
sortOption, | ||
updateSortOption, | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,3 +23,7 @@ type Brand<B> = { [__brand]: B }; | |
export type Branded<T, B> = T & Brand<B>; | ||
|
||
export type KeyedStrings<T> = Record<keyof T, string>; | ||
|
||
export type Entries<T> = { | ||
[K in keyof T]: [K, T[K]]; | ||
}[keyof T][]; | ||
Comment on lines
+26
to
+29
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍