Skip to content
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

search router polish #50883

Conversation

289Adam289
Copy link
Contributor

@289Adam289 289Adam289 commented Oct 16, 2024

Details

This pr fixes following problems mentioned in #50250:

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

  • 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 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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed 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.

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

@luacmartins luacmartins self-requested a review October 17, 2024 15:32
Copy link
Contributor

@SzymczakJ SzymczakJ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@289Adam289 289Adam289 marked this pull request as ready for review October 18, 2024 08:32
@289Adam289 289Adam289 requested a review from a team as a code owner October 18, 2024 08:32
@melvin-bot melvin-bot bot removed the request for review from a team October 18, 2024 08:32
Copy link

melvin-bot bot commented Oct 18, 2024

@ 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
Copy link
Contributor Author

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

Copy link
Contributor

@rayane-djouah rayane-djouah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

@rayane-djouah
Copy link
Contributor

rayane-djouah commented Oct 18, 2024

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

Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

src/libs/SearchUtils.ts Outdated Show resolved Hide resolved
@289Adam289
Copy link
Contributor Author

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.

Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@289Adam289 we have conflicts and some tests are failing

luacmartins
luacmartins previously approved these changes Oct 22, 2024
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM and tests well. @rayane-djouah let's prioritize reviewing this one

src/libs/SearchParser/baseRules.peggy Outdated Show resolved Hide resolved
@rayane-djouah
Copy link
Contributor

BUG:

  1. Click on the "Filters" button.
  2. Choose both "greater than" and "less than" values for the total filter.
  3. Click on "View Results."
  4. Click on the "Filters" button again.
  5. Issue: Notice that only the "less than" value is preserved, while the "greater than" value is missing.
Screen.Recording.2024-10-22.at.10.58.38.PM.mov

cc @289Adam289

@rayane-djouah
Copy link
Contributor

^ The same bug is reproducible with the date filter (only the "After" value is preserved, while the "Before" value is missing.)

src/libs/SearchUtils.ts Outdated Show resolved Hide resolved
src/libs/SearchUtils.ts Outdated Show resolved Hide resolved
@luacmartins
Copy link
Contributor

We also have conflicts now

@289Adam289
Copy link
Contributor Author

@rayane-djouah I fixed both bugs and resolved conflicts

luacmartins
luacmartins previously approved these changes Oct 23, 2024
@luacmartins
Copy link
Contributor

all yours @rayane-djouah

@rayane-djouah
Copy link
Contributor

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

Screenshot 2024-10-24 at 9 44 33 AM Screenshot 2024-10-24 at 9 45 16 AM

@289Adam289
Copy link
Contributor Author

289Adam289 commented Oct 24, 2024

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

Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor

@rayane-djouah rayane-djouah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works well

Copy link

melvin-bot bot commented Oct 25, 2024

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

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

@luacmartins luacmartins merged commit 9508b17 into Expensify:main Oct 25, 2024
16 of 18 checks passed
@OSBotify
Copy link
Contributor

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

Copy link
Contributor

🚀 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
Copy link
Contributor

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

@dangrous
Copy link
Contributor

dangrous commented Oct 29, 2024

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)

Copy link
Contributor

🚀 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 🚫

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants