Going to workspace from details page #19064

alitoshmatov · 2023-05-16T19:28:53Z

Details

Going to workspace page from report details page

Fixed Issues

$ #18895
PROPOSAL: #18895 (comment)

Tests

Open policy room
Open details of the room
Click on the workspace name under the room name
4(a). If you are an admin of room's workspace, you should go to workspace page
4(b). If you are not admin of room's workspace, nothing should happen

Verify that no errors appear in the JS console

Offline tests

Open policy room
Open details of the room
Click on the workspace name under the room name
4(a). If you are an admin of room's workspace, you should go to workspace page
4(b). If you are not admin of room's workspace, nothing should happen

QA Steps

Open policy room
Open details of the room
Click on the workspace name under the room name
4(a). If you are an admin of room's workspace, you should go to workspace page
4(b). If you are not admin of room's workspace, nothing should happen

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

18895-web.mov

Mobile Web - Chrome

18895-mWeb.mp4

Mobile Web - Safari

18895-safari.mp4

Desktop

18895-desktop.mov

iOS

18895-ios.mp4

Android

18895-android.mp4

… admin in report's policy

melvin-bot · 2023-05-16T19:28:58Z

@puneetlath @0xmiroslav 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]

0xmiros · 2023-05-18T18:08:43Z

@alitoshmatov the expected behavior is wrong. It should go to workspace settings page, not initial page

src/libs/ReportUtils.js

src/pages/ReportDetailsPage.js

0xmiros · 2023-05-18T18:27:04Z

@puneetlath I am re-considering this conern.
Do you think it should be conditional? So if Settings page comes from Details page, go back to Details. if not, go to Initial page.
Or leave current behavior as is?

Screen.Recording.2023-05-18.at.8.23.15.PM.mov

0xmiros · 2023-05-18T18:45:00Z

@puneetlath Also, workspace chat has a bit different design. Title is workspace name and subtitle is just "Workspace" text.
In all other chats, title is report name, subtitle is policy (workspace) name

Screen.Recording.2023-05-18.at.8.42.07.PM.mov

In this case, both title and subtitle should link to workspace settings?

Co-authored-by: Miroslav Stevanovic <97473779+0xmiroslav@users.noreply.github.com>

puneetlath · 2023-05-18T20:30:08Z

Interesting questions.

@puneetlath I am re-considering #18895 (comment).
Do you think it should be conditional? So if Settings page comes from Details page, go back to Details. if not, go to Initial page.
Or leave current behavior as is?

I think leave as-is. I think it's fine.

@puneetlath Also, workspace chat has a bit different design. Title is workspace name and subtitle is just "Workspace" text.
In all other chats, title is report name, subtitle is policy (workspace) name
In this case, both title and subtitle should link to workspace settings?

I think I kind of like it how it is actually. Where just the word "workspace" is linked.

0xmiros · 2023-05-18T20:33:36Z

ok great! This is ready for you to review @puneetlath
Meanwhile, I will do checklist.

src/libs/ReportUtils.js

src/pages/ReportDetailsPage.js

0xmiros · 2023-05-18T21:30:34Z

Also the branch has conflict now

src/libs/PolicyUtils.js

Co-authored-by: Puneet Lath <puneet@expensify.com>

alitoshmatov · 2023-05-18T21:53:27Z

@0xmiroslav resolved conflicts

src/libs/PolicyUtils.js

Co-authored-by: Miroslav Stevanovic <97473779+0xmiroslav@users.noreply.github.com>

alitoshmatov

Applied requested changes

0xmiros · 2023-05-18T22:23:13Z

Thanks for the quick updates

0xmiros · 2023-05-18T22:27:34Z

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

web.mov

Mobile Web - Chrome

mchrome.mov

Mobile Web - Safari

msafari.mov

Desktop

desktop.mov

iOS

ios.mov

Android

android.mov

0xmiros · 2023-05-18T22:29:16Z

@alitoshmatov I think test step needs separated into 2 cases - admin, not admin

alitoshmatov · 2023-05-18T22:37:54Z

@0xmiroslav updated test steps

0xmiros · 2023-05-18T22:39:19Z

LGTM!
@puneetlath all yours!

puneetlath

Just one comment. Otherwise looks good and tests well.

src/pages/ReportDetailsPage.js

Co-authored-by: Puneet Lath <puneet@expensify.com>

OSBotify · 2023-05-19T13:58: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-05-22T23:51:09Z

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

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

OSBotify · 2023-05-25T00:23:01Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.17-5 🚀

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

fedirjh · 2023-08-16T12:51:41Z

src/pages/ReportDetailsPage.js

-                                        {chatRoomSubtitle}
-                                    </Text>
+                                    {isPolicyAdmin ? (
+                                        <Pressable


Coming from #23355, we should have taken into account the scenario in which the workspace has a pending delete action, and consequently, disable navigation to that workspace.

Added isPolicyAdmin function which takes report and checks if user is…

57b8d5d

… admin in report's policy

alitoshmatov requested a review from a team as a code owner May 16, 2023 19:28

melvin-bot bot requested review from 0xmiros and puneetlath and removed request for a team May 16, 2023 19:28

alitoshmatov mentioned this pull request May 16, 2023

[HOLD for payment 2023-06-01] [$1000] Feature Request: Implement workspace link in the details page of a room to get to workspace editor #18895

Closed

6 tasks

alitoshmatov added 2 commits May 17, 2023 00:40

Fixed lint error

7404324

Fixed unexpected podfile.lock change

f3db637

0xmiros suggested changes May 18, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

src/pages/ReportDetailsPage.js Show resolved Hide resolved

alitoshmatov and others added 3 commits May 19, 2023 01:07

Update src/libs/ReportUtils.js

1b376a3

Co-authored-by: Miroslav Stevanovic <97473779+0xmiroslav@users.noreply.github.com>

Update src/libs/ReportUtils.js

ac24c10

Co-authored-by: Miroslav Stevanovic <97473779+0xmiroslav@users.noreply.github.com>

Fixed route to go to workspace settings page

50c5e3b

Co-authored-by: Miroslav Stevanovic <97473779+0xmiroslav@users.noreply.github.com>

puneetlath requested changes May 18, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

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

alitoshmatov added 2 commits May 19, 2023 02:00

Removed reduntant condition

ec99524

Placed isPolicyAdmin to policyUtils

fd69abd

0xmiros reviewed May 18, 2023

View reviewed changes

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

alitoshmatov added 3 commits May 19, 2023 02:35

Extracted getPolicy method

543144c

Merging upstream

91c95f4

Removed lint error

7c8cb65

puneetlath reviewed May 18, 2023

View reviewed changes

src/libs/PolicyUtils.js Outdated Show resolved Hide resolved

Updated comment

962355c

Co-authored-by: Puneet Lath <puneet@expensify.com>

0xmiros reviewed May 18, 2023

View reviewed changes

src/libs/PolicyUtils.js Outdated Show resolved Hide resolved

Update src/libs/PolicyUtils.js

ef3975d

Co-authored-by: Miroslav Stevanovic <97473779+0xmiroslav@users.noreply.github.com>

alitoshmatov commented May 18, 2023

View reviewed changes

alitoshmatov requested a review from puneetlath May 18, 2023 22:21

0xmiros previously approved these changes May 18, 2023

View reviewed changes

puneetlath requested changes May 19, 2023

View reviewed changes

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

alitoshmatov dismissed 0xmiros’s stale review via 3da475d May 19, 2023 13:44

Changing back to go to workspace initial page

3da475d

Co-authored-by: Puneet Lath <puneet@expensify.com>

0xmiros approved these changes May 19, 2023

View reviewed changes

puneetlath approved these changes May 19, 2023

View reviewed changes

puneetlath merged commit 33447f7 into Expensify:main May 19, 2023

alitoshmatov deleted the from-details-to-workspace branch May 19, 2023 14:08

OSBotify mentioned this pull request May 22, 2023

Deploy Checklist: New Expensify 2023-05-22 #19422

Closed

62 tasks

dhairyasenjaliya mentioned this pull request May 25, 2023

A Long workspace name is cut off in Details sidebar #19609

Closed

6 tasks

fedirjh reviewed Aug 16, 2023

View reviewed changes

fedirjh mentioned this pull request Aug 16, 2023

[HOLD for payment 2023-08-16] [$1000] Web - Deleted Workspace can be accessed after deleting a workspace offline #23355

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Going to workspace from details page #19064

Going to workspace from details page #19064

alitoshmatov commented May 16, 2023 •

edited

Loading

melvin-bot bot commented May 16, 2023

0xmiros commented May 18, 2023

0xmiros commented May 18, 2023

0xmiros commented May 18, 2023

puneetlath commented May 18, 2023

0xmiros commented May 18, 2023

0xmiros commented May 18, 2023

alitoshmatov commented May 18, 2023

alitoshmatov left a comment

0xmiros commented May 18, 2023

0xmiros commented May 18, 2023

0xmiros commented May 18, 2023

alitoshmatov commented May 18, 2023

0xmiros commented May 18, 2023

puneetlath left a comment

OSBotify commented May 19, 2023

OSBotify commented May 22, 2023

OSBotify commented May 25, 2023

fedirjh Aug 16, 2023

Going to workspace from details page #19064

Going to workspace from details page #19064

Conversation

alitoshmatov commented May 16, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 16, 2023

0xmiros commented May 18, 2023

0xmiros commented May 18, 2023

0xmiros commented May 18, 2023

puneetlath commented May 18, 2023

0xmiros commented May 18, 2023

0xmiros commented May 18, 2023

alitoshmatov commented May 18, 2023

alitoshmatov left a comment

Choose a reason for hiding this comment

0xmiros commented May 18, 2023

0xmiros commented May 18, 2023

Reviewer Checklist

Screenshots/Videos

0xmiros commented May 18, 2023

alitoshmatov commented May 18, 2023

0xmiros commented May 18, 2023

puneetlath left a comment

Choose a reason for hiding this comment

OSBotify commented May 19, 2023

OSBotify commented May 22, 2023

OSBotify commented May 25, 2023

fedirjh Aug 16, 2023

Choose a reason for hiding this comment

alitoshmatov commented May 16, 2023 •

edited

Loading