From ee5dfa80b9f962bcf793f8a02132f26ae4ef496a Mon Sep 17 00:00:00 2001 From: Leslie Xiong Date: Mon, 15 Dec 2025 14:26:01 -0500 Subject: [PATCH] used explicit imports --- .../vault-filter/filters/collection-filter.component.ts | 6 +++--- .../vault-filter/filters/folder-filter.component.ts | 7 +++---- .../filters/organization-filter.component.ts | 7 +++---- .../vault-filter/filters/status-filter.component.ts | 7 ++++--- .../vault-filter/filters/type-filter.component.ts | 7 ++++--- .../app/vault-v3/vault-filter/shared-filter-imports.ts | 9 --------- 6 files changed, 17 insertions(+), 26 deletions(-) delete mode 100644 apps/desktop/src/vault/app/vault-v3/vault-filter/shared-filter-imports.ts diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/collection-filter.component.ts b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/collection-filter.component.ts index 1ea3ae27252..b2c8aa53e0a 100644 --- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/collection-filter.component.ts +++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/collection-filter.component.ts @@ -1,16 +1,16 @@ import { Component, input, computed } from "@angular/core"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; +import { NavigationModule } from "@bitwarden/components"; import { VaultFilter, CollectionFilter } from "@bitwarden/vault"; -import { VAULT_FILTER_IMPORTS } from "../shared-filter-imports"; - // FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush // eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection @Component({ selector: "app-collection-filter", templateUrl: "collection-filter.component.html", - imports: [...VAULT_FILTER_IMPORTS], + imports: [JslibModule, NavigationModule], }) export class CollectionFilterComponent { protected readonly collection = input>(); diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/folder-filter.component.ts b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/folder-filter.component.ts index f2858f0e902..83389629b82 100644 --- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/folder-filter.component.ts +++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/folder-filter.component.ts @@ -1,17 +1,16 @@ import { Component, input, computed, output } from "@angular/core"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; -import { IconButtonModule } from "@bitwarden/components"; +import { IconButtonModule, NavigationModule } from "@bitwarden/components"; import { VaultFilter, FolderFilter } from "@bitwarden/vault"; -import { VAULT_FILTER_IMPORTS } from "../shared-filter-imports"; - // FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush // eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection @Component({ selector: "app-folder-filter", templateUrl: "folder-filter.component.html", - imports: [...VAULT_FILTER_IMPORTS, IconButtonModule], + imports: [JslibModule, NavigationModule, IconButtonModule], }) export class FolderFilterComponent { protected readonly folder = input>(); diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.ts b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.ts index fef9c7d1b51..ed7ee8dde4f 100644 --- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.ts +++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.ts @@ -1,14 +1,13 @@ import { Component, computed, input, inject } from "@angular/core"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; import { DisplayMode } from "@bitwarden/angular/vault/vault-filter/models/display-mode"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { OrganizationId } from "@bitwarden/common/types/guid"; import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; -import { ToastService } from "@bitwarden/components"; +import { ToastService, NavigationModule } from "@bitwarden/components"; import { OrganizationFilter, VaultFilter, CollectionFilter } from "@bitwarden/vault"; -import { VAULT_FILTER_IMPORTS } from "../shared-filter-imports"; - import { CollectionFilterComponent } from "./collection-filter.component"; // FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush @@ -16,7 +15,7 @@ import { CollectionFilterComponent } from "./collection-filter.component"; @Component({ selector: "app-organization-filter", templateUrl: "organization-filter.component.html", - imports: [...VAULT_FILTER_IMPORTS, CollectionFilterComponent], + imports: [JslibModule, NavigationModule, CollectionFilterComponent], }) export class OrganizationFilterComponent { private toastService: ToastService = inject(ToastService); diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/status-filter.component.ts b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/status-filter.component.ts index f4fce207453..7bda547a079 100644 --- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/status-filter.component.ts +++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/status-filter.component.ts @@ -1,21 +1,22 @@ +import { CommonModule } from "@angular/common"; import { Component, viewChild, input, inject, computed } from "@angular/core"; import { combineLatest, firstValueFrom, map, switchMap } from "rxjs"; import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service"; import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; +import { NavigationModule } from "@bitwarden/components"; import { VaultFilter, CipherStatus, CipherTypeFilter } from "@bitwarden/vault"; -import { VAULT_FILTER_IMPORTS } from "../shared-filter-imports"; - // FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush // eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection @Component({ selector: "app-status-filter", templateUrl: "status-filter.component.html", - imports: [...VAULT_FILTER_IMPORTS, PremiumBadgeComponent], + imports: [CommonModule, JslibModule, NavigationModule, PremiumBadgeComponent], }) export class StatusFilterComponent { private accountService: AccountService = inject(AccountService); diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.ts b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.ts index 3625642bf94..aa3059627f6 100644 --- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.ts +++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.ts @@ -1,18 +1,19 @@ +import { CommonModule } from "@angular/common"; import { Component, input, inject } from "@angular/core"; import { map, shareReplay } from "rxjs"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node"; import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service"; +import { NavigationModule } from "@bitwarden/components"; import { VaultFilter, CipherTypeFilter } from "@bitwarden/vault"; -import { VAULT_FILTER_IMPORTS } from "../shared-filter-imports"; - // FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush // eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection @Component({ selector: "app-type-filter", templateUrl: "type-filter.component.html", - imports: [...VAULT_FILTER_IMPORTS], + imports: [CommonModule, JslibModule, NavigationModule], }) export class TypeFilterComponent { private restrictedItemTypesService: RestrictedItemTypesService = inject( diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/shared-filter-imports.ts b/apps/desktop/src/vault/app/vault-v3/vault-filter/shared-filter-imports.ts deleted file mode 100644 index d2cd3d9cf66..00000000000 --- a/apps/desktop/src/vault/app/vault-v3/vault-filter/shared-filter-imports.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { CommonModule } from "@angular/common"; - -import { JslibModule } from "@bitwarden/angular/jslib.module"; -import { NavigationModule } from "@bitwarden/components"; - -/** - * Common imports shared across all vault filter components. - */ -export const VAULT_FILTER_IMPORTS = [CommonModule, JslibModule, NavigationModule] as const;