search router polish by 289Adam289 · Pull Request #50883 · Expensify/App

289Adam289 · 2024-10-16T11:27:24Z

Details

This pr fixes following problems mentioned in #50250:

parsing error with special characters
amount display value in cents
improve performance of filter validation
fix reordering of standard filters
Using the router and putting a link removes the link for the search results

Fixed Issues

#50250
#50988
PROPOSAL:

Tests

Open Search Page
Enter custom search query with amount
Verify that filters except default filters and free text don't change order
Verify that amount filter is not displayed in cents
Verify that special characters e.g. emoji can be used in search input
Verify that no errors appear in the JS console

Offline tests

QA Steps

Open Search Page
Enter custom search query with amount
Verify that filters except default filters and free text don't change order
Verify that amount filter is not displayed in cents
Verify that special characters e.g. emoji can be used in search input
Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-10-17.at.17.41.04.mp4

Android: mWeb Chrome

iOS: Native

Screen.Recording.2024-10-17.at.17.35.11.mp4

iOS: mWeb Safari

Screen.Recording.2024-10-17.at.17.36.41.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-10-17.at.17.28.59.mp4

MacOS: Desktop

SzymczakJ

LGTM 🚀

melvin-bot · 2024-10-18T08:32:53Z

@ 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]

289Adam289 · 2024-10-18T09:22:34Z

@rayane-djouah I am not sure why but no reviewer has been assigned to this pr. You have reviewed #49838 and I think you can review this one as a follow up pr to #49838.

rayane-d

.

rayane-d · 2024-10-18T10:41:41Z

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-10-25.at.10.30.58.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-10-25.at.10.33.27.PM.mov

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-10-25.at.22.19.25.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-10-25.at.22.24.09.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-10-25.at.10.08.32.PM.mov

1.mov

2.mov

33.mov

MacOS: Desktop

Screen.Recording.2024-10-25.at.10.11.37.PM.mov

luacmartins

Nice changes. Was the link dropping issue a parsing problem?

src/libs/SearchUtils.ts

289Adam289 · 2024-10-21T08:22:32Z

Yes, the link dropping issue was a parsing problem. When you pasted the link parsing error occurred and router navigated to search page with the last query without error.

luacmartins

@289Adam289 we have conflicts and some tests are failing

src/libs/SearchUtils.ts

luacmartins · 2024-10-22T23:48:50Z

We also have conflicts now

289Adam289 · 2024-10-23T09:20:49Z

@rayane-djouah I fixed both bugs and resolved conflicts

luacmartins · 2024-10-23T19:09:28Z

all yours @rayane-djouah

rayane-d · 2024-10-24T08:48:36Z

@289Adam289 We still have a parsing error with the " special character. Would you like to address this issue in this PR?

289Adam289 · 2024-10-24T16:37:28Z

I've given it a try and I think it works. Unit tests pass but further testing is needed because I've changed important rules heavily. cc @rayane-djouah

luacmartins

LGTM. I did some testing on the latest grammar and it seems to be working well. All yours @rayane-djouah

rayane-d

Works well

melvin-bot · 2024-10-25T21:52:02Z

🎯 @rayane-djouah, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #51506.

OSBotify · 2024-10-25T22:18:14Z

✋ 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-10-29T09:44:22Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.0.55-0 🚀

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

dangrous · 2024-10-29T14:05:01Z

Hi! I haven't confirmed yet but it seems like this is related to #51661 - can you take a quick look?

dangrous · 2024-10-29T14:28:15Z

Okay yep confirmed - it's d3f99c1

The error is:

SearchQueryUtils.ts:223 Error when parsing SearchQuery: "," SyntaxError: Expected default key, end of input, key, quote, whitespace, or word but "," found. (at searchParser.js:20:1)
    at new peg$SyntaxError (searchParser.js:20:1)
    at peg$buildStructuredError (searchParser.js:415:1)
    at Module.peg$parse (searchParser.js:1195:1)
    at Module.buildSearchQueryJSON (SearchQueryUtils.ts:214:20)
    at eval (SearchRouter.tsx:118:23)
    at invokeFunc (debounce.js:102:19)
    at trailingEdge (debounce.js:151:14)
    at timerExpired (debounce.js:139:14)

github-actions · 2024-10-31T11:17:34Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.0.55-10 🚀

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

rushatgabhane · 2025-01-09T13:38:37Z

src/libs/SearchQueryUtils.ts


-    Object.keys(query.flatFilters)
+    query.flatFilters.forEach((filter) => {
+        filter.filters.sort((a, b) => localeCompare(a.value.toString(), b.value.toString()));


we caused this issue - #52170

shubham1206agra · 2025-07-18T18:26:44Z

src/libs/SearchQueryUtils.ts


-    Object.keys(query.flatFilters)
+    query.flatFilters.forEach((filter) => {
+        filter.filters.sort((a, b) => localeCompare(a.value.toString(), b.value.toString()));


Mark for ref

DylanDylann · 2026-03-17T08:16:05Z

src/libs/SearchQueryUtils.ts

    }
+    if (filterName === CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT) {
+        if (typeof filter === 'string') {
+            const backendAmount = CurrencyUtils.convertToBackendAmount(Number(filter));


This change caused #79934,

This PR added amount-to-cents conversion (convertToBackendAmount) to the findIDFromDisplayValue function in src/libs/SearchQueryUtils.ts. The PR's intent was to fix "amount display value in cents," but this function was already being called for all search submissions from SearchRouter.tsx — including clicks on recent search items.

289Adam289 added 4 commits October 16, 2024 12:33

fix amount display value

ee74fe1

improve validation performance

d51f57d

fix parsin special characters bug

8acc21f

Merge branch 'main' into 289Adam289/50250-search-router-polish

53d0a55

Kicu mentioned this pull request Oct 17, 2024

[No QA] Split SearchUtils into two files #50866

Merged

48 tasks

289Adam289 mentioned this pull request Oct 17, 2024

Search - Console error shows up when entering emoji in search input #50988

Closed

8 tasks

289Adam289 added 2 commits October 17, 2024 15:23

fix reordering of standard filters

9e475c0

fix amount NaN

b5f74d4

289Adam289 mentioned this pull request Oct 17, 2024

Search - "No category" is no longer selected in Categories field after searching with filter #50989

Closed

8 tasks

289Adam289 added 4 commits October 17, 2024 16:30

fix no category and no tag

479d3cd

Merge branch 'main' into 289Adam289/50250-search-router-polish

01d4ec7

remove no support

4ca8fc0

remove necesary optional chaining

d27e193

luacmartins self-requested a review October 17, 2024 15:32

SzymczakJ approved these changes Oct 18, 2024

View reviewed changes

289Adam289 marked this pull request as ready for review October 18, 2024 08:32

289Adam289 requested a review from a team as a code owner October 18, 2024 08:32

melvin-bot bot removed the request for review from a team October 18, 2024 08:32

rayane-d reviewed Oct 18, 2024

View reviewed changes

luacmartins reviewed Oct 18, 2024

View reviewed changes

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

luacmartins requested review from luacmartins and rayane-d October 21, 2024 14:36

289Adam289 added 2 commits October 21, 2024 16:45

add comment

a81b7d0

Merge branch 'main' into 289Adam289/50250-search-router-polish

a84ec18

luacmartins reviewed Oct 21, 2024

View reviewed changes

fix typecheck

dec2439

rayane-d suggested changes Oct 22, 2024

View reviewed changes

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

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

289Adam289 added 2 commits October 23, 2024 09:48

fix bug with amount and date

3096ed1

Merge branch 'main' into 289Adam289/50250-search-router-polish

d8104a7

289Adam289 dismissed luacmartins’s stale review via d8104a7 October 23, 2024 08:48

fix imports

e746d55

luacmartins previously approved these changes Oct 23, 2024

View reviewed changes

luacmartins requested a review from rayane-d October 23, 2024 18:59

fix issues with quotes

d3f99c1

289Adam289 dismissed luacmartins’s stale review via d3f99c1 October 24, 2024 16:31

luacmartins approved these changes Oct 24, 2024

View reviewed changes

rayane-d approved these changes Oct 25, 2024

View reviewed changes

melvin-bot bot mentioned this pull request Oct 25, 2024

[PAYMENT DUE 11/7]Payment issue for E/App PR#50883 #51506

Closed

luacmartins merged commit 9508b17 into Expensify:main Oct 25, 2024

github-actions bot mentioned this pull request Oct 29, 2024

Deploy Checklist: New Expensify 2024-10-29 #51635

Closed

65 tasks

dangrous mentioned this pull request Oct 29, 2024

[HOLD for payment 2024-11-11] Web - Search - Console error shows up when entering comma in the search router #51661

Closed

8 tasks

rushatgabhane reviewed Jan 9, 2025

View reviewed changes

shubham1206agra reviewed Jul 18, 2025

View reviewed changes

MelvinBot mentioned this pull request Mar 17, 2026

[Due for payment 2026-03-16] [$250] Search - Expense search shows incorrect amount from recent searches #79934

Closed

7 tasks

DylanDylann reviewed Mar 17, 2026

View reviewed changes

Conversation

289Adam289 commented Oct 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

SzymczakJ left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Oct 18, 2024

Uh oh!

289Adam289 commented Oct 18, 2024

Uh oh!

rayane-d left a comment

Choose a reason for hiding this comment

Uh oh!

rayane-d commented Oct 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

289Adam289 commented Oct 21, 2024

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

luacmartins commented Oct 22, 2024

Uh oh!

289Adam289 commented Oct 23, 2024

Uh oh!

luacmartins commented Oct 23, 2024

Uh oh!

rayane-d commented Oct 24, 2024

Uh oh!

289Adam289 commented Oct 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

rayane-d left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Oct 25, 2024

Uh oh!

OSBotify commented Oct 25, 2024

Uh oh!

github-actions bot commented Oct 29, 2024

Uh oh!

dangrous commented Oct 29, 2024

Uh oh!

dangrous commented Oct 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Oct 31, 2024

Uh oh!

rushatgabhane Jan 9, 2025

Choose a reason for hiding this comment

Uh oh!

shubham1206agra Jul 18, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

289Adam289 commented Oct 16, 2024 •

edited

Loading

rayane-d commented Oct 18, 2024 •

edited

Loading

289Adam289 commented Oct 24, 2024 •

edited

Loading

dangrous commented Oct 29, 2024 •

edited

Loading