Skip to content

[UBP] Add placeholder billing configuration UI to the user settings page #12733

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

Merged
merged 2 commits into from
Sep 13, 2022

Conversation

andrew-farries
Copy link
Contributor

Description

Building on #12732 which extracted the components to make them reusable, add the UBP configuration UI widgets to the individual user billing page:

image

The 'Upgrade billing' button doesn't work yet. This is fine to merge as-is because only people opted into usage based billing will see the UI (currently only Gitpod team members).

Related Issue(s)

Part of #12685

How to test

Visit your user settings page and see the placeholder UI

Release Notes

NONE

Documentation

Werft options:

  • /werft with-preview
  • /werft with-payment

@andrew-farries andrew-farries requested a review from a team September 7, 2022 11:38
@github-actions github-actions bot added the team: webapp Issue belongs to the WebApp team label Sep 7, 2022
@roboquat roboquat added the size/S label Sep 7, 2022
@andrew-farries
Copy link
Contributor Author

/hold because it's based on #12732

Base automatically changed from af/extract-common-ubp-components to main September 7, 2022 11:43
@roboquat roboquat added size/XL and removed size/S labels Sep 7, 2022
@andrew-farries
Copy link
Contributor Author

andrew-farries commented Sep 7, 2022

/werft run with-preview with-payment

👍 started the job as gitpod-build-af-placeholder-individual-user-ubp-ui.1
(with .werft/ from main)

@andrew-farries
Copy link
Contributor Author

andrew-farries commented Sep 7, 2022

/werft run with-preview with-payment

👍 started the job as gitpod-build-af-placeholder-individual-user-ubp-ui.2
(with .werft/ from main)

@andrew-farries andrew-farries force-pushed the af/placeholder-individual-user-ubp-ui branch from c0e6bc6 to 2f4a219 Compare September 12, 2022 10:25
@andrew-farries andrew-farries force-pushed the af/placeholder-individual-user-ubp-ui branch from 172006f to 95623b0 Compare September 13, 2022 09:09
@AlexTugarev
Copy link
Member

@andrew-farries and @jankeromnes, what's the state of this PR? And more interestingly, how does this relate to #12684? Is it already covered in here? If yes, please assign accordingly. If not, are you going to continue with that?

@andrew-farries
Copy link
Contributor Author

@andrew-farries and @jankeromnes, what's the state of this PR? And more interestingly, how does this relate to #12684? Is it already covered in here? If yes, please assign accordingly. If not, are you going to continue with that?

I'm still hoping to land this soon. All review comments have been addressed.

The usage limit for individuals (#12684) I consider to be part of #12685 as the UI for configuring billing for individuals also includes the UI to set usage limits. I've assigned #12684 to myself.

@andrew-farries andrew-farries force-pushed the af/placeholder-individual-user-ubp-ui branch from 95623b0 to 4eeae67 Compare September 13, 2022 13:39
Copy link
Contributor

@jankeromnes jankeromnes left a comment

Choose a reason for hiding this comment

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

Many thanks for iterating on this! 👍 Now looks perfect to me 🎯 and also works as advertised.

(It's even possible to create a customer as a User, however since the User Billing page doesn't yet handle the Stripe redirection and doesn't call subscribeUserToStripe, we're not attaching credit cards or creating subscriptions for users yet -- unrelated to this PR / good as follow-up)

@andrew-farries
Copy link
Contributor Author

/unhold

@roboquat roboquat merged commit 0c63b14 into main Sep 13, 2022
@roboquat roboquat deleted the af/placeholder-individual-user-ubp-ui branch September 13, 2022 14:16
@roboquat roboquat added deployed: webapp Meta team change is running in production deployed Change is completely running in production labels Sep 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployed: webapp Meta team change is running in production deployed Change is completely running in production release-note-none size/M team: webapp Issue belongs to the WebApp team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants