Skip to content

[CP Staging] Fix export integration next step showing for workspace members#45577

Merged
arosiclair merged 4 commits into
mainfrom
lucien/fix-export-integration-nextStep
Jul 17, 2024
Merged

[CP Staging] Fix export integration next step showing for workspace members#45577
arosiclair merged 4 commits into
mainfrom
lucien/fix-export-integration-nextStep

Conversation

@lakchote

@lakchote lakchote commented Jul 17, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

Details

Right now we're displaying the option to export to integration for workspace members in two areas:

  • money report preview
  • money report details

This is wrong as they don't have the authorization to do that.

We need to display the export to integration button only if the user is an admin or a manager, just like in QueueReport.cpp.

(Logsearch error example)

cc @arosiclair @kosmydel as you've worked on the PR for the manual export

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/413328
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Prerequisites

  • Collect workspace with an admin and member
  • Setup QBO integration connection
  • All the steps will be done in NewDot

Steps

  1. As the member, submit an expense report
  2. As the admin, click on the money report preview and select Pay elsewhere option

Here's what you should see for the different scenarios:

Admin/Manager

  1. You should see the option Export to QuickBooks Online in the money report preview
    image
  2. Click on the money report preview
  3. You should see the option Export to QuickBooks Online in the top right position
    image

Member

  1. You should NOT see the option Export to QuickBooks Online in the money report preview
    image
  2. Click on the money report preview
  3. You should NOT see the option Export to QuickBooks Online in the top right position
    image

QA Steps

  • Verify that no errors appear in the JS console
    Same as in tests

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: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

Screenshots are posted above in the test steps.

MacOS: Desktop

@lakchote lakchote self-assigned this Jul 17, 2024
@lakchote lakchote requested a review from a team as a code owner July 17, 2024 08:42
@melvin-bot melvin-bot Bot requested review from allroundexperts and removed request for a team July 17, 2024 08:42
@melvin-bot

melvin-bot Bot commented Jul 17, 2024

Copy link
Copy Markdown

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

@kosmydel

kosmydel commented Jul 17, 2024

Copy link
Copy Markdown
Contributor

Thank you @lakchote for handling that

@allroundexperts

allroundexperts commented Jul 17, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

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
Screen.Recording.2024-07-17.at.3.10.04.PM.mov
Screen.Recording.2024-07-17.at.3.08.35.PM.mov
Android: mWeb Chrome
Screen.Recording.2024-07-17.at.3.09.25.PM.mov
Screen.Recording.2024-07-17.at.3.10.42.PM.mov
iOS: Native
Screen.Recording.2024-07-17.at.3.06.21.PM.mov
Screen.Recording.2024-07-17.at.3.07.42.PM.mov
iOS: mWeb Safari
Screen.Recording.2024-07-17.at.3.04.55.PM.mov
Screen.Recording.2024-07-17.at.3.05.52.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2024-07-17.at.3.00.52.PM.mov
Screen.Recording.2024-07-17.at.3.03.24.PM.mov
MacOS: Desktop
Screen.Recording.2024-07-17.at.3.04.03.PM.mov

allroundexperts
allroundexperts approved these changes Jul 17, 2024
View reviewed changes

@allroundexperts allroundexperts left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Works good!

@melvin-bot

melvin-bot Bot commented Jul 17, 2024

Copy link
Copy Markdown

@marcochavezf 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 marcochavezf July 17, 2024 10:16
@melvin-bot melvin-bot Bot mentioned this pull request Jul 17, 2024
Closed
@melvin-bot

melvin-bot Bot commented Jul 17, 2024

Copy link
Copy Markdown

🎯 @allroundexperts, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #45585.

@kosmydel kosmydel mentioned this pull request Jul 17, 2024
Closed
6 tasks
@trjExpensify

trjExpensify commented Jul 17, 2024

Copy link
Copy Markdown
Contributor

@lakchote just checking something you said in a linked issue. On OldDot, only admins can manually export reports to connected accounting solutions, right?

@lakchote

lakchote commented Jul 17, 2024

Copy link
Copy Markdown
Contributor Author

@lakchote just checking something you said in a linked issue. On OldDot, only admins can manually export reports to connected accounting solutions, right?

Yes.

Admin's view:
image

Employee's view:
image

@trjExpensify

trjExpensify commented Jul 17, 2024

Copy link
Copy Markdown
Contributor

Okay cool, so a "manager" (i.e a submitsTo that's not an admin) can't manually export either, yeah?

@lakchote

lakchote commented Jul 17, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Okay cool, so a "manager" (i.e a submitsTo that's not an admin) can't manually export either, yeah?

He can't in OldDot.

However, our backend logic allows exporting if the user is the report's manager OR an admin of the policy (https://github.com/Expensify/Auth/blob/9da0e11669612308496a700c3d22a8765f45d68a/auth/command/QueueReportExport.cpp#L68-L70).

EDIT: I've talked with Tom in DM, we should be consistent with the frontend here, so I'm going to update the PR to only allow admins.

@trjExpensify

trjExpensify commented Jul 17, 2024

Copy link
Copy Markdown
Contributor

He can't in OldDot.

Cool yeah, so I think we should be consistent with OldDot here. Only admins can see the manual export options to connected accounting integrations. 👍

@arosiclair arosiclair merged commit 5377e04 into main Jul 17, 2024
@arosiclair arosiclair deleted the lucien/fix-export-integration-nextStep branch July 17, 2024 19:22
@OSBotify

OSBotify commented Jul 17, 2024

Copy link
Copy Markdown
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.

@lakchote lakchote changed the title Fix export integration next step showing for workspace members [CP Staging] Fix export integration next step showing for workspace members Jul 18, 2024
OSBotify pushed a commit that referenced this pull request Jul 18, 2024
@arosiclair @OSBotify
Merge pull request #45577 from Expensify/lucien/fix-export-integratio…
4b0d13c 
…n-nextStep

Fix export integration next step showing for workspace members

(cherry picked from commit 5377e04)
@github-actions github-actions Bot mentioned this pull request Jul 18, 2024
Closed
48 tasks
@OSBotify

OSBotify commented Jul 18, 2024

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.0.8-5 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@OSBotify

OSBotify commented Jul 18, 2024

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.0.8-4 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@lakchote lakchote mentioned this pull request Jul 18, 2024
Closed
6 tasks
@OSBotify

OSBotify commented Jul 18, 2024

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.8-6 🚀

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

@OSBotify

OSBotify commented Jul 19, 2024

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.9-5 🚀

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

Reviewers

@arosiclair arosiclair arosiclair approved these changes

@marcochavezf marcochavezf Awaiting requested review from marcochavezf

+1 more reviewer

@allroundexperts allroundexperts allroundexperts approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@lakchote lakchote

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@lakchote @kosmydel @allroundexperts @trjExpensify @OSBotify @arosiclair