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

Update CONSTS to direct developers to use role instead of accessibilityRole #31590

Merged
merged 28 commits into from
Dec 12, 2023

Conversation

trevor-coleman
Copy link
Contributor

@trevor-coleman trevor-coleman commented Nov 20, 2023

Details

This fixes the issue with ROLE and ACCESSIBLITY_ROLE identified earlier and discussed on Slack.

It makes the following changes:

Changes to CONST.ts

  1. Reverts CONST.ACCESSIBILITY_ROLE.TEXT to the value 'text'
  2. Adds deprecation warnings on CONST.ACCESSIBLITY_ROLE and all properties
  3. Creates the CONST.ROLE object with JSDoc comments

Fixes to Components

Simple find-replace

The majority of components were fixed using a simple find and replaced that made the following change

Replace: role={CONST.ACCESSIBILITY_ROLE with role={CONST.ROLE

For example:

role={CONST.ACCESSIBILITY_ROLE.BUTTON} would become role={CONST.ROLE.BUTTON}

Non-standard Cases

Description Why Change Was Made Before After
Components using TEXT to mean PRESENTATION Aligned with correct key in CONST.ROLE role={CONST.ACCESSIBILITY_ROLE.TEXT} role={CONST.ROLE.PRESENTATION}
Inappropriate use of IMAGEBUTTON IMAGEBUTTON only available in accessibilityRole. Corrected property to accessibilityRole and pointed to the right const (see note below) role={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON} accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
Inappropriate use of ADJUSTABLE adjustable is not available in role but is in accessibilityRole. Reverted the value and updated prop to reflect correct usage role={CONST.ACCESSIBILITY_ROLE.ADJUSTABLE} role={CONST.ROLE.SLIDER}
Use of non-existent ACCESSIBILITY_ROLE.IMAGE Replaced with valid role value role={CONST.ACCESSIBILITY_ROLE.IMAGE} role={CONST.ROLE.IMG}

Note: In the IMAGEBUTTON Case, I thought it was best to preserve the imagebutton role information even though it uses the deprecated ACCESSIBILITY_ROLE. This minimizes the number of changes, rather than try to decide on a case-by-case basis what an appropriate replacement would be. ACCESSIBILITY_ROLE.IMAGEBUTTON is marked as deprecated and so it will be flagged and can be cleaned up the next time someone touches that component. In the meantime, the accessibilityRole prop is still supported in react-native (and will be for a long time) so there shouldn't be any problems.

Fixed Issues

$ #31500

Tests

This was a find-replace operation that touched a lot of components, but should not cause any changes to the app's behaviour. I tried a number of ordinary operations and there was no discernable difference or error in the log.

  1. Open app
  2. Open existing chat
  3. Send message(s) to the chat.
  4. Return home
  5. Send a new money request
  6. Assign a task
  7. Open and edit existing money requests.
  • Verify that no errors appear in the JS console

Offline tests

This change will have no effect in offline mode as it only concerns front-end behaviour.

QA Steps

This change should not cause any changes to the app's behaviour. To test, open the app and generally test it through ordinary operations. There should be no discernable difference in the app's behaviour. or error in the log.

  1. Open app
  2. Open existing chat
  3. Send message(s) to the chat.
  4. Return home
  5. Send a new money request
  6. Assign a task
  7. Open and edit existing money requests.
  • 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 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(themeColors.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 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

There should be no changes to the app's appearance or behaviour as a result of this change.

…BLITY_ROLE.TEXT` to point to `ROLE.PRESENTATION`
…g button` value by reverting them to `accessibilityRole`
Update CONSTS to direct developers to use role instead of accessibilityRole (Expensify#31500)
Copy link

melvin-bot bot commented Nov 20, 2023

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

Copy link
Contributor

github-actions bot commented Nov 20, 2023

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

# Conflicts:
#	src/components/AvatarWithImagePicker.js
#	src/components/Banner.tsx
#	src/components/Checkbox.js
#	src/components/ParentNavigationSubtitle.tsx
#	src/components/ReportHeaderSkeletonView.tsx
#	src/pages/ReimbursementAccount/BankAccountManualStep.js
#	src/pages/settings/Profile/PersonalDetails/AddressPage.js
@trevor-coleman trevor-coleman marked this pull request as ready for review November 22, 2023 22:49
@trevor-coleman trevor-coleman requested a review from a team as a code owner November 22, 2023 22:49
@melvin-bot melvin-bot bot requested review from allroundexperts and removed request for a team November 22, 2023 22:49
Copy link

melvin-bot bot commented Nov 22, 2023

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

@allroundexperts
Copy link
Contributor

Hi @trevor-coleman!

This has conflicts. Can you please fix?

@trevor-coleman
Copy link
Contributor Author

Fixed conflicts.

@dangrous
Copy link
Contributor

dangrous commented Dec 1, 2023

Hey @allroundexperts! Will you have time for a re-review today or sometime next week? Thank you!

# Conflicts:
#	src/components/DatePicker/index.android.js
#	src/components/DatePicker/index.ios.js
#	src/components/DatePicker/index.js
#	src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js
#	src/components/RoomNameInput/index.native.js
# Conflicts:
#	src/components/ReportActionItem/ReportActionItemImage.js
#	src/pages/settings/Security/CloseAccountPage.js
@trevor-coleman
Copy link
Contributor Author

trevor-coleman commented Dec 4, 2023

Resolved merge conflicts. @allroundexperts -- because this touches so many files it may be good for us to coordinate our timing so we can get it merged before more conflicts arise.

@allroundexperts
Copy link
Contributor

allroundexperts commented Dec 4, 2023

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(themeColors.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 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 Screenshot 2023-12-05 at 4 45 38 AM
Android: mWeb Chrome Screenshot 2023-12-05 at 4 40 16 AM
iOS: Native Screenshot 2023-12-05 at 4 27 31 AM
iOS: mWeb Safari Screenshot 2023-12-05 at 4 25 19 AM
MacOS: Chrome / Safari Screenshot 2023-12-05 at 4 18 55 AM
MacOS: Desktop Screenshot 2023-12-05 at 4 23 07 AM

@@ -28,7 +28,7 @@ function AttachmentViewImage({source, file, isAuthTokenRequired, loadComplete, o
onPress={onPress}
disabled={loadComplete}
style={[styles.flex1, styles.flexRow, styles.alignSelfStretch]}
role={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
Copy link
Contributor

Choose a reason for hiding this comment

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

Wouldn't this throw a deprecation warning? If so, we should either not use it or remove the @deprecated comment from the const file where this is defined.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I covered this in the description:

Note: In the IMAGEBUTTON Case, I thought it was best to preserve the imagebutton role information even though it uses the deprecated ACCESSIBILITY_ROLE. This minimizes the number of changes, rather than try to decide on a case-by-case basis what an appropriate replacement would be. ACCESSIBILITY_ROLE.IMAGEBUTTON is marked as deprecated and so it will be flagged and can be cleaned up the next time someone touches that component. In the meantime, the accessibilityRole prop is still supported in react-native (and will be for a long time) so there shouldn't be any problems.

But if you have enough context for this component to suggest what the correct value should be then I can make the change here.

Copy link
Contributor

Choose a reason for hiding this comment

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

Hm... I would rather clean it up quick then let it hang around. Would you be available for the cleanup as a follow up PR?

Copy link
Contributor

@allroundexperts allroundexperts left a comment

Choose a reason for hiding this comment

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

@trevor-coleman Requested one more minor change. Also, can you please make sure to upload screen recordings / shots of all platforms regardless if your code is not modifying anything related to those? This requirement was added intentionally so that we can be super confident about the stability of our application!

@trevor-coleman
Copy link
Contributor Author

@trevor-coleman Requested one more minor change. Also, can you please make sure to upload screen recordings / shots of all platforms regardless if your code is not modifying anything related to those? This requirement was added intentionally so that we can be super confident about the stability of our application!

So just a recording of me opening up the app and pressing random buttons and navigating around a bit?

@allroundexperts
Copy link
Contributor

allroundexperts commented Dec 6, 2023

So just a recording of me opening up the app and pressing random buttons and navigating around a bit?

Correct!

@trevor-coleman
Copy link
Contributor Author

Ok, I've got another PR open at the moment, so this will probably be a few days.

@allroundexperts
Copy link
Contributor

Completed the checklist. Should be good to merge after conflicts are resolved!

Copy link
Contributor

@allroundexperts allroundexperts left a comment

Choose a reason for hiding this comment

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

Looks good to me. I am approving it so that merging is not delayed after conflicts are fixed (This is catching conflicts real fast).

@melvin-bot melvin-bot bot requested a review from dangrous December 10, 2023 23:36
@trevor-coleman
Copy link
Contributor Author

Merge conflicts resolved

Copy link
Contributor

@dangrous dangrous left a comment

Choose a reason for hiding this comment

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

Looks good! Agreed that it would be ideal to fix that IMAGEBUTTON workaround in a follow up PR. Thanks!

@dangrous dangrous merged commit ae25d9a into Expensify:main Dec 12, 2023
15 checks passed
@dangrous
Copy link
Contributor

oh, and one more thing, I think we added a couple new consts to ACCESSIBILITY_ROLE (for example SWITCH). Do we need those? It didn't look like it was used anywhere, but figured it couldn't hurt. I know you put all the possibilities for ROLE in the consts which is great, so I think we either remove the ones no longer used in ACCESSIBILITY_ROLE or do the full list there too. What do you think?

@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/dangrous in version: 1.4.12-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/dangrous in version: 1.4.12-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/dangrous in version: 1.4.12-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.12-2 🚀

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