Fix/31863: Don't allow member to edit task in room #32165

DylanDylann · 2023-11-29T08:43:13Z

Details

Don't allow member to edit task in room

Fixed Issues

$ #31863
PROPOSAL: #31863 (comment)

Tests

Create a workspace
Go to settings > workspace > members
Add userB as member
Go to #annoince
Click on + icon and select assign task
Enter title and description
Assign it to yourself and create a task
Sign in as userB
Go to task report screen
Edit the task details
Verify that user B can't edit task

Verify that no errors appear in the JS console

Offline tests

same above

QA Steps

Create a workspace
Go to settings > workspace > members
Add userB as member
Go to #annoince
Click on + icon and select assign task
Enter title and description
Assign it to yourself and create a task
Sign in as userB
Go to task report screen
Edit the task details
Verify that user B can't edit task

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2023-11-29.at.16.05.44-compressed.mov

Android: mWeb Chrome

Screen.Recording.2023-11-29.at.16.08.28-compressed.mov

iOS: Native

Screen.Recording.2023-11-29.at.16.07.03-compressed.mov

iOS: mWeb Safari

sa.mp4

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

desk.mov

melvin-bot · 2023-11-29T09:23:36Z

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

src/libs/actions/Task.js

DylanDylann · 2023-12-01T11:27:25Z

@Ollyws Updated to cover policy expense chat. Thanks

Ollyws · 2023-12-01T12:57:05Z

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

01_Android_Native.mp4

Android: mWeb Chrome

02_Android_Chrome.mp4

iOS: Native

03_iOS_Native.mp4

iOS: mWeb Safari

04_iOS_Safari.mp4

MacOS: Chrome / Safari

05_MacOS_Chrome.mp4

MacOS: Desktop

06_MacOS_Desktop.mp4

Ollyws

LGTM.

aldo-expensify

It would be good to avoid adding more Onyx.connect for functions that are used during rendering. Left a comment there, can we explore if that change can be done? 🙏

src/libs/actions/Task.js

DylanDylann · 2023-12-08T10:18:30Z

@aldo-expensify @Ollyws I updated as this comment. Please help to review again

DylanDylann · 2023-12-08T15:08:25Z

I am investigating how to import lodash correctly to fix lint

src/components/ReportActionItem/TaskPreview.js

aldo-expensify · 2023-12-08T18:08:02Z

src/components/ReportActionItem/TaskPreview.js

@@ -149,5 +156,9 @@ export default compose(
            key: ({taskReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`,
            initialValue: {},
        },
+        policy: {
+            key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID || '0'}`,


We don't need in this case to get the ReportUtils.getRootParentReport(report); first?

Updated name of props. policyID props here was already policyID of root parent report

@aldo-expensify Updated. please check again

DylanDylann · 2023-12-11T07:26:05Z

@Ollyws @aldo-expensify Fixed lint. All yours

DylanDylann · 2023-12-14T06:43:45Z

@Ollyws @aldo-expensify Bump on this one

aldo-expensify · 2023-12-14T14:09:24Z

@Ollyws please retest, web may be enough?

Ollyws

Tests well!

OSBotify · 2023-12-15T13:51:46Z

✋ 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 · 2023-12-19T02:42:57Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 1.4.14-0 🚀

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

OSBotify · 2023-12-19T03:46:18Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 1.4.14-0 🚀

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

OSBotify · 2023-12-21T05:13:53Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.4.14-6 🚀

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

aimane-chnaif · 2024-02-12T17:59:04Z

src/libs/actions/Task.js

+    const parentReport = ReportUtils.getParentReport(taskReport);
+
+    if (policyRole && (ReportUtils.isChatRoom(parentReport) || ReportUtils.isPolicyExpenseChat(parentReport)) && policyRole !== CONST.POLICY.ROLE.ADMIN) {
+        return false;
+    }


For non-member of workspace, policyRole is falsy, so this condition wasn't met.
So it caused regression - #33420

Details: #33420 (comment)

DylanDylann added 2 commits November 29, 2023 15:38

don't allow member to edit task in room

fb35bc3

fix: lint

83e58ea

DylanDylann marked this pull request as ready for review November 29, 2023 09:23

DylanDylann requested a review from a team as a code owner November 29, 2023 09:23

melvin-bot bot requested review from Ollyws and removed request for a team November 29, 2023 09:23

Ollyws reviewed Dec 1, 2023

View reviewed changes

src/libs/actions/Task.js Outdated Show resolved Hide resolved

DylanDylann added 2 commits December 1, 2023 18:11

merge main

59d4832

add policy expense chat

04c4b7b

Ollyws approved these changes Dec 1, 2023

View reviewed changes

melvin-bot bot requested a review from aldo-expensify December 1, 2023 13:05

aldo-expensify requested changes Dec 4, 2023

View reviewed changes

src/libs/actions/Task.js Outdated Show resolved Hide resolved

DylanDylann added 2 commits December 7, 2023 17:18

merge main

178b07e

add params to canModifyTask function

de9e6d4

fix lint

5901627

aldo-expensify reviewed Dec 8, 2023

View reviewed changes

src/components/ReportActionItem/TaskPreview.js Outdated Show resolved Hide resolved

aldo-expensify reviewed Dec 8, 2023

View reviewed changes

DylanDylann added 3 commits December 9, 2023 16:27

update name

6992930

fix lint

d0363a9

fix lint

d8fc0ed

aldo-expensify self-requested a review December 12, 2023 18:05

aldo-expensify requested a review from Ollyws December 14, 2023 14:09

Ollyws approved these changes Dec 15, 2023

View reviewed changes

aldo-expensify approved these changes Dec 15, 2023

View reviewed changes

aldo-expensify merged commit 14bc32a into Expensify:main Dec 15, 2023
14 checks passed

karimiBadr mentioned this pull request Dec 18, 2023

[$500] Workspace -Assign Task-Random employee can edit/reassign task #33241

Closed

6 tasks

github-actions bot mentioned this pull request Dec 19, 2023

Deploy Checklist: New Expensify 2023-12-19 #33264

Closed

98 tasks

melvin-bot bot mentioned this pull request Dec 21, 2023

[HOLD for payment 2023-12-28] [$500] Task - user can can edit task details even if user is not assigned nor task creator #31863

Closed

6 tasks

namhihi237 mentioned this pull request Jan 3, 2024

[HOLD for payment 2024-02-14] [$500] Task – Able to edit task as room's member but not a member of Workspace #33420

Closed

6 tasks

c3024 mentioned this pull request Jan 12, 2024

[HOLD for payment 2024-01-11] [$500] Task - Task assignee list opens with deep link when user has no access to edit task #33296

Closed

6 tasks

DylanDylann mentioned this pull request Feb 2, 2024

Fix/33420: Allow member to edit task #35219

Merged

50 tasks

aimane-chnaif reviewed Feb 12, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/31863: Don't allow member to edit task in room #32165

Fix/31863: Don't allow member to edit task in room #32165

DylanDylann commented Nov 29, 2023 •

edited

Loading

melvin-bot bot commented Nov 29, 2023

DylanDylann commented Dec 1, 2023

Ollyws commented Dec 1, 2023

Ollyws left a comment

aldo-expensify left a comment •

edited

Loading

DylanDylann commented Dec 8, 2023 •

edited

Loading

DylanDylann commented Dec 8, 2023 •

edited

Loading

aldo-expensify Dec 8, 2023

DylanDylann Dec 9, 2023

DylanDylann Dec 9, 2023

DylanDylann commented Dec 11, 2023

DylanDylann commented Dec 14, 2023

aldo-expensify commented Dec 14, 2023

Ollyws left a comment

OSBotify commented Dec 15, 2023

OSBotify commented Dec 19, 2023

OSBotify commented Dec 19, 2023

OSBotify commented Dec 21, 2023

aimane-chnaif Feb 12, 2024

Fix/31863: Don't allow member to edit task in room #32165

Fix/31863: Don't allow member to edit task in room #32165

Conversation

DylanDylann commented Nov 29, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 29, 2023

DylanDylann commented Dec 1, 2023

Ollyws commented Dec 1, 2023

Reviewer Checklist

Screenshots/Videos

Ollyws left a comment

Choose a reason for hiding this comment

aldo-expensify left a comment • edited Loading

Choose a reason for hiding this comment

DylanDylann commented Dec 8, 2023 • edited Loading

DylanDylann commented Dec 8, 2023 • edited Loading

aldo-expensify Dec 8, 2023

Choose a reason for hiding this comment

DylanDylann Dec 9, 2023

Choose a reason for hiding this comment

DylanDylann Dec 9, 2023

Choose a reason for hiding this comment

DylanDylann commented Dec 11, 2023

DylanDylann commented Dec 14, 2023

aldo-expensify commented Dec 14, 2023

Ollyws left a comment

Choose a reason for hiding this comment

OSBotify commented Dec 15, 2023

OSBotify commented Dec 19, 2023

OSBotify commented Dec 19, 2023

OSBotify commented Dec 21, 2023

aimane-chnaif Feb 12, 2024

Choose a reason for hiding this comment

DylanDylann commented Nov 29, 2023 •

edited

Loading

aldo-expensify left a comment •

edited

Loading

DylanDylann commented Dec 8, 2023 •

edited

Loading

DylanDylann commented Dec 8, 2023 •

edited

Loading