Fix/19987: Prioritize using name of policy from policy #20498

dukenv0307 · 2023-06-09T04:18:23Z

Details

Workspace name does not change when the room is set to "Public" because we use report.policyName first if it exists and when policy name is updated the BE doesn't update report.policyName. So we fix it by using name of policy from policy first

Fixed Issues

$ #19987
PROPOSAL: #19987 (comment)

Tests

Navigate to the "New room" option
Enter a room name and select a workspace
Set the visibility to "Public" and click on "Create room"
Proceed to the settings > Workspace section
Attempt to edit the workspace name
Verify that the workspace name is updated

Verify that no errors appear in the JS console

Offline tests

same above

QA Steps

Navigate to the "New room" option
Enter a room name and select a workspace
Set the visibility to "Public" and click on "Create room"
Proceed to the settings > Workspace section
Attempt to edit the workspace name
Verify that the workspace name is updated

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screen.Recording.2023-06-09.at.10.55.13.mp4

Mobile Web - Chrome

351827083_6514837461911474_1151533270012611305_n.mp4

Mobile Web - Safari

Screen.Recording.2023-06-09.at.10.58.30.mp4

Desktop

Screen.Recording.2023-06-09.at.11.05.54.mov

iOS

Screen.Recording.2023-06-09.at.11.23.34.mp4

Android

Screen.Recording.2023-06-09.at.11.37.32.1.mp4

melvin-bot · 2023-06-09T04:50:04Z

@puneetlath @allroundexperts 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]

allroundexperts · 2023-06-11T18:30:54Z

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-06-12.at.12.26.52.AM.mov

Mobile Web - Chrome

Screen.Recording.2023-06-12.at.12.32.41.AM.mov

Mobile Web - Safari

Screen.Recording.2023-06-12.at.12.32.05.AM.mov

Desktop

Screen.Recording.2023-06-12.at.12.30.54.AM.mov

iOS

Screen.Recording.2023-06-12.at.12.34.59.AM.mov

Android

Screen.Recording.2023-06-12.at.12.33.37.AM.mov

allroundexperts · 2023-06-11T18:56:40Z

src/libs/ReportUtils.js

    // Public rooms send back the policy name with the reportSummary,
    // since they can also be accessed by people who aren't in the workspace


@dukenv0307 Can you move this comment as well?

@allroundexperts Just updated. I think we only should comment in the first place.

allroundexperts · 2023-06-12T19:49:56Z

@dukenv0307 Any update on the outstanding comments?

dukenv0307 · 2023-06-13T02:38:48Z

@dukenv0307 Any update on the outstanding comments?

@allroundexperts I just updated above

allroundexperts · 2023-06-13T12:02:22Z

@dukenv0307 Any update on the outstanding comments?

@allroundexperts I just updated above

Sorry, I don't see the following being addressed:

dukenv0307 · 2023-06-13T16:39:01Z

@allroundexperts it's so weird, I don't see your comment. Could you help to check again?

src/libs/ReportUtils.js

allroundexperts · 2023-06-11T19:16:16Z

src/libs/ReportUtils.js

    if (!policy) {
+        if (report.policyName) {
+            return report.policyName;
+        }
        return report.oldPolicyName || Localize.translateLocal('workspace.common.unavailable');
    }


This can be removed as well and replaced by:

return _.get(report, 'policyName') || _.get(policy, 'name') || _.get(report, 'oldPolicyName') || Localize.translateLocal('workspace.common.unavailable')

@allroundexperts I just tested and see that this change will not work because we only should return report.policyName; if policy is falsy. So I think we should remain this code

But we're sort of repeating the condition I mentioned above. Can you look for a way with which we don't repeat the code?

@allroundexperts Just updated. Could you help to check last commit? Thanks

allroundexperts · 2023-06-13T16:40:47Z

@dukenv0307 My bad. I forgot to submit the review. Please confirm if you can see it now.

allroundexperts · 2023-06-13T19:46:15Z

src/libs/ReportUtils.js

    if (!policy) {
-        return report.oldPolicyName || Localize.translateLocal('workspace.common.unavailable');
+        // Public rooms send back the policy name with the reportSummary,
+        // since they can also be accessed by people who aren't in the workspace
+        if (report.policyName) {
+            return report.policyName;
+        }
+    } else if (policy.name) {
+        return policy.name;
    }
-
-    return policy.name || report.oldPolicyName || Localize.translateLocal('workspace.common.unavailable');
+    return report.oldPolicyName || Localize.translateLocal('workspace.common.unavailable');


@dukenv0307 Can't we replace above with:

return lodashGet(policy, 'name') || report.policyName || report.oldPolicyName || Localize.translateLocal('workspace.common.unavailable')

@allroundexperts I Just updated. It works well

Awesome. Thanks!

allroundexperts · 2023-06-14T20:02:13Z

src/libs/ReportUtils.js

+    if ((!allPolicies || _.size(allPolicies) === 0) && !report.policyName) {
        return Localize.translateLocal('workspace.common.unavailable');
    }


Is this needed @dukenv0307?

Oh, I see now that its needed. Else, we might show an old report name.

allroundexperts

Looks good!

dukenv0307 · 2023-06-15T02:28:07Z

@puneetlath All yours

dukenv0307 · 2023-06-20T13:30:36Z

@puneetlath Bump, Could you help to check this PR

OSBotify · 2023-06-20T20:03:14Z

✋ 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-06-21T02:26:10Z

🚀 Deployed to staging by https://github.com/puneetlath in version: 1.3.30-0 🚀

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

OSBotify · 2023-06-22T16:53:48Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.30-5 🚀

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

dukenv0307 added 2 commits June 9, 2023 11:03

fix: prioritize name of policy from policy

d3d77fe

fix: lint

b89e02a

dukenv0307 marked this pull request as ready for review June 9, 2023 04:49

dukenv0307 requested a review from a team as a code owner June 9, 2023 04:49

melvin-bot bot requested review from allroundexperts and puneetlath and removed request for a team June 9, 2023 04:50

dukenv0307 mentioned this pull request Jun 9, 2023

[HOLD for payment 2023-06-29] [$1000] Workspace name does not change when the room is set to "Public" #19987

Closed

6 tasks

allroundexperts reviewed Jun 11, 2023

View reviewed changes

fix: move comment

4708a64

allroundexperts reviewed Jun 13, 2023

View reviewed changes

dukenv0307 added 4 commits June 13, 2023 23:55

fix: simplize logic

736a492

fix: reset last commit

0174740

fix: lint

351b5b5

fix: remove repeated code

1e4c0ac

allroundexperts reviewed Jun 13, 2023

View reviewed changes

dukenv0307 added 2 commits June 14, 2023 09:32

fix: simplize logic

776dab4

fix: lint

a089e8f

allroundexperts reviewed Jun 14, 2023

View reviewed changes

allroundexperts approved these changes Jun 14, 2023

View reviewed changes

puneetlath approved these changes Jun 20, 2023

View reviewed changes

puneetlath merged commit 7857758 into Expensify:main Jun 20, 2023

OSBotify mentioned this pull request Jun 21, 2023

Deploy Checklist: New Expensify 2023-06-21 #21172

Closed

67 tasks

		// Public rooms send back the policy name with the reportSummary,
		// since they can also be accessed by people who aren't in the workspace

Fix/19987: Prioritize using name of policy from policy #20498

Fix/19987: Prioritize using name of policy from policy #20498

Uh oh!

Conversation

dukenv0307 commented Jun 9, 2023 • 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 Jun 9, 2023

Uh oh!

allroundexperts commented Jun 11, 2023 • 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!

allroundexperts commented Jun 12, 2023

Uh oh!

dukenv0307 commented Jun 13, 2023

Uh oh!

allroundexperts commented Jun 13, 2023

Uh oh!

dukenv0307 commented Jun 13, 2023

Uh oh!

Uh oh!

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!

allroundexperts commented Jun 13, 2023

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!

allroundexperts left a comment

Choose a reason for hiding this comment

Uh oh!

dukenv0307 commented Jun 15, 2023

Uh oh!

dukenv0307 commented Jun 20, 2023

Uh oh!

OSBotify commented Jun 20, 2023

Uh oh!

OSBotify commented Jun 21, 2023

Uh oh!

OSBotify commented Jun 22, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dukenv0307 commented Jun 9, 2023 •

edited

Loading

allroundexperts commented Jun 11, 2023 •

edited

Loading