Disable renaming public rooms if the current user is not an admin or the creator of the linked workspace #15688

jasperhuangg · 2023-03-06T18:31:29Z

Details

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/266085

Tests

(if you're using the web proxy, just follow the QA steps instead)

Create a new workspace and create a new room with public visibility on that workspace (FAB > "New Room"). Save the reportID.
Sign out of the account that created the workspace, and sign into a different account that isn't in the workspace.
Navigate to the report from [1] (i.e. localhost:8080/r/<reportID) > Settings.
Verify that you are unable to update the report name.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Sign in the with following account: bryanna54@cwroutinesp.com (password asdfASDF00)
Navigate to the following report: https://new.expensify.com/r/6794758698552692
Go to the report details. Verify that you are unable to modify the report name.

Verify that no errors appear in the JS console

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 / Chrome
- iOS / native
- iOS / 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 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 correct English and 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 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

…the workspace

…name

MelvinBot · 2023-03-07T19:43:43Z

@eVoloshchak @bondydaa One of you needs to 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]

eVoloshchak · 2023-03-08T16:52:26Z

@jasperhuangg, where can I find ./script/sql.sh file to test this?
Also, when I create a new room, it isn't displayed

Do I need my account to be added to the policy rooms beta on dev for this to work?

jasperhuangg · 2023-03-08T18:53:41Z

@eVoloshchak I've updated the testing steps, you don't need that script anymore.

Do I need my account to be added to the policy rooms beta on dev for this to work?

You can just sign in with the testing account that I've provided in the QA steps, that's already been added to all the necessary betas, and you can just follow the QA steps if you're using WEB_PROXY=true. I've updated the instructions

jasperhuangg · 2023-03-08T21:58:55Z

Gonna ask for more reviews since we want to get this deployed before Friday

eVoloshchak · 2023-03-08T22:39:14Z

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 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 correct English and 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 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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

eVoloshchak

Looks good and tests well with the updated instructions, thanks

MelvinBot · 2023-03-08T22:57:51Z

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

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

src/pages/ReportSettingsPage.js

aldo-expensify · 2023-03-09T20:15:27Z

After you correct the function name here: https://github.com/Expensify/App/pull/15688/files#r1130755483, I'll approve.

Sorry for the slowness, just got to test it today.

thienlnam · 2023-03-10T15:18:46Z

Added a commit to this while Jasper is OOO, please give this a review (we want this out before ECX)

thienlnam · 2023-03-10T15:28:20Z

Okay tested locally, good to go cc @MonilBhavsar or @aldo-expensify

src/pages/ReportSettingsPage.js

…single function

jasperhuangg · 2023-03-11T08:34:19Z

@bondydaa @aldo-expensify @thienlnam Thank you guys for keeping this moving while I've been out sick. I have literally been in bed all day 😢

fixed the conditions and consolidated the logic as stated in your review comments, good for another look!

thienlnam

Just one comment about the naming of the linked workspace (can be addressed in a seperate PR)

Otherwise this looks good
I know this is urgent so going to approve

thienlnam · 2023-03-12T13:44:57Z

src/pages/ReportSettingsPage.js

+     * @param {Object|null} linkedWorkspace - the workspace the report is on, null if the user isn't a member of the workspace
+     * @returns {Boolean}
+     */
+    shouldDisableRename(linkedWorkspace) {


Can we just change this to currentWorkspace? I am not sure what linked workspace implies

Comments addressed

OSBotify · 2023-03-12T13:52:50Z

✋ 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-03-13T12:55:21Z

🚀 Deployed to staging by https://github.com/thienlnam in version: 1.2.83-0 🚀

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

OSBotify · 2023-03-13T14:44:43Z

🚀 Deployed to staging by https://github.com/thienlnam in version: 1.2.83-0 🚀

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

OSBotify · 2023-03-14T02:59:52Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.2.83-3 🚀

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

jasperhuangg added 2 commits March 6, 2023 10:20

disable renaming public rooms if the current user is not a member of …

672c408

…the workspace

disable renaming public rooms if the current user is not a member of …

f4efc77

…the workspace

jasperhuangg self-assigned this Mar 6, 2023

jasperhuangg added 3 commits March 6, 2023 10:32

remove unused

1bacb54

remove unused

4c0d168

lint

bac9f02

jasperhuangg changed the title ~~Disable renaming public rooms if the current user is not an admin or the creator of the linked workspace~~ [HOLD App#15392] Disable renaming public rooms if the current user is not an admin or the creator of the linked workspace Mar 6, 2023

jasperhuangg changed the title ~~[HOLD App#15392] Disable renaming public rooms if the current user is not an admin or the creator of the linked workspace~~ Disable renaming public rooms if the current user is not an admin or the creator of the linked workspace Mar 7, 2023

jasperhuangg added 4 commits March 6, 2023 22:04

Merge branch 'main' of github.com:Expensify/App into jasper-disableRe…

867ee55

…name

resolve conflicts

c6a38fe

remove unused, style

681a49f

remove unused

9b1bed7

jasperhuangg marked this pull request as ready for review March 7, 2023 19:43

jasperhuangg requested a review from a team as a code owner March 7, 2023 19:43

melvin-bot bot requested review from bondydaa and eVoloshchak and removed request for a team March 7, 2023 19:43

eVoloshchak previously approved these changes Mar 8, 2023

View reviewed changes

melvin-bot bot mentioned this pull request Mar 8, 2023

Payment issue for E/App PR#15688 #15756

Closed

aldo-expensify reviewed Mar 8, 2023

View reviewed changes

src/pages/ReportSettingsPage.js Outdated Show resolved Hide resolved

use early returns

ac3744a

jasperhuangg dismissed eVoloshchak’s stale review via ac3744a March 9, 2023 04:19

clarify comment

efd3e2b

jasperhuangg requested a review from aldo-expensify March 9, 2023 04:20

jasperhuangg requested a review from eVoloshchak March 9, 2023 04:20

MonilBhavsar reviewed Mar 9, 2023

View reviewed changes

src/pages/ReportSettingsPage.js Outdated Show resolved Hide resolved

src/pages/ReportSettingsPage.js Outdated Show resolved Hide resolved

aldo-expensify reviewed Mar 9, 2023

View reviewed changes

src/pages/ReportSettingsPage.js Outdated Show resolved Hide resolved

review comments

b657fa0

Update ReportSettingsPage.js

dffb136

eVoloshchak previously approved these changes Mar 10, 2023

View reviewed changes

aldo-expensify reviewed Mar 10, 2023

View reviewed changes

src/pages/ReportSettingsPage.js Outdated Show resolved Hide resolved

bondydaa previously requested changes Mar 10, 2023

View reviewed changes

src/pages/ReportSettingsPage.js Outdated Show resolved Hide resolved

src/pages/ReportSettingsPage.js Outdated Show resolved Hide resolved

bondydaa assigned thienlnam Mar 10, 2023

fix condition, move all condition checks for disabling renaming into …

24335d4

…single function

jasperhuangg dismissed eVoloshchak’s stale review via 24335d4 March 11, 2023 08:30

jasperhuangg requested review from aldo-expensify, thienlnam and bondydaa March 11, 2023 08:32

thienlnam approved these changes Mar 12, 2023

View reviewed changes

thienlnam merged commit 57a2129 into main Mar 12, 2023

thienlnam deleted the jasper-disableRename branch March 12, 2023 13:48

OSBotify mentioned this pull request Mar 13, 2023

Deploy Checklist: New Expensify 2023-03-13 #15889

Closed

16 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Disable renaming public rooms if the current user is not an admin or the creator of the linked workspace #15688

Disable renaming public rooms if the current user is not an admin or the creator of the linked workspace #15688

jasperhuangg commented Mar 6, 2023 •

edited

Loading

MelvinBot commented Mar 7, 2023

eVoloshchak commented Mar 8, 2023 •

edited

Loading

jasperhuangg commented Mar 8, 2023 •

edited

Loading

jasperhuangg commented Mar 8, 2023

eVoloshchak commented Mar 8, 2023 •

edited

Loading

eVoloshchak left a comment

MelvinBot commented Mar 8, 2023

aldo-expensify commented Mar 9, 2023 •

edited

Loading

thienlnam commented Mar 10, 2023

thienlnam commented Mar 10, 2023

jasperhuangg commented Mar 11, 2023

thienlnam left a comment •

edited

Loading

thienlnam Mar 12, 2023

OSBotify commented Mar 12, 2023

OSBotify commented Mar 13, 2023

OSBotify commented Mar 13, 2023

OSBotify commented Mar 14, 2023

Disable renaming public rooms if the current user is not an admin or the creator of the linked workspace #15688

Disable renaming public rooms if the current user is not an admin or the creator of the linked workspace #15688

Conversation

jasperhuangg commented Mar 6, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

MelvinBot commented Mar 7, 2023

eVoloshchak commented Mar 8, 2023 • edited Loading

jasperhuangg commented Mar 8, 2023 • edited Loading

jasperhuangg commented Mar 8, 2023

eVoloshchak commented Mar 8, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

eVoloshchak left a comment

Choose a reason for hiding this comment

MelvinBot commented Mar 8, 2023

aldo-expensify commented Mar 9, 2023 • edited Loading

thienlnam commented Mar 10, 2023

thienlnam commented Mar 10, 2023

jasperhuangg commented Mar 11, 2023

thienlnam left a comment • edited Loading

Choose a reason for hiding this comment

thienlnam Mar 12, 2023

Choose a reason for hiding this comment

OSBotify commented Mar 12, 2023

OSBotify commented Mar 13, 2023

OSBotify commented Mar 13, 2023

OSBotify commented Mar 14, 2023

jasperhuangg commented Mar 6, 2023 •

edited

Loading

eVoloshchak commented Mar 8, 2023 •

edited

Loading

jasperhuangg commented Mar 8, 2023 •

edited

Loading

eVoloshchak commented Mar 8, 2023 •

edited

Loading

aldo-expensify commented Mar 9, 2023 •

edited

Loading

thienlnam left a comment •

edited

Loading