fix: should not be able to set welcome message for threads created from policy room by dukenv0307 · Pull Request #30676 · Expensify/App

dukenv0307 · 2023-11-01T09:16:17Z

Details

Fixed Issues

$ #29454
PROPOSAL: #29454 (comment)

Tests

Go to a policy room like #admins
Send a message in the room.
Create a thread A from the message.
Click on the report header.
Click on settings.
Verify that "Set welcome message" is not shown here
Back to that thread A, go deeplink by adding: /welcomeMessage
Verity that Not found page is displayed

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to a policy room like #admins
Send a message in the room.
Create a thread A from the message.
Click on the report header.
Click on settings.
Verify that "Set welcome message" is not shown here
Back to that thread A, go deeplink by adding: /welcomeMessage
Verity that Not found page is displayed

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android-resize.mov

Android: mWeb Chrome

chrome-resize.mov

iOS: Native

ios-resize.mov

iOS: mWeb Safari

safari-resize.mov

MacOS: Chrome / Safari

web-resize.mov

MacOS: Desktop

desktop-resize.mov

…om policy room

melvin-bot · 2023-11-01T09:53:19Z

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

dukenv0307 · 2023-11-01T09:55:43Z

@mollfpr Please ignore this PR. I believe the auto-assign is wrong here since the issue is not assigned to C+
@situchan Please help review this PR

dukenv0307 · 2023-11-03T03:07:21Z

@situchan Friendly bump. Please help review the PR

dukenv0307 · 2023-11-06T03:48:46Z

@situchan Friendly bump. Please help review this PR

situchan · 2023-11-12T08:06:23Z

    return room;
 }
+/**
+ * We want policy owners and admins to be able to modify the welcome message only when the report is not a thread chat


Suggested change

* We want policy owners and admins to be able to modify the welcome message only when the report is not a thread chat

* We only want policy owners and admins to be able to modify the welcome message, but not in thread chat.

situchan · 2023-11-12T08:07:03Z

+ * @return {Boolean}
+ */
+function checkShouldDisableWelcomeMessage(report, policy) {
+    return isMoneyRequestReport(report) || isArchivedRoom(report) || !isChatRoom(report) || _.isEmpty(policy) || policy.role !== CONST.POLICY.ROLE.ADMIN || isChatThread(report);


Suggested change

return isMoneyRequestReport(report) || isArchivedRoom(report) || !isChatRoom(report) || _.isEmpty(policy) || policy.role !== CONST.POLICY.ROLE.ADMIN || isChatThread(report);

return isMoneyRequestReport(report) || isArchivedRoom(report) || !isChatRoom(report) || isChatThread(report) || !PolicyUtils.isPolicyAdmin(policy);

situchan · 2023-11-12T08:09:06Z

+ * @param {Object} policy
+ * @return {Boolean}
+ */
+function checkShouldDisableWelcomeMessage(report, policy) {


rename to shouldDisableWelcomeMessage

situchan · 2023-11-12T08:10:16Z

Please pull main when ready for next review

situchan · 2023-11-12T13:29:55Z

            testID={ReportWelcomeMessagePage.displayName}
        >
-            <FullPageNotFoundView shouldShow={!PolicyUtils.isPolicyAdmin(props.policy)}>
+            <FullPageNotFoundView shouldShow={!PolicyUtils.isPolicyAdmin(props.policy) || ReportUtils.checkShouldDisableWelcomeMessage(props.report, props.policy)}>


Suggested change

<FullPageNotFoundView shouldShow={!PolicyUtils.isPolicyAdmin(props.policy) || ReportUtils.checkShouldDisableWelcomeMessage(props.report, props.policy)}>

<FullPageNotFoundView shouldShow={ReportUtils.checkShouldDisableWelcomeMessage(props.report, props.policy)}>

dukenv0307 · 2023-11-13T10:44:30Z

@situchan Updated. Please help review again

situchan · 2023-11-15T16:46:48Z

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

android.mov

Android: mWeb Chrome

mchrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web1.mov

web2.mov

MacOS: Desktop

desktop.mov

situchan · 2023-11-15T16:47:21Z

@dukenv0307 please pull main to fix author checklist failure

dukenv0307 · 2023-11-15T16:58:38Z

Updated.

OSBotify · 2023-11-15T19:32:03Z

✋ 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-11-20T13:40:50Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.0-3 🚀

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

fix: should not be able to set welcome message for threads created fr…

d888bd2

…om policy room

dukenv0307 marked this pull request as ready for review November 1, 2023 09:53

dukenv0307 requested a review from a team as a code owner November 1, 2023 09:53

melvin-bot Bot requested review from mollfpr and removed request for a team November 1, 2023 09:53

resolve conflict

a450a7c

dukenv0307 added 2 commits November 6, 2023 10:27

Merge branch 'main' into fix/29454

358c53f

fix lint issue

6c6a057

resolve conflict

18f9bd1

situchan suggested changes Nov 12, 2023

View reviewed changes

situchan reviewed Nov 12, 2023

View reviewed changes

dukenv0307 added 2 commits November 13, 2023 17:31

Merge branch 'main' into fix/29454

d88c951

update conditions

b732182

situchan approved these changes Nov 15, 2023

View reviewed changes

melvin-bot Bot requested a review from chiragsalian November 15, 2023 16:48

Merge branch 'main' into fix/29454

36b7d9e

chiragsalian approved these changes Nov 15, 2023

View reviewed changes

chiragsalian merged commit 1ca499c into Expensify:main Nov 15, 2023

OSBotify mentioned this pull request Nov 16, 2023

Deploy Checklist: New Expensify 2023-11-15 #31404

Closed

37 tasks

melvin-bot Bot mentioned this pull request Nov 20, 2023

[HOLD for payment 2023-11-27] [$500] Able to set welcome message for threads created from policy room #29454

Closed

6 tasks

	* We want policy owners and admins to be able to modify the welcome message only when the report is not a thread chat
	* We only want policy owners and admins to be able to modify the welcome message, but not in thread chat.

	return isMoneyRequestReport(report) \|\| isArchivedRoom(report) \|\| !isChatRoom(report) \|\| _.isEmpty(policy) \|\| policy.role !== CONST.POLICY.ROLE.ADMIN \|\| isChatThread(report);
	return isMoneyRequestReport(report) \|\| isArchivedRoom(report) \|\| !isChatRoom(report) \|\| isChatThread(report) \|\| !PolicyUtils.isPolicyAdmin(policy);

	<FullPageNotFoundView shouldShow={!PolicyUtils.isPolicyAdmin(props.policy) \|\| ReportUtils.checkShouldDisableWelcomeMessage(props.report, props.policy)}>
	<FullPageNotFoundView shouldShow={ReportUtils.checkShouldDisableWelcomeMessage(props.report, props.policy)}>

Conversation

dukenv0307 commented Nov 1, 2023 • edited by github-actions Bot 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 Nov 1, 2023

Uh oh!

dukenv0307 commented Nov 1, 2023

Uh oh!

dukenv0307 commented Nov 3, 2023

Uh oh!

dukenv0307 commented Nov 6, 2023

Uh oh!

situchan Nov 12, 2023

Choose a reason for hiding this comment

Uh oh!

situchan Nov 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

situchan Nov 12, 2023

Choose a reason for hiding this comment

Uh oh!

situchan commented Nov 12, 2023

Uh oh!

situchan Nov 12, 2023

Choose a reason for hiding this comment

Uh oh!

dukenv0307 commented Nov 13, 2023

Uh oh!

situchan commented Nov 15, 2023

Reviewer Checklist

Screenshots/Videos

Uh oh!

situchan commented Nov 15, 2023

Uh oh!

dukenv0307 commented Nov 15, 2023

Uh oh!

OSBotify commented Nov 15, 2023

Uh oh!

OSBotify commented Nov 20, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dukenv0307 commented Nov 1, 2023 •

edited by github-actions Bot

Loading

situchan Nov 12, 2023 •

edited

Loading