Repository navigation
Add support for groupBy week in Search #80684
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
Merged
Merged
Changes from all commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
cb6fb32
Add groupby:week
cristipaval 63bd122
Merge branch 'cristi_support-groupByMonth' into cristi_support-groupB…
cristipaval 9dd115f
Fix week groupping sorting
cristipaval ec7a821
Merge remote-tracking branch 'origin/main' into cristi_support-groupB…
cristipaval 6ac4d62
Fix formatted week display
cristipaval 144834c
Fix expanding the week groups
cristipaval 3a57c88
Prettier
cristipaval 2ebab4c
Fix week start and end dates
cristipaval af9eb56
Add translations
cristipaval 5f2037f
Merge remote-tracking branch 'origin/main' into cristi_support-groupB…
cristipaval baa97ba
UI test
cristipaval e1144cd
Tests
cristipaval 2a47570
Run prettier
cristipaval e4f0393
Fix typecheck
cristipaval 6c2b059
Fix ESLisnt
cristipaval 707ac24
prettier
cristipaval 68ad91a
FIx sorting
cristipaval 7e35f24
Merge remote-tracking branch 'origin/main' into cristi_support-groupB…
cristipaval 4cd88b0
Regenerate after resolving conflicts
cristipaval 7537db8
Prettier
cristipaval 4634f52
Revert unnecessary chanegs in the language files
cristipaval 875a6fa
refactor
cristipaval e5790b8
Remove sortKey for weeks in tests
cristipaval 7b30346
Fix typecheck
cristipaval 8fb8733
Refactor WeekListItemHeader
cristipaval 680f90e
Refactor
cristipaval bdf0776
fix test
cristipaval 2dd02bf
Fix the week intervals when the date is limited
cristipaval 60ce8cc
Merge remote-tracking branch 'origin/main' into cristi_support-groupB…
cristipaval b35710c
Regenerate after resolving conflicts
cristipaval 3263002
Fix eslint
cristipaval 2f6f778
Merge remote-tracking branch 'origin/main' into cristi_support-groupB…
cristipaval 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
43 changes: 43 additions & 0 deletions
43
src/components/SelectionListWithSections/Search/WeekListItemHeader.tsx
This file contains hidden or 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,43 @@ | ||
| import React from 'react'; | ||
| import type {ListItem, TransactionWeekGroupListItemType} from '@components/SelectionListWithSections/types'; | ||
| import CONST from '@src/CONST'; | ||
| import type {BaseListItemHeaderProps} from './BaseListItemHeader'; | ||
| import BaseListItemHeader from './BaseListItemHeader'; | ||
|
|
||
| type WeekListItemHeaderProps<TItem extends ListItem> = Omit<BaseListItemHeaderProps<TItem>, 'item' | 'displayName' | 'groupColumnKey' | 'columnStyleKey'> & { | ||
| /** The week group currently being looked at */ | ||
| week: TransactionWeekGroupListItemType; | ||
| }; | ||
|
|
||
| function WeekListItemHeader<TItem extends ListItem>({ | ||
| week: weekItem, | ||
| onCheckboxPress, | ||
| isDisabled, | ||
| canSelectMultiple, | ||
| isSelectAllChecked, | ||
| isIndeterminate, | ||
| isExpanded, | ||
| onDownArrowClick, | ||
| columns, | ||
| }: WeekListItemHeaderProps<TItem>) { | ||
| const weekName = weekItem.formattedWeek; | ||
|
|
||
| return ( | ||
| <BaseListItemHeader | ||
| item={weekItem} | ||
| displayName={weekName} | ||
| groupColumnKey={CONST.SEARCH.TABLE_COLUMNS.GROUP_WEEK} | ||
| columnStyleKey={CONST.SEARCH.TABLE_COLUMNS.GROUP_WEEK} | ||
| onCheckboxPress={onCheckboxPress} | ||
| isDisabled={isDisabled} | ||
| canSelectMultiple={canSelectMultiple} | ||
| isSelectAllChecked={isSelectAllChecked} | ||
| isIndeterminate={isIndeterminate} | ||
| isExpanded={isExpanded} | ||
| onDownArrowClick={onDownArrowClick} | ||
| columns={columns} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| export default WeekListItemHeader; |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.