[No QA]: Restricted action: Restrict actions of Delegate Submitter #48485

allgandalf · 2024-09-03T15:00:44Z

Details

A copilot with the role submitter cannot approve, pay, hold, or reject expenses.

In all components that use any of IOU.approveMoneyRequest, IOU.payMoneyRequest, IOU.payInvoice, IOU.putOnHold, or IOU.unapproveExpenseReport we will check if the copilot has the role submitter and show a ConfirmModal.

Fixed Issues

$ #46926
PROPOSAL: https://expensify.slack.com/archives/C02NK2DQWUX/p1725046112539189?thread_ts=1725040927.420699&cid=C02NK2DQWUX

Tests

Precondition: Copilot beta enabled and Set an email as a delegate with submitter only access.

Login to ND as a delegate
Go to Settings > Profile > Click on the profile and select the delegator email
Now go to any chat and open a report which is pending approval / payment / held/unheld expense by the delegator
As a delegate (with submitter only access), try approving an expense

Verify that a modal shows up which informs the delegate of restricted access with the email of the delegator, the modal for all cases will be:

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Screen.Recording.2024-09-04.at.3.09.17.PM.mov

Screen.Recording.2024-09-04.at.3.09.38.PM.mov

MacOS: Desktop

Screen.Recording.2024-09-04.at.3.16.04.PM.mov

Android: Native

Android: mWeb Chrome

iOS: Native

Screen.Recording.2024-09-04.at.4.10.30.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-09-04.at.4.12.11.PM.mov

melvin-bot · 2024-09-04T07:36:42Z

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

dangrous · 2024-09-04T14:42:36Z

Just calling out here (because it might not have been clear in the issue!) that this should cover showing the delegate in the app for report actions (right @rushatgabhane? I don't think we're including that elsewhere?) It should be the full "Using the product as a copilot" section

Also @rushatgabhane would you like another C+ to take primary review of this, so you can focus on your PRs?

rushatgabhane · 2024-09-04T14:50:26Z

@dangrous that i agree with.

but @allgandalf is doing it in two parts.

restrict actions (this PR)
using the product as copilot

would you like another C+ to take primary review of this, so you can focus on your PRs

yeah that would be okay

dangrous · 2024-09-04T17:25:35Z

oh great, missed that it was in two parts - that makes sense!

looping in @DylanDylann for pinch hit reviewing!

src/languages/es.ts

src/libs/Permissions.ts

DylanDylann · 2024-09-05T05:05:32Z

BUG: The modal isn't closed when click outside

Please add onClose props

DylanDylann · 2024-09-05T05:09:51Z

@allgandalf We also need to prevent users from putting them on hold

allgandalf · 2024-09-05T17:06:02Z

@DylanDylann , I hope i addressed all your questions , thanks

src/components/DelegateNoAccessModal.tsx

DylanDylann · 2024-09-06T03:48:16Z

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-09-06.at.11.06.46.mov

Android: mWeb Chrome

Screen.Recording.2024-09-06.at.10.57.50.mov

iOS: Native

Screen.Recording.2024-09-06.at.10.58.40.mov

iOS: mWeb Safari

Screen.Recording.2024-09-06.at.11.04.33.mov

MacOS: Chrome / Safari

Screen.Recording.2024-09-06.at.10.48.47.mov

MacOS: Desktop

Screen.Recording.2024-09-06.at.10.53.42.mov

allgandalf · 2024-09-06T05:47:05Z

Oops, idk how that happened ;)

dangrous

Couple of minor edits, and then let's make sure isDelegateOnlySubmitter is working correctly if there are multiple delegates for a delegator.

Thanks!

src/components/DelegateNoAccessModal.tsx

src/hooks/useDelegateUserDetails.ts

dangrous · 2024-09-06T15:12:14Z

src/libs/AccountUtils.ts

+    if (!delegate) {
+        return false;
+    }
+    return delegate?.role === CONST.DELEGATE_ROLE.SUBMITTER;


Will this work if there is more than one delegate? That is, if the delegator has multiple delegates, we need to make sure we're checking if the correct one is a submitter. We should look for the email match

Fixed the code now, tested and works fine, thanks for pointing that out @dangrous

Screen.Recording.2024-09-07.at.1.36.30.AM.mov

oh and btw, for the warning prompt, if we do not have the display name of the delegator in case of restricted access, it falls back to the email of the delegator

dangrous

Let's do it!

OSBotify · 2024-09-06T21:21:47Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

add new type 'delegate: string'

467cc7b

allgandalf changed the title ~~add new type 'delegate: string'~~ feature: Update actions to include "delegate" (and TypeScript changes) Sep 3, 2024

allgandalf added 2 commits September 4, 2024 00:52

revert delegate message

68094e8

add feature restrict submitter delegate access

c8fa1e8

allgandalf changed the title ~~feature: Update actions to include "delegate" (and TypeScript changes)~~ Restricted action: Restrict actions of Delegate Submitter Sep 3, 2024

allgandalf added 11 commits September 4, 2024 02:39

remove console log and prettier

660329e

create hook for delegate details

afd53f9

add correct order of checks for delegate and fix typo

725387a

revert useBeta hook

6f4c271

Make code DRY

dc9ae56

remove unwanted file

d09cd8e

add dependency

22dad16

remove unused imports

ea96b3e

remove delegate from accountUtils

80a53dc

revert: remove delegate from accountUtils

87e5019

cleanup unused variables

3a80ade

allgandalf marked this pull request as ready for review September 4, 2024 07:36

allgandalf requested a review from a team as a code owner September 4, 2024 07:36

melvin-bot bot requested review from rushatgabhane and removed request for a team September 4, 2024 07:36

fix lint

9b1c2bc

allgandalf changed the title ~~Restricted action: Restrict actions of Delegate Submitter~~ [No QA]: Restricted action: Restrict actions of Delegate Submitter Sep 4, 2024

allgandalf added 4 commits September 4, 2024 14:38

refactor delegateNoAccessModal

6ad1894

fix typecheck

689c89c

fix lint

ca1ac04

fix lint for the last time :)

ea1efb0

dangrous requested a review from DylanDylann September 4, 2024 17:25

DylanDylann reviewed Sep 5, 2024

View reviewed changes

src/languages/es.ts Show resolved Hide resolved

src/libs/Permissions.ts Outdated Show resolved Hide resolved

allgandalf added 3 commits September 5, 2024 21:59

revert beta

fc33da0

close modal when tapped outside

9f6f75e

add nodelegateAccess to hold option

ae01a66

fix lint

fc43245

DylanDylann reviewed Sep 6, 2024

View reviewed changes

src/components/DelegateNoAccessModal.tsx Outdated Show resolved Hide resolved

DylanDylann approved these changes Sep 6, 2024

View reviewed changes

melvin-bot bot requested a review from dangrous September 6, 2024 04:08

allgandalf closed this Sep 6, 2024

allgandalf reopened this Sep 6, 2024

dangrous requested changes Sep 6, 2024

View reviewed changes

allgandalf added 2 commits September 7, 2024 01:19

apply suggestions

88af5c8

find role of current delegate in object

6b01659

dangrous approved these changes Sep 6, 2024

View reviewed changes

dangrous merged commit da62c55 into Expensify:main Sep 6, 2024
17 checks passed

github-actions bot mentioned this pull request Sep 9, 2024

Deploy Checklist: New Expensify 2024-09-09 #48791

Closed

DylanDylann mentioned this pull request Nov 1, 2024

[HOLD for payment 2024-10-07][$250] [#wave-control] [Bring copilot to NewDot] Update actions to include "delegate" (and TypeScript changes) #46926

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[No QA]: Restricted action: Restrict actions of Delegate Submitter #48485

[No QA]: Restricted action: Restrict actions of Delegate Submitter #48485

allgandalf commented Sep 3, 2024 •

edited

Loading

melvin-bot bot commented Sep 4, 2024

dangrous commented Sep 4, 2024 •

edited

Loading

rushatgabhane commented Sep 4, 2024 •

edited

Loading

dangrous commented Sep 4, 2024

DylanDylann commented Sep 5, 2024

DylanDylann commented Sep 5, 2024

allgandalf commented Sep 5, 2024

DylanDylann commented Sep 6, 2024 •

edited

Loading

allgandalf commented Sep 6, 2024

dangrous left a comment

dangrous Sep 6, 2024

allgandalf Sep 6, 2024

allgandalf Sep 6, 2024

dangrous left a comment

OSBotify commented Sep 6, 2024

[No QA]: Restricted action: Restrict actions of Delegate Submitter #48485

[No QA]: Restricted action: Restrict actions of Delegate Submitter #48485

Conversation

allgandalf commented Sep 3, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 4, 2024

dangrous commented Sep 4, 2024 • edited Loading

rushatgabhane commented Sep 4, 2024 • edited Loading

dangrous commented Sep 4, 2024

DylanDylann commented Sep 5, 2024

DylanDylann commented Sep 5, 2024

allgandalf commented Sep 5, 2024

DylanDylann commented Sep 6, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

allgandalf commented Sep 6, 2024

dangrous left a comment

Choose a reason for hiding this comment

dangrous Sep 6, 2024

Choose a reason for hiding this comment

allgandalf Sep 6, 2024

Choose a reason for hiding this comment

allgandalf Sep 6, 2024

Choose a reason for hiding this comment

dangrous left a comment

Choose a reason for hiding this comment

OSBotify commented Sep 6, 2024

allgandalf commented Sep 3, 2024 •

edited

Loading

dangrous commented Sep 4, 2024 •

edited

Loading

rushatgabhane commented Sep 4, 2024 •

edited

Loading

DylanDylann commented Sep 6, 2024 •

edited

Loading