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

User's name containing accent not shown in results if no accent in search query #54806

Open
wants to merge 10 commits into
base: main
Choose a base branch
from

Conversation

nyomanjyotisa
Copy link
Contributor

Explanation of Change

Fixed Issues

$ #53671
PROPOSAL: #53671 (comment)

Tests

Same as QA Steps

  • Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

  1. Click on FAB > Start a chat
  2. Enter a user's name without an accent mark, e.g. Álex, Timón
  3. Verify that the username with the accent mark is displayed in the search results
  • 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.ts 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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
Android-Native.mp4
Android: mWeb Chrome
Android-mWeb.Chrome.mp4
iOS: Native
iOS-Native.mp4
iOS: mWeb Safari
iOS-mWeb.Safari.mp4
MacOS: Chrome / Safari
MacOS-Chrome.mp4
MacOS: Desktop
MacOS-Desktop.mp4

@nyomanjyotisa nyomanjyotisa marked this pull request as ready for review January 7, 2025 00:43
@nyomanjyotisa nyomanjyotisa requested a review from a team as a code owner January 7, 2025 00:43
@melvin-bot melvin-bot bot requested review from c3024 and removed request for a team January 7, 2025 00:43
Copy link

melvin-bot bot commented Jan 7, 2025

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

@nyomanjyotisa
Copy link
Contributor Author

The original issue mentioned about countries search

User is not displayed in the search results unless the accent mark is entered. However, when setting an address in Profile, countries that have diacritics are shown when searching without them.

Country names are filtered using StringUtils.sanitizeString

searchValue: StringUtils.sanitizeString(`${countryISO}${countryName}`),

Which removes diacritics and special characters (e.g., "Côte d'Ivoire" can be found by searching "Cote divoire").
Meanwhile, in this PR, user names are filtered using StringUtils.normalizeAccents, which results in no matches when searching for "D'artagnan" with "Dartagnan". To get a result, the query must include a space, such as "D artagnan" or "D'artagnan".
However, applying StringUtils.sanitizeString to user names may lead to the removal of special characters, potentially affecting expected results.

image

image

What is the expected behavior here? Should we exclude apostrophes and hyphens in this case? Maybe something like this:

StringUtils.normalizeAccents(text).replace(/['-]/g, '');

What do you think? @c3024

@c3024
Copy link
Contributor

c3024 commented Jan 7, 2025

@nyomanjyotisa

However, applying StringUtils.sanitizeString to user names may lead to the removal of special characters, potentially affecting expected results.

If we use sanitizeString in place of normalizeAccents at all places in the filterReports function, it should not be a problem, right?

The search seems to work fine after replacing with sanitizeString.

Screen.Recording.2025-01-07.at.9.29.25.PM.mov

@nyomanjyotisa

This comment was marked as outdated.

@nyomanjyotisa
Copy link
Contributor Author

Sanitizing the searchTerms with StringUtils.sanitizeString could impact the expected search results, especially when users search for phone numbers, or usernames that contain special characters or numbers. This method removes diacritical marks, non-alphabetic characters, and non-Latin characters, potentially altering the intended query and causing some test cases to fail. Below is a comparison of different scenarios:

Searching for an incomplete phone number using normalizeString

image

Searching for an incomplete phone number using sanitizeString

image

Searching for a numbered username using normalizeString

image

Searching for a numbered username using sanitizeString

image

It displayed all the recent users.

Apostrophes are not considered as accents or diacritics, they are treated as special characters. If we want to address this, we can use an approach like in this comment to remove apostrophes.

@c3024
Copy link
Contributor

c3024 commented Jan 10, 2025

@nyomanjyotisa
Good catch! We can have phone numbers as well in chat search so we cannot use sanitizeString. Personally, I think let us just use normalizeAccents and remove only the accents or diacritics and let the apostrophes stay. Then "D'Alembert" does not return results for "DAlembert" but I think that is okay because the user can easily search with the term with apostrophe like "D'Alembert" with the usual English keyboard and this gets the relevant results.

@MonilBhavsar , what do you think?

@MonilBhavsar
Copy link
Contributor

It's fair that user can type apostrophe easily on a keyboard, but I think we should definitely return results for D'Alembert if user just typed DAlembert

@c3024
Copy link
Contributor

c3024 commented Jan 16, 2025

@nyomanjyotisa

Let's do this like you suggested.

StringUtils.normalizeAccents(text).replace(/['-]/g, '');

@nyomanjyotisa
Copy link
Contributor Author

nyomanjyotisa commented Jan 16, 2025

Let's do this like you suggested.

The PR has been updated!
For the ESLint check, should we address the namespace import errors for ReportActionsUtils and ReportUtils in this PR? or would it be better to disable them using eslint-disable-next-line no-restricted-syntax, considering their extensive usage in this file?

@c3024
Copy link
Contributor

c3024 commented Jan 16, 2025

I think we should make the changes and not suppress the lint error. There are many places to change but the change is simple enough that nothing should break IMO.

@nyomanjyotisa
Copy link
Contributor Author

PR updated @c3024


expect(filteredReports).toEqual(reports);
});
});
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you add a test for text containing ' and -?

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.

3 participants