diff --git a/apps/web/src/app/modules/loose-components.module.ts b/apps/web/src/app/modules/loose-components.module.ts index 443da003a97..6ee70fa2838 100644 --- a/apps/web/src/app/modules/loose-components.module.ts +++ b/apps/web/src/app/modules/loose-components.module.ts @@ -55,8 +55,6 @@ import { ResetPasswordPolicyComponent } from "../organizations/policies/reset-pa import { SendOptionsPolicyComponent } from "../organizations/policies/send-options.component"; import { SingleOrgPolicyComponent } from "../organizations/policies/single-org.component"; import { TwoFactorAuthenticationPolicyComponent } from "../organizations/policies/two-factor-authentication.component"; -import { ReportListComponent as OrgReportListComponent } from "../organizations/reporting/report-list.component"; -import { ReportingComponent as OrgReportingComponent } from "../organizations/reporting/reporting.component"; import { AccountComponent as OrgAccountComponent } from "../organizations/settings/account.component"; import { AdjustSubscription } from "../organizations/settings/adjust-subscription.component"; import { ChangePlanComponent } from "../organizations/settings/change-plan.component"; @@ -263,8 +261,6 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga OrgUserConfirmComponent, OrgUserGroupsComponent, OrgWeakPasswordsReportComponent, - OrgReportingComponent, - OrgReportListComponent, GeneratorComponent, PasswordGeneratorHistoryComponent, PasswordGeneratorPolicyComponent, diff --git a/apps/web/src/app/modules/organizations/reporting/organization-reporting.module.ts b/apps/web/src/app/modules/organizations/reporting/organization-reporting.module.ts new file mode 100644 index 00000000000..7a8d7652556 --- /dev/null +++ b/apps/web/src/app/modules/organizations/reporting/organization-reporting.module.ts @@ -0,0 +1,14 @@ +import { NgModule } from "@angular/core"; + +import { LooseComponentsModule } from "../../loose-components.module"; +import { SharedModule } from "../../shared.module"; + +import { ReportListComponent } from "./report-list.component"; +import { ReportingComponent } from "./reporting.component"; + +@NgModule({ + imports: [SharedModule, LooseComponentsModule], + declarations: [ReportListComponent, ReportingComponent], + exports: [ReportListComponent, ReportingComponent], +}) +export class OrganizationReportingModule {} diff --git a/apps/web/src/app/organizations/reporting/report-list.component.html b/apps/web/src/app/modules/organizations/reporting/report-list.component.html similarity index 100% rename from apps/web/src/app/organizations/reporting/report-list.component.html rename to apps/web/src/app/modules/organizations/reporting/report-list.component.html diff --git a/apps/web/src/app/organizations/reporting/report-list.component.ts b/apps/web/src/app/modules/organizations/reporting/report-list.component.ts similarity index 92% rename from apps/web/src/app/organizations/reporting/report-list.component.ts rename to apps/web/src/app/modules/organizations/reporting/report-list.component.ts index 3c644743b7b..cbc5e1d863e 100644 --- a/apps/web/src/app/organizations/reporting/report-list.component.ts +++ b/apps/web/src/app/modules/organizations/reporting/report-list.component.ts @@ -2,7 +2,7 @@ import { Component } from "@angular/core"; import { NavigationEnd, Router } from "@angular/router"; import { filter, Subscription } from "rxjs"; -import { ReportTypes } from "../../reports/report-card.component"; +import { ReportTypes } from "../../../reports/report-card.component"; @Component({ selector: "app-org-report-list", diff --git a/apps/web/src/app/organizations/reporting/reporting.component.html b/apps/web/src/app/modules/organizations/reporting/reporting.component.html similarity index 100% rename from apps/web/src/app/organizations/reporting/reporting.component.html rename to apps/web/src/app/modules/organizations/reporting/reporting.component.html diff --git a/apps/web/src/app/organizations/reporting/reporting.component.ts b/apps/web/src/app/modules/organizations/reporting/reporting.component.ts similarity index 100% rename from apps/web/src/app/organizations/reporting/reporting.component.ts rename to apps/web/src/app/modules/organizations/reporting/reporting.component.ts diff --git a/apps/web/src/app/organizations/organization-routing.module.ts b/apps/web/src/app/organizations/organization-routing.module.ts index e4b6962f12b..544047a22bc 100644 --- a/apps/web/src/app/organizations/organization-routing.module.ts +++ b/apps/web/src/app/organizations/organization-routing.module.ts @@ -8,6 +8,8 @@ import { OrganizationBillingHistoryComponent } from "../modules/organizations/bi 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 { ReportListComponent } from "../modules/organizations/reporting/report-list.component"; +import { ReportingComponent } from "../modules/organizations/reporting/reporting.component"; import { OrganizationVaultModule } from "../modules/vault/modules/organization-vault/organization-vault.module"; import { GroupsComponent } from "./groups/groups.component"; @@ -15,8 +17,6 @@ import { PermissionsGuard } from "./guards/permissions.guard"; import { OrganizationLayoutComponent } from "./layouts/organization-layout.component"; import { EventsComponent } from "./manage/events.component"; import { MembersComponent } from "./members/members.component"; -import { ReportListComponent } from "./reporting/report-list.component"; -import { ReportingComponent } from "./reporting/reporting.component"; import { NavigationPermissionsService } from "./services/navigation-permissions.service"; import { AccountComponent } from "./settings/account.component"; import { SettingsComponent } from "./settings/settings.component"; diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts index 851cbaf4e9f..f48822c67de 100644 --- a/apps/web/src/app/oss.module.ts +++ b/apps/web/src/app/oss.module.ts @@ -4,6 +4,7 @@ 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 { OrganizationReportingModule } from "./modules/organizations/reporting/organization-reporting.module"; import { OrganizationUserModule } from "./modules/organizations/users/organization-user.module"; import { PipesModule } from "./modules/pipes/pipes.module"; import { SharedModule } from "./modules/shared.module"; @@ -23,6 +24,7 @@ import { OrganizationBadgeModule } from "./modules/vault/modules/organization-ba OrganizationUserModule, OrganizationCreateModule, OrganizationBillingModule, + OrganizationReportingModule, ], exports: [ SharedModule,