implement filtering and sorting #507
Open
Conversation
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
Moroz-Dmytro
suggested changes
Oct 6, 2023
src/components/PageNotFound.tsx
Outdated
| @@ -0,0 +1,3 @@ | |||
| export const PageNotFound: React.FC = () => ( | |||
There was a problem hiding this comment.
Suggested change
| export const PageNotFound: React.FC = () => ( | |
| export const NotFoundPage: React.FC = () => ( |
src/components/People.tsx
Outdated
| person: Person, | ||
| }; | ||
|
|
||
| export const People: React.FC<Props> = ({ person }) => { |
There was a problem hiding this comment.
Suggested change
| export const People: React.FC<Props> = ({ person }) => { | |
| export const Person: React.FC<Props> = ({ person }) => { |
src/components/PeopleFilters.tsx
Outdated
Comment on lines
34
to
59
| function toggleCenturies(cntr: string) { | ||
| const params = new URLSearchParams(searchParams); | ||
|
|
||
| const newCenturies = centuries.includes(cntr) | ||
| ? centuries.filter(prevCentury => prevCentury !== cntr) | ||
| : [...centuries, cntr]; | ||
|
|
||
| params.delete('centuries'); | ||
| newCenturies.forEach(cent => params.append('centuries', cent)); | ||
| setSearchParams(params); | ||
| } | ||
|
|
||
| function handleClearAllCenturies() { | ||
| const params = new URLSearchParams(searchParams); | ||
|
|
||
| params.delete('centuries'); | ||
| setSearchParams(params); | ||
| } | ||
|
|
||
| function handleResetAllFilters() { | ||
| const params = new URLSearchParams(searchParams); | ||
|
|
||
| params.delete('sex'); | ||
| params.delete('query'); | ||
| setSearchParams(params); | ||
| } |
There was a problem hiding this comment.
You don't need these functions. You have params prop in your SearchLink for this
src/components/PeopleFilters.tsx
Outdated
Comment on lines
112
to
122
| <button | ||
| key={century} | ||
| type="button" | ||
| data-cy="century" | ||
| className={classNames('button mr-1', { | ||
| 'is-info': centuries.includes(century), | ||
| })} | ||
| onClick={() => toggleCenturies(century)} | ||
| > | ||
| {century} | ||
| </button> |
src/components/PeopleFilters.tsx
Outdated
Comment on lines
126
to
135
| <button | ||
| type="button" | ||
| data-cy="centuryALL" | ||
| className="button is-success is-outlined" | ||
| href="#/people" | ||
| className={classNames('button is-success', { | ||
| 'is-outlined': !!centuries.length, | ||
| })} | ||
| onClick={handleClearAllCenturies} | ||
| > | ||
| All | ||
| </a> | ||
| </button> |
src/components/PeopleFilters.tsx
Outdated
Comment on lines
140
to
146
| <a | ||
| className="button is-link is-outlined is-fullwidth" | ||
| href="#/people" | ||
| onClick={() => handleResetAllFilters} | ||
| > | ||
| Reset all filters | ||
| </a> |
src/components/PeopleList.tsx
Outdated
Comment on lines
57
to
59
| 'fa-sort': sort !== normalizedTitle, | ||
| 'fa-sort-up': sort === normalizedTitle && !order, | ||
| 'fa-sort-down': sort === normalizedTitle && order, |
There was a problem hiding this comment.
DRY, create variable for repeatable code
src/components/PeoplePage.tsx
Outdated
Comment on lines
30
to
36
| const preparedPeople = persons.map(person => { | ||
| return { | ||
| ...person, | ||
| mother: persons.find(({ name }) => person.motherName === name), | ||
| father: persons.find(({ name }) => person.fatherName === name), | ||
| }; | ||
| }); |
There was a problem hiding this comment.
Move this logic to separate helper function
src/helpers/getSortedPeople.tsx
Outdated
| if (sort) { | ||
| personsClone = personsClone.sort((personA, personB) => { | ||
| switch (sort) { | ||
| case 'name': |
src/helpers/getSortedPeople.tsx
Outdated
| import { Person } from '../types'; | ||
|
|
||
| export function getCentury(person: Person, centuries: string[]) { | ||
| return centuries.includes(Math.ceil(person.born / 100).toString()); |
BudnikOleksii
approved these changes
Oct 10, 2023
Comment on lines
+21
to
+24
| const params = new URLSearchParams(searchParams); | ||
|
|
||
| params.set('query', event.target.value); | ||
| setSearchParams(params); |
There was a problem hiding this comment.
You can get previous params in setSearchParams
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
demo link