Develop #616
Open
Develop #616
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
Stim1
approved these changes
Nov 23, 2023
src/components/PeopleFilters.tsx
Outdated
| params={{ sex: 'f' }} | ||
| > | ||
| Female | ||
| </SearchLink> |
There was a problem hiding this comment.
nothing serious but you can use the map method here
superpooperxxx
suggested changes
Nov 24, 2023
src/components/PeoplePage.tsx
Outdated
Comment on lines
9
to
78
| const getVisiblePeople = ( | ||
| people: Person[], { | ||
| sex, centuries, query, sort, order, | ||
| }: { | ||
| sex: string, | ||
| centuries: string[], | ||
| query: string, | ||
| sort: string | null, | ||
| order: string | null, | ||
| }, | ||
| ) => { | ||
| let copiePeople = [...people]; | ||
|
|
||
| if (sex) { | ||
| copiePeople = copiePeople.filter(person => { | ||
| switch (sex) { | ||
| case 'm': | ||
| return person.sex === 'm'; | ||
| case 'f': | ||
| return person.sex === 'f'; | ||
| case '': | ||
| default: | ||
| return copiePeople; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| if (centuries.length > 0) { | ||
| copiePeople = copiePeople.filter(person => { | ||
| return centuries.includes(Math.ceil(person.born / 100).toString()); | ||
| }); | ||
| } | ||
|
|
||
| if (query) { | ||
| const normalizedQuery = query.toLowerCase().trim(); | ||
|
|
||
| copiePeople = copiePeople.filter(person => { | ||
| return person.name.toLowerCase().includes(normalizedQuery) | ||
| || person.motherName?.toLowerCase().includes(normalizedQuery) | ||
| || person.fatherName?.toLowerCase().includes(normalizedQuery); | ||
| }); | ||
| } | ||
|
|
||
| if (sort) { | ||
| copiePeople = copiePeople.sort((person1, person2): number => { | ||
| switch (sort) { | ||
| case 'name': | ||
| return order | ||
| ? person2.name.localeCompare(person1.name) | ||
| : person1.name.localeCompare(person2.name); | ||
| case 'sex': | ||
| return order | ||
| ? person2.sex.localeCompare(person1.sex) | ||
| : person1.sex.localeCompare(person2.sex); | ||
| case 'born': | ||
| return order | ||
| ? person2.born - person1.born | ||
| : person1.born - person2.born; | ||
| case 'died': | ||
| return order | ||
| ? person2.died - person1.died | ||
| : person1.died - person2.died; | ||
| default: | ||
| return 0; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| return copiePeople; | ||
| }; |
There was a problem hiding this comment.
Let's take this function to separate file
src/components/PeopleTable.tsx
Outdated
Comment on lines
35
to
41
| if (sort && sort !== column) { | ||
| newParams = { sort: column, order: null }; | ||
| } | ||
|
|
||
| if (sort && sort === column && order) { | ||
| newParams = { sort: null, order: null }; | ||
| } |
There was a problem hiding this comment.
2 conditions return the same thing, combine
src/components/PeopleFilters.tsx
Outdated
| params={{ sex: 'f' }} | ||
| > | ||
| Female | ||
| </SearchLink> |
polosanya
approved these changes
Dec 12, 2023
| export const getSexParam = (filterType: string) => { | ||
| let newParam = {}; | ||
|
|
||
| if (filterType === 'All') { |
There was a problem hiding this comment.
Consider using Enum instead of the hardcoded value where it's possible
Comment on lines
+48
to
+56
| switch (sort) { | ||
| case 'name': | ||
| return order | ||
| ? person2.name.localeCompare(person1.name) | ||
| : person1.name.localeCompare(person2.name); | ||
| case 'sex': | ||
| return order | ||
| ? person2.sex.localeCompare(person1.sex) | ||
| : person1.sex.localeCompare(person2.sex); |
Comment on lines
+33
to
+35
| {arayOfFilterType.map(filterType => ( | ||
| <SearchLink | ||
| className={cn({ |
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