Navigate to #admin on workspace creation by esh-g · Pull Request #22619 · Expensify/App

esh-g · 2023-07-11T06:30:16Z

Details

Fixed Issues

$ #21408
PROPOSAL: #21408 (comment)

Tests

Test 1

Login from an account with no workspace (or delete all workspaces)
Click on the + icon and create new workspace.
On fullscreen, verify that we navigate to #admins page report and also to the workspace details on the right.
On Small screen, verify that we are not shown the admin chat but are navigated to the details of the workspace.

Test 2

Go to settings -> workspace.
Click on "New Workspace"
On fullscreen, verify that we navigate to #admins page report and also to the workspace details on the right.
On Small screen, verify that we are not shown the admin chat but are navigated to the details of the workspace.

Test 3 (For web and mWeb)

Login to Old dot.
Go to settings -> policies -> groups.
Click on new policy.
Copy the URL and close the tab.
Open a new tab and paste the URL replacing new.expensify.com with localhost:8080.
On fullscreen, verify that we navigate to #admins page report and also to the workspace details on the right.
On Small screen, verify that we are not shown the admin chat but are navigated to the details of the workspace.

Verify that no errors appear in the JS console

Offline tests

Test 2 (Only this test required for offline)

Go to settings -> workspace.
Click on "New Workspace"
On fullscreen, verify that we navigate to #admins page report and also to the workspace details on the right.
On Small screen, verify that we are not shown the admin chat but are navigated to the details of the workspace.

QA Steps

Test 1

Login from an account with no workspace (or delete all workspaces)
Click on the + icon and create new workspace.
On fullscreen, verify that we navigate to #admins page report and also to the workspace details on the right.
On Small screen, verify that we are not shown the admin chat but are navigated to the details of the workspace.

Test 2

Go to settings -> workspace.
Click on "New Workspace"
On fullscreen, verify that we navigate to #admins page report and also to the workspace details on the right.
On Small screen, verify that we are not shown the admin chat but are navigated to the details of the workspace.

Test 3 (For web and mWeb)

Login to Old dot.
Go to settings -> policies -> groups.
Click on new policy.
Copy the URL and close the tab.
Open a new tab and paste the URL replacing new.expensify.com with staging.new.expensify.com
On fullscreen, verify that we navigate to #admins page report and also to the workspace details on the right.
On Small screen, verify that we are not shown the admin chat but are navigated to the details of the workspace.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screen.Recording.2023-07-08.at.2.28.23.PM.mov

Screen.Recording.2023-07-14.at.8.29.14.PM.mov

Screen.Recording.2023-07-14.at.8.37.51.PM-1.mov

Mobile Web - Chrome

Screen.Recording.2023-07-11.at.11.56.22.AM.mov

Screen.Recording.2023-07-14.at.9.46.08.PM.mov

Screen.Recording.2023-07-14.at.9.43.44.PM-1.mov

Mobile Web - Safari

Screen.Recording.2023-07-11.at.11.29.58.AM.mov

Screen.Recording.2023-07-14.at.9.01.15.PM.mov

Screen.Recording.2023-07-14.at.9.05.15.PM.mov

Desktop

Screen.Recording.2023-07-11.at.11.45.10.AM.mov

Screen.Recording.2023-07-14.at.8.32.41.PM.mov

iOS

Screen.Recording.2023-07-08.at.2.42.29.PM.mov

Screen.Recording.2023-07-14.at.9.00.46.PM.mov

Android

Screen.Recording.2023-07-11.at.11.53.31.AM.mov

Screen.Recording.2023-07-14.at.9.25.36.PM.mov

melvin-bot · 2023-07-11T06:30:21Z

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

esh-g · 2023-07-12T12:27:38Z

bump @abdulrahuman5196 I hope this looks good! Hope we can get this done till tomorrow 😇

abdulrahuman5196 · 2023-07-12T20:22:20Z

Sorry for the delay. Will complete the review in the morning.

abdulrahuman5196 · 2023-07-13T11:16:53Z

@esh-g There is an another createWorkspace ingress here which is missed in the PR -

App/src/libs/actions/App.js

Line 225 in 9e5d4ee

Policy.createWorkspace(policyOwnerEmail, makeMeAdmin, policyName, true);

esh-g · 2023-07-13T12:26:40Z

@abdulrahuman5196 Then would it be fine to pass the shouldNavigateToAdminChat argument rom AuthScreen.js (App.setUpPoliciesAndNavigate) --> actions/App.js (Policy.createWorkspace). In there:

App/src/libs/Navigation/AppNavigator/AuthScreens.js

Line 138 in 9b205fb

App.setUpPoliciesAndNavigate(this.props.session);

 App.setUpPoliciesAndNavigate(this.props.session, !this.props.isSmallScreenWidth);

esh-g · 2023-07-13T12:30:00Z

@abdulrahuman5196 This is the only case where the function setUpPoliciesAndNavigate is being called as well, so it can be easily changed without affecting other places.

abdulrahuman5196 · 2023-07-13T12:34:35Z

Yes. Its should be fine. @esh-g

esh-g · 2023-07-13T12:49:39Z

@abdulrahuman5196 I hope this looks good now!

esh-g · 2023-07-13T13:36:35Z

@abdulrahuman5196 Do I need to merge main to this PR?

abdulrahuman5196 · 2023-07-14T14:12:34Z

@esh-g I don't see testing video for this #22619 (comment) and the settings->workspace creation flow?

And author's checklist testing steps also doesn't have the same?

esh-g · 2023-07-14T15:16:55Z

@abdulrahuman5196 Sorry, I thought we only needed to add tests for the main bug.
I edited the Tests and am now creating the videos for the tests... But for Test 3, I'm not sure that is testable on native platforms...(because it involves manipulating URLs) Is it alright if I leave those out (for ios, android and desktop)?

esh-g · 2023-07-14T16:27:08Z

@abdulrahuman5196 I have now added videos for all platforms as well (except the ones mentioned in the above comment)

abdulrahuman5196 · 2023-07-14T18:26:57Z

@esh-g For the old dot migration flow,

For some reason the LHN becomes unresponsive for me, but the same doesn't happen on main.

Screen.Recording.2023-07-14.at.11.55.17.PM.mov

esh-g · 2023-07-15T06:01:12Z

@abdulrahuman5196 I merged main into this branch and it goes away.

Before

Screen.Recording.2023-07-15.at.11.28.09.AM-1.mov

After

Screen.Recording.2023-07-15.at.11.21.35.AM.mov

esh-g · 2023-07-15T07:45:11Z

@abdulrahuman5196 Do let me know if that fixes it for you 😇

esh-g · 2023-07-19T01:10:56Z

Bump @abdulrahuman5196

esh-g · 2023-07-19T01:42:07Z

@abdulrahuman5196 Seems like another PR removed the logic to navigate to the admins chat as well as policy details from the Policy.createWorkspace and deferred the navigation to App.createWorkspaceAndNavigateToIt. Should I just replace the Navigation.setParams there like I did in this solution?

abdulrahuman5196 · 2023-07-19T13:00:24Z

Should I just replace the Navigation.setParams there like I did in this solution?

@esh-g Yes. Its only the position of the code that has changed. The same solution should apply AFAIK

esh-g · 2023-07-19T16:08:18Z

@abdulrahuman5196 I have made the required changes!

esh-g · 2023-07-20T11:46:50Z

bump @abdulrahuman5196

abdulrahuman5196 · 2023-07-20T11:49:05Z

Hi, will work on the review today

abdulrahuman5196 · 2023-07-21T09:15:52Z

Working on review now

abdulrahuman5196 · 2023-07-21T13:42:54Z

@esh-g Test 2 alone will be applicable for offline test as well

abdulrahuman5196 · 2023-07-21T13:45:37Z

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-21.at.2.52.04.PM.mp4

Screen.Recording.2023-07-21.at.3.11.59.PM.mp4

Mobile Web - Chrome

az_recorder_20230721_151731.mp4

Mobile Web - Safari

Untitled.1.mp4

Desktop

Screen.Recording.2023-07-21.at.6.33.35.PM.mp4

iOS

Screen.Recording.2023-07-21.at.6.38.35.PM.mp4

Android

az_recorder_20230721_185519.mp4

esh-g · 2023-07-21T14:58:29Z

@abdulrahuman5196 Made the change for offline tests 💫

abdulrahuman5196

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

All yours @aldo-expensify

🎀 👀 🎀
C+ Reviewed

aldo-expensify

Tested well for me, thank you!

OSBotify · 2023-07-21T22:18:41Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

roryabraham · 2023-07-22T01:17:09Z

 import * as ReportUtils from '../../libs/ReportUtils';
 import * as CurrencyUtils from '../../libs/CurrencyUtils';
 import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading';
+import withWindowDimensions from '../../components/withWindowDimensions';


Minor feedback for next time, we have hooks to replace many of our HOCs, and we should strive to use them going forward in functional components

withWindowDimensions => useWindowDimensions

withLocalize => useLocalize

withNetwork => useNetwork

etc...

whenever refactoring a class component or adding new HOCs, please check src/hooks first. Thanks! 😄

OSBotify · 2023-07-25T01:43:54Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 1.3.45-0 🚀

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

OSBotify · 2023-07-26T15:53:25Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.45-7 🚀

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

Navigate to #admin on workspace creation

4eaa082

esh-g requested a review from a team as a code owner July 11, 2023 06:30

melvin-bot Bot requested review from abdulrahuman5196 and removed request for a team July 11, 2023 06:30

esh-g mentioned this pull request Jul 11, 2023

[HOLD for payment 2023-08-02] [$1000] Web - #admin is highlighted in LHN but shows Concierge report screen #21408

Closed

6 tasks

Updated transition workspace creation

641a3c7

Merge branch 'main' into nav-admin-workspace

38ccfaf

esh-g added 2 commits July 19, 2023 21:20

Merge branch 'main' into nav-admin-workspace

ccca953

prettify

25561e0

abdulrahuman5196 approved these changes Jul 21, 2023

View reviewed changes

melvin-bot Bot requested a review from aldo-expensify July 21, 2023 15:32

aldo-expensify approved these changes Jul 21, 2023

View reviewed changes

aldo-expensify merged commit f235a45 into Expensify:main Jul 21, 2023

roryabraham reviewed Jul 22, 2023

View reviewed changes

OSBotify mentioned this pull request Jul 25, 2023

Deploy Checklist: New Expensify 2023-07-25 #23522

Closed

kbecciv mentioned this pull request Aug 26, 2023

[Awaiting Payment][$1000] Web - Workspace - Concierge opens and #admin with WS settings close after coming from OD #23566

Closed

6 tasks

Uh oh!

Conversation

esh-g commented Jul 11, 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 Jul 11, 2023

Uh oh!

esh-g commented Jul 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

abdulrahuman5196 commented Jul 12, 2023

Uh oh!

abdulrahuman5196 commented Jul 13, 2023

Uh oh!

esh-g commented Jul 13, 2023

Uh oh!

esh-g commented Jul 13, 2023

Uh oh!

abdulrahuman5196 commented Jul 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

esh-g commented Jul 13, 2023

Uh oh!

esh-g commented Jul 13, 2023

Uh oh!

abdulrahuman5196 commented Jul 14, 2023

Uh oh!

esh-g commented Jul 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

esh-g commented Jul 14, 2023

Uh oh!

abdulrahuman5196 commented Jul 14, 2023

Uh oh!

esh-g commented Jul 15, 2023

Uh oh!

esh-g commented Jul 15, 2023

Uh oh!

esh-g commented Jul 19, 2023

Uh oh!

esh-g commented Jul 19, 2023

Uh oh!

abdulrahuman5196 commented Jul 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

esh-g commented Jul 19, 2023

Uh oh!

esh-g commented Jul 20, 2023

Uh oh!

abdulrahuman5196 commented Jul 20, 2023

Uh oh!

abdulrahuman5196 commented Jul 21, 2023

Uh oh!

abdulrahuman5196 commented Jul 21, 2023

Uh oh!

abdulrahuman5196 commented Jul 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

esh-g commented Jul 21, 2023

Uh oh!

abdulrahuman5196 left a comment

Choose a reason for hiding this comment

Uh oh!

aldo-expensify left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jul 21, 2023

Uh oh!

roryabraham Jul 22, 2023

Choose a reason for hiding this comment

Uh oh!

esh-g commented Jul 11, 2023 •

edited

Loading

esh-g commented Jul 12, 2023 •

edited

Loading

abdulrahuman5196 commented Jul 13, 2023 •

edited

Loading

esh-g commented Jul 14, 2023 •

edited

Loading

abdulrahuman5196 commented Jul 19, 2023 •

edited

Loading

abdulrahuman5196 commented Jul 21, 2023 •

edited

Loading