1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-23 11:43:46 +00:00

SM-904: Remove SecretsManagerBeta (Phase 2) (#6891)

* SM-904: Remove SecretsManagerBeta

* SM-904: Remove additional places sm beta is used

* SM-904: Remove unused SM Beta messages
This commit is contained in:
Colton Hurst
2024-01-31 17:09:35 -05:00
committed by GitHub
parent 3cf17d1073
commit 01781848f3
4 changed files with 1 additions and 62 deletions

View File

@@ -85,32 +85,13 @@
<td bitCell>{{ "passwordManager" | i18n }} - {{ "freeOrganization" | i18n }}</td>
<td bitCell class="tw-text-right">{{ "free" | i18n }}</td>
</tr>
<tr bitRow *ngIf="userOrg.useSecretsManager && !sub.secretsManagerBeta">
<tr bitRow *ngIf="userOrg.useSecretsManager">
<td bitCell>{{ "secretsManager" | i18n }} - {{ "freeOrganization" | i18n }}</td>
<td bitCell class="tw-text-right">{{ "free" | i18n }}</td>
</tr>
</ng-container>
<tr bitRow *ngIf="sub.secretsManagerBeta">
<td bitCell>
{{ "secretsManager" | i18n }} -
{{ "beta" | i18n }}
({{ "annually" | i18n }}) @
{{ 0 | currency: "$" }}
<span bitBadge variant="warning" class="tw-ml-2">{{
"betaEnding" | i18n | uppercase
}}</span>
</td>
<td bitCell class="tw-text-right">{{ 0 | currency: "$" }} /{{ "year" | i18n }}</td>
</tr>
</ng-template>
</bit-table>
<bit-callout
*ngIf="sub.secretsManagerBeta && !userOrg.isFreeOrg"
type="warning"
class="tw-mt-4 tw-block"
>
{{ smBetaEndedDesc }}
</bit-callout>
</div>
</ng-container>

View File

@@ -1,4 +1,3 @@
import { DatePipe } from "@angular/common";
import { Component, OnDestroy, OnInit } from "@angular/core";
import { ActivatedRoute } from "@angular/router";
import { concatMap, firstValueFrom, Subject, takeUntil } from "rxjs";
@@ -15,7 +14,6 @@ import { ProductType } from "@bitwarden/common/enums";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { DialogService } from "@bitwarden/components";
import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component";
@@ -41,9 +39,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
firstLoaded = false;
loading: boolean;
private readonly _smBetaEndingDate = new Date(2023, 7, 15);
private readonly _smGracePeriodEndingDate = new Date(2023, 10, 14);
protected readonly teamsStarter = ProductType.TeamsStarter;
private destroy$ = new Subject<void>();
@@ -57,7 +52,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
private organizationApiService: OrganizationApiServiceAbstraction,
private route: ActivatedRoute,
private dialogService: DialogService,
private datePipe: DatePipe,
) {}
async ngOnInit() {
@@ -126,7 +120,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
this.userOrg.useSecretsManager &&
this.subscription != null &&
this.sub.plan?.SecretsManager?.hasAdditionalSeatsOption &&
!this.sub.secretsManagerBeta &&
!this.subscription.cancelled &&
!this.subscriptionMarkedForCancel;
@@ -275,14 +268,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
);
}
get smBetaEndedDesc() {
return this.i18nService.translate(
"smBetaEndedDesc",
this.datePipe.transform(this._smBetaEndingDate),
Utils.daysRemaining(this._smGracePeriodEndingDate).toString(),
);
}
cancel = async () => {
if (this.loading) {
return;