From 356e3fc7fc47bc2d47ed0241a0c9860294e21329 Mon Sep 17 00:00:00 2001 From: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com> Date: Fri, 10 Nov 2023 09:31:48 -0500 Subject: [PATCH] [AC-1806] Hide Teams Starter for MSP creating client org (#6835) * Hide Teams Starter plan for provider creating new client org * QA: Disallow addition of existing Teams Starter orgs --- .../app/billing/organizations/organization-plans.component.ts | 3 ++- .../app/admin-console/providers/clients/clients.component.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts index f79b33f5b8..afcd9cb18d 100644 --- a/apps/web/src/app/billing/organizations/organization-plans.component.ts +++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts @@ -236,7 +236,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { plan.product === ProductType.TeamsStarter) && (this.currentProductType !== ProductType.TeamsStarter || plan.product === ProductType.Teams || - plan.product === ProductType.Enterprise) + plan.product === ProductType.Enterprise) && + (!this.providerId || plan.product !== ProductType.TeamsStarter) ); result.sort((planA, planB) => planA.displaySortOrder - planB.displaySortOrder); diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts index 758c812035..5fe6d58425 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts @@ -27,6 +27,7 @@ const DisallowedPlanTypes = [ PlanType.Free, PlanType.FamiliesAnnually2019, PlanType.FamiliesAnnually, + PlanType.TeamsStarter, ]; @Component({