Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Directly create a workspace and add the Edit Workspace page #4310

Merged
merged 17 commits into from
Aug 3, 2021

Conversation

jasperhuangg
Copy link
Contributor

@jasperhuangg jasperhuangg commented Jul 29, 2021

Details

See the issue for more context

Fixed Issues

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

Tests/QA

You'll need a few accounts with different emails, namely one with a public domain (e.g. test@gmail.com) and two with private domains, one where we have a company name registered (e.g. test@expensify.com), and one where we don't (e.g. test@alksdjflasdf.com).

For both of these accounts:

  1. Open the global create menu, click "New Workspace".
  2. Verify that the new workspace is created directly and that you're navigated to the Workspace Settings page.
  3. Verify the name of the workspace is auto-generated correctly:
  • For the account with the public domain, it should be everything before the '@'
  • For the account with the private domain, it should be the company name if it exists, or just everything before the '@'

Tested On

  • Web
  • Mobile Web
  • Desktop
  • iOS
  • Android

Screenshots

N/A (no UI changes)

@jasperhuangg jasperhuangg self-assigned this Jul 29, 2021
src/languages/es.js Outdated Show resolved Hide resolved
@jasperhuangg jasperhuangg requested review from mountiny and removed request for mountiny July 29, 2021 18:47
@jasperhuangg jasperhuangg marked this pull request as ready for review July 29, 2021 20:33
@jasperhuangg jasperhuangg requested a review from a team as a code owner July 29, 2021 20:33
@MelvinBot MelvinBot requested review from tylerkaraszewski and removed request for a team July 29, 2021 20:49
@jasperhuangg
Copy link
Contributor Author

jasperhuangg commented Jul 29, 2021

@tylerkaraszewski Gonna unrequest you for review and request @mountiny to simplify review. He was auto-assigned to review https://github.com/Expensify/Web-Expensify/pull/31579, which this depends on.

@jasperhuangg jasperhuangg requested review from mountiny and removed request for tylerkaraszewski July 29, 2021 23:42
@jasperhuangg
Copy link
Contributor Author

jasperhuangg commented Jul 30, 2021

@mountiny This and https://github.com/Expensify/Web-Expensify/pull/31579 should be good for review, thanks!

@mountiny
Copy link
Contributor

@MitchExpensify @jasperhuangg @HorusGoul I guess there might be some merge conflicts coming between this and this PR: #4298

mountiny
mountiny previously approved these changes Jul 30, 2021
Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and code looks good to me, however, there is a lot of stuff which is done in the PR I linked above (which I coincidently review as well 😅 ). I believe you should negotiate, who will merge first, or even merge these two branches to one PR.

I believe based on the nature of the PR by @HorusGoul, which has more changes in terms of design, that one should be merged first. Then just update that code with these functional changes (skipping adding name).

What do you think? 👀 Also we do not need to rush as we should wait for https://github.com/Expensify/Web-Expensify/pull/31579 to be deployed to production.

@jasperhuangg
Copy link
Contributor Author

jasperhuangg commented Jul 30, 2021

Ah it looks like I might have done some duplicate work 😅 The issue made it seem like I was supposed to implement everything, but I guess I was only supposed to make it so that clicking "New Workspace" would directly create the workspace.

I think it's alright if we merge the other PR first, since it has been back and forth with design. I'll revert the changes in this one that would otherwise conflict.

cc @mountiny @HorusGoul

@jasperhuangg
Copy link
Contributor Author

@mountiny Should be good for another look! I've removed all the conflicting changes with #4298.

@mountiny
Copy link
Contributor

@jasperhuangg Thanks! Do you reckon we should still wait or good to merge? Probably good to wait, we should make sure the Web-Expensify changes are deployed before merging this to main as it would be broken for anyone who has local environment pointed to production.

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works!

@jasperhuangg
Copy link
Contributor Author

@mountiny Yep! Definitely should wait for the Web-E changes to go out on prod before we merge this. Otherwise we'll be creating workspaces without any names 😅

@mountiny
Copy link
Contributor

@jasperhuangg I see no problem there 😂

@MitchExpensify
Copy link
Contributor

Good catch on the overlap and finding the best path forward! @jasperhuangg @vitHoracek

@mountiny mountiny changed the title [HOLD Web-Expensify 31579] Directly create a workspace and add the Edit Workspace page Directly create a workspace and add the Edit Workspace page Aug 3, 2021
@mountiny mountiny merged commit d15beee into main Aug 3, 2021
@mountiny mountiny deleted the jasper-editWorkspacePage branch August 3, 2021 12:12
@OSBotify
Copy link
Contributor

OSBotify commented Aug 3, 2021

✋ 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
Copy link
Contributor

OSBotify commented Aug 6, 2021

🚀 Deployed to staging in version: 1.0.82-8🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by @francoisl in version: 1.0.83-1 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants