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

Integrate Mapbox in App #24306

Merged
merged 70 commits into from
Aug 18, 2023
Merged

Integrate Mapbox in App #24306

merged 70 commits into from
Aug 18, 2023

Conversation

hayata-suenaga
Copy link
Contributor

@hayata-suenaga hayata-suenaga commented Aug 9, 2023

Details

This PR does three things

  • Add scripts necessary to setup the environment to download Mapbox iOS and Android SDKs
    You have to get credentials from Mapbox and add them to appropriate files to download Mapbox SDKs. Added scripts to streamline that process.

  • Configure the project for Mapbox SDKs
    Mapbox SDKs requires configurations in build.gradle and Podfile.

  • Install react-native-x-maps which uses Mapbox mobile and web SDKs under the hood to display maps
    Added a map in the Distance Request page (where users can report expenses for automobile transportations).

Fixed Issues

$ #22703
PROPOSAL: N/A

Tests / QA Steps

Map test

For engineers, if you're building and testing this PR in the development environment, you first need to run npm run configure-mapbox to setup the development environment.

  1. Open NewDot on any platform
  2. Go to any chat room where you can request money. Click the "+" icon next to the chat message text field. Click "Request money option from the popup menu.
  3. Click "Distance" in the tab menu. Check that a map is displayed under "Add stop" button. Also check that the map is centered around San Francisco.
Screenshot 2023-08-14 at 1 25 24 PM
  1. Verify that no errors appear in the JS console
  2. Make the device offline and check that a placeholder component like below is displayed instead of the map
Screenshot 2023-08-15 at 11 45 05 AM Screenshot 2023-08-15 at 11 44 49 AM

Bash script test (This doesn't have to be QAed by the QA team)

  1. Run npm run configure-mapbox for the project root.

  2. Check you see an output like below.
    Screenshot 2023-08-15 at 9 15 38 AM

  3. Don't enter anything for the secret token prompt and hit enter. Check you receive the following message
    Screenshot 2023-08-15 at 9 16 56 AM

  4. Run npm run configure-mapbox. Type something for the secret token prompt (it doesn't have to be the actual token). Note that you don't see what's you're typing. Check you see an output like below.
    Screenshot 2023-08-15 at 9 18 09 AM

  5. Open ~/.netrc. Check that you have an entry like the following

    machine api.mapbox.com
    login mapbox
    password <your-password>
    
  6. Open /.gradle/gradle.properties. Check you have an entry like the following.

    MAPBOX_DOWNLOADS_TOKEN=<your-password>
    

Offline tests

If you open DistanceRequest page by following the test instruction for "Map test" while offline, you should not see the map.

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 / Chrome
    • iOS / native
    • iOS / 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web web
Mobile Web - Chrome Screenshot 2023-08-14 at 2 20 11 PM
Mobile Web - Safari Screenshot 2023-08-14 at 2 12 31 PM
Desktop desktop
iOS

Simulator Screen Shot - iPhone 14 Pro - 2023-08-11 at 13 26 58

Android

@neil-marcellini
Copy link
Contributor

I linked this PR to the issue for you. Please do that right away when you create your next draft PR since it makes the organization easier.

@hayata-suenaga
Copy link
Contributor Author

Screen shots of the current UI

Web Screenshot 2023-08-10 at 10 43 08 AM

@neil-marcellini neil-marcellini changed the base branch from main to neil-waypoints-list August 10, 2023 18:26
@neil-marcellini
Copy link
Contributor

I also changed the base branch to make it easier to review. When my PR is merged it will automatically update the base branch to main.

Copy link
Contributor

@neil-marcellini neil-marcellini left a comment

Choose a reason for hiding this comment

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

Looking good so far. Please also handle the set up of the secret tokens during deployment.

scripts/configure-netrc-for-mapbox-sdk-installation.sh Outdated Show resolved Hide resolved
scripts/configure-netrc-for-mapbox-sdk-installation.sh Outdated Show resolved Hide resolved
scripts/configure-netrc-for-mapbox-sdk-installation.sh Outdated Show resolved Hide resolved
Comment on lines 46 to 50
echo -e "1. \033[1m$NETRC_PATH\033[0m"
echo -e "2. \033[1m$GRADLE_PROPERTIES_PATH\033[0m"
echo -e "\nYou can grant permissions using the commands:"
echo -e "\033[1mchmod u+rw $NETRC_PATH\033[0m"
echo -e "\033[1mchmod u+rw $GRADLE_PROPERTIES_PATH\033[0m"
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we check and update the permissions in the script?

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 don't know if that's a good idea. I don't want to mess with contributor's file system with my script 😭 also I think I have to deal with other edge cases if I want to change the permissions in the script

so maybe it's better if a contributor change directory/file permissions by themselves

Copy link
Contributor

Choose a reason for hiding this comment

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

Fair enough, but what about when it's running in an GH action? We need to make sure the permissions are correct in that case. Idk if it's bad to change permissions from a script, but in the interactive version they would probably have to enter their login password to authorize it anyways.

package.json Outdated Show resolved Hide resolved
android/build.gradle Outdated Show resolved Hide resolved
android/build.gradle Outdated Show resolved Hide resolved
Base automatically changed from neil-waypoints-list to main August 11, 2023 18:07
@hayata-suenaga hayata-suenaga marked this pull request as ready for review August 11, 2023 22:31
@hayata-suenaga hayata-suenaga requested a review from a team as a code owner August 11, 2023 22:31
@melvin-bot melvin-bot bot requested review from parasharrajat and removed request for a team August 11, 2023 22:31
@melvin-bot
Copy link

melvin-bot bot commented Aug 11, 2023

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

@parasharrajat
Copy link
Member

I noticed a bug. I am yet to verify this but it happened twice.

Bug: ios: Android chrome: Nothing is shown in the map area.

Screen.Recording.2023-08-18.at.1.18.50.AM.mov

Steps:

  1. Login into the app(Must). Logout if already login and then relogin.
  2. Force offline from the preference page.
  3. Go to request page. Notice that nothing is shown in the map area.
  4. Turn off force offline from the Preference page.
  5. Go back to requset page and notice that map hasn't loaded.

@hayata-suenaga
Copy link
Contributor Author

I noticed a bug. I am yet to verify this but it happened twice.

thanks again for the thorough testing 🙇

This seems to be a separate bug with how the force offline works. From the code logic, there should be some component that should be displayed (either MapView or offline placeholder component)

one possibility is that MapView is being displayed but the token is not there so a blank MapView is being displayed

anyway, this is a bug for the force offline (which is a feature for developers) this shouldn't block merge.

@hayata-suenaga
Copy link
Contributor Author

if other things look good, could you complete the Reviewer Checklist 🙇 @parasharrajat

@mananjadhav
Copy link
Collaborator

@hayata-suenaga As I can we all the bugs we've discussed would be picked up in the next issues, I am not blocking the checklist for the issue list, we can look at it once the PR is merged.

@mananjadhav
Copy link
Collaborator

@hayata-suenaga I can still reproduce that immediately opening the Mapview after sign-in doesn't load the Map. I think this is being addressed with Api.read change here?

web-first-load-map.mov

@hayata-suenaga
Copy link
Contributor Author

@mananjadhav yes that's right it's being addressed in a separate PR 👍

@mananjadhav
Copy link
Collaborator

mananjadhav commented Aug 17, 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 / Chrome
    • iOS / native
    • iOS / 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

Web web-mapbox
web-mapbox-offline.mov
web-first-load-map.mov
Mobile Web - Chrome mweb-chrome-mapbox-offline mweb-chrome-mapbox

mweb-chrome-tablet-mapbox

Mobile Web - Safari mweb-safari-mapbox-offline mweb-safari-mapbox
Desktop desktop-mapbox
iOS
ios-mapbox.mov
Android
android-mapbox.mov

iOS and Android builds are running.

@mananjadhav
Copy link
Collaborator

mananjadhav commented Aug 17, 2023

Still running the Android build.

@mananjadhav
Copy link
Collaborator

@hayata-suenaga Finally completed the checklist 😌

@hayata-suenaga
Copy link
Contributor Author

Created the issue for rewriting bash scripts in node: #25442

Copy link
Contributor

@tgolen tgolen 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!

@hayata-suenaga hayata-suenaga merged commit c435734 into main Aug 18, 2023
29 of 38 checks passed
@hayata-suenaga hayata-suenaga deleted the hayata-add-map branch August 18, 2023 03:36
@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.

@parasharrajat
Copy link
Member

parasharrajat commented Aug 18, 2023

Thanks @mananjadhav for covering up the checklist, I fell asleep. But I already tested so all good.

@Julesssss
Copy link
Contributor

We should have tested the AdHoc builds here as the script was modified. The AdHoc build fails with these changes which are blocking us from testing lots of PRs and delaying the App deployment.

Can we revert?

@Julesssss
Copy link
Contributor

Reverted here

@@ -80,7 +80,7 @@ jobs:
sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc

- uses: Expensify/App/.github/actions/composite/setupNode@main
- uses: ./.github/actions/composite/setupNode
Copy link
Contributor Author

Choose a reason for hiding this comment

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

here

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/hayata-suenaga in version: 1.3.56-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.56-24 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 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.

10 participants