fix rename room permission #22316

hungvu193 · 2023-07-05T23:14:28Z

Details

Fix rename room permission

Fixed Issues

$ #21498
PROPOSAL: #21498 (comment)

Tests

Let User A Create a new room where User B is a member.
Using User B click on the room avatar on top.
Verify that user B can't change the room name
From userA copy url to the rename page and paste to the userB browser.
Verify that user B can't change the room name

Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

Let User A Create a new room where User B is a member.
Using User B click on the room avatar on top.
Verify that user B can't change the room name
From userA copy url to the rename page and paste to the userB browser.
Verify that user B can't change the room name

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots

Web

Screen.Recording.2023-07-06.at.12.02.14.mov

Mobile Web - Chrome

RPReplay_Final1688620024.MP4

Mobile Web - Safari

RPReplay_Final1688620024.MP4

Desktop

Screen.Recording.2023-07-06.at.12.29.32.mov

IOS

Screen.Recording.2023-07-06.at.12.25.51.mov

Android

Screen.Recording.2023-07-06.at.12.41.21.mov

melvin-bot · 2023-07-06T05:42:01Z

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

hungvu193 · 2023-07-06T05:42:18Z

@abdulrahuman5196 PR is ready for review!

abdulrahuman5196 · 2023-07-06T15:55:46Z

src/pages/settings/Report/RoomNamePage.js

-                    />
-                </View>
-            </Form>
+            <FullPageNotFoundView shouldShow={!Policy.isPolicyOwner(policy) && policy.role !== CONST.POLICY.ROLE.ADMIN}>


@hungvu193 This is duplicating the room rename permission logic. We should create a util function to have the logic of room rename permission check and use it in both these places.

@abdulrahuman5196 Thank you, I've just fixed it

abdulrahuman5196 · 2023-07-07T15:55:41Z

src/pages/settings/Report/RoomNamePage.js

-                    />
-                </View>
-            </Form>
+            <FullPageNotFoundView shouldShow={Policy.isPolicyMember(policy)}>


I was expecting the shouldDisableRename(linkedWorkspace) function itself to have gone into a util and we should have been using that util here to avoid duplicate logic.
So in future anyone who wants to change the permission, they can just update in the util and it will reflect in both the places.
@hungvu193

@abdulrahuman5196 That makes sense. Do you think we should keep isPolicyMember function? I think that's helpful too.

I don't think so. It seems to be actually !isPolicyAdmin(), correct me if wrong. So It seems to be a duplicate.

I think in the future, we will also allow owner and admin to edit the room name. So members aren't owner or admin. That's different.

anw, I 've just pushed the updates again :)

abdulrahuman5196 · 2023-07-09T17:45:50Z

@hungvu193 Room rename option should be disabled even in offline mode on the room details page. Kindly update the offline tests accordingly

abdulrahuman5196 · 2023-07-09T18:37:09Z

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

Screen.Recording.2023-07-09.at.11.30.52.PM.mp4

Mobile Web - Chrome

az_recorder_20230709_234436.mp4

Mobile Web - Safari

Untitled.2.mp4

Desktop

Screen.Recording.2023-07-09.at.11.50.42.PM.mp4

iOS

Screen.Recording.2023-07-09.at.11.54.23.PM.mp4

Android

az_recorder_20230710_001224.mp4

abdulrahuman5196 · 2023-07-09T18:58:18Z

src/pages/settings/Report/RoomNamePage.js

@@ -27,12 +29,20 @@ const propTypes = {

    /** All reports shared with the user */
    reports: PropTypes.objectOf(reportPropTypes),
+
+    /** */


Suggested change

/** */

/** Policy of the report for which the name is being edited */

@hungvu193 Kindly add proper comment for the policy

Oops my bad. Updated!

abdulrahuman5196 · 2023-07-09T18:59:03Z

src/pages/settings/Report/RoomNamePage.js

@@ -27,12 +29,20 @@ const propTypes = {

    /** All reports shared with the user */
    reports: PropTypes.objectOf(reportPropTypes),
+
+    /** */


@hungvu193 Kindly add proper comment for the policy

abdulrahuman5196

Changes looks good and works well. Reviewers checklist is also complete.

All yours @chiragsalian

🎀 👀 🎀
C+ Reviewed

src/libs/actions/Policy.js

hungvu193 · 2023-07-13T02:50:09Z

@chiragsalian @abdulrahuman5196 Can we push this one before it reached 9 days penalty 😢

abdulrahuman5196 · 2023-07-14T17:43:35Z

NAB: @hungvu193 Kindly update the author's checklist Offline test to reflect "Same as tests", since this change is expected to work in offline as well.

abdulrahuman5196

Tested changes again and looks good and works well. Reviewers checklist is also complete again.

All yours @chiragsalian. Good to merge.

🎀 👀 🎀
C+ Reviewed

abdulrahuman5196 · 2023-07-17T11:51:32Z

@hungvu193 It seems there is new merge conflicts on this PR

hungvu193 · 2023-07-17T13:00:29Z

@abdulrahuman5196 I've just updated!

abdulrahuman5196 · 2023-07-17T22:15:13Z

@hungvu193 After recent merge I am unable to rename a room, only showing page not found view? Can we check and fix this?

Screen.Recording.2023-07-18.at.3.43.09.AM.mp4

hungvu193 · 2023-07-17T23:42:13Z

Oh my bad, that's merge issue. Fixed again @abdulrahuman5196.

Screen.Recording.2023-07-18.at.06.41.23.mov

abdulrahuman5196 · 2023-07-18T12:09:35Z

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

Screen.Recording.2023-07-18.at.3.57.15.PM.mp4

Mobile Web - Chrome

az_recorder_20230718_160624.mp4

Mobile Web - Safari

Untitled.mp4

Desktop

Screen.Recording.2023-07-18.at.5.12.46.PM.mp4

iOS

Screen.Recording.2023-07-18.at.5.26.08.PM.mp4

Android

az_recorder_20230718_173435.mp4

abdulrahuman5196

Changes looks good and works well. Reviewers checklist is also complete.

All yours. @chiragsalian Good to merge since it was already approved. It would be good to merge this soon if no other issue to avoid merge conflicts again.

🎀 👀 🎀
C+ Reviewed

abdulrahuman5196 · 2023-07-18T13:21:07Z

NAB: @hungvu193 Kindly update the author's checklist Offline test to reflect "Same as tests", since this change is expected to work in offline as well.

NAB: @hungvu193 Kindly update this as well.

hungvu193 · 2023-07-18T13:24:26Z

NAB: @hungvu193 Kindly update the author's checklist Offline test to reflect "Same as tests", since this change is expected to work in offline as well.

NAB: @hungvu193 Kindly update this as well.

Thanks for pointing that out 😄 . Updated

OSBotify · 2023-07-19T15:34:33Z

✋ 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-07-19T18:00:05Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 1.3.43-0 🚀

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

OSBotify · 2023-07-20T18:21:06Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 1.3.43-0 🚀

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

OSBotify · 2023-07-21T18:52:03Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 1.3.44-0 🚀

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

OSBotify · 2023-07-22T00:19:14Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.43-7 🚀

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

OSBotify · 2023-07-25T01:26:00Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.3.44-2 🚀

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

hungvu193 added 3 commits July 6, 2023 06:13

fix rename room permission

e300fe4

update condition of rename page

fc84f5e

fix linting

346f13c

hungvu193 marked this pull request as ready for review July 6, 2023 05:41

hungvu193 requested a review from a team as a code owner July 6, 2023 05:41

melvin-bot bot removed the request for review from a team July 6, 2023 05:42

melvin-bot bot requested a review from abdulrahuman5196 July 6, 2023 05:42

fix linting stuff

9823d69

abdulrahuman5196 suggested changes Jul 6, 2023

View reviewed changes

hungvu193 added 2 commits July 7, 2023 09:41

remove dupe code

3fec021

fix linting

eae6aba

abdulrahuman5196 suggested changes Jul 7, 2023

View reviewed changes

move shouldrename to Policy

17c1ae9

abdulrahuman5196 reviewed Jul 9, 2023

View reviewed changes

abdulrahuman5196 suggested changes Jul 9, 2023

View reviewed changes

hungvu193 added 2 commits July 10, 2023 09:00

add comment for policy prop type

277dcd1

Merge branch 'fix-21498' of github.com:hungvu193/App into fix-21498

795cd90

abdulrahuman5196 approved these changes Jul 10, 2023

View reviewed changes

melvin-bot bot requested a review from chiragsalian July 10, 2023 08:38

hungvu193 mentioned this pull request Jul 10, 2023

[HOLD for payment 2023-07-26] [$1000] Web - UserB can access the room "Welcome message" page and update it without permission #22013

Closed

6 tasks

chiragsalian requested changes Jul 10, 2023

View reviewed changes

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

sync with main

5fa3661

hungvu193 added 3 commits July 13, 2023 16:07

move shouldDisableRename to ReportUtils

bf510dd

fix linting

4585740

remove dependency circle

229b7a8

abdulrahuman5196 approved these changes Jul 14, 2023

View reviewed changes

melvin-bot bot requested a review from chiragsalian July 14, 2023 17:49

sync w main

56c632e

fix conflict

d02784e

hungvu193 dismissed chiragsalian’s stale review via d02784e July 17, 2023 13:03

fix lint

4e02c35

fix merge issue

00e18fc

abdulrahuman5196 approved these changes Jul 18, 2023

View reviewed changes

abdulrahuman5196 mentioned this pull request Jul 19, 2023

[HOLD for payment 2023-07-28] [$1000] Room name can be changed by non admin users #21498

Closed

6 tasks

Julesssss approved these changes Jul 19, 2023

View reviewed changes

Julesssss merged commit 568aab2 into Expensify:main Jul 19, 2023
12 checks passed

OSBotify mentioned this pull request Jul 19, 2023

Deploy Checklist: New Expensify 2023-07-19 #23183

Closed

42 tasks

ginsuma mentioned this pull request Jul 20, 2023

Update ReportSettingsPage and NotificationPreferencePage permission #23255

Merged

57 tasks

alexxxwork added a commit to alexxxwork/App that referenced this pull request Jul 20, 2023

Fix after PR Expensify#22316 changing the same component

c53486d

alexxxwork mentioned this pull request Jul 20, 2023

Component refactor: migrate ReportSettingsPage to function component #22927

Merged

57 tasks

OSBotify mentioned this pull request Jul 21, 2023

Deploy Checklist: New Expensify 2023-07-21 #23362

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix rename room permission #22316

fix rename room permission #22316

hungvu193 commented Jul 5, 2023 •

edited

Loading

melvin-bot bot commented Jul 6, 2023

hungvu193 commented Jul 6, 2023

abdulrahuman5196 Jul 6, 2023

hungvu193 Jul 7, 2023

abdulrahuman5196 Jul 7, 2023

hungvu193 Jul 7, 2023

abdulrahuman5196 Jul 7, 2023

hungvu193 Jul 7, 2023

hungvu193 Jul 7, 2023

abdulrahuman5196 commented Jul 9, 2023

abdulrahuman5196 commented Jul 9, 2023 •

edited

Loading

abdulrahuman5196 Jul 9, 2023 •

edited

Loading

abdulrahuman5196 Jul 9, 2023

hungvu193 Jul 10, 2023

abdulrahuman5196 Jul 9, 2023

abdulrahuman5196 left a comment

hungvu193 commented Jul 13, 2023

abdulrahuman5196 commented Jul 14, 2023

abdulrahuman5196 left a comment

abdulrahuman5196 commented Jul 17, 2023

hungvu193 commented Jul 17, 2023

abdulrahuman5196 commented Jul 17, 2023

hungvu193 commented Jul 17, 2023

abdulrahuman5196 commented Jul 18, 2023 •

edited

Loading

abdulrahuman5196 left a comment

abdulrahuman5196 commented Jul 18, 2023

hungvu193 commented Jul 18, 2023

OSBotify commented Jul 19, 2023

OSBotify commented Jul 19, 2023

OSBotify commented Jul 20, 2023

OSBotify commented Jul 21, 2023

OSBotify commented Jul 22, 2023

OSBotify commented Jul 25, 2023

	/** */
	/** Policy of the report for which the name is being edited */

fix rename room permission #22316

fix rename room permission #22316

Conversation

hungvu193 commented Jul 5, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots

melvin-bot bot commented Jul 6, 2023

hungvu193 commented Jul 6, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abdulrahuman5196 commented Jul 9, 2023

abdulrahuman5196 commented Jul 9, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

abdulrahuman5196 Jul 9, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abdulrahuman5196 left a comment

Choose a reason for hiding this comment

hungvu193 commented Jul 13, 2023

abdulrahuman5196 commented Jul 14, 2023

abdulrahuman5196 left a comment

Choose a reason for hiding this comment

abdulrahuman5196 commented Jul 17, 2023

hungvu193 commented Jul 17, 2023

abdulrahuman5196 commented Jul 17, 2023

hungvu193 commented Jul 17, 2023

abdulrahuman5196 commented Jul 18, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

abdulrahuman5196 left a comment

Choose a reason for hiding this comment

abdulrahuman5196 commented Jul 18, 2023

hungvu193 commented Jul 18, 2023

OSBotify commented Jul 19, 2023

OSBotify commented Jul 19, 2023

OSBotify commented Jul 20, 2023

OSBotify commented Jul 21, 2023

OSBotify commented Jul 22, 2023

OSBotify commented Jul 25, 2023

hungvu193 commented Jul 5, 2023 •

edited

Loading

abdulrahuman5196 commented Jul 9, 2023 •

edited

Loading

abdulrahuman5196 Jul 9, 2023 •

edited

Loading

abdulrahuman5196 commented Jul 18, 2023 •

edited

Loading