From e4c7efba12edd47e347f3343f3ec44ebe7023e15 Mon Sep 17 00:00:00 2001 From: Conner Turnbull <133619638+cturnbull-bitwarden@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:34:51 -0400 Subject: [PATCH] Resolved circular dependency with UpdateLicenseDialogResult enum (#10056) --- .../app/billing/individual/user-subscription.component.ts | 6 ++---- .../app/billing/shared/update-license-dialog.component.ts | 5 +---- apps/web/src/app/billing/shared/update-license-types.ts | 4 ++++ apps/web/src/app/billing/shared/update-license.component.ts | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 apps/web/src/app/billing/shared/update-license-types.ts diff --git a/apps/web/src/app/billing/individual/user-subscription.component.ts b/apps/web/src/app/billing/individual/user-subscription.component.ts index 9b615f3a690..7e564341ca1 100644 --- a/apps/web/src/app/billing/individual/user-subscription.component.ts +++ b/apps/web/src/app/billing/individual/user-subscription.component.ts @@ -20,10 +20,8 @@ import { OffboardingSurveyDialogResultType, openOffboardingSurvey, } from "../shared/offboarding-survey.component"; -import { - UpdateLicenseDialogComponent, - UpdateLicenseDialogResult, -} from "../shared/update-license-dialog.component"; +import { UpdateLicenseDialogComponent } from "../shared/update-license-dialog.component"; +import { UpdateLicenseDialogResult } from "../shared/update-license-types"; @Component({ templateUrl: "user-subscription.component.html", 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 3a690378b8e..fd9acfe7861 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 @@ -8,12 +8,9 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { DialogService } from "@bitwarden/components"; +import { UpdateLicenseDialogResult } from "./update-license-types"; import { UpdateLicenseComponent } from "./update-license.component"; -export enum UpdateLicenseDialogResult { - Updated = "updated", - Cancelled = "cancelled", -} @Component({ templateUrl: "update-license-dialog.component.html", }) diff --git a/apps/web/src/app/billing/shared/update-license-types.ts b/apps/web/src/app/billing/shared/update-license-types.ts new file mode 100644 index 00000000000..8f939ac62a9 --- /dev/null +++ b/apps/web/src/app/billing/shared/update-license-types.ts @@ -0,0 +1,4 @@ +export enum UpdateLicenseDialogResult { + Updated = "updated", + Cancelled = "cancelled", +} 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 ec0852b9e03..e1c079ba54a 100644 --- a/apps/web/src/app/billing/shared/update-license.component.ts +++ b/apps/web/src/app/billing/shared/update-license.component.ts @@ -6,7 +6,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"; +import { UpdateLicenseDialogResult } from "./update-license-types"; @Component({ selector: "app-update-license",