[AC-1453] Move OrganizationPlansComponent and related components out of LooseComponentsModule (#6230)
* restructure billing folders into individual, organization, and shared * move components from `LooseComponentsModule`
This commit is contained in:
parent
0e1b2cfb0d
commit
0a953b444a
|
@ -15,15 +15,17 @@ import { ValidationService } from "@bitwarden/common/platform/abstractions/valid
|
||||||
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
|
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
|
||||||
import { DialogService } from "@bitwarden/components";
|
import { DialogService } from "@bitwarden/components";
|
||||||
|
|
||||||
import { OrganizationPlansComponent } from "../../../billing/settings/organization-plans.component";
|
import { OrganizationPlansComponent } from "../../../billing";
|
||||||
|
import { SharedModule } from "../../../shared";
|
||||||
import {
|
import {
|
||||||
DeleteOrganizationDialogResult,
|
DeleteOrganizationDialogResult,
|
||||||
openDeleteOrganizationDialog,
|
openDeleteOrganizationDialog,
|
||||||
} from "../settings/components";
|
} from "../settings/components";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "families-for-enterprise-setup",
|
|
||||||
templateUrl: "families-for-enterprise-setup.component.html",
|
templateUrl: "families-for-enterprise-setup.component.html",
|
||||||
|
standalone: true,
|
||||||
|
imports: [SharedModule, OrganizationPlansComponent],
|
||||||
})
|
})
|
||||||
export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy {
|
export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy {
|
||||||
@ViewChild(OrganizationPlansComponent, { static: false })
|
@ViewChild(OrganizationPlansComponent, { static: false })
|
||||||
|
|
|
@ -5,11 +5,13 @@ import { first } from "rxjs/operators";
|
||||||
import { PlanType } from "@bitwarden/common/billing/enums";
|
import { PlanType } from "@bitwarden/common/billing/enums";
|
||||||
import { ProductType } from "@bitwarden/common/enums";
|
import { ProductType } from "@bitwarden/common/enums";
|
||||||
|
|
||||||
import { OrganizationPlansComponent } from "../../billing/settings/organization-plans.component";
|
import { OrganizationPlansComponent } from "../../billing";
|
||||||
|
import { SharedModule } from "../../shared";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-create-organization",
|
|
||||||
templateUrl: "create-organization.component.html",
|
templateUrl: "create-organization.component.html",
|
||||||
|
standalone: true,
|
||||||
|
imports: [SharedModule, OrganizationPlansComponent],
|
||||||
})
|
})
|
||||||
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
||||||
export class CreateOrganizationComponent implements OnInit {
|
export class CreateOrganizationComponent implements OnInit {
|
||||||
|
|
|
@ -3,7 +3,7 @@ import { FormGroup } from "@angular/forms";
|
||||||
|
|
||||||
import { ProductType } from "@bitwarden/common/enums";
|
import { ProductType } from "@bitwarden/common/enums";
|
||||||
|
|
||||||
import { OrganizationPlansComponent } from "../../settings/organization-plans.component";
|
import { OrganizationPlansComponent } from "../../organizations";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-billing",
|
selector: "app-billing",
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
export { OrganizationPlansComponent } from "./organizations";
|
||||||
|
export { PaymentComponent, TaxInfoComponent } from "./shared";
|
|
@ -6,7 +6,6 @@ import { BillingHistoryResponse } from "@bitwarden/common/billing/models/respons
|
||||||
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-billing-history-view",
|
|
||||||
templateUrl: "billing-history-view.component.html",
|
templateUrl: "billing-history-view.component.html",
|
||||||
})
|
})
|
||||||
export class BillingHistoryViewComponent implements OnInit {
|
export class BillingHistoryViewComponent implements OnInit {
|
|
@ -1,12 +1,12 @@
|
||||||
import { NgModule } from "@angular/core";
|
import { NgModule } from "@angular/core";
|
||||||
import { RouterModule, Routes } from "@angular/router";
|
import { RouterModule, Routes } from "@angular/router";
|
||||||
|
|
||||||
import { BillingHistoryViewComponent } from "../../billing/settings/billing-history-view.component";
|
import { PaymentMethodComponent } from "../shared";
|
||||||
import { PaymentMethodComponent } from "../../billing/settings/payment-method.component";
|
|
||||||
import { UserSubscriptionComponent } from "../../billing/settings/user-subscription.component";
|
|
||||||
import { PremiumComponent } from "../settings/premium.component";
|
|
||||||
|
|
||||||
|
import { BillingHistoryViewComponent } from "./billing-history-view.component";
|
||||||
|
import { PremiumComponent } from "./premium.component";
|
||||||
import { SubscriptionComponent } from "./subscription.component";
|
import { SubscriptionComponent } from "./subscription.component";
|
||||||
|
import { UserSubscriptionComponent } from "./user-subscription.component";
|
||||||
|
|
||||||
const routes: Routes = [
|
const routes: Routes = [
|
||||||
{
|
{
|
||||||
|
@ -43,4 +43,4 @@ const routes: Routes = [
|
||||||
imports: [RouterModule.forChild(routes)],
|
imports: [RouterModule.forChild(routes)],
|
||||||
exports: [RouterModule],
|
exports: [RouterModule],
|
||||||
})
|
})
|
||||||
export class SubscriptionRoutingModule {}
|
export class IndividualBillingRoutingModule {}
|
|
@ -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 {}
|
|
@ -11,11 +11,9 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
|
||||||
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
|
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
|
||||||
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
|
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
|
||||||
|
|
||||||
import { PaymentComponent } from "./payment.component";
|
import { PaymentComponent, TaxInfoComponent } from "../shared";
|
||||||
import { TaxInfoComponent } from "./tax-info.component";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-premium",
|
|
||||||
templateUrl: "premium.component.html",
|
templateUrl: "premium.component.html",
|
||||||
})
|
})
|
||||||
export class PremiumComponent implements OnInit {
|
export class PremiumComponent implements OnInit {
|
|
@ -4,7 +4,6 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
|
||||||
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
|
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-subscription",
|
|
||||||
templateUrl: "subscription.component.html",
|
templateUrl: "subscription.component.html",
|
||||||
})
|
})
|
||||||
export class SubscriptionComponent {
|
export class SubscriptionComponent {
|
|
@ -12,7 +12,6 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
|
||||||
import { DialogService } from "@bitwarden/components";
|
import { DialogService } from "@bitwarden/components";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-user-subscription",
|
|
||||||
templateUrl: "user-subscription.component.html",
|
templateUrl: "user-subscription.component.html",
|
||||||
})
|
})
|
||||||
export class UserSubscriptionComponent implements OnInit {
|
export class UserSubscriptionComponent implements OnInit {
|
|
@ -17,7 +17,6 @@ export interface BillingSyncApiModalData {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-billing-sync-api-key",
|
|
||||||
templateUrl: "billing-sync-api-key.component.html",
|
templateUrl: "billing-sync-api-key.component.html",
|
||||||
})
|
})
|
||||||
export class BillingSyncApiKeyComponent {
|
export class BillingSyncApiKeyComponent {
|
||||||
|
|
|
@ -18,7 +18,6 @@ export interface BillingSyncKeyModalData {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-billing-sync-key",
|
|
||||||
templateUrl: "billing-sync-key.component.html",
|
templateUrl: "billing-sync-key.component.html",
|
||||||
})
|
})
|
||||||
export class BillingSyncKeyComponent {
|
export class BillingSyncKeyComponent {
|
|
@ -0,0 +1 @@
|
||||||
|
export * from "./organization-plans.component";
|
|
@ -6,7 +6,6 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso
|
||||||
import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response";
|
import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-org-billing-history-view",
|
|
||||||
templateUrl: "organization-billing-history-view.component.html",
|
templateUrl: "organization-billing-history-view.component.html",
|
||||||
})
|
})
|
||||||
export class OrgBillingHistoryViewComponent implements OnInit, OnDestroy {
|
export class OrgBillingHistoryViewComponent implements OnInit, OnDestroy {
|
||||||
|
|
|
@ -5,8 +5,8 @@ import { canAccessBillingTab } from "@bitwarden/common/admin-console/abstraction
|
||||||
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
|
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
|
||||||
|
|
||||||
import { OrganizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard";
|
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 { WebPlatformUtilsService } from "../../core/web-platform-utils.service";
|
||||||
|
import { PaymentMethodComponent } from "../shared";
|
||||||
|
|
||||||
import { OrgBillingHistoryViewComponent } from "./organization-billing-history-view.component";
|
import { OrgBillingHistoryViewComponent } from "./organization-billing-history-view.component";
|
||||||
import { OrganizationBillingTabComponent } from "./organization-billing-tab.component";
|
import { OrganizationBillingTabComponent } from "./organization-billing-tab.component";
|
||||||
|
|
|
@ -6,7 +6,6 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
|
||||||
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-org-billing-tab",
|
|
||||||
templateUrl: "organization-billing-tab.component.html",
|
templateUrl: "organization-billing-tab.component.html",
|
||||||
})
|
})
|
||||||
export class OrganizationBillingTabComponent implements OnInit {
|
export class OrganizationBillingTabComponent implements OnInit {
|
||||||
|
|
|
@ -1,37 +1,42 @@
|
||||||
import { NgModule } from "@angular/core";
|
import { NgModule } from "@angular/core";
|
||||||
|
|
||||||
import { UserVerificationModule } from "../../auth/shared/components/user-verification";
|
import { UserVerificationModule } from "../../auth/shared/components/user-verification";
|
||||||
import { LooseComponentsModule, SharedModule } from "../../shared";
|
import { BillingSharedModule } from "../shared";
|
||||||
|
|
||||||
import { AdjustSubscription } from "./adjust-subscription.component";
|
import { AdjustSubscription } from "./adjust-subscription.component";
|
||||||
import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component";
|
import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component";
|
||||||
|
import { BillingSyncKeyComponent } from "./billing-sync-key.component";
|
||||||
import { ChangePlanComponent } from "./change-plan.component";
|
import { ChangePlanComponent } from "./change-plan.component";
|
||||||
import { DownloadLicenseComponent } from "./download-license.component";
|
import { DownloadLicenseComponent } from "./download-license.component";
|
||||||
import { OrgBillingHistoryViewComponent } from "./organization-billing-history-view.component";
|
import { OrgBillingHistoryViewComponent } from "./organization-billing-history-view.component";
|
||||||
import { OrganizationBillingRoutingModule } from "./organization-billing-routing.module";
|
import { OrganizationBillingRoutingModule } from "./organization-billing-routing.module";
|
||||||
import { OrganizationBillingTabComponent } from "./organization-billing-tab.component";
|
import { OrganizationBillingTabComponent } from "./organization-billing-tab.component";
|
||||||
|
import { OrganizationPlansComponent } from "./organization-plans.component";
|
||||||
import { OrganizationSubscriptionCloudComponent } from "./organization-subscription-cloud.component";
|
import { OrganizationSubscriptionCloudComponent } from "./organization-subscription-cloud.component";
|
||||||
import { OrganizationSubscriptionSelfhostComponent } from "./organization-subscription-selfhost.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";
|
import { SubscriptionHiddenComponent } from "./subscription-hidden.component";
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
SharedModule,
|
|
||||||
LooseComponentsModule,
|
|
||||||
OrganizationBillingRoutingModule,
|
OrganizationBillingRoutingModule,
|
||||||
UserVerificationModule,
|
UserVerificationModule,
|
||||||
SecretsManagerBillingModule,
|
BillingSharedModule,
|
||||||
|
OrganizationPlansComponent,
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
AdjustSubscription,
|
AdjustSubscription,
|
||||||
BillingSyncApiKeyComponent,
|
BillingSyncApiKeyComponent,
|
||||||
|
BillingSyncKeyComponent,
|
||||||
ChangePlanComponent,
|
ChangePlanComponent,
|
||||||
DownloadLicenseComponent,
|
DownloadLicenseComponent,
|
||||||
OrganizationBillingTabComponent,
|
OrganizationBillingTabComponent,
|
||||||
OrgBillingHistoryViewComponent,
|
|
||||||
OrganizationSubscriptionSelfhostComponent,
|
|
||||||
OrganizationSubscriptionCloudComponent,
|
OrganizationSubscriptionCloudComponent,
|
||||||
|
OrganizationSubscriptionSelfhostComponent,
|
||||||
|
OrgBillingHistoryViewComponent,
|
||||||
|
SecretsManagerAdjustSubscriptionComponent,
|
||||||
|
SecretsManagerSubscribeStandaloneComponent,
|
||||||
SubscriptionHiddenComponent,
|
SubscriptionHiddenComponent,
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
|
|
|
@ -35,10 +35,10 @@ import {
|
||||||
} from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
|
} from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
|
||||||
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
|
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
|
||||||
|
|
||||||
import { secretsManagerSubscribeFormFactory } from "../organizations/secrets-manager/sm-subscribe.component";
|
import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module";
|
||||||
|
import { BillingSharedModule, secretsManagerSubscribeFormFactory } from "../shared";
|
||||||
import { PaymentComponent } from "./payment.component";
|
import { PaymentComponent } from "../shared/payment.component";
|
||||||
import { TaxInfoComponent } from "./tax-info.component";
|
import { TaxInfoComponent } from "../shared/tax-info.component";
|
||||||
|
|
||||||
interface OnSuccessArgs {
|
interface OnSuccessArgs {
|
||||||
organizationId: string;
|
organizationId: string;
|
||||||
|
@ -47,6 +47,8 @@ interface OnSuccessArgs {
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-organization-plans",
|
selector: "app-organization-plans",
|
||||||
templateUrl: "organization-plans.component.html",
|
templateUrl: "organization-plans.component.html",
|
||||||
|
standalone: true,
|
||||||
|
imports: [BillingSharedModule, OrganizationCreateModule],
|
||||||
})
|
})
|
||||||
export class OrganizationPlansComponent implements OnInit, OnDestroy {
|
export class OrganizationPlansComponent implements OnInit, OnDestroy {
|
||||||
@ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
|
@ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
|
|
@ -22,10 +22,9 @@ import {
|
||||||
BillingSyncApiKeyComponent,
|
BillingSyncApiKeyComponent,
|
||||||
BillingSyncApiModalData,
|
BillingSyncApiModalData,
|
||||||
} from "./billing-sync-api-key.component";
|
} from "./billing-sync-api-key.component";
|
||||||
import { SecretsManagerSubscriptionOptions } from "./secrets-manager/sm-adjust-subscription.component";
|
import { SecretsManagerSubscriptionOptions } from "./sm-adjust-subscription.component";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-org-subscription-cloud",
|
|
||||||
templateUrl: "organization-subscription-cloud.component.html",
|
templateUrl: "organization-subscription-cloud.component.html",
|
||||||
})
|
})
|
||||||
export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy {
|
export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy {
|
||||||
|
|
|
@ -17,10 +17,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
|
||||||
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
|
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
|
||||||
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
||||||
|
|
||||||
import {
|
import { BillingSyncKeyComponent, BillingSyncKeyModalData } from "./billing-sync-key.component";
|
||||||
BillingSyncKeyComponent,
|
|
||||||
BillingSyncKeyModalData,
|
|
||||||
} from "../../billing/settings/billing-sync-key.component";
|
|
||||||
|
|
||||||
enum LicenseOptions {
|
enum LicenseOptions {
|
||||||
SYNC = 0,
|
SYNC = 0,
|
||||||
|
@ -28,7 +25,6 @@ enum LicenseOptions {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-org-subscription-selfhost",
|
|
||||||
templateUrl: "organization-subscription-selfhost.component.html",
|
templateUrl: "organization-subscription-selfhost.component.html",
|
||||||
})
|
})
|
||||||
export class OrganizationSubscriptionSelfhostComponent implements OnInit, OnDestroy {
|
export class OrganizationSubscriptionSelfhostComponent implements OnInit, OnDestroy {
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
export * from "./sm-billing.module";
|
|
||||||
export * from "./sm-subscribe.component";
|
|
||||||
export * from "./sm-subscribe-standalone.component";
|
|
|
@ -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 {}
|
|
|
@ -10,7 +10,7 @@ import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.res
|
||||||
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 { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
||||||
|
|
||||||
import { secretsManagerSubscribeFormFactory } from "./sm-subscribe.component";
|
import { secretsManagerSubscribeFormFactory } from "../shared";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "sm-subscribe-standalone",
|
selector: "sm-subscribe-standalone",
|
|
@ -9,7 +9,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
|
||||||
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
||||||
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
||||||
|
|
||||||
import { PaymentComponent } from "../billing/settings/payment.component";
|
import { PaymentComponent } from "./payment.component";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-adjust-storage",
|
selector: "app-adjust-storage",
|
|
@ -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 {}
|
|
@ -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";
|
|
@ -17,7 +17,6 @@ import { DialogService } from "@bitwarden/components";
|
||||||
import { TaxInfoComponent } from "./tax-info.component";
|
import { TaxInfoComponent } from "./tax-info.component";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-payment-method",
|
|
||||||
templateUrl: "payment-method.component.html",
|
templateUrl: "payment-method.component.html",
|
||||||
})
|
})
|
||||||
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
|
@ -6,9 +6,13 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
|
||||||
import { PaymentMethodType } from "@bitwarden/common/billing/enums";
|
import { PaymentMethodType } from "@bitwarden/common/billing/enums";
|
||||||
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
||||||
|
|
||||||
|
import { SharedModule } from "../../shared";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-payment",
|
selector: "app-payment",
|
||||||
templateUrl: "payment.component.html",
|
templateUrl: "payment.component.html",
|
||||||
|
standalone: true,
|
||||||
|
imports: [SharedModule],
|
||||||
})
|
})
|
||||||
export class PaymentComponent implements OnInit, OnDestroy {
|
export class PaymentComponent implements OnInit, OnDestroy {
|
||||||
@Input() showMethods = true;
|
@Input() showMethods = true;
|
|
@ -7,7 +7,7 @@ import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.res
|
||||||
import { ProductType } from "@bitwarden/common/enums";
|
import { ProductType } from "@bitwarden/common/enums";
|
||||||
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
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 {
|
export interface SecretsManagerSubscription {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
|
@ -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 { TaxRateResponse } from "@bitwarden/common/billing/models/response/tax-rate.response";
|
||||||
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
||||||
|
|
||||||
|
import { SharedModule } from "../../shared";
|
||||||
|
|
||||||
type TaxInfoView = Omit<TaxInfoResponse, "taxIdType"> & {
|
type TaxInfoView = Omit<TaxInfoResponse, "taxIdType"> & {
|
||||||
includeTaxId: boolean;
|
includeTaxId: boolean;
|
||||||
[key: string]: unknown;
|
[key: string]: unknown;
|
||||||
|
@ -17,6 +19,8 @@ type TaxInfoView = Omit<TaxInfoResponse, "taxIdType"> & {
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-tax-info",
|
selector: "app-tax-info",
|
||||||
templateUrl: "tax-info.component.html",
|
templateUrl: "tax-info.component.html",
|
||||||
|
standalone: true,
|
||||||
|
imports: [SharedModule],
|
||||||
})
|
})
|
||||||
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
||||||
export class TaxInfoComponent {
|
export class TaxInfoComponent {
|
|
@ -11,7 +11,6 @@ import {
|
||||||
import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard";
|
import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard";
|
||||||
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
|
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 { flagEnabled, Flags } from "../utils/flags";
|
||||||
|
|
||||||
import { AcceptFamilySponsorshipComponent } from "./admin-console/organizations/sponsorships/accept-family-sponsorship.component";
|
import { AcceptFamilySponsorshipComponent } from "./admin-console/organizations/sponsorships/accept-family-sponsorship.component";
|
||||||
|
@ -221,7 +220,10 @@ const routes: Routes = [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "subscription",
|
path: "subscription",
|
||||||
loadChildren: () => SubscriptionRoutingModule,
|
loadChildren: () =>
|
||||||
|
import("./billing/individual/individual-billing.module").then(
|
||||||
|
(m) => m.IndividualBillingModule
|
||||||
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "emergency-access",
|
path: "emergency-access",
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import { NgModule } from "@angular/core";
|
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 { OrganizationUserModule } from "./admin-console/organizations/users/organization-user.module";
|
||||||
import { LoginModule } from "./auth/login/login.module";
|
import { LoginModule } from "./auth/login/login.module";
|
||||||
import { TrialInitiationModule } from "./auth/trial-initiation/trial-initiation.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,
|
VaultFilterModule,
|
||||||
OrganizationBadgeModule,
|
OrganizationBadgeModule,
|
||||||
OrganizationUserModule,
|
OrganizationUserModule,
|
||||||
OrganizationCreateModule,
|
|
||||||
LoginModule,
|
LoginModule,
|
||||||
],
|
],
|
||||||
exports: [
|
exports: [
|
||||||
|
|
|
@ -3,12 +3,10 @@ import { NgModule } from "@angular/core";
|
||||||
import { PasswordCalloutComponent } from "@bitwarden/auth";
|
import { PasswordCalloutComponent } from "@bitwarden/auth";
|
||||||
|
|
||||||
import { OrganizationSwitcherComponent } from "../admin-console/components/organization-switcher.component";
|
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 { OrganizationLayoutComponent } from "../admin-console/organizations/layouts/organization-layout.component";
|
||||||
import { EventsComponent as OrgEventsComponent } from "../admin-console/organizations/manage/events.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 { UserConfirmComponent as OrgUserConfirmComponent } from "../admin-console/organizations/manage/user-confirm.component";
|
||||||
import { AcceptFamilySponsorshipComponent } from "../admin-console/organizations/sponsorships/accept-family-sponsorship.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 { 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 { 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";
|
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 { 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 { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from "../admin-console/organizations/tools/weak-passwords-report.component";
|
||||||
import { ProvidersComponent } from "../admin-console/providers/providers.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 { SponsoredFamiliesComponent } from "../admin-console/settings/sponsored-families.component";
|
||||||
import { SponsoringOrgRowComponent } from "../admin-console/settings/sponsoring-org-row.component";
|
import { SponsoringOrgRowComponent } from "../admin-console/settings/sponsoring-org-row.component";
|
||||||
import { AcceptEmergencyComponent } from "../auth/accept-emergency.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 { UpdateTempPasswordComponent } from "../auth/update-temp-password.component";
|
||||||
import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component";
|
import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component";
|
||||||
import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component";
|
import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component";
|
||||||
import { SecretsManagerBillingModule } from "../billing/organizations/secrets-manager/sm-billing.module";
|
import { BillingSharedModule } from "../billing/shared";
|
||||||
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 { DynamicAvatarComponent } from "../components/dynamic-avatar.component";
|
import { DynamicAvatarComponent } from "../components/dynamic-avatar.component";
|
||||||
import { SelectableAvatarComponent } from "../components/selectable-avatar.component";
|
import { SelectableAvatarComponent } from "../components/selectable-avatar.component";
|
||||||
import { FooterComponent } from "../layouts/footer.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 { ProductSwitcherModule } from "../layouts/product-switcher/product-switcher.module";
|
||||||
import { UserLayoutComponent } from "../layouts/user-layout.component";
|
import { UserLayoutComponent } from "../layouts/user-layout.component";
|
||||||
import { AccountComponent } from "../settings/account.component";
|
import { AccountComponent } from "../settings/account.component";
|
||||||
import { AdjustStorageComponent } from "../settings/adjust-storage.component";
|
|
||||||
import { ApiKeyComponent } from "../settings/api-key.component";
|
import { ApiKeyComponent } from "../settings/api-key.component";
|
||||||
import { ChangeAvatarComponent } from "../settings/change-avatar.component";
|
import { ChangeAvatarComponent } from "../settings/change-avatar.component";
|
||||||
import { ChangeEmailComponent } from "../settings/change-email.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 { SecurityKeysComponent } from "../settings/security-keys.component";
|
||||||
import { SecurityComponent } from "../settings/security.component";
|
import { SecurityComponent } from "../settings/security.component";
|
||||||
import { SettingsComponent } from "../settings/settings.component";
|
import { SettingsComponent } from "../settings/settings.component";
|
||||||
import { UpdateLicenseComponent } from "../settings/update-license.component";
|
|
||||||
import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.component";
|
import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.component";
|
||||||
import { GeneratorComponent } from "../tools/generator.component";
|
import { GeneratorComponent } from "../tools/generator.component";
|
||||||
import { PasswordGeneratorHistoryComponent } from "../tools/password-generator-history.component";
|
import { PasswordGeneratorHistoryComponent } from "../tools/password-generator-history.component";
|
||||||
|
@ -117,7 +100,6 @@ import { SharedModule } from "./shared.module";
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
SharedModule,
|
SharedModule,
|
||||||
OrganizationCreateModule,
|
|
||||||
RegisterFormModule,
|
RegisterFormModule,
|
||||||
ProductSwitcherModule,
|
ProductSwitcherModule,
|
||||||
UserVerificationModule,
|
UserVerificationModule,
|
||||||
|
@ -125,10 +107,12 @@ import { SharedModule } from "./shared.module";
|
||||||
DynamicAvatarComponent,
|
DynamicAvatarComponent,
|
||||||
EnvironmentSelectorModule,
|
EnvironmentSelectorModule,
|
||||||
AccountFingerprintComponent,
|
AccountFingerprintComponent,
|
||||||
|
|
||||||
// To be removed when OrganizationPlansComponent is moved to its own module (see AC-1453)
|
|
||||||
SecretsManagerBillingModule,
|
|
||||||
PasswordCalloutComponent,
|
PasswordCalloutComponent,
|
||||||
|
|
||||||
|
// Temporary export to be removed in AC-1453
|
||||||
|
// Import PaymentComponent and TaxInfoComponent directly into TrialIniationComponent
|
||||||
|
// and remove BillingSharedModule here
|
||||||
|
BillingSharedModule,
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
AcceptEmergencyComponent,
|
AcceptEmergencyComponent,
|
||||||
|
@ -136,19 +120,14 @@ import { SharedModule } from "./shared.module";
|
||||||
AcceptOrganizationComponent,
|
AcceptOrganizationComponent,
|
||||||
AccessComponent,
|
AccessComponent,
|
||||||
AccountComponent,
|
AccountComponent,
|
||||||
AddCreditComponent,
|
|
||||||
AddEditComponent,
|
AddEditComponent,
|
||||||
AddEditCustomFieldsComponent,
|
AddEditCustomFieldsComponent,
|
||||||
AddEditCustomFieldsComponent,
|
AddEditCustomFieldsComponent,
|
||||||
AdjustPaymentComponent,
|
|
||||||
AdjustStorageComponent,
|
|
||||||
ApiKeyComponent,
|
ApiKeyComponent,
|
||||||
AttachmentsComponent,
|
AttachmentsComponent,
|
||||||
BillingSyncKeyComponent,
|
|
||||||
ChangeEmailComponent,
|
ChangeEmailComponent,
|
||||||
ChangePasswordComponent,
|
ChangePasswordComponent,
|
||||||
CollectionsComponent,
|
CollectionsComponent,
|
||||||
CreateOrganizationComponent,
|
|
||||||
DeauthorizeSessionsComponent,
|
DeauthorizeSessionsComponent,
|
||||||
DeleteAccountComponent,
|
DeleteAccountComponent,
|
||||||
DomainRulesComponent,
|
DomainRulesComponent,
|
||||||
|
@ -159,7 +138,6 @@ import { SharedModule } from "./shared.module";
|
||||||
EmergencyAccessTakeoverComponent,
|
EmergencyAccessTakeoverComponent,
|
||||||
EmergencyAccessViewComponent,
|
EmergencyAccessViewComponent,
|
||||||
EmergencyAddEditComponent,
|
EmergencyAddEditComponent,
|
||||||
FamiliesForEnterpriseSetupComponent,
|
|
||||||
FolderAddEditComponent,
|
FolderAddEditComponent,
|
||||||
FooterComponent,
|
FooterComponent,
|
||||||
FrontendLayoutComponent,
|
FrontendLayoutComponent,
|
||||||
|
@ -169,7 +147,6 @@ import { SharedModule } from "./shared.module";
|
||||||
OrganizationSwitcherComponent,
|
OrganizationSwitcherComponent,
|
||||||
OrgAddEditComponent,
|
OrgAddEditComponent,
|
||||||
OrganizationLayoutComponent,
|
OrganizationLayoutComponent,
|
||||||
OrganizationPlansComponent,
|
|
||||||
OrgAttachmentsComponent,
|
OrgAttachmentsComponent,
|
||||||
OrgCollectionsComponent,
|
OrgCollectionsComponent,
|
||||||
OrgEventsComponent,
|
OrgEventsComponent,
|
||||||
|
@ -183,11 +160,8 @@ import { SharedModule } from "./shared.module";
|
||||||
GeneratorComponent,
|
GeneratorComponent,
|
||||||
PasswordGeneratorHistoryComponent,
|
PasswordGeneratorHistoryComponent,
|
||||||
PasswordRepromptComponent,
|
PasswordRepromptComponent,
|
||||||
PaymentComponent,
|
|
||||||
PaymentMethodComponent,
|
|
||||||
PreferencesComponent,
|
PreferencesComponent,
|
||||||
PremiumBadgeComponent,
|
PremiumBadgeComponent,
|
||||||
PremiumComponent,
|
|
||||||
ProfileComponent,
|
ProfileComponent,
|
||||||
ChangeAvatarComponent,
|
ChangeAvatarComponent,
|
||||||
ProvidersComponent,
|
ProvidersComponent,
|
||||||
|
@ -205,8 +179,6 @@ import { SharedModule } from "./shared.module";
|
||||||
SponsoredFamiliesComponent,
|
SponsoredFamiliesComponent,
|
||||||
SponsoringOrgRowComponent,
|
SponsoringOrgRowComponent,
|
||||||
SsoComponent,
|
SsoComponent,
|
||||||
SubscriptionComponent,
|
|
||||||
TaxInfoComponent,
|
|
||||||
ToolsComponent,
|
ToolsComponent,
|
||||||
TwoFactorAuthenticatorComponent,
|
TwoFactorAuthenticatorComponent,
|
||||||
TwoFactorComponent,
|
TwoFactorComponent,
|
||||||
|
@ -218,13 +190,9 @@ import { SharedModule } from "./shared.module";
|
||||||
TwoFactorVerifyComponent,
|
TwoFactorVerifyComponent,
|
||||||
TwoFactorWebAuthnComponent,
|
TwoFactorWebAuthnComponent,
|
||||||
TwoFactorYubiKeyComponent,
|
TwoFactorYubiKeyComponent,
|
||||||
UpdateLicenseComponent,
|
|
||||||
UpdatePasswordComponent,
|
UpdatePasswordComponent,
|
||||||
UpdateTempPasswordComponent,
|
UpdateTempPasswordComponent,
|
||||||
BillingHistoryComponent,
|
|
||||||
BillingHistoryViewComponent,
|
|
||||||
UserLayoutComponent,
|
UserLayoutComponent,
|
||||||
UserSubscriptionComponent,
|
|
||||||
VaultTimeoutInputComponent,
|
VaultTimeoutInputComponent,
|
||||||
VerifyEmailComponent,
|
VerifyEmailComponent,
|
||||||
VerifyEmailTokenComponent,
|
VerifyEmailTokenComponent,
|
||||||
|
@ -238,18 +206,14 @@ import { SharedModule } from "./shared.module";
|
||||||
AcceptOrganizationComponent,
|
AcceptOrganizationComponent,
|
||||||
AccessComponent,
|
AccessComponent,
|
||||||
AccountComponent,
|
AccountComponent,
|
||||||
AddCreditComponent,
|
|
||||||
AddEditComponent,
|
AddEditComponent,
|
||||||
AddEditCustomFieldsComponent,
|
AddEditCustomFieldsComponent,
|
||||||
AddEditCustomFieldsComponent,
|
AddEditCustomFieldsComponent,
|
||||||
AdjustPaymentComponent,
|
|
||||||
AdjustStorageComponent,
|
|
||||||
ApiKeyComponent,
|
ApiKeyComponent,
|
||||||
AttachmentsComponent,
|
AttachmentsComponent,
|
||||||
ChangeEmailComponent,
|
ChangeEmailComponent,
|
||||||
ChangePasswordComponent,
|
ChangePasswordComponent,
|
||||||
CollectionsComponent,
|
CollectionsComponent,
|
||||||
CreateOrganizationComponent,
|
|
||||||
DeauthorizeSessionsComponent,
|
DeauthorizeSessionsComponent,
|
||||||
DeleteAccountComponent,
|
DeleteAccountComponent,
|
||||||
DomainRulesComponent,
|
DomainRulesComponent,
|
||||||
|
@ -261,7 +225,6 @@ import { SharedModule } from "./shared.module";
|
||||||
EmergencyAccessTakeoverComponent,
|
EmergencyAccessTakeoverComponent,
|
||||||
EmergencyAccessViewComponent,
|
EmergencyAccessViewComponent,
|
||||||
EmergencyAddEditComponent,
|
EmergencyAddEditComponent,
|
||||||
FamiliesForEnterpriseSetupComponent,
|
|
||||||
FolderAddEditComponent,
|
FolderAddEditComponent,
|
||||||
FooterComponent,
|
FooterComponent,
|
||||||
FrontendLayoutComponent,
|
FrontendLayoutComponent,
|
||||||
|
@ -271,7 +234,6 @@ import { SharedModule } from "./shared.module";
|
||||||
OrganizationSwitcherComponent,
|
OrganizationSwitcherComponent,
|
||||||
OrgAddEditComponent,
|
OrgAddEditComponent,
|
||||||
OrganizationLayoutComponent,
|
OrganizationLayoutComponent,
|
||||||
OrganizationPlansComponent,
|
|
||||||
OrgAttachmentsComponent,
|
OrgAttachmentsComponent,
|
||||||
OrgCollectionsComponent,
|
OrgCollectionsComponent,
|
||||||
OrgEventsComponent,
|
OrgEventsComponent,
|
||||||
|
@ -285,11 +247,8 @@ import { SharedModule } from "./shared.module";
|
||||||
GeneratorComponent,
|
GeneratorComponent,
|
||||||
PasswordGeneratorHistoryComponent,
|
PasswordGeneratorHistoryComponent,
|
||||||
PasswordRepromptComponent,
|
PasswordRepromptComponent,
|
||||||
PaymentComponent,
|
|
||||||
PaymentMethodComponent,
|
|
||||||
PreferencesComponent,
|
PreferencesComponent,
|
||||||
PremiumBadgeComponent,
|
PremiumBadgeComponent,
|
||||||
PremiumComponent,
|
|
||||||
ProfileComponent,
|
ProfileComponent,
|
||||||
ChangeAvatarComponent,
|
ChangeAvatarComponent,
|
||||||
ProvidersComponent,
|
ProvidersComponent,
|
||||||
|
@ -307,8 +266,6 @@ import { SharedModule } from "./shared.module";
|
||||||
SponsoredFamiliesComponent,
|
SponsoredFamiliesComponent,
|
||||||
SponsoringOrgRowComponent,
|
SponsoringOrgRowComponent,
|
||||||
SsoComponent,
|
SsoComponent,
|
||||||
SubscriptionComponent,
|
|
||||||
TaxInfoComponent,
|
|
||||||
ToolsComponent,
|
ToolsComponent,
|
||||||
TwoFactorAuthenticatorComponent,
|
TwoFactorAuthenticatorComponent,
|
||||||
TwoFactorComponent,
|
TwoFactorComponent,
|
||||||
|
@ -320,18 +277,19 @@ import { SharedModule } from "./shared.module";
|
||||||
TwoFactorVerifyComponent,
|
TwoFactorVerifyComponent,
|
||||||
TwoFactorWebAuthnComponent,
|
TwoFactorWebAuthnComponent,
|
||||||
TwoFactorYubiKeyComponent,
|
TwoFactorYubiKeyComponent,
|
||||||
UpdateLicenseComponent,
|
|
||||||
UpdatePasswordComponent,
|
UpdatePasswordComponent,
|
||||||
UpdateTempPasswordComponent,
|
UpdateTempPasswordComponent,
|
||||||
BillingHistoryComponent,
|
|
||||||
BillingHistoryViewComponent,
|
|
||||||
UserLayoutComponent,
|
UserLayoutComponent,
|
||||||
UserSubscriptionComponent,
|
|
||||||
VaultTimeoutInputComponent,
|
VaultTimeoutInputComponent,
|
||||||
VerifyEmailComponent,
|
VerifyEmailComponent,
|
||||||
VerifyEmailTokenComponent,
|
VerifyEmailTokenComponent,
|
||||||
VerifyRecoverDeleteComponent,
|
VerifyRecoverDeleteComponent,
|
||||||
LowKdfComponent,
|
LowKdfComponent,
|
||||||
|
|
||||||
|
// Temporary export to be removed in AC-1453
|
||||||
|
// Import PaymentComponent and TaxInfoComponent directly into TrialIniationComponent
|
||||||
|
// and remove BillingSharedModule here
|
||||||
|
BillingSharedModule,
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
export class LooseComponentsModule {}
|
export class LooseComponentsModule {}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { Component, OnInit, ViewChild } from "@angular/core";
|
import { Component, OnInit, ViewChild } from "@angular/core";
|
||||||
import { ActivatedRoute } from "@angular/router";
|
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({
|
@Component({
|
||||||
selector: "app-create-organization",
|
selector: "app-create-organization",
|
||||||
|
|
|
@ -5,6 +5,7 @@ import { FormsModule } from "@angular/forms";
|
||||||
import { JslibModule } from "@bitwarden/angular/jslib.module";
|
import { JslibModule } from "@bitwarden/angular/jslib.module";
|
||||||
import { ModalService } from "@bitwarden/angular/services/modal.service";
|
import { ModalService } from "@bitwarden/angular/services/modal.service";
|
||||||
import { SearchModule } from "@bitwarden/components";
|
import { SearchModule } from "@bitwarden/components";
|
||||||
|
import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing";
|
||||||
import { OssModule } from "@bitwarden/web-vault/app/oss.module";
|
import { OssModule } from "@bitwarden/web-vault/app/oss.module";
|
||||||
|
|
||||||
import { AddOrganizationComponent } from "./clients/add-organization.component";
|
import { AddOrganizationComponent } from "./clients/add-organization.component";
|
||||||
|
@ -32,8 +33,9 @@ import { SetupComponent } from "./setup/setup.component";
|
||||||
FormsModule,
|
FormsModule,
|
||||||
OssModule,
|
OssModule,
|
||||||
JslibModule,
|
JslibModule,
|
||||||
SearchModule,
|
|
||||||
ProvidersRoutingModule,
|
ProvidersRoutingModule,
|
||||||
|
OrganizationPlansComponent,
|
||||||
|
SearchModule,
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
AcceptProviderComponent,
|
AcceptProviderComponent,
|
||||||
|
|
Loading…
Reference in New Issue