From f2ba5e4a38ffe27f63af6f19f941210e1ef01c35 Mon Sep 17 00:00:00 2001 From: Leslie Xiong Date: Tue, 16 Dec 2025 10:49:35 -0500 Subject: [PATCH] replaced `JslibModule` imports with `A11yTitleDirective` --- .../vault-filter/filters/collection-filter.component.ts | 5 ++--- .../vault-v3/vault-filter/filters/folder-filter.component.ts | 5 ++--- .../vault-filter/filters/organization-filter.component.ts | 5 ++--- .../vault-v3/vault-filter/filters/status-filter.component.ts | 5 ++--- .../vault-v3/vault-filter/filters/type-filter.component.ts | 5 ++--- 5 files changed, 10 insertions(+), 15 deletions(-) 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 b2c8aa53e0a..e23d215aef1 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,8 +1,7 @@ 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 { NavigationModule, A11yTitleDirective } from "@bitwarden/components"; import { VaultFilter, CollectionFilter } from "@bitwarden/vault"; // FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush @@ -10,7 +9,7 @@ import { VaultFilter, CollectionFilter } from "@bitwarden/vault"; @Component({ selector: "app-collection-filter", templateUrl: "collection-filter.component.html", - imports: [JslibModule, NavigationModule], + imports: [A11yTitleDirective, 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 83389629b82..efcbaaeab72 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,8 +1,7 @@ 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, NavigationModule } from "@bitwarden/components"; +import { IconButtonModule, NavigationModule, A11yTitleDirective } from "@bitwarden/components"; import { VaultFilter, FolderFilter } from "@bitwarden/vault"; // FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush @@ -10,7 +9,7 @@ import { VaultFilter, FolderFilter } from "@bitwarden/vault"; @Component({ selector: "app-folder-filter", templateUrl: "folder-filter.component.html", - imports: [JslibModule, NavigationModule, IconButtonModule], + imports: [A11yTitleDirective, 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 ed7ee8dde4f..d79e583edee 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,11 +1,10 @@ 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, NavigationModule } from "@bitwarden/components"; +import { ToastService, NavigationModule, A11yTitleDirective } from "@bitwarden/components"; import { OrganizationFilter, VaultFilter, CollectionFilter } from "@bitwarden/vault"; import { CollectionFilterComponent } from "./collection-filter.component"; @@ -15,7 +14,7 @@ import { CollectionFilterComponent } from "./collection-filter.component"; @Component({ selector: "app-organization-filter", templateUrl: "organization-filter.component.html", - imports: [JslibModule, NavigationModule, CollectionFilterComponent], + imports: [A11yTitleDirective, 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 7bda547a079..417c618d62a 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 @@ -3,12 +3,11 @@ 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 { NavigationModule, A11yTitleDirective } from "@bitwarden/components"; import { VaultFilter, CipherStatus, CipherTypeFilter } from "@bitwarden/vault"; // FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush @@ -16,7 +15,7 @@ import { VaultFilter, CipherStatus, CipherTypeFilter } from "@bitwarden/vault"; @Component({ selector: "app-status-filter", templateUrl: "status-filter.component.html", - imports: [CommonModule, JslibModule, NavigationModule, PremiumBadgeComponent], + imports: [CommonModule, A11yTitleDirective, 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 aa3059627f6..5262d617336 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 @@ -2,10 +2,9 @@ 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 { NavigationModule, A11yTitleDirective } from "@bitwarden/components"; import { VaultFilter, CipherTypeFilter } from "@bitwarden/vault"; // FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush @@ -13,7 +12,7 @@ import { VaultFilter, CipherTypeFilter } from "@bitwarden/vault"; @Component({ selector: "app-type-filter", templateUrl: "type-filter.component.html", - imports: [CommonModule, JslibModule, NavigationModule], + imports: [CommonModule, A11yTitleDirective, NavigationModule], }) export class TypeFilterComponent { private restrictedItemTypesService: RestrictedItemTypesService = inject(