Add more search filters by luacmartins · Pull Request #52938 · Expensify/App

luacmartins · 2024-11-21T22:49:19Z

Explanation of Change

Adds additional submitted, approved, paid, exported, posted search date filters. Additionally, it organizes filters into "sections" separated by a horizontal ruler.

Fixed Issues

$ #52262
$ #52376

Tests

Pre-condition: an account with a submitted, approved, paid and exported to integration report. Also, a posted card transaction

Navigate to search
Press the Filters button
Verify that you see the filters separated by a horizontal ruler
Select the Submitted filter and verify that you can select a date
Select the date that the report was submitted and make the search
Verify that you see only reports submitted on the specified date
Repeat 4-6 for the Approved, Paid, Exported and Posted filters

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I verified that similar component doesn't exist in the codebase
I verified that all props are defined accurately and each prop has a /** comment above it */
I verified that each file is named correctly
I verified that each component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
I verified that the only data being stored in component state is data necessary for rendering and nothing else
In component if we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
I verified that component internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
I verified that all JSX used for rendering exists in the render method
I verified that each component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions

Screenshots/Videos

Screen.Recording.2024-11-27.at.2.48.12.PM.mov

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-11-26T23:46:03Z

@dukenv0307 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

github-actions · 2024-11-27T16:18:38Z

🚧 @luacmartins has triggered a test build. You can view the workflow run here.

luacmartins · 2024-12-02T21:52:06Z

@dukenv0307 the backend PR fixing this issue is merged, but we're still waiting on the deploy (should happen in the next 24h or so). Meanwhile, I resolved conflicts

luacmartins · 2024-12-03T20:58:43Z

@dukenv0307 the issue is resolved. Please continue review

dukenv0307 · 2024-12-04T03:39:11Z

src/components/Search/SearchDateFilterBase.tsx

+                    inputID={`${dateKey}${CONST.SEARCH.DATE_MODIFIERS.BEFORE}`}
+                    label={translate('search.filters.date.before')}
+                    defaultValue={dateBefore}
+                    maxDate={CONST.CALENDAR_PICKER.MAX_DATE}


should we handle maxDate and minDate of dateBefore based on dateAfter and vice versa?

We don't do that for the current date filter, so I'm inclined to not change the behaviour as part of this PR.

src/libs/SearchQueryUtils.ts

src/pages/Search/AdvancedSearchFilters.tsx

dukenv0307 · 2024-12-04T03:49:23Z

src/pages/Search/AdvancedSearchFilters.tsx

+                    const onPress = singleExecution(waitForNavigate(() => Navigation.navigate(baseFilterConfig[key].route)));
+                    let filterTitle;
+                    if (
+                        key === CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE ||


we can reuse DATE_KEYS here

This one doesn't quite include the full array. We process POSTED different in a separate conditional

dukenv0307 · 2024-12-04T03:53:14Z

@luacmartins I left some comments, the rest looks good

luacmartins · 2024-12-04T20:03:46Z

Updated!

dukenv0307 · 2024-12-05T03:09:39Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Screen.Recording.2024-12-05.at.10.04.40.mov

Android: mWeb Chrome

Screen.Recording.2024-12-05.at.10.02.40.mov

iOS: Native

Screen.Recording.2024-12-05.at.10.07.36.mov

iOS: mWeb Safari

Screen.Recording.2024-12-05.at.09.56.12.mov

MacOS: Chrome / Safari

Screen.Recording.2024-12-05.at.09.53.08.mov

MacOS: Desktop

Screen.Recording.2024-12-05.at.10.08.57.mov

dukenv0307

LGTM

melvin-bot · 2024-12-05T03:10:56Z

@amyevans Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

dukenv0307 · 2024-12-06T03:35:30Z

@amyevans Can you take a look at the PR? Thanks

lakchote

LGTM.

OSBotify · 2024-12-06T16:16:41Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2024-12-09T16:28:32Z

🚀 Deployed to staging by https://github.com/lakchote in version: 9.0.73-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	failure ❌

IuliiaHerets · 2024-12-09T19:16:25Z

This PR is failing because of issue #53781

github-actions · 2024-12-10T22:46:47Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.0.73-8 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	success ✅

eVoloshchak · 2025-02-19T19:00:10Z

src/pages/Search/AdvancedSearchFilters.tsx

+            CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED,
+        ],
+    ],
+    [CONST.SEARCH.DATA_TYPES.CHAT]: [


✋ Coming from #54172, this has caused a regression
DATA_TYPES.CHAT array previously contained the "in" filter, which was removed in this PR
We've added it back

luacmartins added 15 commits November 21, 2024 15:48

add more search filters

b753beb

add date filters to advanced page

93f1382

add screens

13c3e87

add pages

9df3103

add values to page

a6e612d

add values to filters

adf06af

decode values

6578473

add spacers

29c67e1

Merge branch 'main' into cmartins-addMoreDateFilters

978c180

add sections

e55d794

only show posted if cards are enabled

c701978

stop sorting filters

06197f7

fix lint

57e888f

filter empty sections

be30679

fix ts

db24949

luacmartins marked this pull request as ready for review November 26, 2024 23:45

luacmartins requested a review from a team as a code owner November 26, 2024 23:45

melvin-bot bot requested review from dukenv0307 and removed request for a team November 26, 2024 23:46

update spanish translation

dacf439

luacmartins added the Ready To Build label Nov 27, 2024

This comment has been minimized.

Sign in to view

luacmartins added 6 commits November 27, 2024 13:43

refactor code to support before and after

c14d1d5

refactor pages

de2c9dd

refactor all pages

b61410e

fix lint

f4690da

fix import

0f24781

fix lint

8dbf469

huult mentioned this pull request Dec 3, 2024

[$250] Search - Search section loads infinitely when opened after logging in #53285

Closed

8 tasks

dukenv0307 reviewed Dec 4, 2024

View reviewed changes

src/libs/SearchQueryUtils.ts Outdated Show resolved Hide resolved

dukenv0307 reviewed Dec 4, 2024

View reviewed changes

src/pages/Search/AdvancedSearchFilters.tsx Outdated Show resolved Hide resolved

dukenv0307 reviewed Dec 4, 2024

View reviewed changes

luacmartins added 3 commits December 4, 2024 11:13

Merge branch 'main' into cmartins-addMoreDateFilters

8621611

use array

caa85b6

fix lint

7a31ff3

luacmartins requested a review from dukenv0307 December 4, 2024 20:03

dukenv0307 approved these changes Dec 5, 2024

View reviewed changes

melvin-bot bot requested a review from amyevans December 5, 2024 03:10

lakchote approved these changes Dec 6, 2024

View reviewed changes

lakchote merged commit c12ea75 into main Dec 6, 2024

lakchote deleted the cmartins-addMoreDateFilters branch December 6, 2024 16:08

github-actions bot mentioned this pull request Dec 9, 2024

Deploy Checklist: New Expensify 2024-12-09 #53762

Closed

70 tasks

IuliiaHerets mentioned this pull request Dec 9, 2024

Search Filter - Search results for date filter are irrelevant #53781

Closed

8 tasks

melvin-bot bot mentioned this pull request Dec 10, 2024

[HOLD for payment 2024-12-17] [Search v1.2] Add date-based filter for report actions #52262

Closed

bernhardoj mentioned this pull request Dec 16, 2024

[Due for payment 2025-02-19] [$125] Reports - Chat filter is missing "In" field #54172

Closed

8 tasks

eVoloshchak reviewed Feb 19, 2025

View reviewed changes

Conversation

luacmartins commented Nov 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Nov 26, 2024

Uh oh!

github-actions bot commented Nov 27, 2024

Uh oh!

This comment has been minimized.

luacmartins commented Dec 2, 2024

Uh oh!

luacmartins commented Dec 3, 2024

Uh oh!

dukenv0307 Dec 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

luacmartins Dec 4, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dukenv0307 Dec 4, 2024

Choose a reason for hiding this comment

Uh oh!

luacmartins Dec 4, 2024

Choose a reason for hiding this comment

Uh oh!

dukenv0307 commented Dec 4, 2024

Uh oh!

luacmartins commented Dec 4, 2024

Uh oh!

dukenv0307 commented Dec 5, 2024

Reviewer Checklist

Screenshots/Videos

Uh oh!

dukenv0307 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Dec 5, 2024

Uh oh!

dukenv0307 commented Dec 6, 2024

Uh oh!

lakchote left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Dec 6, 2024

Uh oh!

github-actions bot commented Dec 9, 2024

Uh oh!

IuliiaHerets commented Dec 9, 2024

Uh oh!

github-actions bot commented Dec 10, 2024

Uh oh!

eVoloshchak Feb 19, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

luacmartins commented Nov 21, 2024 •

edited

Loading

dukenv0307 Dec 4, 2024 •

edited

Loading