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-2420] Hide SM checkbox on member invite when org is on SM Standalone #8644

Merged
merged 12 commits into from
Apr 18, 2024

Conversation

amorask-bitwarden
Copy link
Contributor

@amorask-bitwarden amorask-bitwarden commented Apr 8, 2024

Type of change

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

Objective

This PR updates the people.component to check if the current organization is on SM Standalone. If it is, when the user tries to invite a new member, it hides the option to give the invited member access to SM and defaults it to true. This enforces a rule that SM standalone orgs cannot invite PM only members.

Code changes

Unrelated Refactoring

Screenshots

Screen.Recording.2024-04-08.at.2.51.23.PM.mov

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

@github-actions github-actions bot added the needs-qa Marks a PR as requiring QA approval label Apr 8, 2024
Copy link

codecov bot commented Apr 8, 2024

Codecov Report

Attention: Patch coverage is 0% with 18 lines in your changes are missing coverage. Please review.

Project coverage is 27.31%. Comparing base (a45706c) to head (fd737e8).

Files Patch % Lines
...c/billing/services/organization-billing.service.ts 0.00% 8 Missing ⚠️
...-console/organizations/members/people.component.ts 0.00% 4 Missing ⚠️
...omponents/member-dialog/member-dialog.component.ts 0.00% 3 Missing ⚠️
...common/src/billing/services/billing-api.service.ts 0.00% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8644      +/-   ##
==========================================
- Coverage   27.32%   27.31%   -0.01%     
==========================================
  Files        2349     2349              
  Lines       68613    68632      +19     
  Branches    12828    12831       +3     
==========================================
  Hits        18748    18748              
- Misses      48455    48474      +19     
  Partials     1410     1410              

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

@amorask-bitwarden amorask-bitwarden marked this pull request as ready for review April 8, 2024 19:14
@amorask-bitwarden amorask-bitwarden requested review from a team as code owners April 8, 2024 19:14
Copy link
Contributor

github-actions bot commented Apr 8, 2024

Logo
Checkmarx One – Scan Summary & Detailsb263f183-1baf-4327-9fda-2310fe697a80

No New Or Fixed Issues Found

r-tome
r-tome previously approved these changes Apr 10, 2024
Copy link
Contributor

@r-tome r-tome left a comment

Choose a reason for hiding this comment

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

LGTM!

@amorask-bitwarden
Copy link
Contributor Author

@cturnbull-bitwarden @r-tome Can I get another look at this when you both have a sec? I had to change it from hiding the SM checkbox to defaulting it to checked and disabling it as shown below:
Screenshot 2024-04-10 at 1 31 40 PM

r-tome
r-tome previously approved these changes Apr 11, 2024
@amorask-bitwarden amorask-bitwarden removed the needs-qa Marks a PR as requiring QA approval label Apr 18, 2024
@amorask-bitwarden amorask-bitwarden merged commit adb1ee3 into main Apr 18, 2024
57 checks passed
@amorask-bitwarden amorask-bitwarden deleted the billing/AC-2420/self-serve-sm-user-seat-count branch April 18, 2024 15:21
MGibson1 pushed a commit that referenced this pull request Apr 22, 2024
…one (#8644)

* Refactoring

* Hide SM toggle on member invite and default to true for SM standalone org

* changed from hide sm checkbox to default and disable

* Removed errant addition from conflict resolution
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.

None yet

3 participants