diff --git a/apps/web/src/app/billing/shared/update-license-dialog.component.ts b/apps/web/src/app/billing/shared/update-license-dialog.component.ts index 5f9a1e94be..7338bb7aa6 100644 --- a/apps/web/src/app/billing/shared/update-license-dialog.component.ts +++ b/apps/web/src/app/billing/shared/update-license-dialog.component.ts @@ -1,3 +1,4 @@ +import { DialogRef } from "@angular/cdk/dialog"; import { Component } from "@angular/core"; import { FormBuilder } from "@angular/forms"; @@ -23,8 +24,16 @@ export class UpdateLicenseDialogComponent extends UpdateLicenseComponent { platformUtilsService: PlatformUtilsService, organizationApiService: OrganizationApiServiceAbstraction, formBuilder: FormBuilder, + dialogRef: DialogRef, // Add this line ) { - super(apiService, i18nService, platformUtilsService, organizationApiService, formBuilder); + super( + apiService, + i18nService, + platformUtilsService, + organizationApiService, + formBuilder, + dialogRef, + ); } async submitLicense() { await this.submit(); diff --git a/apps/web/src/app/billing/shared/update-license.component.ts b/apps/web/src/app/billing/shared/update-license.component.ts index 30b5983090..14ee8df680 100644 --- a/apps/web/src/app/billing/shared/update-license.component.ts +++ b/apps/web/src/app/billing/shared/update-license.component.ts @@ -1,3 +1,4 @@ +import { DialogRef } from "@angular/cdk/dialog"; import { Component, EventEmitter, Input, Output } from "@angular/core"; import { FormBuilder, Validators } from "@angular/forms"; @@ -6,6 +7,7 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { UpdateLicenseDialogResult } from "./update-license-dialog.component"; @Component({ selector: "app-update-license", templateUrl: "update-license.component.html", @@ -28,6 +30,7 @@ export class UpdateLicenseComponent { private platformUtilsService: PlatformUtilsService, private organizationApiService: OrganizationApiServiceAbstraction, private formBuilder: FormBuilder, + private dialogRef: DialogRef, ) {} protected setSelectedFile(event: Event) { const fileInputEl = event.target; @@ -51,24 +54,25 @@ export class UpdateLicenseComponent { const fd = new FormData(); fd.append("license", files); - let updatePromise: Promise = null; - if (this.organizationId == null) { - updatePromise = this.apiService.postAccountLicense(fd); - } else { - updatePromise = this.organizationApiService.updateLicense(this.organizationId, fd); - } + // let updatePromise: Promise = null; + // if (this.organizationId == null) { + // updatePromise = this.apiService.postAccountLicense(fd); + // } else { + // updatePromise = this.organizationApiService.updateLicense(this.organizationId, fd); + // } - this.formPromise = updatePromise.then(() => { - return this.apiService.refreshIdentityToken(); - }); + // this.formPromise = updatePromise.then(() => { + // return this.apiService.refreshIdentityToken(); + // }); - await this.formPromise; - this.platformUtilsService.showToast( - "success", - null, - this.i18nService.t("licenseUploadSuccess"), - ); - this.onUpdated.emit(); + // await this.formPromise; + // this.platformUtilsService.showToast( + // "success", + // null, + // this.i18nService.t("licenseUploadSuccess"), + // ); + // this.onUpdated.emit(); + this.dialogRef.close(UpdateLicenseDialogResult.Updated); }; cancel = () => {