Don't allow employee to delete submitted request by bernhardoj · Pull Request #35744 · Expensify/App

bernhardoj · 2024-02-03T08:23:41Z

Details

Currently, an employee can delete a submitted expense request, but the BE will gives an error.

Fixed Issues

$ #34538
PROPOSAL: #34538 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Create a new expense request on a collect policy
Submit the expense
Open the expense report
Right-click/long-press the expense preview
(if employee) Verify there is no Delete Request (if admin) Verify there is a Delete Request option
Press the expense preview to open the transaction thread
Press the three-dots button
(if employee) Verify there is no Delete Request and Add receipt (if admin) Verify there is a Delete Request and Add receipt option

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-02-03.at.16.30.04.mov

Android: mWeb Chrome

Screen.Recording.2024-02-03.at.16.07.41.mov

iOS: Native

Screen.Recording.2024-02-03.at.15.59.15.mov

iOS: mWeb Safari

Screen.Recording.2024-02-03.at.16.03.12.mov

MacOS: Chrome / Safari

Screen.Recording.2024-02-03.at.15.54.22.mov

MacOS: Desktop

Screen.Recording.2024-02-03.at.15.56.07.mov

melvin-bot · 2024-02-03T08:23:45Z

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

bernhardoj · 2024-02-03T08:25:32Z

+    if (ReportUtils.isPaidGroupPolicyExpenseReport(moneyRequestReport)) {
+        // If it's a paid policy expense report, only allow modifying the request if it's not submitted or the user is the policy admin
+        canModifyRequest = canModifyRequest && (ReportUtils.isDraftExpenseReport(moneyRequestReport) || PolicyUtils.isPolicyAdmin(policy));
+    }


I tested and found out that we can't add a receipt on a submitted expense too, so I decided to move the condition here.

But if the submitted expense has a receipt, we can replace/delete it.

I tested and it seems that I can add a receipt on a submitted expense. Can you please double check?

Let me check once again.

Yeah, I can add a receipt on a submitted request. Updated

bernhardoj · 2024-02-03T08:31:25Z

Here is the video showing that the admin can still successfully add a receipt and delete a submitted report.

Screen.Recording.2024-02-03.at.16.29.07.mov

s77rt · 2024-02-04T12:34:14Z

 * Checks if the current user is an admin of the policy.
 */
-const isPolicyAdmin = (policy: OnyxEntry<Policy>): boolean => policy?.role === CONST.POLICY.ROLE.ADMIN;
+const isPolicyAdmin = (policy?: OnyxEntry<Policy>): boolean => policy?.role === CONST.POLICY.ROLE.ADMIN;


Revert. Pass null if policy is not available. (same for other util changes)

Oh, I don't know that. Updated.

…ed-request

s77rt · 2024-02-05T20:05:58Z

 * Whether the provided report belongs to a Control or Collect policy
 */
-function isPaidGroupPolicy(report: OnyxEntry<Report>): boolean {
+function isPaidGroupPolicy(report: OnyxEntry<Report> | EmptyObject): boolean {


Revert. Use null

Oh, I see that we use EmptyObject in many places. Updated

s77rt · 2024-02-05T20:06:13Z

 * Whether the provided report belongs to a Control or Collect policy and is an expense report
 */
-function isPaidGroupPolicyExpenseReport(report: OnyxEntry<Report>): boolean {
+function isPaidGroupPolicyExpenseReport(report: OnyxEntry<Report> | EmptyObject): boolean {


Revert. Use null

s77rt · 2024-02-05T20:28:20Z

+    if (ReportUtils.isPaidGroupPolicyExpenseReport(moneyRequestReport)) {
+        // If it's a paid policy expense report, only allow modifying the request if it's not submitted or the user is the policy admin
+        canModifyRequest = canModifyRequest && (ReportUtils.isDraftExpenseReport(moneyRequestReport) || PolicyUtils.isPolicyAdmin(policy));
+    }


I tested and it seems that I can add a receipt on a submitted expense. Can you please double check?

s77rt · 2024-02-05T20:30:24Z

 * @param policies must have Onyxkey prefix (i.e 'policy_') for keys
 */
-function getPolicyType(report: OnyxEntry<Report>, policies: OnyxCollection<Policy>): string {
+function getPolicyType(report: OnyxEntry<Report> | EmptyObject, policies: OnyxCollection<Policy>): string {


Revert. Use null

s77rt · 2024-02-05T21:25:06Z

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(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.
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

…ed-request

s77rt · 2024-02-06T12:48:06Z

        }

        if (isActionOwner) {
+            if (isPaidGroupPolicyExpenseReport(!isEmptyObject(report) ? report : null)) {


Suggested change

if (isPaidGroupPolicyExpenseReport(!isEmptyObject(report) ? report : null)) {

if (!isEmptyObject(report) && isPaidGroupPolicyExpenseReport(report)) {

NAB

Oh, I like this one better, updated

Can you please push the changes?

Oh, that's weird. I though it's pushed. Done

s77rt · 2024-02-06T13:08:05Z

+    let canDeleteRequest = canModifyRequest;
+
+    if (ReportUtils.isPaidGroupPolicyExpenseReport(moneyRequestReport)) {
+        // If it's a paid policy expense report, only allow deleting the request if it's not submitted or the user is the policy admin
+        canDeleteRequest = canDeleteRequest && (ReportUtils.isDraftExpenseReport(moneyRequestReport) || PolicyUtils.isPolicyAdmin(policy));
+    }


Suggested change

let canDeleteRequest = canModifyRequest;

if (ReportUtils.isPaidGroupPolicyExpenseReport(moneyRequestReport)) {

// If it's a paid policy expense report, only allow deleting the request if it's not submitted or the user is the policy admin

canDeleteRequest = canDeleteRequest && (ReportUtils.isDraftExpenseReport(moneyRequestReport) || PolicyUtils.isPolicyAdmin(policy));

}

// If it's a paid policy expense report, only allow deleting the request if it's not submitted or the user is the policy admin

const canDeleteRequest =

canModifyRequest &&

(ReportUtils.isPaidGroupPolicyExpenseReport(moneyRequestReport) ? ReportUtils.isDraftExpenseReport(moneyRequestReport) || PolicyUtils.isPolicyAdmin(policy) : true);

NAB. But I think using const is better for this case. It's easier to know where canDeleteRequest value is coming from

Hmm, I feel the current code is easier to read

…ed-request

s77rt · 2024-02-06T13:59:22Z

@bernhardoj Can you please merge main see it fixes the failing tests

s77rt · 2024-02-06T14:32:44Z

Perf test still failing, can you please check it?

bernhardoj · 2024-02-06T14:41:57Z

Hmm, it shouldn't be related to this PR as it fails on SearchPage. It has happened there many times on my previous PRs. I guess it's just flaky

OSBotify · 2024-02-08T15:40:41Z

✋ 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 · 2024-02-08T18:44:19Z

🚀 Deployed to staging by https://github.com/Gonals in version: 1.4.39-0 🚀

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

OSBotify · 2024-02-12T14:01:58Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.39-8 🚀

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

don't allow employee to delete submitted request

e0ae249

bernhardoj requested a review from a team as a code owner February 3, 2024 08:23

melvin-bot Bot removed the request for review from a team February 3, 2024 08:23

melvin-bot Bot requested a review from s77rt February 3, 2024 08:23

bernhardoj commented Feb 3, 2024

View reviewed changes

s77rt suggested changes Feb 4, 2024

View reviewed changes

bernhardoj added 2 commits February 5, 2024 23:00

Merge branch 'main' into fix/34538-dont-allow-employee-delete-submitt…

07fc3df

…ed-request

pass null instead of undefined

943e2a1

s77rt suggested changes Feb 5, 2024

View reviewed changes

bernhardoj added 3 commits February 6, 2024 11:06

Merge branch 'main' into fix/34538-dont-allow-employee-delete-submitt…

8ff8453

…ed-request

pass null instead of empty object

7fe73c2

only allow deleting the request if it's not submitted

177e65d

s77rt suggested changes Feb 6, 2024

View reviewed changes

bernhardoj added 2 commits February 6, 2024 21:28

Merge branch 'main' into fix/34538-dont-allow-employee-delete-submitt…

c5b0efe

…ed-request

update the condition

14f1297

s77rt approved these changes Feb 6, 2024

View reviewed changes

melvin-bot Bot requested a review from Gonals February 6, 2024 14:49

Gonals approved these changes Feb 8, 2024

View reviewed changes

Gonals merged commit 342da2e into Expensify:main Feb 8, 2024

github-actions Bot mentioned this pull request Feb 8, 2024

Deploy Checklist: New Expensify 2024-02-08 #36168

Closed

77 tasks

kavimuru mentioned this pull request Feb 9, 2024

[HOLD E/E #359760] [$500] No "Hold Request" and "Add a receipt" option on workspace expense report as Admin #36202

Closed

6 tasks

izarutskaya mentioned this pull request Feb 9, 2024

[$500] No "Delete Request" and "Add a receipt" option on workspace expense report as Admin #36215

Closed

6 tasks

melvin-bot Bot mentioned this pull request Feb 12, 2024

[HOLD for payment 2024-02-19] [$500] IOU -Deleting submitted report shows unexpected error with amount crossed out #34538

Closed

6 tasks

hoangzinh mentioned this pull request Mar 3, 2024

Improve creating expenses on Collect with Instant Submit #36388

Merged

57 tasks

	if (isPaidGroupPolicyExpenseReport(!isEmptyObject(report) ? report : null)) {
	if (!isEmptyObject(report) && isPaidGroupPolicyExpenseReport(report)) {

Conversation

bernhardoj commented Feb 3, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Feb 3, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bernhardoj commented Feb 3, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

s77rt commented Feb 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

s77rt commented Feb 6, 2024

Uh oh!

s77rt commented Feb 6, 2024

Uh oh!

bernhardoj commented Feb 6, 2024

Uh oh!

OSBotify commented Feb 8, 2024

Uh oh!

OSBotify commented Feb 8, 2024

Uh oh!

OSBotify commented Feb 12, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bernhardoj commented Feb 3, 2024 •

edited

Loading

s77rt commented Feb 5, 2024 •

edited

Loading