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

[Audit][Implementation] Intl collator replacement #36592

Merged

Conversation

kacper-mikolajczak
Copy link
Contributor

@kacper-mikolajczak kacper-mikolajczak commented Feb 15, 2024

Details

PR is a part of Callstack performance audit.

PR aims to replace costly localeCompare calls with static Intl.Collator

Fixed Issues

$ #36795
PROPOSAL: #35234 (comment)

Tests

  1. Open app
  2. Use English as preferred language
  3. Open report
  4. Write a message
  5. See if LHN ordering is correct (chat with draft is ordered correctly)
  6. Change to Spanish and repeat the steps
  7. Verify that the ordering matches main too (use pinned, drafts, archived)

Offline tests

QA Steps

  1. Open app
  2. Use English as preferred language
  3. Open report
  4. Write a message
  5. See if LHN ordering is correct (chat with draft is ordered correctly)
  6. Change to Spanish and repeat the steps
  7. Verify that the ordering matches main too (use pinned, drafts, archived)

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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
android.mov
Android: mWeb Chrome
mandroid.mov
iOS: Native
ios.mov
iOS: mWeb Safari
mios.mov
MacOS: Chrome / Safari
web.mov
MacOS: Desktop
desktop.mov

@kacper-mikolajczak
Copy link
Contributor Author

kacper-mikolajczak commented Feb 16, 2024

Main concerns:

  • where to put patched localeCompare (for now it is extracted from other files, but I was thinking about placing it in the StringUtils as well)
  • es locale and it seemed quite good, but if it could be double-checked by someone with better expertise 🇪🇸 😎
  • performance is indeed better with Intl.Collator by quite a margin. If someone with an ability to run it on physical device could check that 🙇

@kacper-mikolajczak
Copy link
Contributor Author

Implementation with Intl.Collator

Screenshot 2024-02-14 at 09 39 12

Implementation with primitive comparison

Screenshot 2024-02-14 at 09 40 08

Primitive comparison sorting takes about 19.5% of Intl.Collator time.

While primitive comparison is way faster, it is not 100% compliant with localeCompare, so in order to keep the compatibility we have implemented middle-ground solution in form of Intl.Collator

@kacper-mikolajczak kacper-mikolajczak marked this pull request as ready for review February 19, 2024 10:31
@kacper-mikolajczak kacper-mikolajczak requested a review from a team as a code owner February 19, 2024 10:31
@melvin-bot melvin-bot bot removed the request for review from a team February 19, 2024 10:31
Copy link

melvin-bot bot commented Feb 19, 2024

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

@melvin-bot melvin-bot bot requested a review from cubuspl42 February 19, 2024 10:31
@mountiny mountiny requested review from hoangzinh and removed request for cubuspl42 February 19, 2024 10:33
@mountiny
Copy link
Contributor

From Slack adding @hoangzinh as they can review now

@hoangzinh
Copy link
Contributor

hoangzinh commented Feb 19, 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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-02-19.at.18.52.02.android.mov
Android: mWeb Chrome
Screen.Recording.2024-02-19.at.18.50.02.android.chrome.mov
iOS: Native
Screen.Recording.2024-02-19.at.18.47.13.ios.mov
iOS: mWeb Safari
Screen.Recording.2024-02-19.at.18.45.23.ios.safari.mov
MacOS: Chrome / Safari
Screen.Recording.2024-02-19.at.18.37.53.web.mov
MacOS: Desktop
Screen.Recording.2024-02-19.at.18.40.31.desktop.mp4

@hoangzinh
Copy link
Contributor

Hi @kacper-mikolajczak I found that we're also using localeCompare in other places

Screenshot 2024-02-19 at 17 41 46

Does this PR only replace in SidebarUtils?

@kacper-mikolajczak
Copy link
Contributor Author

Hi @hoangzinh! The issue/analysis was mostly related to SidebarUtils, thus in order not to confuse anyone I initially decided to replace only occurrences relevant for getOrderedReportIDs.

If it is not going to be an issue to replace all of them, we can definitely do that!

@hoangzinh
Copy link
Contributor

@kacper-mikolajczak thanks for confirmation. I will continue with the review checklist.

@hoangzinh
Copy link
Contributor

NAB, with a common util func in this PR, I think it's better if we have unit tests. If we all agree, we can add them in another PR if this PR is urgent.

@mountiny
Copy link
Contributor

I think those are good points:

  • I think we should now create a plan of how we would tackle the remaining usage of localeCompare - how will we decide if there is any regression or similar
  • create the unit tests for this method

@hoangzinh
Copy link
Contributor

@kacper-mikolajczak I think testing steps are incorrect. We're touching getOrderedReportIDs function and this function would be used to display the order of chats in LHN (left-hand navigation), not messages in a chat report

Screenshot 2024-02-19 at 18 15 50

@kacper-mikolajczak
Copy link
Contributor Author

@kacper-mikolajczak I think testing steps are incorrect. We're touching getOrderedReportIDs function and this function would be used to display the order of chats in LHN (left-hand navigation), not messages in a chat report

Updated testing steps to specifically refer to LHN 👍

@kacper-mikolajczak
Copy link
Contributor Author

  • I think we should now create a plan of how we would tackle the remaining usage of localeCompare - how will we
  • decide if there is any regression or similar
    create the unit tests for this method

Those are valid points, thanks for that! I've got to handle different responsibilities today, but I am going to act on those as soon as I am free 👍

CC @mountiny @hoangzinh

Copy link
Contributor

@hoangzinh hoangzinh left a comment

Choose a reason for hiding this comment

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

LGTM

@melvin-bot melvin-bot bot requested a review from mountiny February 19, 2024 12:01
Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Thanks!

@mountiny
Copy link
Contributor

Improvement noticed in the test

SidebarUtils [SidebarUtils] getOrderedReportIDs on 1k reports [function]: 4.5 ms → 4.1 ms (-0.4 ms, -7.9%)  | 1 → 1 

@mountiny mountiny merged commit c31b1e6 into Expensify:main Feb 19, 2024
20 of 21 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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.43-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.43-20 🚀

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

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.

4 participants