1
0
mirror of https://github.com/bitwarden/web synced 2025-12-06 00:03:28 +00:00

Compare commits

..

6 Commits

Author SHA1 Message Date
gbubemismith
63aa95d55b Revert "[ps-136] Igonre accented characters in vault search (#1690)"
This reverts commit 58d9ac5ebc.
2022-05-24 23:33:38 +01:00
gbubemismith
eab8908206 Merge branch 'master' into bug/ps-136-search-accented-characters 2022-05-19 19:04:55 +01:00
gbubemismith
51ee899c5e Merge branch 'master' into bug/ps-136-search-accented-characters 2022-05-19 15:27:05 +01:00
gbubemismith
26065d3542 updated jslib 2022-05-19 15:26:31 +01:00
gbubemismith
5094a710ac Merge branch 'master' into bug/ps-136-search-accented-characters 2022-05-17 14:17:18 +01:00
gbubemismith
67ebf88837 removed accented character from serach input field 2022-05-17 14:16:43 +01:00
4 changed files with 28 additions and 6 deletions

View File

@@ -27,4 +27,8 @@ export class VaultFilterComponent extends BaseVaultFilterComponent {
searchTextChanged() {
this.onSearchTextChanged.emit(this.searchText);
}
async initCollections() {
return await this.vaultFilterService.buildCollections(this.organization?.id);
}
}

View File

@@ -1,6 +1,12 @@
import { NgModule } from "@angular/core";
import { VaultFilterService } from "jslib-angular/modules/vault-filter/vault-filter.service";
import { CipherService } from "jslib-common/abstractions/cipher.service";
import { CollectionService } from "jslib-common/abstractions/collection.service";
import { FolderService } from "jslib-common/abstractions/folder.service";
import { OrganizationService } from "jslib-common/abstractions/organization.service";
import { PolicyService } from "jslib-common/abstractions/policy.service";
import { StateService } from "jslib-common/abstractions/state.service";
import { SharedModule } from "../shared.module";
@@ -24,6 +30,19 @@ import { VaultFilterComponent } from "./vault-filter.component";
TypeFilterComponent,
],
exports: [VaultFilterComponent],
providers: [VaultFilterService],
providers: [
{
provide: VaultFilterService,
useClass: VaultFilterService,
deps: [
StateService,
OrganizationService,
FolderService,
CipherService,
CollectionService,
PolicyService,
],
},
],
})
export class VaultFilterModule {}

View File

@@ -0,0 +1,3 @@
import { VaultFilterService as BaseVaultFilterService } from "jslib-angular/modules/vault-filter/vault-filter.service";
export class VaultFilterService extends BaseVaultFilterService {}

View File

@@ -98,7 +98,6 @@ export class OrganizationVaultComponent implements OnInit, OnDestroy {
this.vaultFilterComponent.reloadCollectionsAndFolders(
new VaultFilter({
selectedOrganizationId: this.organization.id,
useAdminCollections: this.organization.canEditAnyCollection,
} as Partial<VaultFilter>)
),
this.ciphersComponent.refresh(),
@@ -111,10 +110,7 @@ export class OrganizationVaultComponent implements OnInit, OnDestroy {
});
}
await this.vaultFilterComponent.reloadCollectionsAndFolders(
new VaultFilter({
selectedOrganizationId: this.organization.id,
useAdminCollections: this.organization.canEditAnyCollection,
} as Partial<VaultFilter>)
new VaultFilter({ selectedOrganizationId: this.organization.id } as Partial<VaultFilter>)
);
await this.ciphersComponent.reload();