Refactor organization billing to use a module

apps/web/src/app/modules/loose-components.module.ts

@@ -27,11 +27,6 @@ import { FooterComponent } from "../layouts/footer.component";
 import { FrontendLayoutComponent } from "../layouts/frontend-layout.component";
 import { NavbarComponent } from "../layouts/navbar.component";
 import { UserLayoutComponent } from "../layouts/user-layout.component";
-import { BillingSyncApiKeyComponent } from "../organizations/billing/billing-sync-api-key.component";
-import { OrganizationBillingHistoryComponent } from "../organizations/billing/organization-billing-history.component";
-import { OrganizationBillingTabComponent } from "../organizations/billing/organization-billing-tab.component";
-import { OrganizationPaymentMethodComponent } from "../organizations/billing/organization-payment-method.component";
-import { OrganizationSubscriptionComponent } from "../organizations/billing/organization-subscription.component";
 import { GroupAddEditComponent as OrgGroupAddEditComponent } from "../organizations/groups/group-add-edit.component";
 import { GroupsComponent as OrgGroupsComponent } from "../organizations/groups/groups.component";
 import { OrganizationLayoutComponent } from "../organizations/layouts/organization-layout.component";
@@ -194,7 +189,6 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     AdjustSubscription,
     ApiKeyComponent,
     AttachmentsComponent,
-    BillingSyncApiKeyComponent,
     BillingSyncKeyComponent,
     BreachReportComponent,
     BulkActionsComponent,
@@ -237,12 +231,8 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     OrganizationSwitcherComponent,
     OrgAccountComponent,
     OrgAddEditComponent,
-    OrganizationBillingTabComponent,
-    OrganizationPaymentMethodComponent,
-    OrganizationBillingHistoryComponent,
     OrganizationLayoutComponent,
     OrganizationPlansComponent,
-    OrganizationSubscriptionComponent,
     OrgAttachmentsComponent,
     OrgBulkConfirmComponent,
     OrgBulkDeactivateomponent,
@@ -396,10 +386,8 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     OrganizationSwitcherComponent,
     OrgAccountComponent,
     OrgAddEditComponent,
-    OrganizationPaymentMethodComponent,
     OrganizationLayoutComponent,
     OrganizationPlansComponent,
-    OrganizationSubscriptionComponent,
     OrgAttachmentsComponent,
     OrgBulkConfirmComponent,
     OrgBulkDeactivateomponent,

apps/web/src/app/modules/organizations/billing/organization-billing.module.ts

@@ -0,0 +1,29 @@
+import { NgModule } from "@angular/core";
+
+import { LooseComponentsModule } from "../../loose-components.module";
+import { SharedModule } from "../../shared.module";
+
+import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component";
+import { OrganizationBillingHistoryComponent } from "./organization-billing-history.component";
+import { OrganizationBillingTabComponent } from "./organization-billing-tab.component";
+import { OrganizationPaymentMethodComponent } from "./organization-payment-method.component";
+import { OrganizationSubscriptionComponent } from "./organization-subscription.component";
+
+@NgModule({
+  imports: [SharedModule, LooseComponentsModule],
+  declarations: [
+    BillingSyncApiKeyComponent,
+    OrganizationBillingHistoryComponent,
+    OrganizationBillingTabComponent,
+    OrganizationPaymentMethodComponent,
+    OrganizationSubscriptionComponent,
+  ],
+  exports: [
+    BillingSyncApiKeyComponent,
+    OrganizationBillingHistoryComponent,
+    OrganizationBillingTabComponent,
+    OrganizationPaymentMethodComponent,
+    OrganizationSubscriptionComponent,
+  ],
+})
+export class OrganizationBillingModule {}

apps/web/src/app/organizations/organization-routing.module.ts

@@ -4,12 +4,12 @@ import { RouterModule, Routes } from "@angular/router";
 import { AuthGuard } from "@bitwarden/angular/guards/auth.guard";
 import { Permissions } from "@bitwarden/common/enums/permissions";
 
+import { OrganizationBillingHistoryComponent } from "../modules/organizations/billing/organization-billing-history.component";
+import { OrganizationBillingTabComponent } from "../modules/organizations/billing/organization-billing-tab.component";
+import { OrganizationPaymentMethodComponent } from "../modules/organizations/billing/organization-payment-method.component";
+import { OrganizationSubscriptionComponent } from "../modules/organizations/billing/organization-subscription.component";
 import { OrganizationVaultModule } from "../modules/vault/modules/organization-vault/organization-vault.module";
 
-import { OrganizationBillingHistoryComponent } from "./billing/organization-billing-history.component";
-import { OrganizationBillingTabComponent } from "./billing/organization-billing-tab.component";
-import { OrganizationPaymentMethodComponent } from "./billing/organization-payment-method.component";
-import { OrganizationSubscriptionComponent } from "./billing/organization-subscription.component";
 import { GroupsComponent } from "./groups/groups.component";
 import { PermissionsGuard } from "./guards/permissions.guard";
 import { OrganizationLayoutComponent } from "./layouts/organization-layout.component";

apps/web/src/app/oss.module.ts

@@ -1,6 +1,7 @@
 import { NgModule } from "@angular/core";
 
 import { LooseComponentsModule } from "./modules/loose-components.module";
+import { OrganizationBillingModule } from "./modules/organizations/billing/organization-billing.module";
 import { OrganizationCreateModule } from "./modules/organizations/create/organization-create.module";
 import { OrganizationManageModule } from "./modules/organizations/manage/organization-manage.module";
 import { OrganizationUserModule } from "./modules/organizations/users/organization-user.module";
@@ -21,6 +22,7 @@ import { OrganizationBadgeModule } from "./modules/vault/modules/organization-ba
     OrganizationManageModule,
     OrganizationUserModule,
     OrganizationCreateModule,
+    OrganizationBillingModule,
   ],
   exports: [
     SharedModule,