[SG-360] Remove the /modules/ folder (#3225)

* Move Web's SharedModule to /app/shared/

This commit relocates `SharedModule` from `/app/modules` to `/app/shared` to
align with [ADR #11](https://adr.bitwarden.com/decisions/0011-angular-folder-structure)

All other changes are just to adjust imports that reference `SharedModule`.

* Move /modules/pipes to /shared/pipes

This commit relocates `PipesModule` from `/app/modules` to `/app/shared` to
align with [ADR #11](https://adr.bitwarden.com/decisions/0011-angular-folder-structure)

All other changes are just to adjust imports that reference `PipesModule`.

* Move LooseComponentsModule to /shared/

This commit relocates `LooseComponentsModule` from `/app/modules` to `/app/shared` to
align with [ADR #11](https://adr.bitwarden.com/decisions/0011-angular-folder-structure)

All other changes are just to adjust imports that reference `LooseComponentsModule`.

* Move VerticalStepperModule to /shared/

This commit relocates `VerticalStepperModule` from `/app/modules` to `/app/shared` to
align with [ADR #11](https://adr.bitwarden.com/decisions/0011-angular-folder-structure)

All other changes are just to adjust imports that reference `VerticalStepperModule`.

* Move TrialInitiationModule to /shared/

This commit relocates `TrialInitiationModule` & `RegisterFormModule` from `/app/modules` to `/app/shared` to
align with [ADR #11](https://adr.bitwarden.com/decisions/0011-angular-folder-structure)

All other changes are just to adjust imports that reference `TrialInitiationModule` or `RegisterFormModule`.

* Move /modules/organization to /organization

This commit relocates all modules in `/app/modules/organization` to `/app/organization` to
align with [ADR #11](https://adr.bitwarden.com/decisions/0011-angular-folder-structure)

All other changes are just to adjust imports that reference the moved modules.

* Move /modules/vault/ to /vault

This commit relocates the IndividualVaultModule to `/app/modules/vault`, and the OrganizationVaultModule to `/app/organization/vault` to
align with [ADR #11](https://adr.bitwarden.com/decisions/0011-angular-folder-structure)

All other changes are just to adjust imports that reference the moved modules.

* Move VaultFiltersModule to /vault

This commit relocates the `VaultFilterModule` to `/app/vault/vault-filter`, and the OrganizationVaultFilterComponent to `/app/organization/vault/vault-filter` to
align with [ADR #11](https://adr.bitwarden.com/decisions/0011-angular-folder-structure)

All other changes are just to adjust imports that reference the moved modules.

* Remove the /modules/ folder from desktop

This commit relocates the `VaultFilterModule` to `/app/vault/vault-filter`, and the OrganizationVaultFilterComponent to `/app/organization/vault/vault-filter` to
align with [ADR #11](https://adr.bitwarden.com/decisions/0011-angular-folder-structure)

All other changes are just to adjust imports that reference the moved modules.

* Move Libs' VaultFiltersComponent to /vault/

This commit moves the lib's logic for `VaultFiltersModule` from
`/modules/` to `/vault/`

All other changes are just to adjust imports that reference the moved
files.

* Rename VaultModule -> SharedVaultModule

* Rename IndividualVaultModule -> VaultModule

* Rename OrganizationVaultModule -> VaultModule

* Rename OrganizationVaultFilterComponent

Rename OrganizationVaultFilterComponent to VaultFilterComponent

* Seperate the two VaultFilterComponents

This commit seperate the `OrganizationVaultFilterComponent` from the `VaultFilerModule`, which is only used by the individual vault.
A `VaultFilterSharedModule` was created to declare shared components and provide shared services between the two implementations.
This was done to align with best practices for NgModules.

* [r] Move VerticalStepperModule to /account/

More specifically, /account/trial/

* [r] Declare PaymentComponent in LooseComponentsModule

`PaymentComponent` is not reused across domains and should not be
declared in `SharedModule`.

I've moved it to `LooseComponentsModule` for now, but later it will need
to be exported from a `SettingsModule`.

* [r] Declare TaxInfoComponent in LooseComponentsModule

* [r] Reloacte Pipes out of /shared/

* [r] Extract locales out of SharedModule

* [r] Add documentation to shared module

* [r] Cleanup imports

* [r] Use an index.ts file for /shared/

* [r] Add eslint rule restricting access to /shared/

Co-authored-by: Hinton <hinton@users.noreply.github.com>

apps/browser/src/popup/vault/ciphers.component.ts

@@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { first } from "rxjs/operators";
 
 import { CiphersComponent as BaseCiphersComponent } from "@bitwarden/angular/components/ciphers.component";
-import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model";
+import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";

apps/browser/src/popup/vault/vault-filter.component.ts

@@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 import { first } from "rxjs/operators";
 
-import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model";
+import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";

apps/browser/src/popup/vault/vault-select.component.ts

@@ -15,7 +15,7 @@ import {
 } from "@angular/core";
 import { merge } from "rxjs";
 
-import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model";
+import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";

apps/browser/src/services/vaultFilter.service.ts

@@ -1,5 +1,5 @@
-import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model";
+import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
-import { VaultFilterService as BaseVaultFilterService } from "@bitwarden/angular/modules/vault-filter/vault-filter.service";
+import { VaultFilterService as BaseVaultFilterService } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";

apps/desktop/src/app/app.module.ts

@@ -81,11 +81,10 @@ import { AccountSwitcherComponent } from "./layout/account-switcher.component";
 import { HeaderComponent } from "./layout/header.component";
 import { NavComponent } from "./layout/nav.component";
 import { SearchComponent } from "./layout/search/search.component";
-import { SharedModule } from "./modules/shared.module";
-import { VaultFilterModule } from "./modules/vault-filter/vault-filter.module";
 import { AddEditComponent as SendAddEditComponent } from "./send/add-edit.component";
 import { EffluxDatesComponent as SendEffluxDatesComponent } from "./send/efflux-dates.component";
 import { SendComponent } from "./send/send.component";
+import { SharedModule } from "./shared/shared.module";
 import { AddEditCustomFieldsComponent } from "./vault/add-edit-custom-fields.component";
 import { AddEditComponent } from "./vault/add-edit.component";
 import { AttachmentsComponent } from "./vault/attachments.component";
@@ -97,6 +96,7 @@ import { GeneratorComponent } from "./vault/generator.component";
 import { PasswordGeneratorHistoryComponent } from "./vault/password-generator-history.component";
 import { PasswordHistoryComponent } from "./vault/password-history.component";
 import { ShareComponent } from "./vault/share.component";
+import { VaultFilterModule } from "./vault/vault-filter/vault-filter.module";
 import { VaultComponent } from "./vault/vault.component";
 import { ViewCustomFieldsComponent } from "./vault/view-custom-fields.component";
 import { ViewComponent } from "./vault/view.component";

apps/desktop/src/app/vault/vault-filter/filters/collection-filter.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { CollectionFilterComponent as BaseCollectionFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/collection-filter.component";
+import { CollectionFilterComponent as BaseCollectionFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/collection-filter.component";
 
 @Component({
   selector: "app-collection-filter",

apps/desktop/src/app/vault/vault-filter/filters/folder-filter.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { FolderFilterComponent as BaseFolderFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/folder-filter.component";
+import { FolderFilterComponent as BaseFolderFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/folder-filter.component";
 
 @Component({
   selector: "app-folder-filter",

apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.ts

@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 
-import { OrganizationFilterComponent as BaseOrganizationFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/organization-filter.component";
+import { OrganizationFilterComponent as BaseOrganizationFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/organization-filter.component";
-import { DisplayMode } from "@bitwarden/angular/modules/vault-filter/models/display-mode";
+import { DisplayMode } from "@bitwarden/angular/vault/vault-filter/models/display-mode";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { Organization } from "@bitwarden/common/models/domain/organization";

apps/desktop/src/app/vault/vault-filter/filters/status-filter.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { StatusFilterComponent as BaseStatusFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/status-filter.component";
+import { StatusFilterComponent as BaseStatusFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/status-filter.component";
 
 @Component({
   selector: "app-status-filter",

apps/desktop/src/app/vault/vault-filter/filters/type-filter.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { TypeFilterComponent as BaseTypeFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/type-filter.component";
+import { TypeFilterComponent as BaseTypeFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/type-filter.component";
 
 @Component({
   selector: "app-type-filter",

apps/desktop/src/app/vault/vault-filter/vault-filter.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { VaultFilterComponent as BaseVaultFilterComponent } from "@bitwarden/angular/modules/vault-filter/vault-filter.component";
+import { VaultFilterComponent as BaseVaultFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/vault-filter.component";
 
 @Component({
   selector: "app-vault-filter",

apps/desktop/src/app/vault/vault-filter/vault-filter.module.ts

@@ -2,13 +2,13 @@ import { NgModule } from "@angular/core";
 import { BrowserModule } from "@angular/platform-browser";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { VaultFilterService } from "@bitwarden/angular/modules/vault-filter/vault-filter.service";
+import { VaultFilterService } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service";
 
-import { CollectionFilterComponent } from "./components/collection-filter.component";
+import { CollectionFilterComponent } from "./filters/collection-filter.component";
-import { FolderFilterComponent } from "./components/folder-filter.component";
+import { FolderFilterComponent } from "./filters/folder-filter.component";
-import { OrganizationFilterComponent } from "./components/organization-filter.component";
+import { OrganizationFilterComponent } from "./filters/organization-filter.component";
-import { StatusFilterComponent } from "./components/status-filter.component";
+import { StatusFilterComponent } from "./filters/status-filter.component";
-import { TypeFilterComponent } from "./components/type-filter.component";
+import { TypeFilterComponent } from "./filters/type-filter.component";
 import { VaultFilterComponent } from "./vault-filter.component";
 
 @NgModule({

apps/desktop/src/app/vault/vault.component.ts

@@ -11,8 +11,8 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { first } from "rxjs/operators";
 
 import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref";
-import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
+import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { EventService } from "@bitwarden/common/abstractions/event.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -30,7 +30,6 @@ import { FolderView } from "@bitwarden/common/models/view/folderView";
 import { invokeMenu, RendererMenuItem } from "@bitwarden/electron/utils";
 
 import { SearchBarService } from "../layout/search/search-bar.service";
-import { VaultFilterComponent } from "../modules/vault-filter/vault-filter.component";
 
 import { AddEditComponent } from "./add-edit.component";
 import { AttachmentsComponent } from "./attachments.component";
@@ -40,6 +39,7 @@ import { FolderAddEditComponent } from "./folder-add-edit.component";
 import { GeneratorComponent } from "./generator.component";
 import { PasswordHistoryComponent } from "./password-history.component";
 import { ShareComponent } from "./share.component";
+import { VaultFilterComponent } from "./vault-filter/vault-filter.component";
 import { ViewComponent } from "./view.component";
 
 const BroadcasterSubscriptionId = "VaultComponent";

apps/web/.eslintrc.json

@@ -6,7 +6,7 @@
     "no-restricted-imports": [
       "error",
       {
-        "patterns": ["**/app/core/*", "**/reports/*"]
+        "patterns": ["**/app/core/*", "**/reports/*", "**/app/shared/*"]
       }
     ]
   }

apps/web/src/app/accounts/register-form/register-form.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 
-import { SharedModule } from "../shared.module";
+import { SharedModule } from "../../shared";
 
 import { RegisterFormComponent } from "./register-form.component";
 

apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts

@@ -12,14 +12,13 @@ import { I18nPipe } from "@bitwarden/angular/pipes/i18n.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PolicyService } from "@bitwarden/common/abstractions/policy.service";
+import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService as BaseStateService } from "@bitwarden/common/abstractions/state.service";
 import { PlanType } from "@bitwarden/common/enums/planType";
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions";
 
-import { VerticalStepperComponent } from "../vertical-stepper/vertical-stepper.component";
-
 import { TrialInitiationComponent } from "./trial-initiation.component";
+import { VerticalStepperComponent } from "./vertical-stepper/vertical-stepper.component";
 
 describe("TrialInitiationComponent", () => {
   let component: TrialInitiationComponent;

apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts

@@ -16,7 +16,7 @@ import { PolicyData } from "@bitwarden/common/models/data/policyData";
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions";
 import { Policy } from "@bitwarden/common/models/domain/policy";
 
-import { VerticalStepperComponent } from "../vertical-stepper/vertical-stepper.component";
+import { VerticalStepperComponent } from "./vertical-stepper/vertical-stepper.component";
 
 @Component({
   selector: "app-trial",

apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts

@@ -4,10 +4,9 @@ import { NgModule } from "@angular/core";
 
 import { FormFieldModule } from "@bitwarden/components";
 
-import { OrganizationCreateModule } from "../organizations/create/organization-create.module";
+import { OrganizationCreateModule } from "../../organizations/create/organization-create.module";
+import { LooseComponentsModule, SharedModule } from "../../shared";
 import { RegisterFormModule } from "../register-form/register-form.module";
-import { SharedModule } from "../shared.module";
-import { VerticalStepperModule } from "../vertical-stepper/vertical-stepper.module";
 
 import { BillingComponent } from "./billing.component";
 import { ConfirmationDetailsComponent } from "./confirmation-details.component";
@@ -15,6 +14,7 @@ import { EnterpriseContentComponent } from "./enterprise-content.component";
 import { FamiliesContentComponent } from "./families-content.component";
 import { TeamsContentComponent } from "./teams-content.component";
 import { TrialInitiationComponent } from "./trial-initiation.component";
+import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.module";
 
 @NgModule({
   imports: [
@@ -24,6 +24,7 @@ import { TrialInitiationComponent } from "./trial-initiation.component";
     FormFieldModule,
     RegisterFormModule,
     OrganizationCreateModule,
+    LooseComponentsModule,
   ],
   declarations: [
     TrialInitiationComponent,

apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 
-import { SharedModule } from "../shared.module";
+import { SharedModule } from "../../../shared";
 
 import { VerticalStepContentComponent } from "./vertical-step-content.component";
 import { VerticalStep } from "./vertical-step.component";

apps/web/src/app/modules/vault-filter/vault-filter.module.ts

@@ -1,32 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { SharedModule } from "../shared.module";
-
-import { CollectionFilterComponent } from "./components/collection-filter.component";
-import { FolderFilterComponent } from "./components/folder-filter.component";
-import { LinkSsoComponent } from "./components/link-sso.component";
-import { OrganizationFilterComponent } from "./components/organization-filter.component";
-import { OrganizationOptionsComponent } from "./components/organization-options.component";
-import { StatusFilterComponent } from "./components/status-filter.component";
-import { TypeFilterComponent } from "./components/type-filter.component";
-import { OrganizationVaultFilterComponent } from "./organization-vault-filter.component";
-import { VaultFilterComponent } from "./vault-filter.component";
-import { VaultFilterService } from "./vault-filter.service";
-
-@NgModule({
-  imports: [SharedModule],
-  declarations: [
-    VaultFilterComponent,
-    CollectionFilterComponent,
-    FolderFilterComponent,
-    OrganizationFilterComponent,
-    OrganizationOptionsComponent,
-    StatusFilterComponent,
-    TypeFilterComponent,
-    OrganizationVaultFilterComponent,
-    LinkSsoComponent,
-  ],
-  exports: [VaultFilterComponent, OrganizationVaultFilterComponent],
-  providers: [VaultFilterService],
-})
-export class VaultFilterModule {}

apps/web/src/app/modules/vault/modules/individual-vault/individual-vault.module.ts

@@ -1,13 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { VaultModule } from "../../vault.module";
-
-import { IndividualVaultRoutingModule } from "./individual-vault-routing.module";
-import { IndividualVaultComponent } from "./individual-vault.component";
-
-@NgModule({
-  imports: [VaultModule, IndividualVaultRoutingModule],
-  declarations: [IndividualVaultComponent],
-  exports: [IndividualVaultComponent],
-})
-export class IndividualVaultModule {}

apps/web/src/app/modules/vault/modules/organization-vault/organization-vault.module.ts

@@ -1,13 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { VaultModule } from "../../vault.module";
-
-import { OrganizationVaultRoutingModule } from "./organization-vault-routing.module";
-import { OrganizationVaultComponent } from "./organization-vault.component";
-
-@NgModule({
-  imports: [VaultModule, OrganizationVaultRoutingModule],
-  declarations: [OrganizationVaultComponent],
-  exports: [OrganizationVaultComponent],
-})
-export class OrganizationVaultModule {}

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

@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 
-import { SharedModule } from "../../shared.module";
+import { SharedModule } from "../../shared";
 
 import { OrganizationInformationComponent } from "./organization-information.component";
 

apps/web/src/app/organizations/manage/collections.component.ts

@@ -20,9 +20,8 @@ import {
 import { ListResponse } from "@bitwarden/common/models/response/listResponse";
 import { CollectionView } from "@bitwarden/common/models/view/collectionView";
 
-import { EntityUsersComponent } from "../../modules/organizations/manage/entity-users.component";
-
 import { CollectionAddEditComponent } from "./collection-add-edit.component";
+import { EntityUsersComponent } from "./entity-users.component";
 
 @Component({
   selector: "app-org-manage-collections",

apps/web/src/app/organizations/manage/groups.component.ts

@@ -12,8 +12,7 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { GroupResponse } from "@bitwarden/common/models/response/groupResponse";
 
-import { EntityUsersComponent } from "../../modules/organizations/manage/entity-users.component";
+import { EntityUsersComponent } from "./entity-users.component";
-
 import { GroupAddEditComponent } from "./group-add-edit.component";
 
 @Component({

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

@@ -1,7 +1,7 @@
 import { ScrollingModule } from "@angular/cdk/scrolling";
 import { NgModule } from "@angular/core";
 
-import { SharedModule } from "../../shared.module";
+import { SharedModule } from "../../shared";
 
 import { EntityUsersComponent } from "./entity-users.component";
 

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

@@ -4,8 +4,6 @@ import { RouterModule, Routes } from "@angular/router";
 import { AuthGuard } from "@bitwarden/angular/guards/auth.guard";
 import { Permissions } from "@bitwarden/common/enums/permissions";
 
-import { OrganizationVaultModule } from "../modules/vault/modules/organization-vault/organization-vault.module";
-
 import { PermissionsGuard } from "./guards/permissions.guard";
 import { OrganizationLayoutComponent } from "./layouts/organization-layout.component";
 import { CollectionsComponent } from "./manage/collections.component";
@@ -26,6 +24,7 @@ import { ReusedPasswordsReportComponent } from "./tools/reused-passwords-report.
 import { ToolsComponent } from "./tools/tools.component";
 import { UnsecuredWebsitesReportComponent } from "./tools/unsecured-websites-report.component";
 import { WeakPasswordsReportComponent } from "./tools/weak-passwords-report.component";
+import { VaultModule } from "./vault/vault.module";
 
 const routes: Routes = [
   {
@@ -39,7 +38,7 @@ const routes: Routes = [
       { path: "", pathMatch: "full", redirectTo: "vault" },
       {
         path: "vault",
-        loadChildren: () => OrganizationVaultModule,
+        loadChildren: () => VaultModule,
       },
       {
         path: "tools",

apps/web/src/app/organizations/tools/import-export/org-import-export.module.ts

@@ -1,8 +1,5 @@
-import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
-import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 
-import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
@@ -13,21 +10,14 @@ import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abs
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { ImportService } from "@bitwarden/common/services/import.service";
 
-import { LooseComponentsModule } from "../../../modules/loose-components.module";
+import { LooseComponentsModule, SharedModule } from "../../../shared";
 
 import { OrganizationExportComponent } from "./org-export.component";
 import { OrganizationImportExportRoutingModule } from "./org-import-export-routing.module";
 import { OrganizationImportComponent } from "./org-import.component";
 
 @NgModule({
-  imports: [
+  imports: [SharedModule, LooseComponentsModule, OrganizationImportExportRoutingModule],
-    CommonModule,
-    JslibModule,
-    LooseComponentsModule,
-    FormsModule,
-    ReactiveFormsModule,
-    OrganizationImportExportRoutingModule,
-  ],
   declarations: [OrganizationImportComponent, OrganizationExportComponent],
   providers: [
     {

apps/web/src/app/organizations/users/organization-user.module.ts

@@ -1,8 +1,7 @@
 import { ScrollingModule } from "@angular/cdk/scrolling";
 import { NgModule } from "@angular/core";
 
-import { LooseComponentsModule } from "../../loose-components.module";
+import { LooseComponentsModule, SharedModule } from "../../shared";
-import { SharedModule } from "../../shared.module";
 
 import { EnrollMasterPasswordReset } from "./enroll-master-password-reset.component";
 

apps/web/src/app/organizations/vault/vault-filter/vault-filter.component.ts

@@ -2,13 +2,13 @@ import { Component } from "@angular/core";
 
 import { Organization } from "@bitwarden/common/models/domain/organization";
 
-import { VaultFilterComponent } from "./vault-filter.component";
+import { VaultFilterComponent as BaseVaultFilterComponent } from "../../../vault/vault-filter/vault-filter.component";
 
 @Component({
   selector: "app-organization-vault-filter",
-  templateUrl: "vault-filter.component.html",
+  templateUrl: "../../../vault/vault-filter/vault-filter.component.html",
 })
-export class OrganizationVaultFilterComponent extends VaultFilterComponent {
+export class VaultFilterComponent extends BaseVaultFilterComponent {
   hideOrganizations = true;
   hideFavorites = true;
   hideFolders = true;

apps/web/src/app/organizations/vault/vault-filter/vault-filter.module.ts

@@ -0,0 +1,12 @@
+import { NgModule } from "@angular/core";
+
+import { VaultFilterSharedModule } from "../../../vault/vault-filter/shared/vault-filter-shared.module";
+
+import { VaultFilterComponent } from "./vault-filter.component";
+
+@NgModule({
+  imports: [VaultFilterSharedModule],
+  declarations: [VaultFilterComponent],
+  exports: [VaultFilterComponent],
+})
+export class VaultFilterModule {}

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

@@ -1,11 +1,11 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
-import { IndividualVaultComponent } from "./individual-vault.component";
+import { VaultComponent } from "./vault.component";
 const routes: Routes = [
   {
     path: "",
-    component: IndividualVaultComponent,
+    component: VaultComponent,
     data: { titleId: "vaults" },
   },
 ];
@@ -13,4 +13,4 @@ const routes: Routes = [
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule],
 })
-export class IndividualVaultRoutingModule {}
+export class VaultRoutingModule {}

apps/web/src/app/organizations/vault/vault.component.ts

@@ -10,8 +10,8 @@ import {
 import { ActivatedRoute, Params, Router } from "@angular/router";
 import { first } from "rxjs/operators";
 
-import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
+import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -24,23 +24,24 @@ import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { Organization } from "@bitwarden/common/models/domain/organization";
 import { CipherView } from "@bitwarden/common/models/view/cipherView";
 
-import { EntityEventsComponent } from "../../../../organizations/manage/entity-events.component";
+import { VaultService } from "../../vault/shared/vault.service";
-import { AddEditComponent } from "../../../../organizations/vault/add-edit.component";
+import { EntityEventsComponent } from "../manage/entity-events.component";
-import { AttachmentsComponent } from "../../../../organizations/vault/attachments.component";
+
-import { CiphersComponent } from "../../../../organizations/vault/ciphers.component";
+import { AddEditComponent } from "./add-edit.component";
-import { CollectionsComponent } from "../../../../organizations/vault/collections.component";
+import { AttachmentsComponent } from "./attachments.component";
-import { OrganizationVaultFilterComponent } from "../../../vault-filter/organization-vault-filter.component";
+import { CiphersComponent } from "./ciphers.component";
-import { VaultService } from "../../vault.service";
+import { CollectionsComponent } from "./collections.component";
+import { VaultFilterComponent } from "./vault-filter/vault-filter.component";
 
 const BroadcasterSubscriptionId = "OrgVaultComponent";
 
 @Component({
   selector: "app-org-vault",
-  templateUrl: "organization-vault.component.html",
+  templateUrl: "vault.component.html",
 })
-export class OrganizationVaultComponent implements OnInit, OnDestroy {
+export class VaultComponent implements OnInit, OnDestroy {
   @ViewChild("vaultFilter", { static: true })
-  vaultFilterComponent: OrganizationVaultFilterComponent;
+  vaultFilterComponent: VaultFilterComponent;
   @ViewChild(CiphersComponent, { static: true }) ciphersComponent: CiphersComponent;
   @ViewChild("attachments", { read: ViewContainerRef, static: true })
   attachmentsModalRef: ViewContainerRef;

apps/web/src/app/organizations/vault/vault.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from "@angular/core";
+
+import { VaultSharedModule } from "../../vault/shared/vault-shared.module";
+
+import { CiphersComponent } from "./ciphers.component";
+import { VaultFilterModule } from "./vault-filter/vault-filter.module";
+import { VaultRoutingModule } from "./vault-routing.module";
+import { VaultComponent } from "./vault.component";
+
+@NgModule({
+  imports: [VaultSharedModule, VaultRoutingModule, VaultFilterModule],
+  declarations: [VaultComponent, CiphersComponent],
+  exports: [VaultComponent],
+})
+export class VaultModule {}

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

@@ -18,6 +18,7 @@ import { RegisterComponent } from "./accounts/register.component";
 import { RemovePasswordComponent } from "./accounts/remove-password.component";
 import { SetPasswordComponent } from "./accounts/set-password.component";
 import { SsoComponent } from "./accounts/sso.component";
+import { TrialInitiationComponent } from "./accounts/trial-initiation/trial-initiation.component";
 import { TwoFactorComponent } from "./accounts/two-factor.component";
 import { UpdatePasswordComponent } from "./accounts/update-password.component";
 import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
@@ -26,8 +27,6 @@ import { VerifyRecoverDeleteComponent } from "./accounts/verify-recover-delete.c
 import { HomeGuard } from "./guards/home.guard";
 import { FrontendLayoutComponent } from "./layouts/frontend-layout.component";
 import { UserLayoutComponent } from "./layouts/user-layout.component";
-import { TrialInitiationComponent } from "./modules/trial-initiation/trial-initiation.component";
-import { IndividualVaultModule } from "./modules/vault/modules/individual-vault/individual-vault.module";
 import { OrganizationsRoutingModule } from "./organizations/organization-routing.module";
 import { AcceptFamilySponsorshipComponent } from "./organizations/sponsorships/accept-family-sponsorship.component";
 import { FamiliesForEnterpriseSetupComponent } from "./organizations/sponsorships/families-for-enterprise-setup.component";
@@ -46,6 +45,7 @@ import { SponsoredFamiliesComponent } from "./settings/sponsored-families.compon
 import { SubscriptionRoutingModule } from "./settings/subscription-routing.module";
 import { GeneratorComponent } from "./tools/generator.component";
 import { ToolsComponent } from "./tools/tools.component";
+import { VaultModule } from "./vault/vault.module";
 
 const routes: Routes = [
   {
@@ -162,7 +162,7 @@ const routes: Routes = [
     children: [
       {
         path: "vault",
-        loadChildren: () => IndividualVaultModule,
+        loadChildren: () => VaultModule,
       },
       { path: "sends", component: SendComponent, data: { title: "Send" } },
       {

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

@@ -1,14 +1,12 @@
 import { NgModule } from "@angular/core";
 
-import { LooseComponentsModule } from "./modules/loose-components.module";
+import { TrialInitiationModule } from "./accounts/trial-initiation/trial-initiation.module";
-import { OrganizationCreateModule } from "./modules/organizations/create/organization-create.module";
+import { OrganizationCreateModule } from "./organizations/create/organization-create.module";
-import { OrganizationManageModule } from "./modules/organizations/manage/organization-manage.module";
+import { OrganizationManageModule } from "./organizations/manage/organization-manage.module";
-import { OrganizationUserModule } from "./modules/organizations/users/organization-user.module";
+import { OrganizationUserModule } from "./organizations/users/organization-user.module";
-import { PipesModule } from "./modules/pipes/pipes.module";
+import { LooseComponentsModule, SharedModule } from "./shared";
-import { SharedModule } from "./modules/shared.module";
+import { OrganizationBadgeModule } from "./vault/organization-badge/organization-badge.module";
-import { TrialInitiationModule } from "./modules/trial-initiation/trial-initiation.module";
+import { VaultFilterModule } from "./vault/vault-filter/vault-filter.module";
-import { VaultFilterModule } from "./modules/vault-filter/vault-filter.module";
-import { OrganizationBadgeModule } from "./modules/vault/modules/organization-badge/organization-badge.module";
 
 @NgModule({
   imports: [
@@ -17,7 +15,6 @@ import { OrganizationBadgeModule } from "./modules/vault/modules/organization-ba
     TrialInitiationModule,
     VaultFilterModule,
     OrganizationBadgeModule,
-    PipesModule,
     OrganizationManageModule,
     OrganizationUserModule,
     OrganizationCreateModule,
@@ -28,7 +25,6 @@ import { OrganizationBadgeModule } from "./modules/vault/modules/organization-ba
     TrialInitiationModule,
     VaultFilterModule,
     OrganizationBadgeModule,
-    PipesModule,
   ],
   bootstrap: [],
 })

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

@@ -1,7 +1,7 @@
 import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
 
-import { SharedModule } from "../modules/shared.module";
+import { SharedModule } from "../shared";
 
 import { BreachReportComponent } from "./pages/breach-report.component";
 import { ExposedPasswordsReportComponent } from "./pages/exposed-passwords-report.component";

apps/web/src/app/shared/index.ts

@@ -0,0 +1,2 @@
+export * from "./shared.module";
+export * from "./loose-components.module";

apps/web/src/app/shared/locales.ts

@@ -1,5 +1,4 @@
-import { DragDropModule } from "@angular/cdk/drag-drop";
+import { registerLocaleData } from "@angular/common";
-import { DatePipe, registerLocaleData, CommonModule } from "@angular/common";
 import localeAf from "@angular/common/locales/af";
 import localeAz from "@angular/common/locales/az";
 import localeBe from "@angular/common/locales/be";
@@ -50,25 +49,6 @@ import localeUk from "@angular/common/locales/uk";
 import localeVi from "@angular/common/locales/vi";
 import localeZhCn from "@angular/common/locales/zh-Hans";
 import localeZhTw from "@angular/common/locales/zh-Hant";
-import { NgModule } from "@angular/core";
-import { FormsModule, ReactiveFormsModule } from "@angular/forms";
-import { RouterModule } from "@angular/router";
-import { InfiniteScrollModule } from "ngx-infinite-scroll";
-import { ToastrModule } from "ngx-toastr";
-
-import { JslibModule } from "@bitwarden/angular/jslib.module";
-import {
-  BadgeModule,
-  ButtonModule,
-  CalloutModule,
-  FormFieldModule,
-  SubmitButtonModule,
-  MenuModule,
-  IconModule,
-} from "@bitwarden/components";
-
-import { PaymentComponent } from "../settings/payment.component";
-import { TaxInfoComponent } from "../settings/tax-info.component";
 
 registerLocaleData(localeAf, "af");
 registerLocaleData(localeAz, "az");
@@ -120,50 +100,3 @@ registerLocaleData(localeUk, "uk");
 registerLocaleData(localeVi, "vi");
 registerLocaleData(localeZhCn, "zh-CN");
 registerLocaleData(localeZhTw, "zh-TW");
-
-@NgModule({
-  declarations: [PaymentComponent, TaxInfoComponent],
-  imports: [
-    CommonModule,
-    DragDropModule,
-    FormsModule,
-    InfiniteScrollModule,
-    JslibModule,
-    ReactiveFormsModule,
-    RouterModule,
-    BadgeModule,
-    ButtonModule,
-    CalloutModule,
-    ToastrModule,
-    BadgeModule,
-    ButtonModule,
-    MenuModule,
-    FormFieldModule,
-    SubmitButtonModule,
-    IconModule,
-  ],
-  exports: [
-    CommonModule,
-    DragDropModule,
-    FormsModule,
-    InfiniteScrollModule,
-    JslibModule,
-    ReactiveFormsModule,
-    RouterModule,
-    BadgeModule,
-    ButtonModule,
-    CalloutModule,
-    ToastrModule,
-    BadgeModule,
-    ButtonModule,
-    MenuModule,
-    FormFieldModule,
-    SubmitButtonModule,
-    PaymentComponent,
-    TaxInfoComponent,
-    IconModule,
-  ],
-  providers: [DatePipe],
-  bootstrap: [],
-})
-export class SharedModule {}

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

@@ -9,6 +9,7 @@ import { LockComponent } from "../accounts/lock.component";
 import { LoginComponent } from "../accounts/login.component";
 import { RecoverDeleteComponent } from "../accounts/recover-delete.component";
 import { RecoverTwoFactorComponent } from "../accounts/recover-two-factor.component";
+import { RegisterFormModule } from "../accounts/register-form/register-form.module";
 import { RegisterComponent } from "../accounts/register.component";
 import { RemovePasswordComponent } from "../accounts/remove-password.component";
 import { SetPasswordComponent } from "../accounts/set-password.component";
@@ -27,6 +28,7 @@ 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 { OrganizationCreateModule } from "../organizations/create/organization-create.module";
 import { OrganizationLayoutComponent } from "../organizations/layouts/organization-layout.component";
 import { BulkConfirmComponent as OrgBulkConfirmComponent } from "../organizations/manage/bulk/bulk-confirm.component";
 import { BulkRemoveComponent as OrgBulkRemoveComponent } from "../organizations/manage/bulk/bulk-remove.component";
@@ -76,7 +78,6 @@ import { UnsecuredWebsitesReportComponent as OrgUnsecuredWebsitesReportComponent
 import { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from "../organizations/tools/weak-passwords-report.component";
 import { AddEditComponent as OrgAddEditComponent } from "../organizations/vault/add-edit.component";
 import { AttachmentsComponent as OrgAttachmentsComponent } from "../organizations/vault/attachments.component";
-import { CiphersComponent as OrgCiphersComponent } from "../organizations/vault/ciphers.component";
 import { CollectionsComponent as OrgCollectionsComponent } from "../organizations/vault/collections.component";
 import { ProvidersComponent } from "../providers/providers.component";
 import { AccessComponent } from "../send/access.component";
@@ -105,6 +106,7 @@ import { EmergencyAccessComponent } from "../settings/emergency-access.component
 import { EmergencyAddEditComponent } from "../settings/emergency-add-edit.component";
 import { OrganizationPlansComponent } from "../settings/organization-plans.component";
 import { PaymentMethodComponent } from "../settings/payment-method.component";
+import { PaymentComponent } from "../settings/payment.component";
 import { PreferencesComponent } from "../settings/preferences.component";
 import { PremiumComponent } from "../settings/premium.component";
 import { ProfileComponent } from "../settings/profile.component";
@@ -115,6 +117,7 @@ import { SettingsComponent } from "../settings/settings.component";
 import { SponsoredFamiliesComponent } from "../settings/sponsored-families.component";
 import { SponsoringOrgRowComponent } from "../settings/sponsoring-org-row.component";
 import { SubscriptionComponent } from "../settings/subscription.component";
+import { TaxInfoComponent } from "../settings/tax-info.component";
 import { TwoFactorAuthenticatorComponent } from "../settings/two-factor-authenticator.component";
 import { TwoFactorDuoComponent } from "../settings/two-factor-duo.component";
 import { TwoFactorEmailComponent } from "../settings/two-factor-email.component";
@@ -140,17 +143,13 @@ import { BulkDeleteComponent } from "../vault/bulk-delete.component";
 import { BulkMoveComponent } from "../vault/bulk-move.component";
 import { BulkRestoreComponent } from "../vault/bulk-restore.component";
 import { BulkShareComponent } from "../vault/bulk-share.component";
-import { CiphersComponent } from "../vault/ciphers.component";
 import { CollectionsComponent } from "../vault/collections.component";
 import { FolderAddEditComponent } from "../vault/folder-add-edit.component";
+import { OrganizationBadgeModule } from "../vault/organization-badge/organization-badge.module";
 import { ShareComponent } from "../vault/share.component";
+import { VaultFilterModule } from "../vault/vault-filter/vault-filter.module";
 
-import { OrganizationCreateModule } from "./organizations/create/organization-create.module";
+import { SharedModule } from ".";
-import { PipesModule } from "./pipes/pipes.module";
-import { RegisterFormModule } from "./register-form/register-form.module";
-import { SharedModule } from "./shared.module";
-import { VaultFilterModule } from "./vault-filter/vault-filter.module";
-import { OrganizationBadgeModule } from "./vault/modules/organization-badge/organization-badge.module";
 
 // Please do not add to this list of declarations - we should refactor these into modules when doing so makes sense until there are none left.
 // If you are building new functionality, please create or extend a feature module instead.
@@ -159,7 +158,6 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     SharedModule,
     VaultFilterModule,
     OrganizationBadgeModule,
-    PipesModule,
     OrganizationCreateModule,
     RegisterFormModule,
   ],
@@ -190,7 +188,6 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     ChangeKdfComponent,
     ChangePasswordComponent,
     ChangePlanComponent,
-    CiphersComponent,
     CollectionsComponent,
     CreateOrganizationComponent,
     DeauthorizeSessionsComponent,
@@ -228,7 +225,6 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     OrgBulkRestoreRevokeComponent,
     OrgBulkRemoveComponent,
     OrgBulkStatusComponent,
-    OrgCiphersComponent,
     OrgCollectionAddEditComponent,
     OrgCollectionsComponent,
     OrgEntityEventsComponent,
@@ -257,6 +253,7 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     PasswordGeneratorHistoryComponent,
     PasswordGeneratorPolicyComponent,
     PasswordRepromptComponent,
+    PaymentComponent,
     PaymentMethodComponent,
     PersonalOwnershipPolicyComponent,
     PreferencesComponent,
@@ -285,6 +282,7 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     SponsoringOrgRowComponent,
     SsoComponent,
     SubscriptionComponent,
+    TaxInfoComponent,
     ToolsComponent,
     TwoFactorAuthenticationPolicyComponent,
     TwoFactorAuthenticatorComponent,
@@ -334,7 +332,6 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     ChangeKdfComponent,
     ChangePasswordComponent,
     ChangePlanComponent,
-    CiphersComponent,
     CollectionsComponent,
     CreateOrganizationComponent,
     DeauthorizeSessionsComponent,
@@ -372,7 +369,6 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     OrgBulkRestoreRevokeComponent,
     OrgBulkRemoveComponent,
     OrgBulkStatusComponent,
-    OrgCiphersComponent,
     OrgCollectionAddEditComponent,
     OrgCollectionsComponent,
     OrgEntityEventsComponent,
@@ -400,6 +396,7 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     PasswordGeneratorHistoryComponent,
     PasswordGeneratorPolicyComponent,
     PasswordRepromptComponent,
+    PaymentComponent,
     PaymentMethodComponent,
     PersonalOwnershipPolicyComponent,
     PreferencesComponent,
@@ -428,6 +425,7 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     SponsoringOrgRowComponent,
     SsoComponent,
     SubscriptionComponent,
+    TaxInfoComponent,
     ToolsComponent,
     TwoFactorAuthenticationPolicyComponent,
     TwoFactorAuthenticatorComponent,

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

@@ -0,0 +1,72 @@
+import { DragDropModule } from "@angular/cdk/drag-drop";
+import { DatePipe, CommonModule } from "@angular/common";
+import { NgModule } from "@angular/core";
+import { FormsModule, ReactiveFormsModule } from "@angular/forms";
+import { RouterModule } from "@angular/router";
+import { InfiniteScrollModule } from "ngx-infinite-scroll";
+import { ToastrModule } from "ngx-toastr";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import {
+  BadgeModule,
+  ButtonModule,
+  CalloutModule,
+  FormFieldModule,
+  SubmitButtonModule,
+  MenuModule,
+  IconModule,
+} from "@bitwarden/components";
+
+// Register the locales for the application
+import "./locales";
+
+/**
+ * This NgModule should contain the most basic shared directives, pipes, and components. They
+ * should be widely used by other modules to be considered for adding to this module. If in doubt
+ * do not add to this module.
+ *
+ * See: https://angular.io/guide/module-types#shared-ngmodules
+ */
+@NgModule({
+  imports: [
+    CommonModule,
+    DragDropModule,
+    FormsModule,
+    InfiniteScrollModule,
+    JslibModule,
+    ReactiveFormsModule,
+    RouterModule,
+    BadgeModule,
+    ButtonModule,
+    CalloutModule,
+    ToastrModule,
+    BadgeModule,
+    ButtonModule,
+    MenuModule,
+    FormFieldModule,
+    SubmitButtonModule,
+    IconModule,
+  ],
+  exports: [
+    CommonModule,
+    DragDropModule,
+    FormsModule,
+    InfiniteScrollModule,
+    JslibModule,
+    ReactiveFormsModule,
+    RouterModule,
+    BadgeModule,
+    ButtonModule,
+    CalloutModule,
+    ToastrModule,
+    BadgeModule,
+    ButtonModule,
+    MenuModule,
+    FormFieldModule,
+    SubmitButtonModule,
+    IconModule,
+  ],
+  providers: [DatePipe],
+  bootstrap: [],
+})
+export class SharedModule {}

apps/web/src/app/tools/import-export/import-export.module.ts

@@ -1,8 +1,5 @@
-import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
-import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 
-import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
@@ -13,21 +10,14 @@ import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abs
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { ImportService } from "@bitwarden/common/services/import.service";
 
-import { LooseComponentsModule } from "../../modules/loose-components.module";
+import { LooseComponentsModule, SharedModule } from "../../shared";
 
 import { ExportComponent } from "./export.component";
 import { ImportExportRoutingModule } from "./import-export-routing.module";
 import { ImportComponent } from "./import.component";
 
 @NgModule({
-  imports: [
+  imports: [SharedModule, LooseComponentsModule, ImportExportRoutingModule],
-    CommonModule,
-    JslibModule,
-    LooseComponentsModule,
-    FormsModule,
-    ReactiveFormsModule,
-    ImportExportRoutingModule,
-  ],
   declarations: [ImportComponent, ExportComponent],
   providers: [
     {

apps/web/src/app/vault/organization-badge/organization-badge.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 
-import { SharedModule } from "../../../shared.module";
+import { SharedModule } from "../../shared";
 
 import { OrganizationNameBadgeComponent } from "./organization-name-badge.component";
 

apps/web/src/app/vault/shared/pipes/pipes.module.ts

@@ -3,7 +3,6 @@ import { NgModule } from "@angular/core";
 import { GetOrgNameFromIdPipe } from "./get-organization-name.pipe";
 
 @NgModule({
-  imports: [],
   declarations: [GetOrgNameFromIdPipe],
   exports: [GetOrgNameFromIdPipe],
 })

apps/web/src/app/vault/shared/vault-shared.module.ts

@@ -1,14 +1,15 @@
 import { NgModule } from "@angular/core";
 
-import { LooseComponentsModule } from "../loose-components.module";
+import { SharedModule } from "../../shared";
-import { SharedModule } from "../shared.module";
+import { LooseComponentsModule } from "../../shared/loose-components.module";
 import { VaultFilterModule } from "../vault-filter/vault-filter.module";
 
+import { PipesModule } from "./pipes/pipes.module";
 import { VaultService } from "./vault.service";
 
 @NgModule({
-  imports: [SharedModule, VaultFilterModule, LooseComponentsModule],
+  imports: [SharedModule, VaultFilterModule, LooseComponentsModule, PipesModule],
-  exports: [SharedModule, VaultFilterModule, LooseComponentsModule],
+  exports: [SharedModule, VaultFilterModule, LooseComponentsModule, PipesModule],
   providers: [
     {
       provide: VaultService,
@@ -16,4 +17,4 @@ import { VaultService } from "./vault.service";
     },
   ],
 })
-export class VaultModule {}
+export class VaultSharedModule {}

apps/web/src/app/vault/shared/vault.service.ts

@@ -1,4 +1,4 @@
-import { VaultFilter } from "@bitwarden/angular/modules/vault-filter/models/vault-filter.model";
+import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 
 export class VaultService {
   calculateSearchBarLocalizationString(vaultFilter: VaultFilter): string {

apps/web/src/app/vault/vault-filter/organization-filter/organization-filter.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { OrganizationFilterComponent as BaseOrganizationFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/organization-filter.component";
+import { OrganizationFilterComponent as BaseOrganizationFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/organization-filter.component";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { Organization } from "@bitwarden/common/models/domain/organization";

apps/web/src/app/vault/vault-filter/organization-filter/organization-options.component.ts

@@ -12,7 +12,7 @@ import { Organization } from "@bitwarden/common/models/domain/organization";
 import { Policy } from "@bitwarden/common/models/domain/policy";
 import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/models/request/organizationUserResetPasswordEnrollmentRequest";
 
-import { EnrollMasterPasswordReset } from "../../organizations/users/enroll-master-password-reset.component";
+import { EnrollMasterPasswordReset } from "../../../organizations/users/enroll-master-password-reset.component";
 
 @Component({
   selector: "app-organization-options",

apps/web/src/app/vault/vault-filter/shared/collection-filter/collection-filter.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { CollectionFilterComponent as BaseCollectionFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/collection-filter.component";
+import { CollectionFilterComponent as BaseCollectionFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/collection-filter.component";
 
 @Component({
   selector: "app-collection-filter",

apps/web/src/app/vault/vault-filter/shared/folder-filter/folder-filter.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { FolderFilterComponent as BaseFolderFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/folder-filter.component";
+import { FolderFilterComponent as BaseFolderFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/folder-filter.component";
 
 @Component({
   selector: "app-folder-filter",

apps/web/src/app/vault/vault-filter/shared/status-filter/status-filter.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { StatusFilterComponent as BaseStatusFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/status-filter.component";
+import { StatusFilterComponent as BaseStatusFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/status-filter.component";
 
 @Component({
   selector: "app-status-filter",

apps/web/src/app/vault/vault-filter/shared/type-filter/type-filter.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { TypeFilterComponent as BaseTypeFilterComponent } from "@bitwarden/angular/modules/vault-filter/components/type-filter.component";
+import { TypeFilterComponent as BaseTypeFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/type-filter.component";
 
 @Component({
   selector: "app-type-filter",

apps/web/src/app/vault/vault-filter/shared/vault-filter-shared.module.ts

@@ -0,0 +1,28 @@
+import { NgModule } from "@angular/core";
+
+import { SharedModule } from "../../../shared";
+
+import { CollectionFilterComponent } from "./collection-filter/collection-filter.component";
+import { FolderFilterComponent } from "./folder-filter/folder-filter.component";
+import { StatusFilterComponent } from "./status-filter/status-filter.component";
+import { TypeFilterComponent } from "./type-filter/type-filter.component";
+import { VaultFilterService } from "./vault-filter.service";
+
+@NgModule({
+  imports: [SharedModule],
+  declarations: [
+    CollectionFilterComponent,
+    FolderFilterComponent,
+    StatusFilterComponent,
+    TypeFilterComponent,
+  ],
+  exports: [
+    SharedModule,
+    CollectionFilterComponent,
+    FolderFilterComponent,
+    StatusFilterComponent,
+    TypeFilterComponent,
+  ],
+  providers: [VaultFilterService],
+})
+export class VaultFilterSharedModule {}

apps/web/src/app/vault/vault-filter/shared/vault-filter.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from "@angular/core";
 import { BehaviorSubject, Observable } from "rxjs";
 
-import { DynamicTreeNode } from "@bitwarden/angular/modules/vault-filter/models/dynamic-tree-node.model";
+import { DynamicTreeNode } from "@bitwarden/angular/vault/vault-filter/models/dynamic-tree-node.model";
-import { VaultFilterService as BaseVaultFilterService } from "@bitwarden/angular/modules/vault-filter/vault-filter.service";
+import { VaultFilterService as BaseVaultFilterService } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";

apps/web/src/app/vault/vault-filter/vault-filter.component.ts

@@ -1,11 +1,11 @@
 import { Component, EventEmitter, Output } from "@angular/core";
 
-import { VaultFilterComponent as BaseVaultFilterComponent } from "@bitwarden/angular/modules/vault-filter/vault-filter.component";
+import { VaultFilterComponent as BaseVaultFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/vault-filter.component";
 
-import { VaultFilterService } from "./vault-filter.service";
+import { VaultFilterService } from "./shared/vault-filter.service";
 
 @Component({
-  selector: "app-vault-filter",
+  selector: "./app-vault-filter",
   templateUrl: "vault-filter.component.html",
 })
 export class VaultFilterComponent extends BaseVaultFilterComponent {