bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 16:23:44 +00:00
Code Issues Releases Wiki Activity

Cleaned up feature flag logic now that it's released (#7030)

Browse Source
This commit is contained in:
Conner Turnbull
2023-12-04 08:16:43 -05:00
committed by GitHub
parent 641ae844fb
commit c1963f1bc3
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/web/src/app/billing/organizations/organization-plans.component.html
View File

@@ -68,11 +68,7 @@
</ng-container> </ng-container>
<ng-template #nonEnterprisePlans> <ng-template #nonEnterprisePlans>
<ng-container <ng-container
*ngIf=" *ngIf="selectableProduct.product === productTypes.Teams; else fullFeatureList"
teamsStarterPlanFeatureFlagIsEnabled &&
selectableProduct.product === productTypes.Teams;
else fullFeatureList
"
> >
<small>• {{ "includeAllTeamsStarterFeatures" | i18n }}</small> <small>• {{ "includeAllTeamsStarterFeatures" | i18n }}</small>
<small>• {{ "chooseMonthlyOrAnnualBilling" | i18n }}</small> <small>• {{ "chooseMonthlyOrAnnualBilling" | i18n }}</small>

13
apps/web/src/app/billing/organizations/organization-plans.component.ts
View File

@@ -255,10 +255,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
return result; return result;
} }
get teamsStarterPlanFeatureFlagIsEnabled(): boolean {
return this.passwordManagerPlans.some((plan) => plan.product === ProductType.TeamsStarter);
}
get hasProvider() { get hasProvider() {
return this.providerId != null; return this.providerId != null;
} }
@@ -420,13 +416,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
if (!this.formGroup.controls.businessOwned.value || this.selectedPlan.canBeUsedByBusiness) { if (!this.formGroup.controls.businessOwned.value || this.selectedPlan.canBeUsedByBusiness) {
return; return;
} }
if (this.teamsStarterPlanFeatureFlagIsEnabled) { this.formGroup.controls.product.setValue(ProductType.TeamsStarter);
this.formGroup.controls.product.setValue(ProductType.TeamsStarter); this.formGroup.controls.plan.setValue(PlanType.TeamsStarter);
this.formGroup.controls.plan.setValue(PlanType.TeamsStarter);
} else {
this.formGroup.controls.product.setValue(ProductType.Teams);
this.formGroup.controls.plan.setValue(PlanType.TeamsAnnually);
}
this.changedProduct(); this.changedProduct();
} }