1
0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-23 03:22:50 +02:00

Remove unused payment.component from adjust-subscription.component.html (#10820)

This commit is contained in:
Alex Morask 2024-08-30 14:18:07 -04:00 committed by GitHub
parent 2882fa3077
commit 95d04f264f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 26 deletions

View File

@ -56,4 +56,3 @@
{{ "save" | i18n }} {{ "save" | i18n }}
</button> </button>
</form> </form>
<app-payment [showMethods]="false"></app-payment>

View File

@ -1,43 +1,36 @@
import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core"; import { Component, EventEmitter, Input, Output } from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { FormBuilder, Validators } from "@angular/forms"; import { FormBuilder, Validators } from "@angular/forms";
import { Subject, takeUntil } from "rxjs";
import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
import { OrganizationSubscriptionUpdateRequest } from "@bitwarden/common/billing/models/request/organization-subscription-update.request"; import { OrganizationSubscriptionUpdateRequest } from "@bitwarden/common/billing/models/request/organization-subscription-update.request";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { ToastService } from "@bitwarden/components"; import { ToastService } from "@bitwarden/components";
@Component({ @Component({
selector: "app-adjust-subscription", selector: "app-adjust-subscription",
templateUrl: "adjust-subscription.component.html", templateUrl: "adjust-subscription.component.html",
}) })
export class AdjustSubscription implements OnInit, OnDestroy { export class AdjustSubscription {
@Input() organizationId: string; @Input() organizationId: string;
@Input() maxAutoscaleSeats: number; @Input() maxAutoscaleSeats: number;
@Input() currentSeatCount: number; @Input() currentSeatCount: number;
@Input() seatPrice = 0; @Input() seatPrice = 0;
@Input() interval = "year"; @Input() interval = "year";
@Output() onAdjusted = new EventEmitter(); @Output() onAdjusted = new EventEmitter();
private destroy$ = new Subject<void>();
adjustSubscriptionForm = this.formBuilder.group({ adjustSubscriptionForm = this.formBuilder.group({
newSeatCount: [0, [Validators.min(0)]], newSeatCount: [0, [Validators.min(0)]],
limitSubscription: [false], limitSubscription: [false],
newMaxSeats: [0, [Validators.min(0)]], newMaxSeats: [0, [Validators.min(0)]],
}); });
get limitSubscription(): boolean {
return this.adjustSubscriptionForm.value.limitSubscription;
}
constructor( constructor(
private i18nService: I18nService, private i18nService: I18nService,
private platformUtilsService: PlatformUtilsService,
private organizationApiService: OrganizationApiServiceAbstraction, private organizationApiService: OrganizationApiServiceAbstraction,
private formBuilder: FormBuilder, private formBuilder: FormBuilder,
private toastService: ToastService, private toastService: ToastService,
) {} ) {
ngOnInit() {
this.adjustSubscriptionForm.patchValue({ this.adjustSubscriptionForm.patchValue({
newSeatCount: this.currentSeatCount, newSeatCount: this.currentSeatCount,
limitSubscription: this.maxAutoscaleSeats != null, limitSubscription: this.maxAutoscaleSeats != null,
@ -45,7 +38,7 @@ export class AdjustSubscription implements OnInit, OnDestroy {
}); });
this.adjustSubscriptionForm this.adjustSubscriptionForm
.get("limitSubscription") .get("limitSubscription")
.valueChanges.pipe(takeUntil(this.destroy$)) .valueChanges.pipe(takeUntilDestroyed())
.subscribe((value: boolean) => { .subscribe((value: boolean) => {
if (value) { if (value) {
this.adjustSubscriptionForm this.adjustSubscriptionForm
@ -63,10 +56,6 @@ export class AdjustSubscription implements OnInit, OnDestroy {
}); });
} }
ngOnDestroy() {
this.destroy$.next();
this.destroy$.complete();
}
submit = async () => { submit = async () => {
this.adjustSubscriptionForm.markAllAsTouched(); this.adjustSubscriptionForm.markAllAsTouched();
if (this.adjustSubscriptionForm.invalid) { if (this.adjustSubscriptionForm.invalid) {
@ -99,18 +88,15 @@ export class AdjustSubscription implements OnInit, OnDestroy {
: 0; : 0;
} }
get additionalMaxSeatCount(): number {
return this.adjustSubscriptionForm.value.newMaxSeats
? this.adjustSubscriptionForm.value.newMaxSeats - this.currentSeatCount
: 0;
}
get maxSeatTotal(): number { get maxSeatTotal(): number {
return Math.abs((this.adjustSubscriptionForm.value.newMaxSeats ?? 0) * this.seatPrice); return Math.abs((this.adjustSubscriptionForm.value.newMaxSeats ?? 0) * this.seatPrice);
} }
get seatTotalCost(): number { get seatTotalCost(): number {
const totalSeat = Math.abs(this.adjustSubscriptionForm.value.newSeatCount * this.seatPrice); return Math.abs(this.adjustSubscriptionForm.value.newSeatCount * this.seatPrice);
return totalSeat; }
get limitSubscription(): boolean {
return this.adjustSubscriptionForm.value.limitSubscription;
} }
} }