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

Add prefer-at condition to eslint #49534

Merged

Conversation

zfurtak
Copy link
Contributor

@zfurtak zfurtak commented Sep 20, 2024

Details

Fixed Issues

$ #43055
PROPOSAL:

Tests

  1. Log in to the app
  2. Try to open workspace, add an expense in it
  3. Check list of members in the workspace
  4. Open chosen chat, try to send attachment, write a message with emoji (change skin colour of emojis)
  5. It's good to check different functionalities of the app as this PR is changing a lot of files
  • Verify that no errors appear in the JS console

Offline tests

n/a

QA Steps

Like above
It's important to check many different parts of the app

  • 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
Android: mWeb Chrome
iOS: Native
ios.mov
iOS: mWeb Safari
ios-web.mov
MacOS: Chrome / Safari
web.mov
MacOS: Desktop
Screen.Recording.2024-09-23.at.18.31.19.mov

Copy link
Contributor

@VickyStash VickyStash left a comment

Choose a reason for hiding this comment

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

Reviewing... 📝

.storybook/webpack.config.ts Outdated Show resolved Hide resolved
src/components/ActiveGuidesEventListener.tsx Outdated Show resolved Hide resolved
src/CONST.ts Outdated Show resolved Hide resolved
src/components/MenuItem.tsx Outdated Show resolved Hide resolved
src/components/MenuItem.tsx Outdated Show resolved Hide resolved
src/components/MagicCodeInput.tsx Show resolved Hide resolved
src/components/MagicCodeInput.tsx Show resolved Hide resolved
src/components/OptionsList/BaseOptionsList.tsx Outdated Show resolved Hide resolved
src/components/ReportActionItem/MoneyRequestView.tsx Outdated Show resolved Hide resolved
src/components/ReportActionItem/MoneyRequestView.tsx Outdated Show resolved Hide resolved
src/hooks/useViolations.ts Outdated Show resolved Hide resolved
src/components/RoomHeaderAvatars.tsx Show resolved Hide resolved
src/components/SelectionList/BaseSelectionList.tsx Outdated Show resolved Hide resolved
src/utils/getDefaultIcon.ts Outdated Show resolved Hide resolved
src/libs/PaginationUtils.ts Show resolved Hide resolved
src/libs/EmojiUtils.ts Outdated Show resolved Hide resolved
src/libs/PolicyUtils.ts Show resolved Hide resolved
src/libs/ReportActionsUtils.ts Show resolved Hide resolved
src/libs/ReportActionsUtils.ts Show resolved Hide resolved
src/libs/actions/Policy/Tag.ts Outdated Show resolved Hide resolved
src/libs/actions/User.ts Outdated Show resolved Hide resolved
src/pages/Debug/DebugDetails.tsx Outdated Show resolved Hide resolved
src/pages/Search/SearchTypeMenuNarrow.tsx Outdated Show resolved Hide resolved
src/pages/home/report/ReportActionsList.tsx Outdated Show resolved Hide resolved
src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx Outdated Show resolved Hide resolved
src/styles/utils/index.ts Outdated Show resolved Hide resolved
src/types/onyx/User.ts Outdated Show resolved Hide resolved
tests/actions/ReportTest.ts Outdated Show resolved Hide resolved
tests/perf-test/BaseOptionsList.perf-test.tsx Outdated Show resolved Hide resolved
tests/unit/APITest.ts Outdated Show resolved Hide resolved
tests/unit/MiddlewareTest.ts Outdated Show resolved Hide resolved
tests/unit/WorkflowUtilsTest.ts Outdated Show resolved Hide resolved
Copy link
Contributor

@Kicu Kicu left a comment

Choose a reason for hiding this comment

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

Related to this comment: #49534 (comment) and, more general - default icon and avatars, a few cents from me.

First of all I agree with Błażej to improve naming. This should be correctly named fallbackIcon and not a defaultIcon.

Second of all we cannot treat this:

    source: FallbackAvatar,
    type: CONST.ICON_TYPE_AVATAR,

as universal fallback icon everywhere, because this is specifically a fallback Avatar, not a "default" icon or avatar.

This means that if something is to display a different TYPE of icon, and we fallback to FallbackAvatar then it might be incorrect.
For the record this is fallback avatar:
Screenshot 2024-09-24 at 14 46 39

As you can see displaying this image in place of for example something report or workspace related might be problematic.

Because of ☝️ my suggestion would be:

  • do not add default value for mainAvatar inside SubscriptAvatar
  • do not create a separate file with fallbackIcon

Even though defaulting mainAvatar sounds like a good idea, it will hide a lot of wrong usages of SubscriptAvatar.
I think we should go case by case and verify where the fallback value is even needed. I did a quick check and found several usages where we don't have to fallback, but instead we should refactor code:

  • in OptionRow we have this check: {!!option.icons?.length && ... so we don't have to even display Avatar if there is no icons - we should clean this code and not fallback
  • in MenuItem we have floatRightAvatars?.length > 0 - same as above

Everywhere else define fallbackIcon locally and use it for the specific files.

@melvin-bot melvin-bot bot removed request for a team, Kicu, VickyStash and blazejkustra October 1, 2024 15:44
Copy link

melvin-bot bot commented Oct 1, 2024

@eh2077 @roryabraham One of you needs to 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]

roryabraham
roryabraham previously approved these changes Oct 1, 2024
Copy link
Contributor

@roryabraham roryabraham left a 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 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@roryabraham
Copy link
Contributor

As discussed in slack, I've done only some basic smoke testing here, because this PR is too large to practically test in full. Fortunately, it should only make things safer in general, so the risk isn't too high.

If it doesn't work though, I think rather than trying again, we should just move it to the lint config for changed files.

@roryabraham roryabraham merged commit b61b0c7 into Expensify:main Oct 1, 2024
20 of 21 checks passed
@roryabraham
Copy link
Contributor

ignoring changed-files lint because this PR is too big

@melvin-bot melvin-bot bot added the Emergency label Oct 1, 2024
Copy link

melvin-bot bot commented Oct 1, 2024

@roryabraham looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@OSBotify
Copy link
Contributor

OSBotify commented Oct 1, 2024

✋ 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

github-actions bot commented Oct 2, 2024

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.0.43-0 🚀

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

1 similar comment
Copy link
Contributor

github-actions bot commented Oct 2, 2024

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.0.43-0 🚀

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

@rushatgabhane
Copy link
Member

rushatgabhane commented Oct 2, 2024

@roryabraham @zfurtak i believe the eslint rule is incorrectly applied?

delegators is an array of object here.

image

@blazejkustra
Copy link
Contributor

@rushatgabhane Do you get the same result when running npm run lint? Ensure you reinstalled the modules 🙏

visibleReportActionItems[reportID] = reportActionsForDisplay[reportActionsForDisplay.length - 1];
const reportAction = reportActionsForDisplay.at(-1);
if (!reportAction) {
return;
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor

github-actions bot commented Oct 3, 2024

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.43-6 🚀

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

@@ -117,7 +117,11 @@ function getMatchingRootRouteForRHPRoute(route: NavigationPartialRoute): Navigat
// If there is rhpNavigator in the state generated for backTo url, we want to get root route matching to this rhp screen.
const rhpNavigator = stateForBackTo.routes.find((rt) => rt.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR);
if (rhpNavigator && rhpNavigator.state) {
return getMatchingRootRouteForRHPRoute(findFocusedRoute(stateForBackTo) as NavigationPartialRoute);
const isRHPinState = stateForBackTo.routes.at(0)?.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR;
Copy link
Contributor

Choose a reason for hiding this comment

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

This is the bad merge since we already decided to remove them in dukenv0307@f787b1c cc @zfurtak @roryabraham

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry! However this code is already correct on main, what should I do about it then? 😊

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.

9 participants