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

fix: consolidate org user menus #10162

Merged
merged 1 commit into from
Aug 28, 2024
Merged

Conversation

mattkrick
Copy link
Member

Description

fix #10159

We've had a mix of logic for org administration.
We could stand to make this simpler, but for now I wanted to get all the logic in 1 place.

TEST

  • make sure actions that appear in the menu are as expected (I couldn't find a spec for this business logic. this should exist on the server, but since it didn't already exist there, I didn't add it)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
Copy link
Contributor

@nickoferrall nickoferrall 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 it LGTM

manager.stripe.billingPortal.sessions.create({
customer: stripeId,
return_url: makeAppURL(appOrigin, `me/organizations/${orgId}/billing`)
}),
manager.retrieveUpcomingInvoice(stripeId),
manager.listInvoices(stripeId)
])
if (
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this invoices logic related to the org user logic?

Copy link
Member Author

Choose a reason for hiding this comment

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

100% invoices, i wanted to test it on the parabol org & it kept breaking in dev mode with prod data, so this prevents it from throwing a fatal error

@mattkrick mattkrick merged commit b172a2f into master Aug 28, 2024
7 checks passed
@mattkrick mattkrick deleted the fix/10159/org-admin-demote branch August 28, 2024 21:04
@github-actions github-actions bot mentioned this pull request Aug 29, 2024
24 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Org Admins cannot remove Org Admin role from user in the Plans & Billing page
2 participants