-
Notifications
You must be signed in to change notification settings - Fork 2.9k
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
Make autocomplete work with entity ids #51633
Make autocomplete work with entity ids #51633
Conversation
e63486c
to
533131a
Compare
533131a
to
1e9929d
Compare
2cc15d1
to
e3e559b
Compare
@rayane-djouah 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] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
return; | ||
filteredAutocompleteSuggestions = filteredChats.map((chat) => ({ | ||
filterKey: CONST.SEARCH.SYNTAX_FILTER_KEYS.IN, | ||
text: chat.text ?? '', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is ok for now, but we might have to add some more details to the name to help users differentiate multiple reports with the same name, e.g. admin
rooms
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am following the slack thread for this and will ask there
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TLDR this will be implemented as a holistic approach throughout the app, so we decided to do nothing for now.
src/components/Search/SearchRouter/getQueryWithSubstitutions.ts
Outdated
Show resolved
Hide resolved
@luacmartins I definitely think we should distinguish those somehow. Right now that list is basically unusable. There's a million ways we could do that, here are a few ideas: I think I lean towards the simple dot separator pattern: |
^ is being discussed here |
src/components/Search/SearchRouter/getQueryWithSubstitutions.ts
Outdated
Show resolved
Hide resolved
src/components/Search/SearchRouter/getUpdatedSubstitutionsMap.ts
Outdated
Show resolved
Hide resolved
@luacmartins @rayane-djouah I addressed I believe all the comments, with 2 special notes:
Please re-check. |
Yes, I agree that this is not a blocker for this PR, as it stems from #51237. I just wanted to mention it in case you'd like to address it now. Otherwise, it seems fine to handle it in a follow-up PR. |
I think those are NAB and we can address them in a follow up. Up to you @Kicu |
@rayane-djouah will be looking into your comments tomorrow, for now I added a missing Will try to figure out tomorrow if we can do it better, but I would also like to try to push forward this PR |
@luacmartins if you're happy with how this works then I'd prefer to merge and then start a new PR that will fix everything together and improve the code. |
Sounds good. Let's push this PR forward then and address those in a follow up. @rayane-djouah |
Reviewing it again now |
Reviewing again... |
There was a problem hiding this 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
Bug (Reproducible on Staging, Not a Blocker for This PR):
Screen.Recording.2024-11-06.at.7.37.32.PM.movNote: This issue does not occur with Screen.Recording.2024-11-06.at.7.38.12.PM.movNote: The issue also occurs with "tag": Screen.Recording.2024-11-06.at.7.39.35.PM.mov |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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 verified the steps for local testing are in the
- 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 notonIconClick
). - 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
- 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.
- 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 usingAvatar
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. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor) - Any internal methods bound to
this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
) - 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 thatAvatar
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 theTest
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-11-06.at.7.55.27.PM.mov
Android: mWeb Chrome
Screen.Recording.2024-11-06.at.7.53.26.PM.mov
iOS: Native
Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-11-06.at.19.51.30.mp4
iOS: mWeb Safari
Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-11-06.at.19.53.04.mp4
MacOS: Chrome / Safari
Screen.Recording.2024-11-06.at.7.32.37.PM.mov
MacOS: Desktop
Untitled.mov
Gonna merge this one. @Kicu let's address the comments above in a follow up! |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
will link when I have a PR fixing all these things 👍 |
🚀 Deployed to staging by https://github.com/luacmartins in version: 9.0.59-0 🚀
|
Hi, a great PR! App/src/components/Search/SearchRouter/SearchRouter.tsx Lines 250 to 252 in c658375
I haven’t looked over all the pending minor bugs here yet, so not sure if the follow up PR will address this case. |
🚀 Deployed to production by https://github.com/francoisl in version: 9.0.59-3 🚀
|
@ntdiary I will keep this in mind when doing the next PR with some polish items 👍 |
FYI #52568 is still a draft but it fixes several small issues form this PR. It will be ready for review soon. |
Details
from
,to
,in
,tax
,cardID
)SearchRouter
,SearchPageHeader
will still work using old code; I will make this autocomplete work also on Results page inSearchPageHeader
but in a separate PR. Doing it in here would make this PR grow way over 1k locDetailed autocomplete description
test from:john@expensify.com
, then when submitting we would run a function standardizeQueryJSON to traverse the parsed tree and substitue all plain text values with id values for specific filters. (this helper fn did the job: https://github.com/Expensify/App/blob/main/src/libs/SearchQueryUtils.ts#L169)in:adm
into my autocomplete I get more than 5 different rooms all named#admins
. Previous solution couldn't handle a string like thisin:#admins hello
because we don't know which room#admins
room it might be. This is the source of bug [HOLD for payment 2024-12-07] [$250] [HOLD for payment 2024-11-18] [HOLD Search autocomplete][Search v2.5] - Input shows report ID instead of report name when selecting "Search in" #50976.new implementation
substitutionsMap
objectstring
that user sees in his query with anautocompleteID
of the entity that can be stored in URL and sent to backend; these ids can beaccountID
for a user orreportID
for chat/room/report, and some other ids for tags and cardsstandardizeQueryJSON
function can soon be removed, but this mechanism described above now only works forSearchRouter
, whereas input insideSearchHeaderPage
still uses the old substitution mechanism, and thus needs the functiongetQueryWithSubstitutions
andgetUpdatedSubstitutionsMap
should help understand thisFixed Issues
$ #50976
$ #50947
$ #50944
$ #50943
PROPOSAL:
Tests
cmd +k
shortcutfrom:...
,to:...
,cardID:...
andtax:...
Offline tests
QA Steps
cmd +k
shortcutfrom:...
,to:...
,cardID:...
andtax:...
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)myBool && <MyComponent />
.src/languages/*
files and using the translation methodSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)Design
label and/or tagged@Expensify/design
so the design team can review the changes.ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Android: Native
rec-autocomplete-andr.mp4
Android: mWeb Chrome
iOS: Native
rec-autocomplete-ios.mp4
iOS: mWeb Safari
MacOS: Chrome / Safari
rec-autocomplete-web.mp4
MacOS: Desktop