diff --git a/apps/web/src/app/components/environment-selector/environment-selector.component.ts b/apps/web/src/app/components/environment-selector/environment-selector.component.ts index 3f71a0d719a..ba0f5097b5b 100644 --- a/apps/web/src/app/components/environment-selector/environment-selector.component.ts +++ b/apps/web/src/app/components/environment-selector/environment-selector.component.ts @@ -10,10 +10,13 @@ import { import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { SharedModule } from "../../shared"; + @Component({ selector: "environment-selector", templateUrl: "environment-selector.component.html", - standalone: false, + standalone: true, + imports: [SharedModule], }) export class EnvironmentSelectorComponent implements OnInit { constructor( diff --git a/apps/web/src/app/components/environment-selector/environment-selector.module.ts b/apps/web/src/app/components/environment-selector/environment-selector.module.ts deleted file mode 100644 index 1326d4c9cae..00000000000 --- a/apps/web/src/app/components/environment-selector/environment-selector.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from "@angular/core"; - -import { SharedModule } from "../../../app/shared"; - -import { EnvironmentSelectorComponent } from "./environment-selector.component"; - -@NgModule({ - imports: [SharedModule], - declarations: [EnvironmentSelectorComponent], - exports: [EnvironmentSelectorComponent], -}) -export class EnvironmentSelectorModule {} diff --git a/apps/web/src/app/layouts/frontend-layout.component.ts b/apps/web/src/app/layouts/frontend-layout.component.ts index 9e22ab6d43e..5ccb39b1dc9 100644 --- a/apps/web/src/app/layouts/frontend-layout.component.ts +++ b/apps/web/src/app/layouts/frontend-layout.component.ts @@ -4,10 +4,14 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { EnvironmentSelectorComponent } from "../components/environment-selector/environment-selector.component"; +import { SharedModule } from "../shared"; + @Component({ selector: "app-frontend-layout", templateUrl: "frontend-layout.component.html", - standalone: false, + standalone: true, + imports: [SharedModule, EnvironmentSelectorComponent], }) export class FrontendLayoutComponent implements OnInit, OnDestroy { version: string; diff --git a/apps/web/src/app/settings/domain-rules.component.ts b/apps/web/src/app/settings/domain-rules.component.ts index 2d570f4aeb4..7656222cfd2 100644 --- a/apps/web/src/app/settings/domain-rules.component.ts +++ b/apps/web/src/app/settings/domain-rules.component.ts @@ -9,10 +9,14 @@ 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 { HeaderModule } from "../layouts/header/header.module"; +import { SharedModule } from "../shared"; + @Component({ selector: "app-domain-rules", templateUrl: "domain-rules.component.html", - standalone: false, + standalone: true, + imports: [SharedModule, HeaderModule], }) export class DomainRulesComponent implements OnInit { loading = true; diff --git a/apps/web/src/app/settings/preferences.component.ts b/apps/web/src/app/settings/preferences.component.ts index 9ab23c76795..c9efd059271 100644 --- a/apps/web/src/app/settings/preferences.component.ts +++ b/apps/web/src/app/settings/preferences.component.ts @@ -14,6 +14,7 @@ import { tap, } from "rxjs"; +import { VaultTimeoutInputComponent } from "@bitwarden/auth/angular"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { getFirstPolicy } from "@bitwarden/common/admin-console/services/policy/default-policy.service"; @@ -34,10 +35,14 @@ import { Utils } from "@bitwarden/common/platform/misc/utils"; import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service"; import { DialogService } from "@bitwarden/components"; +import { HeaderModule } from "../layouts/header/header.module"; +import { SharedModule } from "../shared"; + @Component({ selector: "app-preferences", templateUrl: "preferences.component.html", - standalone: false, + standalone: true, + imports: [SharedModule, HeaderModule, VaultTimeoutInputComponent], }) export class PreferencesComponent implements OnInit, OnDestroy { // For use in template diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index ab6c6cc5d72..e59633ee499 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -40,20 +40,18 @@ import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.comp import { SponsoredFamiliesComponent } from "../billing/settings/sponsored-families.component"; import { SponsoringOrgRowComponent } from "../billing/settings/sponsoring-org-row.component"; import { DynamicAvatarComponent } from "../components/dynamic-avatar.component"; +// eslint-disable-next-line no-restricted-imports -- Temporarily disabled until DIRT refactors these out of this module import { ExposedPasswordsReportComponent as OrgExposedPasswordsReportComponent } from "../dirt/reports/pages/organizations/exposed-passwords-report.component"; +// eslint-disable-next-line no-restricted-imports -- Temporarily disabled until DIRT refactors these out of this module import { InactiveTwoFactorReportComponent as OrgInactiveTwoFactorReportComponent } from "../dirt/reports/pages/organizations/inactive-two-factor-report.component"; +// eslint-disable-next-line no-restricted-imports -- Temporarily disabled until DIRT refactors these out of this module import { ReusedPasswordsReportComponent as OrgReusedPasswordsReportComponent } from "../dirt/reports/pages/organizations/reused-passwords-report.component"; +// eslint-disable-next-line no-restricted-imports -- Temporarily disabled until DIRT refactors these out of this module import { UnsecuredWebsitesReportComponent as OrgUnsecuredWebsitesReportComponent } from "../dirt/reports/pages/organizations/unsecured-websites-report.component"; +// eslint-disable-next-line no-restricted-imports -- Temporarily disabled until DIRT refactors these out of this module import { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from "../dirt/reports/pages/organizations/weak-passwords-report.component"; import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component"; -import { FrontendLayoutComponent } from "../layouts/frontend-layout.component"; import { HeaderModule } from "../layouts/header/header.module"; -import { ProductSwitcherModule } from "../layouts/product-switcher/product-switcher.module"; -import { UserLayoutComponent } from "../layouts/user-layout.component"; -import { DomainRulesComponent } from "../settings/domain-rules.component"; -import { PreferencesComponent } from "../settings/preferences.component"; -/* eslint no-restricted-imports: "off" -- Temporarily disabled until Tools refactors these out of this module */ -/* eslint no-restricted-imports: "error" */ import { PremiumBadgeComponent } from "../vault/components/premium-badge.component"; import { FolderAddEditComponent } from "../vault/individual-vault/folder-add-edit.component"; import { OrganizationBadgeModule } from "../vault/individual-vault/organization-badge/organization-badge.module"; @@ -61,7 +59,6 @@ import { PipesModule } from "../vault/individual-vault/pipes/pipes.module"; import { PurgeVaultComponent } from "../vault/settings/purge-vault.component"; import { FreeBitwardenFamiliesComponent } from "./../billing/members/free-bitwarden-families.component"; -import { EnvironmentSelectorModule } from "./../components/environment-selector/environment-selector.module"; import { AccountFingerprintComponent } from "./components/account-fingerprint/account-fingerprint.component"; import { SharedModule } from "./shared.module"; @@ -70,11 +67,9 @@ import { SharedModule } from "./shared.module"; @NgModule({ imports: [ SharedModule, - ProductSwitcherModule, UserVerificationModule, ChangeKdfModule, DynamicAvatarComponent, - EnvironmentSelectorModule, AccountFingerprintComponent, OrganizationBadgeModule, PipesModule, @@ -85,7 +80,6 @@ import { SharedModule } from "./shared.module"; NavigationModule, HeaderModule, OrganizationLayoutComponent, - UserLayoutComponent, VerifyRecoverDeleteOrgComponent, VaultTimeoutInputComponent, ], @@ -96,14 +90,12 @@ import { SharedModule } from "./shared.module"; ChangeEmailComponent, DeauthorizeSessionsComponent, DeleteAccountDialogComponent, - DomainRulesComponent, EmergencyAccessAddEditComponent, EmergencyAccessComponent, EmergencyAccessConfirmComponent, EmergencyAccessTakeoverComponent, EmergencyAccessViewComponent, FolderAddEditComponent, - FrontendLayoutComponent, OrgEventsComponent, OrgExposedPasswordsReportComponent, OrgInactiveTwoFactorReportComponent, @@ -111,7 +103,6 @@ import { SharedModule } from "./shared.module"; OrgUnsecuredWebsitesReportComponent, OrgUserConfirmComponent, OrgWeakPasswordsReportComponent, - PreferencesComponent, PremiumBadgeComponent, ProfileComponent, ChangeAvatarDialogComponent, @@ -139,7 +130,6 @@ import { SharedModule } from "./shared.module"; ChangeEmailComponent, DeauthorizeSessionsComponent, DeleteAccountDialogComponent, - DomainRulesComponent, DynamicAvatarComponent, EmergencyAccessAddEditComponent, EmergencyAccessComponent, @@ -147,7 +137,6 @@ import { SharedModule } from "./shared.module"; EmergencyAccessTakeoverComponent, EmergencyAccessViewComponent, FolderAddEditComponent, - FrontendLayoutComponent, OrganizationLayoutComponent, OrgEventsComponent, OrgExposedPasswordsReportComponent, @@ -156,7 +145,6 @@ import { SharedModule } from "./shared.module"; OrgUnsecuredWebsitesReportComponent, OrgUserConfirmComponent, OrgWeakPasswordsReportComponent, - PreferencesComponent, PremiumBadgeComponent, ProfileComponent, ChangeAvatarDialogComponent, @@ -173,7 +161,6 @@ import { SharedModule } from "./shared.module"; SponsoringOrgRowComponent, UpdateTempPasswordComponent, UpdatePasswordComponent, - UserLayoutComponent, VerifyEmailTokenComponent, VerifyRecoverDeleteComponent, HeaderModule,