[No QA]Fix Free Workspace transitions, add `Admin` badge to all admins #11774

alex-mechler · 2022-10-12T19:32:33Z

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/233026
PROPOSAL: N/A

Tests

Must be tested with https://github.com/Expensify/Web-Expensify/pull/35133

On OldDot, set up an approved accountant and 121 https://stackoverflow.com/c/expensify/questions/337 https://stackoverflow.com/c/expensify/questions/14339
As the Approved accountant, navigate to Policies -> Group -> New Policy
Enable Create for another account and fill out the form

Select the free plan
Verify you are brought in a new tab to the new workspace in newdot
Verify the members are a guide, the account you selected, and yourself, and all 3 are admins
For each platform, sign into the new account, and verify you see the admin badge next to all three members

Verify that no new errors appear in the JS console (The 'isRequired' is required is an existing error in main)

PR Review Checklist

PR Author Checklist

PR Reviewer Checklist

The reviewer will copy/paste it into a new comment and complete it after the author checklist is completed

QA Steps

Until https://github.com/Expensify/Web-Expensify/pull/35133 is on production, these steps will fail. Treat this as NO QA

On a new account on the gmail domain, create a new Workspace
Verify you are given an assigned guide in the Workspace
Verify the guide is shown as an admin

On each platform, sign in as the same user, and verify the guide is shown as an admin on each

Verify that no new errors appear in the JS console (The 'isRequired' is required is an existing error in main)

Screenshots

Web

Mobile Web - Chrome

#### Mobile Web - Safari

Desktop

iOS

Android

AndrewGable · 2022-10-12T20:35:29Z

src/libs/actions/App.js

+    const ownerEmail = url.searchParams.get('ownerEmail');
+    const makeMeAdmin = url.searchParams.get('makeMeAdmin');


So if alex was my guide and created the policy for me:

Alex is hitting this URL via his new dot

ownerEmail is andrew@email.com

makeMeAdmin is true

Is that correct?

Correct, Alex would be hitting this through a transition link generated by OldDot

AndrewGable

Code looks good but one question on implementation just for my knowledge.

Also do we want to CP this to staging?

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:
- iOS / native
- Android / native
- iOS / Safari
- Android / Chrome
- MacOS / Chrome
- 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 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 was added in all src/languages/* files
- I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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 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 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

francoisl · 2022-10-12T20:41:38Z

Hm so the step 5 of the test worked at first, but then after a few seconds the I got a "It's not here" error....

Trying to reproduce with a new workspace now to see why it happens.

francoisl · 2022-10-12T21:03:27Z

Trying again now, it works in that I have access to the workspace chat, but the right hand panel automatically switches to "it's not there" after ~1 second (I imagine an onyx update pushed from the backend, but I can't tell which one from the logs)

Screen.Recording.2022-10-12.at.1.59.10.PM.mov

alex-mechler · 2022-10-12T21:04:30Z

Just to confirm @francoisl you have the latest version of the linked Web PR running locally? https://github.com/Expensify/Web-Expensify/pull/35133

francoisl · 2022-10-12T21:05:51Z

Yes

github-actions · 2022-10-12T21:06:03Z

⚠️ ⚠️ Heads up! This pull request has the CP Staging label. ⚠️ ⚠️
Merging it will cause it to be immediately deployed to staging, even if the open StagingDeployCash deploy checklist is locked.

francoisl · 2022-10-12T21:26:52Z

Discussed in slack, but it works after making a new guide account. I guess something was messed up with the existing one I had?

alex-mechler · 2022-10-12T21:28:58Z

Yeah, thats very strange. Are you sure there wasnt a typo in the email that would make it the wrong domain before? Not sure what else that could be

melvin-bot · 2022-10-12T21:44:18Z

@alex-mechler looks like this was merged without passing tests. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

alex-mechler · 2022-10-12T21:45:50Z

This was passing travis 😅

Merged with approval https://expensify.slack.com/archives/C042KQL7963/p1665610912585159?thread_ts=1665596202.592759&cid=C042KQL7963

…ition (cherry picked from commit 3a6fe30)

…-11774 🍒 Cherry pick PR #11774 to staging 🍒

OSBotify · 2022-10-12T23:27:37Z

🚀 Cherry-picked to staging by @alex-mechler in version: 1.2.13-4 🚀

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

OSBotify · 2022-10-13T05:54:37Z

🚀 Deployed to production by @yuwenmemon in version: 1.2.13-5 🚀

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

…min-transition

OSBotify · 2023-06-15T01:44:22Z

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀

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

Alexander Mechler added 4 commits October 11, 2022 16:16

Make the admin badge based on roles

e944430

Also add back self check

296cf4d

Add makeMeAdmin and ownerEmail parameters to createWorkspace

9170edf

Add comments

f9b0e4a

alex-mechler requested a review from AndrewGable October 12, 2022 19:32

alex-mechler marked this pull request as ready for review October 12, 2022 19:33

alex-mechler requested a review from a team as a code owner October 12, 2022 19:33

melvin-bot bot requested review from francoisl and removed request for a team October 12, 2022 19:33

AndrewGable reviewed Oct 12, 2022

View reviewed changes

AndrewGable approved these changes Oct 12, 2022

View reviewed changes

alex-mechler added the CP Staging label Oct 12, 2022

alex-mechler self-assigned this Oct 12, 2022

francoisl approved these changes Oct 12, 2022

View reviewed changes

alex-mechler merged commit 3a6fe30 into main Oct 12, 2022

alex-mechler deleted the amechler-make-me-admin-transition branch October 12, 2022 21:44

melvin-bot bot added the Emergency label Oct 12, 2022

alex-mechler removed the Emergency label Oct 12, 2022

OSBotify pushed a commit that referenced this pull request Oct 12, 2022

Merge pull request #11774 from Expensify/amechler-make-me-admin-trans…

2ab566f

…ition (cherry picked from commit 3a6fe30)

OSBotify mentioned this pull request Oct 12, 2022

🍒 Cherry pick PR #11774 to staging 🍒 #11780

Merged

OSBotify added a commit that referenced this pull request Oct 12, 2022

Merge pull request #11780 from Expensify/OSBotify-cherry-pick-staging…

8b01b75

…-11774 🍒 Cherry pick PR #11774 to staging 🍒

OSBotify mentioned this pull request Oct 12, 2022

Deploy Checklist: New Expensify 2022-10-11 #11741

Closed

48 tasks

alex-mechler changed the title ~~Fix Free Workspace transitions, add Admin badge to all admins~~ [No QA]Fix Free Workspace transitions, add Admin badge to all admins Oct 12, 2022

OSBotify mentioned this pull request Oct 13, 2022

Deploy Checklist: New Expensify 2022-10-13 #11793

Closed

9 tasks

smrutiparida pushed a commit to autosave-app/App that referenced this pull request Oct 13, 2022

Merge pull request Expensify#11774 from Expensify/amechler-make-me-ad…

f5ae83a

…min-transition

OSBotify mentioned this pull request Oct 14, 2022

Deploy Checklist: New Expensify 2022-10-14 #11873

Closed

53 tasks

OSBotify mentioned this pull request May 2, 2023

Deploy Checklist: New Expensify 2023-05-02 #18315

Closed

OSBotify mentioned this pull request Jun 15, 2023

Deploy Checklist: New Expensify 2023-06-14 #20782

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[No QA]Fix Free Workspace transitions, add `Admin` badge to all admins #11774

[No QA]Fix Free Workspace transitions, add `Admin` badge to all admins #11774

alex-mechler commented Oct 12, 2022 •

edited

AndrewGable Oct 12, 2022

alex-mechler Oct 12, 2022

AndrewGable left a comment •

edited

francoisl commented Oct 12, 2022

francoisl commented Oct 12, 2022

alex-mechler commented Oct 12, 2022

francoisl commented Oct 12, 2022

github-actions bot commented Oct 12, 2022

francoisl commented Oct 12, 2022

alex-mechler commented Oct 12, 2022

melvin-bot bot commented Oct 12, 2022

alex-mechler commented Oct 12, 2022 •

edited

OSBotify commented Oct 12, 2022

OSBotify commented Oct 13, 2022

OSBotify commented Jun 15, 2023

		const ownerEmail = url.searchParams.get('ownerEmail');
		const makeMeAdmin = url.searchParams.get('makeMeAdmin');

[No QA]Fix Free Workspace transitions, add Admin badge to all admins #11774

[No QA]Fix Free Workspace transitions, add Admin badge to all admins #11774

Conversation

alex-mechler commented Oct 12, 2022 • edited

Fixed Issues

Tests

PR Review Checklist

PR Author Checklist

PR Reviewer Checklist

QA Steps

Screenshots

Web

Mobile Web - Chrome

Desktop

iOS

Android

AndrewGable Oct 12, 2022

Choose a reason for hiding this comment

alex-mechler Oct 12, 2022

Choose a reason for hiding this comment

AndrewGable left a comment • edited

Choose a reason for hiding this comment

francoisl commented Oct 12, 2022

francoisl commented Oct 12, 2022

alex-mechler commented Oct 12, 2022

francoisl commented Oct 12, 2022

github-actions bot commented Oct 12, 2022

francoisl commented Oct 12, 2022

alex-mechler commented Oct 12, 2022

melvin-bot bot commented Oct 12, 2022

alex-mechler commented Oct 12, 2022 • edited

OSBotify commented Oct 12, 2022

OSBotify commented Oct 13, 2022

OSBotify commented Jun 15, 2023

[No QA]Fix Free Workspace transitions, add `Admin` badge to all admins #11774

[No QA]Fix Free Workspace transitions, add `Admin` badge to all admins #11774

alex-mechler commented Oct 12, 2022 •

edited

AndrewGable left a comment •

edited

alex-mechler commented Oct 12, 2022 •

edited