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

[AC-2513] Only showing PM subscription adjustment form if the user is a PM user #9011

Merged

Conversation

cturnbull-bitwarden
Copy link
Contributor

@cturnbull-bitwarden cturnbull-bitwarden commented May 2, 2024

Type of change

- [ ] Bug fix
- [X] New feature development
- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
- [ ] Build/deploy pipeline (DevOps)
- [ ] Other

Objective

For organizations who have signed up for the Secrets Manager free trial via https://vault.bitwarden.com/#/register?org=teams&layout=secretsManager, this PR hides the Password Manager form fields from the subscription tab in the Admin Console.

Since this means that the user won't be able to directly update Password Manager seats, this server-side PR adds functionality to scale Password Manager seats with adjustments to Secrets Manager seats to avoid the validation error.

bitwarden/server#4040

Code changes

  • organization-subscription-cloud.component.html: Wraps the Password Manager form fields in an ng-container and only shows it if !customerDiscount || customerDiscount.id != 'sm-standalone'

Screenshots

image

Before you submit

  • Please add unit tests where it makes sense to do so (encouraged but not required)
  • If this change requires a documentation update - notify the documentation team
  • If this change has particular deployment requirements - notify the DevOps team
  • Ensure that all UI additions follow WCAG AA requirements

@cturnbull-bitwarden cturnbull-bitwarden requested a review from a team as a code owner May 2, 2024 12:34
@github-actions github-actions bot added the needs-qa Marks a PR as requiring QA approval label May 2, 2024
Copy link

codecov bot commented May 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (main@be51f19). Click here to learn what that means.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #9011   +/-   ##
=======================================
  Coverage        ?   27.75%           
=======================================
  Files           ?     2419           
  Lines           ?    69904           
  Branches        ?    13008           
=======================================
  Hits            ?    19400           
  Misses          ?    49005           
  Partials        ?     1499           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

github-actions bot commented May 2, 2024

Logo
Checkmarx One – Scan Summary & Detailsd6364573-7685-4919-b016-3e7e8beb6f47

No New Or Fixed Issues Found

@github-actions github-actions bot temporarily deployed to Web Vault - US QA Cloud May 16, 2024 20:00 Inactive
@github-actions github-actions bot temporarily deployed to Web Vault - US QA Cloud May 17, 2024 15:36 Inactive
@cturnbull-bitwarden cturnbull-bitwarden merged commit f97064e into main May 17, 2024
32 of 34 checks passed
@cturnbull-bitwarden cturnbull-bitwarden deleted the billing/AC-2513/hide-pm-subscription-for-sm-only branch May 17, 2024 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-qa Marks a PR as requiring QA approval
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants