From 0a953b444acdfa1d0662bdbdef4e9a4581095c79 Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Wed, 4 Oct 2023 05:36:45 +1000 Subject: [PATCH] [AC-1453] Move OrganizationPlansComponent and related components out of LooseComponentsModule (#6230) * restructure billing folders into individual, organization, and shared * move components from `LooseComponentsModule` --- ...families-for-enterprise-setup.component.ts | 6 +- .../settings/create-organization.component.ts | 6 +- .../trial-initiation/billing.component.ts | 2 +- apps/web/src/app/billing/index.ts | 2 + .../billing-history-view.component.html | 0 .../billing-history-view.component.ts | 1 - apps/web/src/app/billing/individual/index.ts | 0 .../individual-billing-routing.module.ts} | 10 +-- .../individual/individual-billing.module.ts | 20 ++++++ .../premium.component.html | 0 .../premium.component.ts | 4 +- .../subscription.component.html | 0 .../subscription.component.ts | 1 - .../user-subscription.component.html | 0 .../user-subscription.component.ts | 1 - .../billing-sync-api-key.component.ts | 1 - .../billing-sync-key.component.html | 0 .../billing-sync-key.component.ts | 1 - .../src/app/billing/organizations/index.ts | 1 + ...nization-billing-history-view.component.ts | 1 - .../organization-billing-routing.module.ts | 2 +- .../organization-billing-tab.component.ts | 1 - .../organization-billing.module.ts | 19 ++++-- .../organization-plans.component.html | 0 .../organization-plans.component.ts | 10 +-- ...ganization-subscription-cloud.component.ts | 3 +- ...ization-subscription-selfhost.component.ts | 6 +- .../organizations/secrets-manager/index.ts | 3 - .../secrets-manager/sm-billing.module.ts | 22 ------- .../sm-adjust-subscription.component.html | 0 .../sm-adjust-subscription.component.ts | 0 .../sm-subscribe-standalone.component.html | 0 .../sm-subscribe-standalone.component.ts | 2 +- .../add-credit.component.html | 0 .../add-credit.component.ts | 0 .../adjust-payment.component.html | 0 .../adjust-payment.component.ts | 0 .../shared}/adjust-storage.component.html | 0 .../shared}/adjust-storage.component.ts | 2 +- .../billing-history.component.html | 0 .../billing-history.component.ts | 0 .../billing/shared/billing-shared.module.ts | 37 +++++++++++ apps/web/src/app/billing/shared/index.ts | 5 ++ .../payment-method.component.html | 0 .../payment-method.component.ts | 1 - .../payment.component.html | 0 .../{settings => shared}/payment.component.ts | 4 ++ .../sm-subscribe.component.html | 0 .../sm-subscribe.component.ts | 2 +- .../tax-info.component.html | 0 .../tax-info.component.ts | 4 ++ .../shared}/update-license.component.html | 0 .../shared}/update-license.component.ts | 0 apps/web/src/app/oss-routing.module.ts | 6 +- apps/web/src/app/oss.module.ts | 2 - .../src/app/shared/loose-components.module.ts | 64 ++++--------------- .../clients/create-organization.component.ts | 2 +- .../providers/providers.module.ts | 4 +- 58 files changed, 131 insertions(+), 127 deletions(-) create mode 100644 apps/web/src/app/billing/index.ts rename apps/web/src/app/billing/{settings => individual}/billing-history-view.component.html (100%) rename apps/web/src/app/billing/{settings => individual}/billing-history-view.component.ts (96%) create mode 100644 apps/web/src/app/billing/individual/index.ts rename apps/web/src/app/billing/{settings/subscription-routing.module.ts => individual/individual-billing-routing.module.ts} (71%) create mode 100644 apps/web/src/app/billing/individual/individual-billing.module.ts rename apps/web/src/app/billing/{settings => individual}/premium.component.html (100%) rename apps/web/src/app/billing/{settings => individual}/premium.component.ts (97%) rename apps/web/src/app/billing/{settings => individual}/subscription.component.html (100%) rename apps/web/src/app/billing/{settings => individual}/subscription.component.ts (95%) rename apps/web/src/app/billing/{settings => individual}/user-subscription.component.html (100%) rename apps/web/src/app/billing/{settings => individual}/user-subscription.component.ts (99%) rename apps/web/src/app/billing/{settings => organizations}/billing-sync-key.component.html (100%) rename apps/web/src/app/billing/{settings => organizations}/billing-sync-key.component.ts (98%) create mode 100644 apps/web/src/app/billing/organizations/index.ts rename apps/web/src/app/billing/{settings => organizations}/organization-plans.component.html (100%) rename apps/web/src/app/billing/{settings => organizations}/organization-plans.component.ts (98%) delete mode 100644 apps/web/src/app/billing/organizations/secrets-manager/index.ts delete mode 100644 apps/web/src/app/billing/organizations/secrets-manager/sm-billing.module.ts rename apps/web/src/app/billing/organizations/{secrets-manager => }/sm-adjust-subscription.component.html (100%) rename apps/web/src/app/billing/organizations/{secrets-manager => }/sm-adjust-subscription.component.ts (100%) rename apps/web/src/app/billing/organizations/{secrets-manager => }/sm-subscribe-standalone.component.html (100%) rename apps/web/src/app/billing/organizations/{secrets-manager => }/sm-subscribe-standalone.component.ts (96%) rename apps/web/src/app/billing/{settings => shared}/add-credit.component.html (100%) rename apps/web/src/app/billing/{settings => shared}/add-credit.component.ts (100%) rename apps/web/src/app/billing/{settings => shared}/adjust-payment.component.html (100%) rename apps/web/src/app/billing/{settings => shared}/adjust-payment.component.ts (100%) rename apps/web/src/app/{settings => billing/shared}/adjust-storage.component.html (100%) rename apps/web/src/app/{settings => billing/shared}/adjust-storage.component.ts (97%) rename apps/web/src/app/billing/{settings => shared}/billing-history.component.html (100%) rename apps/web/src/app/billing/{settings => shared}/billing-history.component.ts (100%) create mode 100644 apps/web/src/app/billing/shared/billing-shared.module.ts create mode 100644 apps/web/src/app/billing/shared/index.ts rename apps/web/src/app/billing/{settings => shared}/payment-method.component.html (100%) rename apps/web/src/app/billing/{settings => shared}/payment-method.component.ts (99%) rename apps/web/src/app/billing/{settings => shared}/payment.component.html (100%) rename apps/web/src/app/billing/{settings => shared}/payment.component.ts (99%) rename apps/web/src/app/billing/{organizations/secrets-manager => shared}/sm-subscribe.component.html (100%) rename apps/web/src/app/billing/{organizations/secrets-manager => shared}/sm-subscribe.component.ts (97%) rename apps/web/src/app/billing/{settings => shared}/tax-info.component.html (100%) rename apps/web/src/app/billing/{settings => shared}/tax-info.component.ts (98%) rename apps/web/src/app/{settings => billing/shared}/update-license.component.html (100%) rename apps/web/src/app/{settings => billing/shared}/update-license.component.ts (100%) diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts index c3a687a7f9..c598ce6442 100644 --- a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts +++ b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts @@ -15,15 +15,17 @@ import { ValidationService } from "@bitwarden/common/platform/abstractions/valid import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { DialogService } from "@bitwarden/components"; -import { OrganizationPlansComponent } from "../../../billing/settings/organization-plans.component"; +import { OrganizationPlansComponent } from "../../../billing"; +import { SharedModule } from "../../../shared"; import { DeleteOrganizationDialogResult, openDeleteOrganizationDialog, } from "../settings/components"; @Component({ - selector: "families-for-enterprise-setup", templateUrl: "families-for-enterprise-setup.component.html", + standalone: true, + imports: [SharedModule, OrganizationPlansComponent], }) export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy { @ViewChild(OrganizationPlansComponent, { static: false }) diff --git a/apps/web/src/app/admin-console/settings/create-organization.component.ts b/apps/web/src/app/admin-console/settings/create-organization.component.ts index c7fc53c525..7728ddc540 100644 --- a/apps/web/src/app/admin-console/settings/create-organization.component.ts +++ b/apps/web/src/app/admin-console/settings/create-organization.component.ts @@ -5,11 +5,13 @@ import { first } from "rxjs/operators"; import { PlanType } from "@bitwarden/common/billing/enums"; import { ProductType } from "@bitwarden/common/enums"; -import { OrganizationPlansComponent } from "../../billing/settings/organization-plans.component"; +import { OrganizationPlansComponent } from "../../billing"; +import { SharedModule } from "../../shared"; @Component({ - selector: "app-create-organization", templateUrl: "create-organization.component.html", + standalone: true, + imports: [SharedModule, OrganizationPlansComponent], }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class CreateOrganizationComponent implements OnInit { diff --git a/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts b/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts index 1830b49a45..2e54019165 100644 --- a/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts +++ b/apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts @@ -3,7 +3,7 @@ import { FormGroup } from "@angular/forms"; import { ProductType } from "@bitwarden/common/enums"; -import { OrganizationPlansComponent } from "../../settings/organization-plans.component"; +import { OrganizationPlansComponent } from "../../organizations"; @Component({ selector: "app-billing", diff --git a/apps/web/src/app/billing/index.ts b/apps/web/src/app/billing/index.ts new file mode 100644 index 0000000000..b59ab33e54 --- /dev/null +++ b/apps/web/src/app/billing/index.ts @@ -0,0 +1,2 @@ +export { OrganizationPlansComponent } from "./organizations"; +export { PaymentComponent, TaxInfoComponent } from "./shared"; diff --git a/apps/web/src/app/billing/settings/billing-history-view.component.html b/apps/web/src/app/billing/individual/billing-history-view.component.html similarity index 100% rename from apps/web/src/app/billing/settings/billing-history-view.component.html rename to apps/web/src/app/billing/individual/billing-history-view.component.html diff --git a/apps/web/src/app/billing/settings/billing-history-view.component.ts b/apps/web/src/app/billing/individual/billing-history-view.component.ts similarity index 96% rename from apps/web/src/app/billing/settings/billing-history-view.component.ts rename to apps/web/src/app/billing/individual/billing-history-view.component.ts index 0c64e3f92e..a2442bcd4b 100644 --- a/apps/web/src/app/billing/settings/billing-history-view.component.ts +++ b/apps/web/src/app/billing/individual/billing-history-view.component.ts @@ -6,7 +6,6 @@ import { BillingHistoryResponse } from "@bitwarden/common/billing/models/respons import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; @Component({ - selector: "app-billing-history-view", templateUrl: "billing-history-view.component.html", }) export class BillingHistoryViewComponent implements OnInit { diff --git a/apps/web/src/app/billing/individual/index.ts b/apps/web/src/app/billing/individual/index.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/web/src/app/billing/settings/subscription-routing.module.ts b/apps/web/src/app/billing/individual/individual-billing-routing.module.ts similarity index 71% rename from apps/web/src/app/billing/settings/subscription-routing.module.ts rename to apps/web/src/app/billing/individual/individual-billing-routing.module.ts index 5664cb89cd..ff45ca75ac 100644 --- a/apps/web/src/app/billing/settings/subscription-routing.module.ts +++ b/apps/web/src/app/billing/individual/individual-billing-routing.module.ts @@ -1,12 +1,12 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { BillingHistoryViewComponent } from "../../billing/settings/billing-history-view.component"; -import { PaymentMethodComponent } from "../../billing/settings/payment-method.component"; -import { UserSubscriptionComponent } from "../../billing/settings/user-subscription.component"; -import { PremiumComponent } from "../settings/premium.component"; +import { PaymentMethodComponent } from "../shared"; +import { BillingHistoryViewComponent } from "./billing-history-view.component"; +import { PremiumComponent } from "./premium.component"; import { SubscriptionComponent } from "./subscription.component"; +import { UserSubscriptionComponent } from "./user-subscription.component"; const routes: Routes = [ { @@ -43,4 +43,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class SubscriptionRoutingModule {} +export class IndividualBillingRoutingModule {} diff --git a/apps/web/src/app/billing/individual/individual-billing.module.ts b/apps/web/src/app/billing/individual/individual-billing.module.ts new file mode 100644 index 0000000000..15837d0382 --- /dev/null +++ b/apps/web/src/app/billing/individual/individual-billing.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from "@angular/core"; + +import { BillingSharedModule } from "../shared"; + +import { BillingHistoryViewComponent } from "./billing-history-view.component"; +import { IndividualBillingRoutingModule } from "./individual-billing-routing.module"; +import { PremiumComponent } from "./premium.component"; +import { SubscriptionComponent } from "./subscription.component"; +import { UserSubscriptionComponent } from "./user-subscription.component"; + +@NgModule({ + imports: [IndividualBillingRoutingModule, BillingSharedModule], + declarations: [ + SubscriptionComponent, + BillingHistoryViewComponent, + UserSubscriptionComponent, + PremiumComponent, + ], +}) +export class IndividualBillingModule {} diff --git a/apps/web/src/app/billing/settings/premium.component.html b/apps/web/src/app/billing/individual/premium.component.html similarity index 100% rename from apps/web/src/app/billing/settings/premium.component.html rename to apps/web/src/app/billing/individual/premium.component.html diff --git a/apps/web/src/app/billing/settings/premium.component.ts b/apps/web/src/app/billing/individual/premium.component.ts similarity index 97% rename from apps/web/src/app/billing/settings/premium.component.ts rename to apps/web/src/app/billing/individual/premium.component.ts index 311985c317..4044caa1db 100644 --- a/apps/web/src/app/billing/settings/premium.component.ts +++ b/apps/web/src/app/billing/individual/premium.component.ts @@ -11,11 +11,9 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { PaymentComponent } from "./payment.component"; -import { TaxInfoComponent } from "./tax-info.component"; +import { PaymentComponent, TaxInfoComponent } from "../shared"; @Component({ - selector: "app-premium", templateUrl: "premium.component.html", }) export class PremiumComponent implements OnInit { diff --git a/apps/web/src/app/billing/settings/subscription.component.html b/apps/web/src/app/billing/individual/subscription.component.html similarity index 100% rename from apps/web/src/app/billing/settings/subscription.component.html rename to apps/web/src/app/billing/individual/subscription.component.html diff --git a/apps/web/src/app/billing/settings/subscription.component.ts b/apps/web/src/app/billing/individual/subscription.component.ts similarity index 95% rename from apps/web/src/app/billing/settings/subscription.component.ts rename to apps/web/src/app/billing/individual/subscription.component.ts index a6d5f13eae..94381fbce5 100644 --- a/apps/web/src/app/billing/settings/subscription.component.ts +++ b/apps/web/src/app/billing/individual/subscription.component.ts @@ -4,7 +4,6 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; @Component({ - selector: "app-subscription", templateUrl: "subscription.component.html", }) export class SubscriptionComponent { diff --git a/apps/web/src/app/billing/settings/user-subscription.component.html b/apps/web/src/app/billing/individual/user-subscription.component.html similarity index 100% rename from apps/web/src/app/billing/settings/user-subscription.component.html rename to apps/web/src/app/billing/individual/user-subscription.component.html diff --git a/apps/web/src/app/billing/settings/user-subscription.component.ts b/apps/web/src/app/billing/individual/user-subscription.component.ts similarity index 99% rename from apps/web/src/app/billing/settings/user-subscription.component.ts rename to apps/web/src/app/billing/individual/user-subscription.component.ts index 2e2a12a7b0..5b4b7cf49e 100644 --- a/apps/web/src/app/billing/settings/user-subscription.component.ts +++ b/apps/web/src/app/billing/individual/user-subscription.component.ts @@ -12,7 +12,6 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv import { DialogService } from "@bitwarden/components"; @Component({ - selector: "app-user-subscription", templateUrl: "user-subscription.component.html", }) export class UserSubscriptionComponent implements OnInit { diff --git a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts index 8386747170..f5fc3572a0 100644 --- a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts +++ b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts @@ -17,7 +17,6 @@ export interface BillingSyncApiModalData { } @Component({ - selector: "app-billing-sync-api-key", templateUrl: "billing-sync-api-key.component.html", }) export class BillingSyncApiKeyComponent { diff --git a/apps/web/src/app/billing/settings/billing-sync-key.component.html b/apps/web/src/app/billing/organizations/billing-sync-key.component.html similarity index 100% rename from apps/web/src/app/billing/settings/billing-sync-key.component.html rename to apps/web/src/app/billing/organizations/billing-sync-key.component.html diff --git a/apps/web/src/app/billing/settings/billing-sync-key.component.ts b/apps/web/src/app/billing/organizations/billing-sync-key.component.ts similarity index 98% rename from apps/web/src/app/billing/settings/billing-sync-key.component.ts rename to apps/web/src/app/billing/organizations/billing-sync-key.component.ts index 3a855bb3ed..5896955128 100644 --- a/apps/web/src/app/billing/settings/billing-sync-key.component.ts +++ b/apps/web/src/app/billing/organizations/billing-sync-key.component.ts @@ -18,7 +18,6 @@ export interface BillingSyncKeyModalData { } @Component({ - selector: "app-billing-sync-key", templateUrl: "billing-sync-key.component.html", }) export class BillingSyncKeyComponent { diff --git a/apps/web/src/app/billing/organizations/index.ts b/apps/web/src/app/billing/organizations/index.ts new file mode 100644 index 0000000000..4b4461bf3c --- /dev/null +++ b/apps/web/src/app/billing/organizations/index.ts @@ -0,0 +1 @@ +export * from "./organization-plans.component"; diff --git a/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts index 22cea10acb..7f13f5e08f 100644 --- a/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts +++ b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts @@ -6,7 +6,6 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response"; @Component({ - selector: "app-org-billing-history-view", templateUrl: "organization-billing-history-view.component.html", }) export class OrgBillingHistoryViewComponent implements OnInit, OnDestroy { diff --git a/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts b/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts index eae0fdfdec..9b158eb610 100644 --- a/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts +++ b/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts @@ -5,8 +5,8 @@ import { canAccessBillingTab } from "@bitwarden/common/admin-console/abstraction import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { OrganizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard"; -import { PaymentMethodComponent } from "../../billing/settings/payment-method.component"; import { WebPlatformUtilsService } from "../../core/web-platform-utils.service"; +import { PaymentMethodComponent } from "../shared"; import { OrgBillingHistoryViewComponent } from "./organization-billing-history-view.component"; import { OrganizationBillingTabComponent } from "./organization-billing-tab.component"; diff --git a/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts b/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts index b0946ae560..90f5f6a4dd 100644 --- a/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts +++ b/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts @@ -6,7 +6,6 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; @Component({ - selector: "app-org-billing-tab", templateUrl: "organization-billing-tab.component.html", }) export class OrganizationBillingTabComponent implements OnInit { diff --git a/apps/web/src/app/billing/organizations/organization-billing.module.ts b/apps/web/src/app/billing/organizations/organization-billing.module.ts index bebf382a16..9fdc316514 100644 --- a/apps/web/src/app/billing/organizations/organization-billing.module.ts +++ b/apps/web/src/app/billing/organizations/organization-billing.module.ts @@ -1,37 +1,42 @@ import { NgModule } from "@angular/core"; import { UserVerificationModule } from "../../auth/shared/components/user-verification"; -import { LooseComponentsModule, SharedModule } from "../../shared"; +import { BillingSharedModule } from "../shared"; import { AdjustSubscription } from "./adjust-subscription.component"; import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component"; +import { BillingSyncKeyComponent } from "./billing-sync-key.component"; import { ChangePlanComponent } from "./change-plan.component"; import { DownloadLicenseComponent } from "./download-license.component"; import { OrgBillingHistoryViewComponent } from "./organization-billing-history-view.component"; import { OrganizationBillingRoutingModule } from "./organization-billing-routing.module"; import { OrganizationBillingTabComponent } from "./organization-billing-tab.component"; +import { OrganizationPlansComponent } from "./organization-plans.component"; import { OrganizationSubscriptionCloudComponent } from "./organization-subscription-cloud.component"; import { OrganizationSubscriptionSelfhostComponent } from "./organization-subscription-selfhost.component"; -import { SecretsManagerBillingModule } from "./secrets-manager/sm-billing.module"; +import { SecretsManagerAdjustSubscriptionComponent } from "./sm-adjust-subscription.component"; +import { SecretsManagerSubscribeStandaloneComponent } from "./sm-subscribe-standalone.component"; import { SubscriptionHiddenComponent } from "./subscription-hidden.component"; @NgModule({ imports: [ - SharedModule, - LooseComponentsModule, OrganizationBillingRoutingModule, UserVerificationModule, - SecretsManagerBillingModule, + BillingSharedModule, + OrganizationPlansComponent, ], declarations: [ AdjustSubscription, BillingSyncApiKeyComponent, + BillingSyncKeyComponent, ChangePlanComponent, DownloadLicenseComponent, OrganizationBillingTabComponent, - OrgBillingHistoryViewComponent, - OrganizationSubscriptionSelfhostComponent, OrganizationSubscriptionCloudComponent, + OrganizationSubscriptionSelfhostComponent, + OrgBillingHistoryViewComponent, + SecretsManagerAdjustSubscriptionComponent, + SecretsManagerSubscribeStandaloneComponent, SubscriptionHiddenComponent, ], }) diff --git a/apps/web/src/app/billing/settings/organization-plans.component.html b/apps/web/src/app/billing/organizations/organization-plans.component.html similarity index 100% rename from apps/web/src/app/billing/settings/organization-plans.component.html rename to apps/web/src/app/billing/organizations/organization-plans.component.html diff --git a/apps/web/src/app/billing/settings/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts similarity index 98% rename from apps/web/src/app/billing/settings/organization-plans.component.ts rename to apps/web/src/app/billing/organizations/organization-plans.component.ts index 3d898de214..b57066b8b2 100644 --- a/apps/web/src/app/billing/settings/organization-plans.component.ts +++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts @@ -35,10 +35,10 @@ import { } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { secretsManagerSubscribeFormFactory } from "../organizations/secrets-manager/sm-subscribe.component"; - -import { PaymentComponent } from "./payment.component"; -import { TaxInfoComponent } from "./tax-info.component"; +import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module"; +import { BillingSharedModule, secretsManagerSubscribeFormFactory } from "../shared"; +import { PaymentComponent } from "../shared/payment.component"; +import { TaxInfoComponent } from "../shared/tax-info.component"; interface OnSuccessArgs { organizationId: string; @@ -47,6 +47,8 @@ interface OnSuccessArgs { @Component({ selector: "app-organization-plans", templateUrl: "organization-plans.component.html", + standalone: true, + imports: [BillingSharedModule, OrganizationCreateModule], }) export class OrganizationPlansComponent implements OnInit, OnDestroy { @ViewChild(PaymentComponent) paymentComponent: PaymentComponent; diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts index 04065fb3bd..8179903e09 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts +++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts @@ -22,10 +22,9 @@ import { BillingSyncApiKeyComponent, BillingSyncApiModalData, } from "./billing-sync-api-key.component"; -import { SecretsManagerSubscriptionOptions } from "./secrets-manager/sm-adjust-subscription.component"; +import { SecretsManagerSubscriptionOptions } from "./sm-adjust-subscription.component"; @Component({ - selector: "app-org-subscription-cloud", templateUrl: "organization-subscription-cloud.component.html", }) export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy { diff --git a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts index 06c474a6a1..69f0571f6c 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts +++ b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts @@ -17,10 +17,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { - BillingSyncKeyComponent, - BillingSyncKeyModalData, -} from "../../billing/settings/billing-sync-key.component"; +import { BillingSyncKeyComponent, BillingSyncKeyModalData } from "./billing-sync-key.component"; enum LicenseOptions { SYNC = 0, @@ -28,7 +25,6 @@ enum LicenseOptions { } @Component({ - selector: "app-org-subscription-selfhost", templateUrl: "organization-subscription-selfhost.component.html", }) export class OrganizationSubscriptionSelfhostComponent implements OnInit, OnDestroy { diff --git a/apps/web/src/app/billing/organizations/secrets-manager/index.ts b/apps/web/src/app/billing/organizations/secrets-manager/index.ts deleted file mode 100644 index fc0bcd3534..0000000000 --- a/apps/web/src/app/billing/organizations/secrets-manager/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from "./sm-billing.module"; -export * from "./sm-subscribe.component"; -export * from "./sm-subscribe-standalone.component"; diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-billing.module.ts b/apps/web/src/app/billing/organizations/secrets-manager/sm-billing.module.ts deleted file mode 100644 index 127a6e49fe..0000000000 --- a/apps/web/src/app/billing/organizations/secrets-manager/sm-billing.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from "@angular/core"; - -import { SharedModule } from "../../../shared"; - -import { SecretsManagerAdjustSubscriptionComponent } from "./sm-adjust-subscription.component"; -import { SecretsManagerSubscribeStandaloneComponent } from "./sm-subscribe-standalone.component"; -import { SecretsManagerSubscribeComponent } from "./sm-subscribe.component"; - -@NgModule({ - imports: [SharedModule], - declarations: [ - SecretsManagerSubscribeComponent, - SecretsManagerSubscribeStandaloneComponent, - SecretsManagerAdjustSubscriptionComponent, - ], - exports: [ - SecretsManagerSubscribeComponent, - SecretsManagerSubscribeStandaloneComponent, - SecretsManagerAdjustSubscriptionComponent, - ], -}) -export class SecretsManagerBillingModule {} diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-adjust-subscription.component.html b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.html similarity index 100% rename from apps/web/src/app/billing/organizations/secrets-manager/sm-adjust-subscription.component.html rename to apps/web/src/app/billing/organizations/sm-adjust-subscription.component.html diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-adjust-subscription.component.ts b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts similarity index 100% rename from apps/web/src/app/billing/organizations/secrets-manager/sm-adjust-subscription.component.ts rename to apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe-standalone.component.html b/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.html similarity index 100% rename from apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe-standalone.component.html rename to apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.html diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe-standalone.component.ts b/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts similarity index 96% rename from apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe-standalone.component.ts rename to apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts index f4af8ed1d8..3ca365fb9b 100644 --- a/apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe-standalone.component.ts +++ b/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts @@ -10,7 +10,7 @@ import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.res import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { secretsManagerSubscribeFormFactory } from "./sm-subscribe.component"; +import { secretsManagerSubscribeFormFactory } from "../shared"; @Component({ selector: "sm-subscribe-standalone", diff --git a/apps/web/src/app/billing/settings/add-credit.component.html b/apps/web/src/app/billing/shared/add-credit.component.html similarity index 100% rename from apps/web/src/app/billing/settings/add-credit.component.html rename to apps/web/src/app/billing/shared/add-credit.component.html diff --git a/apps/web/src/app/billing/settings/add-credit.component.ts b/apps/web/src/app/billing/shared/add-credit.component.ts similarity index 100% rename from apps/web/src/app/billing/settings/add-credit.component.ts rename to apps/web/src/app/billing/shared/add-credit.component.ts diff --git a/apps/web/src/app/billing/settings/adjust-payment.component.html b/apps/web/src/app/billing/shared/adjust-payment.component.html similarity index 100% rename from apps/web/src/app/billing/settings/adjust-payment.component.html rename to apps/web/src/app/billing/shared/adjust-payment.component.html diff --git a/apps/web/src/app/billing/settings/adjust-payment.component.ts b/apps/web/src/app/billing/shared/adjust-payment.component.ts similarity index 100% rename from apps/web/src/app/billing/settings/adjust-payment.component.ts rename to apps/web/src/app/billing/shared/adjust-payment.component.ts diff --git a/apps/web/src/app/settings/adjust-storage.component.html b/apps/web/src/app/billing/shared/adjust-storage.component.html similarity index 100% rename from apps/web/src/app/settings/adjust-storage.component.html rename to apps/web/src/app/billing/shared/adjust-storage.component.html diff --git a/apps/web/src/app/settings/adjust-storage.component.ts b/apps/web/src/app/billing/shared/adjust-storage.component.ts similarity index 97% rename from apps/web/src/app/settings/adjust-storage.component.ts rename to apps/web/src/app/billing/shared/adjust-storage.component.ts index df570d7f9a..f4b55e603b 100644 --- a/apps/web/src/app/settings/adjust-storage.component.ts +++ b/apps/web/src/app/billing/shared/adjust-storage.component.ts @@ -9,7 +9,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { PaymentComponent } from "../billing/settings/payment.component"; +import { PaymentComponent } from "./payment.component"; @Component({ selector: "app-adjust-storage", diff --git a/apps/web/src/app/billing/settings/billing-history.component.html b/apps/web/src/app/billing/shared/billing-history.component.html similarity index 100% rename from apps/web/src/app/billing/settings/billing-history.component.html rename to apps/web/src/app/billing/shared/billing-history.component.html diff --git a/apps/web/src/app/billing/settings/billing-history.component.ts b/apps/web/src/app/billing/shared/billing-history.component.ts similarity index 100% rename from apps/web/src/app/billing/settings/billing-history.component.ts rename to apps/web/src/app/billing/shared/billing-history.component.ts diff --git a/apps/web/src/app/billing/shared/billing-shared.module.ts b/apps/web/src/app/billing/shared/billing-shared.module.ts new file mode 100644 index 0000000000..1b8f083a87 --- /dev/null +++ b/apps/web/src/app/billing/shared/billing-shared.module.ts @@ -0,0 +1,37 @@ +import { NgModule } from "@angular/core"; + +import { SharedModule } from "../../shared"; + +import { AddCreditComponent } from "./add-credit.component"; +import { AdjustPaymentComponent } from "./adjust-payment.component"; +import { AdjustStorageComponent } from "./adjust-storage.component"; +import { BillingHistoryComponent } from "./billing-history.component"; +import { PaymentMethodComponent } from "./payment-method.component"; +import { PaymentComponent } from "./payment.component"; +import { SecretsManagerSubscribeComponent } from "./sm-subscribe.component"; +import { TaxInfoComponent } from "./tax-info.component"; +import { UpdateLicenseComponent } from "./update-license.component"; + +@NgModule({ + imports: [SharedModule, PaymentComponent, TaxInfoComponent], + declarations: [ + AddCreditComponent, + AdjustPaymentComponent, + AdjustStorageComponent, + BillingHistoryComponent, + PaymentMethodComponent, + SecretsManagerSubscribeComponent, + UpdateLicenseComponent, + ], + exports: [ + SharedModule, + PaymentComponent, + TaxInfoComponent, + + AdjustStorageComponent, + BillingHistoryComponent, + SecretsManagerSubscribeComponent, + UpdateLicenseComponent, + ], +}) +export class BillingSharedModule {} diff --git a/apps/web/src/app/billing/shared/index.ts b/apps/web/src/app/billing/shared/index.ts new file mode 100644 index 0000000000..ae28e45f78 --- /dev/null +++ b/apps/web/src/app/billing/shared/index.ts @@ -0,0 +1,5 @@ +export * from "./billing-shared.module"; +export * from "./payment-method.component"; +export * from "./payment.component"; +export * from "./sm-subscribe.component"; +export * from "./tax-info.component"; diff --git a/apps/web/src/app/billing/settings/payment-method.component.html b/apps/web/src/app/billing/shared/payment-method.component.html similarity index 100% rename from apps/web/src/app/billing/settings/payment-method.component.html rename to apps/web/src/app/billing/shared/payment-method.component.html diff --git a/apps/web/src/app/billing/settings/payment-method.component.ts b/apps/web/src/app/billing/shared/payment-method.component.ts similarity index 99% rename from apps/web/src/app/billing/settings/payment-method.component.ts rename to apps/web/src/app/billing/shared/payment-method.component.ts index 5a8e598f7b..a99202f991 100644 --- a/apps/web/src/app/billing/settings/payment-method.component.ts +++ b/apps/web/src/app/billing/shared/payment-method.component.ts @@ -17,7 +17,6 @@ import { DialogService } from "@bitwarden/components"; import { TaxInfoComponent } from "./tax-info.component"; @Component({ - selector: "app-payment-method", templateUrl: "payment-method.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil diff --git a/apps/web/src/app/billing/settings/payment.component.html b/apps/web/src/app/billing/shared/payment.component.html similarity index 100% rename from apps/web/src/app/billing/settings/payment.component.html rename to apps/web/src/app/billing/shared/payment.component.html diff --git a/apps/web/src/app/billing/settings/payment.component.ts b/apps/web/src/app/billing/shared/payment.component.ts similarity index 99% rename from apps/web/src/app/billing/settings/payment.component.ts rename to apps/web/src/app/billing/shared/payment.component.ts index e5c9c3dd3c..68cc93c270 100644 --- a/apps/web/src/app/billing/settings/payment.component.ts +++ b/apps/web/src/app/billing/shared/payment.component.ts @@ -6,9 +6,13 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { PaymentMethodType } from "@bitwarden/common/billing/enums"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { SharedModule } from "../../shared"; + @Component({ selector: "app-payment", templateUrl: "payment.component.html", + standalone: true, + imports: [SharedModule], }) export class PaymentComponent implements OnInit, OnDestroy { @Input() showMethods = true; diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe.component.html b/apps/web/src/app/billing/shared/sm-subscribe.component.html similarity index 100% rename from apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe.component.html rename to apps/web/src/app/billing/shared/sm-subscribe.component.html diff --git a/apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe.component.ts b/apps/web/src/app/billing/shared/sm-subscribe.component.ts similarity index 97% rename from apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe.component.ts rename to apps/web/src/app/billing/shared/sm-subscribe.component.ts index 2d56d033a1..b48809813b 100644 --- a/apps/web/src/app/billing/organizations/secrets-manager/sm-subscribe.component.ts +++ b/apps/web/src/app/billing/shared/sm-subscribe.component.ts @@ -7,7 +7,7 @@ import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.res import { ProductType } from "@bitwarden/common/enums"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { SecretsManagerLogo } from "../../../layouts/secrets-manager-logo"; +import { SecretsManagerLogo } from "../../layouts/secrets-manager-logo"; export interface SecretsManagerSubscription { enabled: boolean; diff --git a/apps/web/src/app/billing/settings/tax-info.component.html b/apps/web/src/app/billing/shared/tax-info.component.html similarity index 100% rename from apps/web/src/app/billing/settings/tax-info.component.html rename to apps/web/src/app/billing/shared/tax-info.component.html diff --git a/apps/web/src/app/billing/settings/tax-info.component.ts b/apps/web/src/app/billing/shared/tax-info.component.ts similarity index 98% rename from apps/web/src/app/billing/settings/tax-info.component.ts rename to apps/web/src/app/billing/shared/tax-info.component.ts index a7ceea0b2d..27584bfd77 100644 --- a/apps/web/src/app/billing/settings/tax-info.component.ts +++ b/apps/web/src/app/billing/shared/tax-info.component.ts @@ -9,6 +9,8 @@ import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-i import { TaxRateResponse } from "@bitwarden/common/billing/models/response/tax-rate.response"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { SharedModule } from "../../shared"; + type TaxInfoView = Omit & { includeTaxId: boolean; [key: string]: unknown; @@ -17,6 +19,8 @@ type TaxInfoView = Omit & { @Component({ selector: "app-tax-info", templateUrl: "tax-info.component.html", + standalone: true, + imports: [SharedModule], }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class TaxInfoComponent { diff --git a/apps/web/src/app/settings/update-license.component.html b/apps/web/src/app/billing/shared/update-license.component.html similarity index 100% rename from apps/web/src/app/settings/update-license.component.html rename to apps/web/src/app/billing/shared/update-license.component.html diff --git a/apps/web/src/app/settings/update-license.component.ts b/apps/web/src/app/billing/shared/update-license.component.ts similarity index 100% rename from apps/web/src/app/settings/update-license.component.ts rename to apps/web/src/app/billing/shared/update-license.component.ts diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index 3a08a5863a..58d3f60134 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -11,7 +11,6 @@ import { import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; -import { SubscriptionRoutingModule } from "../app/billing/settings/subscription-routing.module"; import { flagEnabled, Flags } from "../utils/flags"; import { AcceptFamilySponsorshipComponent } from "./admin-console/organizations/sponsorships/accept-family-sponsorship.component"; @@ -221,7 +220,10 @@ const routes: Routes = [ }, { path: "subscription", - loadChildren: () => SubscriptionRoutingModule, + loadChildren: () => + import("./billing/individual/individual-billing.module").then( + (m) => m.IndividualBillingModule + ), }, { path: "emergency-access", diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts index d15addba3e..e1e57302f4 100644 --- a/apps/web/src/app/oss.module.ts +++ b/apps/web/src/app/oss.module.ts @@ -1,6 +1,5 @@ import { NgModule } from "@angular/core"; -import { OrganizationCreateModule } from "./admin-console/organizations/create/organization-create.module"; import { OrganizationUserModule } from "./admin-console/organizations/users/organization-user.module"; import { LoginModule } from "./auth/login/login.module"; import { TrialInitiationModule } from "./auth/trial-initiation/trial-initiation.module"; @@ -16,7 +15,6 @@ import { VaultFilterModule } from "./vault/individual-vault/vault-filter/vault-f VaultFilterModule, OrganizationBadgeModule, OrganizationUserModule, - OrganizationCreateModule, LoginModule, ], exports: [ diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index 96b127c113..08f14a5cce 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -3,12 +3,10 @@ import { NgModule } from "@angular/core"; import { PasswordCalloutComponent } from "@bitwarden/auth"; import { OrganizationSwitcherComponent } from "../admin-console/components/organization-switcher.component"; -import { OrganizationCreateModule } from "../admin-console/organizations/create/organization-create.module"; import { OrganizationLayoutComponent } from "../admin-console/organizations/layouts/organization-layout.component"; import { EventsComponent as OrgEventsComponent } from "../admin-console/organizations/manage/events.component"; import { UserConfirmComponent as OrgUserConfirmComponent } from "../admin-console/organizations/manage/user-confirm.component"; import { AcceptFamilySponsorshipComponent } from "../admin-console/organizations/sponsorships/accept-family-sponsorship.component"; -import { FamiliesForEnterpriseSetupComponent } from "../admin-console/organizations/sponsorships/families-for-enterprise-setup.component"; import { ExposedPasswordsReportComponent as OrgExposedPasswordsReportComponent } from "../admin-console/organizations/tools/exposed-passwords-report.component"; import { InactiveTwoFactorReportComponent as OrgInactiveTwoFactorReportComponent } from "../admin-console/organizations/tools/inactive-two-factor-report.component"; import { ReusedPasswordsReportComponent as OrgReusedPasswordsReportComponent } from "../admin-console/organizations/tools/reused-passwords-report.component"; @@ -16,7 +14,6 @@ import { ToolsComponent as OrgToolsComponent } from "../admin-console/organizati import { UnsecuredWebsitesReportComponent as OrgUnsecuredWebsitesReportComponent } from "../admin-console/organizations/tools/unsecured-websites-report.component"; import { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from "../admin-console/organizations/tools/weak-passwords-report.component"; import { ProvidersComponent } from "../admin-console/providers/providers.component"; -import { CreateOrganizationComponent } from "../admin-console/settings/create-organization.component"; import { SponsoredFamiliesComponent } from "../admin-console/settings/sponsored-families.component"; import { SponsoringOrgRowComponent } from "../admin-console/settings/sponsoring-org-row.component"; import { AcceptEmergencyComponent } from "../auth/accept-emergency.component"; @@ -54,19 +51,7 @@ import { UpdatePasswordComponent } from "../auth/update-password.component"; import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component"; import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component"; import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component"; -import { SecretsManagerBillingModule } from "../billing/organizations/secrets-manager/sm-billing.module"; -import { AddCreditComponent } from "../billing/settings/add-credit.component"; -import { AdjustPaymentComponent } from "../billing/settings/adjust-payment.component"; -import { BillingHistoryViewComponent } from "../billing/settings/billing-history-view.component"; -import { BillingHistoryComponent } from "../billing/settings/billing-history.component"; -import { BillingSyncKeyComponent } from "../billing/settings/billing-sync-key.component"; -import { OrganizationPlansComponent } from "../billing/settings/organization-plans.component"; -import { PaymentMethodComponent } from "../billing/settings/payment-method.component"; -import { PaymentComponent } from "../billing/settings/payment.component"; -import { PremiumComponent } from "../billing/settings/premium.component"; -import { SubscriptionComponent } from "../billing/settings/subscription.component"; -import { TaxInfoComponent } from "../billing/settings/tax-info.component"; -import { UserSubscriptionComponent } from "../billing/settings/user-subscription.component"; +import { BillingSharedModule } from "../billing/shared"; import { DynamicAvatarComponent } from "../components/dynamic-avatar.component"; import { SelectableAvatarComponent } from "../components/selectable-avatar.component"; import { FooterComponent } from "../layouts/footer.component"; @@ -75,7 +60,6 @@ import { NavbarComponent } from "../layouts/navbar.component"; import { ProductSwitcherModule } from "../layouts/product-switcher/product-switcher.module"; import { UserLayoutComponent } from "../layouts/user-layout.component"; import { AccountComponent } from "../settings/account.component"; -import { AdjustStorageComponent } from "../settings/adjust-storage.component"; import { ApiKeyComponent } from "../settings/api-key.component"; import { ChangeAvatarComponent } from "../settings/change-avatar.component"; import { ChangeEmailComponent } from "../settings/change-email.component"; @@ -89,7 +73,6 @@ import { PurgeVaultComponent } from "../settings/purge-vault.component"; import { SecurityKeysComponent } from "../settings/security-keys.component"; import { SecurityComponent } from "../settings/security.component"; import { SettingsComponent } from "../settings/settings.component"; -import { UpdateLicenseComponent } from "../settings/update-license.component"; import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.component"; import { GeneratorComponent } from "../tools/generator.component"; import { PasswordGeneratorHistoryComponent } from "../tools/password-generator-history.component"; @@ -117,7 +100,6 @@ import { SharedModule } from "./shared.module"; @NgModule({ imports: [ SharedModule, - OrganizationCreateModule, RegisterFormModule, ProductSwitcherModule, UserVerificationModule, @@ -125,10 +107,12 @@ import { SharedModule } from "./shared.module"; DynamicAvatarComponent, EnvironmentSelectorModule, AccountFingerprintComponent, - - // To be removed when OrganizationPlansComponent is moved to its own module (see AC-1453) - SecretsManagerBillingModule, PasswordCalloutComponent, + + // Temporary export to be removed in AC-1453 + // Import PaymentComponent and TaxInfoComponent directly into TrialIniationComponent + // and remove BillingSharedModule here + BillingSharedModule, ], declarations: [ AcceptEmergencyComponent, @@ -136,19 +120,14 @@ import { SharedModule } from "./shared.module"; AcceptOrganizationComponent, AccessComponent, AccountComponent, - AddCreditComponent, AddEditComponent, AddEditCustomFieldsComponent, AddEditCustomFieldsComponent, - AdjustPaymentComponent, - AdjustStorageComponent, ApiKeyComponent, AttachmentsComponent, - BillingSyncKeyComponent, ChangeEmailComponent, ChangePasswordComponent, CollectionsComponent, - CreateOrganizationComponent, DeauthorizeSessionsComponent, DeleteAccountComponent, DomainRulesComponent, @@ -159,7 +138,6 @@ import { SharedModule } from "./shared.module"; EmergencyAccessTakeoverComponent, EmergencyAccessViewComponent, EmergencyAddEditComponent, - FamiliesForEnterpriseSetupComponent, FolderAddEditComponent, FooterComponent, FrontendLayoutComponent, @@ -169,7 +147,6 @@ import { SharedModule } from "./shared.module"; OrganizationSwitcherComponent, OrgAddEditComponent, OrganizationLayoutComponent, - OrganizationPlansComponent, OrgAttachmentsComponent, OrgCollectionsComponent, OrgEventsComponent, @@ -183,11 +160,8 @@ import { SharedModule } from "./shared.module"; GeneratorComponent, PasswordGeneratorHistoryComponent, PasswordRepromptComponent, - PaymentComponent, - PaymentMethodComponent, PreferencesComponent, PremiumBadgeComponent, - PremiumComponent, ProfileComponent, ChangeAvatarComponent, ProvidersComponent, @@ -205,8 +179,6 @@ import { SharedModule } from "./shared.module"; SponsoredFamiliesComponent, SponsoringOrgRowComponent, SsoComponent, - SubscriptionComponent, - TaxInfoComponent, ToolsComponent, TwoFactorAuthenticatorComponent, TwoFactorComponent, @@ -218,13 +190,9 @@ import { SharedModule } from "./shared.module"; TwoFactorVerifyComponent, TwoFactorWebAuthnComponent, TwoFactorYubiKeyComponent, - UpdateLicenseComponent, UpdatePasswordComponent, UpdateTempPasswordComponent, - BillingHistoryComponent, - BillingHistoryViewComponent, UserLayoutComponent, - UserSubscriptionComponent, VaultTimeoutInputComponent, VerifyEmailComponent, VerifyEmailTokenComponent, @@ -238,18 +206,14 @@ import { SharedModule } from "./shared.module"; AcceptOrganizationComponent, AccessComponent, AccountComponent, - AddCreditComponent, AddEditComponent, AddEditCustomFieldsComponent, AddEditCustomFieldsComponent, - AdjustPaymentComponent, - AdjustStorageComponent, ApiKeyComponent, AttachmentsComponent, ChangeEmailComponent, ChangePasswordComponent, CollectionsComponent, - CreateOrganizationComponent, DeauthorizeSessionsComponent, DeleteAccountComponent, DomainRulesComponent, @@ -261,7 +225,6 @@ import { SharedModule } from "./shared.module"; EmergencyAccessTakeoverComponent, EmergencyAccessViewComponent, EmergencyAddEditComponent, - FamiliesForEnterpriseSetupComponent, FolderAddEditComponent, FooterComponent, FrontendLayoutComponent, @@ -271,7 +234,6 @@ import { SharedModule } from "./shared.module"; OrganizationSwitcherComponent, OrgAddEditComponent, OrganizationLayoutComponent, - OrganizationPlansComponent, OrgAttachmentsComponent, OrgCollectionsComponent, OrgEventsComponent, @@ -285,11 +247,8 @@ import { SharedModule } from "./shared.module"; GeneratorComponent, PasswordGeneratorHistoryComponent, PasswordRepromptComponent, - PaymentComponent, - PaymentMethodComponent, PreferencesComponent, PremiumBadgeComponent, - PremiumComponent, ProfileComponent, ChangeAvatarComponent, ProvidersComponent, @@ -307,8 +266,6 @@ import { SharedModule } from "./shared.module"; SponsoredFamiliesComponent, SponsoringOrgRowComponent, SsoComponent, - SubscriptionComponent, - TaxInfoComponent, ToolsComponent, TwoFactorAuthenticatorComponent, TwoFactorComponent, @@ -320,18 +277,19 @@ import { SharedModule } from "./shared.module"; TwoFactorVerifyComponent, TwoFactorWebAuthnComponent, TwoFactorYubiKeyComponent, - UpdateLicenseComponent, UpdatePasswordComponent, UpdateTempPasswordComponent, - BillingHistoryComponent, - BillingHistoryViewComponent, UserLayoutComponent, - UserSubscriptionComponent, VaultTimeoutInputComponent, VerifyEmailComponent, VerifyEmailTokenComponent, VerifyRecoverDeleteComponent, LowKdfComponent, + + // Temporary export to be removed in AC-1453 + // Import PaymentComponent and TaxInfoComponent directly into TrialIniationComponent + // and remove BillingSharedModule here + BillingSharedModule, ], }) export class LooseComponentsModule {} diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts index 53137514d4..994980deee 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing/settings/organization-plans.component"; +import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing"; @Component({ selector: "app-create-organization", diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts index 70bc6241b6..b7f3bf9f38 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts @@ -5,6 +5,7 @@ import { FormsModule } from "@angular/forms"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { SearchModule } from "@bitwarden/components"; +import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing"; import { OssModule } from "@bitwarden/web-vault/app/oss.module"; import { AddOrganizationComponent } from "./clients/add-organization.component"; @@ -32,8 +33,9 @@ import { SetupComponent } from "./setup/setup.component"; FormsModule, OssModule, JslibModule, - SearchModule, ProvidersRoutingModule, + OrganizationPlansComponent, + SearchModule, ], declarations: [ AcceptProviderComponent,